Make pulseaudio optional (bug #399111).

Package-Manager: portage-2.2.0_alpha99/cvs/Linux x86_64

4 files changed, 83 insertions, 12 deletions

diff --git a/net-libs/gtk-vnc/ChangeLog b/net-libs/gtk-vnc/ChangeLog
index 9ff58b94980f..5158fc75d21b 100644
--- a/net-libs/gtk-vnc/ChangeLog
+++ b/net-libs/gtk-vnc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-libs/gtk-vnc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/ChangeLog,v 1.83 2012/03/25 17:09:35 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/ChangeLog,v 1.84 2012/04/06 08:00:09 tetromino Exp $
+
+  06 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gtk-vnc-0.5.0.ebuild, +files/gtk-vnc-0.5.0-pulseaudio-automagic.patch:
+  Make pulseaudio optional (bug #399111).
 
   25 Mar 2012; Raúl Porcel <armin76@gentoo.org> gtk-vnc-0.4.4.ebuild:
   alpha/ia64/sparc stable wrt #393007
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index a7af294d951a..a80eb52791e3 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,19 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gtk-vnc-0.5.0-pod.patch 3441 RMD160 062d0b6ca34e38bb1aaa4754d7bcc1dd00f1f132 SHA1 dc731670865d8f167ab0e205ead99abc9ed3d228 SHA256 921b8347907bee39caff14c80c3b576618fe7ac2a7d679500769f797cab8fb66
+AUX gtk-vnc-0.5.0-pulseaudio-automagic.patch 2001 RMD160 fc3d2b1604f87cdd7a02bb4c5741898919b75738 SHA1 7a16afb8a3fa1e58d69462a83a509c781c009d65 SHA256 5ea9f09c341b656efaf54e5c9114f6ce04ac056212615b01ba68911d0085f2aa
 DIST gtk-vnc-0.4.3.tar.bz2 446486 RMD160 f7cc379b43088b83628dc92fb10ece463b1ab8fc SHA1 4e43d8fd68e5809b0769e26f7a7ac94d45315864 SHA256 b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377
 DIST gtk-vnc-0.4.4.tar.xz 377304 RMD160 f7d24d19969c2c236731749f2339252ebb7d70f1 SHA1 9b8f9bf12f31af9808b5bbf1176ac913003015ba SHA256 c93fdb53c78b52a1cfa067c1a0be0b93d4adfc17ccea1215f20eeab2818308b7
 DIST gtk-vnc-0.5.0.tar.xz 386068 RMD160 6e0c7140659b81f2e349b291ed211f9561e9cd4e SHA1 2463339452a8a0ddf79d77d062979e683bfb5226 SHA256 1de65d8ffa8c25a61a8e8c4b7e5963d4a826f4fcf7120d66ed027f5f70cc8f81
 EBUILD gtk-vnc-0.4.3-r1.ebuild 3315 RMD160 5718c5303f0f331186df11c404915dd60a7bddb0 SHA1 59cc9369eec78e6e4f134fd870f484d47d2493c6 SHA256 25362db3589748133453742df0ffccc7a658f97d321b9816027cf9157dadcf1c
 EBUILD gtk-vnc-0.4.4.ebuild 3681 RMD160 4ccee77a23a512a8a91411ca9da6213f18a808b8 SHA1 741395b9a6492ce3ac63c64aed587c3b75718083 SHA256 dd7f3a4acd1cdc2bc853f1e1de26512c732509167333ec22022d0e969fca131e
-EBUILD gtk-vnc-0.5.0.ebuild 4198 RMD160 e7773aac1dc270eb8ad0d8cb8c0e219edd7dc565 SHA1 dc44077b1576f8f8f08ff33426ff0ec2a8daba2a SHA256 16d2de9afaa3f628efe350d86fec5d9ea7cdf732187ff7ab0cf5f9288aafc506
-MISC ChangeLog 12372 RMD160 e85d131c9f04adf7eea405c4f3d8ffc399819f45 SHA1 8140fc625daf96fe6581aec138b562045589286b SHA256 3c6fd478fe16f69d654be8c75bb514e58dfcdd6f65d6be7790eb768751ba2392
+EBUILD gtk-vnc-0.5.0.ebuild 4491 RMD160 33834b4b275ed439af3fd84387fa53dc86933b62 SHA1 a42723ea418863d62049b1179cddef3bd771246d SHA256 2c58e8fab34f8d2f73ae27e5df286529fe7cdabe66f1aa317c1f4366fc713963
+MISC ChangeLog 12549 RMD160 9c2562941c143fc4a65b948d6b320ced5944796e SHA1 31e29583a83f8fd6bef424690fb519a53fbc1a8b SHA256 4db194a971a36025c098e0e603d68fc3d62e774e562ce483351d4ebb590a2442
 MISC metadata.xml 422 RMD160 cb601006c1db8b5d55b62e8716a7d6f202a8383a SHA1 9cb78db02346b72dce5f3448ceecd3d04cc40413 SHA256 207a74cd4c91430061e1c1104813b2563eddf87f08e4ea0d559248bbd4b6b9a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9vUVUACgkQuQc30/atMkCxlACdHDQ9CYPR6pggohxN6Ak5P8EY
-oFQAnRhadNTQoHfvtqnK1ASmORyeqbwF
-=B1fA
+iF4EAREIAAYFAk9+oo8ACgkQdjK8w9WeBnAh2AD/YKKWIpOhYTslE3W6yZ05SlJ8
+4GaDRHa6VGkR3lOye9IA/1fWzVIZZSYhKN0tjUgvENBkpb21R76Aw08LTAvr0sK8
+=eN45
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-0.5.0-pulseaudio-automagic.patch b/net-libs/gtk-vnc/files/gtk-vnc-0.5.0-pulseaudio-automagic.patch
new file mode 100644
index 000000000000..215096ece33a
--- /dev/null
+++ b/net-libs/gtk-vnc/files/gtk-vnc-0.5.0-pulseaudio-automagic.patch
@@ -0,0 +1,55 @@
+From 2262cd59322d8351be5fcb67bf4229cca35c8764 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 6 Apr 2012 03:33:41 -0400
+Subject: [PATCH] configure: make pulseaudio detection non-automagic
+
+This is to allow building gtk-vnc on a system with pulseaudio and then
+deploying on a system without pulseaudio.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=673570
+---
+ configure.ac |   21 +++++++++++++++++----
+ 1 files changed, 17 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8eebe41..df213d5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -216,11 +216,23 @@ AC_SUBST(VIEW_CFLAGS)
+ AC_SUBST(VIEW_LIBS)
+ 
+ 
+-PKG_CHECK_MODULES(PULSEAUDIO, libpulse-simple, WANT_PULSEAUDIO="yes", AC_MSG_NOTICE([Not building against libpulse]))
+-if test "x$WANT_PULSEAUDIO" = xyes; then
+-    AC_DEFINE_UNQUOTED([HAVE_PULSEAUDIO], 1,[Define if we have and want pulseaudio.])
++AC_ARG_WITH(pulseaudio,
++  [AS_HELP_STRING([--with-pulseaudio],
++    [use PulseAudio for audio playback @<:@default=check@:>@])],
++  [],
++  [with_pulseaudio=check])
++
++HAVE_PULSEAUDIO=no
++if test "x$with_pulseaudio" != "xno"; then
++  PULSEAUDIO_MODULES=libpulse-simple
++  if test "x$with_pulseaudio" == "xyes"; then
++    PKG_CHECK_MODULES(PULSEAUDIO, $PULSEAUDIO_MODULES, [HAVE_PULSEAUDIO=yes])
++  else
++    PKG_CHECK_MODULES(PULSEAUDIO, $PULSEAUDIO_MODULES, [HAVE_PULSEAUDIO=yes],
++      [AC_MSG_NOTICE([libpulse-simple not found, disabling PulseAudio support])])
++  fi
+ fi
+-AM_CONDITIONAL([HAVE_PULSEAUDIO], [test "x$WANT_PULSEAUDIO" = "xyes"])
++AM_CONDITIONAL([HAVE_PULSEAUDIO], [test "x$HAVE_PULSEAUDIO" = "xyes"])
+ AC_SUBST(PULSEAUDIO_CFLAGS)
+ AC_SUBST(PULSEAUDIO_LIBS)
+ 
+@@ -477,5 +489,6 @@ Configure summary:
+ 	Install example programs ...:  ${WITH_EXAMPLES}
+ 	Browser plugin .............:  ${enable_plugin}
+ 	SASL support................:  ${enable_sasl}
++	PulseAudio support..........:  ${HAVE_PULSEAUDIO}
+ 	GTK+ version................:  ${GTK_API_VERSION}
+ "
+-- 
+1.7.8.5
+
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild
index 884439d9d03a..8bdf3dc7410b 100644
--- a/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild
+++ b/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild,v 1.3 2012/02/17 04:50:11 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild,v 1.4 2012/04/06 08:00:09 tetromino Exp $
 
 EAPI="4"
 
 PYTHON_DEPEND="python? 2"
 
-inherit base eutils gnome.org python
+inherit autotools base eutils gnome.org python
 
 DESCRIPTION="VNC viewer widget for GTK"
 HOMEPAGE="http://live.gnome.org/gtk-vnc"
@@ -14,7 +14,7 @@ HOMEPAGE="http://live.gnome.org/gtk-vnc"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="examples gtk3 +introspection python sasl vala"
+IUSE="examples gtk3 +introspection pulseaudio python sasl vala"
 
 # libview is used in examples/gvncviewer -- no need
 # glib-2.30.1 needed to avoid linking failure due to .la files (bug #399129)
@@ -23,13 +23,13 @@ IUSE="examples gtk3 +introspection python sasl vala"
 COMMON_DEPEND=">=dev-libs/glib-2.30.1:2
 	>=dev-libs/libgcrypt-1.4.2
 	dev-libs/libgpg-error
-	media-sound/pulseaudio
 	>=net-libs/gnutls-1.4
 	>=x11-libs/cairo-1.2
 	>=x11-libs/gtk+-2.18:2
 	x11-libs/libX11
 	gtk3? ( >=x11-libs/gtk+-2.91.3:3 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.4 )
+	pulseaudio? ( media-sound/pulseaudio )
 	python? ( >=dev-python/pygtk-2:2 )
 	sasl? ( dev-libs/cyrus-sasl )"
 RDEPEND="${COMMON_DEPEND}"
@@ -38,10 +38,14 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext
 	>=dev-util/intltool-0.40
+
+	gnome-base/gnome-common
+
 	vala? (
 		dev-lang/vala:0.14[vapigen]
 		>=dev-libs/gobject-introspection-0.9.4 )
 "
+# eautoreconf requires gnome-common
 
 GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
 GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
@@ -59,6 +63,10 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=667943
 	epatch "${FILESDIR}/${PN}-0.5.0-pod.patch"
 
+	# bug #399111, https://bugzilla.gnome.org/show_bug.cgi?id=673570
+	# requires eautoreconf
+	epatch "${FILESDIR}/${PN}-0.5.0-pulseaudio-automagic.patch"
+
 	python_convert_shebangs -r 2 .
 	mkdir "${GTK2_BUILDDIR}" || die
 	mkdir "${GTK3_BUILDDIR}" || die
@@ -73,6 +81,8 @@ src_prepare() {
 	sed -e 's/codegendir pygtk-2.0/codegendir pygobject-2.0/g' \
 		-i src/Makefile.* || die
 
+	eautoreconf
+
 	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=667941
 	[[ -e GNUmakefile ]] || touch GNUmakefile
 }
@@ -82,6 +92,7 @@ src_configure() {
 	myconf="
 		$(use_with examples) \
 		$(use_enable introspection) \
+		$(use_with pulseaudio) \
 		$(use_with sasl) \
 		--with-coroutine=gthread \
 		--without-libview \