Support gtk2 and gtk3 builds in the same ebuild. gtk2 is always on and gtk3 is optional.

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

3 files changed, 184 insertions, 2 deletions

diff --git a/net-misc/spice-gtk/ChangeLog b/net-misc/spice-gtk/ChangeLog
index 3c5bafa3b360..a1999a1ac66f 100644
--- a/net-misc/spice-gtk/ChangeLog
+++ b/net-misc/spice-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/spice-gtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.33 2012/12/04 20:26:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.34 2012/12/04 20:41:36 cardoe Exp $
+
+*spice-gtk-0.14-r1 (04 Dec 2012)
+
+  04 Dec 2012; Doug Goldstein <cardoe@gentoo.org> +spice-gtk-0.14-r1.ebuild:
+  Support gtk2 and gtk3 builds in the same ebuild. gtk2 is always on and gtk3
+  is optional.
 
   04 Dec 2012; Doug Goldstein <cardoe@gentoo.org> -spice-gtk-0.8.ebuild,
   -spice-gtk-0.11.ebuild, -spice-gtk-0.12.ebuild, -spice-gtk-0.13.ebuild:
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 1a554f97bbcd..9c63e6d6353a 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -4,7 +4,8 @@ AUX spice.protocol 159 SHA256 9a13ea202d5b26cbb45874c56df95d30c15a9372e551404267
 AUX spice.schemas 1305 SHA256 aa21d09f57e539a9206d88051f2b4d1a15e9eb3e8ea2d104bdcdcb677801ea14 SHA512 bf894c8970c92353df0849e532ac46f7e04a3344090ca70c325ea198aa1a10e94a71649f7648a867d18b07fddc2e87be67d82d332965fc5777466e4798bfa33e WHIRLPOOL 593b2c2bad2ec1c975838ac5665a143c96f04e14a9537863eedd58ee1b34653aaa538b1e1e0a81f756c32ecc5ea4b8e08a5f988ff0fc05759633f6610eb27702
 DIST spice-gtk-0.14.tar.bz2 1204821 SHA256 a16fa27364541493b886cc943f72c8f96ec251083af0a29d405a2c4f490274f5 SHA512 64510e098927d856ac8f05c6d9f07626ee280979fd792bb92f188ff11a15ff54b11acd0471a7e30c8f6fbc594a036c6642bd3369c0d231412ea9aece6d07bba1 WHIRLPOOL 16ce4c6cfb863c76026998239b5bbbd912cdeb5044afb8533020eaf255585863f41080bcc598b51efea3dc99b5e678508f1ece3f18a6dbae0d71e4bb81b513b9
 DIST spice-gtk-0.7.159.tar.bz2 800551 SHA256 c154c28778cbf2afef4c3c7f023afe4d0de7d742a2aace38a7358eb56a2c3306 SHA512 5ca9e5a953ae6eb3dcbf994772a8b38a2f574fe173e6c075adb9831f5197270f923d2d9d8747737f79d802d19c191f1c9f332abcc2b0c5787f023960f82f08ae WHIRLPOOL 71556dd4e20091ce6c10b81bb1ae2461e3a939082247d3c77947db7722cf5f5ee6763a4d3957757f7403d0278b3dcea44c5ab84590483b85e704e1da1afe21d8
+EBUILD spice-gtk-0.14-r1.ebuild 4346 SHA256 4366a86e7b90d6f760c5b27f4e6d4589ba704e5014785c45d9bc3b4b9c507d6e SHA512 5821fba2586187ba65a3cb638df59a7d0967da006813a3940951829cd7748c0c2a150b96cd760d364c20bb4cc3fea439edb1f5fd9da8a1cfbf59ca453c6a1410 WHIRLPOOL a1688780ca1306f992d413458a63d895ae7333ab96c75e7db152d218abe349cc34767c53cff3632b938ecaa50549332e3a262d8baa89cd21d832680ee43e7004
 EBUILD spice-gtk-0.14.ebuild 3386 SHA256 147d06393d0d0c75a57a1f1bc0e93681a83a77656e9167c09f2bb12eba90d167 SHA512 110e2d091487ab68dfe4cea86643c91b0fe37efe6dc50253ffe7d155d73d58029d71edd04906e5520c20ca9888914208e263fbd3008f974507eada98eb1039f5 WHIRLPOOL c8a7e6ba18f6197b0998bf469ec9dfeb045a89976532c45ae90f883a3bcaebcabb607f4ccf982a2a8b4414e19758565ffc069c0d696974872fbbc6624a49d200
 EBUILD spice-gtk-0.7.159.ebuild 3325 SHA256 1b5bf23a1a574229de51d26f538ae5729401a8d9df24c324170e6e0b2a31a76e SHA512 f9cdbb533717379a943ca21dd217a4145ff665b3bc2c4709fdc5517399ae4635227f7241378dd636bd737d2714231356b3cedd9beb847dc11594a5569486d671 WHIRLPOOL 59264b44511b754c1d3003bfebbd0c2febf7c6d827de8b2b875bcf7211f49e7c0883cd3764db14adf3c7efe1bad93c0f19b3851736936934b57edd0b7399ebd1
