gentoo auto-resync : 04:06:2023 - 03:33:17

4 files changed, 12 insertions, 154 deletions

diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index d0dfe4113042..75b73dd86cf3 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,7 +1,5 @@
 AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
-DIST spice-gtk-0.41.tar.xz 827320 BLAKE2B bed8e62647ca9fde8a3b534a3d9720dee829f222442edb589e6ff569ce9a49f16e3c99bad4798a22e8a551d0d89875043c2335e2b08a80901483ace6a1948d6d SHA512 bfd97c98c8bdbc29da0f26c38dfcf75d9f17e5358d4c7fa9c36e4974d0df3ce92409ca568dfc790d43f581d00b94090d9e60154e83220a719d678b596c87fcef
 DIST spice-gtk-0.42.tar.xz 812776 BLAKE2B 406a2218d4ec0765173c911d6305cb0e043cd575c53ba51cbd53d922835b9d395873143f2388a5a02ee60ce617e32a1cb6a95008b67deec787fcf67da0d49736 SHA512 fd567e35f6d4ebfe6ef004f358dca4c41254336f55f7dd26cf67b62b2acb4866907186bd0526b7cb52b0c24020cdc8809251127498a8d357555bb0c5d3b8f137
-EBUILD spice-gtk-0.41-r1.ebuild 3705 BLAKE2B 4964c83adc8d8694655b6268529abad0ba4b37095a0928e9aa98c571e7e4f69de23ab95b341f3b1708371edf664050d5d7b0b56a8a1de4ab4dd0b4f989b75c1c SHA512 42e65cc900d1830343e972aeb1ac1a368178e5348ef2e20e1adcd7a3616d398a8f2666765c91be43fb8366bbd71b4e7651c61f18256f8df5fe52514ad6f294aa
-EBUILD spice-gtk-0.42.ebuild 3778 BLAKE2B 8c1d1cdcab68bf3df9f4cc1e7cc2607047411b5ac2ea5bc9e2c5e7596291f62ca1eb0901ba0a20b18c6a4d7d46a79ddd4d6f45f661dc855bd199808302bbf013 SHA512 83ea86a108260aeb36bc7cd495769e6920bf22b5bf952031d40dc85af979897e80b332c05b1ed79a8ac204be94721362af868cefe036ed2eee9763927bc8368f
+EBUILD spice-gtk-0.42-r1.ebuild 3856 BLAKE2B dee17752893e2edad7beff74b5df34cdb96a3c180c185a2ef2c62527cd8cffdaf05d17441516d05dc1792bb4bf259a9cf4b25a48cf157c13b2c89bc047f6d662 SHA512 61a7247eff97b356e01a24e38f2c43b6d6fe3c2ab1728e263801ac433985499018300cf04dcf415c913d685410812f0d26df41ca567b141d8b68799ab6c04207
 EBUILD spice-gtk-9999.ebuild 3708 BLAKE2B 7fd961954d00a1ddaf20572aeef35f160d973d54b1c9f3e89b3a1b02f57b8f51ed6945bc68eae8303699848fa0b96616232c6816f97906a3bf6c19787475103c SHA512 d09f9cb4d7a945a63f157aa03dc99c27ff2bc2faa2e94f394932b1200fa092ed1295519f66421d0c527f1d3960917735e67e9cc7c7fc0de5e997cdfff5f95b60
-MISC metadata.xml 786 BLAKE2B 92848ffe7209398af8bb17b6ec7017474aac7abfd9b2d1babdf9724c909ab364c53d23115d46c7cfc316ac2014c56d89a80590924e5fa31302b9a9016783e30d SHA512 1de921c89ecdeeaf601d8a362f025ed636a4125152a5042e51ca7c54c1b0dbe479566ad9528913c24209ac4c22c94c7b8a927bf6e352ea8223c65408af3a7dfa
+MISC metadata.xml 878 BLAKE2B ed1c920773825632995e541e6bc7ec0b894005edcff41c90c2af4a47279db54bcc695b22e91e7aa3c1376cee6ed509f985cb7486a2f7d75e8b6ebbb8c6caa67b SHA512 308ea78d044e3c13ed40154b4835f202dc523fc8925aa3ad0304ddb6518a9c51437ebccc539998b8d55d6919649358a073b5c80a2e8dd0d8e82bb4e0ab6c6d0a
diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
index 8ad630bb0db4..ae48364fa719 100644
--- a/net-misc/spice-gtk/metadata.xml
+++ b/net-misc/spice-gtk/metadata.xml
@@ -15,4 +15,7 @@
 		<flag name="webdav">Support for folder-sharing between guest and client
 			using <pkg>net-libs/phodav</pkg></flag>
 	</use>
