Fix as-needed issues, bug 157188; thanks to Mike Mattie

Package-Manager: portage-2.1.2_rc4-r3

4 files changed, 43 insertions, 30 deletions

diff --git a/dev-scheme/scheme48/ChangeLog b/dev-scheme/scheme48/ChangeLog
index b1a23b551b7b..b331c2cb147a 100644
--- a/dev-scheme/scheme48/ChangeLog
+++ b/dev-scheme/scheme48/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-scheme/scheme48
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.3 2006/08/31 03:45:58 mkennedy Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/ChangeLog,v 1.4 2007/01/06 12:35:33 masterdriverz Exp $
+
+  06 Jan 2007; Charlie Shepherd <masterdriverz@gentoo.org>
+  +files/scheme48-1.3-as-needed.patch, scheme48-1.3-r1.ebuild:
+  Fix as-needed issues, bug 157188; thanks to Mike Mattie
 
   31 Aug 2006; Matthew Kennedy <mkennedy@gentoo.org> -scheme48-1.3.ebuild,
   scheme48-1.3-r1.ebuild:
diff --git a/dev-scheme/scheme48/Manifest b/dev-scheme/scheme48/Manifest
index aec0e42461de..3defada8239a 100644
--- a/dev-scheme/scheme48/Manifest
+++ b/dev-scheme/scheme48/Manifest
@@ -1,19 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50scheme48-gentoo.el 198 RMD160 27ce388121bb1927b4c647d8ceffa71faf0e00e6 SHA1 7b613cdf2a8f40edf4269945ed054586221e75eb SHA256 6aaa0729ea2383855c6d3c6e254b0656ad03fdd97e5ea80de99a04e7c0585024
 MD5 75e4b8751b0c3e96501efc5218e39523 files/50scheme48-gentoo.el 198
 RMD160 27ce388121bb1927b4c647d8ceffa71faf0e00e6 files/50scheme48-gentoo.el 198
 SHA256 6aaa0729ea2383855c6d3c6e254b0656ad03fdd97e5ea80de99a04e7c0585024 files/50scheme48-gentoo.el 198
+AUX scheme48-1.3-as-needed.patch 501 RMD160 cc269059dd7e6dd921b87de28366a963a338eb63 SHA1 a3a211fd355acfd4d25a1871908be61748c9cbbd SHA256 53e4a1baff083b88b929459a20fc4fcd42ca360fb9c468cd518e47901c463a3e
+MD5 9e684c6e536d17bb593a58da147fc984 files/scheme48-1.3-as-needed.patch 501
+RMD160 cc269059dd7e6dd921b87de28366a963a338eb63 files/scheme48-1.3-as-needed.patch 501
+SHA256 53e4a1baff083b88b929459a20fc4fcd42ca360fb9c468cd518e47901c463a3e files/scheme48-1.3-as-needed.patch 501
 DIST scheme48-1.3.tgz 2322178 RMD160 25cbf7ddda946ffe114264c3cb4818817eeeb440 SHA1 be1704893b5932fc304b8a2e2279ec753a49f15b SHA256 50d2c540bced74c6015abca3978ba4f65e97d14c78eba1fa8488b3a5c064883b
-EBUILD scheme48-1.3-r1.ebuild 1719 RMD160 f466e2c4fa8181b17f58ea619b6c8f1be432f090 SHA1 98a4ac3a920b521ed61986d52c6f959b6730f141 SHA256 d6201c66144d6be4982338e91a7c45f5776d54a21b63341faad739bf4c6d82d1
-MD5 efde448ab3e8512bff299e22d01611aa scheme48-1.3-r1.ebuild 1719
-RMD160 f466e2c4fa8181b17f58ea619b6c8f1be432f090 scheme48-1.3-r1.ebuild 1719
-SHA256 d6201c66144d6be4982338e91a7c45f5776d54a21b63341faad739bf4c6d82d1 scheme48-1.3-r1.ebuild 1719
-MISC ChangeLog 789 RMD160 f9d92e140378226fc586685f4db2b0cc76b89dc4 SHA1 1e89e55ef5a7e693910e5609fd08cf4f2cf11b96 SHA256 37f9fa596049b49d69a7528d3010d514c01013d2f552167186250e98accc7cd2
-MD5 441b710a5c30fbbc70946d7a7b05e6db ChangeLog 789
-RMD160 f9d92e140378226fc586685f4db2b0cc76b89dc4 ChangeLog 789
-SHA256 37f9fa596049b49d69a7528d3010d514c01013d2f552167186250e98accc7cd2 ChangeLog 789
+EBUILD scheme48-1.3-r1.ebuild 1743 RMD160 8b7f14077fdc98c26769f97bcdd9280e7261ab7f SHA1 e417d78044cad0c8675af0eba7aedc1ad99c9d46 SHA256 0f9f187e38dc7cb0a63e77477ff95d203eadf781edb5cba47cf4709774b7a34e
+MD5 246adf31697139b464d70bfcc8641ac8 scheme48-1.3-r1.ebuild 1743
+RMD160 8b7f14077fdc98c26769f97bcdd9280e7261ab7f scheme48-1.3-r1.ebuild 1743
+SHA256 0f9f187e38dc7cb0a63e77477ff95d203eadf781edb5cba47cf4709774b7a34e scheme48-1.3-r1.ebuild 1743
+MISC ChangeLog 975 RMD160 5c35b89bd43eccf1389b50bbea39ec2720175389 SHA1 6085a0f8a99495a3077d390074f777bcc6afa952 SHA256 8540be4445c3780d61354f7616e9e2ba6afafd5bdc3eb9949d3a88128c394183
+MD5 05f971309ac42de08ebea3af0df9388e ChangeLog 975
+RMD160 5c35b89bd43eccf1389b50bbea39ec2720175389 ChangeLog 975
+SHA256 8540be4445c3780d61354f7616e9e2ba6afafd5bdc3eb9949d3a88128c394183 ChangeLog 975
 MISC metadata.xml 532 RMD160 130ae0288c47f06e72ae2225c8fc08e32b0ce428 SHA1 857a3bb429c6d759b0aae2e644f2cc220905e81c SHA256 58724fd8ef37b1b7edfca3d69536c1302ecafb00240112a3f442ea1a017819ab
 MD5 3ced4838ea1f70eee5d0d0f0e14b18b1 metadata.xml 532
 RMD160 130ae0288c47f06e72ae2225c8fc08e32b0ce428 metadata.xml 532
