[gentoo-commits] repo/gentoo:master commit in: games-arcade/crack-attack/files/, games-arcade/crack-attack/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/crack-attack/files/, games-arcade/crack-attack/

[Lars Wendler]

commit:     b81af92480950d7d5454f5d632f6123e5f97c4af
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Mar  9 08:34:41 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Mar  9 08:35:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b81af924

games-arcade/crack-attack: EAPI-7 bump. Avoid bashisms.

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 .../crack-attack/crack-attack-1.1.14-r2.ebuild     | 33 ++++++++++++++--------
 .../files/crack-attack-1.1.14-avoid_bashisms.patch | 15 ++++++++++
 2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
index eded2a71ead..24ca982cd26 100644
--- a/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
+++ b/games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+inherit autotools desktop
 
 DESCRIPTION="Addictive OpenGL-based block game"
 HOMEPAGE="http://www.nongnu.org/crack-attack/"
@@ -15,28 +15,37 @@ IUSE="gtk sdl"
 
 RDEPEND="
 	media-libs/freeglut
-	sdl? ( media-libs/libsdl
-		media-libs/sdl-mixer )
+	sdl? (
+		media-libs/libsdl
+		media-libs/sdl-mixer
+	)
 	gtk? ( >=x11-libs/gtk+-2.6:2 )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-glut.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+	"${FILESDIR}"/${P}-avoid_bashisms.patch
+)
+
 src_prepare() {
 	default
-	eapply \
-		"${FILESDIR}"/${P}-glut.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
+	eautoreconf
 	sed -i 's/-lXmu//' src/gtk-gui/Makefile.in src/Makefile.in || die
 	touch -r . * */*
 }
 
 src_configure() {
-	econf \
-		--disable-binreloc \
-		$(use_enable sdl sound) \
+	local myeconfargs=(
+		--disable-binreloc
+		$(use_enable sdl sound)
 		$(use_enable gtk)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {

diff --git a/games-arcade/crack-attack/files/crack-attack-1.1.14-avoid_bashisms.patch b/games-arcade/crack-attack/files/crack-attack-1.1.14-avoid_bashisms.patch
new file mode 100644
index 00000000000..8f405710dae
--- /dev/null
+++ b/games-arcade/crack-attack/files/crack-attack-1.1.14-avoid_bashisms.patch
@@ -0,0 +1,15 @@
+--- crack-attack-1.1.14/configure.ac
++++ crack-attack-1.1.14/configure.ac
+@@ -75,10 +75,10 @@
+     ],[found_sound=no]
+   )
+ 
+-  if test "$enable_sound" == "yes" -a "$found_sound" == "no"; then
++  if test "$enable_sound" = "yes" -a "$found_sound" = "no"; then
+     AC_MSG_ERROR(libSDL and SDL_mixer are required for sound)
+   fi
+-  if test "$found_sound" == "yes"; then
++  if test "$found_sound" = "yes"; then
+     AUDIO_CFLAGS="$SDL_CFLAGS"
+     AUDIO_LIBS="$SDL_LIBS -lSDL_mixer"
+     AC_DEFINE(AUDIO_ENABLED, 1, [Has audio support])