gentoo auto-resync : 15:11:2024 - 03:02:36

5 files changed, 13 insertions, 147 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index f1b26aa2af48..d846d84b5484 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/ruffle/Manifest b/app-emulation/ruffle/Manifest
index 08b520bf0616..3fa9e8186d7d 100644
--- a/app-emulation/ruffle/Manifest
+++ b/app-emulation/ruffle/Manifest
@@ -3,7 +3,6 @@ DIST ruffle-nightly-2024-09-29-vendor.tar.xz 68100452 BLAKE2B 31644cd0015e54ac78
 DIST ruffle-nightly-2024-09-29.tar.gz 93467899 BLAKE2B 9a9c10686e161ce913892279378bca6c4aea67397bad6fb500e18d5362ee9c6303fcb20238dd8e1fbdb3cbeaa2eaa623eb3b5f2b8c7c9f2ca061c1edb5cc239b SHA512 1a835c5fcb7e6420cea5680af6d14e0bf8d889823b5f2617373aeec88511a31300441c869b53e01e32900e8cb1b2a9e69d52434dc4586354d266a8b6a99af2bb
 DIST ruffle-nightly-2024-10-27-vendor.tar.xz 68393412 BLAKE2B 16a3cb7a16900d21c91e900d0dc8b1036120abd2168fea2482473bb9c2170de4e1d5619fad15dd8b9df44228b93167f1b722311f7f54a5dff1a9c78682fdf04a SHA512 d085af00d4417e961bf7e05b7af1c70f222ac1277c701d67ce99084f85648eba521273269732d74ddc281fb71c8762646cd15c6f1f1a05da788f04ea302696b0
 DIST ruffle-nightly-2024-10-27.tar.gz 93507412 BLAKE2B fcbcd5639bffa8fd1157e1f19765e7ea6721073fc9af6579562a5412d1d07086f53de7d099001ab4eb1b4d497077f09dd1a6da6eaf92c71f12cd1c61633d6f78 SHA512 19790a6641c61ef7e2c1ec94039452c06ea95273de2868198a307d21da955d4196ae33e0807c8f8c74e3f996dc8e26bebdd59ad8bdfa40c9fe6a8afcc745e91f
-EBUILD ruffle-0_p20240929-r1.ebuild 2786 BLAKE2B e1853aaeb7159c6c030a4b23a0d447731f7c452e20953fe08f1b40539c30ed7fabbcaf308b1136e2de559810dbf5bbd4bb2bbeb00a7fa7fbf5c51df1ec93cf39 SHA512 16b37437310936212cf2db6952f7cadc1892604112434ac9f8190c20b71b2673962add0d5fa6bada4188b3efa4dacb4be20c78af5765c29c7604682e62147aa0
-EBUILD ruffle-0_p20241027-r1.ebuild 2787 BLAKE2B 911b4c45231b74200fcf63f879f897500ed454b606b525606d61f7a082761e18d79003195ee59ec8d0cc39a338e6b8a0566ac819fac4d528cf136ad377a6b5be SHA512 8132dc91d72500540785825d923727b341c41199f47012c3fd77a84660dc8ce3a95ca9d8ece4960b6b84fcb8f7fde378dd30edfb1611ea0a8ce83695681d11e2
-EBUILD ruffle-9999.ebuild 2791 BLAKE2B 96372a4f3f908d12b42785558bafa973c7b688b0907c64b1b3b46ef31a64d39b16094d4ce888573d9efe2412c3ab0fb862e92775ab8bc9acc9ed91d547374769 SHA512 1086b9063e484e415437c98691dd75acf09234d63be5876fb85d658cf5199ad46fb48e9498f6409c999d113c5e1a983826919bcad4c06d04d766e250266137d4
+EBUILD ruffle-0_p20240929-r1.ebuild 2776 BLAKE2B 337f3f413a94cc237476a40637680a473c81fd285966bff126405e707488e63846d1392ee38419363e3576962df5158d6911671026778e8e0fc075967b9e30d7 SHA512 78cd84a19f4e976f4e2811cf3b2851f195fa829c0c94bc6fa4058ea198a3febadf91b0272e8ed120c5c7668c7b9748f6e64c13f0fa4087508648c2ba48b70ec3
+EBUILD ruffle-0_p20241027-r1.ebuild 2534 BLAKE2B 12329d8559cc052e9d3956e8834d89f9850ea886f537106f1e9a911439c7f1940fff20eb218cd1e13c70ed3bd62a471603c330095546d63d77d5262823d4ebce SHA512 150d350c48cc5225acf2c2d7e27366768108ec673aad3bbe50e28f565980806edcae4ebe1b59e44ffc4ae8e5cb2826e18a6ac89b41fb5b3f7ed563ca01965277
 MISC metadata.xml 327 BLAKE2B aad7b4089000263fccd1bf6af04e88ac138658121db322215ce0dcc85380b12afa01cdcd2be232c5d2c773698b38903759ecaea6f4854d8c90c420c0a43f33b1 SHA512 bb5e665acc6d02ae3e6a22fbb483c293142104e538d386a9b93884f097629dcbb8ca7b614aa20e0358bf22ae36487c7d86cc1467103987845a70ebacc9c4a5d2
diff --git a/app-emulation/ruffle/ruffle-0_p20240929-r1.ebuild b/app-emulation/ruffle/ruffle-0_p20240929-r1.ebuild
index 2ca7a360fdef..47beaf5f8067 100644
--- a/app-emulation/ruffle/ruffle-0_p20240929-r1.ebuild
+++ b/app-emulation/ruffle/ruffle-0_p20240929-r1.ebuild
@@ -8,7 +8,7 @@ RUST_MIN_VER="1.81.0"
 inherit cargo desktop optfeature xdg
 
 if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
