gentoo resync : 29.12.2022

5 files changed, 20 insertions, 50 deletions

diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 3605f4652968..a544f6955074 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,7 +1,6 @@
-AUX polymc-iconfix.patch 1011 BLAKE2B 17d55d81732cb432205a29e532fe9464bec8e5f43a5a30a749010634920df20d2cf6fdcaca19b93312c742d72f0c1146e66d92476553298013a2f3c70913b18c SHA512 21c8bf9abb2d3eab21c39e7cfd0140e4062293781edfa54a436d52e9628db4b6e2bae6d635e9847d13473c5e8f45c016de20e116c2bc7d252d997c224ef92919
-DIST polymc-1.2.1.tar.gz 5157547 BLAKE2B 92a65cd1303b4f2dce299d2a40824de54babd47bd21a894827e7a0e94276551fc747873ba44e63ac13b3ca46649c3d5280ec9eecd92eb63678f8cbc3c27e4f69 SHA512 193415b552dbc3f540f481c22e36c2b9d0604757cb12283ec0fc2979246757937648b76821818f0742b3f5201ed7af8e535dff9ef3d5efcb22f7a1ddf9ee67d2
-DIST polymc-1.2.2.tar.gz 5167667 BLAKE2B 5cc26d1650f9cf851ad01d3bc75a0ec3f19b3aa50031a91a3c9c16e9bc73dabfc495e408b8c83559026f3af03b86fdd5c83815f04c62121b71c144d1548d764c SHA512 d81d1aaba5361c8ad664bbecffd9869dda637002a5c1288142f40d21abca974d6cc03a50685be5f70a01d5b1ae8bcff4e48c5b849f6c3dcd959e5977582ada58
-EBUILD polymc-1.2.1.ebuild 2310 BLAKE2B 08c80d5315f096efc97e54ac33a5cc3ebb60f5a84f2ea7b27d00f2010f7e95ff392a1abbd1e1f55dd97e54a41ff45ab424064de4bb52c685d499ba30a6ad979d SHA512 0d73dba206b37e91e698583201139c580e22db930a7d7172ad4f2f8027fbee9adbabad343b2d3cc706e075f5b825da1282e7b11e4b5f7017c011f55cba95c885
-EBUILD polymc-1.2.2.ebuild 2310 BLAKE2B 08c80d5315f096efc97e54ac33a5cc3ebb60f5a84f2ea7b27d00f2010f7e95ff392a1abbd1e1f55dd97e54a41ff45ab424064de4bb52c685d499ba30a6ad979d SHA512 0d73dba206b37e91e698583201139c580e22db930a7d7172ad4f2f8027fbee9adbabad343b2d3cc706e075f5b825da1282e7b11e4b5f7017c011f55cba95c885
-EBUILD polymc-9999.ebuild 2310 BLAKE2B 08c80d5315f096efc97e54ac33a5cc3ebb60f5a84f2ea7b27d00f2010f7e95ff392a1abbd1e1f55dd97e54a41ff45ab424064de4bb52c685d499ba30a6ad979d SHA512 0d73dba206b37e91e698583201139c580e22db930a7d7172ad4f2f8027fbee9adbabad343b2d3cc706e075f5b825da1282e7b11e4b5f7017c011f55cba95c885
+DIST polymc-1.3.1.tar.gz 5651471 BLAKE2B ee36d6f046959932c72d6b3320704bbc565afd56e03f715db0f9270148b7ced80ff46d4e2ad33167e77e9b95d5dbe3316d9c7b5f9b36c15e28989555fddf0239 SHA512 8cfd644574a588a0b8dca6adbd9aee21bd603fc29649bbf55ad713dc37a1a9d7a8720031a6952d97c6a597c082f7437315044926d7da2d50e58a3da096343c7b
+DIST polymc-1.3.2.tar.gz 5641952 BLAKE2B f1014c79c394db79e07bcd55c65c930ace80274a83cffc4c8adff58547f3ddf9baa5685ecd7b860c8ec21e4ae4ebf407233d3cb2b8d9ae2a81abd31248b1cebf SHA512 f272248631e76e2cb3b74f3bc91ab3d4f7e7cf4fb7396a09b8bcaf65d928076f49e436e3d7c1a34c32a2cbcf10760709f86cd9c0eca285b66790f25b1c466ea0
+EBUILD polymc-1.3.1.ebuild 2462 BLAKE2B da795feac3140106746b41392edb7fd006e16adccc7e342b3b9d3d6eb95bd0492c03b62dc59fb9e16bf0ada82cebab9c18d529f6293b234b25a63cb4beb9677e SHA512 22c654b5170529e7af3d9ec517517729f104c363026e8d26b7f10c10d3d7480f70ac04d05beb44770865aac1ef93284b8fcd7607d0673ba3809dcf8b09426ce1
+EBUILD polymc-1.3.2.ebuild 2462 BLAKE2B da795feac3140106746b41392edb7fd006e16adccc7e342b3b9d3d6eb95bd0492c03b62dc59fb9e16bf0ada82cebab9c18d529f6293b234b25a63cb4beb9677e SHA512 22c654b5170529e7af3d9ec517517729f104c363026e8d26b7f10c10d3d7480f70ac04d05beb44770865aac1ef93284b8fcd7607d0673ba3809dcf8b09426ce1
+EBUILD polymc-9999.ebuild 2462 BLAKE2B da795feac3140106746b41392edb7fd006e16adccc7e342b3b9d3d6eb95bd0492c03b62dc59fb9e16bf0ada82cebab9c18d529f6293b234b25a63cb4beb9677e SHA512 22c654b5170529e7af3d9ec517517729f104c363026e8d26b7f10c10d3d7480f70ac04d05beb44770865aac1ef93284b8fcd7607d0673ba3809dcf8b09426ce1
 MISC metadata.xml 1088 BLAKE2B 5a9d980fb174d942db61bacb4e5b7d65b59f2ecbc91e4e4a5b15b91fc1abb1d6ab9e8acd3a9db6e526df1321e25120ba89f0802f859daae86a2269542b51db3a SHA512 1c2657370e99a198fc2dea81e9829509e0a49a0a87230cf51b6c695ea1f46a85c0a9a4c001c793b733eef2134db8966ba54d6188e4241095a330604dccc91f4b
