gentoo resync : 02.08.2019

5 files changed, 74 insertions, 90 deletions

diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 7d629b3dc199..5eca703b7535 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,10 +1,10 @@
 AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
 AUX spice-gtk-0.34-openssl11.patch 518 BLAKE2B d9c692996f64ccfb61f16f2c8b620559d1321f35c74072c3e0c51a115f7d40039b7c6dd484cf3beec90c8950df5fbb42575ab62e3c309da3405b5217864b746b SHA512 f879a3f26be439a68e1f40e32e654eea301efc9f5494039b7166673337688f0832e180ab77863cde55627ee033572caf04d5bb08816d4272382d9dccf43ef7f1
 AUX spice-gtk-0.35-libressl.patch 2025 BLAKE2B f1123494cfa4f2cf3d168ae1f2a1277b77dd2afc9a0c4911a65941977f8bac30b30de1d03575fcaf483cd5f9cc8f4ff150a40b6f1bfb8b19da18d2027fc1f04f SHA512 b7717296b66a32f3dd3458de27059c82fd826479143b0261819d0abad5f496cedaca61da42706808b686e1b55bb8c7613187c0b103ccbc9566abb3385c7a36de
-DIST spice-gtk-0.34.tar.bz2 1480566 BLAKE2B 35350cf930d091fa11df1d573f9eff23696745a20e88fcd20783c108b6ddca9064bc4e75d414f23bd94318e37d509e581866c5dcc955cd21ca7c9384b492f0ec SHA512 17ea737511855b47f5eaf5143756483542cf8ee83f8d276cbfb2c0407355f68ed329fcbed8a67737179f3e53587710634d6faa856590234ee68be7b4b13f2689
 DIST spice-gtk-0.35.tar.bz2 1437231 BLAKE2B f2731a794cf22b491bf858fff44506288af730b37f1c37e16ac3042d662373b4e4021808d5ca72440012fb36a5119ad11858cb8cf872b04376518487faebef49 SHA512 f0914a4a9baf892e39dab7d51aa9f5ab4dbb4ef01f09da158b20756f890745837d0a6c8c1f7897844e695be2ed01f3b1d04ada1cacc958b5cfadb0d4bf7c4729
-EBUILD spice-gtk-0.34-r2.ebuild 3770 BLAKE2B bf9da87c11541a41ac5d60551bc2b78273dfbe89b23ec4bff3ffaeb1a76dcb00c9c4d53970ce8d4af20da731662193cb66bbdb40d5eac8363b75e7badd80accf SHA512 0a7273137af62c6c2f6f402a3e6f06411b5c6404da965f56496c3843c67682d02a9c16e1f0dc6562f3724d469f0743f85af20c648e43b57a146c2d11fe87a238
-EBUILD spice-gtk-0.35-r1.ebuild 3701 BLAKE2B a18f1342a995ff1d7c60f97aaf7925d8debc28bfe38f196410b6e5e3d1a74c616e4adb11af200fa2168457b522085d3e066aa2001343b877ef53ddd2b2f078e7 SHA512 6f29c68bc97336b4e0b0fe7e2884d67440dc66b64cc94f886afee8e4f261d505ba72560fd3f69c5fdbfd03493272cc41d4806d249018784338f142d57c88dd7c
-EBUILD spice-gtk-0.35.ebuild 3663 BLAKE2B 307f53ae4809342debee7fbccbeb109391549f5b779b44359be4f3a4db014448af6ce96f1276fac3fc667d23b490583abab9391ed942e47cbdac87bf434996da SHA512 74d69990895f296024907468de495de049e07dc3c1e7bb0cea5442301e75964513e412800ed4771ff02ec16a44bb211cae00f468d31de0df6795ca67fbd3bbb9
-EBUILD spice-gtk-9999.ebuild 3572 BLAKE2B 018aaa56a9473bcf65db97fffbc4239c1b94622985e3f25abef438e9f99b5484d117a73857f9157da997bd8eeb4c0d2531ab8de9a3283351341732d5e839d748 SHA512 614340835d6efe1bf5fe37ab37d6756761403871cb025f4ff8646fa85d6314a6296614abc2b69e895ccb0de4c23d907ef03658f3280dbc37b9cdd606218ede13
+DIST spice-gtk-0.37.tar.bz2 1303111 BLAKE2B cf4b6664ac86d126cf14f1a31b1df93079e15fc0a0af69bfaf61cb84284daa7b6b8cb2a2ee3345f6a475838ffc0fb2a2b0bdd61301e2c1479fb5f5e0c28babbe SHA512 a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029
+EBUILD spice-gtk-0.35-r1.ebuild 3644 BLAKE2B d9af139bcc0ebf73761baf6ca0e7576b79d0684bad33ca49b48ceca06f4ae895f8d9fd737f575f241f90fc988e57d84f78f0c0795aa7532649c6d88a7f9afdb0 SHA512 139c7e72429d06b82272141430927bb6d163d64a6b9011f094cad504733dd3fdb3f8b9899fab41514e5ceedcf11b29dddad6882d9069af4a850fb8eae78c2195
+EBUILD spice-gtk-0.35.ebuild 3606 BLAKE2B e9847a0cdf2093241e8e54bfb4d56d9617c8f812abfbe3461fab52a2a3ad4440c781ab221c236eac52ea51bbb3cd3f0ce059abd81b42a218f259c0bde17ac085 SHA512 260bef70ecbea74788de9cb7730ede3e345407c382ca57fb428d2b548ccd7ede67fe948b4cc61a70055edd6c184d5cd5b37b9e144a97f35484d77f30710ba3bd
+EBUILD spice-gtk-0.37-r2.ebuild 3665 BLAKE2B 8b6b1c74a0b552e4bb8952ba9c5b3d3045b732734adfdc47fcc3dd55e6681c9153606160eb7339a0cc9bcc08c7b339a05b1ddc36ca151a2093e5bc9401688a8c SHA512 6b13b8eb98855f431e6b0a871bb16c04e5b9d887c6d6b7454f69c42bbe264b66d7b63ee191fcbda3cad3e9383a36cf6186de6acc08a6df5b771fa26dc691554f
+EBUILD spice-gtk-9999.ebuild 3637 BLAKE2B 6a95666f309c1d29779b33a225d8a429caf6954f6a4ba5ee993ea7e0db539b6341d2e3d85f66ae5d4fe2e05a7b61a69e80a578ff2ea8de1c8de3ca44f1529de9 SHA512 39f419bc6188c40e25332111ae4953f3eeccfbb6880fd7b22d20be90ce534f9267e6e6f094e36e8cb76d3677cccbea50895f53039acd46b934d24dd3b2e3c9c2
 MISC metadata.xml 1166 BLAKE2B 37cf826a7a49dc48170fb99e05b191964810eacbf8b13db383a37e70faed6a2b4b70acfd724eeffbbe10d97fab27bfec7d56cfb2cbc2537ac4df7612afdbe8d2 SHA512 5229ddeaf19765abee5b0120b066ac2049f77878b1b8886e2b552f2c56d6049df297b227f0bee36bbe6be7041b9d8e1c1d3d868c34b1e39b49a5c0bc16b2c947
