gentoo resync : 18.11.2018

4 files changed, 6 insertions, 160 deletions

diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 69057dab4d0c..bb001fb4bd2b 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -4,7 +4,6 @@ AUX spice-gtk-0.34-openssl11.patch 518 BLAKE2B d9c692996f64ccfb61f16f2c8b620559d
 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 3752 BLAKE2B e27f8a92b0284f6fa2296f0a5f7cb38d01eec7e7502e6730186094835d9ce3b397f002206a976a861ef9e2ef904b8256d696c6e46783c30875b16781df597875 SHA512 1c756aa20ca07af0bf3796b7e42bf76337a15ac3d5aa794eee24649ff9f503e014e7bfc8ac815b6117f5ceca3c2f8461af94cdb89b8119217ab21dff78bd7b1c
-EBUILD spice-gtk-0.34-r3.ebuild 3838 BLAKE2B 6a3789e5ec78191addbda947d680fe0adf97970c7a2b47f0b9f015e29d1b9c159f23820a025149dc78df56d0d2c46480a27e53651891413a53b7022d78477b10 SHA512 8f9de4514153f47b1c26fd586dd4cd56a9c68140892d194950fa510755ae2f979ccc75d9e4a696a57ccafa0108464e758fb93216cc8f940debb47d7f0c8623d9
-EBUILD spice-gtk-0.35.ebuild 3809 BLAKE2B 8bd08c0129f60b4a12f95b166b7f773eefc32452a5490350e0002577e4325b6e94249297526099126a95bd25e3a36b6765066248fb590789d1fbce65306ec4a2 SHA512 b4a0eaba4761d9cdd99fbc8d8c81593084f21a62c61961dcfd44bcdfeb76bfddfe4b89cf22966c58359e2e3c712336fe6233f0d3f66844b0e53c2be780db1ec0
-EBUILD spice-gtk-9999.ebuild 3693 BLAKE2B a85fb7bd44fa36252f13c6d5a25fba4eb213e41a0c5b6d77c2bdbfe4e250981970f42c359175d1de41d81feb86e59ce6e524304eb8e3d8111181f1ec36f2e848 SHA512 3dc59d0315a6e4786a9af9d662647dfc056ce4ab4d2f57c1e308f767e19cd49a769b4fbbc9c8bb985f8b873569641f95e7099719df7fea02c894ecb00d4c882d
+EBUILD spice-gtk-0.35.ebuild 3804 BLAKE2B aa969c2458a6b0d1b7343b9d7522adb72035a3d4e1f653e3d41d1a309246957ab2f061e385f4730de0ff2648090f9822476474b06be1dc0aae987f05bac07e02 SHA512 b2a660c9042a1d388a46b9a89ec9e0ea4ad8b209358fbb95bed23f8c735ac3c3c761f7e8e7a262a9fd01a38d1b7c2efdcf99d6de597272072d80095856d6d01e
+EBUILD spice-gtk-9999.ebuild 3690 BLAKE2B 21d8b47a79d30bd04c866f34cc108928e35657024dd82ad5ed9745fd68d1167b0af3cdf49c6386e55e2492d44253503b7ec2aea8df473645c1810c4eade83cb4 SHA512 f828c3f844505d214aeef9c05db82c547ae21415e34653dbf2e0d2157aaed5ddb4d8c2d94f1537980feea69b8d9222292cfd7cf7fbabe5a76e6d88b8c0298e39
 MISC metadata.xml 1166 BLAKE2B 37cf826a7a49dc48170fb99e05b191964810eacbf8b13db383a37e70faed6a2b4b70acfd724eeffbbe10d97fab27bfec7d56cfb2cbc2537ac4df7612afdbe8d2 SHA512 5229ddeaf19765abee5b0120b066ac2049f77878b1b8886e2b552f2c56d6049df297b227f0bee36bbe6be7041b9d8e1c1d3d868c34b1e39b49a5c0bc16b2c947
diff --git a/net-misc/spice-gtk/spice-gtk-0.34-r3.ebuild b/net-misc/spice-gtk/spice-gtk-0.34-r3.ebuild
deleted file mode 100644
index 3bba2079f5f8..000000000000
--- a/net-misc/spice-gtk/spice-gtk-0.34-r3.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GCONF_DEBUG="no"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools 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/"
-
-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 )"
-
-# 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.36:2
-	>=x11-libs/cairo-1.2
-	virtual/jpeg:0=
-	sys-libs/zlib
-	introspection? ( dev-libs/gobject-introspection )
-	lz4? ( app-arch/lz4 )
-	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
-			!~sys-auth/polkit-0.111 )
-		)
-	webdav? (
-		net-libs/phodav:2.0
-		>=dev-libs/glib-2.43.90:2
-		>=net-libs/libsoup-2.49.91 )
-"
-DEPEND="${RDEPEND}
-	>=app-emulation/spice-protocol-0.12.13
-	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) )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-libressl.patch
-	"${FILESDIR}"/${P}-openssl11.patch
-)
-
-src_prepare() {
-	# bug 558558
-	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-	echo GIT_CEILING_DIRECTORIES=${GIT_CEILING_DIRECTORIES}
-
-	default
-
-	eautoreconf
-
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	# 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
-
-	# Clean up environment, bug #586642
-	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_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-celt051
-		--disable-gtk-doc
-		--disable-maintainer-mode
-		--disable-werror
-		--enable-pie"
-
-	econf ${myconf}
-}
-
-src_compile() {
-	# 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
-
-	default
-}
-
-src_install() {
-	default
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-
-	# Remove .la files if they're not needed
-	use static-libs || prune_libtool_files
-
-	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-	readme.gentoo_create_doc
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.35.ebuild b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
index 707c9f7ae81b..07085d1e6183 100644
--- a/net-misc/spice-gtk/spice-gtk-0.35.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ 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"
+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 )"
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index d489cfc08da7..6e44cc0b2cb8 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -63,7 +63,7 @@ RDEPEND="
 		>=net-libs/libsoup-2.49.91 )
 "
 DEPEND="${RDEPEND}
-	=app-emulation/spice-protocol-9999
+	~app-emulation/spice-protocol-9999
 	dev-perl/Text-CSV
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.40.0