gentoo auto-resync : 14:05:2023 - 16:01:32

6 files changed, 140 insertions, 49 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 3b4a05ea2c53..9c08881cef91 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/libguestfs-appliance/Manifest b/app-emulation/libguestfs-appliance/Manifest
index 05b5772821ae..c34a23d7d09b 100644
--- a/app-emulation/libguestfs-appliance/Manifest
+++ b/app-emulation/libguestfs-appliance/Manifest
@@ -1,4 +1,4 @@
 AUX env.file 47 BLAKE2B 2b9034e60acea9f2300ec234a7ccdd6b438d2370808f8c30c8470c735287d1ed5ee6f75f0c1fa05423a39e558ca5daa258de44b1125999ac47e289c7c4df332d SHA512 74b5c63ab4421238b4e2c54dfc9579dea719101c0b9066341ddf3aa64ff1ed739e6d38e837b388ded1f741bc57c47a52772bf22ee52318acc5cb34908f1df1fd
 DIST appliance-1.46.0.tar.xz 145436856 BLAKE2B d9ed31f533a2772b0f506176b39bfdfdec1421fe4ff7934ccdb1db0cb2644d477211ec1a2d372d7e5dd0a8f278f47a39bff813b7bc4c9a038258a5f6358b4e91 SHA512 842119bdf95dbbd61328891e9bd0b557bed90ba79c6419ee18d1a79cd4a301ea6922339b9e80ac314ff3e16498e9d3c594861aebe8e0fc2db41d285eb8e5d578
-EBUILD libguestfs-appliance-1.46.0.ebuild 1276 BLAKE2B 15a836f9fdc727488040c1ac088c783774bfc7bbadb92acd68c2d2e6a09f40454ee2f20833243776c6284ea675cf8c38c148b6972bd8455387569339d2396e62 SHA512 f2ec240206b089e97838c5a0389f1da6e016ccb20435e677591a0371767d2bb44373bb52550df380f14d13914b4d4f045b786b2a177d240b5936709a798f8156
+EBUILD libguestfs-appliance-1.46.0.ebuild 1276 BLAKE2B 345f96a34bba44962bde9a5519ae48b31efee8a5dc20c47a31241cc1d438f9492a844e6cf959b28a62b49fae6805fc87ef520dc9cdd526ac52067c72030566cc SHA512 b78dfdce10db4ea0a7cdcddcdcccdc6e341f6b05223fa7831be8c45e015280383d8e8336ae0ddece18fc1214b9b8d9faa3b0dee12619bbfc702abf6fa6f9ae73
 MISC metadata.xml 290 BLAKE2B 8084923ecdcdc254e65a614e963d9f97d1e22855e69c30f8843ae7e1fdc2d983efbc70a9165a4113e0dd6a14aaade55cd260cc58b3823895effaed2d26d98951 SHA512 c727a188cfcc8f4c475518d79c44c4d0b9c2b37061a13a9e62121b564228ee3923c696800080cba3e4549ce0cba5efc59fd71cba9917ce79d40444b670ad7ad7
