gentoo resync : 05.12.2021

3 files changed, 47 insertions, 57 deletions

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
+}