Added patch to fix the as-needed linking issues (see bug #167438).

Package-Manager: portage-2.1.2.5

4 files changed, 51 insertions, 13 deletions

diff --git a/sci-mathematics/yacas/ChangeLog b/sci-mathematics/yacas/ChangeLog
index b0fc2a27aad2..61b54b3f24fa 100644
--- a/sci-mathematics/yacas/ChangeLog
+++ b/sci-mathematics/yacas/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/yacas
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.14 2007/01/29 16:09:01 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/ChangeLog,v 1.15 2007/05/04 01:33:03 markusle Exp $
+
+  04 May 2007; Markus Dittrich <markusle@gentoo.org>
+  +files/yacas-1.0.63-as-needed.patch, yacas-1.0.63.ebuild:
+  Added patch to fix the as-needed linking issues (see bug #167438).
+  Thanks much to Timothy Redaelli <drizzt@gentoo.org> for his patches.
 
   29 Jan 2007; Markus Dittrich <markusle@gentoo.org> yacas-1.0.63.ebuild:
   Disabled the proteus useflag for now since the fltk gui seems
diff --git a/sci-mathematics/yacas/Manifest b/sci-mathematics/yacas/Manifest
index da9382e97f83..8f23e6ba9119 100644
--- a/sci-mathematics/yacas/Manifest
+++ b/sci-mathematics/yacas/Manifest
@@ -1,3 +1,7 @@
+AUX yacas-1.0.63-as-needed.patch 1081 RMD160 678c823fff9d720be1662c60c8dbea4b30bbbaeb SHA1 bacfb031a77068a0e749c5f7714e75ba060a15e3 SHA256 d0db20ee97ea3be043eb8c49413372c380916804311fdd9ac288eb02b54780c4
+MD5 5a16ae5b3114d0fd547951b1fcbea891 files/yacas-1.0.63-as-needed.patch 1081
+RMD160 678c823fff9d720be1662c60c8dbea4b30bbbaeb files/yacas-1.0.63-as-needed.patch 1081
+SHA256 d0db20ee97ea3be043eb8c49413372c380916804311fdd9ac288eb02b54780c4 files/yacas-1.0.63-as-needed.patch 1081
 DIST yacas-1.0.61.tar.gz 2106778 RMD160 b2f83a169f4b7eedd834391cdc32f1eaf0b7fa97 SHA1 2d0fe49c49eadbc3b670ba138969c6739c2329cd SHA256 26a02fe92aa5f5d3a7cda87400b5b2fa6b02cc3392d8a27c2df792e447d56595
 DIST yacas-1.0.62.tar.gz 2093683 RMD160 2354212586334eeb9e6aead3ee341b438bbc4e79 SHA1 0710fde83f31f17138f05039ad94bb3a03a9b375 SHA256 17b8fad5e508aefc34495ab61d4b3b350cb378e29ebbde0b7d8cd70d9c840df4
 DIST yacas-1.0.63.tar.gz 2145848 RMD160 7a17c88756874a245eba7961d19b73d4fc45a840 SHA1 d6c73390f9562a5f5b1bc572119431006daf988a SHA256 6dca2c9b6a15720e231dbe2f379277c46e75c2732fb2cee3fb40ad92904830db
@@ -9,14 +13,14 @@ EBUILD yacas-1.0.62.ebuild 1519 RMD160 b6ee090e0cf64107b0ce402c2ac4eb5175906623
 MD5 f14eb99fb23e49f2eb374ac1399b62f7 yacas-1.0.62.ebuild 1519
 RMD160 b6ee090e0cf64107b0ce402c2ac4eb5175906623 yacas-1.0.62.ebuild 1519
 SHA256 333ec3b0b00b14503ac09bdd5aee635879acc4f5436e9518a10474dcb9dc9699 yacas-1.0.62.ebuild 1519
-EBUILD yacas-1.0.63.ebuild 1628 RMD160 0857c387115688170b223eb3aca3ed5f65c1c681 SHA1 b81186539687d5f8355d456117d3d2bedce5cb04 SHA256 6bff4f2bd9b233cb7419ea27854e0ddec332e0b520073b479bb283d2455875ed
-MD5 cfd3efa5891e326272dafd7beb326018 yacas-1.0.63.ebuild 1628
-RMD160 0857c387115688170b223eb3aca3ed5f65c1c681 yacas-1.0.63.ebuild 1628
-SHA256 6bff4f2bd9b233cb7419ea27854e0ddec332e0b520073b479bb283d2455875ed yacas-1.0.63.ebuild 1628
-MISC ChangeLog 3945 RMD160 0c85dfe5343a66f5b9ce45421a613b09bab36756 SHA1 cf3716302bc69f388515eb46c290816a026c2e54 SHA256 c070fc7351a5014e5dc9eff5726defa375f784e8797e7fe8b6dacb445e979a36
-MD5 b3b6532447803cb02f02896aba21e282 ChangeLog 3945
-RMD160 0c85dfe5343a66f5b9ce45421a613b09bab36756 ChangeLog 3945
-SHA256 c070fc7351a5014e5dc9eff5726defa375f784e8797e7fe8b6dacb445e979a36 ChangeLog 3945
+EBUILD yacas-1.0.63.ebuild 1701 RMD160 9538be92d9ca71840f58bd532a7e13feb47b1bfb SHA1 3989926e7efa82294b7c7e87d802e62b76515c63 SHA256 1ba57afe78147344b39d06752c2238b85ee936c637193f3be543e31f06912316
+MD5 8fcb9a4a1ce61fdb9b46acd4d044ab77 yacas-1.0.63.ebuild 1701
+RMD160 9538be92d9ca71840f58bd532a7e13feb47b1bfb yacas-1.0.63.ebuild 1701
+SHA256 1ba57afe78147344b39d06752c2238b85ee936c637193f3be543e31f06912316 yacas-1.0.63.ebuild 1701
+MISC ChangeLog 4199 RMD160 d694b1cbf5f6f5759542403206f2dc5fbfc9e09d SHA1 247075bcf47d935b4f9fcedce01a23de2e267c1b SHA256 b2d1404e8a94e5bcc4f5921fc03290269159ef41023a875058a8b0f14c1d504f
+MD5 4122cae8ee0aaec4b6d7f1ea81a20e66 ChangeLog 4199
+RMD160 d694b1cbf5f6f5759542403206f2dc5fbfc9e09d ChangeLog 4199
+SHA256 b2d1404e8a94e5bcc4f5921fc03290269159ef41023a875058a8b0f14c1d504f ChangeLog 4199
 MISC metadata.xml 168 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 SHA1 95c9e4f7368f82053d631bbcd469612c92ca13cb SHA256 c0cc8d6ab9385750af753ddc504299ed90a70b5c4c655f6c77d865917a8829c9
 MD5 30bc69a424d7634aae9c1e4203365d3d metadata.xml 168
 RMD160 d98790cf055dc0f820c63d65f485b9dcfa8950f4 metadata.xml 168
diff --git a/sci-mathematics/yacas/files/yacas-1.0.63-as-needed.patch b/sci-mathematics/yacas/files/yacas-1.0.63-as-needed.patch
new file mode 100644
index 000000000000..6c401a012ef1
--- /dev/null
+++ b/sci-mathematics/yacas/files/yacas-1.0.63-as-needed.patch
@@ -0,0 +1,24 @@
+--- src/Makefile.am.orig	2007-05-02 15:28:49.000000000 +0200
++++ src/Makefile.am	2007-05-02 15:28:56.000000000 +0200
+@@ -65,16 +65,21 @@
+ 	pcre_maketables_stub.c pcre_pcreposix_stub.c pcre_get_stub.c \
+ 	pcre_plugin_stub.cpp filescanner_stub.cpp filescanner_plugin_stub.cpp
+ 
++libyacas_la_LIBADD = @LIBLTDL@
++
+ libcyacas_la_SOURCES = cyacas.cpp
++libcyacas_la_LIBADD = libyacasplatform.la libyacasnumbers.la -lstdc++
+ 
+ libyacasplatform_la_SOURCES = platmath.cpp grower.cpp stdstubs.cpp obmalloc.cpp lisphash.cpp \
+ 	lispstring.cpp mathutil.cpp yacasbase.cpp debugmem.cpp 
+ libyacasplatform_la_DEPENDENCIES= fastprimes.c
++libyacasplatform_la_LIBADD = -lm
+ 
+ ## The -rpath flag is not added automatically because lib*numbers is listed in EXTRA_LTLIBRARIES,
+ ## so automake does not know in what directory it is installed.
+ libyacasnumbers_la_SOURCES = anumber.cpp yacasnumbers.cpp numbers.cpp
+ libyacasnumbers_la_LDFLAGS = -rpath $(libdir)
++libyacasnumbers_la_LIBADD = libyacas.la
+ libgmpnumbers_la_SOURCES = gmpnumbers.cpp numbers.cpp
+ libgmpnumbers_la_LDFLAGS = -rpath $(libdir)
+ 
diff --git a/sci-mathematics/yacas/yacas-1.0.63.ebuild b/sci-mathematics/yacas/yacas-1.0.63.ebuild
index 1721f4e0a765..bdd75a128279 100644
--- a/sci-mathematics/yacas/yacas-1.0.63.ebuild
+++ b/sci-mathematics/yacas/yacas-1.0.63.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.0.63.ebuild,v 1.2 2007/01/29 16:09:01 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/yacas/yacas-1.0.63.ebuild,v 1.3 2007/05/04 01:33:03 markusle Exp $
 
-inherit eutils flag-o-matic
+inherit autotools eutils flag-o-matic
 
 IUSE="glut server"
 
@@ -23,11 +23,16 @@ DEPEND="virtual/libc
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+
 	if ! use glut; then
-		sed -e 's:opengl::g' -i plugins/Makefile.in || die "sed (opengl) failed"
+		sed -e 's:opengl::g' -i plugins/Makefile.am || \
+			die "sed (opengl) failed"
 		sed -e 's/\(^PLUGINDOCSCHAPTERS.*\)opengl.chapt\(.*\)/\1 \2/' -i \
-		manmake/Makefile.in || die 'sed (manmake) failed'
+		manmake/Makefile.am || die 'sed (manmake) failed'
 	fi
+
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	eautoreconf
 }
 
 src_compile() {