Moved /lib/{,u}dev-state creation after the symlink is made for multilib archs.

(Portage version: 2.1_pre3-r1)

6 files changed, 30 insertions, 19 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index ec1d752d9fb9..4bd31c444ef5 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.291 2006/01/05 10:55:22 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.292 2006/01/07 04:45:21 eradicator 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
 
+  07 Jan 2006; Jeremy Huddleston <eradicator@gentoo.org>
+  baselayout-1.11.13-r1.ebuild, baselayout-1.11.13-r2.ebuild,
+  baselayout-1.11.14.ebuild, baselayout-1.12.0_pre13.ebuild,
+  baselayout-1.12.0_pre13-r1.ebuild:
+  Moved /lib/{,u}dev-state creation after the symlink is made for multilib archs.
+
 *baselayout-1.12.0_pre13-r1 (05 Jan 2006)
 
   05 Jan 2006; Roy Marples <uberlord@gentoo.org>
diff --git a/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild b/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild
index 7f32297364d6..7b5aec3d7ebe 100644
--- a/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.13-r1.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/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild,v 1.4 2005/12/22 04:07:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.13-r1.ebuild,v 1.5 2006/01/07 04:45:22 eradicator Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -175,8 +175,6 @@ src_install() {
 	kdir /etc/modules.d
 	kdir /etc/opt
 	kdir /home
-	kdir /lib/dev-state
-	kdir /lib/udev-state
 	kdir ${rcscripts_dir}
 	kdir ${rcscripts_dir}/awk
 	kdir ${rcscripts_dir}/sh
@@ -239,6 +237,9 @@ src_install() {
 		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
 	fi
 
+	kdir /lib/dev-state
+	kdir /lib/udev-state
+
 	# FHS compatibility symlinks stuff
 	ksym /var/tmp /usr/tmp
 	ksym share/man /usr/local/man
diff --git a/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild b/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild
index 84ba6d9bb5a3..6a9a6107a222 100644
--- a/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.11.13-r2.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/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild,v 1.2 2005/12/22 04:07:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.13-r2.ebuild,v 1.3 2006/01/07 04:45:22 eradicator Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -177,8 +177,6 @@ src_install() {
 	kdir /etc/modules.d
 	kdir /etc/opt
 	kdir /home
-	kdir /lib/dev-state
-	kdir /lib/udev-state
 	kdir ${rcscripts_dir}
 	kdir ${rcscripts_dir}/awk
 	kdir ${rcscripts_dir}/sh
@@ -241,6 +239,9 @@ src_install() {
 		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
 	fi
 
+	kdir /lib/dev-state
+	kdir /lib/udev-state
+
 	# FHS compatibility symlinks stuff
 	ksym /var/tmp /usr/tmp
 	ksym share/man /usr/local/man
diff --git a/sys-apps/baselayout/baselayout-1.11.14.ebuild b/sys-apps/baselayout/baselayout-1.11.14.ebuild
index 2f0370a5c6f5..527dea15f22f 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-2005 Gentoo Foundation
+# 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.3 2005/12/22 04:07:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.14.ebuild,v 1.4 2006/01/07 04:45:22 eradicator Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -176,8 +176,6 @@ src_install() {
 	kdir /etc/modules.d
 	kdir /etc/opt
 	kdir /home
-	kdir /lib/dev-state
-	kdir /lib/udev-state
 	kdir ${rcscripts_dir}
 	kdir ${rcscripts_dir}/awk
 	kdir ${rcscripts_dir}/sh
@@ -240,6 +238,9 @@ src_install() {
 		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
 	fi
 
+	kdir /lib/dev-state
+	kdir /lib/udev-state
+
 	# FHS compatibility symlinks stuff
 	ksym /var/tmp /usr/tmp
 	ksym share/man /usr/local/man
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre13-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre13-r1.ebuild
index a41fb473bba2..60cd698475ac 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre13-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre13-r1.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_pre13-r1.ebuild,v 1.1 2006/01/05 10:55:23 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre13-r1.ebuild,v 1.2 2006/01/07 04:45:22 eradicator Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -185,8 +185,6 @@ src_install() {
 	kdir /etc/modules.d
 	kdir /etc/opt
 	kdir /home
-	kdir /lib/dev-state
-	kdir /lib/udev-state
 	kdir ${rcscripts_dir}
 	kdir ${rcscripts_dir}/awk
 	kdir ${rcscripts_dir}/sh
@@ -249,6 +247,9 @@ src_install() {
 		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
 	fi
 
+	kdir /lib/dev-state
+	kdir /lib/udev-state
+
 	# FHS compatibility symlinks stuff
 	ksym /var/tmp /usr/tmp
 	ksym share/man /usr/local/man
diff --git a/sys-apps/baselayout/baselayout-1.12.0_pre13.ebuild b/sys-apps/baselayout/baselayout-1.12.0_pre13.ebuild
index 3d150a075584..6f32329a2901 100644
--- a/sys-apps/baselayout/baselayout-1.12.0_pre13.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.0_pre13.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_pre13.ebuild,v 1.1 2006/01/04 08:13:20 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_pre13.ebuild,v 1.2 2006/01/07 04:45:22 eradicator Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -183,8 +183,6 @@ src_install() {
 	kdir /etc/modules.d
 	kdir /etc/opt
 	kdir /home
-	kdir /lib/dev-state
-	kdir /lib/udev-state
 	kdir ${rcscripts_dir}
 	kdir ${rcscripts_dir}/awk
 	kdir ${rcscripts_dir}/sh
@@ -247,6 +245,9 @@ src_install() {
 		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
 	fi
 
+	kdir /lib/dev-state
+	kdir /lib/udev-state
+
 	# FHS compatibility symlinks stuff
 	ksym /var/tmp /usr/tmp
 	ksym share/man /usr/local/man