@@ -21,10 +22,3 @@ SHA256 58724fd8ef37b1b7edfca3d69536c1302ecafb00240112a3f442ea1a017819ab metadata
 MD5 caded5191014bbaba8002bdd5dacd1dd files/digest-scheme48-1.3-r1 232
 RMD160 213a8d0d6effe991702de670bdb3e3f178e6fa39 files/digest-scheme48-1.3-r1 232
 SHA256 665bd9994692ba9250316622b10355c27461f090976db6ef81f05a2133936d5f files/digest-scheme48-1.3-r1 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFE9lt8yiNZaEAZA+ARAvS2AJ43x2iSOk5nPBzIh8ak6YlvBXsVaQCePetg
-ePLrsHdtGoKoMfw0ewnmTss=
-=7K/L
------END PGP SIGNATURE-----
diff --git a/dev-scheme/scheme48/files/scheme48-1.3-as-needed.patch b/dev-scheme/scheme48/files/scheme48-1.3-as-needed.patch
new file mode 100644
index 000000000000..bbabf1239b12
--- /dev/null
+++ b/dev-scheme/scheme48/files/scheme48-1.3-as-needed.patch
@@ -0,0 +1,13 @@
+--- Makefile.in.orig	2007-01-06 12:12:17.000000000 +0000
++++ Makefile.in	2007-01-06 12:13:11.000000000 +0000
+@@ -222,8 +222,8 @@
+ 		$(EXTERNAL_INITIALIZERS) &&				\
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ c/main.o $(OBJS) $(UNIX_OBJS)	\
+ 		/tmp/s48_external_$$$$.c				\
+-		$(LIBOBJS) $(LIBS)					\
+-		$(EXTERNAL_OBJECTS) $(EXTERNAL_LD_FLAGS) &&		\
++		$(LIBOBJS) 					\
++		$(EXTERNAL_OBJECTS) $(EXTERNAL_LD_FLAGS) $(LIBS) &&		\
+ 	rm -f /tmp/s48_external_$$$$.c
+ 
+ script-interpreter: c/script-interpreter.o
diff --git a/dev-scheme/scheme48/scheme48-1.3-r1.ebuild b/dev-scheme/scheme48/scheme48-1.3-r1.ebuild
index 26d9d461ddad..dc973d815b20 100644
--- a/dev-scheme/scheme48/scheme48-1.3-r1.ebuild
+++ b/dev-scheme/scheme48/scheme48-1.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/scheme48-1.3-r1.ebuild,v 1.2 2006/08/31 03:45:58 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/scheme48/scheme48-1.3-r1.ebuild,v 1.3 2007/01/06 12:35:33 masterdriverz Exp $
 
-inherit elisp-common multilib
+inherit elisp-common multilib eutils
 
 DESCRIPTION="Scheme48 is an implementation of the Scheme Programming Language."
 HOMEPAGE="http://www.s48.org/"
@@ -13,20 +13,22 @@ SLOT="0"
 KEYWORDS="~x86 -amd64"
 IUSE="doc emacs"
 
-DEPEND="virtual/libc"
+DEPEND=""
 RDEPEND=""
 SITEFILE=50scheme48-gentoo.el
 
 src_unpack() {
 	unpack ${A}
-	sed -i "s:\`pwd\`:/usr/$(get_libdir)/scheme48:" ${S}/Makefile.in
-	sed -i "s:lib=\$(LIB):lib=/usr/$(get_libdir)/scheme48:" ${S}/Makefile.in
+	cd "${S}"
+	sed -i "s:\`pwd\`:/usr/$(get_libdir)/scheme48:" Makefile.in
+	sed -i "s:lib=\$(LIB):lib=/usr/$(get_libdir)/scheme48:" Makefile.in
 	# Set the correct values for the paths show by the man pages
-	sed -i "s:=\$(bindir)=:=/usr/bin/=:" ${S}/Makefile.in
-	sed -i "s:=\$(LIB)=:=/usr/$(get_libdir)/scheme48=:" ${S}/Makefile.in
+	sed -i "s:=\$(bindir)=:=/usr/bin/=:" Makefile.in
+	sed -i "s:=\$(LIB)=:=/usr/$(get_libdir)/scheme48=:" Makefile.in
 	# From Bug #127105
-	sed -i 's:`(cd $(srcdir) && echo $$PWD)`/scheme:'"/usr/$(get_libdir)/scheme48/:" ${S}/Makefile.in
-	sed -i "s:'\$(LIB)':'/usr/$(get_libdir)/\$(RUNNABLE)':" ${S}/Makefile.in
+	sed -i 's:`(cd $(srcdir) && echo $$PWD)`/scheme:'"/usr/$(get_libdir)/scheme48/:" Makefile.in
+	sed -i "s:'\$(LIB)':'/usr/$(get_libdir)/\$(RUNNABLE)':" Makefile.in
+	epatch "${FILESDIR}/${P}-as-needed.patch"
 }
 
 src_compile() {