moved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336

(Portage version: 2.0.51.19)

5 files changed, 15 insertions, 10 deletions

diff --git a/dev-db/c-jdbc/ChangeLog b/dev-db/c-jdbc/ChangeLog
index b3d6303b5ca7..d7ea801ce4da 100644
--- a/dev-db/c-jdbc/ChangeLog
+++ b/dev-db/c-jdbc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/c-jdbc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/ChangeLog,v 1.2 2005/03/04 11:23:02 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/ChangeLog,v 1.3 2005/03/27 17:18:02 luckyduck Exp $
+
+*c-jdbc-1.0.4-r1 (27 Mar 2005)
+
+  27 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> files/controller.sh,
+  +c-jdbc-1.0.4-r1.ebuild, -c-jdbc-1.0.4.ebuild:
+  moved from dev-java/regexp to dev-java/jakarta-regexp dependency. see #71336
 
   04 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> c-jdbc-1.0.4.ebuild:
   changed xml-commons dependency to xerces-2 dependency in order to fix #82561
diff --git a/dev-db/c-jdbc/Manifest b/dev-db/c-jdbc/Manifest
index 21226425c29a..4196c78ea25c 100644
--- a/dev-db/c-jdbc/Manifest
+++ b/dev-db/c-jdbc/Manifest
@@ -1,9 +1,9 @@
-MD5 09fbc7a049cfd655f9709920953cd6c0 c-jdbc-1.0.4.ebuild 3735
-MD5 7f66aace14955900085c9cf377bf1a12 ChangeLog 622
+MD5 61be6f17bfb783a418aaaafaf0a309d9 c-jdbc-1.0.4-r1.ebuild 3719
+MD5 043e112d89212c63d41274e992bb8152 ChangeLog 856
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 MD5 62ac24f25532a4183e3ed1e1480878e7 files/console.sh 606
-MD5 a8d6fd20a9ab0d2f3d6b8c626cf6cf8b files/controller.sh 1118
+MD5 a351a2365e7c15b6b67ead0715dd3263 files/controller.sh 1130
 MD5 6f7e7b9ace7df13d6bab70f487a31189 files/c-jdbc-1.0.4-gentoo.patch 5047
-MD5 599e87927c86dfe53eaf0415b5bae480 files/digest-c-jdbc-1.0.4 70
+MD5 599e87927c86dfe53eaf0415b5bae480 files/digest-c-jdbc-1.0.4-r1 70
 MD5 c366d1203f27f5438c29bc3a5724ab73 files/cjdbc-conf 313
 MD5 9c7589e63d5760dde9a3d56fdc58e6a7 files/cjdbc-init 926
diff --git a/dev-db/c-jdbc/c-jdbc-1.0.4.ebuild b/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild
index c06d710118ea..0028f85f4bea 100644
--- a/dev-db/c-jdbc/c-jdbc-1.0.4.ebuild
+++ b/dev-db/c-jdbc/c-jdbc-1.0.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/dev-db/c-jdbc/c-jdbc-1.0.4.ebuild,v 1.2 2005/03/04 11:23:02 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild,v 1.1 2005/03/27 17:18:02 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -28,7 +28,7 @@ RDEPEND=">=virtual/jre-1.3
 	>=dev-java/kunststoff-2.0.2
 	>=dev-java/log4j-1.2.8
 	=dev-java/mx4j-2.1*
-	>=dev-java/regexp-1.3
+	=dev-java/jakarta-regexp-1.3*
 	>=dev-java/xalan-2.5.2
 	~dev-java/xerces-2.6.2
 	=dev-db/octopus-3.0*"
@@ -47,11 +47,10 @@ src_unpack() {
 		rm -f *.jar
 	done
 
-	java-pkg_jar-from ant-core ant.jar
 	java-pkg_jar-from commons-cli-1
 	java-pkg_jar-from crimson-1
 	java-pkg_jar-from dtdparser-1.21
-	java-pkg_jar-from regexp
+	java-pkg_jar-from jakarta-regexp-1.3
 	java-pkg_jar-from jaxen-1.1
 	java-pkg_jar-from jcommon
 	java-pkg_jar-from jdbc2-stdext
diff --git a/dev-db/c-jdbc/files/controller.sh b/dev-db/c-jdbc/files/controller.sh
index 621e2cad7309..03452e0f17f0 100644
--- a/dev-db/c-jdbc/files/controller.sh
+++ b/dev-db/c-jdbc/files/controller.sh
@@ -11,7 +11,7 @@ sax_parser_class=org.apache.crimson.parser.XMLReaderImpl
   
 cp=${CJDBC_HOME}/config/language:${CJDBC_HOME}/config/controller:$CJDBC_HOME/xml
 cp=${cp}:${CJDBC_HOME}/config/virtualdatabase:${CJDBC_HOME}/config:${CJDBC_HOME}/xsl
-cp=${cp}:`java-config -p regexp`:`java-config -p xerces-2`
+cp=${cp}:`java-config -p jakarta-regexp-1.3`:`java-config -p xerces-2`
 cp=${cp}:`java-config -p octopus-3.0`:`java-config -p c-jdbc-1`
 cp=${cp}:`java-config -p hsqldb`:`java-config -p crimson-1`
 cp=${cp}:`java-config -p jgroups`:`java-config -p dom4j-1`
diff --git a/dev-db/c-jdbc/files/digest-c-jdbc-1.0.4 b/dev-db/c-jdbc/files/digest-c-jdbc-1.0.4-r1
index 0570d0543896..0570d0543896 100644
--- a/dev-db/c-jdbc/files/digest-c-jdbc-1.0.4
+++ b/dev-db/c-jdbc/files/digest-c-jdbc-1.0.4-r1