cp -a -> cp -pPR #103487 and install rpcgen for uClibc targets

Package-Manager: portage-2.0.51.22-r2

2 files changed, 26 insertions, 10 deletions

diff --git a/net-fs/nfs-utils/Manifest b/net-fs/nfs-utils/Manifest
index f0b5f148b104..bfd0b8ac8d9f 100644
--- a/net-fs/nfs-utils/Manifest
+++ b/net-fs/nfs-utils/Manifest
@@ -1,14 +1,24 @@
-MD5 d936fb702a6c1c6eb8308ea856e6c5e5 ChangeLog 10273
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 297d2da334fb6df5e747f61b989ef7ca nfs-utils-1.0.7-r1.ebuild 3272
 MD5 9cee4adcef8a47ea4ee35090f7f89b0a metadata.xml 225
 MD5 a5785bca6bda4d00aabdc28e36802df1 nfs-utils-1.0.6-r6.ebuild 2926
-MD5 1979f1d107c88c937983b05c3965dbf3 nfs-utils-1.0.7-r1.ebuild 3072
-MD5 21621dd473ef1b9bf3d4fdde0b738c51 files/nfs 5964
-MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
+MD5 d936fb702a6c1c6eb8308ea856e6c5e5 ChangeLog 10273
 MD5 1892989b0c12f8b6c533a8c6adfb90ff files/nfs.confd 577
+MD5 a02eed87e5d581e56feb0f6dfd18e6df files/exports 66
+MD5 77b7b275efe6533d3aaf065c89f804ef files/nfs-utils-1.0.7-gcc4.patch 553
+MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6-r6 67
+MD5 46e91b0dea9cbbfedcdccc9386b6326d files/digest-nfs-utils-1.0.7-r1 67
 MD5 1f3e6130e4a60767a213d34ff3131ae4 files/nfsmount 1171
+MD5 21621dd473ef1b9bf3d4fdde0b738c51 files/nfs 5964
 MD5 3878538fac900450212b414f8c8c39ab files/nfs-utils-1.0.6-uclibc.patch 547
-MD5 df57bdbe3dfddd40cda65b04509d5957 files/nfs-utils-1.0.6-usn36.patch.gz 5596
 MD5 3c693e012dcb68827b8f82cc98fa129b files/nfs-utils-0.3.3-rquotad-overflow.patch 1243
-MD5 3a3d8bd1a03bbf2c51a4e77a3516febd files/digest-nfs-utils-1.0.6-r6 67
-MD5 46e91b0dea9cbbfedcdccc9386b6326d files/digest-nfs-utils-1.0.7-r1 67
-MD5 77b7b275efe6533d3aaf065c89f804ef files/nfs-utils-1.0.7-gcc4.patch 553
+MD5 df57bdbe3dfddd40cda65b04509d5957 files/nfs-utils-1.0.6-usn36.patch.gz 5596
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDC76ZgIKl8Uu19MoRAhvgAJ0RB5+EdOIXlBIdWJLg66yV9WIoswCfZreb
+IhSQhATh+sII0O7eVE1idUE=
+=9xtT
+-----END PGP SIGNATURE-----
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.7-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.7-r1.ebuild
index eeb7726d0e89..1bb4c9ebb680 100644
--- a/net-fs/nfs-utils/nfs-utils-1.0.7-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.0.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.7-r1.ebuild,v 1.5 2005/06/02 00:40:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.7-r1.ebuild,v 1.6 2005/08/24 00:25:09 vapier Exp $
 
 inherit gnuconfig eutils flag-o-matic
 
@@ -87,6 +87,12 @@ src_install() {
 
 	doinitd "${FILESDIR}"/nfs "${FILESDIR}"/nfsmount
 	newconfd "${FILESDIR}"/nfs.confd nfs
+
+	# uClibc doesn't provide rpcgen like glibc, so lets steal it from nfs-utils
+	if ! use elibc_glibc ; then
+		dobin tools/rpcgen/rpcgen || die "rpcgen"
+		newdoc tools/rpcgen/README README.rpcgen
+	fi
 }
 
 pkg_preinst() {
@@ -104,6 +110,6 @@ pkg_postinst() {
 	for f in "${ROOT}"/usr/lib/nfs/*; do
 		[[ -f ${ROOT}/var/lib/nfs/${f##*/} ]] && continue
 		einfo "Copying default ${f##*/} from /usr/lib/nfs to /var/lib/nfs"
-		cp -a ${f} "${ROOT}"/var/lib/nfs/
+		cp -pPR ${f} "${ROOT}"/var/lib/nfs/
 	done
 }