summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2010-10-12 13:16:59 +0000
committerAlfredo Tupone <tupone@gentoo.org>2010-10-12 13:16:59 +0000
commit8e9ccd59586baaa6b9d277d2d39b8d2e2334d6b7 (patch)
treeae791418c67161a1a09c8d416f434e1e28b69f70 /games-arcade
parentAdd ~sparc wrt #338861 (diff)
downloadgentoo-2-8e9ccd59586baaa6b9d277d2d39b8d2e2334d6b7.tar.gz
gentoo-2-8e9ccd59586baaa6b9d277d2d39b8d2e2334d6b7.tar.bz2
gentoo-2-8e9ccd59586baaa6b9d277d2d39b8d2e2334d6b7.zip
Respect LDFLAGS. Bug #335697
(Portage version: 2.1.9.14/cvs/Linux i686)
Diffstat (limited to 'games-arcade')
-rw-r--r--games-arcade/gav/ChangeLog8
-rw-r--r--games-arcade/gav/files/gav-0.9.0-ldflags.patch26
-rw-r--r--games-arcade/gav/gav-0.9.0.ebuild24
3 files changed, 42 insertions, 16 deletions
diff --git a/games-arcade/gav/ChangeLog b/games-arcade/gav/ChangeLog
index 4d6a9a438ade..1a3dd40973c6 100644
--- a/games-arcade/gav/ChangeLog
+++ b/games-arcade/gav/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-arcade/gav
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/gav/ChangeLog,v 1.14 2008/04/30 22:01:06 nyhm Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gav/ChangeLog,v 1.15 2010/10/12 13:16:59 tupone Exp $
+
+ 12 Oct 2010; Tupone Alfredo <tupone@gentoo.org> gav-0.9.0.ebuild,
+ +files/gav-0.9.0-ldflags.patch:
+ Respect LDFLAGS. Bug #335697 by flameeyes@gentoo.org
30 Apr 2008; Tristan Heaven <nyhm@gentoo.org>
+files/gav-0.9.0-gcc43.patch, gav-0.9.0.ebuild:
diff --git a/games-arcade/gav/files/gav-0.9.0-ldflags.patch b/games-arcade/gav/files/gav-0.9.0-ldflags.patch
new file mode 100644
index 000000000000..04188320ac4b
--- /dev/null
+++ b/games-arcade/gav/files/gav-0.9.0-ldflags.patch
@@ -0,0 +1,26 @@
+--- CommonHeader.old 2010-10-12 13:08:23.000000000 +0200
++++ CommonHeader 2010-10-12 13:08:48.000000000 +0200
+@@ -31,9 +31,9 @@
+ endif
+
+ ifdef NET
+-LDFLAGS= `sdl-config --libs` -lSDL_image -lSDL_net -lm
++LDLIBS= `sdl-config --libs` -lSDL_image -lSDL_net -lm
+ else
+-LDFLAGS= `sdl-config --libs` -lSDL_image -lm
++LDLIBS= `sdl-config --libs` -lSDL_image -lm
+ endif
+
+ SRCS = $(wildcard *.cpp)
+--- Makefile.Linux.old 2010-10-12 14:36:47.000000000 +0200
++++ Makefile.Linux 2010-10-12 14:37:02.000000000 +0200
+@@ -38,8 +38,7 @@
+ $(MAKE) -C $(@D:%_module.o=%)
+
+ gav: $(ALL_OBJ) $(OFILES)
+- $(CXX) -o gav $(OFILES) $(ALL_OBJ) $(LDFLAGS)
+- strip gav
++ $(CXX) $(LDFLAGS) -o gav $(OFILES) $(ALL_OBJ) $(LDLIBS)
+
+ clean:
+ for i in $(SUBDIRS) ; do \
diff --git a/games-arcade/gav/gav-0.9.0.ebuild b/games-arcade/gav/gav-0.9.0.ebuild
index 8b1680588e36..7e13c620703a 100644
--- a/games-arcade/gav/gav-0.9.0.ebuild
+++ b/games-arcade/gav/gav-0.9.0.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/gav/gav-0.9.0.ebuild,v 1.3 2008/04/30 22:01:06 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gav/gav-0.9.0.ebuild,v 1.4 2010/10/12 13:16:59 tupone Exp $
+EAPI="2"
inherit eutils games
@@ -21,15 +22,15 @@ SLOT="0"
KEYWORDS="amd64 ppc sparc x86 ~x86-fbsd"
IUSE=""
-DEPEND="media-libs/sdl-image
+RDEPEND="media-libs/sdl-image
media-libs/sdl-net
media-libs/libsdl"
+DEPEND="${RDEPEND}"
-src_unpack() {
+src_prepare() {
local d
- unpack ${P}.tar.gz
- cd "${S}"
+ epatch "${FILESDIR}"/${P}-ldflags.patch
for d in . automa menu net ; do
cp ${d}/Makefile.Linux ${d}/Makefile || die "cp ${d}/Makefile failed"
@@ -38,22 +39,17 @@ src_unpack() {
epatch "${FILESDIR}"/${P}-gcc43.patch
sed -i \
-e "s:/usr/bin:${GAMES_BINDIR}:" \
- -e "/strip/d" \
Makefile \
|| die "sed failed"
sed -i \
-e "/^CXXFLAGS=/s: -g : ${CXXFLAGS} :" CommonHeader \
|| die "sed failed"
- # Now, unpack the additional themes
- cd "${S}"/themes
- # unpack everything because it's easy
- unpack ${A}
- # and kill off what we don't want
- rm -rf ${P}
+ # Now, move the additional themes in the proper directory
+ mv ../{fabeach,florindo,inverted,naive,unnamed,yisus,yisus2} themes
# no reason to have executable files in the themes
- find . -type f -exec chmod a-x \{\} \;
+ find themes -type f -exec chmod a-x \{\} \;
}
src_compile() {