Updated reference to servletapi-2.3, we dont install a versioned servletapi jar any longer.

Package-Manager: portage-2.0.51.22-r1

7 files changed, 26 insertions, 22 deletions

diff --git a/dev-java/xom/ChangeLog b/dev-java/xom/ChangeLog
index 04aa72ae4268..37c7f961456e 100644
--- a/dev-java/xom/ChangeLog
+++ b/dev-java/xom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/xom
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.13 2005/04/28 19:19:18 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/ChangeLog,v 1.14 2005/06/04 16:02:48 luckyduck Exp $
+
+*xom-1.0-r1 (04 Jun 2005)
+
+  04 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> -xom-1.0.ebuild,
+  +xom-1.0-r1.ebuild:
+  Updated reference to servletapi-2.3, we dont install a versioned servletapi
+  jar any longer.
 
   28 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> xom-1.0.ebuild,
   -xom-1.0_beta5.ebuild, -xom-1.0_beta6.ebuild:
diff --git a/dev-java/xom/files/digest-xom-1.0 b/dev-java/xom/files/digest-xom-1.0-r1
index c722e54a8182..c722e54a8182 100644
--- a/dev-java/xom/files/digest-xom-1.0
+++ b/dev-java/xom/files/digest-xom-1.0-r1
diff --git a/dev-java/xom/xom-1.0.ebuild b/dev-java/xom/xom-1.0-r1.ebuild
index 9679adb502c6..3948660d614b 100644
--- a/dev-java/xom/xom-1.0.ebuild
+++ b/dev-java/xom/xom-1.0-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/xom/xom-1.0.ebuild,v 1.2 2005/04/28 19:19:18 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xom/xom-1.0-r1.ebuild,v 1.1 2005/06/04 16:02:48 luckyduck Exp $
 
 inherit java-pkg
 
@@ -16,15 +16,15 @@ IUSE="doc jikes source"
 
 DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-1.4
-	>=dev-java/xerces-2.6.2-r1
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.3
+	=dev-java/xerces-2.6*
 	dev-java/xalan
 	dev-java/junit
 	dev-java/icu4j
 	dev-java/tagsoup
-	=dev-java/servletapi-2.3*
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jdk-1.3"
+	=dev-java/servletapi-2.3*"
 
 S=${WORKDIR}/XOM
 
@@ -37,7 +37,7 @@ src_unpack() {
 	java-pkg_jar-from junit
 	java-pkg_jar-from xalan
 	java-pkg_jar-from xerces-2
-	java-pkg_jar-from servletapi-2.3 servletapi-2.3.jar servlet.jar
+	java-pkg_jar-from servletapi-2.3
 	java-pkg_jar-from icu4j icu4j.jar normalizer.jar
 	java-pkg_jar-from tagsoup
 }
diff --git a/dev-java/xt/ChangeLog b/dev-java/xt/ChangeLog
index 34237c359035..9d2a828e0dd4 100644
--- a/dev-java/xt/ChangeLog
+++ b/dev-java/xt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/xt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/ChangeLog,v 1.11 2005/04/17 15:13:15 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/ChangeLog,v 1.12 2005/06/04 16:02:36 luckyduck Exp $
+
+*xt-20020426a-r1 (04 Jun 2005)
+
+  04 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> -xt-20020426a.ebuild,
+  +xt-20020426a-r1.ebuild:
+  Updated reference to servletapi-2.3, we dont install a versioned servletapi
+  jar any longer.
 
   17 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> xt-20020426a.ebuild:
   xml-apis.jar is provided by xml-commons , see #82561
diff --git a/dev-java/xt/Manifest b/dev-java/xt/Manifest
index 0c499d9e0bb0..7e17538e5c3f 100644
--- a/dev-java/xt/Manifest
+++ b/dev-java/xt/Manifest
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cefc8c843f7a54e6bacd7e0c9f915c4a xt-20020426a.ebuild 1042
+MD5 e59de71c45a441dfce02ededb812c0eb xt-20020426a.ebuild 1035
 MD5 337e6a0e81a3584d2232d8be5a5610ff ChangeLog 624
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 MD5 927a81935aafb4f9c5e60755172bf28c files/digest-xt-20020426a 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCYn0e06ebR+OMO78RAuh6AJ4rKs7gGaCWkyelW/AdqERqUEykWQCeIyTT
-E3ZQQUALhpnfp65GVFXGLTw=
-=8lvf
------END PGP SIGNATURE-----
diff --git a/dev-java/xt/files/digest-xt-20020426a b/dev-java/xt/files/digest-xt-20020426a-r1
index 35fb51b7b15a..35fb51b7b15a 100644
--- a/dev-java/xt/files/digest-xt-20020426a
+++ b/dev-java/xt/files/digest-xt-20020426a-r1
diff --git a/dev-java/xt/xt-20020426a.ebuild b/dev-java/xt/xt-20020426a-r1.ebuild
index 747124af435b..06e772a2fa04 100644
--- a/dev-java/xt/xt-20020426a.ebuild
+++ b/dev-java/xt/xt-20020426a-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/xt/xt-20020426a.ebuild,v 1.7 2005/04/17 15:13:15 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/xt-20020426a-r1.ebuild,v 1.1 2005/06/04 16:02:36 luckyduck Exp $
 
 inherit java-pkg
 
@@ -31,7 +31,7 @@ src_unpack() {
 	cd lib
 	java-pkg_jar-from xml-commons xml-apis.jar
 	java-pkg_jar-from xp
-	java-pkg_jar-from servletapi-2.3 servletapi-2.3.jar servlets.jar
+	java-pkg_jar-from servletapi-2.3 servlet.jar servlets.jar
 }
 
 src_compile() {