This patch should resolve the issue on amd64/ppc64 and close bug #110143. It is not the cleanest solution, but will work for the 2006.0 release until a better solution can be made.

Package-Manager: portage-2.1_pre3-r1

3 files changed, 18 insertions, 19 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 5c3dd3630917..62bc8742ff98 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,16 @@
 # 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.296 2006/01/16 15:51:48 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.297 2006/01/17 19:53:53 wolf31o2 Exp $
 
 # See the gentoo-src rc-scripts ChangeLog for up-to-date release information:
 # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup
 
+  17 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  baselayout-1.11.14.ebuild:
+  This patch should resolve the issue on amd64/ppc64 and close bug #110143. It
+  is not the cleanest solution, but will work for the 2006.0 release until a
+  better solution can be made.
+
   16 Jan 2006; Roy Marples <uberlord@gentoo.org>
   baselayout-1.12.0_pre13.ebuild, baselayout-1.12.0_pre13-r1.ebuild,
   baselayout-1.12.0_pre14.ebuild, baselayout-1.12.0_pre14-r1.ebuild,
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 088dcbcf4083..3cb94c6e9355 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,10 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 37b763665cc9d1988342c35cec930a42 ChangeLog 67783
+MD5 59a32bf14bb9668b585668f5c0488e3b ChangeLog 68054
 MD5 87eaee8eee7f139ff75e74dd02f0890d baselayout-1.11.13-r1.ebuild 18930
 MD5 c0d40a19bd595c5a772988bfef6a3dd8 baselayout-1.11.13-r2.ebuild 19000
-MD5 89c374f7777f5801b25b87015cc5b104 baselayout-1.11.14.ebuild 18945
+MD5 6a30eb16fba8692360f9ce1292c8d4d2 baselayout-1.11.14.ebuild 19023
 MD5 37705358669d6569de60a9edaf43debd baselayout-1.12.0_pre13-r1.ebuild 19333
 MD5 119f61f75688b74f9b5055eb0505bb00 baselayout-1.12.0_pre13.ebuild 19287
 MD5 93e1ab7bf7be78c9f5f7c98445386951 baselayout-1.12.0_pre14-r1.ebuild 19341
@@ -24,10 +21,3 @@ MD5 9b965215857e748676396f53b8402af3 files/digest-baselayout-1.12.0_pre14 76
 MD5 9b965215857e748676396f53b8402af3 files/digest-baselayout-1.12.0_pre14-r1 76
 MD5 9b965215857e748676396f53b8402af3 files/digest-baselayout-1.12.0_pre14-r2 76
 MD5 e02bb32cac91dad28d3c05b731b37b04 metadata.xml 385
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDzFPV2+ySkm8kpY0RAvUGAJ4uCWsLkEXLhvPW/y3TCcnVyERRhwCfc1ol
-94lt1cRqxgm4lgtLHS37XMU=
-=MN3y
------END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout/baselayout-1.11.14.ebuild b/sys-apps/baselayout/baselayout-1.11.14.ebuild
index 0d9c0496c1ee..00c934f4724a 100644
--- a/sys-apps/baselayout/baselayout-1.11.14.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.14.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.11.14.ebuild,v 1.5 2006/01/17 02:15:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.14.ebuild,v 1.6 2006/01/17 19:53:53 wolf31o2 Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -151,13 +151,16 @@ src_install() {
 	libdirs=$(get_all_libdirs)
 	: ${libdirs:=lib}	# it isn't that we don't trust multilib.eclass...
 
-	# This should be /lib/rcscripts, but we have to support old profiles too.
+	# fixes 110143
 	if [[ ${SYMLINK_LIB} == "yes" ]]; then
-		rcscripts_dir="/$(get_abi_LIBDIR ${DEFAULT_ABI})/rcscripts"
+		default_lib_dir="$(get_abi_LIBDIR ${DEFAULT_ABI})"
 	else
-		rcscripts_dir="/lib/rcscripts"
+		default_lib_dir="lib"
 	fi
 
+	# This should be /lib/rcscripts, but we have to support old profiles too.
+	rcscripts_dir="/${default_lib_dir}/rcscripts"
+
 	einfo "Creating directories..."
 	kdir /usr
 	kdir /usr/local
@@ -238,8 +241,8 @@ src_install() {
 		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
 	fi
 
-	kdir /lib/dev-state
-	kdir /lib/udev-state
+	kdir /${default_lib_dir}/dev-state
+	kdir /${default_lib_dir}/udev-state
 
 	# FHS compatibility symlinks stuff
 	ksym /var/tmp /usr/tmp