Apply another patch from desbaine@yahoo.com to fix compilation with --as-needed. Closes bug #168207.

Package-Manager: portage-2.1.2-r10

3 files changed, 21 insertions, 17 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index ade2bde82075..84d4a071b858 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.66 2007/02/24 06:03:10 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.67 2007/02/24 23:00:23 marienz Exp $
+
+  24 Feb 2007; Marien Zwart <marienz@gentoo.org> ati-drivers-8.34.8.ebuild:
+  Apply another patch from desbaine@yahoo.com to fix compilation with
+  --as-needed. Closes bug #168207.
 
   24 Feb 2007; Marien Zwart <marienz@gentoo.org> ati-drivers-8.34.8.ebuild:
   Apply a patch from desbaine@yahoo.com to fix bug #168163: make ati-drivers
diff --git a/x11-drivers/ati-drivers/Manifest b/x11-drivers/ati-drivers/Manifest
index fa18a357bc7a..6167bd3b8a6c 100644
--- a/x11-drivers/ati-drivers/Manifest
+++ b/x11-drivers/ati-drivers/Manifest
@@ -81,14 +81,14 @@ EBUILD ati-drivers-8.33.6.ebuild 10670 RMD160 4eca26a8283930b042bc8a4179fa049632
 MD5 484bad00c19c5743bc0cca2a135bc909 ati-drivers-8.33.6.ebuild 10670
 RMD160 4eca26a8283930b042bc8a4179fa0496320316db ati-drivers-8.33.6.ebuild 10670
 SHA256 f58a7b26609f2007136f7ca7a843bd2329bc6cf5d78678ace670a208bc5fea0c ati-drivers-8.33.6.ebuild 10670
-EBUILD ati-drivers-8.34.8.ebuild 13011 RMD160 4ad8634f602ec15c32eee2acd56a5770957b0988 SHA1 b6415fb936443c680625df80a80f3567cd7cc167 SHA256 6fc63bbe2fed02aa85f13d93ade62c96168b8d8ea5e50fc3fd173132006bce1f
-MD5 9da7365ffbbe4b5d941db7c1dc778b2a ati-drivers-8.34.8.ebuild 13011
-RMD160 4ad8634f602ec15c32eee2acd56a5770957b0988 ati-drivers-8.34.8.ebuild 13011
-SHA256 6fc63bbe2fed02aa85f13d93ade62c96168b8d8ea5e50fc3fd173132006bce1f ati-drivers-8.34.8.ebuild 13011
-MISC ChangeLog 35476 RMD160 1c7e532d2cebbfeddb0a2607e701516109e7b497 SHA1 1e1c9470ee2372583381dc06d2562c949fa17a7f SHA256 ec41e2ece0b9ef55c36462ff13a1d5a53229d82d379f40a4170c4cc00b058068
-MD5 f121c7fdaf3baafad615a8df3b0b6535 ChangeLog 35476
-RMD160 1c7e532d2cebbfeddb0a2607e701516109e7b497 ChangeLog 35476
-SHA256 ec41e2ece0b9ef55c36462ff13a1d5a53229d82d379f40a4170c4cc00b058068 ChangeLog 35476
+EBUILD ati-drivers-8.34.8.ebuild 13011 RMD160 54e5f8e813d92810c436e7ac1e77f2b1e449a6d0 SHA1 876effdbc4b0b9665891de4288976cf8b9dc90d5 SHA256 2fdc3e5c3666018d8ca0f724c97d6dc49b00d421dfcb579c76dea73661508387
+MD5 c6544b4ed00dc5a057a7d9a4eff30801 ati-drivers-8.34.8.ebuild 13011
+RMD160 54e5f8e813d92810c436e7ac1e77f2b1e449a6d0 ati-drivers-8.34.8.ebuild 13011
+SHA256 2fdc3e5c3666018d8ca0f724c97d6dc49b00d421dfcb579c76dea73661508387 ati-drivers-8.34.8.ebuild 13011
+MISC ChangeLog 35658 RMD160 98ee828638f3744c25d56bf7c109ca5abf3a53fc SHA1 e3b27a8fb5bfbc63968853e0fce174cb0b745a7e SHA256 911ed46e614990cc60ffb83143f4b2ee7b2273647a65baf8970858d02a2aea69
+MD5 4e2fc26e0ca8fd62fe01238fc85e1559 ChangeLog 35658
+RMD160 98ee828638f3744c25d56bf7c109ca5abf3a53fc ChangeLog 35658
+SHA256 911ed46e614990cc60ffb83143f4b2ee7b2273647a65baf8970858d02a2aea69 ChangeLog 35658
 MISC metadata.xml 494 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a SHA1 3ba9ee03c89575c03788c087c2dea8c208b398e9 SHA256 457f40aec01e7f047adfab46ed13813853102027c1f4cd68efa45a2bd39aff08
 MD5 f462ad2ddb101d99fc4860e39a197a9f metadata.xml 494
 RMD160 6c0f807a9fcdcaee2e28906992a35dd87d24ff0a metadata.xml 494
@@ -129,7 +129,7 @@ SHA256 817e0ef6514267acd75aa95716be2b008a506029776060602d491985f1616d4f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF39U7UElL7eJpfEQRAudtAKCfOvJ4kbHuTj/MSAX7FLSBJnex1ACfTpie
-7j2ibFrgJlXUIstomEm6fN0=
-=8X8I
+iD8DBQFF4MO5UElL7eJpfEQRAueUAJ907i6xK6fqvq3/Z1EC4O0DQv6l5wCgnKMh
+JHlBu2j17f5YMngdnoewXC4=
+=+PGk
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild b/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild
index e4cf2095498b..c5921c2d88b7 100644
--- a/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild,v 1.2 2007/02/24 06:03:10 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-8.34.8.ebuild,v 1.3 2007/02/24 23:00:23 marienz Exp $
 
 IUSE="acpi qt3"
 
@@ -170,14 +170,14 @@ src_compile() {
 	# The -DUSE_GLU is needed to compile using nvidia headers
 	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
 	"$(tc-getCC)" -o fgl_fglxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
-		-I"${S}"/common/usr/include \
-		-lGL -lGLU -lX11 -lm fgl_glxgears.c || die "fgl_glxgears build failed"
+		-I"${S}"/common/usr/include fgl_glxgears.c \
+		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"
 
 	einfo "Building fglrx_gamma lib"
 	cd "${S}"/extra/lib/fglrx_gamma
 	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
-		fglrx_gamma.c -DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 -lXext \
-		|| die "fglrx_gamma lib build failed"
+		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
+		-lXext || die "fglrx_gamma lib build failed"
 	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
 	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"