gentoo resync : 23.03.2018

7 files changed, 261 insertions, 47 deletions

diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index c315a075c902..93dccce1c818 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,8 +1,11 @@
 AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
 AUX spice-gtk-0.33-sys-sysmacros.h.patch 1459 BLAKE2B 105b5b5d11ecb1b34f69df8d0fe3e3b43b52f23d81affe65018fa1aeb6c2b8bcbe5a015d15cc7321436ef537c4a653a902c6e708b0d552c81426b98cfc8ff524 SHA512 9d3331f3a4d9c3b680ca78a0a8e430067d1cbc551865a3bba33bc4d2df64b716f8ac4d49fd2cb279f6e6ce870aab02aea29e93a8269664063245dcaee5942bc1
+AUX spice-gtk-0.34-libressl.patch 1539 BLAKE2B ff7826221a8e551999004c818be806bed8a254d7447d9233012b566941307b117789f73c32887a1d713fe7352a5dac26dfa0eaf67eeadf32283dc46b5f3c18eb SHA512 243ce8cfce2d5fd26b5dc8f5da985b0cf9e95290cb82336439d015352479018075408092425dbac5cabf815f1be95e85680058d9dc1900e992d37c2a04fb85d2
+AUX spice-gtk-0.34-openssl11.patch 518 BLAKE2B d9c692996f64ccfb61f16f2c8b620559d1321f35c74072c3e0c51a115f7d40039b7c6dd484cf3beec90c8950df5fbb42575ab62e3c309da3405b5217864b746b SHA512 f879a3f26be439a68e1f40e32e654eea301efc9f5494039b7166673337688f0832e180ab77863cde55627ee033572caf04d5bb08816d4272382d9dccf43ef7f1
 DIST spice-gtk-0.33.tar.bz2 1383927 BLAKE2B 96cbe8d3f81d596c4fd0d85cc0fd96588029a3b486327c64c5084b82e2c3acefee648a836ca46363dc03aff33dd72a4001c2ac8513b18b6479b56d11cc86f60e SHA512 ee5750194057a7f568641f6382d6969b67dc7271b4d13037570b79cdecd70a7eeb457ad349d3ed8e576f1fbd9701fac7d24607d5cbde8af0e030433b347abc80
 DIST spice-gtk-0.34.tar.bz2 1480566 BLAKE2B 35350cf930d091fa11df1d573f9eff23696745a20e88fcd20783c108b6ddca9064bc4e75d414f23bd94318e37d509e581866c5dcc955cd21ca7c9384b492f0ec SHA512 17ea737511855b47f5eaf5143756483542cf8ee83f8d276cbfb2c0407355f68ed329fcbed8a67737179f3e53587710634d6faa856590234ee68be7b4b13f2689
 EBUILD spice-gtk-0.33-r2.ebuild 3863 BLAKE2B ae6601e6c94762f4331d6b743b401fe74041982c4f650be44e21ddac374158e6ab46c3dfc6c6ea0fa8cbfe74c96cc6ea22b6a7c66965ab4c3966f8a658f94783 SHA512 c0f85f732c6b1d605ca494b230de817b45b7cf065c2a5be69f8e29aa860dacb8046056d4ac1c5877f842358fd84bc1ffd6526a7824fe7e620951d047179b177d
