Version bump, bug #284726.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 18 insertions, 156 deletions

diff --git a/dev-libs/libxml2/ChangeLog b/dev-libs/libxml2/ChangeLog
index be3a3bfc5c2f..d6fdc58618a2 100644
--- a/dev-libs/libxml2/ChangeLog
+++ b/dev-libs/libxml2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libxml2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.272 2009/08/30 23:18:00 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/ChangeLog,v 1.273 2009/09/13 23:05:47 eva Exp $
+
+*libxml2-2.7.4 (13 Sep 2009)
+
+  13 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org> -libxml2-2.7.3.ebuild,
+  -libxml2-2.7.3-r1.ebuild, +libxml2-2.7.4.ebuild:
+  Version bump, bug #284726.
 
   30 Aug 2009; Brent Baude <ranger@gentoo.org> libxml2-2.7.3-r2.ebuild:
   Marking libxml2-2.7.3-r2 ppc64 for bug 280617
diff --git a/dev-libs/libxml2/libxml2-2.7.3.ebuild b/dev-libs/libxml2/libxml2-2.7.3.ebuild
deleted file mode 100644
index 21478bf65232..000000000000
--- a/dev-libs/libxml2/libxml2-2.7.3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.3.ebuild,v 1.9 2009/03/18 18:06:10 jer Exp $
-
-inherit libtool flag-o-matic eutils python
-
-DESCRIPTION="Version 2 of the library to manipulate XML files"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="debug doc examples ipv6 python readline test"
-
-XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
-XSTS_NAME_1="xmlschema2002-01-16"
-XSTS_NAME_2="xmlschema2004-01-14"
-XSTS_TARBALL_1="xsts-2002-01-16.tar.gz"
-XSTS_TARBALL_2="xsts-2004-01-14.tar.gz"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
-	test? (
-		${XSTS_HOME}/${XSTS_NAME_1}/${XSTS_TARBALL_1}
-		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} )"
-
-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() {
-	# ${A} isn't used to avoid unpacking of test tarballs into $WORKDIR,
-	# as they are needed as tarballs in ${S}/xstc instead and not unpacked
-	unpack ${P}.tar.gz
-	cd "${S}"
-
-	if use test; then
-		cp "${DISTDIR}/${XSTS_TARBALL_1}" \
-			"${DISTDIR}/${XSTS_TARBALL_2}" \
-			"${S}"/xstc/ \
-			|| die "Failed to install test tarballs"
-	fi
-
-	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.
-	elibtoolize
-
-	# filter seemingly problematic CFLAGS (#26320)
-	filter-flags -fprefetch-loop-arrays -funroll-loops
-
-	econf $myconf || die "Configuration failed"
-
-	# Patching the Makefiles to respect get_libdir
-	# Fixes BUG #86766, please keep this.
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-	for x in $(find "${S}" -name "Makefile") ; do
-		sed \
-			-e "s|^\(PYTHON_SITE_PACKAGES\ =\ \/usr\/\).*\(\/python.*\)|\1$(get_libdir)\2|g" \
-			-i ${x} \
-			|| die "sed failed"
-	done
-
-	emake || die "Compilation failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation failed"
-
-	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
-
-	if ! use examples; then
-		rm -rf "${D}/usr/share/doc/${P}/examples"
-		rm -rf "${D}/usr/share/doc/${PN}-python-${PV}/examples"
-	fi
-}
-
-pkg_postinst() {
-	if use python; then
-		python_version
-		python_need_rebuild
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
-	fi
-
-	# We don't want to do the xmlcatalog during stage1, as xmlcatalog will not
-	# be in / and stage1 builds to ROOT=/tmp/stage1root. This fixes bug #208887.
-	if [[ "${ROOT}" != "/" ]]
-	then
-		elog "Skipping XML catalog creation for stage building (bug #208887)."
-	else
-		# need an XML catalog, so no-one writes to a non-existent one
-		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 "${ROOT}etc/xml" ] || mkdir -p "${ROOT}etc/xml"
-			/usr/bin/xmlcatalog --create > ${CATALOG}
-			einfo "Created XML catalog in ${CATALOG}"
-		fi
-	fi
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages
-}
diff --git a/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild b/dev-libs/libxml2/libxml2-2.7.4.ebuild
index 69f09f804233..a5d8026f194a 100644
--- a/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild
+++ b/dev-libs/libxml2/libxml2-2.7.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.3-r1.ebuild,v 1.2 2009/05/31 17:37:14 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.4.ebuild,v 1.1 2009/09/13 23:05:48 eva Exp $
+
+EAPI="2"
 
 inherit libtool flag-o-matic eutils python
 
@@ -9,7 +11,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="debug doc examples ipv6 python readline test"
 
 XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
@@ -24,7 +26,7 @@ SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz
 		${XSTS_HOME}/${XSTS_NAME_2}/${XSTS_TARBALL_2} )"
 
 RDEPEND="sys-libs/zlib
-	python?   ( dev-lang/python )
+	python? ( dev-lang/python )
 	readline? ( sys-libs/readline )"
 
 DEPEND="${RDEPEND}
@@ -42,14 +44,13 @@ src_unpack() {
 			"${S}"/xstc/ \
 			|| die "Failed to install test tarballs"
 	fi
+}
 
-	# Fix macro conflict with wxGTK, bug #266653
-	epatch "${FILESDIR}/${P}-printf-rename.patch"
-
+src_prepare() {
 	epunt_cxx
 }
 
-src_compile() {
+src_configure() {
 	# USE zlib support breaks gnome2
 	# (libgnomeprint for instance fails to compile with
 	# fresh install, and existing) - <azarah@gentoo.org> (22 Dec 2002).
@@ -66,7 +67,8 @@ src_compile() {
 		$(use_with python)           \
 		$(use_with readline)         \
 		$(use_with readline history) \
-		$(use_enable ipv6)"
+		$(use_enable ipv6) \
+		PYTHON_SITE_PACKAGES=$(python_get_sitedir)"
 
 	# Please do not remove, as else we get references to PORTAGE_TMPDIR
 	# in /usr/lib/python?.?/site-packages/libxml2mod.la among things.
@@ -76,18 +78,6 @@ src_compile() {
 	filter-flags -fprefetch-loop-arrays -funroll-loops
 
 	econf $myconf
-
-	# Patching the Makefiles to respect get_libdir
-	# Fixes BUG #86766, please keep this.
-	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-	for x in $(find "${S}" -name "Makefile") ; do
-		sed \
-			-e "s|^\(PYTHON_SITE_PACKAGES\ =\ \/usr\/\).*\(\/python.*\)|\1$(get_libdir)\2|g" \
-			-i ${x} \
-			|| die "sed failed"
-	done
-
-	emake || die "Compilation failed"
 }
 
 src_install() {
@@ -97,9 +87,8 @@ src_install() {
 		exampledir=/usr/share/doc/${PF}/python/examples \
 		install || die "Installation failed"
 
+	rm "${D}"/usr/share/doc/${P}/{AUTHORS,ChangeLog,Copyright,NEWS,README*,TODO*}
 	dodoc AUTHORS ChangeLog Copyright NEWS README* TODO* || die "dodoc failed"
-	rm "${D}"/usr/share/doc/${P}/Copyright
-	rm -rf "${D}"/usr/share/doc/${P}
 
 	if ! use python; then
 		rm -rf "${D}"/usr/share/doc/${PF}/python