gentoo resync : 11.05.2021

4 files changed, 69 insertions, 37 deletions

diff --git a/games-arcade/afternoonstalker/Manifest b/games-arcade/afternoonstalker/Manifest
index a7b64a25f92b..25d2eaa7202a 100644
--- a/games-arcade/afternoonstalker/Manifest
+++ b/games-arcade/afternoonstalker/Manifest
@@ -1,3 +1,4 @@
-DIST afternoonstalker-1.1.5.tar.gz 202663 BLAKE2B 1572e5fa2b7ac0c9e24897cd8e31333c1a1819fc36576a3410cbb2ab6676ee505182dc71dd97e65ccaaff8218c470065bdc942a380aafb506f4c0032d4325df4 SHA512 ff08cc72385deddfaffabf98c3cc67f72f8c6db77de1feb4e19d2d3dcf6ca1018a71d6e052d2e2373dc758e119a4c068a3f4195cb6fbf1b01900bdedf193a7e0
-EBUILD afternoonstalker-1.1.5-r1.ebuild 804 BLAKE2B b53d2c845ac083d6d4f87979f3902830d82995cf24265a9ae284f344d203cb2c06859112d92c16a2b9bf534009a0af44248cef2f45e86813dd36298c3cd83e24 SHA512 305584e81a9614946f7a8d95f5382eb7a79b3bafbf35ebf13bc7cd8bed93fed8ac5e228a02d0296942095fa8af01933a48200484d9da1b1cdd25c0a0d00b60d6
+AUX afternoonstalker-1.1.6-autotools.patch 832 BLAKE2B a7c6d0be4457117ab00c032b67c616481a116c9f8cef6c216d6172388d4585c2c312a10dd7266f6b0e10b87f7f931629a599c6765eada5a092513875fb8ca605 SHA512 a6b52df0499fd3ce4c1cf5fadefbb27f0e036acae24f3e47bcd6fb46439541fddde3e3e6008221db0d61e68d748a1ab74cae16b12938aead95e74d316d780969
+DIST afternoonstalker-1.1.6.tar.gz 186724 BLAKE2B 2915e1ff11f0cdf392a94d515541c25082afbe62547c90a49cdc39ab01bc234ac8098394905a0d1ce3d3a550b5c5096fd64f76db2d8d62b510822a0a59ae8cf6 SHA512 4d823abc5f939bc6322729548abb0adc43b56b5d5e035578f15084f4e8f6ce80bd7b7dc3ffbe71530975b7c02962ea93405e2ad13de8a50303ccfdde543cd6c7
+EBUILD afternoonstalker-1.1.6.ebuild 570 BLAKE2B cf4249b850aeb61a51c96a12c55881aa374fc22e72cc33cf823b803052a49a783297bdfc33036cf77965d5466d71e334d2a78dfd404a86fd916dad935fe40e19 SHA512 22806d27f270fbec79bc566d5ab270fef0e78b2cbe2105556c701517e3f9097d604bcf0db519016a9c61ac375667ddf41dd55a3935ab6cc6ac9ed63642189816
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/afternoonstalker/afternoonstalker-1.1.5-r1.ebuild b/games-arcade/afternoonstalker/afternoonstalker-1.1.5-r1.ebuild
deleted file mode 100644
index acc061abc505..000000000000
--- a/games-arcade/afternoonstalker/afternoonstalker-1.1.5-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools
-
-DESCRIPTION="Clone of the 1981 Night Stalker video game by Mattel Electronics"
-HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/afternoonstalker.html"
-SRC_URI="https://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-games/flatzebra-0.1.6"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/^pkgsounddir/ s:sounds.*:\$(PACKAGE)/sounds:" \
-		-e "/^desktopentrydir/ s:=.*:=/usr/share/applications:" \
-		-e "/^pixmapdir/ s:=.*:=/usr/share/pixmaps:" \
-		src/Makefile.am || die
-	eautoreconf
-}
-
-src_install() {
-	emake -C src DESTDIR="${D}" install
-	doman doc/${PN}.6
-	einstalldocs
-}
diff --git a/games-arcade/afternoonstalker/afternoonstalker-1.1.6.ebuild b/games-arcade/afternoonstalker/afternoonstalker-1.1.6.ebuild
new file mode 100644
index 000000000000..8968417bb1e6
--- /dev/null
+++ b/games-arcade/afternoonstalker/afternoonstalker-1.1.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Clone of the 1981 Night Stalker video game by Mattel Electronics"
+HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/afternoonstalker.html"
+SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-games/flatzebra-0.1.6"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1.6-autotools.patch )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/games-arcade/afternoonstalker/files/afternoonstalker-1.1.6-autotools.patch b/games-arcade/afternoonstalker/files/afternoonstalker-1.1.6-autotools.patch
new file mode 100644
index 000000000000..a7c5bc9fe590
--- /dev/null
+++ b/games-arcade/afternoonstalker/files/afternoonstalker-1.1.6-autotools.patch
@@ -0,0 +1,41 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,17 +2,16 @@
+ 
+ SUBDIRS = src
+ 
+-man_MANS = doc/$(PACKAGE).6
++man_MANS = doc/afternoonstalker.6
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+ doc_DATA = \
+ 	AUTHORS \
+-	COPYING \
+ 	NEWS \
+ 	README \
+ 	THANKS
+ 
+ EXTRA_DIST = \
++	COPYING \
+ 	bootstrap \
+ 	autogen.sh \
+ 	$(PACKAGE).spec \
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -114,13 +114,13 @@
+ 	images/digit8.xpm \
+ 	images/digit9.xpm
+ 
+-desktopentrydir = $(datadir)/applications
++desktopentrydir = $(datarootdir)/applications
+ desktopentry_DATA = $(PACKAGE).desktop
+ 
+-pixmapdir = $(datadir)/pixmaps
++pixmapdir = $(datarootdir)/pixmaps
+ pixmap_DATA = images/$(PACKAGE).png
+ 
+-pkgsounddir = $(datadir)/sounds/$(PACKAGE)
++pkgsounddir = $(pkgdatadir)/sounds
+ pkgsound_DATA = \
+ 	sounds/gun-pickup.wav \
+ 	sounds/bat-killed.wav \