gentoo resync : 07.08.2021

3 files changed, 46 insertions, 42 deletions

diff --git a/games-arcade/defendguin/Manifest b/games-arcade/defendguin/Manifest
index fa495ed1b9b1..9dc68b32ff91 100644
--- a/games-arcade/defendguin/Manifest
+++ b/games-arcade/defendguin/Manifest
@@ -1,3 +1,4 @@
 DIST defendguin-0.0.12.tar.gz 2235694 BLAKE2B 4e694edb5a8e51948e343da8ba4555062505c1c7f2563e291cc4f421624b791630dec7b0c7ce08df0ca0db40070418cd67f750fbe525ef1b1d1577951a5224bd SHA512 3a62c7ac62b016eeb6fc63655e8a8c1ac6c5c7cae7eee03c4ab0b9951ba605c7634336d94adb538e94ccbf1d9f927ac530f58da87413a4b1555b2684681e4167
-EBUILD defendguin-0.0.12-r1.ebuild 911 BLAKE2B 537f99b346058fd2c00f0a56dcb069fcfb69b33fd551b2e4dbbf78ecc3fde27f11fa27c494c0337a6b3c5c5ef2ad7dd7bf24ee1846fba92517d84b1de0cc7577 SHA512 0c2de00a424aad305aeaafdcc88b26088d25e4df98d59173074dd9ab928ed1f2ae7c8cfe7c11f33f9f73ed509cdd398a46e4609c6662219c5e2089422016a2e9
+DIST defendguin.png 4444 BLAKE2B 54790605accf524c8fff3b465ace1d09f2a320a66dd4dcf7a216eb74489a02ff029c95aaec32ad31ca4491809ccc8bdf5eecab44c7a6ce7060db96bd01d2c8de SHA512 3adc8db2ea8c3f726b03fdfafba3e79121edb8b3ca70a4006c288ccbebb5d35c104f0095d3812a7c094dc23760bd846902133d5252ae7e186ddf1a114bfb37e7
+EBUILD defendguin-0.0.12-r2.ebuild 977 BLAKE2B 16b4126c97b1ffc196fbaa4942f2071a9e00c511ee042c95a72a566444695f4133f82337e8a5f3852b1c6bfac2041534863cb54a1821f17c46514181f2a24e55 SHA512 2734c468d1481d62bbe595012cc6a54c53d07360a6763d0440f7ecb76c4d7a60501d1a81338fa97187376d3d6b96408ccc31ec2549b7f443153dc97936e3b6a1
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/defendguin/defendguin-0.0.12-r1.ebuild b/games-arcade/defendguin/defendguin-0.0.12-r1.ebuild
deleted file mode 100644
index 574938e18d7b..000000000000
--- a/games-arcade/defendguin/defendguin-0.0.12-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A clone of the arcade game Defender, but with a Linux theme"
-HOMEPAGE="http://www.newbreedsoftware.com/defendguin/"
-SRC_URI="ftp://ftp.tuxpaint.org/unix/x/${PN}/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/sdl-mixer[mod]
-	media-libs/libsdl[video]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:\$(DATA_PREFIX):/usr/share/${PN}/:" \
-		-e '/^CFLAGS=.*-O2/d' \
-		-e '/^CFLAGS=/s:=:+= $(LDFLAGS) :' \
-		Makefile \
-		|| die
-	rm -f data/images/*.sh
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins -r ./data/*
-
-	newicon data/images/ufo/ufo0.bmp ${PN}.bmp
-	make_desktop_entry ${PN} Defendguin /usr/share/pixmaps/${PN}.bmp
-
-	doman src/${PN}.6
-	dodoc docs/{AUTHORS,CHANGES,README,TODO}.txt
-}
diff --git a/games-arcade/defendguin/defendguin-0.0.12-r2.ebuild b/games-arcade/defendguin/defendguin-0.0.12-r2.ebuild
new file mode 100644
index 000000000000..31b4eb2280dc
--- /dev/null
+++ b/games-arcade/defendguin/defendguin-0.0.12-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Clone of the arcade game Defender, but with a Linux theme"
+HOMEPAGE="http://www.newbreedsoftware.com/defendguin/"
+SRC_URI="
+	ftp://ftp.tuxpaint.org/unix/x/defendguin/src/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	media-libs/libsdl[joystick,sound,video]
+	media-libs/sdl-mixer[mod]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	tc-export CC
+	sed	-e "s|\$(DATA_PREFIX)|${EPREFIX}/usr/share/${PN}/|" \
+		-e '/^CFLAGS=.*-O2/d' \
+		-e '/^CFLAGS=/s|=|+= $(CPPFLAGS) $(LDFLAGS) |' \
+		-i Makefile || die
+	rm data/images/l2r.sh || die
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r data/.
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+
+	doman src/${PN}.6
+	dodoc docs/{AUTHORS,CHANGES,README,TODO}.txt
+}