gentoo resync : 05.12.2021

4 files changed, 54 insertions, 71 deletions

diff --git a/games-puzzle/monsterz/Manifest b/games-puzzle/monsterz/Manifest
index 1b0ed83e872b..55098e7a3d91 100644
--- a/games-puzzle/monsterz/Manifest
+++ b/games-puzzle/monsterz/Manifest
@@ -1,5 +1,4 @@
-AUX monsterz-0.7.1-gentoo-r1.patch 390 BLAKE2B 4cd80a3b5ff0d0c67326a811e92637b5006d37b5a00e87ae8dbb9432060ca65e3754b5e75bca023e8822854613bad9fbec0aa3dc7a1040a804bdab0f1204b135 SHA512 6b8eb58d5610d0e15c9598b6bd92a98690b4fdfa663f9d84be0c77c727a8ad8c48caa946f8ea4060e895984d9e28b5cd4caa9acb6385c2c4f045fa5987a6b8da
 DIST monsterz-0.7.1.tar.gz 1879537 BLAKE2B e1ad9f17a64bcbb07005eb61d951dbf756997a6e6bd76c48d88bb634c9b3167c9fd41ef32032925b219153eb607dc238af76b44c3ef6c47aab753d59c61958e1 SHA512 62de125251a74e7ff237c90ad88e10a4953b8841251dfec45cc6b77f416677ef6d68cf4308c3190f65896b5bb1312934abd5e438f0341f08c02884585f0e4787
-DIST monsterz_0.7.1-11.debian.tar.xz 13688 BLAKE2B 2274b6d18b2f03200e09468243bae7ede94b81bd7595f65a73fd33bc9ccc7302fbea3a4876b5bbf6cf98735652742b1cf76b3c288fc6c005f9566c04b4a4f277 SHA512 c172355667db29de949de07745469552d62dc226120f38ff76a288b14018424338f27b6a562de215b7194b8b09c6346d29e9088c8a0edb0fe915f915b8577a4b
-EBUILD monsterz-0.7.1_p11.ebuild 1289 BLAKE2B 98b9af7e5df78dd24e2fc6c50b6cf27c638321f4cfd56941add2014e907670e2d6717d0205d9eb653f72fcdcc8a04870c5172a6d7ad91732b24f0e01755eeac6 SHA512 78d463b043de91fb9bf8ef918918ac1b5034f2878de56ca593dcd5f7f2907eaa7f7f364374f026a643ab608abdc294187a445298b5369dac140da8f4de8a9b90
+DIST monsterz_0.7.1-12.debian.tar.xz 14196 BLAKE2B ec4f425da3502afa175e0e3772a47ed24cd5d5857a04e4627cbcc7491df70f3aa718b82aae25f36a67868ba114075dabb215cc9d1ecd3b97ad2d7ab401cdd528 SHA512 3111363010ee10952fa93c456ce2db015ef1a516bde8bba55b5cd3f2ea4c50d71bb1a81c0207cd89960c47b4e2eb10693782bdc72d7439163720bf686e389cb3
+EBUILD monsterz-0.7.1_p12.ebuild 1144 BLAKE2B 58a65f95c2f64693175f9afeed87ee7e48c95570d189d1462eb82fdcb3704843cb36dfb44a5a65e8bd8b9ada2e678521156bf045e8d8b0bec2f412f60ff6088e SHA512 826a2042be91b610a3314afbd8ae3dfeeee526589db07c01f85ede5e24ca56c52d5ab206b7ffe3c8baa69cd9a6ad9d66073fe3ded0518b4b8fff6983f8135cfa
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo-r1.patch b/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo-r1.patch
deleted file mode 100644
index bd8a825c3c46..000000000000
--- a/games-puzzle/monsterz/files/monsterz-0.7.1-gentoo-r1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/monsterz.py.old	2019-12-25 20:25:16.680365172 +0100
-+++ b/monsterz.py	2019-12-25 20:25:50.606666122 +0100
-@@ -1991,7 +1991,7 @@
-     global system, data, settings, fonter, monsterz
-     override = {}
-     scorefile = None
--    sharedir = dirname(argv[0])
-+    sharedir = "GENTOO_DATADIR"
-     outfd = None
-     try:
-         long = ['help', 'version', 'music', 'sound', 'fullscreen',
diff --git a/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild b/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
deleted file mode 100644
index dff0f0c80f77..000000000000
--- a/games-puzzle/monsterz/monsterz-0.7.1_p11.ebuild
+++ /dev/null
@@ -1,57 +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
-
-DESCRIPTION="A little puzzle game, similar to the famous Bejeweled or Zookeeper"
-HOMEPAGE="http://sam.zoy.org/projects/monsterz/"
-SRC_URI="
-	http://sam.zoy.org/projects/monsterz/${P/_p*}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-1+ LGPL-2+ WTFPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygame[${PYTHON_USEDEP}]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer[mod]
-"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${P/_p*}"
-
-src_prepare() {
-	default
-
-	# Debian fixes
-	for p in $(<"${WORKDIR}"/debian/patches/series) ; do
-		eapply -p1 "${WORKDIR}/debian/patches/${p}"
-	done
-
-	eapply "${FILESDIR}"/${PN}-0.7.1-gentoo-r1.patch
-	sed -i \
-		-e "s:GENTOO_DATADIR:/usr/share/${PN}:" \
-		monsterz.py || die "sed failed"
-
-	rm Makefile || die
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r graphics sound
-	newbin monsterz.py ${PN}
-	newicon graphics/icon.png ${PN}.png
-	make_desktop_entry ${PN} Monsterz
-	einstalldocs
-	python_replicate_script "${ED}"/usr/bin/monsterz
-}
diff --git a/games-puzzle/monsterz/monsterz-0.7.1_p12.ebuild b/games-puzzle/monsterz/monsterz-0.7.1_p12.ebuild
new file mode 100644
index 000000000000..9e90e2b47bbe
--- /dev/null
+++ b/games-puzzle/monsterz/monsterz-0.7.1_p12.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit desktop python-single-r1
+
+DESCRIPTION="Puzzle game similar to the famous Bejeweled or Zookeeper"
+HOMEPAGE="http://sam.zoy.org/projects/monsterz/"
+SRC_URI="
+	http://sam.zoy.org/projects/monsterz/${P/_p*}.tar.gz
+	mirror://debian/pool/main/${P::1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz"
+S="${WORKDIR}/${P/_p*}"
+
+LICENSE="GPL-1+ LGPL-2+ WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/pygame[${PYTHON_USEDEP}]')
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-mixer[mod]"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches
+)
+
+src_prepare() {
+	default
+
+	sed "/sharedir/s|= dirname.*|= \"${EPREFIX}/usr/share/${PN}\"|" \
+		-i monsterz.py || die
+	python_fix_shebang monsterz.py
+
+	rm Makefile || die
+}
+
+src_install() {
+	newbin ${PN}{.py,}
+
+	insinto /usr/share/${PN}
+	doins -r graphics sound
+
+	newicon graphics/icon.png ${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+
+	einstalldocs
+}