Fix for as-needed. Bug #203280

Package-Manager: portage-2.1.3.19

4 files changed, 34 insertions, 14 deletions

diff --git a/games-puzzle/quadra/ChangeLog b/games-puzzle/quadra/ChangeLog
index f7943674cd24..c8ebf9fda322 100644
--- a/games-puzzle/quadra/ChangeLog
+++ b/games-puzzle/quadra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/quadra
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.16 2007/07/06 22:18:36 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/ChangeLog,v 1.17 2007/12/26 12:24:24 tupone Exp $
+
+  26 Dec 2007; Tupone Alfredo <tupone@gentoo.org>
+  +files/quadra-1.1.8-asneeded.patch, quadra-1.1.8.ebuild:
+  Fix for as-needed. Bug #203280 by Yang Zhao
 
   06 Jul 2007; Tristan Heaven <nyhm@gentoo.org>
   +files/quadra-1.1.8-gcc42.patch, quadra-1.1.8.ebuild:
diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest
index 75382aa20744..a812b6dc0c36 100644
--- a/games-puzzle/quadra/Manifest
+++ b/games-puzzle/quadra/Manifest
@@ -9,6 +9,10 @@ AUX quadra-1.1.8-amd64.patch 1075 RMD160 3f88f9078fe2daed39b20c0bd51109759a2b17c
 MD5 ffdb7b1e6830df6f4d6064c9fca1f6bb files/quadra-1.1.8-amd64.patch 1075
 RMD160 3f88f9078fe2daed39b20c0bd51109759a2b17c5 files/quadra-1.1.8-amd64.patch 1075
 SHA256 9c8fe51ab59a6234d3f9dd0c4ab0722327e142e99fd3f9a0007009579205893e files/quadra-1.1.8-amd64.patch 1075
+AUX quadra-1.1.8-asneeded.patch 579 RMD160 91c6f340686e8981576a823fb77f080a3475a76f SHA1 a7006149cd39a1e3a6da8a7df80733933581fc89 SHA256 62eb778b58482853ec303149cd53ee3540852ef04b4e9c4bc5b13189e0f60555
+MD5 1d310137013e0406068e309363fac02e files/quadra-1.1.8-asneeded.patch 579
+RMD160 91c6f340686e8981576a823fb77f080a3475a76f files/quadra-1.1.8-asneeded.patch 579
+SHA256 62eb778b58482853ec303149cd53ee3540852ef04b4e9c4bc5b13189e0f60555 files/quadra-1.1.8-asneeded.patch 579
 AUX quadra-1.1.8-gcc3.patch 3221 RMD160 058b31005f511039a1cf7ffa4de2d4b79ba686c8 SHA1 a043a1cd04ae98e8880d060b69879568004549a4 SHA256 093d65e718a1cb346b1011bc5627784a16e0128424b8d7e2af697991e37f04ed
 MD5 b3cf28e17cc49e66089ebec5f2e10291 files/quadra-1.1.8-gcc3.patch 3221
 RMD160 058b31005f511039a1cf7ffa4de2d4b79ba686c8 files/quadra-1.1.8-gcc3.patch 3221
@@ -18,14 +22,14 @@ MD5 38b9bcab99e187c4c14733304e0b22e3 files/quadra-1.1.8-gcc42.patch 7471
 RMD160 3aa3fb25624dc564b7ffb4a6105e00e65f5625e6 files/quadra-1.1.8-gcc42.patch 7471
 SHA256 deb7a7950ef89ade43d3fa17b1f841c532fa77d4ffd896a439dbc3f0ec369b6d files/quadra-1.1.8-gcc42.patch 7471
 DIST quadra-1.1.8.tar.gz 3379618 RMD160 e57f25a714d5f447f3dcb34c34af9fa22718560d SHA1 3c97ffbbf180b4d952f8aedd183b0fd4a4809957 SHA256 6ebf81d4ffe1cedbebfdcc2cb44fdac875da8ccbd3d113ca5cb62169bf63d201
