[gentoo-commits] proj/gnome:master commit in: net-misc/spice-gtk/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     a0e0085e3cc934df9725d59d0b762c46d269e92b
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 23:04:35 2013 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 23:04:35 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a0e0085e

net-misc/spice-gtk: sync with gentoo-x86

---
 net-misc/spice-gtk/metadata.xml          |  27 ++++++
 net-misc/spice-gtk/spice-gtk-9999.ebuild | 159 +++++++++++++++++++------------
 2 files changed, 126 insertions(+), 60 deletions(-)

diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
new file mode 100644
index 0000000..16dc6e6
--- /dev/null
+++ b/net-misc/spice-gtk/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>virtualization</herd>
+  <maintainer>
+    <email>dev-zero@gentoo.org</email>
+    <name>Tiziano Müller</name>
+  </maintainer>
+  <maintainer>
+    <email>nirbheek@gentoo.org</email>
+    <name>Nirbheek Chauhan</name>
+  </maintainer>
+  <use>
+    <flag name="gtk3">Link against <pkg>x11-libs/gtk+:3</pkg> instead of
+			<pkg>x11-libs/gtk+:2</pkg></flag>
+    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+			for introspection</flag>
+    <flag name="policykit">Enable <pkg>sys-auth/polkit</pkg> support for the
+			usbredir acl helper</flag>
+    <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to redirect USB
+			devices to another machine over TCP</flag>
+    <flag name="vala">Generate <pkg>dev-lang/vala</pkg> bindings using
+			vapigen and regenerate .vala files using valac</flag>
+    <flag name="dbus">Support for desktop integration such as
+			automounting and other APIs exposed by your DE via D-Bus</flag>
+  </use>
+</pkgmetadata>

diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index 9093c45..a6290e1 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -1,17 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=5
 GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit eutils python gnome2-utils
+inherit eutils python-single-r1 vala
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 
-PYTHON_DEPEND="python? 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"
 
@@ -22,119 +23,157 @@ if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	SRC_URI="http://spice-space.org/download/gtk/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 fi
-IUSE="doc gnome gstreamer gtk3 +introspection kde policykit +pulseaudio
-python sasl smartcard static-libs usbredir vala"
-
-# TODO: check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
-RDEPEND="pulseaudio? ( !gstreamer? ( media-sound/pulseaudio ) )
+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 )
-	>=app-emulation/spice-protocol-0.10.1
 	>=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?] )
-	!gtk3? ( x11-libs/gtk+:2[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 )
-	gnome? ( gnome-base/gconf )
 	smartcard? ( app-emulation/libcacard )
 	usbredir? (
+		sys-apps/hwids
+		>=sys-apps/usbredir-0.4.2
+		virtual/libusb:1
+		virtual/udev[gudev]
 		policykit? (
-			sys-auth/polkit
 			sys-apps/acl
-			>=sys-auth/polkit-0.101 )
-		virtual/libusb:1
-		>=sys-apps/usbredir-0.4.2
-		virtal/udev[gudev] )"
+			>=sys-auth/polkit-0.110-r1
+			!~sys-auth/polkit-0.111 )
+		)"
 DEPEND="${RDEPEND}
-	vala? ( dev-lang/vala:0.14 )
 	dev-lang/python
 	dev-python/pyparsing
+	dev-perl/Text-CSV
 	>=dev-util/intltool-0.40.0
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
-		dev-lang/vala:0.14
+		$(vala_depend)
 		dev-lang/perl
 		dev-perl/Text-CSV"
 fi
 
-pkg_setup() {
-	if use gstreamer && use pulseaudio ; then
-		ewarn "spice-gtk can use only one audio backend: gstreamer will be used since you enabled both."
-	fi
+GTK2_BUILDDIR="${WORKDIR}/${P}_gtk2"
+GTK3_BUILDDIR="${WORKDIR}/${P}_gtk3"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	mkdir ${GTK2_BUILDDIR} ${GTK3_BUILDDIR} || die
 }
 
 src_configure() {
+	local myconf
 	local audio="no"
-	local gtk="2.0"
 
-	use pulseaudio && audio="pulse"
 	use gstreamer && audio="gstreamer"
-	# TODO: do a double build like gtk-vnc does to install both gtk2 & gtk3 libs
-	use gtk3 && gtk="3.0"
+	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
 
-	econf --disable-maintainer-mode \
-		VALAC=$(type -P valac-0.14) \
-		VAPIGEN=$(type -P vapigen-0.14) \
+	myconf="
 		$(use_enable static-libs static) \
 		$(use_enable introspection) \
-		--with-audio="${audio}" \
+		--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) \
-		--with-gtk="${gtk}" \
-		--disable-werror
+		$(use_enable dbus) \
+		$(use_enable doc gtk-doc) \
+		--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_install() {
-	emake -j1 DESTDIR="${D}" install
-
-	use static-libs || rm -rf "${D}"/usr/lib*/*.la
-	use python && rm -rf "${D}"/usr/lib*/python*/site-packages/*.la
-	use doc || rm -rf "${D}/usr/share/gtk-doc"
+src_compile() {
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make in ${GTK2_BUILDDIR}"
+	default
 
-	dodoc AUTHORS NEWS README THANKS TODO
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make in ${GTK3_BUILDDIR}"
+		default
+	fi
+}
 
-	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
+src_test() {
+	cd ${GTK2_BUILDDIR}
+	einfo "Running make check in ${GTK2_BUILDDIR}"
+	default
 
-	if use gnome ; then
-		insinto /etc/gconf/schemas
-		doins "${FILESDIR}/spice.schemas"
-	fi
-	if use kde ; then
-		insinto /usr/share/kde4/services
-		doins "${FILESDIR}/spice.protocol"
+	if use gtk3; then
+		cd ${GTK3_BUILDDIR}
+		einfo "Running make check in ${GTK3_BUILDDIR}"
+		default
 	fi
-
 }
 
-pkg_preinst() {
-	use gnome && gnome2_gconf_savelist
-}
+src_install() {
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
 
-pkg_postinst() {
-	use gnome && gnome2_gconf_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
 
-pkg_prerm() {
-	use gnome && gnome2_gconf_uninstall
+	# 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
+
+	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
 }