net-libs/gtk-vnc: provide both gtk2 and gtk3

4 files changed, 151 insertions, 72 deletions

diff --git a/net-libs/gtk-vnc/Manifest b/net-libs/gtk-vnc/Manifest
index 7ed72d34..28551e47 100644
--- a/net-libs/gtk-vnc/Manifest
+++ b/net-libs/gtk-vnc/Manifest
@@ -1,22 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX gtk-vnc-0.4.3-outoftree-build.patch 909 RMD160 3bd53af3b89100ca1ff0401d00b6b20d1ac1313e SHA1 72a570bddc7fb4fd1f38a772bc8d4ca3b76a6e88 SHA256 552477557b7aa737a44bbbcf4232fb9cc41009a003cd1c1f9e64b2ce158cb79f
 DIST gtk-vnc-0.4.3.tar.bz2 446486 RMD160 f7cc379b43088b83628dc92fb10ece463b1ab8fc SHA1 4e43d8fd68e5809b0769e26f7a7ac94d45315864 SHA256 b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377
-EBUILD gtk-vnc-0.4.3-r300.ebuild 1468 RMD160 c3071dfb07cd3f36ba654b2057ef4932286bf440 SHA1 f38648725009927d561fdd1c1d15493084b59ee0 SHA256 fefc51f1008806c38685c3a0233507a338d3db16615cb6b9c84fc6914604e50a
+EBUILD gtk-vnc-0.4.3-r301.ebuild 2911 RMD160 2e9d0136fd38d55f1bf0ae6c7183169a3537da1f SHA1 959a4ac25ccd1f1400358f69a85739e8669f309b SHA256 3ab8339f383a8a41db8e34a94adc4bd06294438bf4f1e8f801328bfb335b792a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNjXTyAAoJELHSF2kinlg4a60P/2ssQsCPmCiquhAbX/0qq8w/
-/C5kxNfhf+JLscs0tlr2WvzFt2PTe9RT83zKb1W8GxtN0G6bTNbZE0YHgIjYzCsI
-+71w+Maea67GdGCOM8YE3blieebDReHj93ODWB1MP52a/h7emxPKZ7HwGad4m/JH
-HVv48Dq0zDv6IOguSTjVZI4E7epP167eTkk8uYwAY6Z+L4HCy4EW1oQfiNof1UYY
-AH0FrkPPSh1TUHs+D1iDbU4XTm3qtwYznxXDVuVfa7KwMRxthWO+/RbV4M0ckw6u
-s9FfowxKkgTiiWUSPk9QXlQ/XF+7i36LELxbb0aTOIDvhEudoRlHdoN8vVd1nF+k
-smkvdLNPQhVrIBbfsEHu66HiVwcouoNuBKT1WcBZm0/4FsielWx5reE/cdIysafW
-x7Jk+LssKRxoXqU+j89I+4lkJTzqnKgClwyTFOVU9ifkGLqN7MEu7h8bxswox5m8
-KCJsYE/ghqSpd//yRpYc8P6SX0HbO2/Zokn62kdNZB3uSLy3AdZ/abfiJzdtsq2v
-GlDpzxSAPBJKqgtJOCBizbeOWSGbohN02iJhebeh+alZFVhs6AXP4kDPELcn3HPi
-ZYRtNVtpOEXQomtC2h1Lv014HfAlKboJsKf05lI/Og1WRDNBaKHWtKt7KkAzy60V
-H9iQza28XrRDhdbB6sal
-=MzTp
+iEYEARECAAYFAk2pphMACgkQ1fmVwcYIWAYLTACeKOFQ/8gQhDlZoixAUc7q9Hju
+htAAnjI6DK15f3OtDOrdAz/IrBtQjCKU
+=AyiH
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gtk-vnc/files/gtk-vnc-0.4.3-outoftree-build.patch b/net-libs/gtk-vnc/files/gtk-vnc-0.4.3-outoftree-build.patch
new file mode 100644
index 00000000..36a3a3a9
--- /dev/null
+++ b/net-libs/gtk-vnc/files/gtk-vnc-0.4.3-outoftree-build.patch
@@ -0,0 +1,21 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 37f8444..2f72fa6 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -279,14 +279,14 @@ GVNC_INTROSPECTION_SRCS = \
+ 			$(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \
+ 			$(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \
+ 			$(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \
+-			$(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \
++			$(srcdir)/vncconnectionenums.h $(srcdir)/vncconnectionenums.c \
+ 			$(srcdir)/vncutil.h $(srcdir)/vncutil.c
+ 
+ GTK_VNC_INTROSPECTION_SRCS = \
+ 			$(srcdir)/vnccairoframebuffer.h $(srcdir)/vnccairoframebuffer.c \
+ 			$(srcdir)/vncdisplay.h $(srcdir)/vncdisplay.c \
+ 			$(srcdir)/vncgrabsequence.h $(srcdir)/vncgrabsequence.c \
+-			$(builddir)/vncdisplayenums.h $(builddir)/vncdisplayenums.c
++			$(srcdir)/vncdisplayenums.h $(srcdir)/vncdisplayenums.c
+ 
+ if HAVE_GTK_2
+ GTK_VNC_INTROSPECTION_SRCS += \
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.4.3-r300.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.4.3-r300.ebuild
deleted file mode 100644
index f1b0071a..00000000
--- a/net-libs/gtk-vnc/gtk-vnc-0.4.3-r300.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2011 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.4.2-r2.ebuild,v 1.1 2011/01/14 23:03:42 cardoe Exp $
-
-EAPI="2"
-
-inherit base gnome.org
-
-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 +introspection sasl"
-
-# libview is used in examples/gvncviewer -- no need
-# TODO: review nsplugin when it will be considered less experimental
-
-COMMON_DEPEND=">=dev-libs/glib-2.10:2
-	>=net-libs/gnutls-1.4
-	>=x11-libs/cairo-1.2
-	>=x11-libs/gtk+-2.91.3:3
-	x11-libs/libX11
-	introspection? ( >=dev-libs/gobject-introspection-0.9.4 )
-	sasl? ( dev-libs/cyrus-sasl )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5
-	dev-util/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.40"
-RDEPEND="${COMMON_DEPEND}
-	!net-libs/gtk-vnc:3"
-
-src_configure() {
-	# Python support is via gobject-introspection
-	# Ex: from gi.repository import GtkVnc
-	econf \
-		$(use_with examples) \
-		$(use_enable introspection) \
-		$(use_with sasl) \
-		--with-python=no \
-		--with-coroutine=gthread \
-		--without-libview \
-		--with-gtk=3.0 \
-		--disable-static
-}
-
-src_install() {
-	# bug #328273
-	MAKEOPTS="${MAKEOPTS} -j1" \
-		base_src_install
-	dodoc AUTHORS ChangeLog NEWS README || die
-
-	# Remove .la files
-	find "${D}" -name '*.la' -exec rm -f '{}' + || die
-}
diff --git a/net-libs/gtk-vnc/gtk-vnc-0.4.3-r301.ebuild b/net-libs/gtk-vnc/gtk-vnc-0.4.3-r301.ebuild
new file mode 100644
index 00000000..1f148b76
--- /dev/null
+++ b/net-libs/gtk-vnc/gtk-vnc-0.4.3-r301.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2011 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.4.2-r2.ebuild,v 1.1 2011/01/14 23:03:42 cardoe Exp $
+
+EAPI="3"
+
+inherit autotools eutils base 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"
+
+# libview is used in examples/gvncviewer -- no need
+# TODO: review nsplugin when it will be considered less experimental
+
+COMMON_DEPEND=">=dev-libs/glib-2.10:2
+	>=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 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	dev-util/pkgconfig
+	sys-devel/gettext
+	>=dev-util/intltool-0.40"
+
+GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
+GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+	mkdir "${GTK2_BUILDDIR}" || die
+	mkdir "${GTK3_BUILDDIR}" || die
+
+	# Fix incorrect rules for out of tree build
+	epatch "${FILESDIR}/${PN}-0.4.3-outoftree-build.patch"
+
+	intltoolize --force --copy --automake || die
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	myconf="
+		$(use_with examples) \
+		$(use_enable introspection) \
+		$(use_with sasl) \
+		--with-coroutine=gthread \
+		--without-libview \
+		--disable-static"
+
+	cd ${GTK2_BUILDDIR}
+	einfo "Running configure in ${GTK2_BUILDDIR}"
+	ECONF_SOURCE="${S}" econf ${myconf} \
+		$(use_enable python) \
+		--with-gtk=2.0
+
+	if use gtk3; then
+		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}"
+	emake || die
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make in ${GTK3_BUILDDIR}"
+		emake || die
+	fi
+}
+
+src_test() {
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make check in ${GTK2_BUILDDIR}"
+	emake check || die
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make check in ${GTK3_BUILDDIR}"
+		emake check || die
+	fi
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog NEWS README || die
+
+	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
+}