Fixed as-needed issues (see bug #244547).

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-SENTINEL-3 i686

4 files changed, 22 insertions, 14 deletions

diff --git a/sci-mathematics/pspp/ChangeLog b/sci-mathematics/pspp/ChangeLog
index 2e4772367d5c..8d2d08e269aa 100644
--- a/sci-mathematics/pspp/ChangeLog
+++ b/sci-mathematics/pspp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/pspp
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.7 2008/08/06 20:47:47 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/ChangeLog,v 1.8 2008/10/28 13:36:24 markusle Exp $
+
+  28 Oct 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/pspp-0.6.0-as-needed.patch, pspp-0.6.0.ebuild:
+  Fixed as-needed issues (see bug #244547).
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-mathematics/pspp/Manifest b/sci-mathematics/pspp/Manifest
index fcc7422394ca..203b1a9a63e3 100644
--- a/sci-mathematics/pspp/Manifest
+++ b/sci-mathematics/pspp/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50pspp-gentoo.el 171 RMD160 99882e34577c8209dafcd422e210af596bde5057 SHA1 c611390e4c21388b70d29dbc2a9a6f5eba41d8c2 SHA256 92296e81ab389b4c639a67cd015e19d63cf8e40664a95fc568c2c6b6e7608940
+AUX pspp-0.6.0-as-needed.patch 380 RMD160 320cd0f8d8ba96b0c8dfe8d745a49e45947f6e90 SHA1 2bfd20030a9702c6b2dff5e1f209995db0bd3d0a SHA256 4461de6c4109d85e7ec77d626bb39ac2ece904200412b77202184659bca048fc
 AUX pspp-0.6.0-disable-inline.patch 4390 RMD160 08daa6269532ed88ea50556f4e71050d50e94ec1 SHA1 80e643c71fee35deaf8881d76de3f5d307531bbd SHA256 3e8ff92284452805c3663677825b93e3c54970131f1a24a25f821a04e10de602
 DIST pspp-0.4.0.tar.gz 1566807 RMD160 28c52e4ee530c80acf37d7cbea4e45aaefc11f7c SHA1 382c76ccbc62f881e439c38095b1f520b2627706 SHA256 b19403e15848ad0f0b393ed4e52beeb236fd4badfdfa63fe3e680f9cc683ca24
 DIST pspp-0.6.0.tar.gz 2872929 RMD160 889745e4b423845f0d87cdfb38004320475dff49 SHA1 b6a89d758a39c9c53803a8b44d73899e9219e33c SHA256 8c85ada08e2133846efc221d88b6b3abd9a525587b1630b246a1887120d0804e
 EBUILD pspp-0.4.0.ebuild 1561 RMD160 ae630b5c06d8a71298989324abcf9940a4198a30 SHA1 11e558cbcb64ca0177dd697ed6939fef0eb2a4f3 SHA256 ca99d27287852a124773006228fba4075bcb7214fb107e2fcfaa726554cd6f4a
-EBUILD pspp-0.6.0.ebuild 1831 RMD160 1e4dae137c96b842b87ac36f512177e7014c0ce5 SHA1 ab72621a71044d173d53e2b8bb6561b588b7e44b SHA256 872f6479af55213f77a412f768e304c1980a1e9f695f153fea094e030cdfc1fc
-MISC ChangeLog 1411 RMD160 341f616438cc8b8a141424519e8e498e406b7c62 SHA1 00066901abb69fe9ca7d7178745081452df03972 SHA256 48160a03d1f8d8a96386d680657cf0d7a6b2d6377c876c7add8c74f00de8fc20
+EBUILD pspp-0.6.0.ebuild 1873 RMD160 681898adf6e7a396904a9201c0ba3cf8beab76c6 SHA1 8a1dfcd2e14b82ad12cf28a77d7bfbf8da393cb0 SHA256 2bd9599e2faf08e59767f0aa1d27c14229837b652dd8e8ddf255b80a970c016e
+MISC ChangeLog 1570 RMD160 ed6672dd6e25abab54cceadd471e1f52fc5c1f11 SHA1 84b0f2a26c9973b32c25170dc12ab562e62df318 SHA256 b6dde0ecbb2dadce37e55bea34175dc1592838357cd9c4740f8ce3320dd360ca
 MISC metadata.xml 640 RMD160 bd10b34d9d13a88fd4d6ccda59b639a1131f8663 SHA1 80ea127c3ab4083e65366122c7fa089c9e0c0948 SHA256 e0d565e2178f3d573a230584f89940fb03fdb064e24b9c8722636d2c6f38a860
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiaDgQACgkQOeoy/oIi7uxsfQCgow5UfPK0DFYkbDbFY/DvuTjq
-PTsAoLmty3mJf7OHFnr3SzIf9TKMnDAA
-=m6Wo
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/pspp/files/pspp-0.6.0-as-needed.patch b/sci-mathematics/pspp/files/pspp-0.6.0-as-needed.patch
new file mode 100644
index 000000000000..88257292de6a
--- /dev/null
+++ b/sci-mathematics/pspp/files/pspp-0.6.0-as-needed.patch
@@ -0,0 +1,12 @@
+diff -Naur pspp-0.6.0/src/ui/terminal/automake.mk pspp-0.6.0.new/src/ui/terminal/automake.mk
+--- pspp-0.6.0/src/ui/terminal/automake.mk	2008-05-03 01:59:39.000000000 -0400
++++ pspp-0.6.0.new/src/ui/terminal/automake.mk	2008-10-28 09:20:50.000000000 -0400
+@@ -37,7 +37,7 @@
+ 	$(NCURSES_LIBS) \
+ 	$(LIBICONV) \
+ 	gl/libgl.la \
+-	@LIBINTL@ @LIBREADLINE@
++	@LIBINTL@ -lreadline
+ 
+ 
+ 
diff --git a/sci-mathematics/pspp/pspp-0.6.0.ebuild b/sci-mathematics/pspp/pspp-0.6.0.ebuild
index cfcbfd414f6b..4b793a5ee5d9 100644
--- a/sci-mathematics/pspp/pspp-0.6.0.ebuild
+++ b/sci-mathematics/pspp/pspp-0.6.0.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/sci-mathematics/pspp/pspp-0.6.0.ebuild,v 1.2 2008/06/30 23:11:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/pspp/pspp-0.6.0.ebuild,v 1.3 2008/10/28 13:36:24 markusle Exp $
 
 inherit elisp-common autotools
 
@@ -32,6 +32,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-disable-inline.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
 	eautoreconf
 }