6 files changed, 15 insertions, 69 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 79bd3ab0bc77..9a7ce67e7cd5 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index cc48c5585ecd..d829c860c4d3 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,5 +1,3 @@
-DIST protontricks-1.10.2.tar.gz 162325 BLAKE2B 5e9d0bf2970ad0e9a5ef5e399af5e327781c94f3e76e36db3a93a93d59102436a54e926a72a22b4640178534d2b9e62452543706c7ec10ce4591f15ce00ac4f3 SHA512 f644e13f356f899b8084ed1d347c210b624c09676f3a644f973610d1134658dd2951e8f85178606639b0eca8c386e9abac89c658a7076e4126278ff955549f10
 DIST protontricks-1.10.3.tar.gz 162698 BLAKE2B 7e3f696f3589a4a92d2cc6132132546bc0c38a5110d688cd486c2d52bd37275b8df4085edc38d4876583aa0d5ec0a9de599ca05616bf92812decf624e2259406 SHA512 c389a712bcbb9dace8e6b3fa10ddb9db0a67abbd3b8d000d312fd59bb682aa68c10d5411b10b31948967536418e56116ac435054ff6d6999bc471ba2a97ca6ba
-EBUILD protontricks-1.10.2.ebuild 1353 BLAKE2B 5425ca792df9caa7dfc57d2422edf2c1b0697d8339f00896d0b077f1f1fc9ab139fd75bfe0e3f1bdb02644db4fd7ae05a38d4b14579337d37331095988f6cf66 SHA512 d3f84d7097d011390ebc553fcba9579fd88fd0991eb5dcdd2f99a46f3be086ec07e9b477a0908890833bb73d3219b3653420803ed059574b251202a63de7eb70
-EBUILD protontricks-1.10.3.ebuild 1354 BLAKE2B 096ef197b4dbf053f225846f91af2d4fc4ddaa6ea34663a3647c9e291b52bf2fc473434de2424159680b2031a472e08668dab34c227cf0c89c33207b58a4b73b SHA512 60f5a31286cfbc810d8adec51428416dda24bc707507a8262bd020dfd1dc7e3a089730f8dd12232087e0fb45efc41125c50674c27816dae48c43715314cde249
+EBUILD protontricks-1.10.3.ebuild 1353 BLAKE2B 5425ca792df9caa7dfc57d2422edf2c1b0697d8339f00896d0b077f1f1fc9ab139fd75bfe0e3f1bdb02644db4fd7ae05a38d4b14579337d37331095988f6cf66 SHA512 d3f84d7097d011390ebc553fcba9579fd88fd0991eb5dcdd2f99a46f3be086ec07e9b477a0908890833bb73d3219b3653420803ed059574b251202a63de7eb70
 MISC metadata.xml 809 BLAKE2B dc0506e6f3224adc867438699359c4eafc389041846c644818732036e04bcb9c789e358a08effdb4b9ff4430521f7fe8ff6800b75aa93d6313e3d85395467741 SHA512 351bb79dc7921e6c62100b3354546185d31578b044393ea5e5b5fea089eb47164882ff4ede30d8a575dea31ec9d0927793f8109d9e63ca4ad6954c1affdbe6f4
diff --git a/app-emulation/protontricks/protontricks-1.10.2.ebuild b/app-emulation/protontricks/protontricks-1.10.2.ebuild
deleted file mode 100644
index a878a6c3640f..000000000000
--- a/app-emulation/protontricks/protontricks-1.10.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi xdg-utils
-
-DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
-HOMEPAGE="https://github.com/Matoking/protontricks"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+gui"
-
-RDEPEND="app-emulation/winetricks
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/vdf[${PYTHON_USEDEP}]
-	')
-	gui? ( gnome-extra/zenity
-		|| (
-			app-emulation/winetricks[gtk]
-			app-emulation/winetricks[kde]
-		)
-	)"
-BDEPEND="$(python_gen_cond_dep '
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-')"
-
-DOCS=( CHANGELOG.md README.md )
-
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog
-
-	if ! use gui; then
-		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
-		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
-		ewarn
-	fi
-
-	elog "Protontricks can only find games for which a Proton prefix already exists."
-	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
-	elog
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-emulation/protontricks/protontricks-1.10.3.ebuild b/app-emulation/protontricks/protontricks-1.10.3.ebuild
index dae98e9c173d..a878a6c3640f 100644
--- a/app-emulation/protontricks/protontricks-1.10.3.ebuild
+++ b/app-emulation/protontricks/protontricks-1.10.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/Matoking/protontricks"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="+gui"
 
 RDEPEND="app-emulation/winetricks
