Until newer baselayout stabilizes, only use config() when it exists #203906.

Package-Manager: portage-2.1.4

4 files changed, 31 insertions, 17 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 7763d113ab25..e81cb1ce49b4 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.117 2008/01/08 15:07:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.118 2008/01/14 09:56:54 vapier Exp $
+
+  14 Jan 2008; Mike Frysinger <vapier@gentoo.org> files/nfs.initd,
+  files/nfsmount.initd:
+  Until newer baselayout stabilizes, only use config() when it exists #203906.
 
   08 Jan 2008; Raúl Porcel <armin76@gentoo.org> nfs-utils-1.1.0-r1.ebuild:
   alpha/ia64/sparc stable wrt #201552
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index 7831afd97d70..d08627e3cb4a 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX exports 66 RMD160 0a61ad40dc321be39fb54d5b9fe717caa714e878 SHA1 52ed6b74643e084cfc17ff4638c2e06c86602034 SHA256 5d6356df546682e2f1a87131d1bb67de9b1f9a34d3a5742343dc64e890cf71d5
 MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
 RMD160 0a61ad40dc321be39fb54d5b9fe717caa714e878 files/exports 66
@@ -18,18 +21,18 @@ AUX nfs.confd.old 533 RMD160 bad552a256a86bc374cd7ff3d685afa4ff5d816e SHA1 43fbd
 MD5 fc332370f9517304bc251f505b17abf2 files/nfs.confd.old 533
 RMD160 bad552a256a86bc374cd7ff3d685afa4ff5d816e files/nfs.confd.old 533
 SHA256 a9b8395590b8d15b52eee8cb637fdc23afce007de42442ef4448e76f2ac899fd files/nfs.confd.old 533
-AUX nfs.initd 3978 RMD160 b07fdc59c0dad0a7f876a7307f5512b198f52cb3 SHA1 85f62949f231f101475c35cbbe61ae4c2c645efa SHA256 ab4eddf26d4a745b45f5ba15a00b2b856c84c507ee00a9f9f0e2cdafa71a0691
-MD5 29d9a91dcf65806114ffb465a5f48f45 files/nfs.initd 3978
-RMD160 b07fdc59c0dad0a7f876a7307f5512b198f52cb3 files/nfs.initd 3978
-SHA256 ab4eddf26d4a745b45f5ba15a00b2b856c84c507ee00a9f9f0e2cdafa71a0691 files/nfs.initd 3978
+AUX nfs.initd 4014 RMD160 1251a11694dd1dfd0aaeac8eb9baa7b77a64fcc4 SHA1 142b72ba0834406d06038a63e861ac5fbcfb065a SHA256 c27427beb955f91392bded6751e569ceda943ad59088b21ed8fa34b21742265b
+MD5 41ffedaf1c4a7d968315245fcd4656e1 files/nfs.initd 4014
+RMD160 1251a11694dd1dfd0aaeac8eb9baa7b77a64fcc4 files/nfs.initd 4014
+SHA256 c27427beb955f91392bded6751e569ceda943ad59088b21ed8fa34b21742265b files/nfs.initd 4014
 AUX nfsmount 1131 RMD160 f67431f36e702c50c67ff799d96c8bd37fbe847f SHA1 c88b592db4304f4d19798c1c2346ea688c9acde2 SHA256 8c1b12047327d707743bc579151ff7e3800696cc46cfcaea1c58a93fbc11f9e7
 MD5 2af8106db3fdcb3d5ddf22ea5fffb105 files/nfsmount 1131
 RMD160 f67431f36e702c50c67ff799d96c8bd37fbe847f files/nfsmount 1131
 SHA256 8c1b12047327d707743bc579151ff7e3800696cc46cfcaea1c58a93fbc11f9e7 files/nfsmount 1131
-AUX nfsmount.initd 1079 RMD160 62595a61fec609cf24b4ef09d7d7295382bc16cb SHA1 a64f4f74919f95347967f99f3b7d382e01461180 SHA256 324b7377f70310abdceee0b9ad526d4d57e5cd336c927fcb65a98c765f48d087
-MD5 d689c5870114ca4acf677a3bc0e5a010 files/nfsmount.initd 1079
-RMD160 62595a61fec609cf24b4ef09d7d7295382bc16cb files/nfsmount.initd 1079
-SHA256 324b7377f70310abdceee0b9ad526d4d57e5cd336c927fcb65a98c765f48d087 files/nfsmount.initd 1079
+AUX nfsmount.initd 1114 RMD160 23e51c571983cf6d7fac5bb43b9b112c10866f5f SHA1 e2c3f98940bdc7b33e74a8987ea2212fb673969f SHA256 dcad18c72379bc8088f4257492b84ff4a59c6596d0d84156b17661fefd403981
+MD5 0e8f2d2d70a01e8ed170ad728c7bb3e1 files/nfsmount.initd 1114
+RMD160 23e51c571983cf6d7fac5bb43b9b112c10866f5f files/nfsmount.initd 1114
+SHA256 dcad18c72379bc8088f4257492b84ff4a59c6596d0d84156b17661fefd403981 files/nfsmount.initd 1114
 AUX rpc.gssd.initd 1106 RMD160 75af3525935d319cb822a57ee7441e3579ac9d6d SHA1 4da6054e65843262246fb314b3b06051e3929b51 SHA256 8f80988fd6572bd251d1feaf75004cd7b02814d1541385a1fc82bbb05022c97c
 MD5 0214d11900ca8ec925e476f35e1a1602 files/rpc.gssd.initd 1106
 RMD160 75af3525935d319cb822a57ee7441e3579ac9d6d files/rpc.gssd.initd 1106
