net-fs/nfs-utils: Some prefix love

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 49 insertions, 37 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index cfbdb244b863..cfd69465ab75 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.243 2014/02/03 14:30:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.244 2014/05/21 15:58:19 jlec Exp $
+
+  21 May 2014; Justin Lecher <jlec@gentoo.org> nfs-utils-1.2.9-r3.ebuild,
+  metadata.xml:
+  Some prefix love
 
   03 Feb 2014; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.2.9-r3.ebuild:
   Drop librpcsecgss dep as it is not used when libtirpc is utilized (which we
diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index bc1e7f61bcad..63f62300611a 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 0001-mountd-Fix-is_subdirectory-again.patch 2704 SHA256 1c1204dc5fc62debb8cc66ca299a741a3d8e515f480ff7aecb4ad72819658de7 SHA512 59a29c72096357fc35e805f0a1e443c7a6ee9b07c96ed85481b1101a6090311937b39f45aefa60325f968a5c7d2bc5550c2a43f2f54bd8522b615b84bdf71c86 WHIRLPOOL fc0c806c3c68f6d215f24a418b92b94188e23cc9249a8e0cea6ec22a1139747ab05cccab253bddff6787a15301225792658dadc8d6d1c4c6aba5543ea893d600
 AUX 0001-statd-exit-if-a-statd-is-already-running.patch 3593 SHA256 d3e402c73b204d4b5e161563005269318dad6e992792c902da76ff8368b872cb SHA512 e04d451618d6f6197dc0692844cc115fec93575525cd0569d582f9278007e2dbec692ef46065c675de13d608e034161f39a60d46766873933d05d18b94633f6c WHIRLPOOL fdf6de89a5ae3f26c1091f8b314684ba0cac3aab68731d3d56e5a909a2211b8f84b8212fbf0f7179427f98bdb102b9bb3d1c3828e66e283bc70abddc9ef3964d
@@ -74,24 +74,26 @@ EBUILD nfs-utils-1.2.8-r1.ebuild 4027 SHA256 19055b182c8bca25dc47efd2516ef11a623
 EBUILD nfs-utils-1.2.8-r2.ebuild 4095 SHA256 76fcc1ef5d657251f8b348938ac224c2a6b9a9efe797ccda8246c772fe51cb77 SHA512 32f7b226591017489302766483a7675f503d9c8990cdcedd8c4d4447fdb069e9b235de053f93d42bd1eb588faf640beea8c9691a8fe68cd9379f887c8b9f0d6e WHIRLPOOL 20bcb1ed15f50ae06244e640550fbce704c4e9734406e532be9f639b25b2664ee046bc855b004efac0b5aa0abd4a5738d48cf88c88d268b7497edcd838a06dc1
 EBUILD nfs-utils-1.2.9-r1.ebuild 4068 SHA256 41d9d9f2580dc1554afecb787f657036800e049e2d260db6a8db3990c732a4f5 SHA512 1cf2fa93feb2c50347c0facb332792c1d10199eed38a133218c174fd9f4af371b2c2844677826bd17e3358674f223371c60c558ab06e526f290dfa37ea63b55c WHIRLPOOL bc33f1fb0b4052ea4a5611ef6eb56de0b1e9dec8ee66ef98dad3a7a7b3792a03106d87717936d68027c4ce03a439129a62486bfc3d81e8253c53e3e0cce226da
 EBUILD nfs-utils-1.2.9-r2.ebuild 4367 SHA256 eac06d8f714370e8b5f7be317bc7eb9f2fc4394dbb0631e4e7ed010ad5e929e8 SHA512 e4cfc841eec2e993deb1c352eb306eb96e9e6aab5d9d4c7ca2b01c16cb2c467813a6cde2999f1e81eeaa55199e1901cd07d36b185b44c944f6640e74b7da543f WHIRLPOOL 62cca1460fb134eff41a9b882bc752ca3522c86d5e1b2b2a1c131e5ae5855caf159843ce3015b2176b387b35a8cc53a73f4236482795f694af87cdfd9d432016
-EBUILD nfs-utils-1.2.9-r3.ebuild 4281 SHA256 8cfc93c94cfcbe4ac9e49f874c0796d8909e26fb7506949b00ce4ec9e395c24f SHA512 64857298abffac064d70db69c3f1442af7b36638476aa74162d535fb58e6f3137c19f3e96706ffbc6a7a90b3be6d5f628668623411297472440d22512494985d WHIRLPOOL 7edc8b8bbbe0044c56d76ad69e65a72f39dd21f143cd0ecb5c2c6d16a3f81f7343c196833a70207a754232cb2d892f67f7bcc8518ed41c0c4d52d2e1332ef24a
+EBUILD nfs-utils-1.2.9-r3.ebuild 4455 SHA256 f323aa2791bd33f1a24a96b3aaee6a775ea4e98bc28eed6bc471971a7c64da69 SHA512 453afdbf85c536de08b62dcceec04ef7a02822e80e7b91d2cd8110be6e03e2ffabfebd8b608abdbd51cf8445af9c578a6734c940e463c128f6acff948411fa33 WHIRLPOOL 420a105cf9feb150d18a1b53dd2a9365215420448fd4dd0ea079525363ba47e155f4301479d29cebd3a0b14d8b0ddb45f314188922e081d18b853d0c9b11ed3b
 EBUILD nfs-utils-1.2.9.ebuild 4029 SHA256 0739c6faff846ab605635750fcb1a3ebdf24271833fa572a76217e8b7d79189b SHA512 3cca8936433fdfb0b2aa7cf23b0e92daeef1e094a3f9192e8bd61e6f92dbdf7c6544670828ae707a146044dd828074eac704fb58989e4f9a3b879f876502ab94 WHIRLPOOL 212d9f84f923b234e84238d7b0b9ddc1f6fa8f2f5c7cd47fe512e8173e603dd0a2dfa0e4a6dd8884c2026162cf1130fcfe07abbd53a9e12d24a92bd576f3c546
-MISC ChangeLog 38377 SHA256 5636f9ac3b479291f9794127fa3b343a42ca3b574fd2f3ce7b831bc294d024b3 SHA512 7d7e66410272ace6d81303ca0baff9c73440692ad122ff22c24d0b04cabbf64d9eceef89148cde36b8e6f79ca620dfd5945ee371856bbe346d5e43b8605c3d7c WHIRLPOOL 14a3ce837f59653771032fb404e73b1cb07c2a6460ac86ec7661c8c8194b354ae78b215563f063aeb2a8aeb56fe0cdd1a5687528c691c052d8bb7328cf3a96a1
-MISC metadata.xml 728 SHA256 654292a2a5f9be2660c579f750c31cb7d2c77de85fb305876c466a672486fbc0 SHA512 289e3ba39ed190f9a8fa5641ab3845503a982e252ea2ff40ce48bcddc66381883e0ffa334446372d0f4e3d97cdbaf5df548db48bc58c6f29479591f659004fa0 WHIRLPOOL f1de0a51ed05327d86442a2503b3a8f7507edde56b1930c7fbae402cdec184122e5047b97f5258af4bb44b32cf9e934a356a32f32e51a76b16614f62dd757c8f
+MISC ChangeLog 38485 SHA256 570114e17642d9df77da9533d5adf7622b7a96016fbf4342d4aece4cb3fe5063 SHA512 4fa2402b8730753e60d7f77ae48ce7c87c0ef331ad351911e484225c26f44a306bd816836de88a558f334e487f06078819440d7d3118d816f6eaeb65868097d7 WHIRLPOOL 3acf87a1fb9997a12c0bf3dfbd8333d97b2f43165e372a34cad71aad0243b64be5520d0100fcb8fca7c694585757d9ce44a620048085f643be99347fc9e9275b
+MISC metadata.xml 749 SHA256 aa6af1c43f6adcc82d29502f5945eb417485d609036983f9adda8b2529d66644 SHA512 aae31fb1933fa3b10e7e2c712cae0437929e183b009853adaaca94a95ea6902b0f9d67dfe0295df795b75b7f6d1d7e8b8e891a4543a51873bbfeaaffd90375ea WHIRLPOOL 2a4afdbb93a76c5b7fb4d3d7b72068cab8bed4e68c30d82dbffeea4fc778b7f695223d77d768f0ba01ebfc47b59b803e0bed71307c7474d051600aa8b9b61f33
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS76gEAAoJEPGu1DbS6WIA3x4QAJw9I2Iw9zm0pmTh2BxpZX3u
-fbWv5yZM5H0lpE5CMLcxS9eZOnDovDxxA+doVMLWvmfSQvYfzyProNZb5mb76PrM
-wuDpt/gReMeDXJLoYiBKvG9ukwm0RSxTOcka5tigFiQqiTeNPulODu47+ND+Xaq/
-kbre1uqqKgj5A26SBmxHl2cgpmRqY8fdQXoKVyJNhmv/DXamf1GLsaLwtAJHJDSl
-78FhAjCltwj1qR6DpqU8XMKxPXyfVmhy9rNnE2e+ywzPG60/YGYklZDgzoY2n1nW
-Iy340ypb//AIfLxACjRyz4yTD6BNssxOwPyW/6aEOnKv80VomWNZthOtdYdYb3pv
-dfWssCq6X6/F63EW7kUyVD/YbdATeMyhSMLdxJ9IXiuvxxomCnp/VJanER2e0b8e
-9hEBgCYHgz5hpVp3Gkt0QoWp70V50XosIAcZoWJpeDaHQbPjDkk5js4gp3NWn1K4
-7xu5qA9yE8ghfWm26Kb1R/7xziPG7iZN3+0AcfRKqxaR6he9XO03hZEFJd6EcJLp
-kEUBRTchpebhbH2GTSAuhjyi16mvcC6qBjmS0iM6A/ALwSALqLSLFLhYZSFBdMN5
-DQchYAS24iHF1ISzUX9og45TKPIb0ViqwkuMg+t9CdUjO55iYfhC+RLlU8c3Ypde
-oqdLdVvnfgD4pvKLgjhh
-=guyN
+iQJ8BAEBCgBmBQJTfM0cXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirLZgP+wVXSC4MtFtd2fhEw6d805QE
+JJg21m/fGJrrT158KqOAQkw7hcvJjguqXleXlS55iwXP0Gvy8iIltpFpuf2mUJKb
+YQ7Bs1zZ9z4NIPHvgYYZd9pRnMIw9KjkQ9qjkiaj/rO86bOrZfADrZSk7qitmulb
+GY51GnVWZVPrdvjWxBhNJO/YSC1oqWgqWKCbc+ubSV7Q8Nd/aCJ6qKQnxcFJoV9Z
+BPLW5fkNybGIOivM33aRlfUb/udk2cpEWOv+WvMCa29cpGOOLQcemf5GtRGhcunX
+biIAf29M529QgtgUT1oznO3+RNB7y/Nj7s0rsELIX7BzItf/gUD5G/s2Gi0NypuQ
+AHmRn0D0i2itGdSM1gSzx2N2BWsMV5V9tGKpbZrxC+zCpGZoMh1Z9SnWeBSe3VMF
+8E78ePRWfdShbxnEWWVJI2Pf/UhyS9nQR2Pyn5qkSVjCQlqqvTz9bGCFwS37J9wX
+ai0NZvBfl1KZpIFNI4ek0Xsx1xTUz8YSAVVRaBINcDZJTd7n2d24L8sKdBwt5juF
+/uA7f96GXN7oPHgy+UpAmGole3KYQ72W935+GZD5fDqcVtcajOwd7FEmhbHdWgYF
+eaWXYVOye5jBOH42UVRV0KkQmjISVGDrGvzCs7Gc3EZawB9f2+HGLzR0Yvh0RInb
+bPPshTkId6CmxUo5FSKk
+=jkjB
 -----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml
index 715d2d63e001..b680f8dbb2bf 100644
--- a/net-fs/nfs-utils/metadata.xml
+++ b/net-fs/nfs-utils/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-fs</herd>
-	<longdescription>NFS client and server daemons</longdescription>
-	<use>
-		<flag name='libmount'>Link mount.nfs with libmount</flag>
-		<flag name='nfsdcld'>Enable nfsdcld NFSv4 clientid tracking daemon</flag>
-		<flag name='nfsidmap'>Enable support for newer nfsidmap helper</flag>
-		<flag name='nfsv3'>Enable support for NFSv3</flag>
-		<flag name='nfsv4'>Enable support for NFSv4</flag>
-		<flag name='nfsv41'>Enable support for NFSv4.1</flag>
-		<flag name='nonfsv4'>Disable support for NFSv4</flag>
-		<flag name='uuid'>Support UUID lookups in rpc.mountd</flag>
-	</use>
+  <herd>net-fs</herd>
+  <longdescription>NFS client and server daemons</longdescription>
+  <use>
+    <flag name="libmount">Link mount.nfs with libmount</flag>
+    <flag name="nfsdcld">Enable nfsdcld NFSv4 clientid tracking daemon</flag>
+    <flag name="nfsidmap">Enable support for newer nfsidmap helper</flag>
+    <flag name="nfsv3">Enable support for NFSv3</flag>
+    <flag name="nfsv4">Enable support for NFSv4</flag>
+    <flag name="nfsv41">Enable support for NFSv4.1</flag>
+    <flag name="nonfsv4">Disable support for NFSv4</flag>
+    <flag name="uuid">Support UUID lookups in rpc.mountd</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild b/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild
index 838c7d54ed64..f0bee565501c 100644
--- a/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.9-r3.ebuild,v 1.2 2014/02/03 14:30:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.2.9-r3.ebuild,v 1.3 2014/05/21 15:58:19 jlec Exp $
 
 EAPI="4"
 
@@ -55,6 +55,11 @@ DEPEND="${DEPEND_COMMON}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1.4-mtab-sym.patch
 	epatch "${FILESDIR}"/${PN}-1.2.8-cross-build.patch
+
+	sed \
+		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
+		-i utils/*/Makefile.am || die
+
 	eautoreconf
 }
 
@@ -62,8 +67,9 @@ src_configure() {
 	export libsqlite3_cv_is_recent=yes # Our DEPEND forces this.
 	export ac_cv_header_keyutils_h=$(usex nfsidmap)
 	econf \
-		--with-statedir=/var/lib/nfs \
+		--with-statedir="${EPREFIX}"/var/lib/nfs \
 		--enable-tirpc \
+		--with-tirpcinclude="${EPREFIX}"/usr/include/tirpc/ \
 		$(use_enable libmount libmount-mount) \
 		$(use_with tcpd tcp-wrappers) \
 		$(use_enable nfsdcld nfsdcltrack) \
@@ -136,10 +142,10 @@ pkg_postinst() {
 	# 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
-	mkdir -p "${ROOT}"/var/lib/nfs #368505
-	for f in "${ROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from /usr/$(get_libdir)/nfs to /var/lib/nfs"
-		cp -pPR "${f}" "${ROOT}"/var/lib/nfs/
+	mkdir -p "${EROOT}"/var/lib/nfs #368505
+	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
+		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
+		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
+		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
 	done
 }