gentoo resync : 05.12.2021

10 files changed, 104 insertions, 131 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 79e1653909e6..1a1352e0b891 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/angrydd/Manifest b/games-puzzle/angrydd/Manifest
index cc92594d12df..61a4855f8b1f 100644
--- a/games-puzzle/angrydd/Manifest
+++ b/games-puzzle/angrydd/Manifest
@@ -1,4 +1,4 @@
 DIST angrydd-1.0.1.tar.gz 5331883 BLAKE2B de8a418b881f17e0869d9b8004b6db3cee56c1bb05729a5238f6357d3072ff10afb864252fcb3cef5c90d136ad7c8739afd71b88c932545203f2e9752c5eac81 SHA512 e0901833febcabb6622bb85405189bfaf3c917c3254ce282045d58e8e5b5c6c6565ca0e7c56fe2819e0d3f344df3bb285cca54c360b467d284739673d1aa74f0
 DIST angrydd_1.0.1-13.debian.tar.xz 11940 BLAKE2B d64ae1f878f3dfe4eee9f236ce6869f7ce3d77021a09593240a84860157781ecd776be7a06edbb48d1e340c654c50f4463b76b42049076e9c02b6397988ca9df SHA512 123d593ac7ceff8f6fe5d70442b92e6564f4e6ee668450cb623bbdeb4633cad6e04cf896d93cacc5e11bda08cb61b7c92ce0b99072e6e12b21e023620d12b360