@@ -63,10 +66,10 @@ EBUILD nfs-utils-1.1.1.ebuild 3427 RMD160 f7de6685b55a98f7bf9d278406a1b0576a95c3
 MD5 8a02fd7cef8d12a8ef621a9ceb588653 nfs-utils-1.1.1.ebuild 3427
 RMD160 f7de6685b55a98f7bf9d278406a1b0576a95c338 nfs-utils-1.1.1.ebuild 3427
 SHA256 8c9f6fb84710beecd856dcdd8a01f5f39d14212ef42f4d68032bf04ae1795341 nfs-utils-1.1.1.ebuild 3427
-MISC ChangeLog 17635 RMD160 511d486e4b18c5cb9a73ec5244ed1f37ef42ee1c SHA1 9495384b7dd3d99cb73bb14228fb98f7658f8f09 SHA256 421ea3d0985837a3433234b751b7bc074bb3237651e574563edff61d5d84f997
-MD5 7a94fa4cdf58df602c7778553c48b182 ChangeLog 17635
-RMD160 511d486e4b18c5cb9a73ec5244ed1f37ef42ee1c ChangeLog 17635
-SHA256 421ea3d0985837a3433234b751b7bc074bb3237651e574563edff61d5d84f997 ChangeLog 17635
+MISC ChangeLog 17805 RMD160 9ea97379088c2cb221b0379c741368c0768a0d87 SHA1 d414dcd6244a417e18b7b8c4ef714ed33c8453e9 SHA256 5d67ffece320d3bf06f49ff3ab6b46f18d79a418ad85f6859482079bd40c5258
+MD5 eb5ccdcf38f9535bcf23a23acb9837c7 ChangeLog 17805
+RMD160 9ea97379088c2cb221b0379c741368c0768a0d87 ChangeLog 17805
+SHA256 5d67ffece320d3bf06f49ff3ab6b46f18d79a418ad85f6859482079bd40c5258 ChangeLog 17805
 MISC metadata.xml 225 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a SHA1 02c4f79d48d465ad7bca76f706d0f7cb7dd039df SHA256 42f511d0cc6e82e29b011c686ba8bb7965f4d92eb6e47ba3e63d4c7edfe9883a
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
 RMD160 477581252d7edf18d7b8a274766e2ed04c61935a metadata.xml 225
@@ -83,3 +86,10 @@ SHA256 403defb82328204e1cf27e79abb76b72bf87103f1889968594f29cecf9a5b8da files/di
 MD5 50c35536a391d9decc8e0008b82719c8 files/digest-nfs-utils-1.1.1 888
 RMD160 1e74cda36b5da2c3aad664d057b6ddab356f0fdd files/digest-nfs-utils-1.1.1 888
 SHA256 eab4b638df3a5fcbf1b0840aaaf2caa54a3ccbd990cca6d8dcddc69d77eef1c8 files/digest-nfs-utils-1.1.1 888
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHizHrj9hvisErhMIRAn4vAKDjteTLRij7PZ8T6GlkaHp6XfYzYQCeNO8q
+SMYNkqPSMM8SnexEGC/MABg=
+=rbxc
+-----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index 4b638ca798ad..a5bd05db3a33 100755
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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/files/nfs.initd,v 1.9 2007/12/30 19:25:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.10 2008/01/14 09:56:55 vapier Exp $
 
 opts="reload"
 
@@ -22,7 +22,7 @@ depend() {
 			myneed="${myneed} rpc.gssd"
 		fi
 	fi
-	config /etc/exports
+	type -t config 2>/dev/null 1>&2 && config /etc/exports
 	need portmap rpc.statd ${myneed}
 	use ypbind net dns rpc.rquotad rpc.idmapd rpc.gssd
 	after quota
diff --git a/net-fs/nfs-utils/files/nfsmount.initd b/net-fs/nfs-utils/files/nfsmount.initd
index 7d30e5d1019b..a523a95a281d 100755
--- a/net-fs/nfs-utils/files/nfsmount.initd
+++ b/net-fs/nfs-utils/files/nfsmount.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # 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/files/nfsmount.initd,v 1.7 2007/12/30 19:25:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfsmount.initd,v 1.8 2008/01/14 09:56:55 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -13,7 +13,7 @@ depend() {
 		[ ${ret} -ne 0 ] && myneed="${myneed} rpc.idmapd"
 		[ ${ret} -eq 1 ] && myneed="${myneed} rpc.gssd"
 	fi
-	config /etc/fstab
+	type -t config 2>/dev/null 1>&2 && config /etc/fstab
 	need net portmap rpc.statd ${myneed}
 	use ypbind dns rpc.idmapd rpc.gssd
 }