+	<upstream>
+		<remote-id type="freedesktop-gitlab">spice/spice-gtk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-misc/spice-gtk/spice-gtk-0.41-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.41-r1.ebuild
deleted file mode 100644
index a4a600e5f8d8..000000000000
--- a/net-misc/spice-gtk/spice-gtk-0.41-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit desktop meson optfeature python-any-r1 readme.gentoo-r1 vala xdg
-
-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/"
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
-	inherit git-r3
-
-	SPICE_PROTOCOL_VER=9999
-else
-	SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-	SPICE_PROTOCOL_VER=0.14.3
-fi
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala wayland 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
-	media-libs/libjpeg-turbo:=
-	sys-libs/zlib
-	>=x11-libs/cairo-1.2
-	>=x11-libs/pixman-0.17.7
-	x11-libs/libX11
-	gtk3? ( x11-libs/gtk+:3[introspection?] )
-	introspection? ( dev-libs/gobject-introspection )
-	dev-libs/openssl:=
-	lz4? ( app-arch/lz4 )
-	sasl? ( dev-libs/cyrus-sasl )
-	smartcard? ( app-emulation/qemu[smartcard] )
-	usbredir? (
-		sys-apps/hwdata
-		>=sys-apps/usbredir-0.4.2
-		virtual/acl
-		virtual/libusb:1
-		policykit? (
-			>=sys-auth/polkit-0.110-r1
-		)
-	)
-	webdav? (
-		net-libs/phodav:3.0
-		net-libs/libsoup:3.0
-	)
-"
-# TODO: spice-gtk has an automagic dependency on media-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? ( media-libs/libva:= )
-	arm64? ( media-libs/libva:= )
-	x86? ( media-libs/libva:= )
-"
-DEPEND="${RDEPEND}
-	>=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER}"
-BDEPEND="
-	dev-perl/Text-CSV
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	$(python_gen_any_dep '
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-	')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/six[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	use vala && vala_setup
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature gtk3 gtk)
-		$(meson_feature introspection)
-		$(meson_use mjpeg builtin-mjpeg)
-		$(meson_feature policykit polkit)
-		$(meson_feature lz4)
-		$(meson_feature sasl)
-		$(meson_feature smartcard)
-		$(meson_feature usbredir)
-		$(meson_feature vala vapi)
-		$(meson_feature webdav)
-		$(meson_feature wayland wayland-protocols)
-	)
-
-	if use elibc_musl; then
-		emesonargs+=(
-			-Dcoroutine=gthread
-		)
-	fi
-
-	if use usbredir; then
-		emesonargs+=(
-			-Dusb-acl-helper-dir=/usr/libexec
-			-Dusb-ids-path="${EPREFIX}"/usr/share/hwdata/usb.ids
-		)
-	fi
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use usbredir && use policykit; then
-		# bug #775554 (and bug #851657)
-		fowners root:root /usr/libexec/spice-client-glib-usb-acl-helper
-		fperms 4755 /usr/libexec/spice-client-glib-usb-acl-helper
-	fi
-
-	make_desktop_entry spicy Spicy "utilities-terminal" "Network;RemoteAccess;"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "Sound support (via pulseaudio)" media-plugins/gst-plugins-pulse
-}
diff --git a/net-misc/spice-gtk/spice-gtk-0.42.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r1.ebuild
index 2e31ef2729a7..9c0ef059a36d 100644
--- a/net-misc/spice-gtk/spice-gtk-0.42.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.42-r1.ebuild
@@ -45,6 +45,9 @@ RDEPEND="
 	introspection? ( dev-libs/gobject-introspection )
 	dev-libs/openssl:=
 	lz4? ( app-arch/lz4 )
+	policykit? (
+		>=sys-auth/polkit-0.110-r1
+	)
 	sasl? ( dev-libs/cyrus-sasl )
 	smartcard? ( app-emulation/qemu[smartcard] )
 	usbredir? (
@@ -52,9 +55,6 @@ RDEPEND="
 		>=sys-apps/usbredir-0.4.2
 		virtual/acl
 		virtual/libusb:1
-		policykit? (
-			>=sys-auth/polkit-0.110-r1
-		)
 	)
 	webdav? (
 		net-libs/phodav:3.0
@@ -76,12 +76,13 @@ DEPEND="${RDEPEND}
 BDEPEND="
 	dev-perl/Text-CSV
 	dev-util/glib-utils
+	dev-util/gtk-doc
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 	$(python_gen_any_dep '
-		dev-python/six[${PYTHON_USEDEP}]
 		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
 	')
 "
 
@@ -93,6 +94,8 @@ python_check_deps() {
 src_prepare() {
 	default
 
+	python_fix_shebang subprojects/keycodemapdb/tools/keymap-gen
+
 	use vala && vala_setup
 }