Respect LDFLAGS. Bug #335697

Package-Manager: portage-2.1.9.14/cvs/Linux i686

4 files changed, 45 insertions, 18 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/Manifest b/games-arcade/gav/Manifest
index e418bdeb2696..5d5ba7b7510d 100644
--- a/games-arcade/gav/Manifest
+++ b/games-arcade/gav/Manifest
@@ -1,4 +1,5 @@
 AUX gav-0.9.0-gcc43.patch 201 RMD160 8313fc96b47aad6cf50f839a84818b50a69869f7 SHA1 f3a9cd78909a74ea7aadc25d8d472080a36ce1da SHA256 11c7bc2062c08133851bf4ec57d6534a203372c2e13b7b35c5d1598b2ba8dd2d
+AUX gav-0.9.0-ldflags.patch 742 RMD160 e9312e2d5997b0c92e0d9c3519cf2b37eadd2dc9 SHA1 2215c63ef575bad62e02684c1a0aa3810cceb659 SHA256 1b0f0f048ac9fec34fe27f56404241362cbf8a0b06c2bda6f6d28b9aaea1433b
 DIST fabeach.tgz 163750 RMD160 3c64d719d2d39aca5b8772747e0388e81b5940e5 SHA1 42a51125a6ca27c890f08254fb5c66140bae9c54 SHA256 e479d25c3624ebb432d6ea272ce60d4f4de4deb47a9c4325ebd4b77b3a4ab9ab
 DIST florindo.tgz 175052 RMD160 60f83d4aff44529edb9aa1667a815bd0109899fa SHA1 d0a3573c42be3530929eafd91d997f902b331252 SHA256 d622ce2054a5f19243d7429dccfd036e51f8a7489cf692fb5181c670ef129a3e
 DIST gav-0.9.0.tar.gz 137729 RMD160 903bb61ebbb0eebd071d76d381431e1e658b34fa SHA1 7f1cc0a7bcac6fa92d89a3eacdfc6793dc0e8f6c SHA256 8f0deb8b2cd775b339229054f4f282583a4cfbcba9d27a6213cf910bab944f3e
@@ -7,6 +8,6 @@ DIST naive.tgz 80169 RMD160 9e703447af2f4020c5c8d66c45cf6e338830ebd5 SHA1 2b6a62
 DIST unnamed.tgz 156406 RMD160 beeda46ea716823e4daa808e2109464aefd27f08 SHA1 36de8faeb6d00d699cca27c3a1533d0e6535ca8e SHA256 e51f5ecf3046b29da3745713a7a9cd6af037bbf297e8bbe403d68ed9e0feec00
 DIST yisus.tgz 131021 RMD160 b22053d26a06ec07120c045db71953143e2c1d11 SHA1 16ec21132dc10b31518fdc8c31f2d5ba2d989989 SHA256 952e162a75ff235743ef89f8b90dde456a3494e245364b52a9c6092725a99dd2
 DIST yisus2.tgz 117923 RMD160 3d17c19a6b0dd4ebe0104ba5af215b2f4e3837b0 SHA1 c5572b91cf218df9224caac6653e42f08007fd67 SHA256 60939602a3ee52316204f64eb167839161aac4aff7b8f409e88d2543ebe733fc
-EBUILD gav-0.9.0.ebuild 1834 RMD160 5158f9d279b74dea52a2421611d967ae972e4886 SHA1 811397486fe52778c5229266025a1403c7c8fcda SHA256 c2bb0dd3df852418751ffd298ebc91781a55ca6b934cb790495e4c9506a76254
-MISC ChangeLog 1964 RMD160 f2fe95c78e0b5448ae0bb3d23c321b2d71ff9a61 SHA1 c87f5c6189f3286dfe9543b9cc3337663ed9ca37 SHA256 3381a20bcf1e66a8b41ffd7fc4ad77e260b3ef7b769db8bfc1389dccf8f6ab0d
+EBUILD gav-0.9.0.ebuild 1837 RMD160 86ecf27e1d3ce599acb893697aacf099d1302839 SHA1 5a799625efc3997a4ee2eecc659190419e13f087 SHA256 d2a3eba4af4d6a673728955d46faa3c427fbf0b5aec595efaea1da24711b2723
+MISC ChangeLog 2124 RMD160 23c6da46843b279d58f049c399367dc8e52b50ed SHA1 b732ab3f3a4c39420c052d200f1a97b3ff5d03a6 SHA256 a42d6b59c157eb17842aa82b41128d37d23234797f5fc7571a2324d705d6be16
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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() {