Version bump, now supports the vnc audio extension (using pulseaudio).

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

4 files changed, 301 insertions, 7 deletions

diff --git a/net-libs/gtk-vnc/ChangeLog b/net-libs/gtk-vnc/ChangeLog
index 0ccbb50c3ffa..ede478208489 100644
--- a/net-libs/gtk-vnc/ChangeLog
+++ b/net-libs/gtk-vnc/ChangeLog
@@ -1,6 +1,12 @@
 # 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.77 2012/01/14 17:38:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gtk-vnc/ChangeLog,v 1.78 2012/01/15 05:04:57 tetromino Exp $
+
+*gtk-vnc-0.5.0 (15 Jan 2012)
+
+  15 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gtk-vnc-0.5.0.ebuild, +files/gtk-vnc-0.5.0-pod.patch:
+  Version bump, now supports the vnc audio extension (using pulseaudio).
 
   14 Jan 2012; Markus Meier <maekke@gentoo.org> gtk-vnc-0.4.4.ebuild:
   x86 stable, bug #393007
diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 59ae73aee11e..59dec7328461 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX gtk-vnc-0.5.0-pod.patch 3441 RMD160 062d0b6ca34e38bb1aaa4754d7bcc1dd00f1f132 SHA1 dc731670865d8f167ab0e205ead99abc9ed3d228 SHA256 921b8347907bee39caff14c80c3b576618fe7ac2a7d679500769f797cab8fb66
 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 3263 RMD160 8353c3cc7dc33ebc7209df283f4920ed910e68c8 SHA1 7c92be5a3ffbda5b4e924f7e0ee97f25d63c40d1 SHA256 c16b089764f79922cdde23c4137e227e742d268f2b0ceaba0164c8212f5fcaf3
 EBUILD gtk-vnc-0.4.4.ebuild 3634 RMD160 ce745486f2aa923b70883508d1e0e103ab242a94 SHA1 f7434d129cab2676599b5342be55265ed1324df3 SHA256 c13a8aa601bd6c22a9102bcdae8372f7f8f58de6f264ae5c05ba6c48c634cf43
-MISC ChangeLog 11301 RMD160 e683d666ae2d32ec1049a6031f2dd63d4b4ee977 SHA1 28fa4d00329ff597640b9d69fa26d514f515dc04 SHA256 b4d3d1a369e6d7900a3e47fcd61e00d778fcdbb6a65f1e258818d554d839bcc5
+EBUILD gtk-vnc-0.5.0.ebuild 4111 RMD160 ab6ddf6e4f221144b8e93e2e13dc3bee6fb70c25 SHA1 5c31554389409ae553dd573a0bf8639e2d139f00 SHA256 a7d42bcb2410803dee6be558022ddb404bee843ae7d5a22982ae77c563bf1023
+MISC ChangeLog 11524 RMD160 c8372fe61c1645fd725c83e8f5d9e4ba9fa156a3 SHA1 c119525a9751b7484832b8dff84689facd5eaaf2 SHA256 9899c9e1fa58714e296337a7a4930f78444dda650ed1ec7eef53ddd63faa1eb9
 MISC metadata.xml 422 RMD160 cb601006c1db8b5d55b62e8716a7d6f202a8383a SHA1 9cb78db02346b72dce5f3448ceecd3d04cc40413 SHA256 207a74cd4c91430061e1c1104813b2563eddf87f08e4ea0d559248bbd4b6b9a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8RvgQACgkQkKaRLQcq0GIf1gCgn2t+qKvYI9QP9OlOJleVTRSA
