moved from dev-java/oro to dev-java/jakarta-oro dependency. see #71337.

Package-Manager: portage-2.0.51.19

7 files changed, 31 insertions, 26 deletions

diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog
index b9327e267796..e09dff513904 100644
--- a/dev-java/struts/ChangeLog
+++ b/dev-java/struts/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/struts
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.12 2004/10/22 11:45:42 absinthe Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.13 2005/03/29 16:36:54 luckyduck Exp $
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> struts-1.1-r1.ebuild,
+  struts-1.1-r2.ebuild, struts-1.1.ebuild, struts-1.2.2-r1.ebuild,
+  struts-1.2.2.ebuild, struts-1.2.4.ebuild:
+  moved from dev-java/oro to dev-java/jakarta-oro dependency. see #71337.
 
   22 Oct 2004; Dylan Carlson <absinthe@gentoo.org> struts-1.1-r1.ebuild,
   struts-1.1-r2.ebuild, struts-1.1.ebuild, struts-1.2.2-r1.ebuild,
diff --git a/dev-java/struts/struts-1.1-r1.ebuild b/dev-java/struts/struts-1.1-r1.ebuild
index 1488aa8d62c2..04775127f23e 100644
--- a/dev-java/struts/struts-1.1-r1.ebuild
+++ b/dev-java/struts/struts-1.1-r1.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/struts/struts-1.1-r1.ebuild,v 1.8 2004/10/22 11:45:42 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r1.ebuild,v 1.9 2005/03/29 16:36:54 luckyduck Exp $
 
 inherit java-pkg
 
@@ -21,7 +21,7 @@ RDEPEND=">=virtual/jre-1.4
 	>=dev-java/commons-lang-1.0
 	>=dev-java/commons-logging-1.0
 	>=dev-java/commons-validator-1.0
-	>=dev-java/oro-2.0.6
+	=dev-java/jakarta-oro-2.0*
 	=dev-java/servletapi-2.3*"
 IUSE="doc jikes"
 KEYWORDS="~x86 ~ppc ~amd64"