diff --git a/games-action/polymc/files/polymc-iconfix.patch b/games-action/polymc/files/polymc-iconfix.patch
deleted file mode 100644
index 01477e559ff6..000000000000
--- a/games-action/polymc/files/polymc-iconfix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8f494636afb9a9b9c0619b256252d3a9dcdbab72 Mon Sep 17 00:00:00 2001
-From: flow <thiagodonato300@gmail.com>
-Date: Thu, 21 Apr 2022 06:38:18 -0300
-Subject: [PATCH] fix: Build iconfix as static library
-
-Otherwise the launcher is unable to find the iconfix .so, and so the
-launcher doesn't run.
-
-Signed-off-by: Thiago Donato Ferreira <flowlnlnln@gmail.com>
----
- libraries/iconfix/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libraries/iconfix/CMakeLists.txt b/libraries/iconfix/CMakeLists.txt
-index 08441203..97a59129 100644
---- a/libraries/iconfix/CMakeLists.txt
-+++ b/libraries/iconfix/CMakeLists.txt
-@@ -12,7 +12,7 @@ internal/qiconloader.cpp
- internal/qiconloader_p.h
- )
- 
--add_library(Launcher_iconfix ${ICONFIX_SOURCES})
-+add_library(Launcher_iconfix STATIC ${ICONFIX_SOURCES})
- target_include_directories(Launcher_iconfix PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}" )
- 
- target_link_libraries(Launcher_iconfix Qt5::Core Qt5::Widgets)
--- 
-2.35.1
-
diff --git a/games-action/polymc/polymc-1.2.1.ebuild b/games-action/polymc/polymc-1.3.1.ebuild
index 00e26da2635e..1034a30e5df0 100644
--- a/games-action/polymc/polymc-1.2.1.ebuild
+++ b/games-action/polymc/polymc-1.3.1.ebuild
@@ -44,7 +44,7 @@ REQUIRED_USE="
 	lto? ( !debug )
 "
 
-MIN_QT="5.6.0"
+MIN_QT="5.12.0"
 
 QT_DEPS="
 	>=dev-qt/qtconcurrent-${MIN_QT}:5
@@ -77,12 +77,12 @@ RDEPEND="
 	virtual/opengl
 "
 
-if [[ ${PV} != 9999 ]]; then
-	PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
-fi
-
 src_prepare() {
 	cmake_src_prepare
+
+	# 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'
 }
 
 src_configure(){
diff --git a/games-action/polymc/polymc-1.2.2.ebuild b/games-action/polymc/polymc-1.3.2.ebuild
index 00e26da2635e..1034a30e5df0 100644
--- a/games-action/polymc/polymc-1.2.2.ebuild
+++ b/games-action/polymc/polymc-1.3.2.ebuild
@@ -44,7 +44,7 @@ REQUIRED_USE="
 	lto? ( !debug )
 "
 
-MIN_QT="5.6.0"
+MIN_QT="5.12.0"
 
 QT_DEPS="
 	>=dev-qt/qtconcurrent-${MIN_QT}:5
@@ -77,12 +77,12 @@ RDEPEND="
 	virtual/opengl
 "
 
-if [[ ${PV} != 9999 ]]; then
-	PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
-fi
-
 src_prepare() {
 	cmake_src_prepare
+
+	# 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'
 }
 
 src_configure(){
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index 00e26da2635e..1034a30e5df0 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -44,7 +44,7 @@ REQUIRED_USE="
 	lto? ( !debug )
 "
 
-MIN_QT="5.6.0"
+MIN_QT="5.12.0"
 
 QT_DEPS="
 	>=dev-qt/qtconcurrent-${MIN_QT}:5
@@ -77,12 +77,12 @@ RDEPEND="
 	virtual/opengl
 "
 
-if [[ ${PV} != 9999 ]]; then
-	PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
-fi
-
 src_prepare() {
 	cmake_src_prepare
+
+	# 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'
 }
 
 src_configure(){