Fixed conflict with strategeo. Closing Bug #30088

5 files changed, 58 insertions, 5 deletions

diff --git a/net-libs/libwww/ChangeLog b/net-libs/libwww/ChangeLog
index c31f23a77a9a..51c13ebc2f3e 100644
--- a/net-libs/libwww/ChangeLog
+++ b/net-libs/libwww/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for net-libs/libwww
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.13 2003/05/14 22:27:29 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.14 2003/10/02 10:08:47 usata Exp $
 
 *libwww-5.4.0-r1 (05 Sep 2002)
 
+  02 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> libwww-5.4.0-r1.ebuild,
+  files/libwww-5.4.0-gentoo.diff:
+  Added a patch to fix conflict with stratego. Thanks to Kevin Quick
+  <quick@null.net> for reporting the Bug #30038.
+
   14 May 2003; Robin Johnson <robbat2@gentoo.org> libwww-5.4.0-r1.ebuild:
   Add block for !dev-libs/9libs since that causes a compile failure since
   9libs installs a custom libc.h that breaks things.
diff --git a/net-libs/libwww/Manifest b/net-libs/libwww/Manifest
index 6daf598e80d0..eebddc5e6269 100644
--- a/net-libs/libwww/Manifest
+++ b/net-libs/libwww/Manifest
@@ -1,3 +1,5 @@
-MD5 57af9c8eaee1b00a0105f9f47b26c4f3 ChangeLog 1994
-MD5 4ea94e25e936e363874d90b2a472539d libwww-5.4.0-r1.ebuild 1094
+MD5 1ff2575ec8fb3281ed4976f87fc3836e ChangeLog 2218
+MD5 c1e97421401927e555c37694aec02d36 libwww-5.4.0-r1.ebuild 1188
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
 MD5 23078d7f8b1327132caea8473ffae786 files/digest-libwww-5.4.0-r1 66
+MD5 507c03693bfa1c4f9974efbc3644c682 files/libwww-5.4.0-gentoo.diff 1089
diff --git a/net-libs/libwww/files/libwww-5.4.0-gentoo.diff b/net-libs/libwww/files/libwww-5.4.0-gentoo.diff
new file mode 100644
index 000000000000..01058215f326
--- /dev/null
+++ b/net-libs/libwww/files/libwww-5.4.0-gentoo.diff
@@ -0,0 +1,33 @@
+diff -urN w3c-libwww-5.4.0.ORIG/configure.in w3c-libwww-5.4.0/configure.in
+--- w3c-libwww-5.4.0.ORIG/configure.in	2002-06-12 18:26:46.000000000 +0900
++++ w3c-libwww-5.4.0/configure.in	2003-10-02 18:43:41.000000000 +0900
+@@ -618,19 +618,16 @@
+   ssllib="-L/usr/lib -lssl -lcrypto"
+ fi
+ dnl find the ssl include dir (empirical)
+-if test -d '/usr/local/ssl/include'; then
+-  sslinc="-I/usr/local/ssl/include"
+-elif test -d '/usr/local/openssl/include'; then
+-  sslinc="-I/usr/local/openssl/include"
+-elif test -d '/usr/local/include/openssl'; then
+-  sslinc="-I/usr/local/include/openssl"
+-elif test -d '/usr/include/ssl'; then
+-  sslinc="-I/usr/include/ssl"
+-elif test -d '/usr/include/openssl'; then
+-  sslinc="-I/usr/include/openssl"
+-else
+-  sslinc=""
+-fi
++ssldir=""
++for ssldir in /usr/local/ssl/include \
++              /usr/local/openssl/include \
++              /usr/local/include/openssl \
++              /usr/include/ssl \
++              /usr/include/openssl ; do
++  if test -d $ssldir -a -f $ssldir/ssl.h ; then
++    sslinc="-I$ssldir"
++  fi
++done
+ WWWSSL=""
+ SSLINC=""
+ LIBSSL=""
diff --git a/net-libs/libwww/libwww-5.4.0-r1.ebuild b/net-libs/libwww/libwww-5.4.0-r1.ebuild
index 20fde4bb103e..71b7bd6a50a3 100644
--- a/net-libs/libwww/libwww-5.4.0-r1.ebuild
+++ b/net-libs/libwww/libwww-5.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.14 2003/09/06 22:04:23 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r1.ebuild,v 1.15 2003/10/02 10:08:47 usata Exp $
 
 IUSE="ssl mysql"
 
@@ -21,7 +21,15 @@ RDEPEND="dev-lang/perl
 	mysql? ( >=dev-db/mysql-3.23.26 )
 	ssl? ( >=dev-libs/openssl-0.9.6 )"
 
-DEPEND="!dev-libs/9libs ${RDEPEND}"
+DEPEND="!dev-libs/9libs
+	>=sys-devel/autoconf-2.13
+	${RDEPEND}"
+
+src_unpack() {
+
+	unpack ${A}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+}
 
 src_compile() {
 	local myconf
diff --git a/net-libs/libwww/metadata.xml b/net-libs/libwww/metadata.xml
new file mode 100644
index 000000000000..06689a1a9114
--- /dev/null
+++ b/net-libs/libwww/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>text-markup</herd>
+</pkgmetadata>