Multilib fixes, don't install helper scripts in /get_libdir/udev and call them at /lib/udev in other scripts.

Package-Manager: portage-2.1.1

3 files changed, 29 insertions, 15 deletions

diff --git a/sys-fs/udev/ChangeLog b/sys-fs/udev/ChangeLog
index 05e56a3e7934..1ec4343eefc1 100644
--- a/sys-fs/udev/ChangeLog
+++ b/sys-fs/udev/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/udev
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.214 2006/09/12 05:49:13 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/ChangeLog,v 1.215 2006/09/18 18:23:37 herbs Exp $
+
+  18 Sep 2006; Herbie Hopkins <herbs@gentoo.org> udev-100-r2.ebuild:
+  Multilib fixes, don't install helper scripts in /get_libdir/udev and call
+  them at /lib/udev in other scripts.
 
   12 Sep 2006; Greg Kroah-Hartman <gregkh@gentoo.org> -udev-100-r1.ebuild:
   remove buggy 100-r1 ebuild
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index c8dc79ef2783..ba4b3209b2b3 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 05-udev-early.rules-078 288 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 SHA1 fbdeedb8b7a638c9d930f1e405aa83e55d9d2eec SHA256 63602afdbefafa4eb0b3301685e47dec5cc206b66765e733f9bcc6afe2a5d31b
 MD5 17c291f5c6e624792d02dd304fb8177e files/05-udev-early.rules-078 288
 RMD160 e4d07ee5080618ba60c9cfb544d438f2eb11cab6 files/05-udev-early.rules-078 288
@@ -210,18 +213,18 @@ EBUILD udev-099.ebuild 10901 RMD160 21c9d4d3d23c0e84c1c36dd14ff1fe9ab20a26a1 SHA
 MD5 e3e5626663681b1a4527416195508c43 udev-099.ebuild 10901
 RMD160 21c9d4d3d23c0e84c1c36dd14ff1fe9ab20a26a1 udev-099.ebuild 10901
 SHA256 5edc702bc9eebf3a8fb0a171720e9be089cc433be4d5e8acadd4145727b27ce7 udev-099.ebuild 10901
-EBUILD udev-100-r2.ebuild 11361 RMD160 fa1610088db4a46ce3bdebb7cff4278a31814b92 SHA1 925b3549e589d3f91d224485d69bae4380e36560 SHA256 61d4f034130ac458fa400672f30fd3c0994c542ab53dfed193e20d2d99e7a1e8
-MD5 54e0c027286da3e05e3e182913c71950 udev-100-r2.ebuild 11361
-RMD160 fa1610088db4a46ce3bdebb7cff4278a31814b92 udev-100-r2.ebuild 11361
-SHA256 61d4f034130ac458fa400672f30fd3c0994c542ab53dfed193e20d2d99e7a1e8 udev-100-r2.ebuild 11361
+EBUILD udev-100-r2.ebuild 11300 RMD160 070aa69e31a6a3c1eaf85cbf9e34802b19016f53 SHA1 c39347657a65ed9efa590d39c10866a1ffd27610 SHA256 17bdecd8667e196796a8e03adb8645b481257f90b2de6539e7c88cb51c0cc5fc
+MD5 0e6e8e178a4cce1a40c648099ab3d3f2 udev-100-r2.ebuild 11300
+RMD160 070aa69e31a6a3c1eaf85cbf9e34802b19016f53 udev-100-r2.ebuild 11300
+SHA256 17bdecd8667e196796a8e03adb8645b481257f90b2de6539e7c88cb51c0cc5fc udev-100-r2.ebuild 11300
 EBUILD udev-100.ebuild 10901 RMD160 f16e2d9278ad0fa9457e39a9687db8fbe62d9c58 SHA1 3113045ecc1dd08c765e56e442d97bb1ee49bc2f SHA256 446afef45c28b445f9c22fd9f5452613dd4edc1a8e84a98b05cd20ce8d01ccd8
 MD5 faa422dda3f247b1afaa34d459eebf86 udev-100.ebuild 10901
 RMD160 f16e2d9278ad0fa9457e39a9687db8fbe62d9c58 udev-100.ebuild 10901
 SHA256 446afef45c28b445f9c22fd9f5452613dd4edc1a8e84a98b05cd20ce8d01ccd8 udev-100.ebuild 10901
