gentoo resync : 12.05.2022

6 files changed, 210 insertions, 46 deletions

diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index 83c7ff3d6f46..3605f4652968 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,4 +1,7 @@
-DIST polymc-1.1.1.tar.gz 5116164 BLAKE2B ca251cac3c8ea21de8a59297a0e637dac078d751476fec5fe86696df270c63ff079779056f016fa656506ea205bb7ace50ab6e0df190ffca14e43297b92292af SHA512 db32479e9e8a92ec61292c97281673b3084e1085d29b764214834de872d9eddf2ed1d2e383bcd79197e0c9321eec025af652b12c863596ff6abb0f5fba9a7af5
-EBUILD polymc-1.1.1.ebuild 2317 BLAKE2B d7862396b8af84cad3baca0415871f66a9012e8844d4207c144f380f493be5da8467f93b5ff40439134c8189157e610ff160497354b670cd1a77894c5c33a180 SHA512 cdce37a46ef2b4eee61e00e5cf6994909f1b46fff23dba07e68fb9ef5723b5f80c45c66162f8461ccd787c9c99a1999b99d74e6e02306dc1df8b857a8d77c4fd
-EBUILD polymc-9999.ebuild 2317 BLAKE2B d7862396b8af84cad3baca0415871f66a9012e8844d4207c144f380f493be5da8467f93b5ff40439134c8189157e610ff160497354b670cd1a77894c5c33a180 SHA512 cdce37a46ef2b4eee61e00e5cf6994909f1b46fff23dba07e68fb9ef5723b5f80c45c66162f8461ccd787c9c99a1999b99d74e6e02306dc1df8b857a8d77c4fd
-MISC metadata.xml 1013 BLAKE2B 350e90c59ce4e58fe013474a158b33688afbaa988d9749cecb1765689ce5a5c98cc8eda808bd6d8483ecdb7246ef0ab6c0112cd7b45e95dff9b2c3f6b3bc3f41 SHA512 2e152d4cabdf02bddc25854d03a38c06e1440ab0c400582b6ed5b8fb1b932e1968465bd54bea66f32988d7a721a67719a9513d2ae641e11f70557a9b62a80e45
+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
+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
new file mode 100644
index 000000000000..01477e559ff6
--- /dev/null
+++ b/games-action/polymc/files/polymc-iconfix.patch
@@ -0,0 +1,29 @@
+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/metadata.xml b/games-action/polymc/metadata.xml
index 78a705414ef3..f704149126f6 100644
--- a/games-action/polymc/metadata.xml
+++ b/games-action/polymc/metadata.xml
@@ -23,4 +23,7 @@
     <remote-id type="github">PolyMC/PolyMC</remote-id>
   </upstream>
   <longdescription>PolyMC is a multi-instance Minecraft launcher focused on user freedom, redistributability, and simplicity.</longdescription>
+  <use>
+    <flag name="lto">Enable link-time optimization</flag>
+  </use>
 </pkgmetadata>
diff --git a/games-action/polymc/polymc-1.1.1.ebuild b/games-action/polymc/polymc-1.2.1.ebuild
index d036cb15c635..00e26da2635e 100644
--- a/games-action/polymc/polymc-1.1.1.ebuild
+++ b/games-action/polymc/polymc-1.2.1.ebuild
@@ -13,12 +13,10 @@ if [[ ${PV} == 9999 ]]; then
 
 	EGIT_REPO_URI="
 		https://github.com/PolyMC/PolyMC
-		https://github.com/MultiMC/libnbtplusplus
-		https://github.com/stachenov/quazip
+		https://github.com/PolyMC/libnbtplusplus
 	"
 
-	# Include all submodules
-	EGIT_SUBMODULES=( '*' )
+	EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
 else
 	MY_PN="PolyMC"
 
@@ -36,13 +34,15 @@ fi
 # Apache-2.0 for MultiMC (PolyMC is forked from it)
 # GPL-3 for PolyMC
 # LGPL-3 for libnbtplusplus
