gentoo resync : 11.05.2021

11 files changed, 140 insertions, 88 deletions

diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 60e035d26d0c..a8f1850ec652 100644
--- a/games-arcade/Manifest.gz
+++ b/games-arcade/Manifest.gz
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 \
diff --git a/games-arcade/batrachians/Manifest b/games-arcade/batrachians/Manifest
index 673eb7069092..9a2c577c5ce3 100644
--- a/games-arcade/batrachians/Manifest
+++ b/games-arcade/batrachians/Manifest
@@ -1,4 +1,4 @@
-AUX batrachians-0.1.6-makefile.patch 1083 BLAKE2B 9660401bf833700f353a1ab8ee065d94c585c2ee8ad3ac04318f7d81a17a367c0f81e540fa4e442b75c368d79bb49758795e51507a98f4cb06a087d019d3608b SHA512 9fb3d84f864b7cad0ace0e288969871824cae110f879ba8fe512969c7b1aef370c375bde57caedf5bf2bc7e5f00a9f2819fdc7de6d710c989bb474382a84e77a
-DIST batrachians-0.1.6.tar.gz 198088 BLAKE2B 446e2fd77068dc8c58e801fca6544ea825529240a79e1b14fac6962d26d78f6f4e977f6965751ba5d09ea790679dfa820e5cdb1ed667bd0af46f8c89180a38bf SHA512 d3022712627061f9828e1f3baa7207053884f1f4c0348768d4ac073673ff1bcf14c95cedf01031b8bd36a6b684bf239af0f381df41aa18d49218320a8bea3b68
-EBUILD batrachians-0.1.6-r1.ebuild 659 BLAKE2B e87b703a9b2af333c79f77530cb84ce15e39cc2d1a9ed304c0f3750cb06dc46aea8744cf14a68cd81d1b32b0933061b0d0b70ef30f4ce125cae7b87c7a66a8ec SHA512 a75ec6d41cd8881ccfb3f894681d00ea1a7c35930404905b818e20e1eea9af745197018067c66f7b6f5c58c008a7ce8b017087bc4055ff18b2ed1d62c749fcc9
+AUX batrachians-0.1.7-autotools.patch 1015 BLAKE2B 55a9cfe17b7c2b6ecc9db7f96c490db7a09f783e9b4af46f3c968e13626aa651c915e562622fb3953822d13393c0320c0a82e1ad445f06323349e94631cdb7dd SHA512 de6e90dda783f4d20d4043b6ff35d37666162ed3ffbe18e46404bdef195f8305ccedc15bde0b37d3cec68d4fbad95595739679bca6d8db6a48e903221146d49c
+DIST batrachians-0.1.7.tar.gz 206981 BLAKE2B 871fb7e22fb17fdfb0fd32d14a36cf63043e46de5bdabc83594d3d3eb43f616ec703d220ad9cf56e505c31025e76582e52b3a816d932f9fca22a6f070ed3198e SHA512 01c49cf02e3894d43948ba2656713fdd1662f3441c1dfe41b2fc3dc27fc5c4c95ac377a946d647c1c59e201a63d0659bc6fc2bd50132eb2f2b393ed64167e781
+EBUILD batrachians-0.1.7.ebuild 598 BLAKE2B 2fc649fc649c393296eaf2242038ebc6298de7cc9f86a301a657d45219f13c544cb690e280084ca8e6ca6780d106857c83a0a57d37645452981a777f242b9a50 SHA512 04edbc840f3ebf789e2262c222ed5768a1df76baf14d726d8b1774d5394062bb66730daa1a5f11de0cac297b7015bc4e5b5199be7f3f9cb33f514170961d09d2
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild b/games-arcade/batrachians/batrachians-0.1.7.ebuild
index 3f26d0405bfe..059c43550bc8 100644
--- a/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild
+++ b/games-arcade/batrachians/batrachians-0.1.7.ebuild
@@ -3,12 +3,11 @@
 
 EAPI=7
 
-GNOME2_EAUTORECONF="yes"
-inherit gnome2
+inherit autotools xdg
 
 DESCRIPTION="A fly-eating frog video game"
-HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/batrachians.html"
-SRC_URI="https://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
+HOMEPAGE="http://perso.b2b2c.ca/~sarrazip/dev/batrachians.html"
+SRC_URI="http://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -18,15 +17,13 @@ RDEPEND="
 	>=dev-games/flatzebra-0.1.5
 	media-libs/libsdl
 	media-libs/sdl-image
