Fix --as-needed. Thanks to Shunichi Fuji <palglowr@gmail.com> for providing a patch. This closes bug #129438.

Package-Manager: portage-2.1.1

4 files changed, 35 insertions, 21 deletions

diff --git a/x11-terms/mlterm/ChangeLog b/x11-terms/mlterm/ChangeLog
index 63e87e22d4f8..6652871b3e0e 100644
--- a/x11-terms/mlterm/ChangeLog
+++ b/x11-terms/mlterm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-terms/mlterm
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.52 2006/11/01 18:53:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/ChangeLog,v 1.53 2006/11/05 16:01:10 usata Exp $
+
+  05 Nov 2006; Mamoru KOMACHI <usata@gentoo.org>
+  +files/mlterm-2.9.3-asneeded.diff, mlterm-2.9.3-r1.ebuild:
+  Fix --as-needed. Thanks to Shunichi Fuji <palglowr@gmail.com> for providing
+  a patch. This closes bug #129438.
 
   01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> mlterm-2.9.2.ebuild,
   -mlterm-2.9.3.ebuild, mlterm-2.9.3-r1.ebuild:
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 73ff52463779..f9b958cc876a 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,24 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mlterm-2.9.1-gentoo.diff 346 RMD160 ac1c41ff99912955626daee5dbe38cf77600bace SHA1 b6c0f7514c024e9b8879dadb95fe5c69a70c706f SHA256 d3a79cead3359b0700329ae0df2bcd88e8c3d83911ddd948bc015f488309748c
 MD5 35f136547978c18aed013cdfd088d098 files/mlterm-2.9.1-gentoo.diff 346
 RMD160 ac1c41ff99912955626daee5dbe38cf77600bace files/mlterm-2.9.1-gentoo.diff 346
 SHA256 d3a79cead3359b0700329ae0df2bcd88e8c3d83911ddd948bc015f488309748c files/mlterm-2.9.1-gentoo.diff 346
-DIST mlterm-2.9.2.tar.gz 1980109 RMD160 c83693c353f266333dc85588d8c1366925cca79c SHA256 e5ff08c516c4edabc51b12e177b6e653a8d01ea5bec2684b9db2c75ec95d268a
+AUX mlterm-2.9.3-asneeded.diff 655 RMD160 f020bbc01a27f1a133b43b9a37bc2a28a87c6a81 SHA1 dae2d1107484e0eb11a33b4b385f7d071e223942 SHA256 41a134c9adfdfc6b7e4f7f1cd2eb7e45b67b10a1b525e2ad3c8bd6ed581f2d78
+MD5 3a854d4b0b4c851e934d1a6d308e8633 files/mlterm-2.9.3-asneeded.diff 655
+RMD160 f020bbc01a27f1a133b43b9a37bc2a28a87c6a81 files/mlterm-2.9.3-asneeded.diff 655
+SHA256 41a134c9adfdfc6b7e4f7f1cd2eb7e45b67b10a1b525e2ad3c8bd6ed581f2d78 files/mlterm-2.9.3-asneeded.diff 655
+DIST mlterm-2.9.2.tar.gz 1980109 RMD160 c83693c353f266333dc85588d8c1366925cca79c SHA1 d71f07bb38553a7cae927f15b8d0a20a165eebe7 SHA256 e5ff08c516c4edabc51b12e177b6e653a8d01ea5bec2684b9db2c75ec95d268a
 DIST mlterm-2.9.3.tar.gz 1984977 RMD160 27f4381a8b8b68b07e53bbeb422581beb7527b48 SHA1 65ba5a7bd83accf7f621f84b84debb35c8f215ef SHA256 565e2d3d391390450b953b13f4c1ebf6e67e188c1ec56583459842e592a08e4f
 EBUILD mlterm-2.9.2.ebuild 1656 RMD160 2ae48acf304c80685b675769dcee8c1f9e97b3c2 SHA1 f221c26e2ad6471dbc2960df354e1f3833f27e9f SHA256 a904bdd3dff8265817c4205342a9c0f6eac124397c5fbad6402aadc11d2070d8
 MD5 2fa926803207b28fcd083772f897a440 mlterm-2.9.2.ebuild 1656
 RMD160 2ae48acf304c80685b675769dcee8c1f9e97b3c2 mlterm-2.9.2.ebuild 1656
 SHA256 a904bdd3dff8265817c4205342a9c0f6eac124397c5fbad6402aadc11d2070d8 mlterm-2.9.2.ebuild 1656
