Fixed compile error with recent libxml and libxslt. Thanks to Sam Jacobson <sam@eversoft.co.nz>. This closes bug #106259.

Package-Manager: portage-2.0.53

4 files changed, 21 insertions, 12 deletions

diff --git a/app-text/xmlstarlet/ChangeLog b/app-text/xmlstarlet/ChangeLog
index 9d57feb89510..d091300bafa1 100644
--- a/app-text/xmlstarlet/ChangeLog
+++ b/app-text/xmlstarlet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/xmlstarlet
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xmlstarlet/ChangeLog,v 1.8 2005/06/02 06:27:36 wormo Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlstarlet/ChangeLog,v 1.9 2006/03/24 12:19:53 usata Exp $
+
+  24 Mar 2006; Mamoru KOMACHI <usata@gentoo.org> xmlstarlet-1.0.0.ebuild,
+  xmlstarlet-1.0.1.ebuild:
+  Fixed compile error with recent libxml and libxslt. Thanks to Sam Jacobson
+  <sam@eversoft.co.nz>. This closes bug #106259.
 
   02 Jun 2005; Stephanie Lockwood-Childs <wormo@gentoo.org>
   xmlstarlet-1.0.1.ebuild:
diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
index 90f78df1ed5b..6fb900480512 100644
--- a/app-text/xmlstarlet/Manifest
+++ b/app-text/xmlstarlet/Manifest
@@ -1,6 +1,6 @@
-MD5 5ee7dc11f503f75c3dac6d234792bc1f ChangeLog 1349
-MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 50042a523ce8428e3e06a4645f82c730 xmlstarlet-1.0.0.ebuild 815
-MD5 d0a0345b9fe7dff935262a70a7e66149 xmlstarlet-1.0.1.ebuild 820
+MD5 6a26f07634bdf15687029bbd624974cb ChangeLog 1577
 MD5 087fae86c52296a3b9080621e6b742be files/digest-xmlstarlet-1.0.0 68
 MD5 be4d4795d51e4066aad360f3a3c66cb8 files/digest-xmlstarlet-1.0.1 68
+MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 c6850313e72e0e8c3c6987540aa604d8 xmlstarlet-1.0.0.ebuild 924
+MD5 7b89dc820aea26e145654e3e798d8089 xmlstarlet-1.0.1.ebuild 929
diff --git a/app-text/xmlstarlet/xmlstarlet-1.0.0.ebuild b/app-text/xmlstarlet/xmlstarlet-1.0.0.ebuild
index 60f81ec3d4de..fc1222f6298e 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.0.0.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.0.0.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/app-text/xmlstarlet/xmlstarlet-1.0.0.ebuild,v 1.2 2005/03/22 07:37:22 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlstarlet/xmlstarlet-1.0.0.ebuild,v 1.3 2006/03/24 12:19:53 usata Exp $
 
 inherit flag-o-matic
 
@@ -22,7 +22,9 @@ DEPEND=">=dev-libs/libxml2-2.6.12
 
 src_compile() {
 	append-ldflags -lgcrypt
-	econf || die
+	local xsltlibs="-lxslt -lexslt"
+	local xmllibs="-lxml2"
+	LIBXSLT_LIBS="${xsltlibs}" LIBXML_LIBS="${xmllibs}" econf || die
 	emake || die
 }
 
diff --git a/app-text/xmlstarlet/xmlstarlet-1.0.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.0.1.ebuild
index 7cdffcfc45ba..fa8a0501d927 100644
--- a/app-text/xmlstarlet/xmlstarlet-1.0.1.ebuild
+++ b/app-text/xmlstarlet/xmlstarlet-1.0.1.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/app-text/xmlstarlet/xmlstarlet-1.0.1.ebuild,v 1.3 2005/06/02 06:27:36 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xmlstarlet/xmlstarlet-1.0.1.ebuild,v 1.4 2006/03/24 12:19:53 usata Exp $
 
 inherit flag-o-matic
 
@@ -22,7 +22,9 @@ DEPEND=">=dev-libs/libxml2-2.6.12
 
 src_compile() {
 	append-ldflags -lgcrypt
-	econf || die
+	local xsltlibs="-lxslt -lexslt"
+	local xmllibs="-lxml2"
+	LIBXSLT_LIBS="${xsltlibs}" LIBXML_LIBS="${xmllibs}" econf || die
 	emake || die
 }