gentoo new year resync : 01.01.2021

3 files changed, 143 insertions, 2 deletions

diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index e6415dc56e0e..8f0f84d8c416 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -3,6 +3,7 @@ AUX spice-gtk-0.37-adjust-to-window-scaling.patch 5257 BLAKE2B a60692c0e08cfed49
 DIST spice-gtk-0.37.tar.bz2 1303111 BLAKE2B cf4b6664ac86d126cf14f1a31b1df93079e15fc0a0af69bfaf61cb84284daa7b6b8cb2a2ee3345f6a475838ffc0fb2a2b0bdd61301e2c1479fb5f5e0c28babbe SHA512 a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029
 DIST spice-gtk-0.38.tar.xz 796112 BLAKE2B c1542b5b76f9e23ffd1910273f358f656198829b1f615c6a8e0931a79d14920132c861facd534f4cf05f03c4f64a50f628f7daa93be581d5ac815f224b81fe16 SHA512 27b44ac9f0cee2737ce03bb3f47c62fc0ee2402c291c49fc56cffc4ccb63e2cab001a68ba865a6375d82cb38444408d59c68469783ee4279fa818d8682e902f3
 EBUILD spice-gtk-0.37-r2.ebuild 3737 BLAKE2B 1b379af9d6f19b31fe90150bf455c93eb5b1130789b70040ee5e82f9a8d073593744e7a965c5d88742012f7ee27d98e04c181885ab107d77aa0903499676d33b SHA512 20952e0c0b3ce3e3d8ba329f28b01fd3f0d2fd580f6ef67aa651c026fe93ceefbd8f05b9023a85b3ddfe41bae562fdd7b59455e7d5aecee9fb9253bd566390c0
+EBUILD spice-gtk-0.38-r1.ebuild 3382 BLAKE2B 6cad1b6f314437630b29c183abe7fe93b4eed5ac70c22096d54e495d1f0ad62a750a2810207258a0a936456d3dd1c44f1907f978684278a6b628d8f1056d5f1a SHA512 5edcb316574f32a5dde19ae3abdf00ebe37d9fe632ba245912229896318e7f4bcfe19f30534eaf750d1e4aa552cfe915159c088585384ccf1526abb38b86ac7e
 EBUILD spice-gtk-0.38.ebuild 2982 BLAKE2B d055699e445e617d196fc3d96439a6655ffa04c1a5470c7d075bd67dfd02c1a7ee193fe2874e633fe931c8752068b5048e4f807b6f16c7c14eb818250dd2d522 SHA512 3a16071be02e1cdcc7f6ecda433b3909594b9a65a8013d3177f21340c8114e4528dedadb835843b1e51b36219cf10ef5ce9ffec09bfeeebdac5d5cfed0e22810
-EBUILD spice-gtk-9999.ebuild 2940 BLAKE2B 0cb8a953ead5b86666cdcb1d40d73d41154747373f9a680e4dcb05fd6a0f75462da1baebc6a7dd8a230988ed5651fd151980f82a16347e67a5d2df9d2f750f97 SHA512 5d435006992d90b633bf41a20dc516ffb1c6776fb96605df13f5b52575fada55bbb66dfc525feb2bd045d82ce26cc1bb856741a315fe4dd3565c97784dc8454d
+EBUILD spice-gtk-9999.ebuild 3235 BLAKE2B 5926310e84c13cfc0814c2eb08c2bfccbfe69afd7ed06f5d2d8ea4d818150578b60431d479b58b702bddbcf9b4cbbca2ac6e4ac907a2352fb32a0bd2e4e14bac SHA512 f3a3ab3053219df825ad1ac6a88be816ebd72521a626d11b9f034657e9c8b42652e7d8f16c17ecebab7d79d0952f58701b1ebfebb136745565bdf4a397fd6e6f
 MISC metadata.xml 785 BLAKE2B b9448548d4a31423a95447eda043cf100df88fe9264889c2909442b64b54cc2d055c9faa8fa7698a161df5c838b1b38e1b1bd6d5c7b4d76ff67d33b48203cac9 SHA512 c5bf0dfd74d054fdef09eb86a98aadfa9c28fa1c2986b01a61c66151542c574db79710332ff0ccad45635278f57f7636d294ec3d0d2523a4cdc8a7c4cbbdddd0
diff --git a/net-misc/spice-gtk/spice-gtk-0.38-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.38-r1.ebuild
new file mode 100644
index 000000000000..0102b373e378
--- /dev/null
+++ b/net-misc/spice-gtk/spice-gtk-0.38-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit desktop eutils meson python-any-r1 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/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+gtk3 +introspection libressl lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav"
+
+# 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="
+	>=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[introspection?]
+	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-plugins/gst-plugins-pulse:1.0
+	)
+	sasl? ( dev-libs/cyrus-sasl )
+	smartcard? ( app-emulation/qemu[smartcard] )
+	usbredir? (
+		sys-apps/hwids
+		>=sys-apps/usbredir-0.4.2
+		virtual/libusb:1
+		policykit? (
+			sys-apps/acl
+			>=sys-auth/polkit-0.110-r1
+		)
+	)
+	webdav? (
+		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-0.14.1
+	dev-perl/Text-CSV
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.14
+	>=dev-util/intltool-0.40.0
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+BDEPEND="
+	$(python_gen_any_dep '
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+	')
+"
+
+python_check_deps() {
+	has_version "dev-python/six[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^                              '-Werror',/d" \
+		subprojects/spice-common/meson.build || die
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature gtk3 gtk)
+		$(meson_feature introspection)
+		$(meson_use mjpeg builtin-mjpeg)
+		$(meson_feature policykit polkit)
+		$(meson_feature pulseaudio pulse)
+		$(meson_feature lz4)
+		$(meson_feature sasl)
+		$(meson_feature smartcard)
+		$(meson_feature usbredir)
+		$(meson_feature vala vapi)
+		$(meson_feature webdav)
+	)
+
+	if use usbredir; then
+		emesonargs+=( -D "usb-acl-helper-dir=/usr/libexec" )
+		emesonargs+=( -D "usb-ids-path=/usr/share/misc/usb.ids" )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	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 e262e6bf9e87..c507c8b5b368 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -6,7 +6,9 @@ EAPI=7
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-inherit desktop eutils git-r3 meson readme.gentoo-r1 vala xdg-utils
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit desktop eutils git-r3 meson python-any-r1 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/"
@@ -74,6 +76,18 @@ DEPEND="${RDEPEND}
 	vala? ( $(vala_depend) )
 "
 
+BDEPEND="
+	$(python_gen_any_dep '
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+	')
+"
+
+python_check_deps() {
+	has_version "dev-python/six[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
 src_prepare() {
 	default