-# LGPL-2.1 with linking exception for Quazip
 # See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 LGPL-2.1-with-linking-exception OFL-1.1 MIT"
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
 
 SLOT="0"
 
-IUSE="debug"
+IUSE="debug lto"
+REQUIRED_USE="
+	lto? ( !debug )
+"
 
 MIN_QT="5.6.0"
 
@@ -56,43 +56,50 @@ QT_DEPS="
 	>=dev-qt/qtxml-${MIN_QT}:5
 "
 
-DEPEND="
+# Required at both build-time and run-time
+COMMON_DEPENDS="
 	${QT_DEPS}
-	media-libs/libglvnd
+	>=dev-libs/quazip-1.3:=
 	sys-libs/zlib
+"
+
+DEPEND="
+	${COMMON_DEPENDS}
+	media-libs/libglvnd
 	>=virtual/jdk-1.8.0:*
 "
 
 # At run-time we don't depend on JDK, only JRE
 # And we need more than just the GL headers
 RDEPEND="
-	${QT_DEPS}
-	sys-libs/zlib
+	${COMMON_DEPENDS}
 	>=virtual/jre-1.8.0:*
 	virtual/opengl
 "
 
+if [[ ${PV} != 9999 ]]; then
+	PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
+fi
+
 src_prepare() {
 	cmake_src_prepare
 }
 
 src_configure(){
-	if use debug; then
-		CMAKE_BUILD_TYPE=Debug
-	else
-		# Prepare for LTO in 1.2.0 (?)
-		# See https://github.com/PolyMC/PolyMC/pull/333
-		CMAKE_BUILD_TYPE=Release
-	fi
-
 	local mycmakeargs=(
-		# Do a system install
-		-DLauncher_PORTABLE=0
 		-DCMAKE_INSTALL_PREFIX="/usr"
 		# Resulting binary is named polymc
 		-DLauncher_APP_BINARY_NAME="${PN}"
+
+		-DENABLE_LTO=$(usex lto)
 	)
 
+	if use debug; then
+		CMAKE_BUILD_TYPE=Debug
+	else
+		CMAKE_BUILD_TYPE=Release
+	fi
+
 	cmake_src_configure
 }
 
diff --git a/games-action/polymc/polymc-1.2.2.ebuild b/games-action/polymc/polymc-1.2.2.ebuild
new file mode 100644
index 000000000000..00e26da2635e
--- /dev/null
+++ b/games-action/polymc/polymc-1.2.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake java-pkg-2 optfeature xdg
+
+HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
+DESCRIPTION="A custom, open source Minecraft launcher"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="
+		https://github.com/PolyMC/PolyMC
+		https://github.com/PolyMC/libnbtplusplus
+	"
+
+	EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
+else
+	MY_PN="PolyMC"
+
+	# Let's use the vendored tarball to avoid dealing with the submodules directly
+	SRC_URI="
+		https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
+	"
+
+	# The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
+	S="${WORKDIR}/${MY_PN}-${PV}"
+
+	KEYWORDS="~amd64"
+fi
+
+# Apache-2.0 for MultiMC (PolyMC is forked from it)
+# GPL-3 for PolyMC
+# LGPL-3 for libnbtplusplus
+# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
+
+SLOT="0"
+
+IUSE="debug lto"
+REQUIRED_USE="
+	lto? ( !debug )
+"
+
+MIN_QT="5.6.0"
+
+QT_DEPS="
+	>=dev-qt/qtconcurrent-${MIN_QT}:5
+	>=dev-qt/qtcore-${MIN_QT}:5
+	>=dev-qt/qtgui-${MIN_QT}:5
+	>=dev-qt/qtnetwork-${MIN_QT}:5
+	>=dev-qt/qttest-${MIN_QT}:5
+	>=dev-qt/qtwidgets-${MIN_QT}:5
+	>=dev-qt/qtxml-${MIN_QT}:5
+"
+
+# Required at both build-time and run-time
+COMMON_DEPENDS="
+	${QT_DEPS}
+	>=dev-libs/quazip-1.3:=
+	sys-libs/zlib
+"
+
+DEPEND="
+	${COMMON_DEPENDS}
+	media-libs/libglvnd
+	>=virtual/jdk-1.8.0:*
+"
+
+# At run-time we don't depend on JDK, only JRE
+# And we need more than just the GL headers
+RDEPEND="
+	${COMMON_DEPENDS}
+	>=virtual/jre-1.8.0:*
+	virtual/opengl
+"
+
+if [[ ${PV} != 9999 ]]; then
+	PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
+fi
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure(){
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="/usr"
+		# Resulting binary is named polymc
+		-DLauncher_APP_BINARY_NAME="${PN}"
+
+		-DENABLE_LTO=$(usex lto)
+	)
+
+	if use debug; then
+		CMAKE_BUILD_TYPE=Debug
+	else
+		CMAKE_BUILD_TYPE=Release
+	fi
+
+	cmake_src_configure
+}
+
+src_compile(){
+	cmake_src_compile
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	# https://github.com/PolyMC/PolyMC/issues/227
+	optfeature "old Minecraft (<= 1.12.2) support" x11-libs/libXrandr
+}
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index d036cb15c635..00e26da2635e 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -13,12 +13,10 @@ if [[ ${PV} == 9999 ]]; then
 
 	EGIT_REPO_URI="
 		https://github.com/PolyMC/PolyMC