+	EGIT_REPO_URI="https://github.com/ruffle-rs/ruffle.git"
 	inherit git-r3
 else
 	MY_PV=nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}
diff --git a/app-emulation/ruffle/ruffle-0_p20241027-r1.ebuild b/app-emulation/ruffle/ruffle-0_p20241027-r1.ebuild
index ed46221ee0c5..f01425116f94 100644
--- a/app-emulation/ruffle/ruffle-0_p20241027-r1.ebuild
+++ b/app-emulation/ruffle/ruffle-0_p20241027-r1.ebuild
@@ -3,27 +3,20 @@
 
 EAPI=8
 
-RUST_MIN_VER="1.81.0"
-
+RUST_MIN_VER=1.81.0
 inherit cargo desktop optfeature xdg
 
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
-	inherit git-r3
-else
-	MY_PV=nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="
-		https://github.com/ruffle-rs/ruffle/archive/refs/tags/${MY_PV}.tar.gz
-			-> ${MY_P}.tar.gz
-		https://dev.gentoo.org/~ionen/distfiles/${MY_P}-vendor.tar.xz
-	"
-	S=${WORKDIR}/${MY_P}
-	KEYWORDS="~amd64"
-fi
+MY_PV=nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}
+MY_P=${PN}-${MY_PV}
 
 DESCRIPTION="Flash Player emulator written in Rust"
 HOMEPAGE="https://ruffle.rs/"
+SRC_URI="
+	https://github.com/ruffle-rs/ruffle/archive/refs/tags/${MY_PV}.tar.gz
+		-> ${MY_P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${MY_P}-vendor.tar.xz
+"
+S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( Apache-2.0 MIT )"
 LICENSE+="
@@ -31,6 +24,7 @@ LICENSE+="
 	MPL-2.0 OFL-1.1 openssl Unicode-3.0 Unicode-DFS-2016 ZLIB
 " # crates
 SLOT="0"
+KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -58,15 +52,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0_p20231216-skip-render-tests.patch
 )
 
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
 src_configure() {
 	local workspaces=(
 		ruffle_{desktop,scanner}
diff --git a/app-emulation/ruffle/ruffle-9999.ebuild b/app-emulation/ruffle/ruffle-9999.ebuild
deleted file mode 100644
index 31372db61bf0..000000000000
--- a/app-emulation/ruffle/ruffle-9999.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-RUST_MIN_VERSION="1.81.0"
-
-inherit cargo desktop optfeature xdg
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libplacebo.git"
-	inherit git-r3
-else
-	MY_PV=nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}
-	MY_P=${PN}-${MY_PV}
-	SRC_URI="
-		https://github.com/ruffle-rs/ruffle/archive/refs/tags/${MY_PV}.tar.gz
-			-> ${MY_P}.tar.gz
-		https://dev.gentoo.org/~ionen/distfiles/${MY_P}-vendor.tar.xz
-	"
-	S=${WORKDIR}/${MY_P}
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Flash Player emulator written in Rust"
-HOMEPAGE="https://ruffle.rs/"
-
-LICENSE="|| ( Apache-2.0 MIT )"
-LICENSE+="
-	Apache-2.0 BSD-2 BSD Boost-1.0 CC0-1.0 ISC UbuntuFontLicense-1.0 MIT
-	MPL-2.0 OFL-1.1 openssl Unicode-3.0 Unicode-DFS-2016 ZLIB
-" # crates
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# dlopen: libX* (see winit+x11-dl crates)
-RDEPEND="
-	media-libs/alsa-lib
-	virtual/libudev:=
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXrender
-"
-DEPEND="
-	${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	virtual/jre:*
-	virtual/pkgconfig
-"
-
-QA_FLAGS_IGNORED="usr/bin/${PN}.*"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0_p20231216-skip-render-tests.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]]; then
-		git-r3_src_unpack
-		cargo_live_src_unpack
-	else
-		cargo_src_unpack
-	fi
-}
-
-src_configure() {
-	local workspaces=(
-		ruffle_{desktop,scanner}
-		exporter
-		$(usev test tests)
-	)
-
-	cargo_src_configure "${workspaces[@]/#/--package=}"
-}
-
-src_test() {
-	local skip=(
-		# may need more investigation, strangely "pass" (xfail) when
-		# RUSTFLAGS is unset, skip for now (bug #915726)
-		--skip from_avmplus/as3/Types/Int/wraparound
-	)
-
-	cargo_src_test -- "${skip[@]}"
-}
-
-src_install() {
-	dodoc README.md
-
-	newicon web/packages/extension/assets/images/icon180.png ${PN}.png
-	make_desktop_entry ${PN} ${PN^} ${PN} "AudioVideo;Player;Emulator;" \
-		"MimeType=application/x-shockwave-flash;application/vnd.adobe.flash.movie;"
-
-	cd "$(cargo_target_dir)" || die
-	newbin ${PN}_desktop ${PN}
-	newbin exporter ${PN}_exporter
-	dobin ${PN}_scanner
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "${PN} is experimental software that is still under heavy development"
-		elog "and only receiving nightly releases. Plans in Gentoo is to update"
-		elog "roughly every months if no known major regressions (feel free to"
-		elog "report if you feel a newer nightly is needed ahead of time)."
-		elog
-		elog "There is currently no plans to support wasm builds / browser"
-		elog "extensions, this provides the desktop viewer and other tools."
-	fi
-
-	optfeature "h264 video decoding" media-libs/openh264
-	optfeature "the in-application file picker" sys-apps/xdg-desktop-portal
-}