Don't use -d option with cp.

(Portage version: 2.0.51.22)

10 files changed, 31 insertions, 19 deletions

diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog
index 81a6dea0a525..2dc0a5a71845 100644
--- a/dev-java/ibm-jre-bin/ChangeLog
+++ b/dev-java/ibm-jre-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ibm-jre-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.18 2005/07/11 13:27:01 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.19 2005/09/02 12:26:21 flameeyes Exp $
+
+  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  ibm-jre-bin-1.4.1-r1.ebuild, ibm-jre-bin-1.4.2.ebuild:
+  Don't use -d option with cp.
 
   11 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
   ibm-jre-bin-1.4.1-r1.ebuild, ibm-jre-bin-1.4.2.ebuild:
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild
index 55fe39fc1f61..aa0af7c13ab8 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-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/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild,v 1.17 2005/07/13 14:07:00 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.1-r1.ebuild,v 1.18 2005/09/02 12:26:21 flameeyes Exp $
 
 inherit java
 
@@ -34,7 +34,7 @@ src_compile() {
 src_install() {
 	# Copy all the files to the designated directory
 	dodir /opt/${P}
-	cp -dpR ${S}/jre/* ${D}/opt/${P}/
+	cp -pR ${S}/jre/* ${D}/opt/${P}/
 
 	dohtml -a html,htm,HTML -r docs
 	dodoc ${S}/docs/COPYRIGHT
diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild
index 6d4ffcff4c54..c02ba1436186 100644
--- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild
+++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.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/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild,v 1.11 2005/07/13 14:07:00 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.ebuild,v 1.12 2005/09/02 12:26:21 flameeyes Exp $
 
 inherit java
 
@@ -34,7 +34,7 @@ src_compile() {
 src_install() {
 	# Copy all the files to the designated directory
 	dodir /opt/${P}
-	cp -dpR ${S}/jre/* ${D}/opt/${P}/
+	cp -pR ${S}/jre/* ${D}/opt/${P}/
 
 	dohtml -a html,htm,HTML -r docs
 	dodoc ${S}/docs/COPYRIGHT
diff --git a/dev-java/jrockit-jdk-bin/ChangeLog b/dev-java/jrockit-jdk-bin/ChangeLog
index dfda175ee3ad..a9f9991a8239 100644
--- a/dev-java/jrockit-jdk-bin/ChangeLog
+++ b/dev-java/jrockit-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jrockit-jdk-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/ChangeLog,v 1.14 2005/08/25 01:39:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/ChangeLog,v 1.15 2005/09/02 12:28:09 flameeyes Exp $
+
+  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  jrockit-jdk-bin-1.4.2.05.ebuild, jrockit-jdk-bin-1.5.0.03.ebuild:
+  Don't use -d option with cp.
 
   25 Aug 2005; Aron Griffis <agriffis@gentoo.org>
   jrockit-jdk-bin-1.5.0.03.ebuild:
diff --git a/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.05.ebuild b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.05.ebuild
index 2537376ef157..2502ae7c0069 100644
--- a/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.05.ebuild
+++ b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.05.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/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.05.ebuild,v 1.4 2005/07/19 14:22:26 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.4.2.05.ebuild,v 1.5 2005/09/02 12:28:09 flameeyes Exp $
 
 IUSE=""
 
@@ -55,7 +55,7 @@ src_install() {
 	dodir /opt/${P}
 
 	for i in ${dirs} ; do
-		cp -dR $i ${D}/opt/${P}/ || die
+		cp -R $i ${D}/opt/${P}/ || die
 	done
 
 	newdoc README.TXT README
diff --git a/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.03.ebuild b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.03.ebuild
index b9d6b0708901..1f3a14d4d880 100644
--- a/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.03.ebuild
+++ b/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.03.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/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.03.ebuild,v 1.5 2005/08/25 01:39:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jrockit-jdk-bin/jrockit-jdk-bin-1.5.0.03.ebuild,v 1.6 2005/09/02 12:28:09 flameeyes Exp $
 
 # WARNING: This is the default VM on ia64, so treat this ebuild
 # with proper care.
@@ -50,7 +50,7 @@ src_install() {
 	dodir /opt/${P}
 
 	for i in ${dirs} ; do
-		cp -dR $i ${D}/opt/${P}/ || die
+		cp -R $i ${D}/opt/${P}/ || die
 	done
 
 	newdoc README.TXT README
diff --git a/dev-java/maven-bin/ChangeLog b/dev-java/maven-bin/ChangeLog
index 4d6912a35069..9a460c6de4e2 100644
--- a/dev-java/maven-bin/ChangeLog
+++ b/dev-java/maven-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/maven-bin
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.5 2005/04/22 08:42:13 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/ChangeLog,v 1.6 2005/09/02 12:25:02 flameeyes Exp $
+
+  02 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  maven-bin-1.0_rc3.ebuild, maven-bin-1.0_rc4.ebuild, maven-bin-1.0.ebuild:
+  Don't use -d option with cp.
 
   22 Apr 2005; Simon Stelling <blubb@gentoo.org> maven-bin-1.0_rc3.ebuild:
   stable on amd64
diff --git a/dev-java/maven-bin/maven-bin-1.0.ebuild b/dev-java/maven-bin/maven-bin-1.0.ebuild
index 2adcbc05574d..c5804f843884 100644
--- a/dev-java/maven-bin/maven-bin-1.0.ebuild
+++ b/dev-java/maven-bin/maven-bin-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.0.ebuild,v 1.2 2004/10/29 12:56:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.0.ebuild,v 1.3 2005/09/02 12:25:02 flameeyes Exp $
 
 DESCRIPTION="Project Management and Comprehension Tool for Java"
 SRC_URI="mirror://apache/maven/binaries/${PN/-bin}-${PV/_/-}.tar.gz"
@@ -23,5 +23,5 @@ src_install() {
 	doexe ${S}/bin/maven
 	insinto /etc/env.d
 	doins ${FILESDIR}/25maven
-	cp -Rdp * ${D}/usr/share/maven
+	cp -Rp * ${D}/usr/share/maven
 }
diff --git a/dev-java/maven-bin/maven-bin-1.0_rc3.ebuild b/dev-java/maven-bin/maven-bin-1.0_rc3.ebuild
index c1ae6e6fb1c5..e589bd418fe6 100644
--- a/dev-java/maven-bin/maven-bin-1.0_rc3.ebuild
+++ b/dev-java/maven-bin/maven-bin-1.0_rc3.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/dev-java/maven-bin/maven-bin-1.0_rc3.ebuild,v 1.4 2005/04/22 08:42:13 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.0_rc3.ebuild,v 1.5 2005/09/02 12:25:02 flameeyes Exp $
 
 DESCRIPTION="Project Management and Comprehension Tool for Java"
 SRC_URI="mirror://apache/maven/binaries/${PN/-bin}-${PV/_/-}.tar.gz"
@@ -23,5 +23,5 @@ src_install() {
 	doexe ${S}/bin/maven
 	insinto /etc/env.d
 	doins ${FILESDIR}/25maven
-	cp -Rdp * ${D}/usr/share/maven
+	cp -Rp * ${D}/usr/share/maven
 }
diff --git a/dev-java/maven-bin/maven-bin-1.0_rc4.ebuild b/dev-java/maven-bin/maven-bin-1.0_rc4.ebuild
index eaef330efc04..5a2ef4a75b87 100644
--- a/dev-java/maven-bin/maven-bin-1.0_rc4.ebuild
+++ b/dev-java/maven-bin/maven-bin-1.0_rc4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.0_rc4.ebuild,v 1.3 2004/10/29 12:56:51 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/maven-bin/maven-bin-1.0_rc4.ebuild,v 1.4 2005/09/02 12:25:02 flameeyes Exp $
 
 DESCRIPTION="Project Management and Comprehension Tool for Java"
 SRC_URI="mirror://apache/maven/binaries/${PN/-bin}-${PV/_/-}.tar.gz"
@@ -23,5 +23,5 @@ src_install() {
 	doexe ${S}/bin/maven
 	insinto /etc/env.d
 	doins ${FILESDIR}/25maven
-	cp -Rdp * ${D}/usr/share/maven
+	cp -Rp * ${D}/usr/share/maven
 }