net-misc/spice-gtk: Bump to new python eclass

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

3 files changed, 187 insertions, 7 deletions

diff --git a/net-misc/spice-gtk/ChangeLog b/net-misc/spice-gtk/ChangeLog
index 882950d9360a..46e96fe1b923 100644
--- a/net-misc/spice-gtk/ChangeLog
+++ b/net-misc/spice-gtk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/spice-gtk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.58 2013/05/12 12:14:10 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/spice-gtk/ChangeLog,v 1.59 2013/06/30 17:56:00 jlec Exp $
+
+*spice-gtk-0.18-r1 (30 Jun 2013)
+
+  30 Jun 2013; Justin Lecher <jlec@gentoo.org> +spice-gtk-0.18-r1.ebuild:
+  Bump to new python eclass
 
   12 May 2013; Pacho Ramos <pacho@gentoo.org> spice-gtk-0.18.ebuild:
   Use vala.eclass (#467400)
diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 15726f1bc1b2..c6a1a2bada3c 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0.12-parallel-install.patch 723 SHA256 8205e16a007ebb481d5cf9ee66b4c698be408038798fa7176287c5c529af572d SHA512 c6928e2e4e52e65760d7c2d69a44750d4756fea232288835d91eed9ded0d2770d062232283604163a5002565e0c4fc87b776693be5627e629ae588ab0710141c WHIRLPOOL 15af38b3f8986b08e576691fa46744cb42b3ecc51384e86f7f9c1ba2b8a40727684cb8e2529cd748c006bdb8be0bfe93604fb0fe3f90e0cdcc726bdb29f2ff61
 AUX 0.14-Deal-with-libusbredirparser.pc-rename-to-libusbredir.patch 2405 SHA256 09c6ca9e8a49f8c0040f83be35223319efed658a02b3838b55ceded7ce74e156 SHA512 28d6b25796f428bd00ab76502ce714eafaf4395e8855b89a767adedf69ff6b981f90e44d4f14465e11d5b62ca6203a51673206d880aa3caa0a8c10261c6dc59d WHIRLPOOL 04c73ec53b733973f4433e86b3d711e5c32cc3849588973b86e43080e96fabc4a7308aed3fc649eb7a84d2ed1f70f74ce5d6506704bc7b2ef99b03432f4b414a
@@ -14,13 +14,14 @@ EBUILD spice-gtk-0.14-r2.ebuild 4241 SHA256 6efc5375b049d5a32315c66727475ddce943
 EBUILD spice-gtk-0.14.ebuild 3386 SHA256 d0aee0d2332ab77737702554f162b036dc9e955f28d722694d73762609c39367 SHA512 53724bcc86000745160e34374f26da6282104e58bd896ae9bb8727341a31b8ec06813a9bc250b34ec3353ed5359714c55f90cc9fc1e4c0af994469c96ba9b82a WHIRLPOOL cca8bcec49b5d5f400d8a6f02495b83546809a4b41fa607a381d65e916c9c809af133198e95158f32a71c86a0d7277f39b84434d3cf9593314ca0d57583c1824
 EBUILD spice-gtk-0.15.3.ebuild 4450 SHA256 3315a8d30c7b24f6455781d6590255b92208614233ac64a2a77873d04bea83fe SHA512 0142773c02e40541f7085dcca2aed89b3d38af0a58fdf84e3b51f7f09127e273776a74c84965f3736a03ffd2eeef70a3b732490d29514773af6a4e0c87b18d41 WHIRLPOOL e77dff075d562b7187dadeac757ac2e91b5a3810ff8ded9638468652e4347d25eb1b6a6ccace4e4c07f6069f41188697aed53d99ab53592ce2110e2b3016ae3f
 EBUILD spice-gtk-0.16.ebuild 4390 SHA256 b5a5b788c308b74eece7a7665fba81ad121c52e2a68e3f49f5586b8bf3087260 SHA512 57cfb7f82122ef5f1b668479220da83b000827bd819cc8e6d22059ceab5e123d88e1e812f83fc304f48b608acc647e977eecadcf2a60536b831f5f0e6183fb9e WHIRLPOOL 512c5651e91291c1196d5d0307153bb6141698604081e31533ab95672e3c18d6576135b895179e12c5be6101792fa45eefed05b992e0df9853d63d478e29d2d1
+EBUILD spice-gtk-0.18-r1.ebuild 4244 SHA256 55f934d5a978b33fa3e6099f17b0dd6e83b8587c4957cff9bd27f4976c30ffa8 SHA512 a796080ab34d36ffe51f27871bbef20592d99f45aa270226774b1ecacb95c5040d50e2bc9c2a4bdc50e8a9d79825413ee6d2a75589634706b41e2041bde919b5 WHIRLPOOL b7d3f254463c142db1be5192acf7c94985f31edad4610c95c4e612968b5cc723611710272d35251c26458f917ace9c22067071848c82c2bc5787a169ebec2404
 EBUILD spice-gtk-0.18.ebuild 4263 SHA256 d9a35926a1049a1321e300e80c107b343991a5edad7f7f6c3ad25d22427fdc24 SHA512 79e6d106f1514fa6dff6e12785f8803ea456006a0e7d52ac7de33f1ee7c600424b86a0c971b91cd5deff44ab3f9b4ef36108c1bdb301d9ad9f45ed207cc70848 WHIRLPOOL 3c120041fff19616a9b4bd7ab0ccac94bf16df423311abad3f99bec363eafe032121081649920826fc169524538844020f3abb310bcb201f7296396dc0f33a02
-MISC ChangeLog 9129 SHA256 83596eab3a6b3bcb0b75bcd8c5d1f31194316b7eed6d9d48d4fce643556b3a1f SHA512 f486f27edace1a71d43748ebc6c0fb278cf6379c59a174eb8d008b76bd5aa93315683189ac43a82b2081a9a20c51a3cdc68b52fc6e8af81b0c9ef575469af327 WHIRLPOOL 5ed2fc0554e5fba23aa1edf5be01713f3d0f9ff9d6a3d6d1f7aa96e671c8847ec9106682458028c204c0d2bc7889ac719d9f51376b25cae1778a01b516108781
+MISC ChangeLog 9265 SHA256 75788b6d15295e256a6cded8ca94be33babe6e807d1eadb0959e5169f200864c SHA512 8e746334e95a0a7352361d1fbaa81d718d79bc269005c230732bd5677ba5db73337dbc224c1ab096c624521aff4c6e0e7459bfca0f837c5c3b67129887484215 WHIRLPOOL 4b8f4e62c7764c7ccba1d8ad5c602814fb472e00b40d27f089dbce4d530be34db02637544c3bd809676d64b31378beffa87218851744d769cb25dacfc6365816
 MISC metadata.xml 1093 SHA256 e870c8e701b20e9b02117b10d3a5a401b21df1e6259c03e0c13540db6c2fd123 SHA512 20eebe5c2396bc77a6eff62cf742ada3cd4ddbef3fa38a0cee2758964d6e9810bd45734c33e89bd18d784d16faecf3ca61e5311053e4c77d1338144f9cb5032e WHIRLPOOL 19828941ec2e27d8f06fdaeea1f45b78156c5265923492f2b2e5073cec0d072fd93ae5ec4951bd82bad306afd21ed9e9424addb3bde152038eefc8ff7d4f6407
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGPh5MACgkQCaWpQKGI+9TkOgCeKMlARXnK4aB39csNlhtXqxTC
-OmYAnR0ZpSvxiAty50JA0gmrs1An3hWX
-=oOs9
+iEYEAREKAAYFAlHQcTEACgkQgAnW8HDreRZe0gCdE44ZXGZUq73A5R6CR8Yl/5sy
+xCQAn11EttJCxRJfyBABu081VcLv+Ba7
+=tQCd
 -----END PGP SIGNATURE-----
diff --git a/net-misc/spice-gtk/spice-gtk-0.18-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.18-r1.ebuild
new file mode 100644
index 000000000000..95ae134cc5e9
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.18-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2013 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.18-r1.ebuild,v 1.1 2013/06/30 17:56:00 jlec Exp $
+
+EAPI=5
+GCONF_DEBUG="no"
+WANT_AUTOMAKE="1.12"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools eutils python-single-r1 vala
+
+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="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="dbus doc gstreamer gtk3 +introspection policykit pulseaudio
+python sasl smartcard static-libs usbredir vala"
+
+REQUIRED_USE="
+	${PYTHON_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="${PYTHON_DEPS}
+	pulseaudio? ( media-sound/pulseaudio[glib] )
+	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
+	dbus? ( dev-libs/dbus-glib )
+	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
+	virtual/pyparsing
+	dev-perl/Text-CSV
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
+
+# Hard-deps while building from git:
+# dev-lang/vala:0.14
+# dev-lang/perl
+
+GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
+GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	mkdir ${GTK2_BUILDDIR} || die
+	mkdir ${GTK3_BUILDDIR} || die
+
+	epatch \
+		"${FILESDIR}/0.12-parallel-install.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) \
+		$(use_enable dbus) \
+		--disable-werror \
+		--enable-pie"
+
+	cd ${GTK2_BUILDDIR}
+	echo "Running configure in ${GTK2_BUILDDIR}"
+	ECONF_SOURCE="${S}" econf --disable-maintainer-mode \
+		--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 \
+			--with-gtk=3.0 \
+			${myconf}
+	fi
+}
+
+src_compile() {
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make in ${GTK2_BUILDDIR}"
+	default
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make in ${GTK3_BUILDDIR}"
+		default
+	fi
+}
+
+src_test() {
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make check in ${GTK2_BUILDDIR}"
+	default
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make check in ${GTK3_BUILDDIR}"
+		default
+	fi
+}
+
+src_install() {
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make check in ${GTK2_BUILDDIR}"
+	default
+
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make install in ${GTK3_BUILDDIR}"
+		default
+	fi
+
+	# Remove .la files if they're not needed
+	use static-libs || prune_libtool_files
+
+	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;"
+}