gentoo resync : 25.08.2020

3 files changed, 54 insertions, 23 deletions

diff --git a/games-action/maelstrom/Manifest b/games-action/maelstrom/Manifest
index 102a38a24585..c7c99e1f3afd 100644
--- a/games-action/maelstrom/Manifest
+++ b/games-action/maelstrom/Manifest
@@ -1,8 +1,9 @@
 AUX maelstrom-3.0.6-64bits.patch 499 BLAKE2B fd74e9af6a9c5937ceef5c95ee865a133a5cd6eaa3864437fcd6f8b1db1bd8934861ec11c802dbb19875e81583b7f0e53db857071de209275c66793df1b00d22 SHA512 b75c094aa91ff443bed86b34ebb52a19221cdc69fd2745a714f1d7728dddd9886c8874054dff7a02513cff7a67cb6c115d7a2757401dd5bcaa96a52537f530a1
+AUX maelstrom-3.0.6-autotools.patch 787 BLAKE2B 069a5d2f656ee37040e9d2764043f89da23ef2c927f11c70ca1e726b96750b048bb5a94023045c82d53a71398719f75beb6520dbe89b16f2c62e679eb472ebed SHA512 75c1f8356e3ba50ea88051c1d4f33259c37cd512e83cffaf992e5a4875b53e02e6c044f0b803abd486df450186a0f94421b7f23749f2622ce634bf3850dfc2f0
 AUX maelstrom-3.0.6-gcc34.patch 878 BLAKE2B 6b260e8214f2a9b20f32ab3fde9950b2a115c9f6ca81bb1de7d7ea045c40a6c5b54694b034f554e6e060497b6d13495d822a410b7201244b5e1ce429cffbd885 SHA512 5427e198d6a595f9d68357d0ad31b8d1d7c6bc8db7dde261269a660d8e6102d83d592128e1e2f1c82285e764808f166798cb4a9121d88a8ec7c047efa6d856d6
 AUX maelstrom-3.0.6-gcc53.patch 537 BLAKE2B e5b0d5fe7cfdab51633988b93f592acc450b90e3732f035dc5b31a77b3319ab6f54d490eb992cb4d543e04489866ce2f068a24a4860980f4be474a5b04adc43b SHA512 cfd30e1474a084a1c45831b3d7c3f2a22ca6920e84838c4ff7615f179d377713d181f6d2bca3e660ee58ba2a62378838dec52cdb24fd896efecc40ff43a9c459
 AUX maelstrom-3.0.6-security.patch 14189 BLAKE2B 54af3ec92a0b8d3d7fdfa865114e65ab4ee3667cbdfedcd1d4cad6394273619a9d3cb7448dfa0e92f5a017d8778087e9be76e4615557cd59f20118b5c7c8f11b SHA512 7e8c6c5c7244fa8871fe55b95e9d2a8c631735590dba04e9e2dfed62e2dfc6264f1b990f3737d797c7762fbceda17474782b1720f944d444bdb8627b43188cb3
 AUX maelstrom-3.0.6-warnings.patch 438 BLAKE2B 8075ff8a90660e70837c48fa44d10cc0e284e3e51832d689dc87baa6b9aa19c9490c405bbd837aeb6d15988508402cb2a21a209723ff146f5bd5e9c0ca38fba2 SHA512 5310843f4a126acf62686aaa9d2086a85a313258fbc0b35b27a8bf7a24389a70264691454a018252d1997bc70093dbaf80c44282c3c59ba39d8cfaa7018866f7
 DIST Maelstrom-3.0.6.tar.gz 1007421 BLAKE2B 652aff33fa683307632ca1be35701c6cce62536845c459d9a06636871da504b2878ef0853d232ccbe854d8d541b97d91accdecc25f34ca17ef4bc9fcf516ea02 SHA512 fecd2411f5d2109aa99e5a6c65702c74f9f79326fc9f074a53005238c846780f231776b9c170ceb54b0470894b856abaa4708c59afd912fa5b2868e6776893ca
