diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2021-03-09 09:34:41 +0100 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2021-03-09 09:35:38 +0100 |
commit | b81af92480950d7d5454f5d632f6123e5f97c4af (patch) | |
tree | 0f99bfc621845e51a3b4a0bf55a7b37997c7cd00 /games-arcade | |
parent | dev-python/python-markdown-math: Bump to 0.8 (diff) | |
download | gentoo-b81af92480950d7d5454f5d632f6123e5f97c4af.tar.gz gentoo-b81af92480950d7d5454f5d632f6123e5f97c4af.tar.bz2 gentoo-b81af92480950d7d5454f5d632f6123e5f97c4af.zip |
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@gentoo.org>
Diffstat (limited to 'games-arcade')
-rw-r--r-- | games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild | 33 | ||||
-rw-r--r-- | games-arcade/crack-attack/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 eded2a71ead8..24ca982cd260 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 000000000000..8f405710dae4 --- /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]) |