gentoo auto-resync : 04:06:2023 - 09:34:05

3 files changed, 36 insertions, 23 deletions

diff --git a/net-misc/spice-gtk/Manifest b/net-misc/spice-gtk/Manifest
index 75b73dd86cf3..717645a434f5 100644
--- a/net-misc/spice-gtk/Manifest
+++ b/net-misc/spice-gtk/Manifest
@@ -1,5 +1,5 @@
 AUX README.gentoo 527 BLAKE2B 5f02dbe14485894513b67bfb8b6f6159321e081f82f24c76a4b05f1463f8a6e332fffb2510b791a04fb9ad99ce7caba761b313fe2252c8d44893faa6ccef0d29 SHA512 2f8a79f6eea330ac9a6927c6cce29f9232c3c0650436f3f4c459d324bd5054a4ad82786d926e5e4c7384e74cb84d1fbb387c25b0b4c27fdb9514d526cbe02f9b
 DIST spice-gtk-0.42.tar.xz 812776 BLAKE2B 406a2218d4ec0765173c911d6305cb0e043cd575c53ba51cbd53d922835b9d395873143f2388a5a02ee60ce617e32a1cb6a95008b67deec787fcf67da0d49736 SHA512 fd567e35f6d4ebfe6ef004f358dca4c41254336f55f7dd26cf67b62b2acb4866907186bd0526b7cb52b0c24020cdc8809251127498a8d357555bb0c5d3b8f137
-EBUILD spice-gtk-0.42-r1.ebuild 3856 BLAKE2B dee17752893e2edad7beff74b5df34cdb96a3c180c185a2ef2c62527cd8cffdaf05d17441516d05dc1792bb4bf259a9cf4b25a48cf157c13b2c89bc047f6d662 SHA512 61a7247eff97b356e01a24e38f2c43b6d6fe3c2ab1728e263801ac433985499018300cf04dcf415c913d685410812f0d26df41ca567b141d8b68799ab6c04207
-EBUILD spice-gtk-9999.ebuild 3708 BLAKE2B 7fd961954d00a1ddaf20572aeef35f160d973d54b1c9f3e89b3a1b02f57b8f51ed6945bc68eae8303699848fa0b96616232c6816f97906a3bf6c19787475103c SHA512 d09f9cb4d7a945a63f157aa03dc99c27ff2bc2faa2e94f394932b1200fa092ed1295519f66421d0c527f1d3960917735e67e9cc7c7fc0de5e997cdfff5f95b60
+EBUILD spice-gtk-0.42-r2.ebuild 3918 BLAKE2B 041aadd8194b703fb4bc840c1a7eb646f6a6ce4edc510c1142da2938b5b2c58a2f0d3ebd3fc4b9d80bb937e750af8127c0a4b38fe65e494c3817e9744b40d9c3 SHA512 4739b4baad3093cc35de65c4024a17f7bde796fbbd8d02a7db75e218452ddce3d237d9c458fa360d264f26ac3be859cfc64908939c66880875f11cfd6a82f5a5
+EBUILD spice-gtk-9999.ebuild 3921 BLAKE2B f331e45d82b251cb46015fd1825fc616968bfe0a5059002191c5a756283b34d7662bc854532cb05ee00d607a1e5aa8ac5b7d1053933d554f58ede25ef77030d5 SHA512 9bef8e2563a856e24fe230b4e3b8f433786493e31a84e72476f929839dad4ee7b35575d5a1238e059a76f5ce5614650d63af31f50646f8a27a5963431c0ef4a9
 MISC metadata.xml 878 BLAKE2B ed1c920773825632995e541e6bc7ec0b894005edcff41c90c2af4a47279db54bcc695b22e91e7aa3c1376cee6ed509f985cb7486a2f7d75e8b6ebbb8c6caa67b SHA512 308ea78d044e3c13ed40154b4835f202dc523fc8925aa3ad0304ddb6518a9c51437ebccc539998b8d55d6919649358a073b5c80a2e8dd0d8e82bb4e0ab6c6d0a
diff --git a/net-misc/spice-gtk/spice-gtk-0.42-r1.ebuild b/net-misc/spice-gtk/spice-gtk-0.42-r2.ebuild
index 9c0ef059a36d..fe18fb9f4736 100644
--- a/net-misc/spice-gtk/spice-gtk-0.42-r1.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.42-r2.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala valgrind wayland webdav"
+IUSE="gtk-doc +gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala valgrind wayland webdav"
 
 # TODO:
 # * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
@@ -65,25 +65,28 @@ RDEPEND="
 # 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}
+RDEPEND="
+	${RDEPEND}
 	amd64? ( media-libs/libva:= )
 	arm64? ( media-libs/libva:= )
 	x86? ( media-libs/libva:= )
 "
-DEPEND="${RDEPEND}
+DEPEND="
+	${RDEPEND}
 	>=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER}
-	valgrind? ( dev-util/valgrind )"
+	valgrind? ( dev-util/valgrind )
+"
 BDEPEND="
+	$(python_gen_any_dep '
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')
 	dev-perl/Text-CSV
 	dev-util/glib-utils
-	dev-util/gtk-doc
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
+	gtk-doc? (  dev-util/gtk-doc )
 	vala? ( $(vala_depend) )
-	$(python_gen_any_dep '
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-	')
 "
 
 python_check_deps() {
@@ -101,6 +104,7 @@ src_prepare() {
 
 src_configure() {
 	local emesonargs=(
+		$(meson_feature gtk-doc gtk_doc)
 		$(meson_feature gtk3 gtk)
 		$(meson_feature introspection)
 		$(meson_use mjpeg builtin-mjpeg)
diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index 1c112cadb3cb..1f2e35fdf1d5 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -17,14 +17,14 @@ if [[ ${PV} == *9999* ]] ; then
 	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"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~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"
+IUSE="gtk-doc +gtk3 +introspection lz4 mjpeg policykit sasl smartcard usbredir vala valgrind wayland webdav"
 
 # TODO:
 # * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
@@ -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
@@ -65,23 +65,28 @@ RDEPEND="
 # 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}
+RDEPEND="
+	${RDEPEND}
 	amd64? ( media-libs/libva:= )
 	arm64? ( media-libs/libva:= )
 	x86? ( media-libs/libva:= )
 "
-DEPEND="${RDEPEND}
-	>=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER}"
+DEPEND="
+	${RDEPEND}
+	>=app-emulation/spice-protocol-${SPICE_PROTOCOL_VER}
+	valgrind? ( dev-util/valgrind )
+"
 BDEPEND="
+	$(python_gen_any_dep '
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')
 	dev-perl/Text-CSV
 	dev-util/glib-utils
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
+	gtk-doc? (  dev-util/gtk-doc )
 	vala? ( $(vala_depend) )
-	$(python_gen_any_dep '
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-	')
 "
 
 python_check_deps() {
@@ -92,11 +97,14 @@ python_check_deps() {
 src_prepare() {
 	default
 
+	python_fix_shebang subprojects/keycodemapdb/tools/keymap-gen
+
 	use vala && vala_setup
 }
 
 src_configure() {
 	local emesonargs=(
+		$(meson_feature gtk-doc gtk_doc)
 		$(meson_feature gtk3 gtk)
 		$(meson_feature introspection)
 		$(meson_use mjpeg builtin-mjpeg)
@@ -106,6 +114,7 @@ src_configure() {
 		$(meson_feature smartcard)
 		$(meson_feature usbredir)
 		$(meson_feature vala vapi)
+		$(meson_use valgrind)
 		$(meson_feature webdav)
 		$(meson_feature wayland wayland-protocols)
 	)