'cp -pPR' instead of 'cp -a' required by Darwin and BSD (bug #103487)

Package-Manager: portage-2.0.51.22-r2

4 files changed, 17 insertions, 13 deletions

diff --git a/net-fs/samba/ChangeLog b/net-fs/samba/ChangeLog
index f2295a7afc6b..85a2db7b2346 100644
--- a/net-fs/samba/ChangeLog
+++ b/net-fs/samba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-fs/samba
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.198 2005/08/13 10:59:21 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/ChangeLog,v 1.199 2005/08/24 10:09:01 satya Exp $
+
+  24 Aug 2005; Christian Andreetta <satya@gentoo.org>
+  samba-3.0.14a-r2.ebuild, samba-3.0.14a-r3.ebuild:
+  'cp -pPR' instead of 'cp -a' required by Darwin and BSD (bug #103487)
 
   13 Aug 2005; Christian Andreetta <satya@gentoo.org>
   +samba-3.0.14a-r3.ebuild:
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 0cc17d810ee6..41f62c28ca91 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,6 +1,6 @@
-MD5 b9509f231541bd56c0d2e80dd24f8ba4 samba-3.0.14a-r2.ebuild 9176
-MD5 04edb4a7c5d834cbeea29adfbd0b7c3c ChangeLog 35498
+MD5 9d5a13f9f53a4c06715e5538f1f17f30 samba-3.0.14a-r2.ebuild 9141
+MD5 4b59f081024262644969a737b5ddf93f ChangeLog 35677
 MD5 41299f246433a1a55c8fccc77ccd709e metadata.xml 491
-MD5 5c7d4a3b73a021cb6a6cfc2f34244186 samba-3.0.14a-r3.ebuild 9184
+MD5 e2d4d730a5b94ca850858aee5802134d samba-3.0.14a-r3.ebuild 9190
 MD5 8655ff25f25d7e80f85a5e527d43e94b files/digest-samba-3.0.14a-r2 209
 MD5 15a9e77f4ef8bd8a597b0efe99599337 files/digest-samba-3.0.14a-r3 209
diff --git a/net-fs/samba/samba-3.0.14a-r2.ebuild b/net-fs/samba/samba-3.0.14a-r2.ebuild
index 08317ece15d5..6ea037d65adf 100644
--- a/net-fs/samba/samba-3.0.14a-r2.ebuild
+++ b/net-fs/samba/samba-3.0.14a-r2.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/samba/samba-3.0.14a-r2.ebuild,v 1.14 2005/08/09 14:33:05 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r2.ebuild,v 1.15 2005/08/24 10:09:01 satya Exp $
 
 inherit eutils versionator
 
@@ -56,7 +56,7 @@ src_unpack() {
 	export EPATCH_SUFFIX="patch"
 	epatch ${PATCHDIR}/general
 	if use oav ; then
-		cp -a ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS
+		cp -pPR ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS
 		epatch ${PATCHDIR}/vscan
 	fi
 }
@@ -232,7 +232,7 @@ src_install() {
 	dodoc ${CONFDIR}/nsswitch.conf-wins
 	use winbind && dodoc ${CONFDIR}/nsswitch.conf-winbind
 
-	cp -a ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples
+	cp -pPR ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples
 
 	chmod -R 755 `find ${D}/usr/share/doc/${PF}/examples -type d`
 	chmod -R 644 `find ${D}/usr/share/doc/${PF}/examples ! -type d`
@@ -259,7 +259,7 @@ pkg_preinst() {
 		&& -r ${ROOT}/${PRIVATE_SRC}/secrets.tdb ]]; then
 		ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/"
 			mkdir -p ${IMAGE}/${PRIVATE_DST}
-			cp -af ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/
+			cp -pPRf ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/
 		eend $?
 	fi
 
diff --git a/net-fs/samba/samba-3.0.14a-r3.ebuild b/net-fs/samba/samba-3.0.14a-r3.ebuild
index 9dee68ec8173..ebbcf9fcbce5 100644
--- a/net-fs/samba/samba-3.0.14a-r3.ebuild
+++ b/net-fs/samba/samba-3.0.14a-r3.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/samba/samba-3.0.14a-r3.ebuild,v 1.3 2005/08/13 10:59:21 satya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/samba/samba-3.0.14a-r3.ebuild,v 1.4 2005/08/24 10:09:01 satya Exp $
 
 inherit eutils versionator
 
@@ -56,7 +56,7 @@ src_unpack() {
 	export EPATCH_SUFFIX="patch"
 	epatch ${PATCHDIR}/general
 	if use oav ; then
-		cp -a ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS
+		cp -pPR ${WORKDIR}/${PFVSCAN} ${S2}/examples/VFS
 		epatch ${PATCHDIR}/vscan
 	fi
 }
@@ -232,7 +232,7 @@ src_install() {
 	dodoc ${CONFDIR}/nsswitch.conf-wins
 	use winbind && dodoc ${CONFDIR}/nsswitch.conf-winbind
 
-	cp -a ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples
+	cp -pPR ${S2}/examples/* ${D}/usr/share/doc/${PF}/examples
 
 	chmod -R 755 `find ${D}/usr/share/doc/${PF}/examples -type d`
 	chmod -R 644 `find ${D}/usr/share/doc/${PF}/examples ! -type d`
@@ -259,7 +259,7 @@ pkg_preinst() {
 		&& -r ${ROOT}/${PRIVATE_SRC}/secrets.tdb ]]; then
 		ebegin "Copying ${ROOT}/${PRIVATE_SRC}/* to ${ROOT}/${PRIVATE_DST}/"
 			mkdir -p ${IMAGE}/${PRIVATE_DST}
-			cp -af ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/
+			cp -pPRf ${ROOT}/${PRIVATE_SRC}/* ${IMAGE}/${PRIVATE_DST}/
 		eend $?
 	fi