gentoo resync : 15.01.2020

3 files changed, 49 insertions, 38 deletions

diff --git a/games-arcade/solarwolf/Manifest b/games-arcade/solarwolf/Manifest
index 8bb4616fb9e1..acbf6309739e 100644
--- a/games-arcade/solarwolf/Manifest
+++ b/games-arcade/solarwolf/Manifest
@@ -1,3 +1,4 @@
 DIST solarwolf-1.5.tar.gz 2045888 BLAKE2B 66498b1d9b202b45ff87ea9d4b1ab14dcb6e343e8b0761576cfbf1c84ee9575cbf665e4b94552eb764f5e4fbaa02739f62c9eb20217085a6d18483d3ca7eb587 SHA512 44d84976f7797e3b859f1e5e50f9f964e5c6d6d4437ad25cf04720035e8697cc0c86490fdbbf8d923320a5c15c6e3afd1fbcfb9f17e7e31ce6f7264004e991f2
-EBUILD solarwolf-1.5-r1.ebuild 807 BLAKE2B c33e0360969cdf10066eb8c434f1cad7445f6cd72c7f5a5d7b1acc2de8d14a2ef6852e0f5dd210b85afc758b8dc2ca8448ddae3ce1c450aeaf46e55a8400a362 SHA512 b1dc28843017beb10eff20dab03c847f61f554c1f512509e904e9fbe567d4c68e918266e08a341e309bcf5ab24e6a60fba11c975ba75575e162253d862b6550f
+DIST solarwolf_1.5+dfsg1-1.debian.tar.xz 8392 BLAKE2B 099543a22e93775756a90867dfeb7926ab9131b8367fa356a6d74efb682d17c5426f5f5372079052967a752a0c75e1d2db36b2ce0b43d00010c65468da968817 SHA512 b4d8ad1a0e83e4cf97185b075a53b7f66fbc20f865e490f714295f678fc675a111d2318e7c0b543028b5d948677140070acb9c04b07fdab1165e37606f34d87a
+EBUILD solarwolf-1.5-r2.ebuild 1084 BLAKE2B f0779beeb563736f2f70deff4ca9d2deb4f3605a218015f32d2fb4ac004b92763ff738aaa96d09a8db5491564b7713685d50ad803177aeffbf1926f3dbc3260a SHA512 706f0aaf0c067d2e40db53214d31869a527110600334d0ba4980a33b83ffade4a0d8e1b760142b305296630488b88c9f62bbec43b0a68bce3e9f9bd0c6d0674f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/solarwolf/solarwolf-1.5-r1.ebuild b/games-arcade/solarwolf/solarwolf-1.5-r1.ebuild
deleted file mode 100644
index e47801d87ca2..000000000000
--- a/games-arcade/solarwolf/solarwolf-1.5-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eutils
-
-DESCRIPTION="Action/arcade recreation of SolarFox"
-HOMEPAGE="http://www.pygame.org/shredwheat/solarwolf/"
-SRC_URI="http://www.pygame.org/shredwheat/solarwolf/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/pygame-1.5.6
-	media-libs/sdl-mixer[mod,vorbis]
-"
-DEPEND=""
-
-src_prepare() {
-	default
-	find . -name .xvpics -print0 | xargs -0 rm -fr
-	gunzip dist/${PN}.6.gz || die #619948
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r code data *py
-	make_wrapper ${PN} "python2 ./solarwolf.py" /usr/share/${PN}
-	doicon dist/${PN}.png
-	make_desktop_entry ${PN} SolarWolf
-	einstalldocs
-	doman dist/${PN}.6
-}
diff --git a/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild b/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild
new file mode 100644
index 000000000000..8f291786f9cb
--- /dev/null
+++ b/games-arcade/solarwolf/solarwolf-1.5-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop eutils python-r1
+
+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"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/pygame-1.5.6[${PYTHON_USEDEP}]
+	media-libs/sdl-mixer[mod,vorbis]
+"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+src_prepare() {
+	default
+
+	eapply -p1 "${WORKDIR}"/debian/patches/*.patch
+
+	find . -name .xvpics -print0 | xargs -0 rm -fr
+	gunzip dist/${PN}.6.gz || die #619948
+}
+
+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
+}