-MISC ChangeLog 38630 RMD160 12ae1e5f57b0766b46584b8cb1b367e40691c429 SHA1 b56862edf91dbe5b34f7954ea177438acaa1040b SHA256 a13041ba23b10d84053c138076a75f310c21927bfb106e10e1e81899522bf3d3
-MD5 5ff5aa6dc69232aa822d3737ef17ff35 ChangeLog 38630
-RMD160 12ae1e5f57b0766b46584b8cb1b367e40691c429 ChangeLog 38630
-SHA256 a13041ba23b10d84053c138076a75f310c21927bfb106e10e1e81899522bf3d3 ChangeLog 38630
+MISC ChangeLog 38813 RMD160 b50112ec68640d7178d08fab050696db92752ee3 SHA1 af9806702840920a9a0e1edb97ed48bdc07e8826 SHA256 b29bba4925e01d2a7ba3673dc2cda4201c432bec5129ced5fed2886bc473b6f9
+MD5 10a39cfc9faa0ce06e4db1fdce19e74c ChangeLog 38813
+RMD160 b50112ec68640d7178d08fab050696db92752ee3 ChangeLog 38813
+SHA256 b29bba4925e01d2a7ba3673dc2cda4201c432bec5129ced5fed2886bc473b6f9 ChangeLog 38813
 MISC metadata.xml 260 RMD160 f1b0916156eade656b558b7507109b69ed78d394 SHA1 3e34c50d52c32d6524b8de2d553e62a40798c043 SHA256 31722725c8bf774ad90600f7a3f50f2ca76c1396aad6888ce1cc08ce981b1552
 MD5 075d5a933d6175160a02ddf15bd4f454 metadata.xml 260
 RMD160 f1b0916156eade656b558b7507109b69ed78d394 metadata.xml 260
@@ -259,3 +262,10 @@ SHA256 b3f9795c890f236bb5fea71fd0bb360921ad749c65c0f1163c0b9dc0f8ff098d files/di
 MD5 1164667e6492c37edc6ce9ef2fb109ed files/digest-udev-100-r2 229
 RMD160 cf5425fc06f42ae72ad61ea195f0e64f2444ee28 files/digest-udev-100-r2 229
 SHA256 b3f9795c890f236bb5fea71fd0bb360921ad749c65c0f1163c0b9dc0f8ff098d files/digest-udev-100-r2 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFDuTr2G5bA0cA/ScRAm8UAKC6qk0dp+XxgErzfYXoh+FNc1k0owCg0XYx
+K8VK0Q+aF7bfI0RNl2+wHtU=
+=Rsfc
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/udev/udev-100-r2.ebuild b/sys-fs/udev/udev-100-r2.ebuild
index 5cd26981d202..c3b7a165a027 100644
--- a/sys-fs/udev/udev-100-r2.ebuild
+++ b/sys-fs/udev/udev-100-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-fs/udev/udev-100-r2.ebuild,v 1.1 2006/09/12 05:47:32 gregkh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev/udev-100-r2.ebuild,v 1.2 2006/09/18 18:23:37 herbs Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -96,7 +96,7 @@ src_install() {
 	dosbin udev			|| die "Required binary not installed properly"
 
 	# Helpers
-	exeinto /$(get_libdir)/udev
+	exeinto /lib/udev
 	doexe extras/run_directory/udev_run_devd	|| die "Required helper not installed properly"
 	doexe extras/run_directory/udev_run_hotplugd	|| die "Required helper not installed properly"
 	doexe extras/ata_id/ata_id		|| die "Required helper not installed properly"
@@ -110,7 +110,7 @@ src_install() {
 	doexe extras/rule_generator/write_cd_rules	|| die "Required helper not installed properly"
 	doexe extras/rule_generator/write_net_rules	|| die "Required helper not installed properly"
 	doexe extras/rule_generator/rule_generator.functions	|| die "Required helper not installed properly"
-	keepdir /$(get_libdir)/udev/state
+	keepdir /lib/udev/state
 
 	# vol_id library (needed by mount and HAL)
 	dolib extras/volume_id/lib/*.a extras/volume_id/lib/*.so*
@@ -188,9 +188,9 @@ src_install() {
 }
 
 pkg_preinst() {
-	if [[ -d ${ROOT}/$(get_libdir)/udev-state ]] ; then
-		mv -f "${ROOT}"/$(get_libdir)/udev-state/* "${D}"/$(get_libdir)/udev/state/
-		rm -r "${ROOT}"/$(get_libdir)/udev-state
+	if [[ -d ${ROOT}/lib/udev-state ]] ; then
+		mv -f "${ROOT}"/lib/udev-state/* "${D}"/lib/udev/state/
+		rm -r "${ROOT}"/lib/udev-state
 	fi
 
 	if [ -f "${ROOT}/etc/udev/udev.config" -a \