-	media-libs/sdl-mixer
-"
+	media-libs/sdl-mixer"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
+PATCHES=( "${FILESDIR}"/${PN}-0.1.7-autotools.patch )
 
-src_install() {
-	emake -C src DESTDIR="${D}" install
-	doman doc/${PN}.6
-	einstalldocs
+src_prepare() {
+	default
+	eautoreconf
 }
diff --git a/games-arcade/batrachians/files/batrachians-0.1.6-makefile.patch b/games-arcade/batrachians/files/batrachians-0.1.6-makefile.patch
deleted file mode 100644
index f01fdfb0da8d..000000000000
--- a/games-arcade/batrachians/files/batrachians-0.1.6-makefile.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ru batrachians-0.1.6.orig/src/Makefile.am batrachians-0.1.6/src/Makefile.am
---- batrachians-0.1.6.orig/src/Makefile.am	2011-04-18 21:25:53.000000000 -0400
-+++ batrachians-0.1.6/src/Makefile.am	2014-10-27 23:19:58.292260669 -0400
-@@ -20,7 +20,7 @@
- 	-DPACKAGE_FULL_NAME_EN=\"$(PACKAGE_FULL_NAME_EN)\" \
- 	-DPKGSOUNDDIR=\"$(pkgsounddir)\"
- 
--pkgsounddir = $(datadir)/sounds/$(PACKAGE)
-+pkgsounddir = $(datadir)/$(PACKAGE)/sounds
- pkgsound_DATA = \
- 	sounds/game-starts.wav \
- 	sounds/game-ends.wav \
-@@ -29,18 +29,18 @@
- 	sounds/frog-jumps.wav \
- 	sounds/tongue-out.wav
- 
--desktopentrydir = $(datadir)/applications
-+desktopentrydir =/usr/share/applications
- desktopentry_DATA = $(PACKAGE).desktop
- 
--pixmapdir = $(datadir)/pixmaps
-+pixmapdir =/usr/share/icons/hicolor/48x48/apps/
- pixmap_DATA = images/$(PACKAGE).png
- 
- 
- check: all
- if HAVE_GETOPT_LONG
- 	test "`./$(PACKAGE) --version`" = "$(PACKAGE) $(VERSION)"
--	./$(PACKAGE) --version >& /dev/null
--	./$(PACKAGE) --help >& /dev/null
-+	./$(PACKAGE) --version > /dev/null 2>&1
-+	./$(PACKAGE) --help > /dev/null 2>&1
- endif
- 
- 
diff --git a/games-arcade/batrachians/files/batrachians-0.1.7-autotools.patch b/games-arcade/batrachians/files/batrachians-0.1.7-autotools.patch
new file mode 100644
index 000000000000..bc05a7f267c2
--- /dev/null
+++ b/games-arcade/batrachians/files/batrachians-0.1.7-autotools.patch
@@ -0,0 +1,50 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,21 +2,20 @@
+ 
+ SUBDIRS = src
+ 
+-man_MANS = doc/$(PACKAGE).6
++man_MANS = doc/batrachians.6
+ 
+ RPMBUILD = rpmbuild
+ rpm: dist
+ 	$(RPMBUILD) -ta $(distdir).tar.gz
+ 
+-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
+@@ -20,7 +20,7 @@
+ 	-DPACKAGE_FULL_NAME_EN=\"$(PACKAGE_FULL_NAME_EN)\" \
+ 	-DPKGSOUNDDIR=\"$(pkgsounddir)\"
+ 
+-pkgsounddir = $(datadir)/sounds/$(PACKAGE)
++pkgsounddir = $(pkgdatadir)/sounds
+ pkgsound_DATA = \
+ 	sounds/game-starts.wav \
+ 	sounds/game-ends.wav \
+@@ -29,10 +29,10 @@
+ 	sounds/frog-jumps.wav \
+ 	sounds/tongue-out.wav
+ 
+-desktopentrydir = $(datadir)/applications
++desktopentrydir = $(datarootdir)/applications
+ desktopentry_DATA = $(PACKAGE).desktop
+ 
+-pixmapdir = $(datadir)/pixmaps
++pixmapdir = $(datarootdir)/pixmaps
+ pixmap_DATA = images/$(PACKAGE).png
+ 
+ 
diff --git a/games-arcade/berusky/Manifest b/games-arcade/berusky/Manifest
index 8ad0358f85bf..5d07d49f054e 100644
--- a/games-arcade/berusky/Manifest
+++ b/games-arcade/berusky/Manifest
@@ -2,5 +2,5 @@ AUX berusky-1.7.1-r2-gentoo.patch 1162 BLAKE2B 86c6baa7ea3355e1681c044ed167a378d
 DIST berusky-1.7.1.tar.gz 483794 BLAKE2B 8e1d6f6c2c47d72fdba73506f8d3ea231649b4eb4fae3e663e9111ed99fbf300b2a160573d54781f9dcb3f9bf62bcb57634d0b3e8abb77f8baffc70254b4640e SHA512 0b0c4d736bfd9b0b62accf11d932271e355cbcbf911e35adb0ccd0bb1b45e06c392d60830bddef04a24689ccfcee7302f2653f6357474ccceba4fd66c44d4383
 DIST berusky-data-1.7.tar.gz 5366663 BLAKE2B 88dbb0063be83b2cc60208e9e5d95ee3014ad381ba1a070d5e781b527324d9d1d4d8a8a56da64e76672995e09f9b57630cd7ba282e2da543dbc6773628362403 SHA512 1ccae352b8033df0dd8fe6f09b1daa83b0e25a67999d41a0f21019014620825551a4e22827f96bc28ccdf0958df85c9f3cfd2e8f1e83dd7edac5b0479413d438
 DIST berusky.png 1714 BLAKE2B 31c8c9c820fa030c5329c3a990bd2430797794e460c22301bb8f7f9577a4d5cfaae23e1ba0640389ffea7dad0146afd5d20ff2ca0fa3d65085207af1a0f625df SHA512 a8a5f7f8dca8d686bc05239adda10673e937361514b1aea07dc9fe66f2e009ae7c20b75ab63fd4db8ed206026a009d8620af3471bbb966b5e9b576ce89f66e54
-EBUILD berusky-1.7.1-r2.ebuild 1013 BLAKE2B 92b832c49f574e329bdb4ea8fcc181bc835f04d9e78738a2a25763aa499772ab4fd61d9f8c7fd7d7309a351eaea166561fcf7a0b36934806fb100febde151eba SHA512 2b288d03aae575579900ec5e59928c4bcf0d92b5b021036fcada7294a38a797cf53a3842b09412c351fd47fa22fafaf7834475536cda896b479e93a46f1c3572
+EBUILD berusky-1.7.1-r2.ebuild 1160 BLAKE2B e27c93e213ebbf1ae583ea7bc732be7d316c39a39881fe0ef2c1acfae30fee21cccadffccdcefe9a0e40061e51b1fbe7a866bebd91b1005c2d49483fe5805403 SHA512 c7029b794ff7256ce4a2b9e1e173a626c5c5e5307ad412e9f78f7278b31123b05fe8a333005ad288006ea02f57c12430088d2460b2b02c064376e5d076746948
 MISC metadata.xml 763 BLAKE2B 8aca8e43b681e917a1746a8e8932dee1aeaf0485f32a5e253874c28765b85e90c7a13c722d1c959a12ab5a419936df968f6e5d99fe54d6c4b432a8ae09441f4b SHA512 07baeac7dc22893b3e6bdf8c7ab687ba05ea622bd044e92d364d32358b2961bced3ea1263fb3434cb4ca386d9f90818834a5a3bc8d016cdc69a06e248d694ee1
diff --git a/games-arcade/berusky/berusky-1.7.1-r2.ebuild b/games-arcade/berusky/berusky-1.7.1-r2.ebuild
index c14feec00747..65f429dfe17f 100644
--- a/games-arcade/berusky/berusky-1.7.1-r2.ebuild
+++ b/games-arcade/berusky/berusky-1.7.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop gnome2
+inherit desktop flag-o-matic gnome2
 
 DATAFILE="${PN}-data-1.7"
 DESCRIPTION="Free logic game based on an ancient puzzle named Sokoban"
@@ -34,6 +34,14 @@ src_prepare() {
 	default
 }
 
+src_configure() {
+	# https://bugs.gentoo.org/787287
+	# clashes with C++17's "std::byte" type
+	append-cxxflags -std=c++14
+
+	default
+}
+
 src_install() {
 	gnome2_src_install