diff --git a/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild
index a09931118314..2bf65fbe5552 100644
--- a/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.35-r1.ebuild
@@ -81,7 +81,6 @@ PATCHES=(
 src_prepare() {
 	# bug 558558
 	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
 
 	default
 
diff --git a/net-misc/spice-gtk/spice-gtk-0.35.ebuild b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
index c56fd6248155..d6e46f5386d3 100644
--- a/net-misc/spice-gtk/spice-gtk-0.35.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
@@ -79,7 +79,6 @@ PATCHES=(
 src_prepare() {
 	# bug 558558
 	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
 
 	default
 
diff --git a/net-misc/spice-gtk/spice-gtk-0.34-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
index bf79416bb4ff..51d40d99df46 100644
--- a/net-misc/spice-gtk/spice-gtk-0.34-r2.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.37-r2.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 GCONF_DEBUG="no"
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools eutils xdg-utils vala readme.gentoo-r1
+inherit autotools desktop eutils xdg-utils vala readme.gentoo-r1
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
 HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
@@ -14,44 +15,35 @@ HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-g
 LICENSE="LGPL-2.1"
 SLOT="0"
 SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
-
-REQUIRED_USE="?? ( pulseaudio gstaudio )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
 
 # 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="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	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-good:1.0
-		)
-	>=x11-libs/pixman-0.17.7
+	>=dev-libs/glib-2.46:2
+	dev-libs/json-glib:0=
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
 	media-libs/opus
-	gtk3? ( x11-libs/gtk+:3[introspection?] )
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/cairo-1.2
-	virtual/jpeg:0=
 	sys-libs/zlib
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.2
+	>=x11-libs/pixman-0.17.7
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
 	introspection? ( dev-libs/gobject-introspection )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	lz4? ( app-arch/lz4 )
+	pulseaudio? ( media-sound/pulseaudio[glib] )
 	sasl? ( dev-libs/cyrus-sasl )
 	smartcard? ( app-emulation/qemu[smartcard] )
 	usbredir? (
 		sys-apps/hwids
 		>=sys-apps/usbredir-0.4.2
 		virtual/libusb:1
-		virtual/libgudev:=
 		policykit? (
 			sys-apps/acl
 			>=sys-auth/polkit-0.110-r1
@@ -59,11 +51,19 @@ RDEPEND="
 		)
 	webdav? (
 		net-libs/phodav:2.0
-		>=dev-libs/glib-2.43.90:2
 		>=net-libs/libsoup-2.49.91 )
 "
+# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a
+# configure knob. The package is relatively lightweight so we just depend
+# on it unconditionally for now. It would be cleaner to transform this into
+# a USE="vaapi" conditional and patch the buildsystem...
+RDEPEND="${RDEPEND}
+	amd64? ( x11-libs/libva:= )
+	arm64? ( x11-libs/libva:= )
+	x86? ( x11-libs/libva:= )
+"
 DEPEND="${RDEPEND}
-	>=app-emulation/spice-protocol-0.12.13
+	>=app-emulation/spice-protocol-0.14.0
 	dev-perl/Text-CSV
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
@@ -73,10 +73,12 @@ DEPEND="${RDEPEND}
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+)
+
 src_prepare() {
 	# bug 558558
 	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
 
 	default
 
@@ -95,29 +97,20 @@ src_configure() {
 	xdg_environment_reset
 
 	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="
-		$(use_enable static-libs static)
+		$(use_with gtk3 gtk 3.0)
 		$(use_enable introspection)
+		$(use_enable mjpeg builtin-mjpeg)
+		$(use_enable policykit polkit)
+		$(use_enable pulseaudio pulse)
 		$(use_with sasl)
 		$(use_enable smartcard)
+		$(use_enable static-libs static)
 		$(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_with usbredir usb-ids-path /usr/share/misc/usb.ids)
 		$(use_enable vala)
 		$(use_enable webdav)
-		$(use_enable dbus)
 		--disable-celt051
 		--disable-gtk-doc
 		--disable-maintainer-mode
@@ -139,10 +132,8 @@ src_compile() {
 src_install() {
 	default
 
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
 	# Remove .la files if they're not needed
-	use static-libs || prune_libtool_files
+	use static-libs || find "${D}" -name '*.la' -delete || die
 
 	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
 	readme.gentoo_create_doc
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index 37f1d9d190d6..c4e0bd6c740b 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 GCONF_DEBUG="no"
 WANT_AUTOMAKE="1.12"
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-inherit autotools eutils git-r3 readme.gentoo-r1 vala xdg-utils
+inherit autotools desktop eutils git-r3 readme.gentoo-r1 vala xdg-utils
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
 HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
@@ -16,43 +17,34 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
 KEYWORDS=""
-IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
-
-REQUIRED_USE="?? ( pulseaudio gstaudio )"
+IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
 
 # 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="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	pulseaudio? ( media-sound/pulseaudio[glib] )
-	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-good:1.0
-		)
-	>=x11-libs/pixman-0.17.7
-	media-libs/opus
-	gtk3? ( x11-libs/gtk+:3[introspection?] )
 	>=dev-libs/glib-2.46:2
-	>=x11-libs/cairo-1.2
-	virtual/jpeg:0=
+	dev-libs/json-glib:0=
+	media-libs/gst-plugins-base:1.0
+	media-libs/gst-plugins-good:1.0
+	media-libs/gstreamer:1.0
+	media-libs/opus
 	sys-libs/zlib
+	virtual/jpeg:0=
+	>=x11-libs/cairo-1.2
+	>=x11-libs/pixman-0.17.7
+	gtk3? ( x11-libs/gtk+:3[introspection?] )
 	introspection? ( dev-libs/gobject-introspection )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
 	lz4? ( app-arch/lz4 )
+	pulseaudio? ( media-sound/pulseaudio[glib] )
 	sasl? ( dev-libs/cyrus-sasl )
 	smartcard? ( app-emulation/qemu[smartcard] )
 	usbredir? (
 		sys-apps/hwids
 		>=sys-apps/usbredir-0.4.2
 		virtual/libusb:1
-		virtual/libgudev:=
 		policykit? (
 			sys-apps/acl
 			>=sys-auth/polkit-0.110-r1
@@ -62,6 +54,15 @@ RDEPEND="
 		net-libs/phodav:2.0
 		>=net-libs/libsoup-2.49.91 )
 "
+# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a
+# configure knob. The package is relatively lightweight so we just depend
+# on it unconditionally for now. It would be cleaner to transform this into
+# a USE="vaapi" conditional and patch the buildsystem...
+RDEPEND="${RDEPEND}
+	amd64? ( x11-libs/libva:= )
+	arm64? ( x11-libs/libva:= )
+	x86? ( x11-libs/libva:= )
+"
 DEPEND="${RDEPEND}
 	~app-emulation/spice-protocol-9999
 	dev-perl/Text-CSV
@@ -76,7 +77,6 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# bug 558558
 	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
 
 	default
 
@@ -96,22 +96,19 @@ src_configure() {
 
 	local myconf
 	myconf="
-		$(use_enable static-libs static)
+		$(use_with gtk3 gtk 3.0)
 		$(use_enable introspection)
+		$(use_enable mjpeg builtin-mjpeg)
+		$(use_enable policykit polkit)
+		$(use_enable pulseaudio pulse)
 		$(use_with sasl)
 		$(use_enable smartcard)
+		$(use_enable static-libs static)
 		$(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_with usbredir usb-ids-path /usr/share/misc/usb.ids)
 		$(use_enable vala)
 		$(use_enable webdav)
-		$(use_enable dbus)
 		--disable-celt051
 		--disable-gtk-doc
 		--disable-maintainer-mode
@@ -133,10 +130,8 @@ src_compile() {
 src_install() {
 	default
 
-	dodoc AUTHORS NEWS README
-
 	# Remove .la files if they're not needed
-	use static-libs || prune_libtool_files
+	use static-libs || find "${D}" -name '*.la' -delete || die
 
 	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
 	readme.gentoo_create_doc