Fixed BUG #86756.

Package-Manager: portage-2.0.51.19

3 files changed, 35 insertions, 10 deletions

diff --git a/dev-libs/libxslt/ChangeLog b/dev-libs/libxslt/ChangeLog
index 5faa578479bd..9d3bd8bc5644 100644
--- a/dev-libs/libxslt/ChangeLog
+++ b/dev-libs/libxslt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libxslt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.97 2005/03/25 02:00:53 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/ChangeLog,v 1.98 2005/03/26 15:27:38 kugelfang Exp $
+
+  26 Mar 2005; Danny van Dyk <kugelfang@gentoo.org>
+  libxslt-1.1.13-r1.ebuild:
+  Fixed BUG #86756 (multilib-strict).
 
 *libxslt-1.1.13-r1 (25 Mar 2005)
 
diff --git a/dev-libs/libxslt/Manifest b/dev-libs/libxslt/Manifest
index ace1cf71e3c5..31b325d73f75 100644
--- a/dev-libs/libxslt/Manifest
+++ b/dev-libs/libxslt/Manifest
@@ -1,14 +1,24 @@
-MD5 f312079d5aae08b8bc34c46b857c2867 ChangeLog 11668
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 e84b24030013e75381c307c7fd4a5035 ChangeLog 11793
+MD5 7a9330a8af2546205073f0ca629f183f libxslt-1.1.12.ebuild 989
 MD5 ed13d05407071759b2b03e9c7b62b94e libxslt-1.1.6.ebuild 700
-MD5 2eecf4b687f32617215484eebd34c297 libxslt-1.1.13-r1.ebuild 1196
-MD5 b78b05c0d2dee0e5531e11c61242427f libxslt-1.1.9-r1.ebuild 982
+MD5 e8b366fbefc88aaca07e071f691ed018 libxslt-1.1.13-r1.ebuild 1547
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 7a9330a8af2546205073f0ca629f183f libxslt-1.1.12.ebuild 989
+MD5 b78b05c0d2dee0e5531e11c61242427f libxslt-1.1.9-r1.ebuild 982
 MD5 66a192c6c3f8ed39532b82f4711eb780 libxslt-1.1.13.ebuild 994
-MD5 119f25b7ef082d3e7d32396885432652 files/digest-libxslt-1.1.6 67
-MD5 ba955ecf3fb1912956c89db250c6e233 files/libxslt-1.1.13-xslt.patch 819
-MD5 f7a67da65c2cf6f2a4979ff10bb3987c files/digest-libxslt-1.1.9-r1 67
-MD5 a772cd7aafe8f9e0fd59de02b2ea2e85 files/libxslt.m4-libxslt-1.1.8.patch 1292
 MD5 0036be4a6749d5a3fc499f2732f59031 files/digest-libxslt-1.1.12 68
+MD5 119f25b7ef082d3e7d32396885432652 files/digest-libxslt-1.1.6 67
 MD5 780e9916a203e55f64b65de63eccae51 files/digest-libxslt-1.1.13 68
 MD5 780e9916a203e55f64b65de63eccae51 files/digest-libxslt-1.1.13-r1 68
+MD5 ba955ecf3fb1912956c89db250c6e233 files/libxslt-1.1.13-xslt.patch 819
+MD5 a772cd7aafe8f9e0fd59de02b2ea2e85 files/libxslt.m4-libxslt-1.1.8.patch 1292
+MD5 f7a67da65c2cf6f2a4979ff10bb3987c files/digest-libxslt-1.1.9-r1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCRX/h5mJXAu5GbtIRAjvqAJ9xKGUPdGj3zo6fj9dmx0lo4QOSDQCfdKpy
+MOma2m5vLBJa4LKJ3IceFHQ=
+=h9tO
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libxslt/libxslt-1.1.13-r1.ebuild b/dev-libs/libxslt/libxslt-1.1.13-r1.ebuild
index 18ca9b3d7bf5..56ede493f349 100644
--- a/dev-libs/libxslt/libxslt-1.1.13-r1.ebuild
+++ b/dev-libs/libxslt/libxslt-1.1.13-r1.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/libxslt/libxslt-1.1.13-r1.ebuild,v 1.1 2005/03/25 02:00:53 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxslt/libxslt-1.1.13-r1.ebuild,v 1.2 2005/03/26 15:27:38 kugelfang Exp $
 
 inherit libtool gnome.org eutils python
 
@@ -37,6 +37,17 @@ src_compile() {
 		$(use_with python) \
 		$(use_with crypt crypto) \
 		|| 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
+	has_multilib_profile && 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 "make failed"
 }