Merged new --as-needed fixes, bug #131698

(Portage version: 2.1_pre10)

4 files changed, 74 insertions, 27 deletions

diff --git a/net-libs/libwww/ChangeLog b/net-libs/libwww/ChangeLog
index 5305a8084ebf..8ab59a33e0ec 100644
--- a/net-libs/libwww/ChangeLog
+++ b/net-libs/libwww/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libwww
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.53 2006/04/14 20:07:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.54 2006/05/01 09:55:57 ehmsen Exp $
+
+  01 May 2006; Martin Ehmsen <ehmsen@gentoo.org>
+  files/libwww-5.4.0-asneeded.patch:
+  Merged new --as-needed fixes thanks to TGL <degrenier@easyconnect.fr>, bug
+  #131698.
 
   14 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> libwww-5.4.0-r5.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/net-libs/libwww/files/digest-libwww-5.4.0-r3 b/net-libs/libwww/files/digest-libwww-5.4.0-r3
index c421f4580c12..7a45b56e4053 100644
--- a/net-libs/libwww/files/digest-libwww-5.4.0-r3
+++ b/net-libs/libwww/files/digest-libwww-5.4.0-r3
@@ -1,2 +1,6 @@
-MD5 c3734ca6caa405707e134cc8c6d7e422 w3c-libwww-5.4.0.tgz 1129121
 MD5 dcaddf44692252045090584a7d63082c libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
+RMD160 c15263ce045333f03a6f655ff3aaaf0dd14eac35 libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
+SHA256 a2e64a286c691075df952763de38bb5f5ad3611d089d3b8b9c8d7c2d2b7d1bbb libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
+MD5 c3734ca6caa405707e134cc8c6d7e422 w3c-libwww-5.4.0.tgz 1129121
+RMD160 12e55ecb2435f9048d627e56f8ae60d4c246648b w3c-libwww-5.4.0.tgz 1129121
+SHA256 64841cd99a41c84679cfbc777ebfbb78bdc2a499f7f6866ccf5cead391c867ef w3c-libwww-5.4.0.tgz 1129121
diff --git a/net-libs/libwww/files/digest-libwww-5.4.0-r4 b/net-libs/libwww/files/digest-libwww-5.4.0-r4
index 5464fae96380..7a45b56e4053 100644
--- a/net-libs/libwww/files/digest-libwww-5.4.0-r4
+++ b/net-libs/libwww/files/digest-libwww-5.4.0-r4
@@ -1,2 +1,6 @@
 MD5 dcaddf44692252045090584a7d63082c libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
+RMD160 c15263ce045333f03a6f655ff3aaaf0dd14eac35 libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
+SHA256 a2e64a286c691075df952763de38bb5f5ad3611d089d3b8b9c8d7c2d2b7d1bbb libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
 MD5 c3734ca6caa405707e134cc8c6d7e422 w3c-libwww-5.4.0.tgz 1129121
+RMD160 12e55ecb2435f9048d627e56f8ae60d4c246648b w3c-libwww-5.4.0.tgz 1129121
+SHA256 64841cd99a41c84679cfbc777ebfbb78bdc2a499f7f6866ccf5cead391c867ef w3c-libwww-5.4.0.tgz 1129121
diff --git a/net-libs/libwww/files/libwww-5.4.0-asneeded.patch b/net-libs/libwww/files/libwww-5.4.0-asneeded.patch
index df557bf9b110..d7fddbc443ac 100644
--- a/net-libs/libwww/files/libwww-5.4.0-asneeded.patch
+++ b/net-libs/libwww/files/libwww-5.4.0-asneeded.patch
@@ -1,8 +1,7 @@
-Index: w3c-libwww-5.4.0/Library/src/Makefile.am
-===================================================================
---- w3c-libwww-5.4.0.orig/Library/src/Makefile.am
-+++ w3c-libwww-5.4.0/Library/src/Makefile.am
-@@ -33,7 +33,7 @@ EXTRA_LTLIBRARIES = \
+diff -urN w3c-libwww-5.4.0.orig/Library/src/Makefile.am w3c-libwww-5.4.0/Library/src/Makefile.am
+--- w3c-libwww-5.4.0.orig/Library/src/Makefile.am	2002-05-29 18:09:13.000000000 +0200
++++ w3c-libwww-5.4.0/Library/src/Makefile.am	2006-04-30 22:54:18.000000000 +0200
+@@ -33,7 +33,7 @@
          libwwwdav.la \
  	libwwwsql.la
  
@@ -11,7 +10,17 @@ Index: w3c-libwww-5.4.0/Library/src/Makefile.am
  
  #	.h files are distributed but originally are made from the
  #	self-documenting hypertext files.
-@@ -181,6 +181,7 @@ libwwwstream_la_SOURCES = \
+@@ -144,6 +144,9 @@
+ 	HTWWWStr.h \
+ 	HTWWWStr.c
+ 
++libwwwcore_la_LIBADD = \
++	libwwwutils.la
++
+ libwwwtrans_la_SOURCES = \
+ 	WWWTrans.h \
+ 	HTANSI.h \
+@@ -181,6 +184,7 @@
  	HTTee.c \
  	HTXParse.h \
  	HTXParse.c