-EBUILD spice-gtk-0.34-r1.ebuild 3804 BLAKE2B 9de7efe611fdbe0f09ff62838372b3b5584f43bd09c555147b5bde9f46c4a8d6e436af63c41ecb63503f8a5274c3030eb5bf4b281c1530ab00239125c596a51b SHA512 8d567d8aa4fd2065242a2208ef16467ccbcaae9ccafafd73f3117696f45331aa95af4a0c1cf8fab4ae4cc0ddf95ccff18a7a775fb662f6d46dc306539ecc6727
-EBUILD spice-gtk-9999.ebuild 3743 BLAKE2B 086fcc06783c34ad8b537b46279283d3fd8979d8e2cfaed297e7ede4552897e5d0a07aa6b482932e453572478549e616f1b14c75a5a4d872bf15ecd6a0688ae5 SHA512 4d1d5c498f8d30b19a307198e336d3b0ac47519b6d21f353ddb27c6018e564823e1a40a28d032cf139609d1332a74bccf1332e58e54d362b6cb3a770be5435a5
-MISC metadata.xml 1179 BLAKE2B c1417aa6d49d8ac4477762a60b4c360ad857fbad4ad7f20c65482c1f6db5845c5cf6bc2e99d234411b9a087ac3c1a98ed394739a598573387656e83b7fe2491c SHA512 6cd0e7da9d10bdefe4180785f4c19a9b6579ac098622bf5423f00f291bdd49be60769eb230830b8aa348da2b0d91ba303576380cd1d8a56de6b27f0f49442515
+EBUILD spice-gtk-0.34-r2.ebuild 3753 BLAKE2B 32afab01aded3b60ab394874f978d7e79deb98be3f080e7dc37782b9ca89227ea0c3199980ae15673fef6f534748080a12e1f87ae57a298d79a2b08c13be94d9 SHA512 4329cc099cfc0ce5a4c939fbc057ba4421c537e4447d75f236e95f1d8635abbdf5073e8ab7fd29e0fe635562d834c991adc578b01fa67ca71c5ff2d0b918d637
+EBUILD spice-gtk-0.34-r3.ebuild 3838 BLAKE2B 6a3789e5ec78191addbda947d680fe0adf97970c7a2b47f0b9f015e29d1b9c159f23820a025149dc78df56d0d2c46480a27e53651891413a53b7022d78477b10 SHA512 8f9de4514153f47b1c26fd586dd4cd56a9c68140892d194950fa510755ae2f979ccc75d9e4a696a57ccafa0108464e758fb93216cc8f940debb47d7f0c8623d9
+EBUILD spice-gtk-9999.ebuild 3693 BLAKE2B a85fb7bd44fa36252f13c6d5a25fba4eb213e41a0c5b6d77c2bdbfe4e250981970f42c359175d1de41d81feb86e59ce6e524304eb8e3d8111181f1ec36f2e848 SHA512 3dc59d0315a6e4786a9af9d662647dfc056ce4ab4d2f57c1e308f767e19cd49a769b4fbbc9c8bb985f8b873569641f95e7099719df7fea02c894ecb00d4c882d
+MISC metadata.xml 1166 BLAKE2B 37cf826a7a49dc48170fb99e05b191964810eacbf8b13db383a37e70faed6a2b4b70acfd724eeffbbe10d97fab27bfec7d56cfb2cbc2537ac4df7612afdbe8d2 SHA512 5229ddeaf19765abee5b0120b066ac2049f77878b1b8886e2b552f2c56d6049df297b227f0bee36bbe6be7041b9d8e1c1d3d868c34b1e39b49a5c0bc16b2c947
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch b/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch
new file mode 100644
index 000000000000..e39efaee2746
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.34-libressl.patch
@@ -0,0 +1,43 @@
+https://bugs.gentoo.org/631250
+https://631250.bugs.gentoo.org/attachment.cgi?id=513720
+
+diff --git a/spice-common/common/ssl_verify.c b/spice-common/common/ssl_verify.c
+index a9ed650..821faa9 100644
+--- a/spice-common/common/ssl_verify.c
++++ b/spice-common/common/ssl_verify.c
+@@ -33,7 +33,7 @@
+ #include <string.h>
+ #include <gio/gio.h>
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+ static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
+ {
+     return M_ASN1_STRING_data(asn1);
+diff --git a/src/bio-gio.c b/src/bio-gio.c
+index 9358fae..30aa73b 100644
+--- a/src/bio-gio.c
++++ b/src/bio-gio.c
+@@ -23,7 +23,7 @@
+ #include "spice-util.h"
+ #include "bio-gio.h"
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+ static BIO_METHOD one_static_bio;
+ 
+ static int BIO_meth_set_read(BIO_METHOD *biom,
+diff --git a/src/spice-channel.c b/src/spice-channel.c
+index 4c3db9d..9df0203 100644
+--- a/src/spice-channel.c
++++ b/src/spice-channel.c
+@@ -55,7 +55,7 @@ static void spice_channel_reset_capabilities(SpiceChannel *channel);
+ static void spice_channel_send_migration_handshake(SpiceChannel *channel);
+ static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x10100000
++#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
+ static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
+ {
+     if (pkey->type != EVP_PKEY_RSA) {
+
diff --git a/net-misc/spice-gtk/files/spice-gtk-0.34-openssl11.patch b/net-misc/spice-gtk/files/spice-gtk-0.34-openssl11.patch
new file mode 100644
index 000000000000..572475d79a44
--- /dev/null
+++ b/net-misc/spice-gtk/files/spice-gtk-0.34-openssl11.patch
@@ -0,0 +1,16 @@
+https://617764.bugs.gentoo.org/attachment.cgi?id=522368
+https://bugs.gentoo.org/617764
+
+--- spice-gtk-0.34.orig/src/spice-channel.c	2017-07-12 10:23:31.000000000 +0200
++++ spice-gtk-0.34/src/spice-channel.c	2018-03-04 13:12:14.351051444 +0100
+@@ -392,8 +392,10 @@
+ 
+     g_type_class_add_private(klass, sizeof(SpiceChannelPrivate));
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     SSL_library_init();
+     SSL_load_error_strings();
++#endif
+ }
+ 
+ /* ---------------------------------------------------------------- */
diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
index a84b4fbfe9ac..72afe048bc6a 100644
--- a/net-misc/spice-gtk/metadata.xml
+++ b/net-misc/spice-gtk/metadata.xml
@@ -8,8 +8,7 @@
 	<use>
 		<flag name="dbus">Support for desktop integration such as
 			automounting and other APIs exposed by your DE via D-Bus</flag>
-		<flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of
-			<pkg>x11-libs/gtk+</pkg>:2</flag>
+		<flag name="gtk3">Build the spice client (spicy), requires <pkg>x11-libs/gtk+</pkg>:3</flag>
 		<flag name="lz4">Enable support for LZ4 compression using
 			<pkg>app-arch/lz4</pkg></flag>
 		<flag name="policykit">Enable <pkg>sys-auth/polkit</pkg> support for the
diff --git a/net-misc/spice-gtk/spice-gtk-0.34-r2.ebuild b/net-misc/spice-gtk/spice-gtk-0.34-r2.ebuild
new file mode 100644
index 000000000000..b3a488fb6cd8
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.34-r2.ebuild
@@ -0,0 +1,148 @@
+# 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) )
+"
+
+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.34-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.34-r3.ebuild
index c2b498522a49..3bba2079f5f8 100644
--- a/net-misc/spice-gtk/spice-gtk-0.34-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.34-r3.ebuild
@@ -15,7 +15,7 @@ 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"
+IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
 
 REQUIRED_USE="?? ( pulseaudio gstaudio )"
 
@@ -37,7 +37,6 @@ RDEPEND="
 		media-libs/gst-plugins-good:1.0
 		)
 	>=x11-libs/pixman-0.17.7
-	>=media-libs/celt-0.5.1.1:0.5.1
 	media-libs/opus
 	gtk3? ( x11-libs/gtk+:3[introspection?] )
 	>=dev-libs/glib-2.36:2
@@ -73,6 +72,11 @@ DEPEND="${RDEPEND}
 	vala? ( $(vala_depend) )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-libressl.patch
+	"${FILESDIR}"/${P}-openssl11.patch
+)
+
 src_prepare() {
 	# bug 558558
 	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
@@ -102,25 +106,26 @@ src_configure() {
 	fi
 
 	myconf="
-		--disable-maintainer-mode \
-		$(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-gtk-doc \
-		--disable-werror \
+		$(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}
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index 6dcfc676df85..d489cfc08da7 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -15,7 +15,7 @@ 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"
+IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
 
 REQUIRED_USE="?? ( pulseaudio gstaudio )"
 
@@ -37,7 +37,6 @@ RDEPEND="
 		media-libs/gst-plugins-good:1.0
 		)
 	>=x11-libs/pixman-0.17.7
-	>=media-libs/celt-0.5.1.1:0.5.1
 	media-libs/opus
 	gtk3? ( x11-libs/gtk+:3[introspection?] )
 	>=dev-libs/glib-2.36:2
@@ -102,25 +101,26 @@ src_configure() {
 	fi
 
 	myconf="
-		--disable-maintainer-mode \
-		$(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-gtk-doc \
-		--disable-werror \
+		$(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}