gentoo resync : 25.09.2019

4 files changed, 17 insertions, 14 deletions

diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index f51237f9d855..856d75485857 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -5,6 +5,6 @@ AUX spice-0.14.0-openssl1.1_fix.patch 614 BLAKE2B fb7b39e73d37bc6ab27035c7d7a742
 DIST spice-0.14.0.tar.bz2 1330195 BLAKE2B 08f93e8ddeb79adb4feac0557a854cc41fd096a9dfefc0baaca176803c2a03ef9286c4f61a135d62ad22e3ac3f4bb31ffd1614c8ddeaec7ae8c01eca34da1750 SHA512 84532146aa628ca6ca459a82afb89d6391892e063668fd4a68023c92cee7ca868b6c82e31dd9886819b76ea745ebdae0d0030e1f608d8f58f51c00f0b09bae1f
 DIST spice-0.14.2.tar.bz2 1406009 BLAKE2B e6c57bedd8c8ec0444da194be7279b895bf348dfa9b427d20301cc223627bcd65b7037280bc2a3d0b531b0cdcd8cb62d34ee132c549ac3dc8f6e5a2959339ce2 SHA512 1093b618ea4a7ff31944429ce2903abecfc8d20c35f2d9c8c837a6e053ee429c0115e40665542637a717869209523ac05d15cdb5e77563102d5d3915e4aaaf76
 EBUILD spice-0.14.0-r2.ebuild 2499 BLAKE2B dd891d8a45946487668b1477542d07c506844a9f521a1296c27b453fc0adb68942b1a8eb304b72f017eafd9c1043574c36fddc139638b29ef5e84965256f7e89 SHA512 42d61b11fc788736e9a5c40b765d260f3bcc6060a3b6e2ede73f7e1187d597037f9c194b0ed841e234634a960618549c42363d55b7cc6846e06bc300c0fd3bf7
-EBUILD spice-0.14.2.ebuild 2437 BLAKE2B 799d9c327fa7dce4478e55342e7b410b5065619e3fcd87cd8965d4888f5aab9922cec37899f088a81327f1a176008cbba50d92343d5d4ca890e4d092d2555d5a SHA512 7e4b6016cba8e679f6410673dc84381be795940d980226fad9acfce150b8ad2fd5049be0da76189221dbf130ae024813609824e217b4307b0d652d8407fdd3d8
-EBUILD spice-9999.ebuild 2365 BLAKE2B 16aa7424b66382318ee14b7449d3087b3e00fbdeb6b154906aad2398540039b80bde961234918cfdddd62f0a1dc451c0be500cd13d1076f94a521b916f81a75a SHA512 d2fc894b11162f2569824849c65ede60f3362bee31af7cee14048b1fdaf2bd8f578e3df5726e7ccc434dbd5f91b37d7635b43db9cd1f724330d9aff3c8c1c2c3
-MISC metadata.xml 476 BLAKE2B 2cda64935d0117db099551f30928c447c4d1d7f4e1c355e619c0134ec31e4d7779b646329218c48f9be671d0f0e92fa496caaa34f6aa4136748dd9bd6d2d868a SHA512 3ae95b689c812e19679cb9a9db2f0811077a4eb205cadf4baeb78a2ddfeb7fc0086e2514540fad59e447bbca6c9dba81001a8ff156a1d18ba2d58171ba301f9b
+EBUILD spice-0.14.2.ebuild 2452 BLAKE2B d57cf9e0bc1c9b14273ae1d91b4ba28e5da0c448796bbed5d0043d09e16299e8bd7d42b3eddc0301b45b2f68edf3900a04f1cb665229cd8d94d3d961edb3d959 SHA512 adacf97c66ba14baffca32e0ca3148af5bed9ee218924364b43c610fa56b34c751e81da51e7e8dad9f0cb2fe4315260de6b9f57e66a65f9560876b1724e6e932
+EBUILD spice-9999.ebuild 2516 BLAKE2B 7c64c6889233f066fa0dcc4dd638d8259ee596ef3ccad9d344c11fca7fc3511e890ed2b35d88e5d8f273e1b7097173ef9372cc84497cb4fa7d463d2e73372417 SHA512 4d7c8e899aab2b9453eb3fb5b92ecf8cf550ace49a6612a81fbc9d5d1db5db690f5e31f55525d7b1ee692e1d26ec92b053a3acc7da0773cbef63267eb04ac707
+MISC metadata.xml 385 BLAKE2B 599bae33d9264b8b3b4474b0d2234d66e6c6f2cd3da1710bfea64f75570264da7f4de712cecb95408a059f70e3dba2de2a421c02f1f728e39c2bf913c2c570a0 SHA512 c75966298d69fb56b3e16c98b0cc7b3b2514d2ad2a6b790777c00493754e678388f0eb17fbabc6f58a667883e87d2a4f19c2a1c34f5c87f81fb13a8948ab85c8
diff --git a/app-emulation/spice/metadata.xml b/app-emulation/spice/metadata.xml
index 0f32fa2a88cf..ee309bddf45f 100644
--- a/app-emulation/spice/metadata.xml
+++ b/app-emulation/spice/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Virtualization Project</name>
 	</maintainer>
 	<use>
-		<flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
 		<flag name="smartcard">Enable smartcard remoting using <pkg>app-emulation/libcacard</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/spice/spice-0.14.2.ebuild b/app-emulation/spice/spice-0.14.2.ebuild
index 464cb7d9c62e..58de3c678521 100644
--- a/app-emulation/spice/spice-0.14.2.ebuild
+++ b/app-emulation/spice/spice-0.14.2.ebuild
@@ -33,22 +33,22 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 	)"
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	>=app-emulation/spice-protocol-0.14.0
+	smartcard? ( app-emulation/qemu[smartcard] )"
+BDEPEND="${PYTHON_DEPS}
 	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] )"
+	')"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.14.0-openssl1.1_fix.patch
 )
 
 python_check_deps() {
-	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
-	has_version "dev-python/six[${PYTHON_USEDEP}]"
+	has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/six[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
diff --git a/app-emulation/spice/spice-9999.ebuild b/app-emulation/spice/spice-9999.ebuild
index 48cf0c3fa264..d4bf02488571 100644
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@@ -34,18 +34,18 @@ RDEPEND="
 		media-libs/gst-plugins-base:1.0
 	)"
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	~app-emulation/spice-protocol-9999
+	smartcard? ( app-emulation/qemu[smartcard] )"
+BDEPEND="${PYTHON_DEPS}
 	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] )"
+	')"
 
 python_check_deps() {
-	has_version ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
-	has_version "dev-python/six[${PYTHON_USEDEP}]"
+	has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	has_version -b "dev-python/six[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -55,6 +55,10 @@ pkg_setup() {
 src_prepare() {
 	default
 
+	# Delete repo-only Makefile that causes build to fail.
+	# https://gitlab.freedesktop.org/spice/spice/issues/35
+	rm GNUmakefile || die
+
 	eautoreconf
 }