[gentoo-commits] repo/gentoo:master commit in: games-puzzle/mures/, games-puzzle/mures/files/

[gentoo-commits] repo/gentoo:master commit in: games-puzzle/mures/, games-puzzle/mures/files/

[David Seifert]

commit:     4bfbc17aa9f30796e3c905e4111ffb86d0e4726c
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 19:59:19 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 19:59:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bfbc17a

games-puzzle/mures: [QA] Run AM_PROG_AR

Closes: https://bugs.gentoo.org/724560
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 games-puzzle/mures/files/mures-0.5-underlink.patch | 14 ++++++++++++--
 games-puzzle/mures/mures-0.5-r1.ebuild             | 21 +++++++++++++--------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/games-puzzle/mures/files/mures-0.5-underlink.patch b/games-puzzle/mures/files/mures-0.5-underlink.patch
index 3acf0b0f723..614a2880cf3 100644
--- a/games-puzzle/mures/files/mures-0.5-underlink.patch
+++ b/games-puzzle/mures/files/mures-0.5-underlink.patch
@@ -1,5 +1,15 @@
---- a/src/Makefile.am.old	2011-06-21 14:39:14.404333493 +0200
-+++ b/src/Makefile.am	2011-06-21 14:39:30.538340283 +0200
+--- a/configure.in
++++ b/configure.in
+@@ -7,6 +7,7 @@
+ AC_PROG_MAKE_SET
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_PROG_INSTALL
+ 
+ dnl Checks for libraries.
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -1,8 +1,8 @@
  bin_PROGRAMS = mures
  

diff --git a/games-puzzle/mures/mures-0.5-r1.ebuild b/games-puzzle/mures/mures-0.5-r1.ebuild
index 36b51630c7e..dcc81b4134a 100644
--- a/games-puzzle/mures/mures-0.5-r1.ebuild
+++ b/games-puzzle/mures/mures-0.5-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit autotools desktop
 
 DESCRIPTION="A clone of Sega's Chu Chu Rocket"
@@ -13,12 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="opengl"
 
-DEPEND="media-libs/libsdl
+DEPEND="
+	media-libs/libsdl
 	media-libs/sdl-image
 	media-libs/sdl-net
 	media-libs/sdl-ttf
-	opengl? ( virtual/opengl )
-"
+	opengl? ( virtual/opengl )"
 RDEPEND="${DEPEND}"
 
 dir="/usr/share/${PN}"
@@ -41,10 +42,10 @@ src_prepare() {
 
 	eapply "${FILESDIR}"/${P}-underlink.patch
 
-	mv configure.in configure.ac
+	mv configure.{in,ac} || die
 	eautoreconf
 
-	cd src
+	cd src || die
 
 	# Save to HOME
 	eapply "${FILESDIR}"/${P}-save.patch
@@ -81,10 +82,14 @@ src_prepare() {
 src_install() {
 	# Remove makefiles before installation
 	rm -f src/*/Makefile* src/*/*/Makefile* || die "removing makefiles"
+
+	dobin src/mures
+
 	insinto "${dir}"
 	doins -r src/{gui,images,sounds,textures,maps,*.lua}
+
 	einstalldocs
-	dobin src/mures
+
 	newicon src/images/cat_right.png ${PN}.png
 	make_desktop_entry ${PN} "Mures"
 }