Fixed compilation problems with --as-needed (bug #178661)

Package-Manager: portage-2.1.5.2

4 files changed, 52 insertions, 6 deletions

diff --git a/dev-scheme/drscheme/ChangeLog b/dev-scheme/drscheme/ChangeLog
index 7395cb17849a..8b28f8c9bb2e 100644
--- a/dev-scheme/drscheme/ChangeLog
+++ b/dev-scheme/drscheme/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-scheme/drscheme
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/ChangeLog,v 1.58 2008/03/23 11:51:43 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/ChangeLog,v 1.59 2008/06/03 10:19:12 dev-zero Exp $
+
+  03 Jun 2008; Tiziano Müller <dev-zero@gentoo.org>
+  +files/drscheme-372-as_needed.patch, drscheme-372-r1.ebuild:
+  Fixed compilation problems with --as-needed (bug #178661)
 
 *drscheme-372-r1 (23 Mar 2008)
 
diff --git a/dev-scheme/drscheme/Manifest b/dev-scheme/drscheme/Manifest
index 3fd068004149..a0d3ee4da80a 100644
--- a/dev-scheme/drscheme/Manifest
+++ b/dev-scheme/drscheme/Manifest
@@ -4,6 +4,7 @@ AUX drscheme-301-no-setfont.patch 511 RMD160 758e16e3d00d4ff12ef0e3c3922557f2f6f
 AUX drscheme-350-fPIC.patch 2979 RMD160 9382e8fc9ad56cad49eda737b7bc3ee558db4b4c SHA1 5aa9b10757c70e2fefa6e1568d6ef805bd11a1f1 SHA256 d020ff1cbc173525a68d52da05e8552787f4bb2ce555e88051997bcc865caff1
 AUX drscheme-352-destdir.patch 16696 RMD160 dffee12eb9170861c4f71699881f14cca9cdf2e1 SHA1 63aee8a3436dfb13cbc97c72b28aedf723882675 SHA256 2e26b0498b103b2559b411c0df7f6927b1ad310336732eb637031f51463062d0
 AUX drscheme-360-DESTDIR-3m.patch 692 RMD160 fa2f89197dd7b3aa0b2d04683eb9c3115cc39535 SHA1 c502ecf79af615c677b5fa172df8e0b5a19705d2 SHA256 f9e628a87e2c151a33ee2fa57ea37f6876a93145cc1877ab7c9653ba01ab9e8a
+AUX drscheme-372-as_needed.patch 1682 RMD160 13e9e2e17c8eeadcb1f54d87a44a76e076673556 SHA1 33b92cb5cf94efdd3c024b95b801012f0fee53db SHA256 afd811f6d803f23c998c7b199a854b1100089a16470c0ce06e77a64b4df7fec0
 DIST plt-360-src-unix.tgz 14106005 RMD160 cbe045f26f429d7df85540f09135c90bde45f84c SHA1 e2ca4fe7f9e66f61a81e5e7a381700f4e94e2d7f SHA256 014cd5c91231a5b6dd67c90ca9d2c26a7466abe0d072a37a40a605b29870f3bd
 DIST plt-370.6-src-unix.tgz 14609493 RMD160 88d901637187cd89ab54db905f48bef77da84d21 SHA1 d263d53dfb62ee5976f189eb8db3e5f6eb14fd96 SHA256 9679294c0cce4ae7b5ac9dfa60c383b9579d00370ab45be13d74202413f08ad5
 DIST plt-371-src-unix.tgz 15192430 RMD160 6abeb5045295d45645230f4ca3cf9e8ed3bb21e2 SHA1 a6cefadbc7561e0ab506c04ff6185ea10f7a9bcf SHA256 966ac7d85626e06dcc9384b9d55013ab780c140f640d9140a6046175775baf52
@@ -14,7 +15,7 @@ EBUILD drscheme-360-r3.ebuild 2332 RMD160 1997b792d0515d40aa3e5f5368d155f15ae4f5
 EBUILD drscheme-370.6_p20070725-r1.ebuild 2059 RMD160 b4e1b832ffb9bf3f7899a66a76f2d50d098a3c23 SHA1 4d6c13bab7edc412f2f4f5034e59f246d3dce3e5 SHA256 9c7ed0605d4ef77896a090c0767e5940093c6b57dfbf248b61de09b672e1933f
 EBUILD drscheme-370.6_p20070725.ebuild 2126 RMD160 6a42e25ae78eac8d5fa2674b2a1356830102692a SHA1 305e8def948c46f1f8078b5e96c8bf9d3a850781 SHA256 7cfe79a751f10d4796a1a0c2220039b338bdcf9cd744e4fee4ca4b6d492c5dae
 EBUILD drscheme-371.ebuild 2029 RMD160 26eba0175d2dd681a5cbca5c9b95e2eab8c85b7a SHA1 b96cc6cdfa51d6b083d1d35a70deb67dcab8a983 SHA256 e1c289f0b375b78f276cfd9dd8191c34ad52a4dfc10abb75643c111c7c1395bc
-EBUILD drscheme-372-r1.ebuild 2161 RMD160 96d1738cf794a4580c8a9b36eba399b6ca66b862 SHA1 66d25cf770813c3c7d019f9eaca9531f39786e2d SHA256 035450ac4be61a6ad0d13de618f041ff2dfee3865fe573a06d150d8171f2e5e8
+EBUILD drscheme-372-r1.ebuild 2240 RMD160 70c3a0dc39953b625284830d4dd3fa5c5cbc3965 SHA1 259ae3b45e12b40d025fd566921438eca89a104c SHA256 8e117c8ec69b236a846a5cb1c9ef9f75b57d91a6f08ae2f0b3b5b8dc6a52705e
 EBUILD drscheme-372.ebuild 2029 RMD160 9942880458f1b93882df88ec3db67753203edee6 SHA1 6ca5cc43291805f832fb57dccf10c5c11e7703a7 SHA256 cc3a777258ffd6bfff552b453751a00d33eadaf42a668e33ba823d5511cf17b9
-MISC ChangeLog 11405 RMD160 43658d02b6f856e774db906367f30b035f6d1bdc SHA1 0264707483bbef053cd3abcb415b5d9a2bedf337 SHA256 847adc6629db35997eed765b2be2fa305d8bfe344eddcc0b7d76bf66aa64e7cf
+MISC ChangeLog 11585 RMD160 9676bcd6303d2132ccd7e5d3bbd2eb1b32fe4956 SHA1 0c00817d162bfa5a7f3fe0e085f43c4d58a56c82 SHA256 1a2a8302f3dc9865a7fdc9f92c1c740bb376eb2df0d2afae1cf8103822caa16c
 MISC metadata.xml 599 RMD160 a228df650ca5754ecdc718ce046c3a88c429c65f SHA1 bc80c435999a6d6e26f1a678b4946d7cd1ddd054 SHA256 5e18280a7962fdcc78ca14de2f71c5756f32d8a247e3e4f665282363b133cbbb
diff --git a/dev-scheme/drscheme/drscheme-372-r1.ebuild b/dev-scheme/drscheme/drscheme-372-r1.ebuild
index 5535127f9f8a..d11802ee7054 100644
--- a/dev-scheme/drscheme/drscheme-372-r1.ebuild
+++ b/dev-scheme/drscheme/drscheme-372-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-372-r1.ebuild,v 1.1 2008/03/23 11:51:43 hkbst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-scheme/drscheme/drscheme-372-r1.ebuild,v 1.2 2008/06/03 10:19:12 dev-zero Exp $
 
 inherit eutils latex-package
 
@@ -32,8 +32,14 @@ DEPEND="${RDEPEND} !dev-tex/slatex"
 S="${WORKDIR}/plt-${PV%%_p*}"
 
 src_unpack() {
-	unpack ${A}; cd "${S}"
-	sed "s,docdir=\"\${datadir}/plt/doc,docdir=\"\${datadir}/doc/${PF}," -i src/configure
+	unpack ${A}
+	cd "${S}"
+
+	sed -i \
+		-e "s,docdir=\"\${datadir}/plt/doc,docdir=\"\${datadir}/doc/${PF}," \
+		src/configure || die "sed failed"
+
+	epatch "${FILESDIR}/${P}-as_needed.patch"
 }
 
 src_compile() {
diff --git a/dev-scheme/drscheme/files/drscheme-372-as_needed.patch b/dev-scheme/drscheme/files/drscheme-372-as_needed.patch
new file mode 100644
index 000000000000..2781c33a6cc0
--- /dev/null
+++ b/dev-scheme/drscheme/files/drscheme-372-as_needed.patch
@@ -0,0 +1,35 @@
+diff -Naur plt-372.orig/src/configure plt-372/src/configure
+--- plt-372.orig/src/configure	2008-06-01 15:25:38.000000000 +0200
++++ plt-372/src/configure	2008-06-01 15:32:21.000000000 +0200
+@@ -5390,6 +5390,7 @@
+   Linux)
+     LIBS="$LIBS -rdynamic"
+     DYN_CFLAGS="-fPIC"
++    LIBMZSCHEME_DEP="-ldl -lm"
+     # PPC: X11 librares are not found
+     case `$UNAME -m` in
+       ppc)
+diff -Naur plt-372.orig/src/mred/Makefile.in plt-372/src/mred/Makefile.in
+--- plt-372.orig/src/mred/Makefile.in	2008-06-01 15:25:37.000000000 +0200
++++ plt-372/src/mred/Makefile.in	2008-06-01 20:33:27.000000000 +0200
+@@ -125,7 +125,7 @@
+ 	$(MREDLINKER) $(MREDLDFLAGS) $(MRSTATIC) -o mred@CGC@ $(MREDOBJECTS) $(MREDLDLIBS) $(MRSTATIC_STUB)
+ 
+ libmred.@LIBSFX@: $(WXLIBSNORM)
+-	$(AR) $(ARFLAGS) libmred.@LIBSFX@ $(WXLIBSNORM) @LIBMRED_DEP@
++	$(AR) $(ARFLAGS) libmred.@LIBSFX@ $(WXLIBSNORM) @LIBMRED_DEP@ @LDFLAGS@ $(LDLIBS)
+ 
+ MRFW = PLT_MrEd.framework/Versions/$(FWVERSION)/PLT_MrEd
+ MRFWRES = PLT_MrEd.framework/Versions/$(FWVERSION)/Resources/PLT_MrEd.rsrc
+diff -Naur plt-372.orig/src/mzscheme/gc2/Makefile.in plt-372/src/mzscheme/gc2/Makefile.in
+--- plt-372.orig/src/mzscheme/gc2/Makefile.in	2008-06-01 15:25:38.000000000 +0200
++++ plt-372/src/mzscheme/gc2/Makefile.in	2008-06-01 20:32:00.000000000 +0200
+@@ -310,7 +310,7 @@
+ EXTRA_OBJS_L = ../src/gmp.@LTO@ @FOREIGN_OBJSLIB_IF_USED@
+ 
+ ../libmzscheme3m.@LIBSFX@: $(OBJS) $(EXTRA_OBJS_T)
+-	$(AR) $(ARFLAGS) ../libmzscheme3m.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L)
++	$(AR) $(ARFLAGS) ../libmzscheme3m.@LIBSFX@ $(OBJS) $(EXTRA_OBJS_L) @LDFLAGS@ $(LIBS)
+ 	$(RANLIB) ../libmzscheme3m.@LIBSFX@
+ 
+ ../mzscheme@MMM@@NOT_OSX@: main.@LTO@ ../libmzscheme3m.@LIBSFX@