* [gentoo-commits] repo/proj/guru:dev commit in: games-action/polymc/
@ 2022-04-09 10:59 Thiago Donato Ferreira
0 siblings, 0 replies; 4+ messages in thread
From: Thiago Donato Ferreira @ 2022-04-09 10:59 UTC (permalink / raw
To: gentoo-commits
commit: a33d6f330ca2ed4de966822261accdbb4d468582
Author: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
AuthorDate: Sat Apr 9 10:30:37 2022 +0000
Commit: Thiago Donato Ferreira <flowlnlnln <AT> gmail <DOT> com>
CommitDate: Sat Apr 9 10:36:41 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a33d6f33
games-action/polymc: new package
Signed-off-by: Thiago Donato Ferreira <flowlnlnln <AT> gmail.com>
games-action/polymc/Manifest | 1 +
games-action/polymc/metadata.xml | 17 ++++++
games-action/polymc/polymc-1.1.1.ebuild | 93 +++++++++++++++++++++++++++++++++
games-action/polymc/polymc-9999.ebuild | 89 +++++++++++++++++++++++++++++++
4 files changed, 200 insertions(+)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
new file mode 100644
index 000000000..bb6f6641a
--- /dev/null
+++ b/games-action/polymc/Manifest
@@ -0,0 +1 @@
+DIST PolyMC-1.1.1.tar.gz 5116164 BLAKE2B ca251cac3c8ea21de8a59297a0e637dac078d751476fec5fe86696df270c63ff079779056f016fa656506ea205bb7ace50ab6e0df190ffca14e43297b92292af SHA512 db32479e9e8a92ec61292c97281673b3084e1085d29b764214834de872d9eddf2ed1d2e383bcd79197e0c9321eec025af652b12c863596ff6abb0f5fba9a7af5
diff --git a/games-action/polymc/metadata.xml b/games-action/polymc/metadata.xml
new file mode 100644
index 000000000..a3aeebb29
--- /dev/null
+++ b/games-action/polymc/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>flowlnlnln@gmail.com</email>
+ <name>Thiago Donato Ferreira</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>swurl@swurl.xyz</email>
+ <name>Carson Rueter</name>
+ </maintainer>
+ <upstream>
+ <bugs-to>https://github.com/PolyMC/PolyMC/issues</bugs-to>
+ <doc>https://polymc.org/wiki/</doc>
+ </upstream>
+ <longdescription lang="en">PolyMC is a multi-instance Minecraft launcher focused on user freedom, redistributability, and simplicity.</longdescription>
+</pkgmetadata>
diff --git a/games-action/polymc/polymc-1.1.1.ebuild b/games-action/polymc/polymc-1.1.1.ebuild
new file mode 100644
index 000000000..d93038a61
--- /dev/null
+++ b/games-action/polymc/polymc-1.1.1.ebuild
@@ -0,0 +1,93 @@
+# 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/"
+DESCRIPTION="A custom, open source Minecraft launcher"
+
+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
+"
+
+# GPL-3 for PolyMC
+# LGPL-3 for libnbtplusplus
+# LGPL-2.1 with linking exception for Quazip
+LICENSE="GPL-3 LGPL-3 LGPL-2.1-with-linking-exception"
+
+SLOT="0"
+KEYWORDS="amd64"
+
+IUSE="debug"
+
+QT_DEPS="
+ >=dev-qt/qtcore-5.6.0:5
+ >=dev-qt/qttest-5.6.0:5
+ >=dev-qt/qtconcurrent-5.6.0:5
+ >=dev-qt/qtgui-5.6.0:5
+ >=dev-qt/qtnetwork-5.6.0:5
+ >=dev-qt/qtwidgets-5.6.0:5
+ >=dev-qt/qtxml-5.6.0:5
+"
+
+BDEPEND="
+ ${QT_DEPS}
+ sys-libs/zlib
+ >=virtual/jdk-1.8.0:*
+ media-libs/libglvnd
+"
+
+DEPEND="
+ ${QT_DEPS}
+ >=virtual/jre-1.8.0:*
+ virtual/opengl
+"
+
+RDEPEND="${DEPEND}"
+
+# We'll fetch the files from the GitHub archive directly, at least for now...
+RESTRICT="mirror"
+
+# The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare(){
+ default
+ 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=false
+ -DCMAKE_INSTALL_PREFIX="/usr"
+ # Resulting binary is named polymc
+ -DLauncher_APP_BINARY_NAME="${PN}"
+ )
+
+ 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
new file mode 100644
index 000000000..ae09f674b
--- /dev/null
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake git-r3 java-pkg-2 optfeature xdg
+
+HOMEPAGE="https://polymc.org/"
+DESCRIPTION="A custom, open source Minecraft launcher"
+
+EGIT_REPO_URI="
+ https://github.com/PolyMC/PolyMC
+ https://github.com/MultiMC/libnbtplusplus
+ https://github.com/stachenov/quazip
+"
+
+# GPL-3 for PolyMC
+# LGPL-3 for libnbtplusplus
+# LGPL-2.1 with linking exception for Quazip
+LICENSE="GPL-3 LGPL-3 LGPL-2.1-with-linking-exception"
+
+SLOT="0"
+
+IUSE="debug"
+
+QT_DEPS="
+ >=dev-qt/qtcore-5.6.0:5
+ >=dev-qt/qttest-5.6.0:5
+ >=dev-qt/qtconcurrent-5.6.0:5
+ >=dev-qt/qtgui-5.6.0:5
+ >=dev-qt/qtnetwork-5.6.0:5
+ >=dev-qt/qtwidgets-5.6.0:5
+ >=dev-qt/qtxml-5.6.0:5
+"
+
+BDEPEND="
+ ${QT_DEPS}
+ sys-libs/zlib
+ >=virtual/jdk-1.8.0:*
+ media-libs/libglvnd
+"
+
+DEPEND="
+ ${QT_DEPS}
+ >=virtual/jre-1.8.0:*
+ virtual/opengl
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ if ${PV} != 9999; then
+ EGIT_COMMIT="${PV}"
+ fi
+
+ git submodule init
+ git config submodule.libnbtplusplus.url "${WORKDIR}/libnbtplusplus"
+ git config submodule.quazip.url "${WORKDIR}/quazip"
+ git submodule update
+
+ default
+ cmake_src_prepare
+}
+
+src_configure(){
+ if use debug; then
+ CMAKE_BUILD_TYPE=Debug
+ else
+ CMAKE_BUILD_TYPE=Release
+ fi
+
+ local mycmakeargs=(
+ -DLauncher_PORTABLE=0
+ -DCMAKE_INSTALL_PREFIX="/usr"
+ -DLauncher_APP_BINARY_NAME="${PN}"
+ )
+ 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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-action/polymc/
@ 2022-04-10 12:33 Andrew Ammerlaan
2022-04-10 12:35 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Ammerlaan @ 2022-04-10 12:33 UTC (permalink / raw
To: gentoo-commits
commit: b68b3c8ad2055f234164d17dcb846ef39d76387c
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 12:33:20 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 12:33:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b68b3c8a
games-action/polymc: synchronize from PR
https://github.com/gentoo/gentoo/pull/24966
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/Manifest | 2 +-
games-action/polymc/polymc-1.1.1.ebuild | 71 ++++++++++++++++++------------
games-action/polymc/polymc-9999.ebuild | 77 ++++++++++++++++++++-------------
3 files changed, 92 insertions(+), 58 deletions(-)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index bb6f6641a..b44203e70 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1 +1 @@
-DIST PolyMC-1.1.1.tar.gz 5116164 BLAKE2B ca251cac3c8ea21de8a59297a0e637dac078d751476fec5fe86696df270c63ff079779056f016fa656506ea205bb7ace50ab6e0df190ffca14e43297b92292af SHA512 db32479e9e8a92ec61292c97281673b3084e1085d29b764214834de872d9eddf2ed1d2e383bcd79197e0c9321eec025af652b12c863596ff6abb0f5fba9a7af5
+DIST polymc-1.1.1.tar.gz 5116164 BLAKE2B ca251cac3c8ea21de8a59297a0e637dac078d751476fec5fe86696df270c63ff079779056f016fa656506ea205bb7ace50ab6e0df190ffca14e43297b92292af SHA512 db32479e9e8a92ec61292c97281673b3084e1085d29b764214834de872d9eddf2ed1d2e383bcd79197e0c9321eec025af652b12c863596ff6abb0f5fba9a7af5
diff --git a/games-action/polymc/polymc-1.1.1.ebuild b/games-action/polymc/polymc-1.1.1.ebuild
index d93038a61..bc6b3a098 100644
--- a/games-action/polymc/polymc-1.1.1.ebuild
+++ b/games-action/polymc/polymc-1.1.1.ebuild
@@ -8,56 +8,71 @@ inherit cmake java-pkg-2 optfeature xdg
HOMEPAGE="https://polymc.org/"
DESCRIPTION="A custom, open source Minecraft launcher"
-MY_PN="PolyMC"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
-# 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
-"
+ EGIT_REPO_URI="
+ https://github.com/PolyMC/PolyMC
+ https://github.com/MultiMC/libnbtplusplus
+ https://github.com/stachenov/quazip
+ "
+
+ # Include all submodules
+ EGIT_SUBMODULES=( '*' )
+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
# LGPL-2.1 with linking exception for Quazip
-LICENSE="GPL-3 LGPL-3 LGPL-2.1-with-linking-exception"
+# 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"
SLOT="0"
-KEYWORDS="amd64"
IUSE="debug"
+MIN_QT="5.6.0"
+
QT_DEPS="
- >=dev-qt/qtcore-5.6.0:5
- >=dev-qt/qttest-5.6.0:5
- >=dev-qt/qtconcurrent-5.6.0:5
- >=dev-qt/qtgui-5.6.0:5
- >=dev-qt/qtnetwork-5.6.0:5
- >=dev-qt/qtwidgets-5.6.0:5
- >=dev-qt/qtxml-5.6.0:5
+ >=dev-qt/qtcore-${MIN_QT}:5
+ >=dev-qt/qttest-${MIN_QT}:5
+ >=dev-qt/qtconcurrent-${MIN_QT}:5
+ >=dev-qt/qtgui-${MIN_QT}:5
+ >=dev-qt/qtnetwork-${MIN_QT}:5
+ >=dev-qt/qtwidgets-${MIN_QT}:5
+ >=dev-qt/qtxml-${MIN_QT}:5
"
-BDEPEND="
+DEPEND="
${QT_DEPS}
- sys-libs/zlib
>=virtual/jdk-1.8.0:*
media-libs/libglvnd
+ sys-libs/zlib
"
-DEPEND="
+# At run-time we don't depend on JDK, only JRE
+# And we need more than just the GL headers
+RDEPEND="
${QT_DEPS}
>=virtual/jre-1.8.0:*
virtual/opengl
+ sys-libs/zlib
"
-RDEPEND="${DEPEND}"
-
-# We'll fetch the files from the GitHub archive directly, at least for now...
-RESTRICT="mirror"
-
-# The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare(){
- default
+src_prepare() {
cmake_src_prepare
}
@@ -72,7 +87,7 @@ src_configure(){
local mycmakeargs=(
# Do a system install
- -DLauncher_PORTABLE=false
+ -DLauncher_PORTABLE=0
-DCMAKE_INSTALL_PREFIX="/usr"
# Resulting binary is named polymc
-DLauncher_APP_BINARY_NAME="${PN}"
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index ae09f674b..bc6b3a098 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -3,62 +3,76 @@
EAPI=8
-inherit cmake git-r3 java-pkg-2 optfeature xdg
+inherit cmake java-pkg-2 optfeature xdg
HOMEPAGE="https://polymc.org/"
DESCRIPTION="A custom, open source Minecraft launcher"
-EGIT_REPO_URI="
- https://github.com/PolyMC/PolyMC
- https://github.com/MultiMC/libnbtplusplus
- https://github.com/stachenov/quazip
-"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="
+ https://github.com/PolyMC/PolyMC
+ https://github.com/MultiMC/libnbtplusplus
+ https://github.com/stachenov/quazip
+ "
+
+ # Include all submodules
+ EGIT_SUBMODULES=( '*' )
+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
# LGPL-2.1 with linking exception for Quazip
-LICENSE="GPL-3 LGPL-3 LGPL-2.1-with-linking-exception"
+# 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"
SLOT="0"
IUSE="debug"
+MIN_QT="5.6.0"
+
QT_DEPS="
- >=dev-qt/qtcore-5.6.0:5
- >=dev-qt/qttest-5.6.0:5
- >=dev-qt/qtconcurrent-5.6.0:5
- >=dev-qt/qtgui-5.6.0:5
- >=dev-qt/qtnetwork-5.6.0:5
- >=dev-qt/qtwidgets-5.6.0:5
- >=dev-qt/qtxml-5.6.0:5
+ >=dev-qt/qtcore-${MIN_QT}:5
+ >=dev-qt/qttest-${MIN_QT}:5
+ >=dev-qt/qtconcurrent-${MIN_QT}:5
+ >=dev-qt/qtgui-${MIN_QT}:5
+ >=dev-qt/qtnetwork-${MIN_QT}:5
+ >=dev-qt/qtwidgets-${MIN_QT}:5
+ >=dev-qt/qtxml-${MIN_QT}:5
"
-BDEPEND="
+DEPEND="
${QT_DEPS}
- sys-libs/zlib
>=virtual/jdk-1.8.0:*
media-libs/libglvnd
+ sys-libs/zlib
"
-DEPEND="
+# At run-time we don't depend on JDK, only JRE
+# And we need more than just the GL headers
+RDEPEND="
${QT_DEPS}
>=virtual/jre-1.8.0:*
virtual/opengl
+ sys-libs/zlib
"
-RDEPEND="${DEPEND}"
-
src_prepare() {
- if ${PV} != 9999; then
- EGIT_COMMIT="${PV}"
- fi
-
- git submodule init
- git config submodule.libnbtplusplus.url "${WORKDIR}/libnbtplusplus"
- git config submodule.quazip.url "${WORKDIR}/quazip"
- git submodule update
-
- default
cmake_src_prepare
}
@@ -66,14 +80,19 @@ 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}"
)
+
cmake_src_configure
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: games-action/polymc/
2022-04-10 12:33 [gentoo-commits] repo/proj/guru:dev commit in: games-action/polymc/ Andrew Ammerlaan
@ 2022-04-10 12:35 ` Andrew Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2022-04-10 12:35 UTC (permalink / raw
To: gentoo-commits
commit: b68b3c8ad2055f234164d17dcb846ef39d76387c
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 12:33:20 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 12:33:20 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b68b3c8a
games-action/polymc: synchronize from PR
https://github.com/gentoo/gentoo/pull/24966
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/Manifest | 2 +-
games-action/polymc/polymc-1.1.1.ebuild | 71 ++++++++++++++++++------------
games-action/polymc/polymc-9999.ebuild | 77 ++++++++++++++++++++-------------
3 files changed, 92 insertions(+), 58 deletions(-)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index bb6f6641a..b44203e70 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1 +1 @@
-DIST PolyMC-1.1.1.tar.gz 5116164 BLAKE2B ca251cac3c8ea21de8a59297a0e637dac078d751476fec5fe86696df270c63ff079779056f016fa656506ea205bb7ace50ab6e0df190ffca14e43297b92292af SHA512 db32479e9e8a92ec61292c97281673b3084e1085d29b764214834de872d9eddf2ed1d2e383bcd79197e0c9321eec025af652b12c863596ff6abb0f5fba9a7af5
+DIST polymc-1.1.1.tar.gz 5116164 BLAKE2B ca251cac3c8ea21de8a59297a0e637dac078d751476fec5fe86696df270c63ff079779056f016fa656506ea205bb7ace50ab6e0df190ffca14e43297b92292af SHA512 db32479e9e8a92ec61292c97281673b3084e1085d29b764214834de872d9eddf2ed1d2e383bcd79197e0c9321eec025af652b12c863596ff6abb0f5fba9a7af5
diff --git a/games-action/polymc/polymc-1.1.1.ebuild b/games-action/polymc/polymc-1.1.1.ebuild
index d93038a61..bc6b3a098 100644
--- a/games-action/polymc/polymc-1.1.1.ebuild
+++ b/games-action/polymc/polymc-1.1.1.ebuild
@@ -8,56 +8,71 @@ inherit cmake java-pkg-2 optfeature xdg
HOMEPAGE="https://polymc.org/"
DESCRIPTION="A custom, open source Minecraft launcher"
-MY_PN="PolyMC"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
-# 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
-"
+ EGIT_REPO_URI="
+ https://github.com/PolyMC/PolyMC
+ https://github.com/MultiMC/libnbtplusplus
+ https://github.com/stachenov/quazip
+ "
+
+ # Include all submodules
+ EGIT_SUBMODULES=( '*' )
+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
# LGPL-2.1 with linking exception for Quazip
-LICENSE="GPL-3 LGPL-3 LGPL-2.1-with-linking-exception"
+# 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"
SLOT="0"
-KEYWORDS="amd64"
IUSE="debug"
+MIN_QT="5.6.0"
+
QT_DEPS="
- >=dev-qt/qtcore-5.6.0:5
- >=dev-qt/qttest-5.6.0:5
- >=dev-qt/qtconcurrent-5.6.0:5
- >=dev-qt/qtgui-5.6.0:5
- >=dev-qt/qtnetwork-5.6.0:5
- >=dev-qt/qtwidgets-5.6.0:5
- >=dev-qt/qtxml-5.6.0:5
+ >=dev-qt/qtcore-${MIN_QT}:5
+ >=dev-qt/qttest-${MIN_QT}:5
+ >=dev-qt/qtconcurrent-${MIN_QT}:5
+ >=dev-qt/qtgui-${MIN_QT}:5
+ >=dev-qt/qtnetwork-${MIN_QT}:5
+ >=dev-qt/qtwidgets-${MIN_QT}:5
+ >=dev-qt/qtxml-${MIN_QT}:5
"
-BDEPEND="
+DEPEND="
${QT_DEPS}
- sys-libs/zlib
>=virtual/jdk-1.8.0:*
media-libs/libglvnd
+ sys-libs/zlib
"
-DEPEND="
+# At run-time we don't depend on JDK, only JRE
+# And we need more than just the GL headers
+RDEPEND="
${QT_DEPS}
>=virtual/jre-1.8.0:*
virtual/opengl
+ sys-libs/zlib
"
-RDEPEND="${DEPEND}"
-
-# We'll fetch the files from the GitHub archive directly, at least for now...
-RESTRICT="mirror"
-
-# The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare(){
- default
+src_prepare() {
cmake_src_prepare
}
@@ -72,7 +87,7 @@ src_configure(){
local mycmakeargs=(
# Do a system install
- -DLauncher_PORTABLE=false
+ -DLauncher_PORTABLE=0
-DCMAKE_INSTALL_PREFIX="/usr"
# Resulting binary is named polymc
-DLauncher_APP_BINARY_NAME="${PN}"
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index ae09f674b..bc6b3a098 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -3,62 +3,76 @@
EAPI=8
-inherit cmake git-r3 java-pkg-2 optfeature xdg
+inherit cmake java-pkg-2 optfeature xdg
HOMEPAGE="https://polymc.org/"
DESCRIPTION="A custom, open source Minecraft launcher"
-EGIT_REPO_URI="
- https://github.com/PolyMC/PolyMC
- https://github.com/MultiMC/libnbtplusplus
- https://github.com/stachenov/quazip
-"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="
+ https://github.com/PolyMC/PolyMC
+ https://github.com/MultiMC/libnbtplusplus
+ https://github.com/stachenov/quazip
+ "
+
+ # Include all submodules
+ EGIT_SUBMODULES=( '*' )
+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
# LGPL-2.1 with linking exception for Quazip
-LICENSE="GPL-3 LGPL-3 LGPL-2.1-with-linking-exception"
+# 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"
SLOT="0"
IUSE="debug"
+MIN_QT="5.6.0"
+
QT_DEPS="
- >=dev-qt/qtcore-5.6.0:5
- >=dev-qt/qttest-5.6.0:5
- >=dev-qt/qtconcurrent-5.6.0:5
- >=dev-qt/qtgui-5.6.0:5
- >=dev-qt/qtnetwork-5.6.0:5
- >=dev-qt/qtwidgets-5.6.0:5
- >=dev-qt/qtxml-5.6.0:5
+ >=dev-qt/qtcore-${MIN_QT}:5
+ >=dev-qt/qttest-${MIN_QT}:5
+ >=dev-qt/qtconcurrent-${MIN_QT}:5
+ >=dev-qt/qtgui-${MIN_QT}:5
+ >=dev-qt/qtnetwork-${MIN_QT}:5
+ >=dev-qt/qtwidgets-${MIN_QT}:5
+ >=dev-qt/qtxml-${MIN_QT}:5
"
-BDEPEND="
+DEPEND="
${QT_DEPS}
- sys-libs/zlib
>=virtual/jdk-1.8.0:*
media-libs/libglvnd
+ sys-libs/zlib
"
-DEPEND="
+# At run-time we don't depend on JDK, only JRE
+# And we need more than just the GL headers
+RDEPEND="
${QT_DEPS}
>=virtual/jre-1.8.0:*
virtual/opengl
+ sys-libs/zlib
"
-RDEPEND="${DEPEND}"
-
src_prepare() {
- if ${PV} != 9999; then
- EGIT_COMMIT="${PV}"
- fi
-
- git submodule init
- git config submodule.libnbtplusplus.url "${WORKDIR}/libnbtplusplus"
- git config submodule.quazip.url "${WORKDIR}/quazip"
- git submodule update
-
- default
cmake_src_prepare
}
@@ -66,14 +80,19 @@ 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}"
)
+
cmake_src_configure
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: games-action/polymc/
2022-04-15 18:42 Andrew Ammerlaan
@ 2022-04-15 18:31 ` Andrew Ammerlaan
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Ammerlaan @ 2022-04-15 18:31 UTC (permalink / raw
To: gentoo-commits
commit: 316d90e0320632adf3ec1b62172cc9fb13e9b4bc
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 18:30:46 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 18:31:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=316d90e0
games-action/polymc: treeclean, moved to ::gentoo
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-action/polymc/Manifest | 1 -
games-action/polymc/metadata.xml | 17 -----
games-action/polymc/polymc-1.1.1.ebuild | 108 --------------------------------
games-action/polymc/polymc-9999.ebuild | 108 --------------------------------
4 files changed, 234 deletions(-)
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
deleted file mode 100644
index b44203e70..000000000
--- a/games-action/polymc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST polymc-1.1.1.tar.gz 5116164 BLAKE2B ca251cac3c8ea21de8a59297a0e637dac078d751476fec5fe86696df270c63ff079779056f016fa656506ea205bb7ace50ab6e0df190ffca14e43297b92292af SHA512 db32479e9e8a92ec61292c97281673b3084e1085d29b764214834de872d9eddf2ed1d2e383bcd79197e0c9321eec025af652b12c863596ff6abb0f5fba9a7af5
diff --git a/games-action/polymc/metadata.xml b/games-action/polymc/metadata.xml
deleted file mode 100644
index a3aeebb29..000000000
--- a/games-action/polymc/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
- <email>flowlnlnln@gmail.com</email>
- <name>Thiago Donato Ferreira</name>
- </maintainer>
- <maintainer type="person">
- <email>swurl@swurl.xyz</email>
- <name>Carson Rueter</name>
- </maintainer>
- <upstream>
- <bugs-to>https://github.com/PolyMC/PolyMC/issues</bugs-to>
- <doc>https://polymc.org/wiki/</doc>
- </upstream>
- <longdescription lang="en">PolyMC is a multi-instance Minecraft launcher focused on user freedom, redistributability, and simplicity.</longdescription>
-</pkgmetadata>
diff --git a/games-action/polymc/polymc-1.1.1.ebuild b/games-action/polymc/polymc-1.1.1.ebuild
deleted file mode 100644
index bc6b3a098..000000000
--- a/games-action/polymc/polymc-1.1.1.ebuild
+++ /dev/null
@@ -1,108 +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/"
-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/MultiMC/libnbtplusplus
- https://github.com/stachenov/quazip
- "
-
- # Include all submodules
- EGIT_SUBMODULES=( '*' )
-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
-# 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"
-
-SLOT="0"
-
-IUSE="debug"
-
-MIN_QT="5.6.0"
-
-QT_DEPS="
- >=dev-qt/qtcore-${MIN_QT}:5
- >=dev-qt/qttest-${MIN_QT}:5
- >=dev-qt/qtconcurrent-${MIN_QT}:5
- >=dev-qt/qtgui-${MIN_QT}:5
- >=dev-qt/qtnetwork-${MIN_QT}:5
- >=dev-qt/qtwidgets-${MIN_QT}:5
- >=dev-qt/qtxml-${MIN_QT}:5
-"
-
-DEPEND="
- ${QT_DEPS}
- >=virtual/jdk-1.8.0:*
- media-libs/libglvnd
- sys-libs/zlib
-"
-
-# At run-time we don't depend on JDK, only JRE
-# And we need more than just the GL headers
-RDEPEND="
- ${QT_DEPS}
- >=virtual/jre-1.8.0:*
- virtual/opengl
- sys-libs/zlib
-"
-
-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}"
- )
-
- 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
deleted file mode 100644
index bc6b3a098..000000000
--- a/games-action/polymc/polymc-9999.ebuild
+++ /dev/null
@@ -1,108 +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/"
-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/MultiMC/libnbtplusplus
- https://github.com/stachenov/quazip
- "
-
- # Include all submodules
- EGIT_SUBMODULES=( '*' )
-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
-# 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"
-
-SLOT="0"
-
-IUSE="debug"
-
-MIN_QT="5.6.0"
-
-QT_DEPS="
- >=dev-qt/qtcore-${MIN_QT}:5
- >=dev-qt/qttest-${MIN_QT}:5
- >=dev-qt/qtconcurrent-${MIN_QT}:5
- >=dev-qt/qtgui-${MIN_QT}:5
- >=dev-qt/qtnetwork-${MIN_QT}:5
- >=dev-qt/qtwidgets-${MIN_QT}:5
- >=dev-qt/qtxml-${MIN_QT}:5
-"
-
-DEPEND="
- ${QT_DEPS}
- >=virtual/jdk-1.8.0:*
- media-libs/libglvnd
- sys-libs/zlib
-"
-
-# At run-time we don't depend on JDK, only JRE
-# And we need more than just the GL headers
-RDEPEND="
- ${QT_DEPS}
- >=virtual/jre-1.8.0:*
- virtual/opengl
- sys-libs/zlib
-"
-
-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}"
- )
-
- 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-04-15 18:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-04-10 12:33 [gentoo-commits] repo/proj/guru:dev commit in: games-action/polymc/ Andrew Ammerlaan
2022-04-10 12:35 ` [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2022-04-15 18:42 Andrew Ammerlaan
2022-04-15 18:31 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2022-04-09 10:59 Thiago Donato Ferreira
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox