Support USE=nsplugin and USE=gtk3 at the same time by doing two builds.

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

3 files changed, 115 insertions, 2 deletions

diff --git a/app-emulation/virt-viewer/ChangeLog b/app-emulation/virt-viewer/ChangeLog
index a665f5e71a61..f178ccdae42e 100644
--- a/app-emulation/virt-viewer/ChangeLog
+++ b/app-emulation/virt-viewer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/virt-viewer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v 1.20 2012/09/21 18:02:15 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/ChangeLog,v 1.21 2012/12/04 23:10:18 cardoe Exp $
+
+*virt-viewer-0.5.4-r1 (04 Dec 2012)
+
+  04 Dec 2012; Doug Goldstein <cardoe@gentoo.org> +virt-viewer-0.5.4-r1.ebuild:
+  Support USE=nsplugin and USE=gtk3 at the same time by doing two builds.
 
   21 Sep 2012; Doug Goldstein <cardoe@gentoo.org> virt-viewer-0.5.4.ebuild:
   Fix spice-gtk depend. bug #435678
diff --git a/app-emulation/virt-viewer/Manifest b/app-emulation/virt-viewer/Manifest
index e670ab07ea45..cc9e7d13d8a5 100644
--- a/app-emulation/virt-viewer/Manifest
+++ b/app-emulation/virt-viewer/Manifest
@@ -6,6 +6,7 @@ DIST virt-viewer-0.5.4.tar.gz 619744 SHA256 8e8ca29ac9f0ef8dc49e28fa465814e13c67
 EBUILD virt-viewer-0.4.2.ebuild 1036 SHA256 033b9ed5eb9a724836a928f39c4333e520223edd6b534b4097b4d86fbcecb5b5 SHA512 8a48e62352f8f8dcfc73d76f3462a65a256b9fb7a913f3b52f8bfd563cff112df35e8a65117a8ec3748b0fba00d3d340b650700169a4587d09a148a2bb63b35e WHIRLPOOL 43c5f496c44c69024ad20de045a0f56b5789ae1270d126bbd31b023e52633c770186a74719c83911cc7d3d718ef0a27063abc1ddec1d51403cbc103a6c76aa79
 EBUILD virt-viewer-0.5.2.ebuild 1554 SHA256 9c2c4f4d1d537249b15beac8d4ad89cbcd1a49d32e0561b5af7f5925602fcb2e SHA512 962dde5226e3b85107a9e8fab47ca8d24cb2f5049895cebde33f85c976ac2cdb988e2a9c14ada659a35e27d8edabe8c73b94b0bf4423c08e1f97c876b3f1df17 WHIRLPOOL 95b47604721542ca7ffd2e2c71f2fc6da97975b8462c2280be53108691b55e8e14245945308d4b9b47a658de15c60d9066556e32c1f0a12fb2dd780c35dfdeb4
 EBUILD virt-viewer-0.5.3.ebuild 1556 SHA256 f598fee4a48e86e7864552fdc3537833ac7c351449f0245b46706ba41d126fec SHA512 8ed5387f4915a6e3c9e24d1a82ee9efd4a31774f64045f38b9f4baf8b46b4a7aa0f06632b9a5fe49cb70f403d9a77efe96c9723722eb9496cc2dd804ed9497d9 WHIRLPOOL 6ce849a4e41e2d062e84d874ce30a5ea91a26841622222e51bf8a827e873d2d42bd36af7e6b154ebd6dafbeeee53a796e823e94ce3d58977064e10dfe524ab90
+EBUILD virt-viewer-0.5.4-r1.ebuild 2540 SHA256 3234ee4d7e99606a7f2763dea2685254a95fc6137b2ccb44194ea846b6bcb80b SHA512 ca941375ed77d9e45e92f08b5485df23b3b9db437b49cbe8d3f11bbbab77ff55978b77f66d4496920d79cee47c25fdb7af735c6a51ec2e2fa31e421c818db434 WHIRLPOOL 7bcb0c7deb228581980438411ed420d3eb3da428ace14e6116d538f8c342c2b9af185e963dff982f637df88a597cd191ed8afee00c8f2e545c2e772532fa3860
 EBUILD virt-viewer-0.5.4.ebuild 1586 SHA256 7618fbf94dcda82b96d5edb14ae79e4e0b834fed6607c1913ff0ec03344b7e98 SHA512 bcea0b84634a436465926a59b3890c9cd373deb12de2ffb19080196373c42f6d3e992a4f0f7eb83799b02e1cb2170f91147efcb4ea69b06f23987b9e612ce878 WHIRLPOOL 7f9eea7e38d4841b587dde6d78b2422bae4b09ef8cb7c9c7a6e1b86a2595e600bdec37a245b03a98331103c24f8836558bf7ef13b619368a3f40d6399de11eb5
