gentoo resync : 25.09.2021

3 files changed, 66 insertions, 75 deletions

diff --git a/games-action/xblast/Manifest b/games-action/xblast/Manifest
index adc11d260e9c..58c783a8fcd1 100644
--- a/games-action/xblast/Manifest
+++ b/games-action/xblast/Manifest
@@ -5,5 +5,5 @@ DIST models-2005-01-06.tar.gz 1738564 BLAKE2B 7dfd87e47bf4555d6f01c59e83d1a34151
 DIST musics-2005-01-06.tar.gz 5317575 BLAKE2B 583d33535c5e80f691e9be7545038ca5dee602a1522f7749ffde0cbd9691378c9bb06c783548482eb26a61f74e3ad3cfac9166382d0644bd450eca1af0f08ed3 SHA512 885591cf5f32d76bc5bae150b24592c8eccd6f33afa5d40570429371b328671c3902c565446dae24bf949ac67b681e39e46e8d4ea737f52c66d467c09a210ede
 DIST sounds.tar.gz 1612625 BLAKE2B eb1ce96370dfafd254ef50334bd6e296045da6825773704d95f5778e854da4c1460fc0a24ae6c3e0c2c3784723fbce4198dfd7331ca9c18ab0324fef6ef6f3f1 SHA512 69518766ce1cc1bef543964acb077de51c361f1a880ebc11bd0d381fe082af0e013d116aad606a18c94855a08c5a2892cb5d0d5a259b081119bb8d355a94e2b2
 DIST xblast-2.10.4.tar.gz 684965 BLAKE2B e9709f539705b9e14831fa036c540877d0d55ce8c975048c8eac0abbf2e391e36b37e4c119118d73f5bf5e888f3fbef4c1dba361b3ba1874909644f948c57613 SHA512 6b3be0d41d18cf8da721030fa87c00ffed81d29706a20dd254a07b9cc8af79bd09f63ebb7f575c1665b77b9f58f29bec74b84f27fd2106d704c2fe2d5513a835
-EBUILD xblast-2.10.4-r1.ebuild 1545 BLAKE2B 3c288f4707e28258e62a195cb00c25e3168b908342b0aacf533a6049fec74bad9624265ef0527b9154c37db794d66b07b5279dd61eb359f40e22c392f26794c1 SHA512 ef688c58dd792d99702dfd1a38f09c861345ceb91aa84017362b7860a60572512fee775c8c7abdb5438d831365286d7d560a6fd03eb7e58ff5db8f4f7144d20b
+EBUILD xblast-2.10.4-r2.ebuild 1294 BLAKE2B 45c209a4cdc2bda6b061e70f263812b0ce005bee8d3a276b5a3952493d83cbcb4f172dc14a513399b7a042e5dc222fa5b82217e8f4a799e51204e67a11306c69 SHA512 48cbd0b6ca984104bbd501e9f9f79bd2b779e247797cc8499c58c329cedc840e73fefbba0cd787f9da3343da0d44cc53177e79fd175de8f0949bec7ee650f9ed
 MISC metadata.xml 330 BLAKE2B f862187afb374059b562c698dc13ea871667c07958b620cf6edf3e9326552d7b7f63742c0279177e379f0b7e6253960c6fb987fc726a16e8fc355466b58e9bcb SHA512 514cabf43b313eb86826c0f2feafde111267b7fe0a6004d82b2a32d16641a3f406ace96b677c1d911e61f1ea83fc95f06e594aea1aa0f2f02d9d928b40777f12
diff --git a/games-action/xblast/xblast-2.10.4-r1.ebuild b/games-action/xblast/xblast-2.10.4-r1.ebuild
deleted file mode 100644
index 3da27dd600ac..000000000000
--- a/games-action/xblast/xblast-2.10.4-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-# Change these as releases changes
-IMAGES="images-2005-01-06"
-LEVELS="levels-2005-01-06"
-MODELS="models-2005-01-06"
-MUSICS="musics-2005-01-06"
-SOUNDS="sounds"
-
-DESCRIPTION="Bomberman clone w/network support for up to 6 players"
-HOMEPAGE="http://xblast.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xblast/${P}.tar.gz
-	mirror://sourceforge/xblast/${IMAGES}.tar.gz
-	mirror://sourceforge/xblast/${LEVELS}.tar.gz
-	mirror://sourceforge/xblast/${MODELS}.tar.gz
-	mirror://sourceforge/xblast/${MUSICS}.tar.gz
-	mirror://sourceforge/xblast/${SOUNDS}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	media-libs/libpng:0
-	x11-libs/libICE
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-libs/libXt"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc-10.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf #255857
-}
-
-src_configure() {
-	econf \
-		--with-otherdatadir=/usr/share/${PN} \
-		--enable-sound
-}
-
-src_install() {
-	local IMAGE_INSTALL_DIR="/usr/share/${PN}/image"
-
-	default
-
-	# Images
-	dodir "${IMAGE_INSTALL_DIR}"
-	cp -pPR "${WORKDIR}/${IMAGES}"/* "${D}/${IMAGE_INSTALL_DIR}" || die
-
-	# Levels
-	insinto "/usr/share/${PN}/level"
-	doins "${WORKDIR}/${LEVELS}"/*
-
-	# Models
-	insinto "/usr/share/${PN}/image/sprite"
-	doins "${WORKDIR}/${MODELS}"/*
-
-	# Music and sound
-	insinto "/usr/share/${PN}/sounds"
-	doins "${WORKDIR}/${MUSICS}"/* "${WORKDIR}/${SOUNDS}"/*
-
-	# Cleanup
-	find "${D}" -name Imakefile -exec rm \{\} \;
-}
diff --git a/games-action/xblast/xblast-2.10.4-r2.ebuild b/games-action/xblast/xblast-2.10.4-r2.ebuild
new file mode 100644
index 000000000000..0f7e212495eb
--- /dev/null
+++ b/games-action/xblast/xblast-2.10.4-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop
+
+MY_GAMEDATA=(
+	images-2005-01-06:image
+	levels-2005-01-06:level
+	models-2005-01-06:image/sprite
+	musics-2005-01-06:sounds
+	sounds
+)
+
+DESCRIPTION="Bomberman clone with network support for up to 6 players"
+HOMEPAGE="http://xblast.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/xblast/${P}.tar.gz
+	$(printf 'mirror://sourceforge/xblast/%s.tar.gz ' "${MY_GAMEDATA[@]%:*}")"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-libs/libX11
+	media-fonts/font-adobe-100dpi"
+DEPEND="
+	x11-base/xorg-proto
+	x11-libs/libX11
+	x11-libs/libXt"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
+
+src_prepare() {
+	default
+
+	find "${WORKDIR}" -name Imakefile -exec rm {} + || die
+
+	# badly non-utf8 named file that doesn't match xblast.wxs runtime #750077
+	mv "${WORKDIR}"/levels-2005-01-06/reconstruct{?,i}on2.xal || die
+
+	eautoreconf #255857
+}
+
+src_configure() {
+	econf \
+		--enable-sound \
+		--with-otherdatadir="${EPREFIX}"/usr/share/${PN}
+}
+
+src_install() {
+	default
+
+	local data
+	for data in "${MY_GAMEDATA[@]}"; do
+		insinto /usr/share/${PN}/${data#*:}
+		doins -r "${WORKDIR}"/${data%:*}/.
+	done
+
+	make_desktop_entry ${PN} XBlast applications-games
+}