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

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 292 insertions, 1 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/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
+}