Drop the 'debug' USE flag (bug #100898).

(Portage version: 2.0.51.22-r2)

4 files changed, 28 insertions, 16 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index d7908494de58..1251a394f8cb 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.128 2005/07/31 07:54:21 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.129 2005/08/03 09:23:43 leonardop Exp $
+
+*libxml2-2.6.20-r2 (03 Aug 2005)
+
+  03 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
+  libxml2-2.6.20-r2.ebuild:
+  Drop the 'debug' USE flag. Its meaning doesn't really relate to the effect
+  of the switch --with-debug in libxml2, and some packages rely on the
+  debugging module, see bug #100898). Added 'static' USE flag.
 
   31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
   libxml2-2.6.19.ebuild:
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index f8e54cb5aa2d..1d177b65cf37 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,8 +1,11 @@
 MD5 07d7f03b9869001ec63096d523b57b56 ChangeLog 15086
+MD5 d88ae7d09a4b03189edcb81648043861 libxml2-2.6.20-r2.ebuild 2372
+MD5 217520464216f200d005365d62f8d6cd .ChangeLog.swp 16384
 MD5 297127438324f349e226b9bc8ebe16cc libxml2-2.6.20-r1.ebuild 2165
 MD5 47e51f2596c69d2b8ee7c34a39f2a647 libxml2-2.6.17.ebuild 1704
-MD5 261427afd62b7a24ac717eb4483cd668 libxml2-2.6.19.ebuild 2039
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 261427afd62b7a24ac717eb4483cd668 libxml2-2.6.19.ebuild 2039
 MD5 4afb7240de6f033dc7cd147c38d2b06f files/digest-libxml2-2.6.20-r1 68
+MD5 4afb7240de6f033dc7cd147c38d2b06f files/digest-libxml2-2.6.20-r2 68
 MD5 8409491d7d4c895c3a509a3c1c121e02 files/digest-libxml2-2.6.17 68
 MD5 761d617849c91c951713a1411f3c1cff files/digest-libxml2-2.6.19 68
diff --git a/dev-libs/libxml2/files/digest-libxml2-2.6.20-r1 b/dev-libs/libxml2/files/digest-libxml2-2.6.20-r2
index cc6731987dbf..cc6731987dbf 100644
--- a/dev-libs/libxml2/files/digest-libxml2-2.6.20-r1
+++ b/dev-libs/libxml2/files/digest-libxml2-2.6.20-r2
diff --git a/dev-libs/libxml2/libxml2-2.6.20-r1.ebuild b/dev-libs/libxml2/libxml2-2.6.20-r2.ebuild
index 1763a3bbeaf8..7be6be0cda8b 100644
--- a/dev-libs/libxml2/libxml2-2.6.20-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.6.20-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.20-r1.ebuild,v 1.1 2005/07/29 22:20:57 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.20-r2.ebuild,v 1.1 2005/08/03 09:23:43 leonardop Exp $
 
 inherit libtool gnome.org flag-o-matic eutils
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 LICENSE="MIT"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="python readline ipv6 doc debug"
+IUSE="doc ipv6 python readline static"
 
 RDEPEND="sys-libs/zlib
 	python? ( dev-lang/python )
@@ -26,6 +26,15 @@ src_unpack() {
 }
 
 src_compile() {
+	# USE zlib support breaks gnome2
+	# (libgnomeprint for instance fails to compile with
+	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
+
+	# The 'debug' USE flag does not apply to the --with-debug option (enabling
+	# the libxml2 debug module). See bug #100898.
+
+	local myconf="--with-zlib $(use_with python) $(use_with readline) \
+		$(use_enable static) $(use_enable ipv6)"
 
 	# Please do not remove, as else we get references to PORTAGE_TMPDIR
 	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
@@ -34,15 +43,7 @@ src_compile() {
 	# filter seemingly problematic CFLAGS (#26320)
 	filter-flags -fprefetch-loop-arrays -funroll-loops
 
-	# USE zlib support breaks gnome2
-	# (libgnomeprint for instance fails to compile with
-	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
-
-	econf --with-zlib \
-		$(use_with python) \
-		$(use_with readline) \
-		$(use_with debug) \
-		$(use_enable ipv6) || die
+	econf $myconf || die "Configuration failed"
 
 	# Patching the Makefiles to respect get_libdir
 	# Fixes BUG #86766, please keep this.
@@ -54,15 +55,15 @@ src_compile() {
 			|| die "sed failed"
 	done
 
-	emake || die
+	emake || die "Copilation failed"
 
 }
 
 src_install() {
 
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "Installation failed"
 
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README* TODO*
 
 	use doc || rm -rf ${D}/usr/share/doc/${PF}/html
 }