Fixed compile error when -DNDEBUG is set. Thanks to #gentoo.pl Team - sekretarz <sekretarz@dukato.net>, bug #50483. Removed 5.4.0-r1 from the tree.

6 files changed, 25 insertions, 63 deletions

diff --git a/net-libs/libwww/ChangeLog b/net-libs/libwww/ChangeLog
index d389146a3625..31ea82c307af 100644
--- a/net-libs/libwww/ChangeLog
+++ b/net-libs/libwww/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libwww
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.29 2004/04/27 20:07:51 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/ChangeLog,v 1.30 2004/05/09 16:41:34 usata Exp $
+
+  10 May 2004; Mamoru KOMACHI <usata@gentoo.org> libwww-5.4.0-r1.ebuild,
+  libwww-5.4.0-r2.ebuild, files/libwww-5.4.0-disable-ndebug-gentoo.diff:
+  Fixed compile error when -DNDEBUG is set. Thanks to #gentoo.pl Team -
+  sekretarz <sekretarz@dukato.net>, bug #50483. Removed 5.4.0-r1 from
+  the CVS tree.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> libwww-5.4.0-r1.ebuild:
   Add inherit eutils
diff --git a/net-libs/libwww/Manifest b/net-libs/libwww/Manifest
index 081425e7573b..30dcf1b80784 100644
--- a/net-libs/libwww/Manifest
+++ b/net-libs/libwww/Manifest
@@ -1,10 +1,9 @@
-MD5 ea5841b0cf3b3641d40edbfeb176f35b libwww-5.4.0-r1.ebuild 1072
-MD5 4c3f95f062cd2a33534daf0ea70c2ad6 libwww-5.4.0-r2.ebuild 1401
+MD5 6e95b6ac0dccc6b99af1009a8e08fee5 libwww-5.4.0-r2.ebuild 1466
+MD5 0faf6c56a294d3272ab9547cc28c2a24 ChangeLog 4562
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 b6074b462096db43c948eeeab550ba20 ChangeLog 4260
-MD5 23078d7f8b1327132caea8473ffae786 files/digest-libwww-5.4.0-r1 66
+MD5 e99f48d15e0834666b84203b48805872 files/libwww-config-liborder.patch 776
 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 ee0dd3b8a76bf8b9e6d051663119eb40 files/libwww-5.4.0-automake-gentoo.diff 346
+MD5 0851f5aef9f0960efcdcabfdfa960341 files/libwww-5.4.0-disable-ndebug-gentoo.diff 370
diff --git a/net-libs/libwww/files/digest-libwww-5.4.0-r1 b/net-libs/libwww/files/digest-libwww-5.4.0-r1
deleted file mode 100644
index f875bc95b421..000000000000
--- a/net-libs/libwww/files/digest-libwww-5.4.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c3734ca6caa405707e134cc8c6d7e422 w3c-libwww-5.4.0.tgz 1129121
diff --git a/net-libs/libwww/files/libwww-5.4.0-disable-ndebug-gentoo.diff b/net-libs/libwww/files/libwww-5.4.0-disable-ndebug-gentoo.diff
new file mode 100644
index 000000000000..eb18186e0bb5
--- /dev/null
+++ b/net-libs/libwww/files/libwww-5.4.0-disable-ndebug-gentoo.diff
@@ -0,0 +1,12 @@
+diff -urN Library.ORIG/src/HTUtils.h Library/src/HTUtils.h
+--- Library.ORIG/src/HTUtils.h	2002-06-12 18:31:21.000000000 +0900
++++ Library/src/HTUtils.h	2004-05-10 00:03:01.043447592 +0900
+@@ -56,7 +56,7 @@
+ is possible to see parts of the output messages.
+ */
+ 
+-#if defined(NODEBUG) || defined(NDEBUG) || defined(_NDEBUG)
++#if 0
+ #undef HTDEBUG
+ #else
+ #ifndef HTDEBUG
diff --git a/net-libs/libwww/libwww-5.4.0-r1.ebuild b/net-libs/libwww/libwww-5.4.0-r1.ebuild
deleted file mode 100644
index 4286ab97e216..000000000000
--- a/net-libs/libwww/libwww-5.4.0-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2004 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.19 2004/04/27 20:07:51 agriffis Exp $
-
-IUSE="ssl mysql"
-
-inherit libtool eutils
-
-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 ia64"
-
-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
-}
-
-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 .
-}
diff --git a/net-libs/libwww/libwww-5.4.0-r2.ebuild b/net-libs/libwww/libwww-5.4.0-r2.ebuild
index d54eb56b011e..78b982022e36 100644
--- a/net-libs/libwww/libwww-5.4.0-r2.ebuild
+++ b/net-libs/libwww/libwww-5.4.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.12 2004/04/02 16:16:38 randy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libwww/libwww-5.4.0-r2.ebuild,v 1.13 2004/05/09 16:41:34 usata Exp $
 
 inherit eutils
 
@@ -32,6 +32,7 @@ src_unpack() {
 	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
 
 	libtoolize -c -f || die "libtoolize failed"
 	aclocal || die "aclocal failed"