Revbump for optional pulseaudio since gtk-vnc may used in profiles where pulseaudio is not enabled by default.

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

4 files changed, 191 insertions, 21 deletions

diff --git a/net-libs/gtk-vnc/ChangeLog b/net-libs/gtk-vnc/ChangeLog
index 5158fc75d21b..a929037a9a80 100644
--- a/net-libs/gtk-vnc/ChangeLog
+++ b/net-libs/gtk-vnc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.84 2012/04/06 08:00:09 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/ChangeLog,v 1.85 2012/04/06 08:11:20 tetromino Exp $
+
+*gtk-vnc-0.5.0-r1 (06 Apr 2012)
+
+  06 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  gtk-vnc-0.5.0.ebuild, +gtk-vnc-0.5.0-r1.ebuild:
+  Revbump for optional pulseaudio since gtk-vnc may used in profiles where
+  pulseaudio is not enabled by default.
 
   06 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   gtk-vnc-0.5.0.ebuild, +files/gtk-vnc-0.5.0-pulseaudio-automagic.patch:
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index a80eb52791e3..2a47b3aa1209 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -8,13 +8,14 @@ DIST gtk-vnc-0.4.4.tar.xz 377304 RMD160 f7d24d19969c2c236731749f2339252ebb7d70f1
 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 4491 RMD160 33834b4b275ed439af3fd84387fa53dc86933b62 SHA1 a42723ea418863d62049b1179cddef3bd771246d SHA256 2c58e8fab34f8d2f73ae27e5df286529fe7cdabe66f1aa317c1f4366fc713963
-MISC ChangeLog 12549 RMD160 9c2562941c143fc4a65b948d6b320ced5944796e SHA1 31e29583a83f8fd6bef424690fb519a53fbc1a8b SHA256 4db194a971a36025c098e0e603d68fc3d62e774e562ce483351d4ebb590a2442
+EBUILD gtk-vnc-0.5.0-r1.ebuild 4494 RMD160 ffbd7d6895107b2543cadcbb523b9a8890d846bb SHA1 de6b83546c0e34b51e8103c09deeb40827ff7f59 SHA256 3d18963d91b6479c35769873ec28cc5bfc431aac5cc605f95fded524e8ffb449
+EBUILD gtk-vnc-0.5.0.ebuild 4198 RMD160 9a12c13d0c67564ee66977f6460fdd1886fa9a4a SHA1 b1fabd58e24d94161d2f7c21c219efb501efce6b SHA256 31bce64d8a638295ed3701c2d02de86b21f31fd21152709ef727670dc6cae5ef
+MISC ChangeLog 12807 RMD160 d869c3a882901bd0750631518180deb9e12bb5cb SHA1 8f5cb17e4970992bd7f79fa1cdea2f4b5493f7de SHA256 f11d8447e4ea4806ae45b5b0ff05d6c66e825ab5c361324edb190f5ce692aba5
 MISC metadata.xml 422 RMD160 cb601006c1db8b5d55b62e8716a7d6f202a8383a SHA1 9cb78db02346b72dce5f3448ceecd3d04cc40413 SHA256 207a74cd4c91430061e1c1104813b2563eddf87f08e4ea0d559248bbd4b6b9a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk9+oo8ACgkQdjK8w9WeBnAh2AD/YKKWIpOhYTslE3W6yZ05SlJ8
