New revision with patch to handle mysql-4.1 support.

5 files changed, 136 insertions, 7 deletions

diff --git a/net-libs/libwww/ChangeLog b/net-libs/libwww/ChangeLog
index 1efa8476ab7c..ab30a6608f77 100644
--- a/net-libs/libwww/ChangeLog
+++ b/net-libs/libwww/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libwww
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.32 2004/07/01 13:33:52 tgall Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.33 2005/05/17 09:18:52 robbat2 Exp $
+
+*libwww-5.4.0-r3 (17 May 2005)
+
+  17 May 2005; Robin H. Johnson <robbat2@gentoo.org>
+  +files/libwww-5.4.0-mysql-4.1.patch, +libwww-5.4.0-r3.ebuild:
+  New revision with patch to handle mysql-4.1 support.
 
   01 Jul 2004; Tom Gall <tgall@gentoo.org> libwww-5.4.0-r2.ebuild:
   stable on ppc64, bug #54799
diff --git a/net-libs/libwww/Manifest b/net-libs/libwww/Manifest
index 468fff602113..96d639a3e112 100644
--- a/net-libs/libwww/Manifest
+++ b/net-libs/libwww/Manifest
@@ -1,9 +1,9 @@
-MD5 27429c8d8b73bef65e72be38c8c840c1 ChangeLog 4651
-MD5 984489f38680d691273e30c3928f674c libwww-5.4.0-r2.ebuild 1659
+MD5 32cbff943adec8f1384336309b004f85 libwww-5.4.0-r3.ebuild 1718
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 078b6239f293e1cc65f3f977b3136317 files/digest-libwww-5.4.0-r2 151
-MD5 507c03693bfa1c4f9974efbc3644c682 files/libwww-5.4.0-gentoo.diff 1089
 MD5 e99f48d15e0834666b84203b48805872 files/libwww-config-liborder.patch 776
-MD5 1866b237427a244b9923469b52f54473 files/libwww-5.4.0-autoconf-gentoo.diff 1089
+MD5 078b6239f293e1cc65f3f977b3136317 files/digest-libwww-5.4.0-r3 151
 MD5 ee0dd3b8a76bf8b9e6d051663119eb40 files/libwww-5.4.0-automake-gentoo.diff 346
+MD5 507c03693bfa1c4f9974efbc3644c682 files/libwww-5.4.0-gentoo.diff 1089
+MD5 1866b237427a244b9923469b52f54473 files/libwww-5.4.0-autoconf-gentoo.diff 1089
 MD5 0851f5aef9f0960efcdcabfdfa960341 files/libwww-5.4.0-disable-ndebug-gentoo.diff 370
+MD5 b0a8e638d02da0d0284e8555866f1f38 files/libwww-5.4.0-mysql-4.1.patch 1674
diff --git a/net-libs/libwww/files/digest-libwww-5.4.0-r3 b/net-libs/libwww/files/digest-libwww-5.4.0-r3
new file mode 100644
index 000000000000..c421f4580c12
--- /dev/null
+++ b/net-libs/libwww/files/digest-libwww-5.4.0-r3
@@ -0,0 +1,2 @@
+MD5 c3734ca6caa405707e134cc8c6d7e422 w3c-libwww-5.4.0.tgz 1129121
+MD5 dcaddf44692252045090584a7d63082c libwww-5.4.0-debian-autoconf-2.5.patch.bz2 8338
diff --git a/net-libs/libwww/files/libwww-5.4.0-mysql-4.1.patch b/net-libs/libwww/files/libwww-5.4.0-mysql-4.1.patch
new file mode 100644
index 000000000000..ea1c7d86e786
--- /dev/null
+++ b/net-libs/libwww/files/libwww-5.4.0-mysql-4.1.patch
@@ -0,0 +1,51 @@
+--- old/Library/src/HTSQL.c	2005-03-18 15:54:48.170275368 +0100
++++ w3c-libwww-5.4.0/Library/src/HTSQL.c	2005-03-18 17:11:38.895338616 +0100
+@@ -182,11 +182,25 @@
+ {
+     if (me && me->host) {
+ 	HTTRACE(SQL_TRACE, "SQL connect. Open a link to server `%s\'\n" _ me->host);
++#if MYSQL_VERSION_ID>=32200
++	if (!mysql_init(&(me->server))) {
++		return NO;
++	}
++#endif
++
++#if MYSQL_VERSION_ID>=40103
++	if ((me->psvr = mysql_real_connect(&(me->server), me->host,
++				      me->user ? me->user : "",
++				      me->password ? me->password : "",
++				      "", 0 , 0 , 0)) == NULL) {
++#else
++		
+ 	if ((me->psvr = mysql_connect(&(me->server), me->host,
+ 				      me->user ? me->user : "",
+ 				      me->password ? me->password : "")) == NULL) {
+-	    HTTRACE(SQL_TRACE, "SQL connect. `%s\' errno %d\n" _ 
+-			mysql_error(&me->server) _ mysql_errno(&me->server));
++#endif
++	    HTTRACE(SQL_TRACE, "SQL connect. `%s\' errno %d\n" _
++		        mysql_error(&me->server) _ mysql_errno(&me->server));
+ 	    return NO;
+ 	}
+ 	return YES;
+@@ -230,6 +244,7 @@
+ PUBLIC BOOL HTSQL_selectDB (HTSQL * me, const char * db)
+ {
+     BOOL created = NO;
++    char query[1024];
+     if (me && me->psvr && db) {
+ 	HTTRACE(SQL_TRACE, "SQL select.. Database `%s\'\n" _ db);
+ 	me->db = NULL;
+@@ -240,7 +255,12 @@
+ 
+ 	    /* If the database couldn't be found then create a new one */
+ 	    if (err == 1049) {
++#if MYSQL_VERSION_ID>=40103
++		sprintf (query, "CREATE DATABASE %s", db);
++		if (mysql_query(me->psvr, query) != 0) {
++#else
+ 		if (mysql_create_db(me->psvr, db) < 0) {
++#endif
+ 		    HTTRACE(SQL_TRACE, "SQL error... `%s\', errno %d\n" _ 
+ 					   mysql_error(me->psvr) _ err);
+ 		    return NO;
diff --git a/net-libs/libwww/libwww-5.4.0-r3.ebuild b/net-libs/libwww/libwww-5.4.0-r3.ebuild
new file mode 100644
index 000000000000..3bd1f7c70dc2
--- /dev/null
+++ b/net-libs/libwww/libwww-5.4.0-r3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2005 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-r3.ebuild,v 1.1 2005/05/17 09:18:52 robbat2 Exp $
+
+inherit eutils
+
+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 ppc64 ppc-macos s390 sparc x86"
+IUSE="ssl mysql"
+
+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}"
+
+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
+
+	if use ppc-macos ; then
+		glibtoolize -c -f || die "libtoolize failed"
+	else
+		libtoolize -c -f || die "libtoolize failed"
+	fi
+
+	aclocal || die "aclocal failed"
+	autoconf || die "autoconf failed"
+}
+
+src_compile() {
+	econf \
+		--enable-shared \
+		--enable-static \
+		--with-zlib \
+		--with-md5 \
+		--with-expat \
+		$(use_with mysql) \
+		$(use_with ssl) \
+		|| die
+
+	emake check-am || die
+	use ppc-macos && echo "#undef HAVE_APPKIT_APPKIT_H" >> wwwconf.h
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc ChangeLog
+	dohtml -r .
+}