summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorJan Brinkmann <luckyduck@gentoo.org>2005-04-17 15:00:19 +0000
committerJan Brinkmann <luckyduck@gentoo.org>2005-04-17 15:00:19 +0000
commit1f2dbba668b399d6ebe05153efbbdaa36ea2e0bb (patch)
tree7577e50dff990002c0976d4f312e5e0681c8b2de /dev-db
parentcommited new version of the patch, fixes #81837. marked stable on amd64, ppc,... (diff)
downloadgentoo-2-1f2dbba668b399d6ebe05153efbbdaa36ea2e0bb.tar.gz
gentoo-2-1f2dbba668b399d6ebe05153efbbdaa36ea2e0bb.tar.bz2
gentoo-2-1f2dbba668b399d6ebe05153efbbdaa36ea2e0bb.zip
xml-apis.jar is provided by xml-commons , see #82561
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/c-jdbc/ChangeLog6
-rw-r--r--dev-db/c-jdbc/Manifest16
-rw-r--r--dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild7
-rw-r--r--dev-db/c-jdbc/files/controller.sh2
4 files changed, 13 insertions, 18 deletions
diff --git a/dev-db/c-jdbc/ChangeLog b/dev-db/c-jdbc/ChangeLog
index d7ea801ce4da..f591b23c9cec 100644
--- a/dev-db/c-jdbc/ChangeLog
+++ b/dev-db/c-jdbc/ChangeLog
@@ -1,6 +1,10 @@
# 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.3 2005/03/27 17:18:02 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/ChangeLog,v 1.4 2005/04/17 15:00:19 luckyduck Exp $
+
+ 17 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> files/controller.sh,
+ c-jdbc-1.0.4-r1.ebuild:
+ xml-apis.jar is provided by xml-commons , see #82561
*c-jdbc-1.0.4-r1 (27 Mar 2005)
diff --git a/dev-db/c-jdbc/Manifest b/dev-db/c-jdbc/Manifest
index ae1e00356650..fb5e4023f3b4 100644
--- a/dev-db/c-jdbc/Manifest
+++ b/dev-db/c-jdbc/Manifest
@@ -1,19 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f94a4bbccee76bdaa31b90a8ae16e598 c-jdbc-1.0.4-r1.ebuild 3722
-MD5 57a1599f27cdbc77a24ed26385b74287 ChangeLog 856
+MD5 55c197701b6392b537194f244bff37ee c-jdbc-1.0.4-r1.ebuild 3745
+MD5 5aebd9f534305dfa2298c65ec25f8119 ChangeLog 1011
MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
MD5 62ac24f25532a4183e3ed1e1480878e7 files/console.sh 606
-MD5 a351a2365e7c15b6b67ead0715dd3263 files/controller.sh 1130
+MD5 d1171c36b6ee239f4db6aeaa9ad7519a files/controller.sh 1133
MD5 6f7e7b9ace7df13d6bab70f487a31189 files/c-jdbc-1.0.4-gentoo.patch 5047
MD5 599e87927c86dfe53eaf0415b5bae480 files/digest-c-jdbc-1.0.4-r1 70
MD5 c366d1203f27f5438c29bc3a5724ab73 files/cjdbc-conf 313
MD5 9c7589e63d5760dde9a3d56fdc58e6a7 files/cjdbc-init 926
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCRure06ebR+OMO78RAlIQAKCPYI7dUTtCOAP0tNhXikOn/S9M8QCdEya2
-o+pstE7/XE5IlWJUM286d8Q=
-=YgzI
------END PGP SIGNATURE-----
diff --git a/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild b/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild
index 0028f85f4bea..8dca56cc4767 100644
--- a/dev-db/c-jdbc/c-jdbc-1.0.4-r1.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-r1.ebuild,v 1.1 2005/03/27 17:18:02 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/c-jdbc/c-jdbc-1.0.4-r1.ebuild,v 1.2 2005/04/17 15:00:19 luckyduck Exp $
inherit java-pkg eutils
@@ -30,7 +30,8 @@ RDEPEND=">=virtual/jre-1.3
=dev-java/mx4j-2.1*
=dev-java/jakarta-regexp-1.3*
>=dev-java/xalan-2.5.2
- ~dev-java/xerces-2.6.2
+ dev-java/xml-commons
+ dev-java/xml-commons
=dev-db/octopus-3.0*"
S=${WORKDIR}/${P}-src
@@ -63,7 +64,7 @@ src_unpack() {
cd ${S}/lib/jmx
java-pkg_jar-from mx4j-2.1
java-pkg_jar-from xalan
- java-pkg_jar-from xerces-2 xml-apis.jar
+ java-pkg_jar-from xml-commons xml-apis.jar
cd ${S}/lib/other
java-pkg_jar-from jdepend
diff --git a/dev-db/c-jdbc/files/controller.sh b/dev-db/c-jdbc/files/controller.sh
index 03452e0f17f0..82b931be6871 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 jakarta-regexp-1.3`:`java-config -p xerces-2`
+cp=${cp}:`java-config -p jakarta-regexp-1.3`:`java-config -p xml-commons`
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`