-4GaDRHa6VGkR3lOye9IA/1fWzVIZZSYhKN0tjUgvENBkpb21R76Aw08LTAvr0sK8
-=eN45
+iF4EAREIAAYFAk9+pS4ACgkQdjK8w9WeBnD5bwEAmqPS6iTyBDxEn7AJfZO4xfnE
+ZB3CfgaMEPM7HFtdf0oA/iyeHn12zOFEzVoI8tGJfAwnjNK5dU3uFv1b4CdVVUeH
+=Plpg
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.5.0-r1.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..6fcfac4b3f08
--- /dev/null
+++ b/net-libs/gtk-vnc/gtk-vnc-0.5.0-r1.ebuild
@@ -0,0 +1,173 @@
+# 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-r1.ebuild,v 1.1 2012/04/06 08:11:20 tetromino Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="python? 2"
+
+inherit autotools base eutils gnome.org python
+
+DESCRIPTION="VNC viewer widget for GTK"
+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 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)
+# TODO: review nsplugin when it will be considered less experimental
+# XXX: automagic pulseaudio. Is it worth patching?
+COMMON_DEPEND=">=dev-libs/glib-2.30.1:2
+	>=dev-libs/libgcrypt-1.4.2
+	dev-libs/libgpg-error
+	>=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}"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	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"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+
+	if use vala && ! use gtk3; then
+		ewarn "You must set USE=gtk3 to enable vala bindings support."
+	fi
+}
+
+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
+
+	# Remove a few files that were autogenerated during distcheck.
+	# Having these around in srcdir breaks out of tree build since they're
+	# expected to be in builddir, which is correct for trunk builds since
+	# they're generated files, not source files. Funny false dichotomy.
+	rm -vf "${S}"/src/{vncconnectionenums.[ch],vncdisplayenums.[ch]}
+
+	# Fix incorrect codegendir check: h2def.py is in pygobject, not pygtk
+	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
+}
+
+src_configure() {
+	local myconf
+	myconf="
+		$(use_with examples) \
+		$(use_enable introspection) \
+		$(use_with pulseaudio) \
+		$(use_with sasl) \
+		--with-coroutine=gthread \
+		--without-libview \
+		--disable-static \
+		--disable-vala"
+
+	cd ${GTK2_BUILDDIR}
+	einfo "Running configure in ${GTK2_BUILDDIR}"
+	ECONF_SOURCE="${S}" econf ${myconf} \
+		$(use_with python) \
+		--with-gtk=2.0
+
+	if use gtk3; then
+		if use vala; then
+			myconf="${myconf} \
+				--enable-introspection \
+				--enable-vala \
+				VAPIGEN=$(type -p vapigen-0.14)"
+		fi
+
+		cd ${GTK3_BUILDDIR}
+		einfo "Running configure in ${GTK3_BUILDDIR}"
+		# Python support is via gobject-introspection
+		# Ex: from gi.repository import GtkVnc
+		ECONF_SOURCE="${S}" econf ${myconf} \
+			--with-python=no \
+			--with-gtk=3.0
+	fi
+}
+
+src_compile() {
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make in ${GTK2_BUILDDIR}"
+	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=667941
+	rm GNUmakefile
+	emake
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make in ${GTK3_BUILDDIR}"
+		# Work around https://bugzilla.gnome.org/show_bug.cgi?id=667941
+		rm GNUmakefile
+		emake
+	fi
+}
+
+src_test() {
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make check in ${GTK2_BUILDDIR}"
+	emake check
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make check in ${GTK3_BUILDDIR}"
+		emake check
+	fi
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog NEWS README
+
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make install in ${GTK2_BUILDDIR}"
+	# bug #328273
+	MAKEOPTS="${MAKEOPTS} -j1" base_src_install
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make install in ${GTK3_BUILDDIR}"
+		# bug #328273
+		MAKEOPTS="${MAKEOPTS} -j1" base_src_install
+	fi
+
+	python_clean_installation_image
+
+	# Remove .la files
+	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
+}
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 8bdf3dc7410b..0e7ea47f5372 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.4 2012/04/06 08:00:09 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild,v 1.5 2012/04/06 08:11:20 tetromino Exp $
 
 EAPI="4"
 
 PYTHON_DEPEND="python? 2"
 
-inherit autotools base eutils gnome.org python
+inherit 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 pulseaudio python sasl vala"
+IUSE="examples gtk3 +introspection 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 pulseaudio 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,14 +38,10 @@ 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"
@@ -63,10 +59,6 @@ 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
@@ -81,8 +73,6 @@ 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
 }
@@ -92,7 +82,6 @@ src_configure() {
 	myconf="
 		$(use_with examples) \
 		$(use_enable introspection) \
-		$(use_with pulseaudio) \
 		$(use_with sasl) \
 		--with-coroutine=gthread \
 		--without-libview \