net-fs/nfs-utils: Some prefix love

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 30 insertions, 20 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/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
 }