@@ -19,7 +28,7 @@ Index: w3c-libwww-5.4.0/Library/src/Makefile.am
  
  libwwwcache_la_SOURCES = \
  	WWWCache.h \
-@@ -197,6 +198,9 @@ libwwwfile_la_SOURCES = \
+@@ -197,6 +201,9 @@
  	HTFile.c \
  	HTMulti.h \
  	HTMulti.c
@@ -29,7 +38,7 @@ Index: w3c-libwww-5.4.0/Library/src/Makefile.am
  
  libwwwftp_la_SOURCES = \
  	WWWFTP.h \
-@@ -225,6 +229,9 @@ libwwwmime_la_SOURCES = \
+@@ -225,6 +232,9 @@
  	HTMIMImp.h \
  	HTMIMImp.c \
  	HTMulpar.h
@@ -39,22 +48,19 @@ Index: w3c-libwww-5.4.0/Library/src/Makefile.am
  
  libwwwhttp_la_SOURCES = \
  	WWWHTTP.h \
-@@ -252,8 +259,13 @@ libwwwhttp_la_SOURCES = \
+@@ -252,8 +262,9 @@
  	HTPEP.h \
  	HTPEP.c
  
-+libwwwhttp_la_LIBADD = \
-+	../../modules/md5/libmd5.la \
-+	libwwwmime.la
-+
- libwwwhttp_la_DEPENDENCIES = \
+-libwwwhttp_la_DEPENDENCIES = \
 -	../../modules/md5/libmd5.la
++libwwwhttp_la_LIBADD = \
 +	../../modules/md5/libmd5.la \
 +	libwwwmime.la
  
  libwwwnews_la_SOURCES = \
  	WWWNews.h \
-@@ -310,6 +322,8 @@ libwwwdir_la_SOURCES = \
+@@ -310,6 +321,8 @@
  	HTDescpt.c \
  	HTDir.h \
  	HTDir.c
@@ -63,11 +69,40 @@ Index: w3c-libwww-5.4.0/Library/src/Makefile.am
  
  libwwwapp_la_SOURCES = \
  	WWWApp.h \
-Index: w3c-libwww-5.4.0/Library/src/SSL/Makefile.am
-===================================================================
---- w3c-libwww-5.4.0.orig/Library/src/SSL/Makefile.am
-+++ w3c-libwww-5.4.0/Library/src/SSL/Makefile.am
-@@ -39,6 +39,14 @@ libwwwssl_la_SOURCES = \
+@@ -334,6 +347,16 @@
+ 	HTRules.h \
+ 	HTRules.c
+ 
++libwwwapp_la_LIBADD = \
++	libwwwmime.la \
++	libwwwhttp.la \
++	libwwwnews.la \
++	libwwwftp.la \
++	libwwwxml.la \
++	libwwwtelnet.la \
++	libwwwgopher.la \
++	libwwwzip.la
++
+ libwwwinit_la_SOURCES = \
+ 	WWWInit.h \
+ 	HTProfil.h \
+@@ -362,9 +385,10 @@
+ 	HTXML.h \
+ 	HTXML.c
+ 
+-libwwwxml_la_DEPENDENCIES = \
++libwwwxml_la_LIBADD = \
+ 	../../modules/expat/xmltok/libxmltok.la \
+-	../../modules/expat/xmlparse/libxmlparse.la
++	../../modules/expat/xmlparse/libxmlparse.la \
++	libwwwcore.la
+ 
+ libwwwxml_la_LDFLAGS = -rpath $(libdir)
+ 
+diff -urN w3c-libwww-5.4.0.orig/Library/src/SSL/Makefile.am w3c-libwww-5.4.0/Library/src/SSL/Makefile.am
+--- w3c-libwww-5.4.0.orig/Library/src/SSL/Makefile.am	2000-06-20 13:01:34.000000000 +0200
++++ w3c-libwww-5.4.0/Library/src/SSL/Makefile.am	2006-04-30 22:53:39.000000000 +0200
+@@ -39,6 +39,14 @@
  	HTSSLhttps.h \
  	HTSSLhttps.c
  
@@ -82,11 +117,10 @@ Index: w3c-libwww-5.4.0/Library/src/SSL/Makefile.am
  libwwwssl_la_LDFLAGS = -rpath $(libdir)
  
  LDADD = \
-Index: w3c-libwww-5.4.0/PICS-client/src/Makefile.am
-===================================================================
---- w3c-libwww-5.4.0.orig/PICS-client/src/Makefile.am
-+++ w3c-libwww-5.4.0/PICS-client/src/Makefile.am
-@@ -29,6 +29,8 @@ libpics_la_SOURCES = \
+diff -urN w3c-libwww-5.4.0.orig/PICS-client/src/Makefile.am w3c-libwww-5.4.0/PICS-client/src/Makefile.am
+--- w3c-libwww-5.4.0.orig/PICS-client/src/Makefile.am	2000-08-04 11:48:37.000000000 +0200
++++ w3c-libwww-5.4.0/PICS-client/src/Makefile.am	2006-04-30 22:53:39.000000000 +0200
+@@ -29,6 +29,8 @@
  	CSLabel.c	CSLLOut.c	CSLLURLs.c \
  	CSMacRed.c	CSMem.c		CSApp.c \
  	CSParse.c	CSUsrLst.c	CSUser.c