From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1259119-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B96EF1382C5
for <garchives@archives.gentoo.org>; Tue, 9 Mar 2021 08:35:44 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D3C74E0844;
Tue, 9 Mar 2021 08:35:43 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B9967E0844
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Mar 2021 08:35:43 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6BBDB34096C
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Mar 2021 08:35:42 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4119356F
for <gentoo-commits@lists.gentoo.org>; Tue, 9 Mar 2021 08:35:40 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1615278938.b81af92480950d7d5454f5d632f6123e5f97c4af.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/crack-attack/files/, games-arcade/crack-attack/
X-VCS-Repository: repo/gentoo
X-VCS-Files: games-arcade/crack-attack/crack-attack-1.1.14-r2.ebuild games-arcade/crack-attack/files/crack-attack-1.1.14-avoid_bashisms.patch
X-VCS-Directories: games-arcade/crack-attack/ games-arcade/crack-attack/files/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: b81af92480950d7d5454f5d632f6123e5f97c4af
X-VCS-Branch: master
Date: Tue, 9 Mar 2021 08:35:40 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b1b71e9a-d874-442b-aa76-666175287171
X-Archives-Hash: c0a0466742f04447add2c683769fff42
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])