4 files changed, 53 insertions, 51 deletions
diff --git a/games-board/megamek/Manifest b/games-board/megamek/Manifest
index 0cc315d57689..742957a1fd2e 100644
--- a/games-board/megamek/Manifest
+++ b/games-board/megamek/Manifest
@@ -1 +1,2 @@
 DIST MegaMek-v0.34.10.zip 16677286 BLAKE2B 73c4ee9e38b4c50221c40c5d0cba1c13de00e586bf2cb9432c356f5c21045c26cfa64705b303c7213f29deda369a97ea5fba397c995c138731a66152c062c5b5 SHA512 943f6ed4f4d57197092a7aa09637f60827f23181a7b8b0991907fcc62109b471ea2ce53816a79dfcad9d8da65c9514be3190e924d9bf2b17aacf84fc1fa6e037
+DIST megamek.png 9264 BLAKE2B cdff3e992af93cfc8f31be0c4d959ff5598eb3f7be58abfae4043a3e1f324d1985fc0621540f14ff7a2e2b4bb5e22672a940494a8e7c8d3339ad8f49c4c60979 SHA512 12a19fcb4ece9ee0fc38b3af10c37b7d362df9a41403d86dd1cfd8fb40a7b06784c71b5b160177b72d7aba048b78c4482f5417406d4add7feb47d13078bc79cf
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..213e94a3ce70
--- /dev/null
+++ b/games-board/megamek/megamek-0.34.10-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 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="
+	https://downloads.sourceforge.net/${PN}/MegaMek-v${PV}.zip
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+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
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} MegaMek
+}
diff --git a/games-board/megamek/metadata.xml b/games-board/megamek/metadata.xml
index 1c5cb53716e8..beaa3c2c374a 100644
--- a/games-board/megamek/metadata.xml
+++ b/games-board/megamek/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!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="github">MegaMek/megamek</remote-id>
 		<remote-id type="sourceforge">megamek</remote-id>
 	</upstream>
 </pkgmetadata>