diff --git a/app-emulation/wine-proton/Manifest b/app-emulation/wine-proton/Manifest
index bb815831c438..2a2cc15ad5bd 100644
--- a/app-emulation/wine-proton/Manifest
+++ b/app-emulation/wine-proton/Manifest
@@ -6,10 +6,10 @@ AUX wine-proton-7.0.4-unwind.patch 1694 BLAKE2B 954cb0a395c3b45afc7a3f39f33d34cf
 AUX wine-proton-7.0.6-mingw64-11.0.0.patch 849 BLAKE2B 26833ef532e7c5b8b0ae1442485c6c44f55a550c571942be2a894aada62ce87398973dfa5619f5a8d498b51479dda84eeae72803370539a7d28575a74310e173 SHA512 189bb20e8c399374567db308c2d3cf43a2b5e2d76b43970edaa3975c0c4ddb7fa245b9d05ed0f7a3452c8bf5264e743acff5a4830a94abd1c7df13664afc21e7
 AUX wine-proton-8.0.1c-unwind.patch 1488 BLAKE2B 1a6d69484fb36f94f32d74679e809cfd7666363bede5dddedd2449e07251823b1ce86a717e06d342eec782aff501f27bc23433511c163da0b2a50c411df7ac53 SHA512 82ff0510fcab35471aa0db8f32f48cd62dbf78b3f5f36e3d191b86be55cb476df1ee689e5cd53c95d4f02199b5900eb0c8a45959693739a6c35e4c8b3cfa243f
 DIST proton-wine-7.0-6.tar.gz 45780326 BLAKE2B f140fcfdd1a47904c34a49d0795fa3326d7cf0d3fac8d6c2ef2a4926181a46223f43a2d1ca96c543e800c8c46b2a3cc51ae306a029d68a42608876e869e177d5 SHA512 793bbe2b23042301a1b518717d78cfff01eaffa0388883d010659a45779b9136d33cfac63f0c3fbb1e458953a954b423eb70ac4fa87633352267db890ceb2fef
-DIST proton-wine-8.0-1d.tar.gz 48198535 BLAKE2B 7ed7c4130d4c74d3f411880d253727469cbdaa78943b7783f3d2162177072503bffd588ba3c6c147014ce4e422850cb49e83c2d2d807777fcd01c101199f922d SHA512 4a5a2a2753f8fd025f8c0fe56341a67ed780befc8ae9bffe03872019d4227ec8324edf892c327b99330c3de29a3b8adaac656b41d3487de03a8a82cef9234da7
 DIST proton-wine-8.0-2c.tar.gz 48207888 BLAKE2B 8dc37f136c6d8758c521c0e5c2f16c88e9ede8b22ce7902bb7377a1555bf6aa5bcfaa46f3b9edb4fced1700675fc50f920f9ead17036c9ad1b8bc742ba7e8de3 SHA512 126c06352b6c8b38c133861ce13bc1ce4f1ecf9d451edc2928db54592707c94b07b3a346eb302895cc96c56fede8679b44111be7e1b451c4059c7afcb5fcff57
+DIST proton-wine-8.0-3c.tar.gz 48254135 BLAKE2B fee58928555376f71579099d3fb39dbe2242516b671af1ca2507a135c3119422d6e168ed2a258d29c57a8fc33a026e5cf788d8362f238f1c0c4c7c81c9cbb147 SHA512 5d473534834ce8ea855d4ee2d39f1596117c0abab0925ee50875245ff6e1f49fe4684fe6f162e92a4b5e408795ff8c9b15b382fb013074216dd565143ecd9efc
 EBUILD wine-proton-7.0.6.ebuild 10798 BLAKE2B 5511bfe5386ea33af4b76c1a9d58e630c8c2cdbe39a64e8305e9c859f6e850032474992beebfc82023a7c263d443162ed5e39cb4294670a4d052506e8caa429f SHA512 87659fbfe50e34eae90aaab12880f7509386d4dd5c77e0672de92e3b1950eca54536451cb1174fc317f20e27b700b888e6f8d39107627f216a49744ef36bf2bf
