Fix multilib dir handling with backed up /var/lib/nfs.

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

3 files changed, 17 insertions, 19 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index b864c486bbea..7353a1829fa9 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.172 2010/08/07 21:13:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.173 2010/09/19 22:39:27 vapier Exp $
+
+  19 Sep 2010; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.2-r2.ebuild:
+  Fix multilib dir handling with backed up /var/lib/nfs.
 
   07 Aug 2010; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
   Port logic over for detecting rpc.gssd needs in nfs init.d script #330795 by
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index fdba0b029a76..3ffe3fd496ac 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -25,18 +25,15 @@ DIST nfs-utils-1.2.2.tar.bz2 721051 RMD160 fe855f89c5f93888b6c50682d353a9b475e0d
 EBUILD nfs-utils-1.1.4-r1.ebuild 3167 RMD160 8378aed25dfc49f16c7f67b4f1f044259533d7b3 SHA1 57dced084df3b73fc613c8efefe93324e9088160 SHA256 c0f3eedc4f31424c7788e55f504980bb530464d1bed49ed0cc0e431eef633403
 EBUILD nfs-utils-1.1.5.ebuild 3098 RMD160 1a1db2ab16f016511e799f5843d3b2b404173edc SHA1 a72f47b8d67fb539842ba3113f8365f4c3ae31ca SHA256 35a23dde75f23c921c1731f4bce5bfd6a9ab4aa66416e73864b7c8909e89a964
 EBUILD nfs-utils-1.1.6-r1.ebuild 3212 RMD160 128bea36284b28408aa6e10dfcc1b33061573b96 SHA1 56df20069859675ae6d37ecd88c136b2b78a7550 SHA256 02ecf4976fd1e54ff1440a8e7b6eb2333b7e4ff2392f082c34b5b41c493f809c
-EBUILD nfs-utils-1.1.6.ebuild 3098 RMD160 dcb65f053cb7c92a63c33e872917427ea717ab40 SHA1 d7c748021e99d05838d0fde58d7eda0e53f9b7e8 SHA256 06a80947bd22ada4949f735f71891ec9e7e0a0a1310ecd059d9a27ad7c1a2bbd
 EBUILD nfs-utils-1.2.0.ebuild 3194 RMD160 bcf7cc92eeb36828a3f62ef597f6f2bf20e3717d SHA1 66c69826465b73de114dc1fe7e1a9fcdafd78805 SHA256 ea1b2347de041280faa7dd8e008a2486d7b28e6b83f0b410f20afb009e906f64
 EBUILD nfs-utils-1.2.1.ebuild 3120 RMD160 c97608ea950bb115875d1c2058112b67e500159c SHA1 06e6b0203540520ce4aed99da5f2dd5575491d40 SHA256 5342652c52e345a17ef3d000a4a78aa0513edf863dad7adaa665975194d9771c
-EBUILD nfs-utils-1.2.2-r1.ebuild 3348 RMD160 5b5ef46d0bc4b45da7a780e98fffa4e4f3c94984 SHA1 5d68576b13b33f75ebb83a011649b3eb37864208 SHA256 9f09802bbd00e511a46db613fcda2b11dda720a9d52ef27ad4b414604eadf6bf
-EBUILD nfs-utils-1.2.2-r2.ebuild 3405 RMD160 65e72e8b1816dd6199e6c14d50973bc6be27ff4e SHA1 0776d16e3fbe14f29b8c37cfc920be53dceb7496 SHA256 ca151a3e88465b077cceaf838d7f61085148b598c225fc1014763581850a12e1
-EBUILD nfs-utils-1.2.2.ebuild 3203 RMD160 203c8a5b8bb5c4a2865b1c0a1d4d48f7205e484f SHA1 2e33c7b1b6242eedf7c321634e3709308e654d10 SHA256 6d1126cf7c519490a3d65207ccb256940b5ecf40f27b0b4ceb288c7da9056c40
-MISC ChangeLog 27398 RMD160 6dcb52b8ed6535a192f96e8cf08741b750b35760 SHA1 dda3fdbc32f4ffb69e1a4945b62a6eee37a978ee SHA256 3eee81d8eaf822d756b3c444055cb8b62af6e534f631260024de8563a32fe66f
+EBUILD nfs-utils-1.2.2-r2.ebuild 3387 RMD160 957cda2a26635d233322f2ca62a4466bbe2ad537 SHA1 bd0fc823c4e79d0c5a0025f31f9a416a3411da78 SHA256 9dd1368b530d093538f6adb4715ec6634fe050e664b6ae0b004f65a8fae9c4f4
+MISC ChangeLog 27533 RMD160 fdc1ce47f3115b1383f9258ad84ccb2044fbe8c0 SHA1 dbf45879c8a85ec203924daac1b99c8c65afa7aa SHA256 c49f02927426d741ac35b3de8da2d3940743a42b48d37225a6197486cbdee7bd
 MISC metadata.xml 402 RMD160 10e39caa098663bde1b609727598aefc319eb5c2 SHA1 9180287973e77c950e172f055e19e5f94f446621 SHA256 cf9b23e458d8e57e6b3ec4639d2c486032b3313952da2c92166bc5f40409e3f6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxdzKEACgkQTwhj9JtAlp6zpQD+PC8X33NaRbqigUOevszU4HDk
-czJG8lBZ+pGubxSSQwgA/jXGt90FP1oQ4k6CcZWoi4YxbO8AF/IuyZtVsrLpETfA
-=l8y8
+iF4EAREIAAYFAkyWkQ0ACgkQTwhj9JtAlp6R4gD/U4F+npfodYkIDZn43e3NdcNo
+Chslj4TFSkLLJKrVIMUA/0lS3mXCudBfg31FdWBBaWc86A8Uq/fSOhpTqXTByaVV
+=dFvU
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.2-r2.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.2-r2.ebuild
index fe7d5bdc238f..83272ff43265 100644
--- a/net-fs/nfs-utils/nfs-utils-1.2.2-r2.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.2.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.2-r2.ebuild,v 1.1 2010/07/23 01:33:58 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.2-r2.ebuild,v 1.2 2010/09/19 22:39:27 vapier Exp $
 
 EAPI="2"
 
@@ -66,10 +66,9 @@ src_install() {
 
 	# Don't overwrite existing xtab/etab, install the original
 	# versions somewhere safe...  more info in pkg_postinst
-	dodir /usr/lib/nfs
-	keepdir /var/lib/nfs/{sm,sm.bak}
-	mv "${D}"/var/lib/nfs/* "${D}"/usr/lib/nfs
-	keepdir /var/lib/nfs
+	dodir /usr/$(get_libdir)/nfs
+	mv "${D}"/var/lib/nfs "${D}"/usr/$(get_libdir)/ || die
+	keepdir /var/lib/nfs/{,sm,sm.bak}
 
 	# Install some client-side binaries in /sbin
 	dodir /sbin
@@ -101,10 +100,9 @@ src_install() {
 }
 
 pkg_postinst() {
-	# Install default xtab and friends if there's none existing.
-	# In src_install we put them in /usr/lib/nfs for safe-keeping, but
-	# the daemons actually use the files in /var/lib/nfs.  This fixes
-	# bug 30486
+	# Install default xtab and friends if there's none existing.  In
+	# src_install we put them in /usr/lib/nfs for safe-keeping, but
+	# the daemons actually use the files in /var/lib/nfs.  #30486
 	local f
 	for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
 		[[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue