actually, we do want rpc.idmapd bound to USE=!nonfsv4 #172431 by emerald

Package-Manager: portage-2.1.2.3

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 1fa0a09aa72f77f21dc15ce25b41c9cf09718189..15ff1dd5d4ccc648852df729aa789de140a2ce89 100644 (file)
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,10 +1,9 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.100 2007/04/07 10:58:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.101 2007/04/07 17:34:52 vapier Exp $
 
-  07 Apr 2007; Mike Frysinger <vapier@gentoo.org>
-  nfs-utils-1.0.12-r2.ebuild, nfs-utils-1.0.12-r3.ebuild:
-  Bind rpc.gssd/rpc.idmapd install to USE=kerberos rather than USE=!nonfsv4
+  07 Apr 2007; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.0.12-r3.ebuild:
+  Bind rpc.gssd install to USE=kerberos rather than USE=!nonfsv4
   #172431 by emerald.
 
 *nfs-utils-1.0.12-r3 (02 Apr 2007)

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 215ef080b5c613dcf6e2192eee79feeee239df03..6a98c8a9f3c08bdeec5554eef806bc13217855d7 100644 (file)
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -88,14 +88,10 @@ EBUILD nfs-utils-1.0.12-r1.ebuild 2792 RMD160 795cf425bb71bca5986d03bba21f909038
 MD5 4f1a3bb7ec1fc8d2327fff5d0cda8071 nfs-utils-1.0.12-r1.ebuild 2792
 RMD160 795cf425bb71bca5986d03bba21f909038aae171 nfs-utils-1.0.12-r1.ebuild 2792
 SHA256 74481faea1c3955dfff766cc6b2f4cf138ec59619ffa98633eef1b2d6d03f9c3 nfs-utils-1.0.12-r1.ebuild 2792
-EBUILD nfs-utils-1.0.12-r2.ebuild 2981 RMD160 ed416695f10270b2362a3b59e354861c5ed0a7e6 SHA1 4d3f0ddf84105bf118e71621b3b2136bdf155167 SHA256 496d87acb7405687292bed19bcabef52e66d22f8b633efe57da8c6def5d5da6f
-MD5 48b61fa9c52942bf8f16f5e93e1febfd nfs-utils-1.0.12-r2.ebuild 2981
-RMD160 ed416695f10270b2362a3b59e354861c5ed0a7e6 nfs-utils-1.0.12-r2.ebuild 2981
-SHA256 496d87acb7405687292bed19bcabef52e66d22f8b633efe57da8c6def5d5da6f nfs-utils-1.0.12-r2.ebuild 2981
-EBUILD nfs-utils-1.0.12-r3.ebuild 2981 RMD160 d261e972037b5f2e5f20f855af2ef6c30b96f8e0 SHA1 ff18c026d7e1a173798240ede56299e184244cd8 SHA256 25d0b51e3864a05a8f9f236911a19caf69436f04596669171b8654c18c89aed5
-MD5 0cbf5266e4610cd53a307d26514d7002 nfs-utils-1.0.12-r3.ebuild 2981
-RMD160 d261e972037b5f2e5f20f855af2ef6c30b96f8e0 nfs-utils-1.0.12-r3.ebuild 2981
-SHA256 25d0b51e3864a05a8f9f236911a19caf69436f04596669171b8654c18c89aed5 nfs-utils-1.0.12-r3.ebuild 2981
+EBUILD nfs-utils-1.0.12-r3.ebuild 2960 RMD160 b490a12c03ee3aaeff30d5f627e9167e2cd52854 SHA1 db9ffcd145f2b0efdb32532b59a275bbe7582df6 SHA256 e4da233abdb817463aeb6f69ec80dd85ec471f20a4c5bbeed60ec39ddd531770
+MD5 43e77a1003325d98baf7abf576460ac2 nfs-utils-1.0.12-r3.ebuild 2960
+RMD160 b490a12c03ee3aaeff30d5f627e9167e2cd52854 nfs-utils-1.0.12-r3.ebuild 2960
+SHA256 e4da233abdb817463aeb6f69ec80dd85ec471f20a4c5bbeed60ec39ddd531770 nfs-utils-1.0.12-r3.ebuild 2960
 EBUILD nfs-utils-1.0.12.ebuild 2721 RMD160 e839170d85cbe7fff9068badfdeb60212c868325 SHA1 1e514e3f8e36466d73debbcca671a85991c0c841 SHA256 53ee34808764fe573e80b8ca6cb1bea75b3daa6df6749c553ba723724a6ff112
 MD5 3298193dbcaad181facde781699181f6 nfs-utils-1.0.12.ebuild 2721
 RMD160 e839170d85cbe7fff9068badfdeb60212c868325 nfs-utils-1.0.12.ebuild 2721
@@ -112,10 +108,10 @@ EBUILD nfs-utils-1.0.9.ebuild 2907 RMD160 9baa749c092aa8ca307986725e3ffd91ba78fc
 MD5 e81d18c985710d5f2c795fcdca91f167 nfs-utils-1.0.9.ebuild 2907
 RMD160 9baa749c092aa8ca307986725e3ffd91ba78fcf2 nfs-utils-1.0.9.ebuild 2907
 SHA256 4fee64fa626fc2ed003fb0428bd74a26a8666cc75ed6d338675c2ae95b2f7927 nfs-utils-1.0.9.ebuild 2907
