Correct cp -a to cp -pPR for bug #103487

Package-Manager: portage-2.0.51.22-r2

8 files changed, 31 insertions, 19 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index 19ad15b77a14..418585e2a61d 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.85 2005/08/03 14:57:30 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.86 2005/08/23 21:16:04 suka Exp $
+
+  23 Aug 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-bin-1.1.1.ebuild, openoffice-bin-1.1.4-r1.ebuild:
+  Correct cp -a to cp -pPR for bug #103487
 
 *openoffice-bin-1.9.122 (03 Aug 2005)
 
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild
index dcc98122e620..16901266e54d 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1.1.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/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild,v 1.17 2005/01/29 12:13:39 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.1.ebuild,v 1.18 2005/08/23 21:16:04 suka Exp $
 
 # NOTE:  There are two big issues that should be addressed.
 #
@@ -159,7 +159,7 @@ src_install() {
 		doins ${kdeloc}/.directory
 		dodir /usr/share
 		# Install the icons and mime info
-		cp -a ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
+		cp -pPR ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
 
 		for x in ${kdeloc}/*.desktop
 		do
diff --git a/app-office/openoffice-bin/openoffice-bin-1.1.4-r1.ebuild b/app-office/openoffice-bin/openoffice-bin-1.1.4-r1.ebuild
index 484de55db748..c3afd53fae59 100644
--- a/app-office/openoffice-bin/openoffice-bin-1.1.4-r1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-1.1.4-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/app-office/openoffice-bin/openoffice-bin-1.1.4-r1.ebuild,v 1.4 2005/06/09 13:23:20 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-1.1.4-r1.ebuild,v 1.5 2005/08/23 21:16:04 suka Exp $
 
 # NOTE:  There are two big issues that should be addressed.
 #
@@ -115,9 +115,9 @@ src_install() {
 
 	einfo "Installing menu shortcuts..."
 	dodir /usr/share
-	cp -a ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
+	cp -pPR ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
 
-	use kde && cp -a ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}/usr/share
+	use kde && cp -pPR ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}/usr/share
 
 	for x in ${D}${INSTDIR}/share/kde/net/*.desktop; do
 		# We have to handle soffice and setup differently
diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index 2bba9c25a729..c0f2e20b20e7 100644
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.136 2005/07/16 15:46:30 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.137 2005/08/23 21:18:38 suka Exp $
+
+  23 Aug 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-ximian-1.3.9-r1.ebuild, openoffice-ximian-1.3.14.ebuild:
+  Correct cp -a to cp -pPR for bug #103487
 
   16 Jul 2005; Joseph Jezak <josejx@gentoo.org>
   openoffice-ximian-1.3.9-r1.ebuild:
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.14.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.14.ebuild
index 7047ea6b3ca5..bc042fa47a83 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.14.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.14.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/app-office/openoffice-ximian/openoffice-ximian-1.3.14.ebuild,v 1.3 2005/06/29 20:48:50 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.14.ebuild,v 1.4 2005/08/23 21:18:38 suka Exp $
 
 # Notes:
 #
@@ -319,14 +319,14 @@ src_unpack() {
 
 	einfo "Installing / Scaling Icons"
 	${PATCHDIR}/bin/scale-icons ${S} || die
-	cp -af ${ICONDIR}/* ${S} || die
+	cp -pPRf ${ICONDIR}/* ${S} || die
 
 	einfo "Copying splash screens in place"
-	cp -af ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/ || die
+	cp -pPRf ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/ || die
 
 	einfo "Copying libpwd tarball in build dir"
 	mkdir -p ${S}/libwpd/download/ || die
-	cp -af ${DISTDIR}/libwpd-0.8.0.tar.gz ${S}/libwpd/download/ || die
+	cp -pPRf ${DISTDIR}/libwpd-0.8.0.tar.gz ${S}/libwpd/download/ || die
 
 	einfo "Munging font mappings ..."
 	${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu || die
diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild
index 214296d9618b..299d16db42b4 100644
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.9-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/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild,v 1.7 2005/07/16 15:46:31 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.9-r1.ebuild,v 1.8 2005/08/23 21:18:38 suka Exp $
 
 # Notes:
 #
@@ -316,14 +316,14 @@ src_unpack() {
 
 	einfo "Installing / Scaling Icons"
 	${PATCHDIR}/bin/scale-icons ${S} || die
-	cp -af ${ICONDIR}/* ${S} || die
+	cp -pPRf ${ICONDIR}/* ${S} || die
 
 	einfo "Copying splash screens in place"
-	cp -af ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/ || die
+	cp -pPRf ${WORKDIR}/gentoo-splash/open*.bmp ${S}/offmgr/res/ || die
 
 	einfo "Copying libpwd tarball in build dir"
 	mkdir -p ${S}/libwpd/download/ || die
-	cp -af ${DISTDIR}/libwpd-0.8.0.tar.gz ${S}/libwpd/download/ || die
+	cp -pPRf ${DISTDIR}/libwpd-0.8.0.tar.gz ${S}/libwpd/download/ || die
 
 	einfo "Munging font mappings ..."
 	${PATCHDIR}/bin/font-munge ${S}/officecfg/registry/data/org/openoffice/VCL.xcu || die
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 15250e3f8ff5..6dde62138b2f 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.120 2005/05/03 06:12:00 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.121 2005/08/23 21:13:48 suka Exp $
+
+  23 Aug 2005; Andreas Proschofsky <suka@gentoo.org>
+  openoffice-1.1.4-r1.ebuild:
+  Correct cp -a to cp -pPR for bug #103487
 
   03 May 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-1.1.4-r1.ebuild:
diff --git a/app-office/openoffice/openoffice-1.1.4-r1.ebuild b/app-office/openoffice/openoffice-1.1.4-r1.ebuild
index ed42d4f0eebe..cab6d2885c17 100644
--- a/app-office/openoffice/openoffice-1.1.4-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.1.4-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/app-office/openoffice/openoffice-1.1.4-r1.ebuild,v 1.7 2005/05/16 09:23:49 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.4-r1.ebuild,v 1.8 2005/08/23 21:13:48 suka Exp $
 
 # Notes:
 #
@@ -511,9 +511,9 @@ src_install() {
 
 	einfo "Installing menu shortcuts..."
 	dodir /usr/share
-	cp -a ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
+	cp -pPR ${D}${INSTDIR}/share/kde/net/share/icons ${D}/usr/share
 
-	use kde && cp -a ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}/usr/share
+	use kde && cp -pPR ${D}${INSTDIR}/share/kde/net/share/mimelnk ${D}/usr/share
 
 	for x in ${D}${INSTDIR}/share/kde/net/*.desktop; do
 		# We have to handle soffice and setup differently