@@ -38,7 +38,7 @@ src_compile() {
 	antflags="${antflags} -Dstruts-legacy.jar=`java-config -p struts-legacy`"
 	antflags="${antflags} -Dcommons-digester.jar=`java-config -p commons-digester`"
 	antflags="${antflags} -Dcommons-fileupload.jar=`java-config -p commons-fileupload`"
-	antflags="${antflags} -Djakarta-oro.jar=`java-config -p oro`"
+	antflags="${antflags} -Djakarta-oro.jar=`java-config -p jakarta-oro-2.0`"
 	antflags="${antflags} -Dservlet.jar=`java-config -p servletapi-2.3`"
 	antflags="${antflags} -Dcommons-lang.jar=`java-config -p commons-lang`"
 	antflags="${antflags} -Dcommons-logging.jar=`java-config -p commons-logging | sed 's/.*://'`"
diff --git a/dev-java/struts/struts-1.1-r2.ebuild b/dev-java/struts/struts-1.1-r2.ebuild
index 757e5a6b70f6..fdbf81e6265f 100644
--- a/dev-java/struts/struts-1.1-r2.ebuild
+++ b/dev-java/struts/struts-1.1-r2.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/struts/struts-1.1-r2.ebuild,v 1.3 2004/10/22 11:45:42 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1-r2.ebuild,v 1.4 2005/03/29 16:36:54 luckyduck Exp $
 
 inherit java-pkg
 
@@ -21,7 +21,7 @@ RDEPEND=">=virtual/jre-1.4
 	>=dev-java/commons-lang-1.0
 	>=dev-java/commons-logging-1.0
 	>=dev-java/commons-validator-1.0
-	>=dev-java/oro-2.0.6
+	=dev-java/jakarta-oro-2.0*
 	=dev-java/servletapi-2.3*"
 IUSE="doc jikes"
 KEYWORDS="~x86 ~ppc ~amd64"
@@ -38,7 +38,7 @@ src_compile() {
 	antflags="${antflags} -Dstruts-legacy.jar=`java-config -p struts-legacy`"
 	antflags="${antflags} -Dcommons-digester.jar=`java-config -p commons-digester`"
 	antflags="${antflags} -Dcommons-fileupload.jar=`java-config -p commons-fileupload`"
-	antflags="${antflags} -Djakarta-oro.jar=`java-config -p oro`"
+	antflags="${antflags} -Djakarta-oro.jar=`java-config -p jakarta-oro-2.0`"
 	antflags="${antflags} -Dservlet.jar=`java-config -p servletapi-2.3`"
 	antflags="${antflags} -Dcommons-lang.jar=`java-config -p commons-lang`"
 	antflags="${antflags} -Dcommons-logging.jar=`java-config -p commons-logging | sed 's/.*://'`"
diff --git a/dev-java/struts/struts-1.1.ebuild b/dev-java/struts/struts-1.1.ebuild
index 6fcf6e7fd75e..717b6bf8a2e1 100644
--- a/dev-java/struts/struts-1.1.ebuild
+++ b/dev-java/struts/struts-1.1.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/struts/struts-1.1.ebuild,v 1.7 2004/10/22 11:45:42 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.1.ebuild,v 1.8 2005/03/29 16:36:54 luckyduck Exp $
 
 inherit java-pkg
 
@@ -19,7 +19,7 @@ DEPEND=">=virtual/jdk-1.4
 		>=dev-java/commons-lang-1.0
 		>=dev-java/commons-logging-1.0
 		>=dev-java/commons-validator-1.0
-		>=dev-java/oro-2.0.6
+		=dev-java/jakarta-oro-2.0*
 		=dev-java/servletapi-2.3*
 		jikes? ( dev-java/jikes )"
 
@@ -38,7 +38,7 @@ src_compile() {
 	antflags="${antflags} -Dstruts-legacy.jar=`java-config -p struts-legacy`"
 	antflags="${antflags} -Dcommons-digester.jar=`java-config -p commons-digester`"
 	antflags="${antflags} -Dcommons-fileupload.jar=`java-config -p commons-fileupload`"
-	antflags="${antflags} -Djakarta-oro.jar=`java-config -p oro`"
+	antflags="${antflags} -Djakarta-oro.jar=`java-config -p jakarta-oro-2.0`"
 	antflags="${antflags} -Dservlet.jar=`java-config -p servletapi-2.3`"
 	antflags="${antflags} -Dcommons-lang.jar=`java-config -p commons-lang`"
 	antflags="${antflags} -Dcommons-logging.jar=`java-config -p commons-logging | sed 's/.*://'`"
diff --git a/dev-java/struts/struts-1.2.2-r1.ebuild b/dev-java/struts/struts-1.2.2-r1.ebuild
index 1a12bf1b6773..6159b1a7c916 100644
--- a/dev-java/struts/struts-1.2.2-r1.ebuild
+++ b/dev-java/struts/struts-1.2.2-r1.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/struts/struts-1.2.2-r1.ebuild,v 1.4 2004/10/22 11:45:42 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.2-r1.ebuild,v 1.5 2005/03/29 16:36:54 luckyduck Exp $
 
 inherit java-pkg
 
@@ -21,7 +21,7 @@ RDEPEND=">=virtual/jre-1.4
 	>=dev-java/commons-lang-2.0
 	>=dev-java/commons-logging-1.0.4
 	>=dev-java/commons-validator-1.1.3
-	>=dev-java/oro-2.0.7
+	=dev-java/jakarta-oro-2.0*
 	=dev-java/servletapi-2.3*"
 IUSE="doc jikes"
 KEYWORDS="~x86 ~ppc ~amd64"
@@ -38,7 +38,7 @@ src_compile() {
 	antflags="${antflags} -Dstruts-legacy.jar=`java-config -p struts-legacy`"
 	antflags="${antflags} -Dcommons-digester.jar=`java-config -p commons-digester`"
 	antflags="${antflags} -Dcommons-fileupload.jar=`java-config -p commons-fileupload`"
-	antflags="${antflags} -Djakarta-oro.jar=`java-config -p oro`"
+	antflags="${antflags} -Djakarta-oro.jar=`java-config -p jakarta-oro-2.0`"
 	antflags="${antflags} -Dservlet.jar=`java-config -p servletapi-2.3`"
 	antflags="${antflags} -Dcommons-lang.jar=`java-config -p commons-lang`"
 	antflags="${antflags} -Dcommons-logging.jar=`java-config -p commons-logging | sed 's/.*://'`"
diff --git a/dev-java/struts/struts-1.2.2.ebuild b/dev-java/struts/struts-1.2.2.ebuild
index a9e2fbaf378e..c9b435c4f98c 100644
--- a/dev-java/struts/struts-1.2.2.ebuild
+++ b/dev-java/struts/struts-1.2.2.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/struts/struts-1.2.2.ebuild,v 1.5 2004/10/22 11:45:42 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.2.ebuild,v 1.6 2005/03/29 16:36:54 luckyduck Exp $
 
 inherit java-pkg
 
@@ -21,7 +21,7 @@ RDEPEND=">=virtual/jre-1.4
 	>=dev-java/commons-lang-2.0
 	>=dev-java/commons-logging-1.0.4
 	>=dev-java/commons-validator-1.1.3
-	>=dev-java/oro-2.0.7
+	=dev-java/jakarta-oro-2.0*
 	=dev-java/servletapi-2.3*"
 IUSE="doc jikes"
 KEYWORDS="~x86 ~ppc ~amd64"
@@ -38,7 +38,7 @@ src_compile() {
 	antflags="${antflags} -Dstruts-legacy.jar=`java-config -p struts-legacy`"
 	antflags="${antflags} -Dcommons-digester.jar=`java-config -p commons-digester`"
 	antflags="${antflags} -Dcommons-fileupload.jar=`java-config -p commons-fileupload`"
-	antflags="${antflags} -Djakarta-oro.jar=`java-config -p oro`"
+	antflags="${antflags} -Djakarta-oro.jar=`java-config -p jakarta-oro-2.0`"
 	antflags="${antflags} -Dservlet.jar=`java-config -p servletapi-2.3`"
 	antflags="${antflags} -Dcommons-lang.jar=`java-config -p commons-lang`"
 	antflags="${antflags} -Dcommons-logging.jar=`java-config -p commons-logging | sed 's/.*://'`"
diff --git a/dev-java/struts/struts-1.2.4.ebuild b/dev-java/struts/struts-1.2.4.ebuild
index 1069c5d58a5e..82e16e9523ba 100644
--- a/dev-java/struts/struts-1.2.4.ebuild
+++ b/dev-java/struts/struts-1.2.4.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/struts/struts-1.2.4.ebuild,v 1.5 2004/10/22 11:45:42 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-1.2.4.ebuild,v 1.6 2005/03/29 16:36:54 luckyduck Exp $
 
 inherit java-pkg
 
@@ -21,7 +21,7 @@ RDEPEND=">=virtual/jre-1.4
 	>=dev-java/commons-lang-2.0
 	>=dev-java/commons-logging-1.0.4
 	>=dev-java/commons-validator-1.1.3
-	>=dev-java/oro-2.0.7
+	=dev-java/jakarta-oro-2.0*
 	=dev-java/servletapi-2.3*"
 IUSE="doc jikes"
 KEYWORDS="~x86 ~ppc ~amd64"
@@ -38,7 +38,7 @@ src_compile() {
 	antflags="${antflags} -Dstruts-legacy.jar=`java-config -p struts-legacy`"
 	antflags="${antflags} -Dcommons-digester.jar=`java-config -p commons-digester`"
 	antflags="${antflags} -Dcommons-fileupload.jar=`java-config -p commons-fileupload`"
-	antflags="${antflags} -Djakarta-oro.jar=`java-config -p oro`"
+	antflags="${antflags} -Djakarta-oro.jar=`java-config -p jakarta-oro-2.0`"
 	antflags="${antflags} -Dservlet.jar=`java-config -p servletapi-2.3`"
 	antflags="${antflags} -Dcommons-lang.jar=`java-config -p commons-lang`"
 	antflags="${antflags} -Dcommons-logging.jar=`java-config -p commons-logging | sed 's/.*://'`"