New release: 2.6.23. Pruned old ebuild.

(Portage version: 2.1_pre3-r1)

5 files changed, 47 insertions, 28 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index f393530ba131..9777135b4804 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.145 2005/12/01 04:14:56 tgall Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.146 2006/01/12 20:16:08 leonardop Exp $
+
+*libxml2-2.6.23 (12 Jan 2006)
+
+  12 Jan 2006; Leonardo Boshell <leonardop@gentoo.org>
+  +libxml2-2.6.23.ebuild:
+  Version bump. Dropped 'static' flag.
 
   30 Nov 2005; Tom Gall <tgall@gentoo.org> libxml2-2.6.22.ebuild:
   stable on ppc64
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 0a795d5fab25..04c4bd2ab27b 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -1,8 +1,11 @@
+MD5 415df4ed78bcec23bf44e5c47694ab79 .libxml2-2.6.23.ebuild.swp 12288
 MD5 ac766035736e6d01b6e42dc5a4ff05a9 ChangeLog 17296
+MD5 761d617849c91c951713a1411f3c1cff files/digest-libxml2-2.6.19 68
+MD5 4afb7240de6f033dc7cd147c38d2b06f files/digest-libxml2-2.6.20-r2 68
+MD5 185f99db7f8b720eb02aa1fb59bd57b9 files/digest-libxml2-2.6.22 68
+MD5 b9b6f547f58add3111d351dccca5142a files/digest-libxml2-2.6.23 68
 MD5 261427afd62b7a24ac717eb4483cd668 libxml2-2.6.19.ebuild 2039
 MD5 f0c57d3000da7a65966ef827bc3243fc libxml2-2.6.20-r2.ebuild 2357
 MD5 db40c499e56cf2734f79e30b625415e1 libxml2-2.6.22.ebuild 2607
+MD5 ebd2cec580ec09da5dc3400189e88c82 libxml2-2.6.23.ebuild 2578
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 761d617849c91c951713a1411f3c1cff files/digest-libxml2-2.6.19 68
-MD5 4afb7240de6f033dc7cd147c38d2b06f files/digest-libxml2-2.6.20-r2 68
-MD5 185f99db7f8b720eb02aa1fb59bd57b9 files/digest-libxml2-2.6.22 68
diff --git a/dev-libs/libxml2/files/digest-libxml2-2.6.19 b/dev-libs/libxml2/files/digest-libxml2-2.6.19
deleted file mode 100644
index a0e3e1a4aac3..000000000000
--- a/dev-libs/libxml2/files/digest-libxml2-2.6.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ed581732d586f86324ec46e572526ede libxml2-2.6.19.tar.bz2 3174844
diff --git a/dev-libs/libxml2/files/digest-libxml2-2.6.23 b/dev-libs/libxml2/files/digest-libxml2-2.6.23
new file mode 100644
index 000000000000..e7f38ef5e37a
--- /dev/null
+++ b/dev-libs/libxml2/files/digest-libxml2-2.6.23
@@ -0,0 +1 @@
+MD5 e98018a6b562f1fa454e705dde2269de libxml2-2.6.23.tar.bz2 3418784
diff --git a/dev-libs/libxml2/libxml2-2.6.19.ebuild b/dev-libs/libxml2/libxml2-2.6.23.ebuild
index 0b18ea55d890..bd76460fa35b 100644
--- a/dev-libs/libxml2/libxml2-2.6.19.ebuild
+++ b/dev-libs/libxml2/libxml2-2.6.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.19.ebuild,v 1.9 2005/07/31 07:54:21 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.6.23.ebuild,v 1.1 2006/01/12 20:16:08 leonardop Exp $
 
 inherit libtool gnome.org flag-o-matic eutils
 
@@ -9,23 +9,38 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug doc ipv6 python readline"
 
 RDEPEND="sys-libs/zlib
 	python? ( dev-lang/python )
 	readline? ( sys-libs/readline )"
+
 DEPEND="${RDEPEND}
 	hppa? ( >=sys-devel/binutils-2.15.92.0.2 )"
 
 src_unpack() {
+	unpack "${A}"
 
-	unpack ${A}
 	epunt_cxx
-
 }
 
 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 meaning of the 'debug' USE flag does not apply to the --with-debug
+	# switch (enabling the libxml2 debug module). See bug #100898.
+
+	# --with-mem-debug causes unusual segmentation faults (bug #105120).
+
+	local myconf="--with-zlib \
+		$(use_with debug run-debug)  \
+		$(use_with python)           \
+		$(use_with readline)         \
+		$(use_with readline history) \
+		$(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,14 +49,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_enable ipv6) || die
+	econf $myconf || die "Configuration failed"
 
 	# Patching the Makefiles to respect get_libdir
 	# Fixes BUG #86766, please keep this.
@@ -53,29 +61,31 @@ src_compile() {
 			|| die "sed failed"
 	done
 
-	emake || die
+	emake || die "Copilation failed"
 
 }
 
 src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
 
-	make DESTDIR=${D} install || die
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	dodoc AUTHORS ChangeLog Copyright NEWS README* TODO*
 
+	if ! use doc; then
+		rm -rf ${D}/usr/share/gtk-doc
+		rm -rf ${D}/usr/share/doc/${P}/html
+	fi
 }
 
 pkg_postinst() {
-
 	# need an XML catalog, so no-one writes to a non-existent one
-	CATALOG=/etc/xml/catalog
+	CATALOG="${ROOT}/etc/xml/catalog"
+
 	# we dont want to clobber an existing catalog though,
 	# only ensure that one is there
 	# <obz@gentoo.org>
 	if [ ! -e ${CATALOG} ]; then
-		[ -d /etc/xml ] || mkdir /etc/xml
+		[ -d "${ROOT}/etc/xml" ] || mkdir -p "${ROOT}/etc/xml"
 		/usr/bin/xmlcatalog --create > ${CATALOG}
 		einfo "Created XML catalog in ${CATALOG}"
 	fi
-
 }