gentoo resync : 28.04.2021

3 files changed, 61 insertions, 19 deletions

diff --git a/games-strategy/triplea/Manifest b/games-strategy/triplea/Manifest
index f8a208399d29..12ddec945552 100644
--- a/games-strategy/triplea/Manifest
+++ b/games-strategy/triplea/Manifest
@@ -1,6 +1,7 @@
 AUX mkdir.sh 28 BLAKE2B e23eb97930e3fd2f5860a0acd5c5a79fd43ebb6577bb79c03b369b74172ec7110b39b5324580e2392c95e5235c86a8b786c67d97adfdd6ae804e4fcc36409973 SHA512 f49b4476521ad392ab91550ce1ef150b4fe4243020f7a173a3fe0d11e31476c22c11773058d4da1a013b63cb3b7017ac8ed38d4793d921a691546481c280ad37
 AUX paths.patch 3867 BLAKE2B 18c958a16855b39e8e800c62976aba0cebb42914a8b67cf3ff09e65dc4a3f505a2a0aa6f5d97a63281300788c2e425248c4319bcc69d3daa691a96a1b0786555 SHA512 bc411daa31e6d7a56a1c762eb785547d0be2f9dfc33dc1311f43e78c9d6337c0786860b52f63c817e61bf137fc71099a4019e6441fca1b469bc4f96a79b0300a
+AUX triplea-1.8.0.9-drop-ant-check.patch 1135 BLAKE2B 664a0e9f8fcf6451af198b2f788c95ffffa3fa82b988ab271c2105172f26077a0c2d99497634dc871e35bd1b5cbcd3d4cbbd606be718f138e7ca298a121b2277 SHA512 98e41c7475792b3069a36c51646f421b62b3e9288cd934586a30d3d9f9e34011c52300b71b2e340fc334d12ce93319aa98a4bda80a67e37ab7be0ec9b213f0eb
 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
+EBUILD triplea-1.8.0.9-r2.ebuild 2421 BLAKE2B 326f39becbc7c074bff3314f5ecbc264b863cd536b88725e3c41372ecea738937cc7cd159ab66020a03f9186c6348c1f605a43b7ad58e5096dda95d6cdc0a937 SHA512 cd968dd9b72e922ac01167580c06a5a190ab423eabdffd59e4108722c45336e1e073688915ed9fb0b4aa9ed2f359e450f0b23b2d8582a86652d423a1142c3b64
 MISC metadata.xml 330 BLAKE2B e5affd70d163a58ffd63374d6a23a291f38eb5e27aa45d0d4f16857d3483b0a1cc64944ef5fe1284b5742ad5ee72ccb2d4ae0cb9a0c4a8470c8bb1e450dc0ff9 SHA512 25e53b4fda63cde7b2211a94b42804a0eb166fe5159eadcbaf5609645526064790a4b01483fe1e15b5b84fb90c73c55b66afe1c1039bb2dc8354e4c603588ea6
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
new file mode 100644
index 000000000000..2a41521c4aed
--- /dev/null
+++ b/games-strategy/triplea/files/triplea-1.8.0.9-drop-ant-check.patch
@@ -0,0 +1,29 @@
+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/triplea-1.8.0.9-r1.ebuild b/games-strategy/triplea/triplea-1.8.0.9-r2.ebuild
index ad0f13584c8a..32eb7c5cbf3c 100644
--- a/games-strategy/triplea/triplea-1.8.0.9-r1.ebuild
+++ b/games-strategy/triplea/triplea-1.8.0.9-r2.ebuild
@@ -1,13 +1,17 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils java-pkg-2 java-ant-2 versionator
+EAPI=7
 
-MY_PV=$(replace_all_version_separators _)
+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"
@@ -15,28 +19,36 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="test" # Needs X11 maybe use virtualx.eclass
 
-RDEPEND="dev-java/apple-java-extensions-bin:0
+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"
-DEPEND="${RDEPEND}
-	>=virtual/jdk-1.7
+	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 )"
-RDEPEND="${RDEPEND}
-	>=virtual/jre-1.7"
+	test? ( dev-java/ant-junit:0 )
+"
 
-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() {
+PATCHES=(
 	# 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
+	"${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.