gentoo resync : 11.05.2021

4 files changed, 61 insertions, 49 deletions

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