get xml-apis from xml-commons noet xerces

Package-Manager: portage-2.0.51.22-r1

4 files changed, 19 insertions, 13 deletions

diff --git a/dev-java/adaptx/ChangeLog b/dev-java/adaptx/ChangeLog
index 09c2cf0b0266..81cb291ae798 100644
--- a/dev-java/adaptx/ChangeLog
+++ b/dev-java/adaptx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/adaptx
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/adaptx/ChangeLog,v 1.10 2005/07/01 09:02:56 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/adaptx/ChangeLog,v 1.11 2005/07/12 23:31:11 axxo Exp $
+
+  12 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
+  adaptx-0.9.13_p20041105.ebuild, adaptx-0.9.13_p20041105-r1.ebuild:
+  get xml-apis from xml-commons noet xerces
 
   01 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
   adaptx-0.9.13_p20041105.ebuild, adaptx-0.9.13_p20041105-r1.ebuild:
diff --git a/dev-java/adaptx/Manifest b/dev-java/adaptx/Manifest
index 0f599100d4cb..d5e02b72a9b6 100644
--- a/dev-java/adaptx/Manifest
+++ b/dev-java/adaptx/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 065cb291f5f47dd69a45761568c5cf0e adaptx-0.9.13_p20041105-r1.ebuild 1447
-MD5 b162b4d3691a1bd4e144952513349049 ChangeLog 1507
+MD5 506af722649c2050c4c6129008634222 adaptx-0.9.13_p20041105-r1.ebuild 1472
+MD5 34badd7f18cbd8f08e66c39dc0447fc4 ChangeLog 1670
 MD5 2d1041fb0d459f9ca2614faa69da0e09 metadata.xml 310
-MD5 796827b25bba29e218de1a6f6e2b9e01 adaptx-0.9.13_p20041105.ebuild 1372
+MD5 9e0e860c57b784a8f3d4088bcac89b79 adaptx-0.9.13_p20041105.ebuild 1409
 MD5 ca47883984cfaf4d74be2ed06fbd1d2e files/digest-adaptx-0.9.13_p20041105 75
 MD5 ca47883984cfaf4d74be2ed06fbd1d2e files/digest-adaptx-0.9.13_p20041105-r1 75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC1FHY/rLF9B432nYRAnSUAKDIUXR1th3Y9RmWj5321LFkNdq9VwCdHpXF
-W9AY1ZwOi2Hq6ObnVcShVlA=
-=Pz9G
+iD8DBQFC1FLM/rLF9B432nYRAmk7AJwNwKWxTMdYjoAouaz+sc8nGkcvkACgxKUs
+9utu3W0GchVVnZPeHSEhpCk=
+=i2EZ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild b/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild
index 18b3137c5ebd..2804277678c7 100644
--- a/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild
+++ b/dev-java/adaptx/adaptx-0.9.13_p20041105-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/adaptx/adaptx-0.9.13_p20041105-r1.ebuild,v 1.4 2005/07/12 23:27:07 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/adaptx/adaptx-0.9.13_p20041105-r1.ebuild,v 1.5 2005/07/12 23:31:11 axxo Exp $
 
 inherit java-pkg
 
@@ -14,6 +14,7 @@ RDEPEND="virtual/jre
 	=dev-java/rhino-1.5*
 	=dev-java/log4j-1.2*
 	dev-java/gnu-jaxp
+	dev-java/xml-commons
 	=dev-java/xerces-2.6*"
 DEPEND="virtual/jdk
 	>=dev-java/ant-1.4
@@ -28,7 +29,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}/lib
 	java-pkg_jar-from xerces-2 xercesImpl.jar
-	java-pkg_jar-from xerces-2 xml-apis.jar
+	java-pkg_jar-from xml-commons xml-apis.jar
 	java-pkg_jar-from rhino-1.5
 	java-pkg_jar-from gnu-jaxp
 	java-pkg_jar-from ant-core ant.jar
diff --git a/dev-java/adaptx/adaptx-0.9.13_p20041105.ebuild b/dev-java/adaptx/adaptx-0.9.13_p20041105.ebuild
index 947704bbf177..235751bb48bb 100644
--- a/dev-java/adaptx/adaptx-0.9.13_p20041105.ebuild
+++ b/dev-java/adaptx/adaptx-0.9.13_p20041105.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/adaptx/adaptx-0.9.13_p20041105.ebuild,v 1.11 2005/07/12 23:27:07 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/adaptx/adaptx-0.9.13_p20041105.ebuild,v 1.12 2005/07/12 23:31:11 axxo Exp $
 
 inherit java-pkg
 
@@ -8,12 +8,13 @@ DESCRIPTION="Adaptx is an XSLT processor and XPath engine"
 HOMEPAGE="http://project.exolab.org/cgi-bin/viewcvs.cgi/adaptx/?cvsroot=adaptx"
 SRC_URI="http://dev.gentoo.org/~karltk/projects/java/distfiles/${PN}-20041105.gentoo.tar.bz2"
 LICENSE="Exolab"
-RDEPEND="virtual/jre
+RDEPEND=">=virtual/jre-1.4
 	=dev-java/rhino-1.5*
 	=dev-java/log4j-1.2*
 	dev-java/gnu-jaxp
+	dev-java/xml-commons
 	=dev-java/xerces-2.6*"
-DEPEND="virtual/jdk
+DEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-1.4
 	${RDEPEND}"
 SLOT="0.9"
@@ -26,7 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}/lib
 	java-pkg_jar-from xerces-2 xercesImpl.jar
-	java-pkg_jar-from xerces-2 xml-apis.jar
+	java-pkg_jar-from xml-commons xml-apis.jar
 	java-pkg_jar-from rhino-1.5
 	java-pkg_jar-from gnu-jaxp
 	java-pkg_jar-from ant-core ant.jar