gentoo resync : 24.07.2021

3 files changed, 62 insertions, 52 deletions

diff --git a/games-arcade/solarwolf/Manifest b/games-arcade/solarwolf/Manifest
index 9060fca754e4..df4eb6bf7c8d 100644
--- a/games-arcade/solarwolf/Manifest
+++ b/games-arcade/solarwolf/Manifest
@@ -1,4 +1,4 @@
 DIST solarwolf-1.5.tar.gz 2045888 BLAKE2B 66498b1d9b202b45ff87ea9d4b1ab14dcb6e343e8b0761576cfbf1c84ee9575cbf665e4b94552eb764f5e4fbaa02739f62c9eb20217085a6d18483d3ca7eb587 SHA512 44d84976f7797e3b859f1e5e50f9f964e5c6d6d4437ad25cf04720035e8697cc0c86490fdbbf8d923320a5c15c6e3afd1fbcfb9f17e7e31ce6f7264004e991f2
-DIST solarwolf_1.5+dfsg1-1.debian.tar.xz 8392 BLAKE2B 099543a22e93775756a90867dfeb7926ab9131b8367fa356a6d74efb682d17c5426f5f5372079052967a752a0c75e1d2db36b2ce0b43d00010c65468da968817 SHA512 b4d8ad1a0e83e4cf97185b075a53b7f66fbc20f865e490f714295f678fc675a111d2318e7c0b543028b5d948677140070acb9c04b07fdab1165e37606f34d87a
-EBUILD solarwolf-1.5-r2.ebuild 1085 BLAKE2B 4c6452ed6a4105fab33fcf176dc4bc38f7c056b0d556cd3706e3c4767bd5dac5aeaffb31bba36db1ae6cd3fd193fff379e05393ea87fff7b6c864737443858c6 SHA512 7bcf0bdf0047f2b0f3a320fe0682fc4d045702827da46f2aa1867c0208afda5a618afe663bc8a4bcbe4b45de487bf8f63e4b57288f724659a5d36f68e58ff456
+DIST solarwolf_1.5+dfsg1-3.debian.tar.xz 8944 BLAKE2B 7d83da34338e069d5076e7852f87f233043bfd3f3b2fe93a03fc3fcc631545ff666922d776d25689dec0723b077a373b30aed70ff713e27fad2c0f77bcf3b40e SHA512 e443c6096d7fae2ead3a4d6cacd21590dbdd89ae3293bbd3a219a5337647088b417d6712cef0839c394bc18570d0255d2c3af12a0fc1aae718955ddc64dced95
+EBUILD solarwolf-1.5_p3.ebuild 1434 BLAKE2B c84ceb67a5e48dd23abc088e8b97b578e31d19d940772addb4f18ab9538c28a8d24f5eb7cb615570628b8d84df6795327834cdfa67ea903d851d2fe931abc8ee SHA512 a4d6d0a00cd7a920f6f5929a30e66701daec848b4da097690e16f31a24cbf3221b61aba2402a9b351071453e5b12a5942068c23f7e666d23c31dbbd24af0e0d5
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild b/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild
deleted file mode 100644
index 2ec0e6da2f73..000000000000
--- a/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit desktop python-r1 wrapper
-
-DESCRIPTION="Action/arcade recreation of SolarFox"
-HOMEPAGE="http://www.pygame.org/shredwheat/solarwolf/"
-SRC_URI="
-	http://www.pygame.org/shredwheat/solarwolf/${P}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}+dfsg1-1.debian.tar.xz
-"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	>=dev-python/pygame-1.5.6[${PYTHON_USEDEP}]
-	media-libs/sdl-mixer[mod,vorbis]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	eapply -p1 "${WORKDIR}"/debian/patches/*.patch
-
-	find . -name .xvpics -print0 | xargs -0 rm -fr || die
-	# bug #619948
-	gunzip dist/${PN}.6.gz || die
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r code data *py
-
-	make_wrapper ${PN} "python3 ./solarwolf.py" /usr/share/${PN}
-
-	newicon data/ship-big.png ${PN}.png
-	make_desktop_entry ${PN} SolarWolf
-
-	einstalldocs
-	doman dist/${PN}.6
-}
diff --git a/games-arcade/solarwolf/solarwolf-1.5_p3.ebuild b/games-arcade/solarwolf/solarwolf-1.5_p3.ebuild
new file mode 100644
index 000000000000..93c392620e1a
--- /dev/null
+++ b/games-arcade/solarwolf/solarwolf-1.5_p3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit desktop python-single-r1
+
+MY_P="${PN}-$(ver_cut 1-2)"
+
+DESCRIPTION="Action/arcade recreation of SolarFox"
+HOMEPAGE="https://www.pygame.org/shredwheat/solarwolf/index.shtml"
+SRC_URI="
+	http://www.pygame.org/shredwheat/solarwolf/${MY_P}.tar.gz
+	mirror://debian/pool/main/s/solarwolf/${MY_P/-/_}+dfsg1-${PV/*_p}.debian.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/pygame[${PYTHON_USEDEP}]')
+	media-libs/sdl2-image[gif,png]
+	media-libs/sdl2-mixer[mod,vorbis]"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches
+)
+
+src_prepare() {
+	default
+
+	sed -e "/CODEDIR = \"/s|= .*|= \"${EPREFIX}/usr/share/${PN}/code\"|" \
+		-e "/DATADIR = \"/s|= .*|= \"${EPREFIX}/usr/share/${PN}\"|" \
+		-i ${PN}.py || die
+	python_fix_shebang ${PN}.py
+
+	# default to windowed given it forces resolution and menus can be invisible
+	sed -i '/^display = 1/s/1/0/' code/game.py || die
+
+	rm -r data/.xvpics || die
+	gzip -d dist/${PN}.6.gz || die
+}
+
+src_install() {
+	newbin ${PN}.py ${PN}
+	doman dist/${PN}.6
+
+	insinto /usr/share/${PN}
+	doins -r code data
+
+	dodoc readme.txt
+
+	newicon data/ship-big.png ${PN}.png
+	make_desktop_entry ${PN} SolarWolf
+}