-EBUILD angrydd-1.0.1_p13-r1.ebuild 1204 BLAKE2B 58763f857a85ccabfaeb86bb40b21de4317c1240aa1500d63fe26314113ca2370cae522d7ef1bdb9ba862f01bf4c77a72107e663e1ecfeb2c1e2cabf710319ff SHA512 5a0402b5779ad00466978e3e24ebbfb8e7d56c00fa4aa21ac0a83975eb17f19313e12944c057d7dd893aa01788a4a6f918cb733c827697b7efb221e17ea17645
+EBUILD angrydd-1.0.1_p13-r2.ebuild 1145 BLAKE2B 22dc65612e68bdeb09e7c0d26b439928826b877689e9ef7ecc77ae74cd8b2f59c04e9dd4b075add80dffeeb4016eab15ce63de6a9f1cad9efae75425e6c0e739 SHA512 6f1fa59813c54afa2f4c59a0aa306d6dc68f8d250d3d4e10c0e0ef0fa07fa2cffa959ef4faa7b222c88a74d599c3fe5afdfdced7dde6f0e03570e84fd0a475a1
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild b/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild
deleted file mode 100644
index d1ad454c75cd..000000000000
--- a/games-puzzle/angrydd/angrydd-1.0.1_p13-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit desktop python-single-r1
-
-DESCRIPTION="Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter"
-HOMEPAGE="https://www.sacredchao.net/~piman/angrydd/"
-SRC_URI="
-	https://www.sacredchao.net/~piman/angrydd/${P/_p*}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/pygame[${PYTHON_USEDEP}]
-	')
-"
-DEPEND="${RDEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${P/_p*}"
-
-src_prepare() {
-	default
-	eapply -p1 "${WORKDIR}"/debian/patches/*.patch
-	python_fix_shebang .
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		PREFIX="/usr/share/" \
-		TO="${PN}" \
-		install
-	rm -rf "${ED}/usr/share/games" "${ED}/usr/share/share" || die
-
-	python_optimize "${ED}/usr/share/${PN}"
-
-	dodir /usr/bin
-	dosym "../share/${PN}/angrydd.py" "/usr/bin/${PN}"
-	doman angrydd.6
-	dodoc README TODO HACKING
-
-	doicon angrydd.png
-	make_desktop_entry angrydd "Angry, Drunken Dwarves"
-}
diff --git a/games-puzzle/angrydd/angrydd-1.0.1_p13-r2.ebuild b/games-puzzle/angrydd/angrydd-1.0.1_p13-r2.ebuild
new file mode 100644
index 000000000000..615182d98fd3
--- /dev/null
+++ b/games-puzzle/angrydd/angrydd-1.0.1_p13-r2.ebuild
@@ -0,0 +1,46 @@
+# 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="Angry, Drunken Dwarves, a falling blocks game similar to Puzzle Fighter"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="
+	mirror://gentoo/${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-2"
+SLOT="0"
+KEYWORDS="~amd64 ~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[vorbis]"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${WORKDIR}"/debian/patches
+)
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr/share TO=${PN} install
+
+	dosym -r /usr/share/${PN}/${PN}.py /usr/bin/${PN}
+	doman angrydd.6
+	einstalldocs
+
+	python_fix_shebang "${ED}"/usr/share/${PN}
+	python_optimize "${ED}"/usr/share/${PN}
+
+	doicon ${PN}.png
+	make_desktop_entry ${PN} "Angry, Drunken Dwarves"
+
+	rm -r "${ED}"/usr/share/{games,share} || die
+}
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
+}
diff --git a/games-puzzle/pathological/Manifest b/games-puzzle/pathological/Manifest
index cdc73b79a04f..b68ae0c9e11d 100644
--- a/games-puzzle/pathological/Manifest
+++ b/games-puzzle/pathological/Manifest
@@ -1,5 +1,5 @@
 AUX pathological-1.1.3_p16-pygame2-compat.patch 1954 BLAKE2B e1670210cdad9f957f76f20ca5bbdc2cccfef9c37353dc00ffeb10c87473972b0066d2413c42c80541bfa23059cffe5143ad2791ec816a06654f4e5dedbb8551 SHA512 e63b964849803020cb68ed908b317fea81c60b5360cbd9cf10e3836483250972764352e619afb836196b50732360fac3da88a68d3863431a9b5f8a74535a2023
 DIST pathological-1.1.3.tar.gz 6995274 BLAKE2B 2fc891f1d0f15f68d2be3a210f04a64b73896cba92882e24fa60df09752b3235e025c4480510b7eebbf214d8ec4885ea556d76757888b85751a48432ea22709f SHA512 a64e0ca9a3bf86ade4a1abdd4f471c341838f690b2471f21c488471b7800da55f89f42c62a51c9be380cb9f265432db904a5de6f6bb3a9a7dde835da94baf566
 DIST pathological_1.1.3-16.debian.tar.xz 12992 BLAKE2B 3209f1d6b867f8d7baf83dda22f94829ba880a7aeff2a7587b883cac406e21b5c20d703a55599bc8692caa49553102ed1b4b0f7ac11c490b400ccbca7608d6cf SHA512 3d946a6d3c0daa4f0dac256c6e5fa053942a101aaae229836c8290dffc4556279169f71eff6bf4814d26ee30f466df9d7014b504c259aba139c3919c704db3ee
-EBUILD pathological-1.1.3_p16-r3.ebuild 1680 BLAKE2B 3dbc7ff5690ebb63b60a2b888b86fb204ea7188af81a3db9acf3c23cfdfcc1490c79d3474ad4f044bf7e98295346d5ad2077904608675eb3169188d853ef3548 SHA512 556796261f70f0a868a6d05b5fa9d6c3bc74395739771f3520c1ced91e3b5d9cb330b3661bd968329277ac5ecf98003a38d0cf80a864c88ead05d04581efebf8
+EBUILD pathological-1.1.3_p16-r3.ebuild 1682 BLAKE2B 82abefa183235d72c9d5036052d8090cf34491b31eaaf39f79cb4da21fdee8b41d9c3ab9137a795da344a732497c48d544bf8f8d0b872961cce361b3172dbe0d SHA512 5cebbdead906abe02c24d0d0f970488a54eea86bbd1c66794abd6a6a484f253cdfcb606e8508bf0a5a53184d1230d660a4f672f6931d432eb192d97a41f41c5f
 MISC metadata.xml 336 BLAKE2B 359f5565f58bfe5b62b7f7af3b062185641e53e861e0191f010d9842e1a3d77dbd0dd5eb61c68b85cb00151c47c9b8223bdfbdf1ac57ab885f812bf94c50f15e SHA512 aa01ff164bcaa993d52746a3b3bdf5913646c0822253c227133c8ed5f3bdb8636195d2ba7e3b125f00ec901d2f3182cec39fb41fcea7b0948f1641d9d2ab739c
diff --git a/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild b/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
index dc1f36d2d15d..0c32cefd318d 100644
--- a/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
+++ b/games-puzzle/pathological/pathological-1.1.3_p16-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit desktop optfeature python-single-r1
 
 MY_P="${PN}-$(ver_cut 1-3)"