-MISC ChangeLog 3549 SHA256 56bdd6634f6d36b407a906a09bfd0dcd52a1c7661a45aae8bcd16f136068f022 SHA512 e125a1cf009dc4e14971aea8aaf90f59ce23af1564049a5e69721966c52ef79536de99c7b655d191a86d8a8a5d60ca0f0709129b350460e9234d18c8441e313d WHIRLPOOL 2255ff4a47381e8bf1df3ea4063eaca8f7b7c6e87bd6f5589771752e8106425eb6e282aae6cda927900c8335a3e811e1534ddc85c3189e8f41304d1e3b6647e5
+MISC ChangeLog 3741 SHA256 cc793577c128cd40841bb1a7a87cb6dbed0b111147ebe8807f59240e5ab897b5 SHA512 f03b29769171790e12a5d5d70be6cb182883a8c3a14badfdb3f5bd13d8ce15c43943ca31df13df7f51a51cededad35883cefc1ece74940e9919e0afda7743319 WHIRLPOOL 5a5d863f40f09bab3ebcdf5e208c66a263bb8052ed850d70576fedd89eda4738b56f1e17729ca383e2217657bedbfbb3a361ce2b989d7d8c90db671f2d530e70
 MISC metadata.xml 458 SHA256 8ed1c7a57660494a298c83bfd496954a3676b992317363e2cb5f2a4aec0b9345 SHA512 9595b18eef531a044e6a625a30862985c85bb60aced02975ff6284281ad75f89c7c348fb9ceb4299d0d14eeb038fac7cba792607101e529e54504157368d5c3a WHIRLPOOL 6a1abff5a7a553438a8b5422e7a257ec55a76e3fe90d8bcedf68a2c3f12af8c805ed3fbd2637fcdcf1d9159f0f6aa910cfaaf95c946dcdb71ea93caf2f87b46f
diff --git a/app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild b/app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild
new file mode 100644
index 000000000000..a04535fdc9b6
--- /dev/null
+++ b/app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.4-r1.ebuild,v 1.1 2012/12/04 23:10:18 cardoe Exp $
+
+EAPI=5
+inherit eutils gnome2 toolchain-funcs
+
+DESCRIPTION="Graphical console client for connecting to virtual machines"
+HOMEPAGE="http://virt-manager.org/"
+SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk3 nsplugin sasl +spice +vnc"
+
+RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
+	>=dev-libs/libxml2-2.6
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( >=x11-libs/gtk+-2.18:2 )
+	nsplugin? (
+		>=dev-libs/nspr-4
+		>=x11-libs/gtk+-2.18:2
+		)
+	spice? ( >=net-misc/spice-gtk-0.12.101[sasl?,gtk3=] )
+	vnc? ( >=net-libs/gtk-vnc-0.5.0[sasl?,gtk3=] )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	nsplugin? ( =net-misc/npapi-sdk-0.27 )
+	spice? ( >=app-emulation/spice-protocol-0.10.1 )"
+
+REQUIRED_USE="|| ( spice vnc )"
+
+GTK2_BUILDDIR="${WORKDIR}/${P}_nsplugin"
+GTK3_BUILDDIR="${WORKDIR}/${P}_gtk"
+
+pkg_setup() {
+	G2CONF="$(use_with vnc gtk-vnc) $(use_with spice spice-gtk)"
+
+	GTK2_G2CONF="${G2CONF} $(use_enable nsplugin plugin)"
+	GTK2_G2CONF="${G2CONF} --with-gtk=2.0"
+
+	GTK3_G2CONF="${G2CONF} --with-gtk=3.0"
+}
+
+src_prepare() {
+	mkdir ${GTK2_BUILDDIR} || die
+	mkdir ${GTK3_BUILDDIR} || die
+
+	epatch "${FILESDIR}"/${PN}-0.5.x-npapi-sdk.patch
+}
+
+src_configure() {
+	if use nsplugin; then
+		export MOZILLA_PLUGIN_CFLAGS="$($(tc-getPKG_CONFIG) --cflags npapi-sdk nspr)"
+		export MOZILLA_PLUGIN_LIBS="$($(tc-getPKG_CONFIG) --libs npapi-sdk nspr)"
+	fi
+
+	export ECONF_SOURCE="${S}"
+
+	cd ${GTK2_BUILDDIR}
+	echo "Running configure in ${GTK2_BUILDDIR}"
+	G2CONF="${GTK2_G2CONF}" gnome2_src_configure
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		echo "Running configure in ${GTK3_BUILDDIR}"
+		G2CONF="${GTK3_G2CONF}" gnome2_src_configure
+	fi
+}
+
+src_compile() {
+	cd ${GTK2_BUILDDIR}
+	echo "Running make in ${GTK2_BUILDDIR}"
+	default
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		echo "Running make in ${GTK3_BUILDDIR}"
+		default
+	fi
+}
+
+src_test() {
+	cd ${GTK2_BUILDDIR}
+	echo "Running make check in ${GTK2_BUILDDIR}"
+	default
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		echo "Running make check in ${GTK3_BUILDDIR}"
+		default
+	fi
+}
+
+src_install() {
+	cd ${GTK2_BUILDDIR}
+	echo "Running make install in ${GTK2_BUILDDIR}"
+	default
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		echo "Running make install in ${GTK3_BUILDDIR}"
+		default
+	fi
+}