-MISC ChangeLog 14823 RMD160 05ad51be07c27685928952d132eea11ac77e1529 SHA1 5d6e5550d8f7aa173b4f693659de7ec4ce0e43b5 SHA256 a90801aa6a6194a83acbf321dbd65efae6412b85f2b31057e96d6d6fa90cfba1
-MD5 bf4a9d0f1dc32dfc7c29e8b0afbae803 ChangeLog 14823
-RMD160 05ad51be07c27685928952d132eea11ac77e1529 ChangeLog 14823
-SHA256 a90801aa6a6194a83acbf321dbd65efae6412b85f2b31057e96d6d6fa90cfba1 ChangeLog 14823
+MISC ChangeLog 14782 RMD160 900276d93a19bca4b3e2f9ed20eff0892ae054fc SHA1 cfeddddfb3199c67ea2ec6acbb66f8792ed8b100 SHA256 432822f702166cb1cc7bb44104a7149fd7c9a4a38bb28f7ca36eae7643af201b
+MD5 e7dcaf2dad81088732387abf1d861e84 ChangeLog 14782
+RMD160 900276d93a19bca4b3e2f9ed20eff0892ae054fc ChangeLog 14782
+SHA256 432822f702166cb1cc7bb44104a7149fd7c9a4a38bb28f7ca36eae7643af201b ChangeLog 14782
 MISC metadata.xml 225 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a SHA1 02c4f79d48d465ad7bca76f706d0f7cb7dd039df SHA256 42f511d0cc6e82e29b011c686ba8bb7965f4d92eb6e47ba3e63d4c7edfe9883a
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a metadata.xml 225
@@ -129,9 +125,6 @@ SHA256 e7414116811bdf30fbef9735564ea69ed25aee0da8e28059d8913b2f9fbeeebd files/di
 MD5 981939bd25f589531226fcbaebda689b files/digest-nfs-utils-1.0.12-r1 250
 RMD160 4de93194725690c970901e58696d0e8ae9c999f3 files/digest-nfs-utils-1.0.12-r1 250
 SHA256 e7414116811bdf30fbef9735564ea69ed25aee0da8e28059d8913b2f9fbeeebd files/digest-nfs-utils-1.0.12-r1 250
-MD5 981939bd25f589531226fcbaebda689b files/digest-nfs-utils-1.0.12-r2 250
-RMD160 4de93194725690c970901e58696d0e8ae9c999f3 files/digest-nfs-utils-1.0.12-r2 250
-SHA256 e7414116811bdf30fbef9735564ea69ed25aee0da8e28059d8913b2f9fbeeebd files/digest-nfs-utils-1.0.12-r2 250
 MD5 981939bd25f589531226fcbaebda689b files/digest-nfs-utils-1.0.12-r3 250
 RMD160 4de93194725690c970901e58696d0e8ae9c999f3 files/digest-nfs-utils-1.0.12-r3 250
 SHA256 e7414116811bdf30fbef9735564ea69ed25aee0da8e28059d8913b2f9fbeeebd files/digest-nfs-utils-1.0.12-r3 250
@@ -147,7 +140,7 @@ SHA256 45ce27b77bf35f168dee66b458d6ecd57242510bfb9fedf1a637b9b795dea73f files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGF3sD8bi6rjpTunYRAocOAJ9SPNEbRS14lTIRYcQDq+NTX60IWQCggv99
-AcKr5o/J+zlnWfuPzOkGnCU=
-=6liu
+iD8DBQFGF9ZV8bi6rjpTunYRAm9SAJ4639ynPfp2V29MHTs3d7KRRX/gPACfddXm
+EgmS7BZHT5Woca3I6UPqreQ=
+=cgi/
 -----END PGP SIGNATURE-----

diff --git a/net-fs/nfs-utils/nfs-utils-1.0.12-r3.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.12-r3.ebuild
index f35e00f6a9914a15d9e87276794179d45ec4ab30..f1476b3c4763caf73923e2b9ed0dd78eecb83190 100644 (file)
--- a/net-fs/nfs-utils/nfs-utils-1.0.12-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.0.12-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.0.12-r3.ebuild,v 1.2 2007/04/07 10:58:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.12-r3.ebuild,v 1.3 2007/04/07 17:34:52 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -71,18 +71,14 @@ src_install() {
        insinto /etc
        doins "${FILESDIR}"/exports
 
-       local f
-       for f in nfs nfsmount rpc.statd ; do
+       local f list=""
+       use !nonfsv4 && list="${list} rpc.idmapd"
+       use kerberos && list="${list} rpc.gssd"
+       for f in nfs nfsmount rpc.statd ${list} ; do
                newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
        done
        newconfd "${FILESDIR}"/nfs.confd nfs
-
-       if use kerberos ; then
-               doins utils/idmapd/idmapd.conf
-               for f in rpc.gssd rpc.idmapd ; do
-                       newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
-               done
-       fi
+       use !nonfsv4 && doins utils/idmapd/idmapd.conf
 
        # uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
        if ! use elibc_glibc ; then