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
commit3361e968efa942244d5f1b6247f4e83c5fda11a1 (patch)
tree74be25d6fda63d57d3eb32c11bd1a4fa813aac87 /games-action/battalion
parentversion bump (diff)
downloadhistorical-3361e968efa942244d5f1b6247f4e83c5fda11a1.tar.gz
historical-3361e968efa942244d5f1b6247f4e83c5fda11a1.tar.bz2
historical-3361e968efa942244d5f1b6247f4e83c5fda11a1.zip
Respect LDFLAGS. Bug #335136
Package-Manager: portage-2.1.9.14/cvs/Linux i686
Diffstat (limited to 'games-action/battalion')
-rw-r--r--games-action/battalion/ChangeLog7
-rw-r--r--games-action/battalion/Manifest4
-rw-r--r--games-action/battalion/battalion-1.4b.ebuild18
3 files changed, 18 insertions, 11 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/Manifest b/games-action/battalion/Manifest
index 2565f0455116..2cae83b04be1 100644
--- a/games-action/battalion/Manifest
+++ b/games-action/battalion/Manifest
@@ -1,4 +1,4 @@
DIST battalion1.4b.tar.bz2 942342 RMD160 6c389c1c2aeb327d65ab2d739e6edd8b501fb1a4 SHA1 797790431396bf471f4788145410ef4cd114cbc7 SHA256 983db152b44b33396ab242946b51d33c405e0bef8649e2cc9e38d6229d9735f7
-EBUILD battalion-1.4b.ebuild 1756 RMD160 e786713f5d914cd591366664bf6ed727cd99fd48 SHA1 4883d836c4ed2fa53e1581c3d5fe190c0b04ab1d SHA256 7f961f33853e5f0578e944ab0e53f7aa43e84f8e8f2211cb3232ba286b5e8c06
-MISC ChangeLog 1278 RMD160 7449cb148e778226b5e5e57aa8ecd01b09b49487 SHA1 564dd31e0a6da981cc6bab21f9416c6ba2cb6ee1 SHA256 107438ca33ceebb854d74cc7eaaada47d6503053359cd43e6dbf93bdd6178f76
+EBUILD battalion-1.4b.ebuild 1854 RMD160 da50336b781be7c660733a17e527e5cb8a5a33b4 SHA1 b968372d29b6efa8f58a0e7316afcc498b418313 SHA256 f5a382d5b96dec48e72e622a8b69f4de56867aa505001ce4062638326557c8c5
+MISC ChangeLog 1407 RMD160 111be85249e6a74f29240f36e324b97749218b40 SHA1 6ad3dfda5e0833a58ce253dc11e7f2dcda2dad1a SHA256 bfab68f3fd0357f3ee5b7df91878880ad37a3e09962a1fc4dac8cd117721f4af
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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}