-EBUILD wine-proton-8.0.1d.ebuild 10803 BLAKE2B 0df2af29bd689cc05963832759aa2f0251f8e5c8331467f9bec347edb731bb3e0de5d6b9f2af21de89d5fe3d4036b98fa35219ca9d4e84c62a4d391cb4147d22 SHA512 6d3939ce90fb4aa865de3e398e43ef4178d84a533e25781f0b103a71e30286c9e3fa73dd4ff0e1319f07cfae2e63133e104794e4b400337032fe28e9f4bd4247
 EBUILD wine-proton-8.0.2c.ebuild 10803 BLAKE2B 0df2af29bd689cc05963832759aa2f0251f8e5c8331467f9bec347edb731bb3e0de5d6b9f2af21de89d5fe3d4036b98fa35219ca9d4e84c62a4d391cb4147d22 SHA512 6d3939ce90fb4aa865de3e398e43ef4178d84a533e25781f0b103a71e30286c9e3fa73dd4ff0e1319f07cfae2e63133e104794e4b400337032fe28e9f4bd4247
+EBUILD wine-proton-8.0.3c.ebuild 10936 BLAKE2B abccff09f367e67b8117c8ebe0d04efa420c96945c1c190c3cb6673f76127eebd0ba8893b2f8e24f7062da4b3a135f6b8677d8dea7c6048f997225534870ae30 SHA512 d14b893fdb1dafe42b2011aa4aa56db94ef0b0dab2892431fbfd4ccb1a24461f40af6f6ae1fcbf32e8b9748b2fad15b54921f56b551f033687aca6a2bc8e06e2
 EBUILD wine-proton-8.0.9999.ebuild 10996 BLAKE2B 00f2707f7f211f9dbf7dc47ccb18b714a0e3980fbe04ce6eb12a2afcf32dcab4153f345df5d2e1c1f844ce38171fdd42b01ea202134565c4df0aab73bc0e578f SHA512 f2f2ddd91b94bd7dddbc8cbf9b4e4a672c584ffc34ad3e8fd67d5ce49bda050477487a81cb94fdcae2a39ce913faaffb13127f57de2e7d9cfc2c4a898ed82765
 MISC metadata.xml 1222 BLAKE2B 75e8a33a16e4d718c5299ae719cdd009e9ac6f0d2eafb112c9e38e7d860a51d7f4d5be14912c1c812718b36fd4d71a9d3ddf2c68f5a076fc71f5d47fab120736 SHA512 3fc770b9d6f1e7cb7cba7fc28f90d5f51ad431f38e757dcb47b03543985d0919e29b6648b8c3f6bb6e1c7b172bb164cde35e2fea24564e476088c1a91e6131c8
diff --git a/app-emulation/wine-proton/wine-proton-8.0.1d.ebuild b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
index 1080ea80dd3f..e5ff1bbe7cce 100644
--- a/app-emulation/wine-proton/wine-proton-8.0.1d.ebuild
+++ b/app-emulation/wine-proton/wine-proton-8.0.3c.ebuild
@@ -28,10 +28,10 @@ HOMEPAGE="https://github.com/ValveSoftware/wine/"
 LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff"
 SLOT="${PV}"
 IUSE="
-	+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags debug
+	+abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags
 	+fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa
-	perl pulseaudio +sdl selinux +ssl udev udisks +unwind usb v4l
-	+xcomposite xinerama"
+	perl pulseaudio +sdl selinux +ssl +strip udev udisks +unwind
+	usb v4l +xcomposite xinerama"
 
 # tests are non-trivial to run, can hang easily, don't play well with
 # sandbox, and several need real opengl/vulkan or network access
@@ -256,7 +256,8 @@ src_configure() {
 
 		# use *FLAGS for mingw, but strip unsupported
 		: "${CROSSCFLAGS:=$(
-			# >=wine-7.21 configure.ac no longer adds -fno-strict by mistake
+			# >=wine-7.21 <8.10's configure.ac does not pass -fno-strict when
+			# it should (can be removed when proton is rebased on >=8.10)
 			append-cflags '-fno-strict-aliasing'
 			filter-flags '-fstack-protector*' #870136
 			filter-flags '-mfunction-return=thunk*' #878849
@@ -310,9 +311,13 @@ src_install() {
 	# don't let portage try to strip PE files with the wrong
 	# strip executable and instead handle it here (saves ~120MB)
 	dostrip -x ${WINE_PREFIX}/wine/{i386,x86_64}-windows
-	use debug ||
+
+	if use strip; then
+		ebegin "Stripping Windows (PE) binaries"
 		find "${ED}"${WINE_PREFIX}/wine/*-windows -regex '.*\.\(a\|dll\|exe\)' \
-			-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} + || die
+			-exec $(usex abi_x86_64 x86_64 i686)-w64-mingw32-strip --strip-unneeded {} +
+		eend ${?} || die
+	fi
 
 	dodoc ANNOUNCE AUTHORS README* documentation/README*
 	readme.gentoo_create_doc