-SZsAn3YW/2PNIAd1ve29lV0cZX0mgRlg
-=czFp
+iF4EAREIAAYFAk8SXn4ACgkQdjK8w9WeBnAgUwD7B37A0gCUKlmq5b6GoMXMW6KZ
+pFQY/LrwOIWAkQGTYDYA/iyFBb588+FqMiLA16CDOSGxGOyIoaG0StcRkdmgpASz
+=FCV/
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-0.5.0-pod.patch b/net-libs/gtk-vnc/files/gtk-vnc-0.5.0-pod.patch
new file mode 100644
index 000000000000..ff74522ba07f
--- /dev/null
+++ b/net-libs/gtk-vnc/files/gtk-vnc-0.5.0-pod.patch
@@ -0,0 +1,124 @@
+From 06d234dcf80ee5aafc9ae4f6fae71409aac2e33c Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 14 Jan 2012 23:33:24 -0500
+Subject: [PATCH] tools/gvnccapture: unbreak pod syntax
+
+For pod, the presence or absence of leading whitespace is significant.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=667943
+---
+ tools/gvnccapture.c |   72 +++++++++++++++++++++++++-------------------------
+ 1 files changed, 36 insertions(+), 36 deletions(-)
+
+diff --git a/tools/gvnccapture.c b/tools/gvnccapture.c
+index a44f012..c3fbd46 100644
+--- a/tools/gvnccapture.c
++++ b/tools/gvnccapture.c
+@@ -19,68 +19,68 @@
+  */
+ 
+ /*
+-  =head1 NAME
++=head1 NAME
+ 
+-  gvnccapture - VNC screenshot capture
++gvnccapture - VNC screenshot capture
+ 
+-  =head1 SYNOPSIS
++=head1 SYNOPSIS
+ 
+-  gvnccapture [OPTION]... [HOST][:DISPLAY] FILENAME
++gvnccapture [OPTION]... [HOST][:DISPLAY] FILENAME
+ 
+-  =head1 DESCRIPTION
++=head1 DESCRIPTION
+ 
+-  Capture a screenshot of the VNC desktop at HOST:DISPLAY saving to the
+-  image file FILENAME. If HOST is omitted it defaults to "localhost",
+-  if :DISPLAY is omitted, it defaults to ":1". FILENAME must end in a
+-  known image format extension (eg ".png", ".jpeg"). Supported options
+-  are
++Capture a screenshot of the VNC desktop at HOST:DISPLAY saving to the
++image file FILENAME. If HOST is omitted it defaults to "localhost",
++if :DISPLAY is omitted, it defaults to ":1". FILENAME must end in a
++known image format extension (eg ".png", ".jpeg"). Supported options
++are
+ 
+-  =over 4
++=over 4
+ 
+-  =item --help, -?
++=item --help, -?
+ 
+-  Display command line help information
++Display command line help information
+ 
+-  =item --quiet, -q
++=item --quiet, -q
+ 
+-  Do not display information on the console when capturing the screenshot,
+-  with the exception of any password prompt.
++Do not display information on the console when capturing the screenshot,
++with the exception of any password prompt.
+ 
+-  =item --debug, -d
++=item --debug, -d
+ 
+-  Display verbose debugging information on the console
++Display verbose debugging information on the console
+ 
+-  =back
++=back
+ 
+-  =head1 EXIT STATUS
++=head1 EXIT STATUS
+ 
+-  The exit status is 0 upon successful screen capture, otherwise
+-  it is a non-zero integer
++The exit status is 0 upon successful screen capture, otherwise
++it is a non-zero integer
+ 
+-  =head1 EXAMPLES
++=head1 EXAMPLES
+ 
+-  # gvnccapture localhost:1 desktop.png
+-  Password:
+-  Connected to localhost:1
+-  Saved display to desktop.png
++ # gvnccapture localhost:1 desktop.png
++ Password:
++ Connected to localhost:1
++ Saved display to desktop.png
+ 
+-  =head1 AUTHORS
++=head1 AUTHORS
+ 
+-  Daniel P. Berrange <dan@berrange.com>
++Daniel P. Berrange <dan@berrange.com>
+ 
+-  =head1 COPYRIGHT
++=head1 COPYRIGHT
+ 
+-  Copyright (C) 2010 Daniel P. Berrange <dan@berrange.com>.
++Copyright (C) 2010 Daniel P. Berrange <dan@berrange.com>.
+ 
+-  License LGPLv2+: GNU Lesser GPL version 2 or later <http://gnu.org/licenses/gpl.html>.
++License LGPLv2+: GNU Lesser GPL version 2 or later <http://gnu.org/licenses/gpl.html>.
+ 
+-  This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law.
++This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law.
+ 
+-  =head1 SEE ALSO
++=head1 SEE ALSO
+ 
+-  vinagre(1)
++vinagre(1)
+ 
+-  =cut
++=cut
+ */
+ 
+ #include <config.h>
+-- 
+1.7.8.3
+
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild
new file mode 100644
index 000000000000..1d4b83c5b8e7
--- /dev/null
+++ b/net-libs/gtk-vnc/gtk-vnc-0.5.0.ebuild
@@ -0,0 +1,161 @@
+# 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.1 2012/01/15 05:04:57 tetromino Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="python? 2"
+
+inherit 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 python sasl vala"
+
+# libview is used in examples/gvncviewer -- no need
+# TODO: review nsplugin when it will be considered less experimental
+# XXX: automagic pulseaudio. Is it worth patching?
+COMMON_DEPEND=">=dev-libs/glib-2.10:2
+	dev-libs/libgcrypt
+	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 )
+	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
+	vala? (
+		dev-lang/vala:0.14[vapigen]
+		>=dev-libs/gobject-introspection-0.9.4 )
+"
+
+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"
+
+	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
+
+	# 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 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
+}