gentoo auto-resync : 28:07:2023 - 16:37:22

5 files changed, 33 insertions, 38 deletions

diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 977394964579..2e9d3242787c 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/ruffle/Manifest b/app-emulation/ruffle/Manifest
index 835cb4a6520e..4da230f317e2 100644
--- a/app-emulation/ruffle/Manifest
+++ b/app-emulation/ruffle/Manifest
@@ -1,3 +1,4 @@
+AUX ruffle-0_p20230724-skip-render-tests.patch 656 BLAKE2B ba8796eb7a70371ebaacb2f787c394bec1aae670399ff75dee0e0450f8bee0bc13f9cabe85158fa4086268ed487107dd5b9ab4e29cfd0e794edcacd7b38e5918 SHA512 8c98e34e76b6a9d8515a99610adf2cdd8aa979efad613dbe1e89a4365f7ed0c83daff5511ed426bef7167686392332166160011dea837de4cf0bd84c7d4ae09a
 DIST Inflector-0.11.4.crate 17438 BLAKE2B eaf0c7f983b3186e9bc89353021a10592f2877e46585bd50b96db9b087343d1199c7b6cf3fa53cd274fb6d33de025a904b8aa31a7ac9599ae3689ecdbcec34cd SHA512 f1f6463e033b6d3c16c51dc1e1a3f5569954308b95b59058294b7f9310919bbda797e99e6a07529071bb83f0688867a243997d33795a7136b0af73977004296e
 DIST ab_glyph-0.2.21.crate 17764 BLAKE2B 83fb307f03d9ca012f1d4a80679f282c598b253decda343859cb9821de4c9e0cb339d26eaf40b4099dd077957fde5d252e9d999478875d5e1aa685d5d5854d39 SHA512 3766c240f8acce486de23c661da7c708c56a5dff04e17fd9dc37f7fcab22d4db6905080ce7a6707c2b8f85cfcf224e068af2c51e53440818b8d021ac8d3b8457
 DIST ab_glyph_rasterizer-0.1.8.crate 11010 BLAKE2B 2a20fd3ff646559d704e214ae7c4e5b8297e20be0909c403c140edb67002665447a6a796e5ca5d71f5c8c55000489a14a101ec43dd90101be9c246d1a0138dc4 SHA512 6fd5ff2d068da84c4ac2e6e2c5ad6ab2f4926f1664afb8ba701b60a35c3bd7bf00b200b22c455ca15dfc7d4303c8caa0bb150c18dcce01ce107deaf323cde17f
@@ -719,6 +720,6 @@ DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a6
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
 EBUILD ruffle-0_p20230525.ebuild 13520 BLAKE2B 7ce9de96770c76230aeab03030751536785b37d8400682adae78c6cf9c88fb3f7183f88c28836153b1485daa65e3fbdc1366c7975d936ca1eeefd8bdd39816b6 SHA512 e1a9b70fdfa07bfb23787f5813863f8ae1eb109060539b5146cf89771bd01d51956d9fcad067167340c9d2800a8e32256608236b501c47392d67066d99d6850d
 EBUILD ruffle-0_p20230624.ebuild 13519 BLAKE2B 99297f1fee34783ae8ff24c6e562397e41863e88fb5b7e48c1f75d062689f9b0327032934ecf675d9d1c43495ae739f229dd29a47248d233ef34fda17d95d2df SHA512 18546a8d6def3b149e1dcfb7f45e73aa8bddd770f811c981b29cd7f37e44ad68ba7d12d1c2cf84e860466fdbd7be074cffd9ccf890014ab248ebabcd31dd323d
-EBUILD ruffle-0_p20230724.ebuild 14137 BLAKE2B 507f02a727bdf607e9a4027d150288c9b0a47998b01636ebbfecc6c2b2da7816e841d493949f2bc2df69f2214e21d093047702ea339cdcb1c6c0e408075cd9fd SHA512 4842ab5613548c8267807faa7ae2b8d713316e8477d666fdf4ea8fcb78c5e4416207686da376e9c00deaff36fdd0b0e275d0c9219ab781d8e0714aa1d65c8ad4
-EBUILD ruffle-9999.ebuild 2689 BLAKE2B 7baeeb65fd1b57d4f3b35350058dcb7a76e71180f4df4f9089abb673dc6f9cba4b49005d9d39640f3c69d7f7dd9407de64d474b3f05d40f9c403f357087d5b00 SHA512 31d488bdf3b98ff295550261d2c6c7125766b3f55926cde6056cc3a326913d71a6f72fa7447b3c34b9753ab00e229a1315dbb3276acbea9686ab79836238f696
+EBUILD ruffle-0_p20230724.ebuild 13823 BLAKE2B 4c9dd290c36ed8f2aeb7503ced2f53a5ff59d611e97306c271d20fd56ffe7654447787e5926808ded25429ec46febf1e5aa2d1ab8171283c25d80516ec7d5a11 SHA512 394e13cdb0999437723dc6bf93a21831ede33b5633c1eda127fdcb1afc571266fe935be316640c274674574e4fc699c05cbe82a79eace6226909fef27047950a
+EBUILD ruffle-9999.ebuild 2375 BLAKE2B 6617eaeaf0df4091dcdd1cf9dc412200d3030e9708c4de86eeee7d6477c94beeb85314e5698f6b9b5e8764cfe4b57052f0c8969fad64c4b3e19a72202c781d10 SHA512 e276108fffa19b35247df6c47ab9dd55e80c5aed32014a4c34291147671c42ddfb039474f79bc95e8b608f08f70ae99c8fd3e04c72c6b822d1a88430259288f0
 MISC metadata.xml 327 BLAKE2B aad7b4089000263fccd1bf6af04e88ac138658121db322215ce0dcc85380b12afa01cdcd2be232c5d2c773698b38903759ecaea6f4854d8c90c420c0a43f33b1 SHA512 bb5e665acc6d02ae3e6a22fbb483c293142104e538d386a9b93884f097629dcbb8ca7b614aa20e0358bf22ae36487c7d86cc1467103987845a70ebacc9c4a5d2
