This is related to #145287 but does not resolve it. Using get_libdir is wrong for udev-state and dev-state directories. Later in the ebuild we use /lib/udev-state and non-ABI stuff should go in /lib not get_libdir.

Package-Manager: portage-2.1-r1

4 files changed, 34 insertions, 19 deletions

diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog
index 06668d4c24c4..3549a525c927 100644
--- a/sys-apps/baselayout/ChangeLog
+++ b/sys-apps/baselayout/ChangeLog
@@ -1,10 +1,15 @@
 # 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.348 2006/09/28 09:36:48 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.349 2006/09/28 12:52:33 kanaka Exp $
 
 # See the rc-scripts ChangeLog in subversion for release info:
 # http://sources.gentoo.org/viewcvs.py/*checkout*/baselayout/trunk/ChangeLog
 
+  28 Sep 2006; Joel Martin <kanaka@gentoo.org> baselayout-1.12.5-r1.ebuild:
+  This is related to #145287 but does not resolve it. Using get_libdir is
+  wrong for udev-state and dev-state directories. Later in the ebuild we use
+  /lib/udev-state and non-ABI stuff should go in /lib not get_libdir.
+
 *baselayout-1.12.5-r2 (28 Sep 2006)
 
   28 Sep 2006; Roy Marples <uberlord@gentoo.org>
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index dd059a894dda..4026f4fa4761 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX baselayout-1.11.0-split-out-udev.patch 7413 RMD160 48eef541397ec0a21230de93518eed8a1ea63c16 SHA1 2dfa7e66c361459c8fce482b70d9e75ee51180bd SHA256 397221c066cbbb65d572df431b4babde766dc92d9177005e522e0df8faa25030
 MD5 8d10a229861f862fca52cd8e3bc655d9 files/baselayout-1.11.0-split-out-udev.patch 7413
 RMD160 48eef541397ec0a21230de93518eed8a1ea63c16 files/baselayout-1.11.0-split-out-udev.patch 7413
@@ -144,22 +147,22 @@ EBUILD baselayout-1.12.4.ebuild 19415 RMD160 57574bfc1b7e851d378032cacb438ac2c3e
 MD5 daa582ec8c3e2890cb66b659cce7e017 baselayout-1.12.4.ebuild 19415
 RMD160 57574bfc1b7e851d378032cacb438ac2c3eafc9e baselayout-1.12.4.ebuild 19415
 SHA256 5cb28241d589a2f494b42552b1e52bf9e4026e1fb9eaa6d9288603e7b79e6c41 baselayout-1.12.4.ebuild 19415
-EBUILD baselayout-1.12.5-r1.ebuild 19806 RMD160 e9e7f4fe0bd35c391007d3f61ecce996208b9d1b SHA1 962a298e6394582fa7a0865bde681b4234940c1c SHA256 75de04a8da04610e6f368913a82961002a2ef3a416e75eb128fa2df9dc36e695
-MD5 0decfa146ecac235b4f93b8863235dc3 baselayout-1.12.5-r1.ebuild 19806
-RMD160 e9e7f4fe0bd35c391007d3f61ecce996208b9d1b baselayout-1.12.5-r1.ebuild 19806
-SHA256 75de04a8da04610e6f368913a82961002a2ef3a416e75eb128fa2df9dc36e695 baselayout-1.12.5-r1.ebuild 19806
-EBUILD baselayout-1.12.5-r2.ebuild 19806 RMD160 53abbcaf8afd3772560e423c88a7eaf410f6aa77 SHA1 fcdd1400f29e17d9cb3afe1f3c70a892376dbeeb SHA256 de94089c7c89a17ed4cb6c7e624609542d3b2344eeb45b26dbf30b6dd12cf9d3
-MD5 bcee272185c88a494faf1495dbce3fda baselayout-1.12.5-r2.ebuild 19806
-RMD160 53abbcaf8afd3772560e423c88a7eaf410f6aa77 baselayout-1.12.5-r2.ebuild 19806
-SHA256 de94089c7c89a17ed4cb6c7e624609542d3b2344eeb45b26dbf30b6dd12cf9d3 baselayout-1.12.5-r2.ebuild 19806
+EBUILD baselayout-1.12.5-r1.ebuild 19784 RMD160 fcc3ce3a13622a5e77593358af936f0d0c47a54e SHA1 1518c528d36c930a8beaa5d3432ff6ec6c2e51ed SHA256 400b2de824c571adee470b3f5175af1e705381d7889f11e070e64f865a0b94bf
+MD5 a18f657db185ec04211fa763d855f224 baselayout-1.12.5-r1.ebuild 19784
+RMD160 fcc3ce3a13622a5e77593358af936f0d0c47a54e baselayout-1.12.5-r1.ebuild 19784
+SHA256 400b2de824c571adee470b3f5175af1e705381d7889f11e070e64f865a0b94bf baselayout-1.12.5-r1.ebuild 19784
+EBUILD baselayout-1.12.5-r2.ebuild 19784 RMD160 24565a186298aa19350dc6f9ac37900ab6ac8e32 SHA1 e9cb9f393ebedc9c75208f66a7454642e59bdd38 SHA256 fbfd956d4b78544d79c667ac42135dc75bbc760199adb43234c191bbb858a9a9
+MD5 f280c19d2a5daed282e37801c59ebd79 baselayout-1.12.5-r2.ebuild 19784
+RMD160 24565a186298aa19350dc6f9ac37900ab6ac8e32 baselayout-1.12.5-r2.ebuild 19784
+SHA256 fbfd956d4b78544d79c667ac42135dc75bbc760199adb43234c191bbb858a9a9 baselayout-1.12.5-r2.ebuild 19784
 EBUILD baselayout-1.12.5.ebuild 19733 RMD160 fe0d9d8de5e4a3f578fcd5e1dab0252dd562ffe4 SHA1 4df16f7ca772d8a61187a16c81ad7f77ede4298d SHA256 1ba697b46a943e0e83300b8f53ce9f3ff0d913fe4cd64b1fcf73ed636079037d
 MD5 2a15f6f4e5c36307e2bd9da16c4a305f baselayout-1.12.5.ebuild 19733
 RMD160 fe0d9d8de5e4a3f578fcd5e1dab0252dd562ffe4 baselayout-1.12.5.ebuild 19733
 SHA256 1ba697b46a943e0e83300b8f53ce9f3ff0d913fe4cd64b1fcf73ed636079037d baselayout-1.12.5.ebuild 19733
