Multilib fixes, #133547 thanks to Jonathan Coome.

Package-Manager: portage-2.1_rc1-r2

3 files changed, 17 insertions, 13 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 872c5f2e5e4c..fad31361e7cb 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,14 @@
 # ChangeLog for sys-apps/baselayout
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.326 2006/05/04 09:18:46 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.327 2006/05/17 09:13:20 uberlord Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  17 May 2006; Roy Marples <uberlord@gentoo.org>
+  baselayout-1.12.0_pre19-r2.ebuild:
+  Multilib fixes, #133547 thanks to Jonathan Coome.
+
 *baselayout-1.12.0_pre19-r2 (04 May 2006)
 *baselayout-1.11.15-r3 (04 May 2006)
 
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 36a7906746c0..bfcd8355b220 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -79,18 +79,18 @@ EBUILD baselayout-1.12.0_pre18-r1.ebuild 19881 RMD160 c781431f9e9ba8fc2ec06d1baf
 MD5 7b1fc1f8d1068ac25aef23a3ace16f14 baselayout-1.12.0_pre18-r1.ebuild 19881
 RMD160 c781431f9e9ba8fc2ec06d1baf1bfd34a68c061b baselayout-1.12.0_pre18-r1.ebuild 19881
 SHA256 6479ec28adcd5d317692143859c8a7961f22feef0674df3b091968077bb6d45c baselayout-1.12.0_pre18-r1.ebuild 19881
-EBUILD baselayout-1.12.0_pre19-r2.ebuild 19870 RMD160 3ba0e7b44de2997e87c3a204ab88b83975b7b0a2 SHA1 c474b90ead8de702420ab7420e52654489217f79 SHA256 053b972f32154fd71aab400627ce123504cc6e8ba0e319bc3db570226c5ab329 size 19870
-MD5 6bef9780c62f4890dea22faafe60363b baselayout-1.12.0_pre19-r2.ebuild 19870
-RMD160 3ba0e7b44de2997e87c3a204ab88b83975b7b0a2 baselayout-1.12.0_pre19-r2.ebuild 19870
-SHA256 053b972f32154fd71aab400627ce123504cc6e8ba0e319bc3db570226c5ab329 baselayout-1.12.0_pre19-r2.ebuild 19870
+EBUILD baselayout-1.12.0_pre19-r2.ebuild 19913 RMD160 8968b833908b71616b3ad929442b9d97abd56dd8 SHA1 ea4a9dcf63e01813dc6115a3310410096bc21b2c SHA256 9fe3957d7fb33371fd1eb9bf0e8d1f8099e175c87e0273c3c95bdf499baa357d size 19913
+MD5 1c572a72616d2bfd0a569038175326e1 baselayout-1.12.0_pre19-r2.ebuild 19913
+RMD160 8968b833908b71616b3ad929442b9d97abd56dd8 baselayout-1.12.0_pre19-r2.ebuild 19913
+SHA256 9fe3957d7fb33371fd1eb9bf0e8d1f8099e175c87e0273c3c95bdf499baa357d baselayout-1.12.0_pre19-r2.ebuild 19913
 EBUILD baselayout-1.12.0_pre19.ebuild 19776 RMD160 f24db28c1f44840ef77ae62e352df3d95cd80123 SHA1 7939ea615ee89f2b14e0b7e34e160dab0441d58a SHA256 7c11d064067a4e9e464e8d3500fb1bbfdebd78c84af71fea03cb6f21ffeb0620 size 19776
 MD5 bba3f186404b7cc4c3884eda8a2af700 baselayout-1.12.0_pre19.ebuild 19776
 RMD160 f24db28c1f44840ef77ae62e352df3d95cd80123 baselayout-1.12.0_pre19.ebuild 19776
 SHA256 7c11d064067a4e9e464e8d3500fb1bbfdebd78c84af71fea03cb6f21ffeb0620 baselayout-1.12.0_pre19.ebuild 19776
-MISC ChangeLog 74686 RMD160 ea1dea83d03f22a557b513be9262c2b4b1dd5660 SHA1 b6c468b980d4b5c43697c09d1355876e4101f66f SHA256 3483dd182da40af345a257c6132895130b3b877ba392020bc09cb51c081a4188 size 74686
-MD5 300e586afdd4b29493ff152fa435ce3f ChangeLog 74686
-RMD160 ea1dea83d03f22a557b513be9262c2b4b1dd5660 ChangeLog 74686
-SHA256 3483dd182da40af345a257c6132895130b3b877ba392020bc09cb51c081a4188 ChangeLog 74686
+MISC ChangeLog 74825 RMD160 5d9ae2a11ecb05222d465353c50162f6770d17f7 SHA1 9a27b40200129ec9c14c83a9aee9a7225fc1f79c SHA256 3bcd7b645d50603907ea9d1a6d0d51e86478da201472c04407340d4ce635cc03 size 74825
+MD5 028447b6225f6c16bf7cf21e864a7796 ChangeLog 74825
+RMD160 5d9ae2a11ecb05222d465353c50162f6770d17f7 ChangeLog 74825
+SHA256 3bcd7b645d50603907ea9d1a6d0d51e86478da201472c04407340d4ce635cc03 ChangeLog 74825
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 size 164
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild
index 358c374bffd5..7861e7dbbd2a 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild,v 1.1 2006/05/04 09:18:46 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre19-r2.ebuild,v 1.2 2006/05/17 09:13:20 uberlord Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -250,8 +250,8 @@ src_install() {
 		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
 	fi
 
-	kdir /lib/dev-state
-	kdir /lib/udev-state
+	kdir /$(get_libdir)/dev-state
+	kdir /$(get_libdir)/udev-state
 
 	# FHS compatibility symlinks stuff
 	ksym /var/tmp /usr/tmp
@@ -385,7 +385,7 @@ src_install() {
 	# Install baselayout utilities
 	#
 	cd "${S}"/src
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" LIBDIR="$(get_libdir)" install || die
 
 	# Hack to fix bug 9849, continued in pkg_postinst
 	unkdir