-EBUILD maelstrom-3.0.6-r3.ebuild 1919 BLAKE2B 36e8cedd88949036cc4ab643611a706f6fe990175cc3e0dedc31f32feb132526435d42f21cad9c7a8b9d9011e52eff8599cefef615594b19f3e9da6c67d59027 SHA512 6a5080ce35e0ce184269e4328649e898d054ff8350c9fb41345e07e057ebf9e509e702309c003c14b5ee9a852e92b1f3d3d3e0980b64d1e544bd8e8fa30bba10
+EBUILD maelstrom-3.0.6-r3.ebuild 1660 BLAKE2B 354c7aa7c3cbd6814ff0726242a68560ab589a6515a011cbb8fdbcb53b6b54f037f922364d6bf0acb679f93195e58e0ccf4029484693bd7adcf567ee9164a070 SHA512 47b71dfd92c99aed28de8cf6747129ffbe88a055e17343211b0537771dfae8e1da315696f44fb67dcd379b8510fe5081453f70f25038fc27c737ca559dcd7397
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-action/maelstrom/files/maelstrom-3.0.6-autotools.patch b/games-action/maelstrom/files/maelstrom-3.0.6-autotools.patch
new file mode 100644
index 000000000000..256578494857
--- /dev/null
+++ b/games-action/maelstrom/files/maelstrom-3.0.6-autotools.patch
@@ -0,0 +1,34 @@
+--- a/configure.in
++++ b/configure.in
+@@ -13,6 +13,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_CC
+ AC_PROG_CXX
++AM_PROG_AR
+ AC_PROG_RANLIB
+ AC_PROG_INSTALL
+ 
+@@ -102,10 +103,10 @@
+         ;;
+     *-*-beos*)
+         ac_default_prefix=/boot/beos
+-        GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE"
++        GAME_INSTALLDIR="\$(datadir)/$PACKAGE"
+         ;;
+     *)
+-        GAME_INSTALLDIR="\$(prefix)/games/$PACKAGE"
++        GAME_INSTALLDIR="\$(datadir)/$PACKAGE"
+         ;;
+ esac
+ AC_SUBST(GAME_INSTALLDIR)
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -65,7 +65,7 @@
+ 
+ # Special install rule for the game
+ install:
+-	make install_gamedata target=@GAME_INSTALLDIR@
++	$(MAKE) install-binPROGRAMS install_gamedata target=$(DESTDIR)/@GAME_INSTALLDIR@
+ 
+ install_gamedata:
+ 	sh mkinstalldirs $(target)/
diff --git a/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild b/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild
index db33e84ab966..50639f25c725 100644
--- a/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild
+++ b/games-action/maelstrom/maelstrom-3.0.6-r3.ebuild
@@ -1,25 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils
+EAPI=7
+
+inherit autotools desktop
 
-MY_P=Maelstrom-${PV}
 DESCRIPTION="An asteroids battle game"
 HOMEPAGE="http://www.libsdl.org/projects/Maelstrom/"
-SRC_URI="http://www.libsdl.org/projects/Maelstrom/src/${MY_P}.tar.gz"
+SRC_URI="http://www.libsdl.org/projects/Maelstrom/src/${P^}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~x86"
-SLOT="0"
 LICENSE="GPL-2"
-IUSE=""
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86"
 
-DEPEND="acct-group/gamestat
+DEPEND="
+	acct-group/gamestat
 	media-libs/libsdl[sound,joystick,video]
 	media-libs/sdl-net"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${P^}"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-security.patch
@@ -27,21 +27,17 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc34.patch
 	"${FILESDIR}"/${P}-warnings.patch
 	"${FILESDIR}"/${P}-gcc53.patch
+	"${FILESDIR}"/${P}-autotools.patch
 )
 
 src_prepare() {
 	default
 
-	# Install the data into $(datadir)/..., not $(prefix)/games/...
-	sed -i \
-		-e "s:(prefix)/games/:(datadir)/:" configure.in || die
-	sed -i \
-		-e '/make install_gamedata/ { s:=:=$(DESTDIR)/:; s/make/$(MAKE)/; s/install_gamedata/install-binPROGRAMS install_gamedata/; }' Makefile.am || die
 	# Install the high scores file in ${GAMES_STATEDIR}
 	sed -i \
 		-e "s:path.Path(MAELSTROM_SCORES):\"/var/games/\"MAELSTROM_SCORES:" scores.cpp || die
-	mv configure.{in,ac}
-	rm aclocal.m4 acinclude.m4
+	mv configure.{in,ac} || die
+	rm aclocal.m4 acinclude.m4 || die
 	eautoreconf
 }
 
@@ -49,17 +45,17 @@ src_install() {
 	default
 	dodoc Changelog Docs/{Maelstrom-Announce,*FAQ,MaelstromGPL_press_release,*.Paper,Technical_Notes*}
 
-	newicon "${D}/usr/share/Maelstrom/icon.xpm" maelstrom.xpm
+	newicon "${ED}"/usr/share/Maelstrom/icon.xpm maelstrom.xpm
 	make_desktop_entry Maelstrom "Maelstrom" maelstrom
 
 	# Put the high scores file in the right place
 	insinto /var/games
-	doins "${D}/usr/share/Maelstrom/Maelstrom-Scores"
+	doins "${ED}"/usr/share/Maelstrom/Maelstrom-Scores
 
 	# clean up some cruft
-	rm -f \
-		"${D}/usr/share/Maelstrom/Maelstrom-Scores" \
-		"${D}/usr/share/Maelstrom/Images/Makefile*"
+	rm \
+		"${ED}"/usr/share/Maelstrom/Maelstrom-Scores \
+		"${ED}"/usr/share/Maelstrom/Images/Makefile* || die
 
 	# make sure we can update the high scores
 	fowners root:gamestat /var/games/Maelstrom-Scores /usr/bin/Maelstrom{,-netd}