-EBUILD quadra-1.1.8.ebuild 1678 RMD160 b94b75e48e0c81f4649509a2806c8ecf82b493b6 SHA1 42b71c57b09c1e45441a5d3263ebfbf2ceac4026 SHA256 1be81bc34456a67902f25826515326e68c5d4ab2bd0872f061a7514b0835b094
-MD5 f45a9dc9cbff5225e7ef8d6c182e5e27 quadra-1.1.8.ebuild 1678
-RMD160 b94b75e48e0c81f4649509a2806c8ecf82b493b6 quadra-1.1.8.ebuild 1678
-SHA256 1be81bc34456a67902f25826515326e68c5d4ab2bd0872f061a7514b0835b094 quadra-1.1.8.ebuild 1678
-MISC ChangeLog 2376 RMD160 66b494325087872d3b52c8b91c65866549ec618b SHA1 c6fccd2585ce53226509a9a4f3e986b87fe548b6 SHA256 b3286a56a40c454134925607f26f2ea423cc6e46108066632b1c8f085df5ebc5
-MD5 54817790482b694ec47e4ff9f3da3e7b ChangeLog 2376
-RMD160 66b494325087872d3b52c8b91c65866549ec618b ChangeLog 2376
-SHA256 b3286a56a40c454134925607f26f2ea423cc6e46108066632b1c8f085df5ebc5 ChangeLog 2376
+EBUILD quadra-1.1.8.ebuild 1718 RMD160 fda84d5cae62305b9f47530d3078434094a37691 SHA1 0331a3e20fe38cb9e8d098856de84251e70bc02a SHA256 d04f69258f7a00aafa587951029db91a61218c8f1396c20823f1c3d712b1066e
+MD5 0c4c15957c5bc3c5dad2f0df74e44113 quadra-1.1.8.ebuild 1718
+RMD160 fda84d5cae62305b9f47530d3078434094a37691 quadra-1.1.8.ebuild 1718
+SHA256 d04f69258f7a00aafa587951029db91a61218c8f1396c20823f1c3d712b1066e quadra-1.1.8.ebuild 1718
+MISC ChangeLog 2534 RMD160 25c3cfb8b00f912993ee8f6725491bb64c50c032 SHA1 8b9d6f708b6518adfac4fcd7d6ba9345afa7655b SHA256 e9d2da2a80445e26452e7794fc8130e1cf06fd97f6ff3313f5c29efb43aa7691
+MD5 85a62855b51417321d8d1504e23f2b94 ChangeLog 2534
+RMD160 25c3cfb8b00f912993ee8f6725491bb64c50c032 ChangeLog 2534
+SHA256 e9d2da2a80445e26452e7794fc8130e1cf06fd97f6ff3313f5c29efb43aa7691 ChangeLog 2534
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -34,9 +38,9 @@ MD5 14e60e570efd3ac017642659293fdff8 files/digest-quadra-1.1.8 241
 RMD160 00d1804ab7dfb5c1a09e80f6717af6ba25ef6d6b files/digest-quadra-1.1.8 241
 SHA256 bedb0acd7b2cc7358e4d769861c5b82b7f8d9a1b4c919aa9b3bf41df076548d5 files/digest-quadra-1.1.8 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGjr/Bdz7hIScOURERAjYOAJ49r5/NslCdFeJ97HMfCxFLwhAj7QCgy21O
-O9aexrMeGcKvj06W44SFlQ0=
-=izDV
+iD8DBQFHckgC8qKy9+b2Hl0RAshvAJ4m6bDfT/fWxSfKQMH4sTqts8y8qACg8dXj
+F2TLvk/YUfzh8fZ8fyQA8ow=
+=a8fe
 -----END PGP SIGNATURE-----
diff --git a/games-puzzle/quadra/files/quadra-1.1.8-asneeded.patch b/games-puzzle/quadra/files/quadra-1.1.8-asneeded.patch
new file mode 100644
index 000000000000..f0e7422d1ba3
--- /dev/null
+++ b/games-puzzle/quadra/files/quadra-1.1.8-asneeded.patch
@@ -0,0 +1,11 @@
+--- source/rules.mk.old	2007-12-26 13:03:26.000000000 +0100
++++ source/rules.mk	2007-12-26 13:04:00.000000000 +0100
+@@ -19,7 +19,7 @@
+ # $Id: quadra-1.1.8-asneeded.patch,v 1.1 2007/12/26 12:24:25 tupone Exp $
+ 
+ quadra: $(QUADRA_OBJECTS) skelton/lib/libugs_s.a
+-	$(LINK.cc) -Lskelton/lib $(X_CFLAGS) $(X_LIBS) -lX11 -lXext -lXpm -lpng -ldl -lz -o $@ $^
++	$(LINK.cc) -Lskelton/lib $(X_CFLAGS) $(X_LIBS) -ldl -lz -o $@ $^ -lX11 -lXext -lXpm -lpng
+ 
+ quadra.res: $(shell cat resources.txt) resources.txt skelton/tools/wadder/wadder
+ 	skelton/tools/wadder/wadder ./ $@ resources.txt
diff --git a/games-puzzle/quadra/quadra-1.1.8.ebuild b/games-puzzle/quadra/quadra-1.1.8.ebuild
index dc045023c0a1..63c5d78cb649 100644
--- a/games-puzzle/quadra/quadra-1.1.8.ebuild
+++ b/games-puzzle/quadra/quadra-1.1.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/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.16 2007/07/06 22:18:36 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/quadra/quadra-1.1.8.ebuild,v 1.17 2007/12/26 12:24:24 tupone Exp $
 
 inherit eutils games
 
@@ -26,6 +26,7 @@ src_unpack() {
 		"${FILESDIR}"/${P}-gcc3.patch \
 		"${FILESDIR}"/libpng-1.2.5.patch \
 		"${FILESDIR}"/${P}-amd64.patch \
+		"${FILESDIR}"/${P}-asneeded.patch \
 		"${FILESDIR}"/${P}-gcc42.patch
 	sed -i \
 		-e 's:-pedantic::' config/vars.mk \