spice-gtk: used a bit edited ebuild from gentoo instead of old one from gnome-overlay

1 files changed, 64 insertions, 59 deletions

diff --git a/net-misc/spice-gtk/spice-gtk-scm.ebuild b/net-misc/spice-gtk/spice-gtk-scm.ebuild
index 834a610..e9b5925 100644
--- a/net-misc/spice-gtk/spice-gtk-scm.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-scm.ebuild
@@ -1,52 +1,52 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 GCONF_DEBUG="no"
 WANT_AUTOMAKE="1.12"
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python2_7 )
 
-inherit eutils python-single-r1 vala gnome2-live multibuild autotools
+inherit autotools eutils vala git-r3
 
 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"
+HOMEPAGE="http://spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-EGIT_REPO_URI="git://anongit.freedesktop.org/spice/${PN}"
+EGIT_REPO_URI="git://anongit.freedesktop.org/spice/spice-gtk.git"
 KEYWORDS=""
-IUSE="doc dbus gstreamer +gtk3 introspection lz4 policykit pulseaudio python sasl smartcard static-libs usbredir +vala webdav"
-REQUIRED_USE="
-	python? ( ${PYTHON_REQUIRED_USE} )
-	?? ( pulseaudio gstreamer )
-"
+IUSE="dbus gstaudio gstvideo gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
 
+REQUIRED_USE="?? ( pulseaudio gstaudio )"
 # 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}
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	pulseaudio? ( media-sound/pulseaudio[glib] )
-	gstreamer? (
+	gstvideo? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		)
+	gstaudio? (
 		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0 )
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0
+		)
 	>=x11-libs/pixman-0.17.7
 	>=media-libs/celt-0.5.1.1:0.5.1
 	media-libs/opus
-	dev-libs/openssl:=
 	gtk3? ( x11-libs/gtk+:3[introspection?] )
-	x11-libs/gtk+:2[introspection?]
-	>=dev-libs/glib-2.28:2
+	>=dev-libs/glib-2.36:2
 	>=x11-libs/cairo-1.2
-	virtual/jpeg:=
+	virtual/jpeg:0=
 	sys-libs/zlib
-	dbus? ( dev-libs/dbus-glib )
 	introspection? ( dev-libs/gobject-introspection )
 	lz4? ( app-arch/lz4 )
-	python? ( dev-python/pygtk:2 )
 	sasl? ( dev-libs/cyrus-sasl )
 	smartcard? ( app-emulation/qemu[smartcard] )
 	usbredir? (
@@ -65,76 +65,81 @@ RDEPEND="
 		>=net-libs/libsoup-2.49.91 )
 "
 DEPEND="${RDEPEND}
-	dev-lang/python
-	dev-python/pyparsing
+	=app-emulation/spice-protocol-scm
 	dev-perl/Text-CSV
+	>=dev-util/gtk-doc-am-1.14
 	>=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
 
 src_prepare() {
 	epatch_user
-	gtkdocize
-#	git submodule update --init --recursive
-	autoreconf -v --force --install
-	intltoolize -f
-	make distclean
+
+	eautoreconf
+
 	use vala && vala_src_prepare
 }
 
 src_configure() {
-	local myconf=()
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	local myconf
 
 	if use vala ; then
 		# force vala regen for MinGW, etc
 		rm -fv gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c
 	fi
 
-	myconf+=( \
-		--disable-maintainer-mode $(use_enable static-libs static) $(use_enable introspection) $(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) $(use_enable doc gtk-doc) --disable-werror --enable-pie $(use_enable webdav) $(use_enable pulseaudio pulse) $(use_enable lz4) \
-		$(use_enable gstreamer gstaudio) $(use_enable gstreamer gstvideo) $(use_enable pulseaudio pulse) \
-		)
-	# Parameter of --with-gtk
-	MULTIBUILD_VARIANTS=( 2.0 )
-	use gtk3 && MULTIBUILD_VARIANTS=( 3.0 )
-
-	configure() {
-#		local myconf=()
-		myconf+=( --with-gtk=${MULTIBUILD_VARIANT} )
-
-		if [[ ${MULTIBUILD_ID} =~ "2.0" ]] ; then
-			myconf+=( $(use_with python) )
-		else
-			myconf+=( --without-python )
-		fi
-
-		ECONF_SOURCE="${S}" econf $@ ${myconf[@]}
-	}
-	multibuild_foreach_variant run_in_build_dir configure ${myconf}
+	myconf="
+		--disable-maintainer-mode \
+		$(use_enable static-libs static) \
+		$(use_enable introspection) \
+		$(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_with gtk3 gtk 3.0) \
+		$(use_enable policykit polkit) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable gstaudio) \
+		$(use_enable gstvideo) \
+		$(use_enable mjpeg builtin-mjpeg) \
+		$(use_enable vala) \
+		$(use_enable webdav) \
+		$(use_enable dbus) \
+		--disable-gtk-doc \
+		--disable-werror \
+		--enable-pie"
+
+	econf ${myconf}
 }
 
 src_compile() {
-	multibuild_foreach_variant run_in_build_dir default
-}
+	# Prevent sandbox violations, bug #581836
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
 
-src_test() {
-	multibuild_foreach_variant run_in_build_dir default
+	default
 }
 
 src_install() {
-	dodoc AUTHORS NEWS README TODO
+	default
 
-	multibuild_foreach_variant run_in_build_dir default
+	dodoc AUTHORS NEWS README TODO
 
 	# 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;"
 }