gentoo resync : 28.04.2021

3 files changed, 54 insertions, 48 deletions

diff --git a/games-arcade/barbarian-bin/Manifest b/games-arcade/barbarian-bin/Manifest
index e8b6478ba6fb..e3ea2902ca8e 100644
--- a/games-arcade/barbarian-bin/Manifest
+++ b/games-arcade/barbarian-bin/Manifest
@@ -1,3 +1,3 @@
 DIST barbarian101_linux.zip 925199 BLAKE2B d8552b7fb03836ec75943b5b754489c345c70c9534301f16a64cdd21ea262fcff19ae6916bcd469b26dd088676079df2190bda369ca085d6c4285d84ebc12616 SHA512 9b46c75666359ed5102a89d29e8b6afacf07ccfa6175f6df27b5acc48b0e0119106f1c1376b124ff761d373bf04145e804659b81503b2834ba09ac05fad5c4f4
-EBUILD barbarian-bin-1.01-r1.ebuild 1242 BLAKE2B 41a093a2be3ede578059fedaf70cc979efc8fc55d4b3c4c9cf93c1134d27916411b405167ca633251da04b5d2097f7dc643a7acb5e9a1fa70cec2c1742e866ad SHA512 97e5d5d20421f666ccd9aa9bf162a649fe2b04202fe0559e6d41052c1eae993d452f78060ee99638fe647cf7cb6a230e96b79a95a2e84dec4259d9967880b8b7
+EBUILD barbarian-bin-1.01-r2.ebuild 1315 BLAKE2B 335419fd3f6b4eded4d986a4e55a7e110741ff6988d3838e213543dc29c5cf3addcc4fa6a3924728c12af8310da2efb75c0c46969db4ee94c6887163cf40689d SHA512 571996903576cd1edab8cb5adf22a96dbaeec739344d3a45166d8fea0d2d5f623a4bc6a9d6e9ae563a81e1412826e0734f399fe43adff7d6e4cae3b7755c2b7f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild b/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild
deleted file mode 100644
index 555f99dd3acb..000000000000
--- a/games-arcade/barbarian-bin/barbarian-bin-1.01-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-MY_PN=${PN/-bin/}
-DESCRIPTION="Save Princess Mariana through one-on-one battles with demonic barbarians"
-HOMEPAGE="http://www.tdbsoft.com/"
-SRC_URI="http://www.pcpages.com/tomberrr/downloads/${MY_PN}${PV/./}_linux.zip"
-
-LICENSE="CC-BY-NC-ND-2.0"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="strip"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND="sys-libs/libstdc++-v3:5
-	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
-	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]"
-
-game_dest="${GAMES_PREFIX_OPT}/${MY_PN}"
-QA_PREBUILT="${game_dest:1}/Barbarian"
-
-S=${WORKDIR}
-
-src_install() {
-	dodir "${game_dest}"
-	cp -r gfx sounds "${D}${game_dest}/" || die
-
-	exeinto "${game_dest}"
-	doexe Barbarian
-
-	dohtml Barbarian.html
-
-	games_make_wrapper barbarian ./Barbarian "${game_dest}"
-
-	# High-score file
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}${GAMES_STATEDIR}/heroes.hoh"
-	fperms 660 "${GAMES_STATEDIR}/heroes.hoh"
-	dosym "${GAMES_STATEDIR}/heroes.hoh" "${game_dest}/heroes.hoh"
-	newicon gfx/sprites/player_attack_2_1.bmp barbarian.bmp
-	make_desktop_entry barbarian "Barbarian" /usr/share/pixmaps/barbarian.bmp
-	prepgamesdirs
-}
diff --git a/games-arcade/barbarian-bin/barbarian-bin-1.01-r2.ebuild b/games-arcade/barbarian-bin/barbarian-bin-1.01-r2.ebuild
new file mode 100644
index 000000000000..c7f7f26b27fe
--- /dev/null
+++ b/games-arcade/barbarian-bin/barbarian-bin-1.01-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop wrapper
+
+MY_PN=${PN/-bin/}
+DESCRIPTION="Save Princess Mariana through one-on-one battles with demonic barbarians"
+HOMEPAGE="http://www.tdbsoft.com/"
+SRC_URI="http://www.pcpages.com/tomberrr/downloads/${MY_PN}${PV/./}_linux.zip"
+S="${WORKDIR}"
+
+LICENSE="CC-BY-NC-ND-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="strip"
+
+RDEPEND="
+	acct-group/gamestat
+	>=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)]
+	sys-libs/libstdc++-v3:5
+	amd64? ( sys-libs/libstdc++-v3:5[multilib] )
+"
+BDEPEND="app-arch/unzip"
+
+game_dest="opt/${MY_PN}"
+QA_PREBUILT="${game_dest}/Barbarian"
+
+src_install() {
+	dodir ${game_dest}
+	cp -r gfx sounds "${ED}"/${game_dest}/ || die
+
+	exeinto ${game_dest}
+	doexe Barbarian
+
+	docinto html
+	dodoc Barbarian.html
+
+	make_wrapper barbarian ./Barbarian "${game_dest}"
+
+	# High-score file
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/heroes.hoh || die
+	dosym ../../var/games/${PN}/heroes.hoh ${game_dest}/heroes.hoh
+
+	fperms 660 /var/games/${PN}/heroes.hoh
+	fowners -R root:gamestat /var/games/${PN}
+	fperms g+s /opt/${MY_PN}/Barbarian
+
+	newicon gfx/sprites/player_attack_2_1.bmp barbarian.bmp
+	make_desktop_entry barbarian "Barbarian" /usr/share/pixmaps/barbarian.bmp
+}