-r5 : allow --as-needed, correct problem with autoreconf and simplify ebuild for ppc-macos (bug #117919).

(Portage version: 2.1_pre3-r1)

7 files changed, 139 insertions, 3 deletions

diff --git a/net-libs/libwww/ChangeLog b/net-libs/libwww/ChangeLog
index f10aada6bacd..4e36c3734cd8 100644
--- a/net-libs/libwww/ChangeLog
+++ b/net-libs/libwww/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-libs/libwww
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.49 2005/11/20 13:21:05 hardave Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.50 2006/01/06 14:31:36 nattfodd Exp $
+
+*libwww-5.4.0-r5 (06 Jan 2006)
+
+  06 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org>
+  +files/libwww-5.4.0-asneeded.patch,
+  +files/libwww-5.4.0-automake-macos.patch,
+  +files/libwww-5.4.0-noexport.patch, +libwww-5.4.0-r5.ebuild:
+  Bump to -r5 : allow compilation with --as-needed ldflag, correct a problem
+  when running autoreconf and simplify ebuild for ppc-macos. Thanks to
+  Flameeyes and grobian (bug #117919).
 
   20 Nov 2005; Hardave Riar <hardave@gentoo.org> libwww-5.4.0-r4.ebuild:
   Stable on mips, bug #109040.
diff --git a/net-libs/libwww/Manifest b/net-libs/libwww/Manifest
index 581d839813fa..600b601314e1 100644
--- a/net-libs/libwww/Manifest
+++ b/net-libs/libwww/Manifest
@@ -1,12 +1,17 @@
-MD5 02b138b9457d514cb4d8da32d6197a69 ChangeLog 6872
+MD5 f4cd091babe9da794abeb8d10235f889 ChangeLog 7291
 MD5 078b6239f293e1cc65f3f977b3136317 files/digest-libwww-5.4.0-r3 151
 MD5 4c3f7314020d5a1a6a01463a71b4944c files/digest-libwww-5.4.0-r4 151
+MD5 4c3f7314020d5a1a6a01463a71b4944c files/digest-libwww-5.4.0-r5 151
+MD5 527be27e3543b162b0b8e17602ca233b files/libwww-5.4.0-asneeded.patch 378
 MD5 1866b237427a244b9923469b52f54473 files/libwww-5.4.0-autoconf-gentoo.diff 1089
 MD5 ee0dd3b8a76bf8b9e6d051663119eb40 files/libwww-5.4.0-automake-gentoo.diff 346
+MD5 231e5cc6d075b3464a46858f8d2b65e3 files/libwww-5.4.0-automake-macos.patch 436
 MD5 0851f5aef9f0960efcdcabfdfa960341 files/libwww-5.4.0-disable-ndebug-gentoo.diff 370
 MD5 6853cd848815d9446ef820e3a74878ca files/libwww-5.4.0-htbound.patch 13279
 MD5 b0a8e638d02da0d0284e8555866f1f38 files/libwww-5.4.0-mysql-4.1.patch 1674
+MD5 db10aa1f9442be23cfec06ad586d1afa files/libwww-5.4.0-noexport.patch 402
 MD5 e99f48d15e0834666b84203b48805872 files/libwww-config-liborder.patch 776
 MD5 4c70dae7ce4964982b3ebe728633f9f0 libwww-5.4.0-r3.ebuild 1943
 MD5 469a45f9eb035116e1c88cfaee53eff7 libwww-5.4.0-r4.ebuild 2145
+MD5 b94df7bc6c485d2b32e1041d41a0b735 libwww-5.4.0-r5.ebuild 2189
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
diff --git a/net-libs/libwww/files/digest-libwww-5.4.0-r5 b/net-libs/libwww/files/digest-libwww-5.4.0-r5
new file mode 100644
index 000000000000..5464fae96380
--- /dev/null
+++ b/net-libs/libwww/files/digest-libwww-5.4.0-r5
@@ -0,0 +1,2 @@
+MD5 dcaddf44692252045090584a7d63082c libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
+MD5 c3734ca6caa405707e134cc8c6d7e422 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
new file mode 100644
index 000000000000..f06fde4bf707
--- /dev/null
+++ b/net-libs/libwww/files/libwww-5.4.0-asneeded.patch
@@ -0,0 +1,13 @@
+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
+@@ -197,6 +197,8 @@ libwwwfile_la_SOURCES = \
+ 	HTFile.c \
+ 	HTMulti.h \
+ 	HTMulti.c
++libwwwfile_la_LIBADD = \
++	libwwwdir.la
+ 
+ libwwwftp_la_SOURCES = \
+ 	WWWFTP.h \
diff --git a/net-libs/libwww/files/libwww-5.4.0-automake-macos.patch b/net-libs/libwww/files/libwww-5.4.0-automake-macos.patch
new file mode 100644
index 000000000000..3e020cb7d0c8
--- /dev/null
+++ b/net-libs/libwww/files/libwww-5.4.0-automake-macos.patch
@@ -0,0 +1,13 @@
+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
+@@ -50,7 +50,7 @@ SUFFIXES = .h .html .txt
+     endif
+ 
+ icondir = @icondir@
+-CPPFLAGS := $(CPPFLAGS) -DW3C_ICONS=\"$(icondir)\"
++CPPFLAGS = -DW3C_ICONS=\"$(icondir)\"
+ 
+ inc: $(BUILT_SOURCES)
+ 	@echo Generated built sources
diff --git a/net-libs/libwww/files/libwww-5.4.0-noexport.patch b/net-libs/libwww/files/libwww-5.4.0-noexport.patch
new file mode 100644
index 000000000000..d5cad0ca0e88
--- /dev/null
+++ b/net-libs/libwww/files/libwww-5.4.0-noexport.patch
@@ -0,0 +1,15 @@
+Index: w3c-libwww-5.4.0/Library/User/Makefile.am
+===================================================================
+--- w3c-libwww-5.4.0.orig/Library/User/Makefile.am
++++ w3c-libwww-5.4.0/Library/User/Makefile.am
+@@ -11,8 +11,8 @@ EXTRA_DIST = \
+ 
+ SUBDIRS = Patch Architecture Using Guide Style Platform
+ 
+-BUILT_SOURCES = \
+-	Extrnals.html
++#BUILT_SOURCES = \
++#	Extrnals.html
+ 
+ SUFFIXES = .html
+ 
diff --git a/net-libs/libwww/libwww-5.4.0-r5.ebuild b/net-libs/libwww/libwww-5.4.0-r5.ebuild
new file mode 100644
index 000000000000..2cf525150265
--- /dev/null
+++ b/net-libs/libwww/libwww-5.4.0-r5.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r5.ebuild,v 1.1 2006/01/06 14:31:36 nattfodd Exp $
+
+inherit eutils multilib autotools
+
+MY_P=w3c-${P}
+DESCRIPTION="A general-purpose client side WEB API"
+HOMEPAGE="http://www.w3.org/Library/"
+SRC_URI="http://www.w3.org/Library/Distribution/${MY_P}.tgz
+	mirror://gentoo/libwww-5.4.0-debian-autoconf-2.5.patch.bz2"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="mysql ssl"
+
+RDEPEND=">=sys-libs/zlib-1.1.4
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+
+DEPEND="${RDEPEND}
+	!dev-libs/9libs
+	>=sys-devel/autoconf-2.13
+	dev-lang/perl"
+
+S=${WORKDIR}/${MY_P}
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-config-liborder.patch
+	epatch "${WORKDIR}"/${P}-debian-autoconf-2.5.patch
+	epatch "${FILESDIR}"/${P}-autoconf-gentoo.diff
+	epatch "${FILESDIR}"/${P}-automake-gentoo.diff	# bug #41959
+	epatch "${FILESDIR}"/${P}-disable-ndebug-gentoo.diff	# bug #50483
+	# http://lists.w3.org/Archives/Public/www-lib/2003OctDec/0015.html
+	# http://www.mysql.gr.jp/mysqlml/mysql/msg/8118
+	epatch "${FILESDIR}"/${P}-mysql-4.1.patch
+	# Fix multiple problems, potentially exploitable (bug #109040)
+	epatch "${FILESDIR}"/${P}-htbound.patch
+	# Fix linking while using --as-needed
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	# Drop Externls rebuild after automake
+	epatch "${FILESDIR}/${P}-noexport.patch"
+	# Mac OS X has no automake 1.4, only 1.6.3
+	epatch "${FILESDIR}/${P}-automake-macos.patch"
+
+	eautoreconf || die "autoreconf failed"
+}
+
+src_compile() {
+	if use mysql ; then
+		myconf="--with-mysql=/usr/$(get_libdir)/mysql/libmysqlclient.a"
+	else
+		myconf="--without-mysql"
+	fi
+
+	export ac_cv_header_appkit_appkit_h=no
+	econf \
+		--enable-shared \
+		--enable-static \
+		--with-zlib \
+		--with-md5 \
+		--with-expat \
+		$(use_with ssl) \
+		${myconf} || die "./configure failed"
+
+	emake || die "Compilation failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+	dodoc ChangeLog
+	dohtml -r .
+}