gentoo resync : 17.06.2021

4 files changed, 50 insertions, 52 deletions

diff --git a/games-board/megamek/Manifest b/games-board/megamek/Manifest
index 5a1d2508bf3c..6b3b85b62bdf 100644
--- a/games-board/megamek/Manifest
+++ b/games-board/megamek/Manifest
@@ -1,3 +1,3 @@
 DIST MegaMek-v0.34.10.zip 16677286 BLAKE2B 73c4ee9e38b4c50221c40c5d0cba1c13de00e586bf2cb9432c356f5c21045c26cfa64705b303c7213f29deda369a97ea5fba397c995c138731a66152c062c5b5 SHA512 943f6ed4f4d57197092a7aa09637f60827f23181a7b8b0991907fcc62109b471ea2ce53816a79dfcad9d8da65c9514be3190e924d9bf2b17aacf84fc1fa6e037
-EBUILD megamek-0.34.10-r1.ebuild 1053 BLAKE2B e9dae9a8ff3f3ee050166d1db15dfb752254ab2c19e4f96fe949c66430de78188b3b8bc442c9c7b1ae8d3c23719707a13a9c534a2750a35438d7221ec82de1d6 SHA512 126ee03e5a9dd995101da2e6c1d63de25d238a6838e595638aac3793ce76270016d1e94bb7a7a417cb7535cbf0e59acd7c03276ad2b973f35703f032486c19ed
-MISC metadata.xml 330 BLAKE2B 08bb146ebca0d9f6e0006d1d6d615a93434dc4a98f363da9da16eba5649678fc36325cdd84253a9f8d3ad72cc165d783228db019026380e447a5242365b29e06 SHA512 e2b391074805c40a32f3a2d74db870e75c5a9cb0413b15b41b43cf7bf16a6bf90363c3d1eb1b6c1fccbc4f44defcadbf44bea218b1a5f3d4fb66a4428e5b5cde
+EBUILD megamek-0.34.10-r2.ebuild 1086 BLAKE2B 7b11b5e08496c09ecc28174aac1cebf86b787d32627fdc0bc3837aaad2fe7ac27aaec3b5ca813a7c30000652e9e3e93f8a10843b15fd3e41c098590cf5d85054 SHA512 2c84b18b4d58cdd39bf9bfff67156f7eb1678bff93c9216fb97293bf3c334faf1cca0d84487217c0866d85c3165f7999e026c3acc7021c052c3f6bf70c89b740
+MISC metadata.xml 385 BLAKE2B 97f3040dbc9c0db34e70a0da22608bfdbeb3a4ea160e642524a08332f799a5f190a3a9f3b661066ef70fae07bbe9c9755d16631a87dcdc79493d186d4e55d243 SHA512 4aa15a91f2d1c31724a23204a09f91f3fd4bde2fa69fc890f002d894830fd5837c617517fad8abc84ed9a45be85a841582395df530a121216e5d7b95664bccca
diff --git a/games-board/megamek/megamek-0.34.10-r1.ebuild b/games-board/megamek/megamek-0.34.10-r1.ebuild
deleted file mode 100644
index 6b3fe5a0bb91..000000000000
--- a/games-board/megamek/megamek-0.34.10-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="an unofficial, online version of the Classic BattleTech board game"
-HOMEPAGE="http://megamek.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/MegaMek-v${PV}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.5
-	app-arch/unzip"
-RDEPEND=">=virtual/jre-1.5"
-
-S=${WORKDIR}
-
-pkg_setup() {
-	java-pkg-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	rm -v *.jar || die
-	edos2unix startup.sh
-	sed -i \
-		-e "s:XmX:Xmx:" \
-		-e "s:/usr/share/java:/usr/share/${PN}:" \
-		-e "s:/usr/share/MegaMek:/usr/share/${PN}:" \
-		startup.sh || die "sed failed"
-	java-pkg-2_src_prepare
-}
-
-src_compile() {
-	eant
-}
-
-src_install() {
-	newbin startup.sh ${PN}
-	insinto /usr/share/${PN}
-	doins -r data docs l10n lib mmconf *.jar readme*
-	dodoc HACKING readme.txt
-	make_desktop_entry ${PN} MegaMek /usr/share/pixmaps/${PN}.gif
-	newicon data/images/misc/megamek-icon.gif ${PN}.gif
-}
diff --git a/games-board/megamek/megamek-0.34.10-r2.ebuild b/games-board/megamek/megamek-0.34.10-r2.ebuild
new file mode 100644
index 000000000000..a1e76585011b
--- /dev/null
+++ b/games-board/megamek/megamek-0.34.10-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop edos2unix java-pkg-2 java-ant-2
+
+DESCRIPTION="Unofficial online version of the Classic BattleTech board game"
+HOMEPAGE="https://megamek.org/"
+SRC_URI="mirror://sourceforge/${PN}/MegaMek-v${PV}.zip"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+
+	rm MegaMek.jar || die
+
+	sed -e "s|XmX|Xmx|" \
+		-e "s|/usr/share/java|${EPREFIX}/usr/share/${PN}|" \
+		-e "s|/usr/share/MegaMek|${EPREFIX}/usr/share/${PN}|" \
+		startup.sh > ${PN} || die
+	edos2unix ${PN}
+
+	# workaround encoding issues posing problems with >=jdk-1.8
+	find . -name '*.java' -exec sed -i 's/\xf6/\xc3\xb6/' {} + || die
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r MegaMek.jar data docs l10n lib mmconf readme* # readme used at runtime
+
+	dodoc HACKING readme.txt
+
+	make_desktop_entry ${PN} MegaMek applications-games
+}
diff --git a/games-board/megamek/metadata.xml b/games-board/megamek/metadata.xml
index 1c5cb53716e8..290f45425af2 100644
--- a/games-board/megamek/metadata.xml
+++ b/games-board/megamek/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">MegaMek/megamek</remote-id>
 		<remote-id type="sourceforge">megamek</remote-id>
 	</upstream>
 </pkgmetadata>