diff --git a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild
index cd4ef2e43f0b..8322e7a5b674 100644
--- a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild
+++ b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.46.0.ebuild
@@ -31,7 +31,7 @@ src_unpack() {
 
 src_install() {
 	dodir /usr/share/guestfs
-	cd "${ED}"/usr/share/guestfs || Die
+	cd "${ED}"/usr/share/guestfs || die
 	unpack ${A}
 
 	cd appliance || die
diff --git a/app-emulation/spice/Manifest b/app-emulation/spice/Manifest
index c6b3e6d6ee57..830007ea1647 100644
--- a/app-emulation/spice/Manifest
+++ b/app-emulation/spice/Manifest
@@ -2,7 +2,9 @@ AUX README.gentoo 270 BLAKE2B 979c3e8d2a3c1d4f30af8f2d9954434dd685abf42992abf0e6
 DIST spice-0.15.0-pthread-c5fe3df1.patch.bz2 7605 BLAKE2B 86b8094a22a02080db038ef98972bf09f391d5344fee8df2aa7d2def0b50a581353cb0e3dd97f99bbd58b88a13ceac4b54be8086a9f4274f38d132b27b62e84d SHA512 5075bd260b33c2dad8c3ce641372383871f7d69190a4f4697bd5e12af1bf5429310c592961de001d36c19a9cdd91143b8d6e8be0e08b3850b9700c2aef2ddd78
 DIST spice-0.15.0.tar.bz2 1537970 BLAKE2B 98e8f55de81a86c6370e4a74c0fd90db78a9a8e8e3af536bccd6a2a75185194ac7b87521163090c4312e392d2ee10036c0283171c7796aea630e1307128a2d55 SHA512 0a776d191c395ce1f7ebbbac47956a00a2765327d3127aeca6e232bd56fd4ccd28750ae1599eb6eb2909ac909cda517d5511faa631166db16b8b75bd4e7b86d9
 DIST spice-0.15.1.tar.bz2 1623290 BLAKE2B 19ddb3cac91be07a4a358ed89a5e4d1a5c406a9831b8c8a518764055354ecf6e09d129ae03ba65d876669da72f2cbf0c307261564097f60951711e9852eebb69 SHA512 362ab2f0b483911830693834515e1d331a6b929c5c63fd4522e843c42bbb7d8a52510d60f5f17d175dd2617c9621630f6a81f3ff7dce11dc28e6fb135e60fa86
+DIST spice-0.15.2.tar.bz2 1663326 BLAKE2B 00f5393ac409590b8fe0203251b811a4fe6dca16e644a30dd8165d57ff28cbef3b2f9c2a92ff7d2f6c8092bbef4f89a4e85ef9228cc8c03b0a163ffa3afaf9f6 SHA512 c8f273b9e97ef38a03b331f7d32c5f0a09d540523fe626568c845152cbd22273a92b3a08bc13fa2e061b913ad16ceb7cbddf142655cd9cdcd8eb5f646fa6aa26
 EBUILD spice-0.15.0.ebuild 2604 BLAKE2B 40d0d68bfd8232c0374cfa5dc008b2517a2b29d18adf1f1586a01476e267005aedeaae3e4bd73aba253bf745d6f4f21a84d02b37f58bd9ded36495bb0188c407 SHA512 33ede49338fd89cd78b8e8ee1729cf41bd643f64499581a3db4544dbb869f4d01cef213e5f160a6b45db6161e7116591fbd6028569e1aff55f3624831c9e829f
 EBUILD spice-0.15.1-r1.ebuild 2566 BLAKE2B 89e3b2b4a8e94a05d1e732840b8f0117d1a6db4d628db3153b87c087bf86318c50a1262ea2ad040240197ed0a111e4c62d61f52b5355379125536ac424d168a7 SHA512 717a04f73fcc6cfd49f11e40d59521da0596d9d31e43443f836892500ca27c86ccb77c0141ceb99959bcc3e183c0ef84ff27126f253109f7001d32d0b6eb36b6
-EBUILD spice-9999.ebuild 2325 BLAKE2B 1a54f0320352d0df4a840b2b08c493e931dd4dcd28fdd7765c76b8c57e4cf8ca5b436bb8985a0450805156e7705db15a67ecf9bc91d7faf342f1f0afae88ec27 SHA512 f519394f922373f99be2615bc438e3b4a2d42f92afb4c64e608445328ca7897e05ab60e9192c6174f690f770cc090f081ca153a5c1761efc6be7aca678d312e3
+EBUILD spice-0.15.2.ebuild 2379 BLAKE2B 7866d3e03f116291c5f3f36292d14c14cefade232d0eb925f86ed08e54effb8c293b07cd4b4974b5ce1212c67f4deb2db1339e09489996c670a601f80459e9f1 SHA512 7a04ad61b88abe08c61ac77ddd79a99fa5f47b496df6bd04e9319bc453db243e5b64748d3f366928dcb2382f03d8db42776692b614ad9cff0291b1bf4a1cea1a
+EBUILD spice-9999.ebuild 2379 BLAKE2B 7866d3e03f116291c5f3f36292d14c14cefade232d0eb925f86ed08e54effb8c293b07cd4b4974b5ce1212c67f4deb2db1339e09489996c670a601f80459e9f1 SHA512 7a04ad61b88abe08c61ac77ddd79a99fa5f47b496df6bd04e9319bc453db243e5b64748d3f366928dcb2382f03d8db42776692b614ad9cff0291b1bf4a1cea1a
 MISC metadata.xml 474 BLAKE2B 62c3e1d9f11d515950c4eb8fda479808a73ab081932fe38994854dcec491aef63e08f3943074ae9bb33eee452b25a85b6ccff8a9d16c77acdb4c85aa8d126665 SHA512 75665383947d475f99e4f75a1d3599ef51e32e7a1b56fbf8fa49aabcb335e66ed29407187a5f9730f223bcf48a38ef1408db685b8a9401a06f73afebf5a673d2
diff --git a/app-emulation/spice/spice-0.15.2.ebuild b/app-emulation/spice/spice-0.15.2.ebuild
new file mode 100644
index 000000000000..b1b52a3283e5
--- /dev/null
+++ b/app-emulation/spice/spice-0.15.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="SPICE server"
+HOMEPAGE="https://www.spice-space.org/"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice.git"
+	inherit git-r3
+
+	DEPEND="~app-emulation/spice-protocol-9999"
+else
+	SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="gstreamer lz4 sasl smartcard static-libs test"
+RESTRICT="!test? ( test )"
+
+# The libspice-server only uses the headers of libcacard
+RDEPEND="
+	dev-lang/orc[static-libs(+)?]
+	>=dev-libs/glib-2.38:2[static-libs(+)?]
+	dev-libs/openssl:0=[static-libs(+)?]
+	media-libs/opus[static-libs(+)?]
+	media-libs/libjpeg-turbo:0=[static-libs(+)?]
+	sys-libs/zlib[static-libs(+)?]
+	>=x11-libs/pixman-0.17.7[static-libs(+)?]
+	lz4? ( app-arch/lz4:0=[static-libs(+)?] )
+	smartcard? ( >=app-emulation/libcacard-2.5.1 )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+"
+DEPEND+="
+	${RDEPEND}
+	>=app-emulation/spice-protocol-0.14.3
+	smartcard? ( app-emulation/qemu[smartcard] )
+	test? ( net-libs/glib-networking )
+"
+BDEPEND="
+	${PYTHON_DEPS}
+	virtual/pkgconfig
+	$(python_gen_any_dep '
+		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	')
+"
+
+python_check_deps() {
+	python_has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	python_has_version -b "dev-python/six[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #586560
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
+	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
+	use gstreamer && addpredict /dev
+
+	xdg_environment_reset
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dgstreamer=$(usex gstreamer 1.0 no)
+		-Dopus=enabled
+		-Dmanual=false
+		$(meson_use lz4)
+		$(meson_use sasl)
+		$(meson_feature smartcard)
+		$(meson_use test tests)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-emulation/spice/spice-9999.ebuild b/app-emulation/spice/spice-9999.ebuild
index 8b1ec904e164..b1b52a3283e5 100644
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@@ -1,60 +1,63 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
-inherit git-r3 meson python-any-r1 readme.gentoo-r1 xdg-utils
+PYTHON_COMPAT=( python3_{10..11} )
+inherit meson python-any-r1 readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="SPICE server"
 HOMEPAGE="https://www.spice-space.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice.git"
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice.git"
+	inherit git-r3
+
+	DEPEND="~app-emulation/spice-protocol-9999"
+else
+	SRC_URI="https://www.spice-space.org/download/releases/spice-server/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
-IUSE="gstreamer lz4 opus sasl smartcard static-libs test"
-
+IUSE="gstreamer lz4 sasl smartcard static-libs test"
 RESTRICT="!test? ( test )"
 
-# the libspice-server only uses the headers of libcacard
+# The libspice-server only uses the headers of libcacard
 RDEPEND="
-	dev-lang/orc
-	>=dev-libs/glib-2.38:2
-	sys-libs/zlib
-	virtual/jpeg:0=
-	>=x11-libs/pixman-0.17.7
-	dev-libs/openssl:0=
-	lz4? ( app-arch/lz4:0= )
-	opus? ( media-libs/opus )
+	dev-lang/orc[static-libs(+)?]
+	>=dev-libs/glib-2.38:2[static-libs(+)?]
+	dev-libs/openssl:0=[static-libs(+)?]
+	media-libs/opus[static-libs(+)?]
+	media-libs/libjpeg-turbo:0=[static-libs(+)?]
+	sys-libs/zlib[static-libs(+)?]
+	>=x11-libs/pixman-0.17.7[static-libs(+)?]
+	lz4? ( app-arch/lz4:0=[static-libs(+)?] )
 	smartcard? ( >=app-emulation/libcacard-2.5.1 )
-	sasl? ( dev-libs/cyrus-sasl )
+	sasl? ( dev-libs/cyrus-sasl[static-libs(+)?] )
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
-	)"
-DEPEND="${RDEPEND}
-	~app-emulation/spice-protocol-9999
+	)
+"
+DEPEND+="
+	${RDEPEND}
+	>=app-emulation/spice-protocol-0.14.3
 	smartcard? ( app-emulation/qemu[smartcard] )
-	test? ( net-libs/glib-networking )"
-BDEPEND="${PYTHON_DEPS}
-	sys-devel/autoconf-archive
+	test? ( net-libs/glib-networking )
+"
+BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
 	$(python_gen_any_dep '
 		>=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]
 		dev-python/six[${PYTHON_USEDEP}]
-	')"
-
-DOCS=(
-	AUTHORS
-	CHANGELOG.md
-	README
-)
+	')
+"
 
 python_check_deps() {
-	has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
-	has_version -b "dev-python/six[${PYTHON_USEDEP}]"
+	python_has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
+	python_has_version -b "dev-python/six[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {
@@ -72,29 +75,19 @@ src_configure() {
 	local emesonargs=(
 		-Ddefault_library=$(usex static-libs both shared)
 		-Dgstreamer=$(usex gstreamer 1.0 no)
+		-Dopus=enabled
+		-Dmanual=false
 		$(meson_use lz4)
 		$(meson_use sasl)
-		$(meson_feature opus)
 		$(meson_feature smartcard)
 		$(meson_use test tests)
-		-Dmanual=false
-		-Dtests=false
 	)
-	meson_src_configure
-}
 
-src_compile() {
-	# Prevent sandbox violations, bug #586560
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
-	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	use gstreamer && addpredict /dev
-
-	meson_src_compile
+	meson_src_configure
 }
 
 src_install() {
 	meson_src_install
-	einstalldocs
 	readme.gentoo_create_doc
 }