[gentoo-commits] repo/gentoo:master commit in: games-action/polymc/files/, profiles/, games-action/polymc/

[Andrew Ammerlaan]

commit:     19a8f17595a0e1717879a2f2626d13da2dbabc6f
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  6 07:59:23 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Nov  6 07:59:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19a8f175

games-action/polymc: treeclean

Bug: https://bugs.gentoo.org/877495
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 games-action/polymc/Manifest                       |   1 -
 .../polymc/files/polymc-1.4.1-include_QDebug.patch |  16 ---
 games-action/polymc/metadata.xml                   |  29 -----
 games-action/polymc/polymc-1.4.2-r2.ebuild         | 135 ---------------------
 profiles/package.mask                              |  11 --
 5 files changed, 192 deletions(-)

diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
deleted file mode 100644
index a1bac66848dd..000000000000
--- a/games-action/polymc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST polymc-1.4.2.tar.gz 5766773 BLAKE2B 0d40f2b1fc6df28089d874a2de949b24a719936b0961fa08a0e909a82931b411926464328ada8ec05c148ba39e405ff9f4d336fc4ade316725756e235231eb60 SHA512 6212752a176e0d3414f66b013b46adc500c5d9e7fa250646aaf9b6bd42b9cbaa7c23282c7da6105e37d6ae77f790cd0036ad4e07b8aa50b611d41045035bc533

diff --git a/games-action/polymc/files/polymc-1.4.1-include_QDebug.patch b/games-action/polymc/files/polymc-1.4.1-include_QDebug.patch
deleted file mode 100644
index 0ad85d958d34..000000000000
--- a/games-action/polymc/files/polymc-1.4.1-include_QDebug.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-add explicit QDebug include in PollServer
-https://bugs.gentoo.org/869395
---- a/libraries/katabasis/src/PollServer.cpp
-+++ b/libraries/katabasis/src/PollServer.cpp
-@@ -1,6 +1,8 @@
- #include <QNetworkAccessManager>
- #include <QNetworkReply>
- 
-+#include <QDebug>
-+
- #include "katabasis/PollServer.h"
- #include "JsonResponse.h"
- 
--- 
-2.37.3
-

diff --git a/games-action/polymc/metadata.xml b/games-action/polymc/metadata.xml
deleted file mode 100644
index f704149126f6..000000000000
--- a/games-action/polymc/metadata.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>flowlnlnln@×××××.com</email>
-    <name>Thiago Donato Ferreira</name>
-  </maintainer>
-  <maintainer type="person" proxied="yes">
-    <email>swurl@×××××.xyz</email>
-    <name>Carson Rueter</name>
-  </maintainer>
-  <maintainer type="person" proxied="proxy">
-    <email>andrewammerlaan@g.o</email>
-    <name>Andrew Ammerlaan</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@g.o</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <bugs-to>https://github.com/PolyMC/PolyMC/issues</bugs-to>
-    <doc>https://polymc.org/wiki/</doc>
-    <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.4.2-r2.ebuild b/games-action/polymc/polymc-1.4.2-r2.ebuild
deleted file mode 100644
index b14fd617e73b..000000000000
--- a/games-action/polymc/polymc-1.4.2-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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
-	"
-
-	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 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT"
-
-SLOT="0"
-
-IUSE="debug lto test"
-REQUIRED_USE="
-	lto? ( !debug )
-"
-
-RESTRICT="!test? ( test )"
-
-MIN_QT="5.12.0"
-QT_SLOT=5
-
-QT_DEPS="
-	>=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtcore-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtgui-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qttest-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtxml-${MIN_QT}:${QT_SLOT}
-"
-
-# Required at both build-time and run-time
-COMMON_DEPENDS="
-	${QT_DEPS}
-	>=dev-libs/quazip-1.3:=[qt5(+)]
-	sys-libs/zlib
-"
-
-BDEPEND="
-	app-text/scdoc
-	kde-frameworks/extra-cmake-modules:5
-"
-
-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}
-
-	>=dev-qt/qtsvg-${MIN_QT}:${QT_SLOT}
-
-	>=virtual/jre-1.8.0:*
-	virtual/opengl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.1-include_QDebug.patch
-)
-
-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(){
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="/usr"
-		# Resulting binary is named polymc
-		-DLauncher_APP_BINARY_NAME="${PN}"
-		# Force Qt5 to avoid accidentaly building the Qt6 version and breaking things
-		-DLauncher_QT_VERSION_MAJOR=${QT_SLOT}
-
-		-DENABLE_LTO=$(usex lto)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	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-apps/xrandr
-
-	optfeature "built-in MangoHud support" games-util/mangohud
-	optfeature "built-in Feral Gamemode support" games-util/gamemode
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 66ffbbc2fbfb..729b04d12cae 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -210,17 +210,6 @@ dev-python/eventlet
 # Bug #722092, #749900, #762169, #840656, #845381, #858392, #866701.
 dev-util/nvidia-cuda-sdk
 
-# Andrew Ammerlaan <andrewammerlaan@g.o> (2022-10-17)
-# Hostile takeover ongoing, integrity cannot be guaranteed.
-# Use the release version only if you change the meta server setting.
-# Use games-action/multimc-bin or games-action/prismlauncher instead
-# to be completely safe.
-# https://bugs.gentoo.org/877495
-#
-# Update (2022-10-20)
-# Removal in 15 days, please install games-action/prismlauncher instead
-games-action/polymc
-
 # Michał Górny <mgorny@g.o> (2022-10-17)
 # Unmaintained since 2018.  Requires dev-python/nose.  No revdeps left.
 # Removal on 2022-11-16.  Bug #877375.