bump to 1.1.23. Bug and build fixes. Fix bug #212784.

(Portage version: 2.1.5_rc5)

4 files changed, 39 insertions, 87 deletions

diff --git a/dev-libs/libxslt/ChangeLog b/dev-libs/libxslt/ChangeLog
index 1c650f223739..a2553851209a 100644
--- a/dev-libs/libxslt/ChangeLog
+++ b/dev-libs/libxslt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libxslt
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.173 2008/03/26 03:41:42 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.174 2008/04/20 11:20:23 eva Exp $
+
+*libxslt-1.1.23 (20 Apr 2008)
+
+  20 Apr 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/libxslt-1.1.23-parallel-install.patch, -libxslt-1.1.20.ebuild,
+  -libxslt-1.1.20-r1.ebuild, +libxslt-1.1.23.ebuild:
+  bump to 1.1.23. Bug and build fixes. Fix bug #212784.
 
   25 Mar 2008; <ricmm@gentoo.org> libxslt-1.1.20.ebuild,
   libxslt-1.1.20-r1.ebuild, libxslt-1.1.22.ebuild:
diff --git a/dev-libs/libxslt/files/libxslt-1.1.23-parallel-install.patch b/dev-libs/libxslt/files/libxslt-1.1.23-parallel-install.patch
new file mode 100644
index 000000000000..2f3f25f04b75
--- /dev/null
+++ b/dev-libs/libxslt/files/libxslt-1.1.23-parallel-install.patch
@@ -0,0 +1,14 @@
+--- libxslt-1.1.22/work/libxslt-1.1.22/python/Makefile.am 
++++ libxslt-1.1.23/work/libxslt-1.1.23/python/Makefile.am 
+@@ -42,9 +42,9 @@
+ 	cat $(srcdir)/libxsl.py $(srcdir)/libxsltclass.py > libxslt.py
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(DESTDIR)$(pythondir)
++	-$(mkinstalldirs) $(DESTDIR)$(pythondir)
+ 	@INSTALL@ -m 0644 libxslt.py $(DESTDIR)$(pythondir)
+-	$(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
++	-$(mkinstalldirs) $(DESTDIR)$(DOCS_DIR)
+ 	@(for doc in $(DOCS) ; \
+ 	   do @INSTALL@ -m 0644 $(srcdir)/$$doc $(DESTDIR)$(DOCS_DIR) ; done)
+ 
diff --git a/dev-libs/libxslt/libxslt-1.1.20-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.20-r1.ebuild
deleted file mode 100644
index 429e9d5e4b82..000000000000
--- a/dev-libs/libxslt/libxslt-1.1.20-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.20-r1.ebuild,v 1.11 2008/03/26 03:41:42 ricmm Exp $
-
-inherit libtool eutils python
-
-DESCRIPTION="XSLT libraries and tools"
-HOMEPAGE="http://www.xmlsoft.org/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="crypt debug python"
-
-DEPEND=">=dev-libs/libxml2-2.6.27
-	crypt? ( >=dev-libs/libgcrypt-1.1.92 )
-	python? ( dev-lang/python )"
-
-SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# we still require the 1.1.8 patch for the .m4 file, to add
-	# the CXXFLAGS defines <obz@gentoo.org>
-	epatch "${FILESDIR}"/libxslt.m4-${PN}-1.1.8.patch
-
-	# Using the python bindings causes a core; bug #190388
-	epatch "${FILESDIR}"/${P}-amd64.patch
-
-	# Patch Makefile to fix bug #99382 so that html gets installed in ${PF}
-	sed -i -e 's:libxslt-$(VERSION):${PF}:' doc/Makefile.in
-
-	epunt_cxx
-	elibtoolize
-}
-
-src_compile() {
-	# Always pass --with-debugger. It is required by third parties (see
-	# e.g. bug #98345)
-	local myconf="--with-debugger \
-		$(use_with python)       \
-		$(use_with crypt crypto) \
-		$(use_with debug)        \
-		$(use_with debug mem-debug)"
-
-	econf ${myconf} || die "configure failed"
-
-	# Patching the Makefiles to respect get_libdir
-	# Fixes BUG #86756, 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() {
-	make DESTDIR="${D}" install || die "Installation failed"
-
-	dodoc AUTHORS ChangeLog Copyright FEATURES NEWS README TODO
-}
diff --git a/dev-libs/libxslt/libxslt-1.1.20.ebuild b/dev-libs/libxslt/libxslt-1.1.23.ebuild
index fc358a45b306..8715b6aeda2e 100644
--- a/dev-libs/libxslt/libxslt-1.1.20.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.23.ebuild
@@ -1,34 +1,38 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.20.ebuild,v 1.12 2008/03/26 03:41:42 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.23.ebuild,v 1.1 2008/04/20 11:20:23 eva Exp $
 
-inherit libtool eutils python
+inherit libtool eutils python autotools
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="http://www.xmlsoft.org/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="crypt debug python"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="crypt debug examples python"
 
 DEPEND=">=dev-libs/libxml2-2.6.27
-	crypt? ( >=dev-libs/libgcrypt-1.1.92 )
+	crypt?  ( >=dev-libs/libgcrypt-1.1.92 )
 	python? ( dev-lang/python )"
 
 SRC_URI="ftp://xmlsoft.org/${PN}/${P}.tar.gz"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 
 	# we still require the 1.1.8 patch for the .m4 file, to add
 	# the CXXFLAGS defines <obz@gentoo.org>
-	epatch "${FILESDIR}"/libxslt.m4-${PN}-1.1.8.patch
+	epatch "${FILESDIR}/libxslt.m4-${PN}-1.1.8.patch"
+
+	# fix parallel install, bug #212784.
+	epatch "${FILESDIR}/${P}-parallel-install.patch"
 
 	# Patch Makefile to fix bug #99382 so that html gets installed in ${PF}
-	sed -i -e 's:libxslt-$(VERSION):${PF}:' doc/Makefile.in
+	sed -i -e "s:libxslt-\$(VERSION):${PF}:" doc/Makefile.am
 
+	eautomake
 	epunt_cxx
 	elibtoolize
 }
@@ -44,21 +48,15 @@ src_compile() {
 
 	econf ${myconf} || die "configure failed"
 
-	# Patching the Makefiles to respect get_libdir
-	# Fixes BUG #86756, 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() {
-	make DESTDIR="${D}" install || die "Installation failed"
+	emake DESTDIR="${D}" install || die "Installation failed"
 
 	dodoc AUTHORS ChangeLog Copyright FEATURES NEWS README TODO
+
+	if ! use examples; then
+		rm -rf "${D}/usr/share/doc/${PN}-python-${PV}/examples"
+	fi
 }