summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-10-15 10:53:31 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-10-15 10:53:31 +0000
commitd4106f00c1f9c165da867e76189ba5c99f795eb3 (patch)
tree0f3121022b0775a9652abd1d358d362ec89d1f53 /games-action
parentversion bump (diff)
downloadgentoo-2-d4106f00c1f9c165da867e76189ba5c99f795eb3.tar.gz
gentoo-2-d4106f00c1f9c165da867e76189ba5c99f795eb3.tar.bz2
gentoo-2-d4106f00c1f9c165da867e76189ba5c99f795eb3.zip
Respect LDFLAGS. Bug #335136
(Portage version: 2.1.9.14/cvs/Linux i686)
Diffstat (limited to 'games-action')
-rw-r--r--games-action/battalion/ChangeLog7
-rw-r--r--games-action/battalion/battalion-1.4b.ebuild18
2 files changed, 16 insertions, 9 deletions
diff --git a/games-action/battalion/ChangeLog b/games-action/battalion/ChangeLog
index 81c254ed2fd6..fb6a02df3db9 100644
--- a/games-action/battalion/ChangeLog
+++ b/games-action/battalion/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-action/battalion
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/ChangeLog,v 1.10 2007/03/12 13:13:57 genone Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/ChangeLog,v 1.11 2010/10/15 10:53:31 tupone Exp $
+
+ 15 Oct 2010; Tupone Alfredo <tupone@gentoo.org> battalion-1.4b.ebuild:
+ Respect LDFLAGS. Bug #335136 by flameeyes@gentoo.org
12 Mar 2007; Marius Mauch <genone@gentoo.org> battalion-1.4b.ebuild:
Replacing einfo with elog
diff --git a/games-action/battalion/battalion-1.4b.ebuild b/games-action/battalion/battalion-1.4b.ebuild
index 7497786de7b9..51e4d69981e2 100644
--- a/games-action/battalion/battalion-1.4b.ebuild
+++ b/games-action/battalion/battalion-1.4b.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/battalion-1.4b.ebuild,v 1.13 2007/03/13 14:33:58 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/battalion/battalion-1.4b.ebuild,v 1.14 2010/10/15 10:53:31 tupone Exp $
+EAPI=2
inherit games
@@ -13,15 +14,13 @@ SLOT="0"
KEYWORDS="ppc x86"
IUSE=""
-DEPEND="virtual/opengl
+RDEPEND="virtual/opengl
virtual/glu"
+DEPEND="${RDEPEND}"
S=${WORKDIR}/${PN}${PV}
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
+src_prepare() {
# Modify data paths
sed -i \
-e "s:SOUNDS/:${GAMES_DATADIR}/${PN}/SOUNDS/:" \
@@ -38,11 +37,16 @@ src_unpack() {
# Modify Makefile and add CFLAGS
sed -i \
-e "s:-O2:${CFLAGS}:" \
+ -e "/^CC/d" \
Makefile || die "sed Makefile failed"
# Only .raw sound files are used on Linux. The .au files are not needed.
rm -f {SOUNDS,MUSIC}/*.au
}
+src_compile() {
+ emake LIBFLAGS="${LDFLAGS}" || die "died running emake"
+}
+
src_install() {
dogamesbin battalion || die "dogamesbin failed"
insinto "${GAMES_DATADIR}"/${PN}