From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- games-strategy/triplea/Manifest | 6 ++ games-strategy/triplea/files/mkdir.sh | 1 + games-strategy/triplea/files/paths.patch | 63 +++++++++++++++++++ games-strategy/triplea/files/upnplib.patch | 14 +++++ games-strategy/triplea/metadata.xml | 11 ++++ games-strategy/triplea/triplea-1.8.0.9-r1.ebuild | 80 ++++++++++++++++++++++++ 6 files changed, 175 insertions(+) create mode 100644 games-strategy/triplea/Manifest create mode 100644 games-strategy/triplea/files/mkdir.sh create mode 100644 games-strategy/triplea/files/paths.patch create mode 100644 games-strategy/triplea/files/upnplib.patch create mode 100644 games-strategy/triplea/metadata.xml create mode 100644 games-strategy/triplea/triplea-1.8.0.9-r1.ebuild (limited to 'games-strategy/triplea') diff --git a/games-strategy/triplea/Manifest b/games-strategy/triplea/Manifest new file mode 100644 index 000000000000..f8a208399d29 --- /dev/null +++ b/games-strategy/triplea/Manifest @@ -0,0 +1,6 @@ +AUX mkdir.sh 28 BLAKE2B e23eb97930e3fd2f5860a0acd5c5a79fd43ebb6577bb79c03b369b74172ec7110b39b5324580e2392c95e5235c86a8b786c67d97adfdd6ae804e4fcc36409973 SHA512 f49b4476521ad392ab91550ce1ef150b4fe4243020f7a173a3fe0d11e31476c22c11773058d4da1a013b63cb3b7017ac8ed38d4793d921a691546481c280ad37 +AUX paths.patch 3867 BLAKE2B 18c958a16855b39e8e800c62976aba0cebb42914a8b67cf3ff09e65dc4a3f505a2a0aa6f5d97a63281300788c2e425248c4319bcc69d3daa691a96a1b0786555 SHA512 bc411daa31e6d7a56a1c762eb785547d0be2f9dfc33dc1311f43e78c9d6337c0786860b52f63c817e61bf137fc71099a4019e6441fca1b469bc4f96a79b0300a +AUX upnplib.patch 999 BLAKE2B 4fd4113eee4b1e695b4bfcada24b57dcf1aa49b346b896926b8ef18d6dc2db8da0720d3c572cb99c6d047cfc0a9256e08ba280096fdb1780fe16492bcbfaf2c9 SHA512 2195e3aec282935bce60017e99e8211bd153165b3359636517fbe518a4630f1e4464beef57015d92e522a399eb9ea79ad75ced36c4b87388905b16705e341283 +DIST triplea_1_8_0_9_source_code_only.zip 378475905 BLAKE2B b9266467d7a919cc4d6e25d30604a21c738761f4b2a31076fd7e2c98c004c5d7b80c98231d388adae619ce29281eec4a9590c6be31fecdbf547d240f81c8951c SHA512 d117bb85d0136d85c76f091cf3b2a398ad1f8755df2cea02867be36d91c6cc98e0fc713a72a93dc74ec91c7b44959afdad5b136591a25a0080f4eabf3c8bff0d +EBUILD triplea-1.8.0.9-r1.ebuild 2328 BLAKE2B 550c6033bf98560da85a62dfc114b0c5cb4e2a826e01422931c9ced89cd6ff50e7e177f1875a4b19a7341e28b8fbac8293ed256ac25e9a14a6e52c7a6146574d SHA512 c5d9b751355b475429e1b96bd1dc1e45c1b60db0733c706dbf9a571fee566a3e90f1b78997672873779bb452866b70e8ea1eb67d2aa30f49aa302357c3edb2ef +MISC metadata.xml 330 BLAKE2B e5affd70d163a58ffd63374d6a23a291f38eb5e27aa45d0d4f16857d3483b0a1cc64944ef5fe1284b5742ad5ee72ccb2d4ae0cb9a0c4a8470c8bb1e450dc0ff9 SHA512 25e53b4fda63cde7b2211a94b42804a0eb166fe5159eadcbaf5609645526064790a4b01483fe1e15b5b84fb90c73c55b66afe1c1039bb2dc8354e4c603588ea6 diff --git a/games-strategy/triplea/files/mkdir.sh b/games-strategy/triplea/files/mkdir.sh new file mode 100644 index 000000000000..f1bd04d125c1 --- /dev/null +++ b/games-strategy/triplea/files/mkdir.sh @@ -0,0 +1 @@ +mkdir -v "${HOME}/.triplea" diff --git a/games-strategy/triplea/files/paths.patch b/games-strategy/triplea/files/paths.patch new file mode 100644 index 000000000000..f0cd91e3abe6 --- /dev/null +++ b/games-strategy/triplea/files/paths.patch @@ -0,0 +1,63 @@ +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/upnplib.patch b/games-strategy/triplea/files/upnplib.patch new file mode 100644 index 000000000000..f17b7891302a --- /dev/null +++ b/games-strategy/triplea/files/upnplib.patch @@ -0,0 +1,14 @@ +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 new file mode 100644 index 000000000000..6c83e2c3e451 --- /dev/null +++ b/games-strategy/triplea/metadata.xml @@ -0,0 +1,11 @@ + + + + + games@gentoo.org + Gentoo Games Project + + + triplea + + diff --git a/games-strategy/triplea/triplea-1.8.0.9-r1.ebuild b/games-strategy/triplea/triplea-1.8.0.9-r1.ebuild new file mode 100644 index 000000000000..ad0f13584c8a --- /dev/null +++ b/games-strategy/triplea/triplea-1.8.0.9-r1.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils java-pkg-2 java-ant-2 versionator + +MY_PV=$(replace_all_version_separators _) +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" +RESTRICT="test" # Needs X11 maybe use virtualx.eclass + +RDEPEND="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" +DEPEND="${RDEPEND} + >=virtual/jdk-1.7 + app-arch/unzip + test? ( dev-java/ant-junit:0 )" +RDEPEND="${RDEPEND} + >=virtual/jre-1.7" + +S=${WORKDIR}/${PN}_${MY_PV} + +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH="apple-java-extensions-bin,commons-httpclient-3,oracle-javamail,osgi-core-api,upnplib" + +java_prepare() { + # Use ~/.triplea, not ~/triplea. + # Don't write server files under /usr/share or ${PWD}. + # Fix to build against our packaged upnplib. + epatch "${FILESDIR}"/{paths,upnplib}.patch + + # 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 +} -- cgit v1.2.3