spice-protocol, spice : sync with gentoo upstream

2 files changed, 54 insertions, 47 deletions

diff --git a/app-emulation/spice-protocol/spice-protocol-scm.ebuild b/app-emulation/spice-protocol/spice-protocol-scm.ebuild
index 5861514..c0d26bb 100644
--- a/app-emulation/spice-protocol/spice-protocol-scm.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-scm.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-protocol/spice-protocol-0.12.2.ebuild,v 1.2 2012/11/04 13:45:03 ago Exp $
+# $Id$
 
-EAPI="5"
+EAPI=6
 
-inherit git-2
+inherit git-r3 autotools
 
 DESCRIPTION="Headers defining the SPICE protocol"
 HOMEPAGE="http://spice-space.org/"
@@ -16,13 +16,9 @@ KEYWORDS=""
 IUSE=""
 
 DEPEND=""
-RDEPEND=""
-
-src_configure() {
-	econf --enable-code-generator
-}
-
+RDEPEND="${DEPEND}"
 
 src_prepare() {
-	 autoreconf --verbose --force --install
+	eautoreconf
+	default
 }
diff --git a/app-emulation/spice/spice-scm.ebuild b/app-emulation/spice/spice-scm.ebuild
index 7705c83..61f88ea 100644
--- a/app-emulation/spice/spice-scm.ebuild
+++ b/app-emulation/spice/spice-scm.ebuild
@@ -2,78 +2,89 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/app-emulation/spice/spice-0.12.0.ebuild,v 1.4 2012/10/05 13:56:45 cardoe Exp $
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
-inherit eutils python-any-r1 git-r3
+inherit eutils python-any-r1 git-r3 autotools readme.gentoo-r1
 
-DESCRIPTION="SPICE server and client"
+DESCRIPTION="SPICE server"
 HOMEPAGE="http://spice-space.org/"
-
+SRC_URI=""
 EGIT_REPO_URI="git://git.freedesktop.org/git/spice/spice"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="+client +gui sasl smartcard static-libs" # static
+IUSE="libressl lz4 sasl smartcard static-libs gstreamer"
 
-RDEPEND=">=x11-libs/pixman-0.17.7[static-libs(+)?]
+RDEPEND="
 	>=dev-libs/glib-2.22:2[static-libs(+)?]
 	>=media-libs/celt-0.5.1.1:0.5.1[static-libs(+)?]
 	media-libs/opus[static-libs(+)?]
-	|| ( dev-libs/openssl[static-libs(+)?] dev-libs/libressl[static-libs(+)?] )
-	virtual/jpeg[static-libs(+)?]
 	sys-libs/zlib[static-libs(+)?]
+	virtual/jpeg:0=[static-libs(+)?]
+	>=x11-libs/pixman-0.17.7[static-libs(+)?]
+	!libressl? ( dev-libs/openssl:0[static-libs(+)?] )
+	libressl? ( dev-libs/libressl[static-libs(+)?] )
+	lz4? ( app-arch/lz4 )
+	smartcard? ( >=app-emulation/libcacard-0.1.2 )
 	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
-	client? (
-		gui? ( =dev-games/cegui-0.6*[opengl] )
-		media-libs/alsa-lib
-		>=x11-libs/libXrandr-1.2
-		x11-libs/libX11
-		x11-libs/libXext
-		>=x11-libs/libXinerama-1.0
-		x11-libs/libXfixes
-		x11-libs/libXrender
-		smartcard? ( app-emulation/qemu[smartcard] )
-	)"
+	gstreamer? ( media-libs/gstreamer )"
 
-DEPEND="virtual/pkgconfig
-	$(python_gen_any_dep \
-		'>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]')
+DEPEND="
+	=app-emulation/spice-protocol-scm
+	virtual/pkgconfig
+	$(python_gen_any_dep '
+		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')
 	smartcard? ( app-emulation/qemu[smartcard] )
 	${RDEPEND}"
 
 python_check_deps() {
 	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	has_version "dev-python/six[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
 	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
 }
 
-# maintainer notes:
-# * opengl support is currently broken
-# * TODO: add slirp for tunnel-support
-
 src_prepare() {
-	mkdir -p m4
-	autoreconf --verbose --force --install
+	default
+	eautoreconf
 }
 
 src_configure() {
-#	python_fix_shebang spice-common/spice_codegen.py
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
 
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable client) \
-		$(use_enable gui) \
-		$(use_with sasl) \
-		$(use_enable smartcard) \
-		--disable-static-linkage
+	local myconf="
+		$(use_enable static-libs static)
+		$(use_enable lz4)
+		$(use_with sasl)
+		$(use_enable smartcard)
+		$(usex gstreamer "1.0" "no")
+		--enable-celt051
+		--disable-gui
+		"
+	econf ${myconf}
+}
+
+src_compile() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	addpredict /dev
+
+	default
 }
 
 src_install() {
 	default
 	use static-libs || prune_libtool_files
+	readme.gentoo_create_doc
 }