summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolić <jsmolic@gentoo.org>2022-03-22 22:20:05 +0100
committerJakov Smolić <jsmolic@gentoo.org>2022-03-22 22:27:34 +0100
commit0625503ae2e9f411450d816cfb9a823f8aeb751d (patch)
tree9ad4657529d5ef654c8fc662daa94e51984b51ff
parentsci-mathematics/coq: bump to 8.15.1 (diff)
downloadgentoo-0625503ae2e9f411450d816cfb9a823f8aeb751d.tar.gz
gentoo-0625503ae2e9f411450d816cfb9a823f8aeb751d.tar.bz2
gentoo-0625503ae2e9f411450d816cfb9a823f8aeb751d.zip
games-strategy/triplea: treeclean
Closes: https://bugs.gentoo.org/784107 Closes: https://bugs.gentoo.org/831106 Closes: https://bugs.gentoo.org/690284 Closes: https://bugs.gentoo.org/677106 Closes: https://bugs.gentoo.org/596468 Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
-rw-r--r--games-strategy/triplea/Manifest1
-rw-r--r--games-strategy/triplea/files/mkdir.sh1
-rw-r--r--games-strategy/triplea/files/paths.patch63
-rw-r--r--games-strategy/triplea/files/triplea-1.8.0.9-drop-ant-check.patch29
-rw-r--r--games-strategy/triplea/files/upnplib.patch14
-rw-r--r--games-strategy/triplea/metadata.xml11
-rw-r--r--games-strategy/triplea/triplea-1.8.0.9-r2.ebuild92
-rw-r--r--profiles/package.mask6
8 files changed, 0 insertions, 217 deletions
diff --git a/games-strategy/triplea/Manifest b/games-strategy/triplea/Manifest
deleted file mode 100644
index 555c3e8aab12..000000000000
--- a/games-strategy/triplea/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST triplea_1_8_0_9_source_code_only.zip 378475905 BLAKE2B b9266467d7a919cc4d6e25d30604a21c738761f4b2a31076fd7e2c98c004c5d7b80c98231d388adae619ce29281eec4a9590c6be31fecdbf547d240f81c8951c SHA512 d117bb85d0136d85c76f091cf3b2a398ad1f8755df2cea02867be36d91c6cc98e0fc713a72a93dc74ec91c7b44959afdad5b136591a25a0080f4eabf3c8bff0d
diff --git a/games-strategy/triplea/files/mkdir.sh b/games-strategy/triplea/files/mkdir.sh
deleted file mode 100644
index f1bd04d125c1..000000000000
--- a/games-strategy/triplea/files/mkdir.sh
+++ /dev/null
@@ -1 +0,0 @@
-mkdir -v "${HOME}/.triplea"
diff --git a/games-strategy/triplea/files/paths.patch b/games-strategy/triplea/files/paths.patch
deleted file mode 100644
index f0cd91e3abe6..000000000000
--- a/games-strategy/triplea/files/paths.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Naur a/src/games/strategy/engine/framework/GameRunner2.java b/src/games/strategy/engine/framework/GameRunner2.java
---- a/src/games/strategy/engine/framework/GameRunner2.java 2015-09-02 20:30:04.000000000 +0100
-+++ b/src/games/strategy/engine/framework/GameRunner2.java 2016-10-11 23:08:50.296813567 +0100
-@@ -952,9 +952,9 @@
- // the default
- File rootDir;
- if (GameRunner.isMac()) {
-- rootDir = new File(new File(userHome, "Documents"), "triplea");
-+ rootDir = new File(new File(userHome, "Documents"), ".triplea");
- } else {
-- rootDir = new File(userHome, "triplea");
-+ rootDir = new File(userHome, ".triplea");
- }
- return rootDir;
- }
-diff -Naur a/src/games/strategy/engine/lobby/server/userDB/Database.java b/src/games/strategy/engine/lobby/server/userDB/Database.java
---- a/src/games/strategy/engine/lobby/server/userDB/Database.java 2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/engine/lobby/server/userDB/Database.java 2016-10-11 23:08:50.296813567 +0100
-@@ -54,7 +54,7 @@
- if (System.getProperties().containsKey(ServerLauncher.SERVER_ROOT_DIR_PROPERTY)) {
- root = new File(System.getProperties().getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY));
- } else {
-- root = GameRunner2.getRootFolder();
-+ root = GameRunner2.getUserRootFolder();
- }
- if (!root.exists()) {
- throw new IllegalStateException("Root dir does not exist");
-diff -Naur a/src/games/strategy/util/AccessLogFileHandler.java b/src/games/strategy/util/AccessLogFileHandler.java
---- a/src/games/strategy/util/AccessLogFileHandler.java 2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/util/AccessLogFileHandler.java 2016-10-11 23:10:31.219309604 +0100
-@@ -12,7 +12,7 @@
- private static final String logFile;
-
- static {
-- final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, "."));
-+ final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, games.strategy.engine.framework.GameRunner2.getUserRootFolder().getAbsolutePath()));
- if (!rootDir.exists()) {
- throw new IllegalStateException("no dir called:" + rootDir.getAbsolutePath());
- }
-diff -Naur a/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java b/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java
---- a/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java 2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/util/RotatingLogFileHandlerForHeadlessGameServer.java 2016-10-11 23:10:40.227175356 +0100
-@@ -13,7 +13,7 @@
- private static final String logFile;
-
- static {
-- final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, "."));
-+ final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, games.strategy.engine.framework.GameRunner2.getUserRootFolder().getAbsolutePath()));
- if (!rootDir.exists()) {
- throw new IllegalStateException("no dir called:" + rootDir.getAbsolutePath());
- }
-diff -Naur a/src/games/strategy/util/RotatingLogFileHandler.java b/src/games/strategy/util/RotatingLogFileHandler.java
---- a/src/games/strategy/util/RotatingLogFileHandler.java 2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/util/RotatingLogFileHandler.java 2016-10-11 23:10:46.851076636 +0100
-@@ -12,7 +12,7 @@
- private static final String logFile;
-
- static {
-- final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, "."));
-+ final File rootDir = new File(System.getProperty(ServerLauncher.SERVER_ROOT_DIR_PROPERTY, games.strategy.engine.framework.GameRunner2.getUserRootFolder().getAbsolutePath()));
- if (!rootDir.exists()) {
- throw new IllegalStateException("no dir called:" + rootDir.getAbsolutePath());
- }
diff --git a/games-strategy/triplea/files/triplea-1.8.0.9-drop-ant-check.patch b/games-strategy/triplea/files/triplea-1.8.0.9-drop-ant-check.patch
deleted file mode 100644
index 2a41521c4aed..000000000000
--- a/games-strategy/triplea/files/triplea-1.8.0.9-drop-ant-check.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Fix version check failure with 1.10.9
---- a/build.xml
-+++ b/build.xml
-@@ -110,25 +110,6 @@
-
- <!--checkBuildEnv -->
- <target name="checkBuildEnv">
-- <!-- Check ant version first (pre-1.6.5 reports java version it was built
-- with, not what it's running under, so an ant built with 1.5 would report
-- that even if it's currently running under < 1.5). 1.6.5 was released in June
-- 2005, so it's fairly unlikely that anyone would be using an older version,
-- but checking it is still a good idea, and it only takes a tiny fraction of
-- a second. -->
-- <fail message="Ant version 1.6.5 or greater is required">
-- <condition>
-- <not>
-- <or>
-- <contains string="${ant.version}" substring="1.6.5" />
-- <contains string="${ant.version}" substring="1.7" />
-- <contains string="${ant.version}" substring="1.8" />
-- <contains string="${ant.version}" substring="1.9" />
-- </or>
-- </not>
-- </condition>
-- </fail>
-- <echo message="${ant.version}" />
- <!-- we require jdk 1.6 or greater -->
- <fail
- message="jdk 1.6 or greater required, you are currently using: ${ant.java.version}">
diff --git a/games-strategy/triplea/files/upnplib.patch b/games-strategy/triplea/files/upnplib.patch
deleted file mode 100644
index f17b7891302a..000000000000
--- a/games-strategy/triplea/files/upnplib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur a/src/games/strategy/net/UniversalPlugAndPlayHelper.java b/src/games/strategy/net/UniversalPlugAndPlayHelper.java
---- a/src/games/strategy/net/UniversalPlugAndPlayHelper.java 2015-08-19 16:35:06.000000000 +0100
-+++ b/src/games/strategy/net/UniversalPlugAndPlayHelper.java 2016-10-11 22:10:37.287834187 +0100
-@@ -166,8 +166,8 @@
- System.out.println("To " + m_local.getHostAddress() + ":" + internalPort);
- boolean mapped = false;
- try {
-- mapped = m_device.addPortMapping("TripleA Game Hosting", "TCP", null, externalPort, m_local.getHostAddress(),
-- internalPort, 0);
-+ mapped = m_device.addPortMapping("TripleA Game Hosting", null, internalPort, externalPort,
-+ m_local.getHostAddress(), 0, "TCP");
- } catch (final IOException e) {
- System.out.println("Port Mapping Failed! Please try to Forward Ports manually! \r\n " + e.getMessage());
- return "Port Mapping Failed! Please try to Forward Ports manually! \r\n " + e.getMessage();
diff --git a/games-strategy/triplea/metadata.xml b/games-strategy/triplea/metadata.xml
deleted file mode 100644
index 65f298ee5bb5..000000000000
--- a/games-strategy/triplea/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>games@gentoo.org</email>
- <name>Gentoo Games Project</name>
- </maintainer>
- <upstream>
- <remote-id type="sourceforge">triplea</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/games-strategy/triplea/triplea-1.8.0.9-r2.ebuild b/games-strategy/triplea/triplea-1.8.0.9-r2.ebuild
deleted file mode 100644
index 32eb7c5cbf3c..000000000000
--- a/games-strategy/triplea/triplea-1.8.0.9-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="apple-java-extensions-bin,commons-httpclient-3,oracle-javamail,osgi-core-api,upnplib"
-inherit desktop java-pkg-2 java-ant-2
-
-MY_PV=$(ver_rs 1- _)
-DESCRIPTION="An open source clone of the popular Axis and Allies boardgame"
-HOMEPAGE="http://triplea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/triplea/${PN}_${MY_PV}_source_code_only.zip"
-S="${WORKDIR}"/${PN}_${MY_PV}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="test" # Needs X11 maybe use virtualx.eclass
-
-DEPEND="
- dev-java/apple-java-extensions-bin:0
- dev-java/commons-httpclient:3
- dev-java/oracle-javamail:0
- dev-java/osgi-core-api:0
- dev-java/upnplib:0
-"
-RDEPEND="
- ${DEPEND}
- >=virtual/jre-1.8:*
-"
-DEPEND+=" >=virtual/jdk-1.8:*"
-BDEPEND="
- app-arch/unzip
- test? ( dev-java/ant-junit:0 )
-"
-
-PATCHES=(
- # Use ~/.triplea, not ~/triplea.
- # Don't write server files under /usr/share or ${PWD}.
- # Fix to build against our packaged upnplib.
- "${FILESDIR}"/{paths,upnplib}.patch
- # Fix build with newer Ant
- "${FILESDIR}"/${PN}-1.8.0.9-drop-ant-check.patch
-)
-
-src_prepare() {
- default
-
- java-pkg-2_src_prepare
-
- # Remove packaged or unneeded libs. Unfortunately Apache Derby was
- # last-rited due to packaging issues. See bug #561410.
- find lib/* ! -name "derby-*.jar" -delete || die
- rm -r old/ || die
-}
-
-src_compile() {
- eant
- echo "triplea.saveGamesInHomeDir=true" > data/triplea.properties || die
- # The only target creating this is zip which does unjar etc
- jar cf ${PN}.jar -C classes . || die
-}
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- insinto /usr/share/${PN}
- doins -r assets data dice_servers maps
-
- java-pkg_dojar ${PN}.jar
- java-pkg_newjar lib/derby-*.jar derby.jar
-
- java-pkg_dolauncher ${PN} \
- --main games.strategy.engine.framework.GameRunner \
- --java_args "-Xmx256m"
- java-pkg_dolauncher ${PN}-server -pre "${FILESDIR}"/mkdir.sh \
- --main games.strategy.engine.lobby.server.LobbyServer \
- --java_args "-server -Xmx64m -Dtriplea.lobby.port=3303 -Dtriplea.lobby.console=true"
-
- newicon icons/triplea_icon.png ${PN}.png
- newicon icons/triplea_icon.png ${PN}-server.png
- make_desktop_entry ${PN} TripleA
- make_desktop_entry ${PN}-server TripleA-server
-
- dodoc changelog.txt TripleA_RuleBook.pdf
- docinto html
- dodoc -r doc/* readme.html
-}
diff --git a/profiles/package.mask b/profiles/package.mask
index f9e772737f50..0d0ae6eb8aff 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -380,12 +380,6 @@ dev-python/socketpool
dev-java/upnplib
dev-java/apple-java-extensions-bin
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2022-02-13)
-# This package is completely broken and some libraries existing only for
-# it cause unneeded workload for Java team. Removal in 30 days.
-# Bug #831106, bug #784107.
-games-strategy/triplea
-
# Jonas Stein <jstein@gentoo.org> (2022-02-11)
# Blocks gtk2 removal, which is EOL
# Removal after 2022-04-01. Bug #833145.