-		https://github.com/MultiMC/libnbtplusplus
-		https://github.com/stachenov/quazip
+		https://github.com/PolyMC/libnbtplusplus
 	"
 
-	# Include all submodules
-	EGIT_SUBMODULES=( '*' )
+	EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
 else
 	MY_PN="PolyMC"
 
@@ -36,13 +34,15 @@ fi
 # Apache-2.0 for MultiMC (PolyMC is forked from it)
 # GPL-3 for PolyMC
 # LGPL-3 for libnbtplusplus
-# LGPL-2.1 with linking exception for Quazip
 # See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 LGPL-2.1-with-linking-exception OFL-1.1 MIT"
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
 
 SLOT="0"
 
-IUSE="debug"
+IUSE="debug lto"
+REQUIRED_USE="
+	lto? ( !debug )
+"
 
 MIN_QT="5.6.0"
 
@@ -56,43 +56,50 @@ QT_DEPS="
 	>=dev-qt/qtxml-${MIN_QT}:5
 "
 
-DEPEND="
+# Required at both build-time and run-time
+COMMON_DEPENDS="
 	${QT_DEPS}
-	media-libs/libglvnd
+	>=dev-libs/quazip-1.3:=
 	sys-libs/zlib
+"
+
+DEPEND="
+	${COMMON_DEPENDS}
+	media-libs/libglvnd
 	>=virtual/jdk-1.8.0:*
 "
 
 # At run-time we don't depend on JDK, only JRE
 # And we need more than just the GL headers
 RDEPEND="
-	${QT_DEPS}
-	sys-libs/zlib
+	${COMMON_DEPENDS}
 	>=virtual/jre-1.8.0:*
 	virtual/opengl
 "
 
+if [[ ${PV} != 9999 ]]; then
+	PATCHES=( "${FILESDIR}/${PN}-iconfix.patch" )
+fi
+
 src_prepare() {
 	cmake_src_prepare
 }
 
 src_configure(){
-	if use debug; then
-		CMAKE_BUILD_TYPE=Debug
-	else
-		# Prepare for LTO in 1.2.0 (?)
-		# See https://github.com/PolyMC/PolyMC/pull/333
-		CMAKE_BUILD_TYPE=Release
-	fi
-
 	local mycmakeargs=(
-		# Do a system install
-		-DLauncher_PORTABLE=0
 		-DCMAKE_INSTALL_PREFIX="/usr"
 		# Resulting binary is named polymc
 		-DLauncher_APP_BINARY_NAME="${PN}"
+
+		-DENABLE_LTO=$(usex lto)
 	)
 
+	if use debug; then
+		CMAKE_BUILD_TYPE=Debug
+	else
+		CMAKE_BUILD_TYPE=Release
+	fi
+
 	cmake_src_configure
 }