-MISC ChangeLog 79100 RMD160 378876d5263cecf6ad67ba1590db2ac5e37fad1c SHA1 f7ad3a342f4cd2f739cb0431b25151962924b7b3 SHA256 04bb81a3f651b2dfa43b273722a650fa6fc3f9cfc8d80a1ebbeda78aef3afaef
-MD5 a04f0b89f93c3c1c2658a60678203554 ChangeLog 79100
-RMD160 378876d5263cecf6ad67ba1590db2ac5e37fad1c ChangeLog 79100
-SHA256 04bb81a3f651b2dfa43b273722a650fa6fc3f9cfc8d80a1ebbeda78aef3afaef ChangeLog 79100
+MISC ChangeLog 79396 RMD160 2804ce326a2f2321b1ce92b4d0e396d40e19c6fd SHA1 d7a153598367b65265cf34fe598fdf5c5ba501bf SHA256 b9e8ee266501edcc6858f46ead2ee05b87e6b6599001a6e6b44f3eaf7ecc5244
+MD5 5bcdec049694278f8815dc3a90f5d684 ChangeLog 79396
+RMD160 2804ce326a2f2321b1ce92b4d0e396d40e19c6fd ChangeLog 79396
+SHA256 b9e8ee266501edcc6858f46ead2ee05b87e6b6599001a6e6b44f3eaf7ecc5244 ChangeLog 79396
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -209,3 +212,10 @@ SHA256 e2664f4f2035a0dffe9e01dad95a8f05e30e9aa277c0c0df51febbe3f05bdc03 files/di
 MD5 7633bbaedb7a7a35d9a6f82e9f313d20 files/digest-baselayout-1.12.5-r2 256
 RMD160 d4002016cd3fde45b5fef010fcfad5fe8700aacd files/digest-baselayout-1.12.5-r2 256
 SHA256 e2664f4f2035a0dffe9e01dad95a8f05e30e9aa277c0c0df51febbe3f05bdc03 files/digest-baselayout-1.12.5-r2 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFFG8WdbaW+3NC9cLgRAj6bAJ0ULryNyFQ6JzqIBzQEZ7cR6ai6xwCfRNmX
+SgzMreItVPDbyd4YtDF06fg=
+=hXiz
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout/baselayout-1.12.5-r1.ebuild b/sys-apps/baselayout/baselayout-1.12.5-r1.ebuild
index f871bd74813a..27545cf0309b 100644
--- a/sys-apps/baselayout/baselayout-1.12.5-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.5-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.5-r1.ebuild,v 1.1 2006/09/27 14:09:00 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.5-r1.ebuild,v 1.2 2006/09/28 12:52:33 kanaka Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -253,8 +253,8 @@ src_install() {
 		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
 	fi
 
-	kdir /$(get_libdir)/dev-state
-	kdir /$(get_libdir)/udev-state
+	kdir /lib/dev-state
+	kdir /lib/udev-state
 
 	# FHS compatibility symlinks stuff
 	ksym /var/tmp /usr/tmp
diff --git a/sys-apps/baselayout/baselayout-1.12.5-r2.ebuild b/sys-apps/baselayout/baselayout-1.12.5-r2.ebuild
index 776bc3544727..0f2c28b3a98f 100644
--- a/sys-apps/baselayout/baselayout-1.12.5-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-1.12.5-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.5-r2.ebuild,v 1.1 2006/09/28 09:36:48 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.5-r2.ebuild,v 1.2 2006/09/28 12:52:33 kanaka Exp $
 
 inherit flag-o-matic eutils toolchain-funcs multilib
 
@@ -253,8 +253,8 @@ src_install() {
 		ksym $(get_abi_LIBDIR ${DEFAULT_ABI}) /usr/local/lib
 	fi
 
-	kdir /$(get_libdir)/dev-state
-	kdir /$(get_libdir)/udev-state
+	kdir /lib/dev-state
+	kdir /lib/udev-state
 
 	# FHS compatibility symlinks stuff
 	ksym /var/tmp /usr/tmp