gentoo resync : 16.09.2021

4 files changed, 80 insertions, 74 deletions

diff --git a/games-action/battalion/Manifest b/games-action/battalion/Manifest
index 8b05d18e84ba..77357045e465 100644
--- a/games-action/battalion/Manifest
+++ b/games-action/battalion/Manifest
@@ -1,5 +1,6 @@
 AUX battalion-1.4b-fix-build-system.patch 1923 BLAKE2B a6c8ad95fde5629f1e49532ddfd0d7f81c40fdbdec934fce876b27496a71093c9065852e3ca912f0827be3989f09fa400512fe2b627fdd3a8804a13177664481 SHA512 ea078f3b6b7ac1a4156840c8479ecf4cd0cf17ea74c7aed6bf18a7894b9f7f0555a74c0e1c1188358f496b9b6ae2309289637cb67f2c5b80b0c2bfe09499b2fc
 AUX battalion-1.4b-warning.patch 335 BLAKE2B 89980f750f2b7ca871ee9b37c0e07f39744cf577c117a99faf5cdd0e3ebd00bb21a3d39a66a0ec48e365dc14c81c822c1a8523925d11ef6e6ce182c82ce9bca9 SHA512 721f466e3c52cbac0d68379028e3c01bd86ab148f59f7d90ec5da536391781d6074cf3424727ba62d9e6991944ac49ea5ab3119ea6d9bf18eaa7e745ac52ccfd