-MISC ChangeLog 5803 SHA256 9d372dc9944bd7210a1085ce6dcce21a1b25ea684b8b9c4c8458d1e695643bb4 SHA512 317b8b486a598fb84b19f0927a1f9c983a148b3b5e428a1771f39c0bdd04d87312031429edb02bafb1e489eeb079f5774067cb11a3f2c0f16e13ae7a132f0211 WHIRLPOOL a659ed7480f95f446f20873067602b5db3b1219720065595a7fd9c7f1e6c3aec1c991c6d239039b8205fcdc44d01392efc4225663006b040ee503c75f424320a
+MISC ChangeLog 6008 SHA256 9b4e0e5abc284c7a750a191afa8fe366bf3d4126ff820638bed0c6c4782c863a SHA512 3259103bed50505ca8532b78d1599bf5ed9b38c42e934f8cc3259414604a33506ea4ac2b6e1c5701d20be197618af7b719051f0ec38780e4db4fab55e24c348e WHIRLPOOL 8882c1239aa530c4c7422f6779b72fcfc4f6b2d9356af34d8378f55ad88a3bc1cde0ed9233b9f6aff28b5cea4bc6d51457a745bfabb38ffbb26808735a0f6e9f
 MISC metadata.xml 910 SHA256 b5785797bf26350dd7977d7f67a106aece090b33cfb7987fc95b2030ca382e40 SHA512 03e8e92a33dd924be8e1dc604298f4130d9711c19326d5831448da104dd2a35ea7394ed26dcda5b99ebefb3651f782e3a1c7326f23995f51f49862d5847e8d3c WHIRLPOOL 21ba69019c590542bfa1384fb29b4a7d5c5a28ba5e5fa411c3b47a453cf25939dadb0c8c5e56c90b67e652ac1f271421a228f7b0477b0a068e1300754b30cdb8
diff --git a/net-misc/spice-gtk/spice-gtk-0.14-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.14-r1.ebuild
new file mode 100644
index 000000000000..ff6b76f6e805
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.14-r1.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/spice-gtk-0.14-r1.ebuild,v 1.1 2012/12/04 20:41:36 cardoe Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+WANT_AUTOMAKE="1.11"
+
+inherit autotools eutils python
+
+PYTHON_DEPEND="2"
+
+DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI."
+HOMEPAGE="http://spice-space.org http://gitorious.org/spice-gtk"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gstreamer gtk3 +introspection policykit pulseaudio
+python sasl smartcard static-libs usbredir vala"
+
+REQUIRED_USE="?? ( pulseaudio gstreamer )"
+
+# TODO:
+# * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
+# * use external pnp.ids as soon as that means not pulling in gnome-desktop
+RDEPEND="pulseaudio? ( media-sound/pulseaudio )
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10 )
+	>=x11-libs/pixman-0.17.7
+	>=media-libs/celt-0.5.1.1:0.5.1
+	dev-libs/openssl
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
+	x11-libs/gtk+:2[introspection?]
+	>=dev-libs/glib-2.26:2
+	>=x11-libs/cairo-1.2
+	virtual/jpeg
+	sys-libs/zlib
+	introspection? ( dev-libs/gobject-introspection )
+	python? ( dev-python/pygtk:2 )
+	sasl? ( dev-libs/cyrus-sasl )
+	smartcard? ( app-emulation/libcacard )
+	usbredir? (
+		sys-apps/hwids
+		>=sys-apps/usbredir-0.4.2
+		virtual/libusb:1
+		virtual/udev[gudev]
+		policykit? (
+			sys-apps/acl
+			>=sys-auth/polkit-0.101 )
+		)"
+DEPEND="${RDEPEND}
+	>=app-emulation/spice-protocol-0.10.1
+	dev-lang/python
+	dev-python/pyparsing
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( dev-lang/vala:0.14 )"
+
+# Hard-deps while building from git:
+# dev-lang/vala:0.14
+# dev-lang/perl
+# dev-perl/Text-CSV
+
+GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
+GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	mkdir ${GTK2_BUILDDIR} || die 
+	mkdir ${GTK3_BUILDDIR} || die 
+
+	epatch \
+		"${FILESDIR}/0.12-parallel-install.patch" \
+		"${FILESDIR}/${PV}-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	local audio="no"
+
+	use gstreamer && audio="gstreamer"
+	use pulseaudio && audio="pulse"
+
+	if use vala ; then
+		# force vala regen for MinGW, etc
+		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
+	fi
+
+	myconf="
+		$(use_enable static-libs static) \
+		$(use_enable introspection) \
+		--with-audio=${audio} \
+		$(use_with python) \
+		$(use_with sasl) \
+		$(use_enable smartcard) \
+		$(use_enable usbredir) \
+		$(use_with usbredir usb-ids-path /usr/share/misc/usb.ids) \
+		$(use_with usbredir usb-acl-helper-dir /usr/libexec) \
+		$(use_enable policykit polkit) \
+		$(use_enable vala) \
+		--disable-werror"
+
+	cd ${GTK2_BUILDDIR}
+	echo "Running configure in ${GTK2_BUILDDIR}"
+	ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
+		VALAC=$(type -P valac-0.14) \
+		VAPIGEN=$(type -P vapigen-0.14) \
+		--with-gtk=2.0 \
+		${myconf}
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		echo "Running configure in ${GTK3_BUILDDIR}"
+		ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
+			VALAC=$(type -P valac-0.14) \
+			VAPIGEN=$(type -P vapigen-0.14) \
+			--with-gtk=3.0 \
+			${myconf}
+	fi
+}
+
+src_compile() {
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make in ${GTK2_BUILDDIR}"
+	emake
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make in ${GTK3_BUILDDIR}"
+		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() {
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make check in ${GTK2_BUILDDIR}"
+	emake DESTDIR="${ED}" install
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make install in ${GTK3_BUILDDIR}"
+		emake DESTDIR="${ED}" install
+	fi
+
+	# Remove .la files if they're not needed
+	if ! use static-libs; then
+		find "${ED}" -name '*.la' -exec rm -f '{}' + || die
+	fi
+
+	use python && rm -rf "${ED}"/usr/lib*/python*/site-packages/*.la
+	use doc || rm -rf "${ED}/usr/share/gtk-doc"
+
+	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+}