gentoo auto-resync : 09:11:2023 - 10:28:50

5 files changed, 22 insertions, 13 deletions

diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 6ba03fcb5ecd..02eaf03c1005 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/prismlauncher/Manifest b/games-action/prismlauncher/Manifest
index 98bb70666817..cea18dfce114 100644
--- a/games-action/prismlauncher/Manifest
+++ b/games-action/prismlauncher/Manifest
@@ -1,6 +1,6 @@
-DIST prismlauncher-7.1.tar.gz 8277729 BLAKE2B 7bbb21339ecb36d26815ba75345f36df041c8343b073d4a241efd8f6439fa7dc166c0126c74fa58b33547ffe3eca9d77bcf143b29961a0b0d755434c3148a8d9 SHA512 64807c49c4b8eb527c7be53616463a95a990ff2118dde8889157acf90b7086a81b504c48c1ce2f46499fe31d95ee44795dded652e07dcfc09d5f55440c0d34a6
 DIST prismlauncher-7.2.tar.gz 8321071 BLAKE2B 393737d1f53d82986430ea8d77e65cd7f191a0ba73548ec4ff72ca62fe8bd8beae5b3718806e1c62c0f4339e02343e9f30aa851b0617685e3309bcb902d265a8 SHA512 f809434ff57b8bb10368c5a2e1c82f0082816fc8d45d8431f723fce1ea6b942e62fbb75be792c8ead8fc0828178330237ed0a1d2a24196e3afadc2678ba170ed
-EBUILD prismlauncher-7.1.ebuild 3810 BLAKE2B 7ed6e5dfc0f745f8dafd2e3537befc0a85f8d441515a70b9bb6aacb37f3478428e5e455b9040fc72d66ad112f01597e196593400007f9ede2972915a2df108e1 SHA512 4ce6620ae466b14de33c0952b4ee8d0fb4b85e84d981d1338b2fece797e6f5d894b47f6eb81f91c44e1b41a86eebed9bf8f388b00f19346e44d4c3e39f101046
-EBUILD prismlauncher-7.2.ebuild 3848 BLAKE2B 6f5c8e13dbd5910dc00aad0b387c2e800b7b98f367e4842bd0092ec8cdd05f097fdce097ac960c1f080d1497cf22fe280d7c861d56b4fdd0cd023581f8eb9a09 SHA512 901ca62b41255673f60315235de455fed72bf9fad4a047db245983cde8f10e249cb8dea35188b8de2dc111f9503bb662dae9228d85e98b629528e65a1d3cdb3e
-EBUILD prismlauncher-9999.ebuild 3848 BLAKE2B 6f5c8e13dbd5910dc00aad0b387c2e800b7b98f367e4842bd0092ec8cdd05f097fdce097ac960c1f080d1497cf22fe280d7c861d56b4fdd0cd023581f8eb9a09 SHA512 901ca62b41255673f60315235de455fed72bf9fad4a047db245983cde8f10e249cb8dea35188b8de2dc111f9503bb662dae9228d85e98b629528e65a1d3cdb3e
+DIST prismlauncher-8.0.tar.gz 8430953 BLAKE2B 74fcc2d8105976cbba774ff8c727b3a57f36f6bd21ab7b3d8be98b26c0b456f78f941af192a76e170ad70fde3567358d0d8e7f47a402052503da19858bbab948 SHA512 a080d7262e2b284a1bab18c99f33e4bea7854fd946aff3f74d0a2e5c896bbf9ad90a3c4700c83162918f5269aa90b3f41e88fe94a89e197243ab3b38f8a7995c
+EBUILD prismlauncher-7.2-r1.ebuild 3993 BLAKE2B 434d3a8bb97cee3afcc73e62616e93db48f57403e49624365d592928911df8e4d597d1b8d1ead433035485149514314e0f1fc81db3ac3a24cda73e1a55dafff9 SHA512 c046ed5ee23283eea914a957da396fdef944c0b6b58a8e5cece47493ad74437ae0296fe7674ac4a973100a0c90a2a1141e10923a387665840f0635c6f4cd5d6f
+EBUILD prismlauncher-8.0.ebuild 3994 BLAKE2B 5f98ad9ba7338fb93f0bfb5a0f1e08335c668366f466356276f85609fc5bf08b7281515748f8bda5448840faf27924a6c91500a8415608641f4e7f6a1ff73521 SHA512 12837922e7ae2bb92ce7e88ffd9a259122c9acb8b627b637d027eb921573d9d3d5078f8abf218aa4b2656ce127c142947f4e2274a110e164001a357434ca64d7
+EBUILD prismlauncher-9999.ebuild 3964 BLAKE2B 725d9d0b30faebc25a33319159b209428ec02860e4f3b0d7b8fd7ecbe8b039031d8737a3154d67562dc4f076f287ebbbc1d39e3586aa20ede34794b8ee3e2650 SHA512 b5eae00eb9e2f18957c244d8f46ecdfea936c0ba4ea0cb6af1ef55537a0a4417d6340ab25a4f9a0fd5787dd81c4b9998684c98953c304882e5fa7b80b614d730
 MISC metadata.xml 1084 BLAKE2B 7def85b6f71b9b18fc987e89c3c2c3e32eaef060183e05a1be179eefe322258c7f83c84066e7300df87c62857e66c2499943db960f45e6532d803b671aa028b9 SHA512 0f893adce9d7b7b259226da5047b594774930afbf25d5a933dbfc9d7247380ae255b97d765ef0b07814101cd017c3c4852131d2f38b57acae0961b4b4606da0e