diff --git a/app-emulation/ruffle/files/ruffle-0_p20230724-skip-render-tests.patch b/app-emulation/ruffle/files/ruffle-0_p20230724-skip-render-tests.patch
new file mode 100644
index 000000000000..46b66538aac8
--- /dev/null
+++ b/app-emulation/ruffle/files/ruffle-0_p20230724-skip-render-tests.patch
@@ -0,0 +1,16 @@
+Running renderer tests using mesa's software rendering has a tendency
+to misbehave (esp. on tinderboxes) and does not reflect usage on real
+hardware.
+
+These are auto-skipped if mesa[-gles2] and perhaps [-llvm], but pretend
+we lack support even if conditions are met.
+
+https://bugs.gentoo.org/903295
+https://bugs.gentoo.org/911320
+https://bugs.gentoo.org/911367
+--- a/tests/tests/util/options.rs
++++ b/tests/tests/util/options.rs
+@@ -163,2 +163,3 @@
+         if let Some(render) = &self.with_renderer {
++            if check_renderer { return false; }
+             // If we don't actually want to check the renderer (ie we're just listing potential tests),
diff --git a/app-emulation/ruffle/ruffle-0_p20230724.ebuild b/app-emulation/ruffle/ruffle-0_p20230724.ebuild
index 012ed52e5f0f..350e5cff76e1 100644
--- a/app-emulation/ruffle/ruffle-0_p20230724.ebuild
+++ b/app-emulation/ruffle/ruffle-0_p20230724.ebuild
@@ -550,7 +550,7 @@ declare -A GIT_CRATES=(
 	[nihav_core]="https://github.com/ruffle-rs/nihav-vp6;9416fcc9fc8aab8f4681aa9093b42922214abbd3;nihav-vp6-%commit%/nihav-core"
 	[nihav_duck]="https://github.com/ruffle-rs/nihav-vp6;9416fcc9fc8aab8f4681aa9093b42922214abbd3;nihav-vp6-%commit%/nihav-duck"
 )
-inherit cargo desktop flag-o-matic virtualx xdg
+inherit cargo desktop flag-o-matic xdg
 
 MY_PV="nightly-${PV:3:4}-${PV:7:2}-${PV:9:2}"
 MY_P="${PN}-${MY_PV}"
@@ -571,6 +571,8 @@ LICENSE+="
 " # crates
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 # dlopen: libX* (see winit+x11-dl crates)
 RDEPEND="
@@ -592,14 +594,14 @@ BDEPEND="
 	virtual/jre:*
 	virtual/pkgconfig
 	>=virtual/rust-1.70
-	test? (
-		media-libs/mesa[llvm]
-		x11-base/xorg-server[-minimal]
-	)
 "
 
 QA_FLAGS_IGNORED="usr/bin/${PN}.*"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0_p20230724-skip-render-tests.patch
+)
+
 src_configure() {
 	filter-lto # TODO: cleanup after bug #893658
 
@@ -614,19 +616,6 @@ src_configure() {
 	cargo_src_configure ${workspaces[*]/#/--package=}
 }
 
-src_test() {
-	xdg_environment_reset
-
-	local skip=(
-		# this should be fine on real hardware, but currently fails with mesa's
-		# software rendering (bug #911320) -- note they are auto-skipped if
-		# USE=-gles2 on mesa, and this just forces to skip regardless
-		--skip visual/filters/displacement_map
-	)
-
-	virtx cargo_src_test -- "${skip[@]}"
-}
-
 src_install() {
 	dodoc README.md
 
diff --git a/app-emulation/ruffle/ruffle-9999.ebuild b/app-emulation/ruffle/ruffle-9999.ebuild
index ced4e9790b1e..fbc440002e65 100644
--- a/app-emulation/ruffle/ruffle-9999.ebuild
+++ b/app-emulation/ruffle/ruffle-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit cargo desktop flag-o-matic git-r3 virtualx xdg
+inherit cargo desktop flag-o-matic git-r3 xdg
 
 DESCRIPTION="Flash Player emulator written in Rust"
 HOMEPAGE="https://ruffle.rs/"
@@ -16,6 +16,8 @@ LICENSE+="
 	Unicode-DFS-2016 ZLIB curl
 " # crates
 SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
 # dlopen: libX* (see winit+x11-dl crates)
 RDEPEND="
@@ -37,14 +39,14 @@ BDEPEND="
 	virtual/jre:*
 	virtual/pkgconfig
 	>=virtual/rust-1.70
-	test? (
-		media-libs/mesa[llvm]
-		x11-base/xorg-server[-minimal]
-	)
 "
 
 QA_FLAGS_IGNORED="usr/bin/${PN}.*"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0_p20230724-skip-render-tests.patch
+)
+
 src_unpack() {
 	git-r3_src_unpack
 
@@ -79,19 +81,6 @@ src_configure() {
 	cargo_src_configure ${workspaces[*]/#/--package=}
 }
 
-src_test() {
-	xdg_environment_reset
-
-	local skip=(
-		# this should be fine on real hardware, but currently fails with mesa's
-		# software rendering (bug #911320) -- note they are auto-skipped if
-		# USE=-gles2 on mesa, and this just forces to skip regardless
-		--skip visual/filters/displacement_map
-	)
-
-	virtx cargo_src_test -- "${skip[@]}"
-}
-
 src_install() {
 	dodoc README.md