-EBUILD mlterm-2.9.3-r1.ebuild 1787 RMD160 0a7cf2ff3875f1137e4bd5ffde461b90f3e7762e SHA1 59225407de289e85410d6b119c51c1f09f7dd327 SHA256 2ea18e5724e1a5123586cbb3aa8b871bead2ab3452d747ea6e13d4839f9f1511
-MD5 043eb54c032012e9bcb08688db2965e2 mlterm-2.9.3-r1.ebuild 1787
-RMD160 0a7cf2ff3875f1137e4bd5ffde461b90f3e7762e mlterm-2.9.3-r1.ebuild 1787
-SHA256 2ea18e5724e1a5123586cbb3aa8b871bead2ab3452d747ea6e13d4839f9f1511 mlterm-2.9.3-r1.ebuild 1787
-MISC ChangeLog 6831 RMD160 7cfd045f72125af7d3cd536de6f856579c0215b8 SHA1 20d21903c4b4f3ac3de1ba32c5235ee97742fd77 SHA256 5abb9dae3c7a8e0c94b2b8bc231d6688f1ae944da5d3df35b7e00de39ac5aad0
-MD5 421eedcf97b5be729b73863ba02cdc65 ChangeLog 6831
-RMD160 7cfd045f72125af7d3cd536de6f856579c0215b8 ChangeLog 6831
-SHA256 5abb9dae3c7a8e0c94b2b8bc231d6688f1ae944da5d3df35b7e00de39ac5aad0 ChangeLog 6831
+EBUILD mlterm-2.9.3-r1.ebuild 1822 RMD160 d00f4d0c2e3c68e6616fb500f5423eefb93d8e17 SHA1 ab1ecba4064c798b40ead72b3b3a8673e0377f4a SHA256 73a14ae6220861ab9e7f7fc4282c608917f662f508617910daaf31bead3e3453
+MD5 7d3724fb8771ce615ac0d85f579e80df mlterm-2.9.3-r1.ebuild 1822
+RMD160 d00f4d0c2e3c68e6616fb500f5423eefb93d8e17 mlterm-2.9.3-r1.ebuild 1822
+SHA256 73a14ae6220861ab9e7f7fc4282c608917f662f508617910daaf31bead3e3453 mlterm-2.9.3-r1.ebuild 1822
+MISC ChangeLog 7052 RMD160 4d7797124d33ef89a47013b3dd3406f78dcef612 SHA1 8bc376651430d3e5a13a387ec855f1c0c1bbfebe SHA256 5f314176cafab1550d50f613b40ff316b54ae82c9819bb094b171da7735798e8
+MD5 bc25c03cbfd4157de4547f1ed2169617 ChangeLog 7052
+RMD160 4d7797124d33ef89a47013b3dd3406f78dcef612 ChangeLog 7052
+SHA256 5f314176cafab1550d50f613b40ff316b54ae82c9819bb094b171da7735798e8 ChangeLog 7052
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
@@ -29,10 +30,3 @@ SHA256 c6125ad64ceaf79f84e35f8d045951490678fd8841b0eb9549e368ef98a9ad09 files/di
 MD5 92fac2c8c32cb0aa495d9851faa4e6db files/digest-mlterm-2.9.3-r1 241
 RMD160 3534dad49be3dcbdb8b4fbf8cb2546a39316922a files/digest-mlterm-2.9.3-r1 241
 SHA256 1bee987d0bc73e81678baf874978df55bf62737ff194844c395144c400d45936 files/digest-mlterm-2.9.3-r1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFSOpOAiZjviIA2XgRArZ9AJ0SAF/Wsuqe94h56TrgrWvqp8F4fgCg23yY
-30LIG5bK6y07av9XSlkUgoM=
-=GKN1
------END PGP SIGNATURE-----
diff --git a/x11-terms/mlterm/files/mlterm-2.9.3-asneeded.diff b/x11-terms/mlterm/files/mlterm-2.9.3-asneeded.diff
new file mode 100644
index 000000000000..8a8e848e4122
--- /dev/null
+++ b/x11-terms/mlterm/files/mlterm-2.9.3-asneeded.diff
@@ -0,0 +1,14 @@
+--- xwindow/Makefile.in.orig	2006-11-03 13:14:34.000000000 +0900
++++ xwindow/Makefile.in	2006-11-03 13:14:39.000000000 +0900
+@@ -42,9 +42,9 @@
+ 	-DLIBEXECDIR=\"$(LIBEXECDIR)\" -DDATADIR=\"$(DATADIR)\"\
+ 	-I$(top_srcdir)/mlterm -I${top_builddir}/xwindow -I/usr/local/include
+ 
+-LIBS=$(LIBS_LOCAL) @IND_LIBS@ @FRIBIDI_LIBS@ @IMAGELIB_LIBS@ @AA_LIBS@ \
++LIBS=$(LIBS_LOCAL) @IND_LIBS@ @IMAGELIB_LIBS@ @AA_LIBS@ \
+ 	@DL_LIBS_IM@ @DL_LIBS_SB@ \
+-	@X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ $(LMLTERM) $(LMKF) $(LKIK) \
++	@X_LIBS@ @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@ $(LMLTERM) @FRIBIDI_LIBS@ $(LMKF) $(LKIK) \
+ 	-L/usr/local/lib -R/usr/local/lib
+ 
+ PROG = mlterm
diff --git a/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild b/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild
index 14ae951915ec..1b274c68242e 100644
--- a/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild
+++ b/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild,v 1.3 2006/11/01 18:53:41 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/mlterm/mlterm-2.9.3-r1.ebuild,v 1.4 2006/11/05 16:01:10 usata Exp $
 
 inherit eutils flag-o-matic
 
@@ -33,6 +33,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}/xwindow
 	epatch ${FILESDIR}/mlterm-2.9.1-gentoo.diff
+	epatch ${FILESDIR}/${P}-asneeded.diff
 }
 
 src_compile() {