-DIST battalion1.4b.tar.bz2 942342 BLAKE2B 6a4bd9afc7202d68c2cf62fbfe5b3b8377069263d71adaad006d2b4803d5989b130e0ef7fd5b1479a7698d79c819bc463ab19f2fa1493d4caf616708091e2c83 SHA512 c3c615772012c63a709aaeaf4f23246760bf577b82eeec7cf5b2a479c6240fe4a2f839aca50540299ed4bee9b297f61fb8b7e1f5af74ea357f0d7e749d86f84b
-EBUILD battalion-1.4b-r1.ebuild 1579 BLAKE2B 631a55005fce3468a211922356cfa559d97a738d864ac22f046ed9b31aefc8d4d9602725d17b4a358114b0ed4df9e5c8a408924eeacfd02a44ca9630d3ada231 SHA512 534c5b747cfe5edd494f9bf759b2d5082f21f45e9b6bf56f28f925ab0d1c2ac5fafa6631028589443fdf85c7e34aeadfba69ed6936986b6b04de4a4d820d8781
-MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
+DIST battalion1.4b-r1.tar.bz2 1103031 BLAKE2B 393561b879813244c90cba1fe1186a65920bf383926c06c28f1ce3a04afa66eab08f3b35925495bf4ca9b0d37eb1925bad5cbace602a8cb575cc4d6c5410fd01 SHA512 5c2acf7941cfd4ae4c7f46b3df7c7e6090dfd099276c67b0de83a4e6e14de00b099814980a12bddf1349407e7e1e62f91da5d0da842fd26f240b9a6cb37ecb04
+DIST battalionSUN4.tar.gz 1593265 BLAKE2B 239dff49c4d2c33a440594c113f45d347e598935257e30a04a18bd0f6b440b7790436000213fcbacfa862187f4760b9927539977f144ff5e92d7dfddbb7f3d7e SHA512 1e1ea7c7232b99b01a85fdf0660877944d64172b751df1dcd63a6cbeb4179078e80879aca77d84bb37b68fcf082680243987d5b65c77e5ea48e8f5645f9b2ef0
+EBUILD battalion-1.4b-r2.ebuild 1722 BLAKE2B bbd3442eb54c5ed51d3902d7abd9f424a974a2fa045a142ee7c9eec022a1939ecd2d82cfdf9ba9fb92ead38e001a1e2b53cf482d23e6d743cd439fdd0df38024 SHA512 94096bf879c0800d741b436ea5fe45785ced3e5b07bbb83d91c38678d139c5e13bd52685ae2405ff5338e85305e8469c19097301c5d5b861c33c8a48b93db553
+MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-action/battalion/battalion-1.4b-r1.ebuild b/games-action/battalion/battalion-1.4b-r1.ebuild
deleted file mode 100644
index ae310183dfe1..000000000000
--- a/games-action/battalion/battalion-1.4b-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Be a rampaging monster and destroy the city"
-HOMEPAGE="http://evlweb.eecs.uic.edu/aej/AndyBattalion.html"
-SRC_URI="http://evlweb.eecs.uic.edu/aej/BATTALION/${PN}${PV}.tar.bz2"
-S="${WORKDIR}"/${PN}${PV}
-
-LICENSE="battalion HPND"
-SLOT="0"
-KEYWORDS="~x86"
-
-DEPEND="
-	virtual/glu
-	virtual/opengl
-	x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-DEPEND+=" virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-warning.patch
-	"${FILESDIR}"/${PN}-1.4b-fix-build-system.patch
-)
-
-src_prepare() {
-	default
-
-	# Modify data paths
-	sed -i \
-		-e "s:SOUNDS/:${EPREFIX}/usr/share/${PN}/SOUNDS/:" \
-		-e "s:MUSIC/:${EPREFIX}/usr/share/${PN}/MUSIC/:" \
-		audio.c || die
-	sed -i \
-		-e "s:DATA/:${EPREFIX}/usr/share/${PN}/DATA/:" \
-		-e "s:/usr/tmp:${EPREFIX}/var/${PN}:" \
-		battalion.c || die
-	sed -i \
-		-e "s:TEXTURES/:${EPREFIX}/usr/share/${PN}/TEXTURES/:" \
-		graphics.c || die
-
-	# Only .raw sound files are used on Linux. The .au files are not needed.
-	rm {SOUNDS,MUSIC}/*.au || die
-}
-
-src_configure() {
-	tc-export CC PKG_CONFIG
-}
-
-src_install() {
-	dobin battalion
-	einstalldocs
-
-	insinto /usr/share/${PN}
-	doins -r DATA MUSIC SOUNDS TEXTURES
-
-	dodir /var/${PN}
-	touch "${ED%/}"/var/${PN}/battalion_hiscore || die
-	fperms 660 /var/${PN}/battalion_hiscore
-}
-
-pkg_postinst() {
-	elog "Sound and music are not enabled by default."
-	elog "Use the S and M keys to enable them in-game, or start the game with"
-	elog "the -s and -m switches: battalion -s -m"
-}
diff --git a/games-action/battalion/battalion-1.4b-r2.ebuild b/games-action/battalion/battalion-1.4b-r2.ebuild
new file mode 100644
index 000000000000..cf5a5613754a
--- /dev/null
+++ b/games-action/battalion/battalion-1.4b-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Be a rampaging monster and destroy the city"
+HOMEPAGE="https://www.evl.uic.edu/aej/AndyBattalion.html"
+SRC_URI="
+	https://www.evl.uic.edu/aej/BATTALION/${PN}${PV}.tar.bz2 -> ${PN}${PV}-r1.tar.bz2
+	https://www.evl.uic.edu/aej/BATTALION/${PN}SUN4.tar.gz"
+S="${WORKDIR}/${PN}${PV}"
+
+LICENSE="battalion HPND"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	acct-group/gamestat
+	virtual/glu
+	virtual/opengl
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-warning.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+)
+
+src_prepare() {
+	default
+
+	sed -e "/getenv.*DATADIR/s|= .*|= \"${EPREFIX}/usr/share/${PN}\";|" \
+		-e "/getenv.*SCOREDIR/s|= .*|= \"${EPREFIX}/var/games\";|" \
+		-i battalion.c || die
+
+	sed '1s/1/6/' ../${PN}SUN4/${PN}.man > "${T}"/${PN}.6 || die
+
+	# Only .raw sound files are used on Linux. The .au files are not needed.
+	rm {SOUNDS,MUSIC}/*.au || die
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+
+	emake clean
+	emake
+}
+
+src_install() {
+	dobin ${PN}
+	doman "${T}"/${PN}.6
+	einstalldocs
+
+	insinto /usr/share/${PN}
+	doins -r DATA MUSIC SOUNDS TEXTURES ../${PN}SUN4/${PN}.data/${PN}.sho
+
+	dodir /var/games
+	> "${ED}"/var/games/${PN}_hiscore || die
+
+	fowners :gamestat /usr/bin/${PN} /var/games/${PN}_hiscore
+	fperms g+s /usr/bin/${PN}
+	fperms 660 /var/games/${PN}_hiscore
+
+	make_desktop_entry ${PN} ${PN^} applications-games
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that sound and music are not enabled by default,"
+		elog "and require OSS support (/dev/dsp) to function."
+	fi
+}
diff --git a/games-action/battalion/metadata.xml b/games-action/battalion/metadata.xml
index 78274e0fa550..1c3ba213c494 100644
--- a/games-action/battalion/metadata.xml
+++ b/games-action/battalion/metadata.xml
@@ -1,5 +1,5 @@
 <?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>