diff --git a/games-action/prismlauncher/prismlauncher-7.1.ebuild b/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
index 7871021897c4..86da806aab2e 100644
--- a/games-action/prismlauncher/prismlauncher-7.1.ebuild
+++ b/games-action/prismlauncher/prismlauncher-7.2-r1.ebuild
@@ -74,6 +74,7 @@ COMMON_DEPENDS="
 	!qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] )
 	 qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] )
 
+	app-text/cmark
 	sys-libs/zlib
 "
 
@@ -81,7 +82,6 @@ COMMON_DEPENDS="
 # only on legacy macOS. Still, we need it present at build time to appease CMake, and having it like this
 # makes it easier to maintain than patching the CMakeLists file directly.
 BDEPEND="
-	app-text/cmark
 	app-text/scdoc
 	dev-cpp/gulrak-filesystem
 	kde-frameworks/extra-cmake-modules:5
@@ -108,9 +108,11 @@ RDEPEND="
 src_prepare() {
 	cmake_src_prepare
 
+	sed -i -e 's/-Werror//' CMakeLists.txt || die 'Failed to remove -Werror via sed'
+
 	# Prevent conflicting with the user's flags
-	# See https://bugs.gentoo.org/848765 for more info
-	sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
+	# See https://bugs.gentoo.org/848765 and https://bugs.gentoo.org/911858 for more info
+	sed -i -e "/CMAKE_CXX_FLAGS_RELEASE/d" CMakeLists.txt || die 'Failed to remove "CMAKE_CXX_FLAGS_RELEASE" from CMakeLists via sed'
 }
 
 src_configure(){
@@ -118,10 +120,12 @@ src_configure(){
 		-DCMAKE_INSTALL_PREFIX="/usr"
 		# Resulting binary is named prismlauncher
 		-DLauncher_APP_BINARY_NAME="${PN}"
+		-DLauncher_BUILD_PLATFORM="Gentoo"
 		-DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5)
 
 		-DENABLE_LTO=$(usex lto)
 		-DBUILD_TESTING=$(usex test)
+		-DDEBUG_ADDRESS_SANITIZER=0
 	)
 
 	if use debug; then
diff --git a/games-action/prismlauncher/prismlauncher-7.2.ebuild b/games-action/prismlauncher/prismlauncher-8.0.ebuild
index 1d4b9a04996f..06a89b80966d 100644
--- a/games-action/prismlauncher/prismlauncher-7.2.ebuild
+++ b/games-action/prismlauncher/prismlauncher-8.0.ebuild
@@ -74,6 +74,7 @@ COMMON_DEPENDS="
 	!qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] )
 	 qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] )
 
+	app-text/cmark
 	sys-libs/zlib
 "
 
@@ -81,7 +82,6 @@ COMMON_DEPENDS="
 # only on legacy macOS. Still, we need it present at build time to appease CMake, and having it like this
 # makes it easier to maintain than patching the CMakeLists file directly.
 BDEPEND="
-	app-text/cmark
 	app-text/scdoc
 	dev-cpp/gulrak-filesystem
 	kde-frameworks/extra-cmake-modules:5
@@ -108,9 +108,11 @@ RDEPEND="
 src_prepare() {
 	cmake_src_prepare
 
+	sed -i -e 's/-Werror//' CMakeLists.txt || die 'Failed to remove -Werror via sed'
+
 	# Prevent conflicting with the user's flags
-	# See https://bugs.gentoo.org/848765 for more info
-	sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
+	# See https://bugs.gentoo.org/848765 and https://bugs.gentoo.org/911858 for more info
+	sed -i -e "/CMAKE_CXX_FLAGS_RELEASE/d" CMakeLists.txt || die 'Failed to remove "CMAKE_CXX_FLAGS_RELEASE" from CMakeLists via sed'
 }
 
 src_configure(){
@@ -123,6 +125,7 @@ src_configure(){
 
 		-DENABLE_LTO=$(usex lto)
 		-DBUILD_TESTING=$(usex test)
+		-DDEBUG_ADDRESS_SANITIZER=0
 	)
 
 	if use debug; then
diff --git a/games-action/prismlauncher/prismlauncher-9999.ebuild b/games-action/prismlauncher/prismlauncher-9999.ebuild
index 1d4b9a04996f..f3bc7a163f2f 100644
--- a/games-action/prismlauncher/prismlauncher-9999.ebuild
+++ b/games-action/prismlauncher/prismlauncher-9999.ebuild
@@ -74,6 +74,7 @@ COMMON_DEPENDS="
 	!qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] )
 	 qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] )
 
+	app-text/cmark
 	sys-libs/zlib
 "
 
@@ -81,7 +82,6 @@ COMMON_DEPENDS="
 # only on legacy macOS. Still, we need it present at build time to appease CMake, and having it like this
 # makes it easier to maintain than patching the CMakeLists file directly.
 BDEPEND="
-	app-text/cmark
 	app-text/scdoc
 	dev-cpp/gulrak-filesystem
 	kde-frameworks/extra-cmake-modules:5
@@ -108,9 +108,11 @@ RDEPEND="
 src_prepare() {
 	cmake_src_prepare
 
+	sed -i -e 's/-Werror//' CMakeLists.txt || die 'Failed to remove -Werror via sed'
+
 	# Prevent conflicting with the user's flags
-	# See https://bugs.gentoo.org/848765 for more info
-	sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
+	# See https://bugs.gentoo.org/848765 and https://bugs.gentoo.org/911858 for more info
+	sed -i -e "/CMAKE_CXX_FLAGS_RELEASE/d" CMakeLists.txt || die 'Failed to remove "CMAKE_CXX_FLAGS_RELEASE" from CMakeLists via sed'
 }
 
 src_configure(){