merged spice and spice-protocol with gentoo upstream repo

2 files changed, 25 insertions, 35 deletions

diff --git a/app-emulation/spice-protocol/spice-protocol-scm.ebuild b/app-emulation/spice-protocol/spice-protocol-scm.ebuild
index 98c836a..d511887 100644
--- a/app-emulation/spice-protocol/spice-protocol-scm.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-scm.ebuild
@@ -6,9 +6,8 @@ EAPI="5"
 
 inherit git-2
 
-DESCRIPTION="Headers defining the SPICE protocol."
+DESCRIPTION="Headers defining the SPICE protocol"
 HOMEPAGE="http://spice-space.org/"
-#SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
 EGIT_REPO_URI="git://git.freedesktop.org/git/spice/spice-protocol"
 
 LICENSE="BSD"
diff --git a/app-emulation/spice/spice-scm.ebuild b/app-emulation/spice/spice-scm.ebuild
index a696157..1074c41 100644
--- a/app-emulation/spice/spice-scm.ebuild
+++ b/app-emulation/spice/spice-scm.ebuild
@@ -4,13 +4,13 @@
 
 EAPI=5
 
-PYTHON_DEPEND="2"
+PYTHON_COMPAT=( python{2_6,2_7} pypy2_0 )
 
-inherit eutils python git-2
+inherit eutils python-any-r1 git-2
 
-DESCRIPTION="SPICE server and client."
+DESCRIPTION="SPICE server and client"
 HOMEPAGE="http://spice-space.org/"
-#SRC_URI="http://spice-space.org/download/releases/${P}.tar.bz2"
+
 EGIT_REPO_URI="git://git.freedesktop.org/git/spice/spice"
 EGIT_HAS_SUBMODULES="1"
 
@@ -19,46 +19,38 @@ SLOT="0"
 KEYWORDS=""
 IUSE="+client +gui sasl smartcard static-libs" # static
 
-RDEPEND=">=x11-libs/pixman-0.17.7
-	media-libs/alsa-lib
-	media-libs/celt:0.5.1
-	dev-libs/openssl
-	virtual/jpeg
-	sys-libs/zlib
-	sasl? ( dev-libs/cyrus-sasl )
-	smartcard? ( >=app-emulation/libcacard-0.1.2 )
+RDEPEND=">=x11-libs/pixman-0.17.7[static-libs(+)?]
+	>=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(+)?]
+	virtual/jpeg[static-libs(+)?]
+	sys-libs/zlib[static-libs(+)?]
+	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
+		>=x11-libs/libXinerama-1.0
 		x11-libs/libXfixes
 		x11-libs/libXrender
+		smartcard? ( app-emulation/qemu[smartcard] )
 	)"
 
-# broken as we don't have static alsa-lib and building that one static requires more work
-#		static? (
-#			>=x11-libs/pixman-0.17.7[static-libs(+)]
-#			media-libs/celt:0.5.1[static-libs(+)]
-#			virtual/jpeg[static-libs(+)]
-#			sys-libs/zlib[static-libs(+)]
-#			media-libs/alsa-lib[static-libs(-)]
-#			>=x11-libs/libXrandr-1.2[static-libs(+)]
-#			x11-libs/libX11[static-libs(+)]
-#			x11-libs/libXext[static-libs(+)]
-#			x11-libs/libXinerama[static-libs(+)]
-#			x11-libs/libXfixes[static-libs(+)]
-#			x11-libs/libXrender[static-libs(+)]
-#		)
-#	)"
 DEPEND="virtual/pkgconfig
-	dev-python/pyparsing
+	$(python_gen_any_dep \
+		'>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]')
+	smartcard? ( app-emulation/qemu[smartcard] )
 	${RDEPEND}"
 
+python_check_deps() {
+	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
+	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
 }
 
 # maintainer notes:
@@ -76,7 +68,6 @@ src_configure() {
 
 	econf \
 		$(use_enable static-libs static) \
-		--disable-tunnel \
 		$(use_enable client) \
 		$(use_enable gui) \
 		$(use_with sasl) \
@@ -87,5 +78,5 @@ src_configure() {
 
 src_install() {
 	default
-	use static-libs || rm "${D}"/usr/lib*/*.la
+	use static-libs || prune_libtool_files
 }