New revision with libwww-config re-ordering patch

4 files changed, 75 insertions, 4 deletions

diff --git a/net-libs/libwww/Manifest b/net-libs/libwww/Manifest
index 518d8060b349..d0d20b9062b6 100644
--- a/net-libs/libwww/Manifest
+++ b/net-libs/libwww/Manifest
@@ -1,9 +1,8 @@
 MD5 61e2d69b9efdbf508eb61be4ba3e15af libwww-5.4.0-r1.ebuild 1057
-MD5 f25e3ae22c3a2a9df62496193c313a01 libwww-5.4.0-r2.ebuild 1116
-MD5 ba9008b2effffb58d0ba668677fe8dbd .libwww-5.4.0-r2.ebuild.swp 12288
-MD5 43f888af44466d92e0a473c2cc0e24ef ChangeLog 2340
+MD5 9402da0d3a3fbcd72dea488325460967 libwww-5.4.0-r2.ebuild 1214
+MD5 5104b341ad10f19dde6011567eacf90f ChangeLog 2711
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 2d0b4e1aa52c0537305e78ad8e64ef15 files/libwww-config-liborder.patch 524
+MD5 e99f48d15e0834666b84203b48805872 files/libwww-config-liborder.patch 776
 MD5 23078d7f8b1327132caea8473ffae786 files/digest-libwww-5.4.0-r1 66
 MD5 23078d7f8b1327132caea8473ffae786 files/digest-libwww-5.4.0-r2 66
 MD5 507c03693bfa1c4f9974efbc3644c682 files/libwww-5.4.0-gentoo.diff 1089
diff --git a/net-libs/libwww/files/digest-libwww-5.4.0-r2 b/net-libs/libwww/files/digest-libwww-5.4.0-r2
new file mode 100644
index 000000000000..f875bc95b421
--- /dev/null
+++ b/net-libs/libwww/files/digest-libwww-5.4.0-r2
@@ -0,0 +1 @@
+MD5 c3734ca6caa405707e134cc8c6d7e422 w3c-libwww-5.4.0.tgz 1129121
diff --git a/net-libs/libwww/files/libwww-config-liborder.patch b/net-libs/libwww/files/libwww-config-liborder.patch
new file mode 100644
index 000000000000..81bf124666d0
--- /dev/null
+++ b/net-libs/libwww/files/libwww-config-liborder.patch
@@ -0,0 +1,11 @@
+--- libwww-config.in.old	2003-10-07 14:49:22.878846832 +0800
++++ libwww-config.in	2003-10-07 14:51:19.242156920 +0800
+@@ -48,7 +48,7 @@
+       echo -I@includedir@ -I@includedir@/@PACKAGE@ @DEFS@
+       ;;
+     --libs)
+-      echo -L@libdir@ @LWWWXML@ @LWWWZIP@ @LWWWWAIS@ @LWWWSQL@ -lwwwinit -lwwwapp -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LIBS@
++      echo -L@libdir@ @LWWWSQL@ -lwwwinit -lwwwapp @LWWWXML@ @LWWWZIP@ @LWWWWAIS@ -lwwwhtml -lwwwtelnet -lwwwnews -lwwwhttp -lwwwmime -lwwwgopher -lwwwftp -lwwwfile -lwwwdir -lwwwcache -lwwwstream -lwwwmux -lwwwtrans -lwwwcore -lwwwutils @LWWWMD5@ @LIBS@
+       ;;
+     *)
+       echo "${usage}" 1>&2
diff --git a/net-libs/libwww/libwww-5.4.0-r2.ebuild b/net-libs/libwww/libwww-5.4.0-r2.ebuild
new file mode 100644
index 000000000000..fb4e2c1fb228
--- /dev/null
+++ b/net-libs/libwww/libwww-5.4.0-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r2.ebuild,v 1.1 2003/10/07 07:06:15 obz Exp $
+
+IUSE="ssl mysql"
+
+inherit libtool
+
+MY_P=w3c-${P}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="A general-purpose client side WEB API"
+SRC_URI="http://www.w3.org/Library/Distribution/${MY_P}.tgz"
+HOMEPAGE="http://www.w3.org/Library/"
+
+SLOT="0"
+LICENSE="W3C"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64"
+
+RDEPEND="dev-lang/perl
+	>=sys-libs/zlib-1.1.4
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )"
+
+DEPEND="!dev-libs/9libs
+	>=sys-devel/autoconf-2.13
+	${RDEPEND}"
+
+src_unpack() {
+
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	# patch for libwww-config library ordering
+	# see bug #30185 for one instance <obz@gentoo.org>
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-config-liborder.patch
+
+}
+
+src_compile() {
+
+	elibtoolize
+
+	econf \
+		--enable-shared \
+		--enable-static \
+		--with-zlib \
+		--with-md5 \
+		--with-expat \
+		`use_with mysql` \
+		`use_with ssl` \
+		|| die
+
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+	dodoc COPYRIGH ChangeLog
+	dohtml -r .
+}