Fix compilation with --as-needed, respect CC and LDFLAGS

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 42 insertions, 12 deletions

diff --git a/app-misc/tdfsb/ChangeLog b/app-misc/tdfsb/ChangeLog
index 5e5d653ecaa8..0d22947b961d 100644
--- a/app-misc/tdfsb/ChangeLog
+++ b/app-misc/tdfsb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/tdfsb
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tdfsb/ChangeLog,v 1.23 2008/11/15 13:42:37 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tdfsb/ChangeLog,v 1.24 2009/02/09 17:16:58 angelos Exp $
+
+  09 Feb 2009; Christoph Mende <angelos@gentoo.org>
+  +files/tdfsb-0.0.10-asneeded.patch, tdfsb-0.0.10.ebuild:
+  Fix compilation with --as-needed, respect CC and LDFLAGS
 
   15 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org> tdfsb-0.0.10.ebuild:
   Die when compile fails.
diff --git a/app-misc/tdfsb/Manifest b/app-misc/tdfsb/Manifest
index 6141bfc9d45d..033a5181d2fd 100644
--- a/app-misc/tdfsb/Manifest
+++ b/app-misc/tdfsb/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX tdfsb-0.0.10-asneeded.patch 2020 RMD160 39a415f0468a0499c6b575eeb3909bc87e585b3c SHA1 b8f3207a0707264825b97afe6639712b1171951e SHA256 b7640fdaa6a9ca005ee3e699f6737b31054c149a7f34f429680cbd2e7d2d0151
 DIST tdfsb-0.0.10.tar.gz 35630 RMD160 0b147f7d120f86b27a46d84efcdcc7dced3ea1f4 SHA1 5108de0d3a275ae190472b343292af6254c73d4c SHA256 91283a0863f7c38028346ab4edfd180d0ce6cee3f1a7c44bf3c181a74063f4c3
-EBUILD tdfsb-0.0.10.ebuild 721 RMD160 c8f2653cc071f96828e7389801c68ead3b0eb897 SHA1 8e0f063f68bcb6fab53e7e8b81463c5786b04d89 SHA256 586200a1a1e4dc69a6e31fd9c96958db484fa7265f7e888e764332ab6a8ff86c
-MISC ChangeLog 2493 RMD160 cfc7fcc8bd3813c1526091d639d04f6ab4097f7e SHA1 506211f933ba594f93292aaef52abd40e1e8115b SHA256 1e7173461844a6a58099ac0ee2a3a2cf21e5efd5c9903dd10cb2b95ed7e92853
+EBUILD tdfsb-0.0.10.ebuild 844 RMD160 518be23baac1ada5d37b1aca7e9238f6111fb095 SHA1 632c32320450e055e964fb184e8784936011d755 SHA256 d255398df63adcefa79551ff6c79e377206d68283af35d50d8e067a8e94e16f1
+MISC ChangeLog 2662 RMD160 1046a5de51c12558b15ee18d6df5a6d66be5ca7e SHA1 37b3764d405fb52835d09ef0dd6c322f728a56d6 SHA256 05e908b1c6ac54e256057c41e45820189fee802ece74d29c3ea3a06ca347f5e6
 MISC metadata.xml 254 RMD160 a6461563f2e5375140c887258a37f90b65e8509a SHA1 f90ca41dc12171045d56e1090c613ef240ca6e18 SHA256 fb2b417ab0e1cef242af9c9bdd54ef01f70b5c847ba2ddbb5bbd3c6d7d8317bd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkke0c0ACgkQAiZjviIA2XiP1ACg8JBv7TmQAsjKUtY3WMth5ooE
-hecAoNk0Eqq/opG16SPkRPz1XZB8Exdy
-=VZs5
+iEYEARECAAYFAkmQZRMACgkQKhnDs22gwa+VagCcDBbBW+v3av9nMF46ZiQT5z/J
+aYIAoOTcCh3BNURHP7LqJGDJrFKL7e8A
+=Bk9Z
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch b/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch
new file mode 100644
index 000000000000..d0039dd98e33
--- /dev/null
+++ b/app-misc/tdfsb/files/tdfsb-0.0.10-asneeded.patch
@@ -0,0 +1,22 @@
+diff -u -r a/compile.sh b/compile.sh
+--- a/compile.sh	2004-08-22 19:37:29.000000000 +0200
++++ b/compile.sh	2009-02-09 18:13:54.342137472 +0100
+@@ -26,15 +26,15 @@
+ if uname -s | grep -i -c "LINUX" > /dev/null; then 
+     echo "GNU/Linux detected.";
+     echo "compiling...";    
+-    gcc $ARGS1 $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c;
++    gcc $ARGS1 $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
+ elif uname -s | grep -i -c "BEOS" > /dev/null; then 
+     echo "BeOS detected.";
+     echo "compiling...";
+-    gcc $ARGS1 $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -lSDL_image -lGL -lglut -lsmpeg -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c;
++    gcc $ARGS1 $ARGS2 -I/boot/develop/tools/gnupro/include/ -I/boot/develop/headers/be/opengl/ -L/boot/home/config/lib -L/boot/develop/tools/gnupro/lib/ -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c -lSDL_image -lGL -lglut -lsmpeg;
+ elif uname -s | grep -i -c "BSD" > /dev/null; then 
+     echo "BSD detected.";
+     echo "compiling...";
+-    gcc $ARGS1 $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c;
++    gcc $ARGS1 $ARGS2 -I/usr/local/include -I/usr/include/ -I/usr/X11R6/include -L/usr/lib/ -L/usr/local/lib/ -L/usr/X11R6/lib -D_THREAD_SAFE -O2 -x c -o tdfsb tdfsb.c -lSDL_image -lGL -lGLU -lglut -lXmu -lXi -lXext -lX11 -lm -lsmpeg;
+ else
+     echo "Unknown OS. If you are running Linux, BeOS or";
+     echo "FreeBSD please send me the output of 'uname -s'." 
diff --git a/app-misc/tdfsb/tdfsb-0.0.10.ebuild b/app-misc/tdfsb/tdfsb-0.0.10.ebuild
index ef4a304067ee..0f3ec4e5b2ec 100644
--- a/app-misc/tdfsb/tdfsb-0.0.10.ebuild
+++ b/app-misc/tdfsb/tdfsb-0.0.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tdfsb/tdfsb-0.0.10.ebuild,v 1.5 2008/11/15 13:42:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tdfsb/tdfsb-0.0.10.ebuild,v 1.6 2009/02/09 17:16:58 angelos Exp $
 
-IUSE=""
+inherit eutils toolchain-funcs
 
 DESCRIPTION="SDL based graphical file browser"
 HOMEPAGE="http://www.determinate.net/webdata/seg/tdfsb.html"
@@ -11,6 +11,7 @@ SRC_URI="http://www.determinate.net/webdata/data/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ppc -sparc x86"
+IUSE=""
 
 DEPEND="media-libs/smpeg
 	media-libs/sdl-image
@@ -18,8 +19,10 @@ DEPEND="media-libs/smpeg
 
 src_unpack() {
 	unpack ${A}
-
-	sed -i "s:-O2:${CFLAGS}:" ${S}/compile.sh
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	sed -i -e "s:-O2:${CFLAGS} ${LDFLAGS}:" \
+		-e "s:gcc:$(tc-getCC):" ${S}/compile.sh
 }
 
 src_compile() {