Switched to java-virtuals/servlet-api, set EAPI=1 and switched to slot deps

Package-Manager: portage-2.1.4.1

3 files changed, 24 insertions, 20 deletions

diff --git a/dev-java/castor/ChangeLog b/dev-java/castor/ChangeLog
index 4168daead590..77fc803d2f18 100644
--- a/dev-java/castor/ChangeLog
+++ b/dev-java/castor/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/castor
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.41 2007/09/15 09:43:57 rbu Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.42 2008/02/14 02:36:40 wltjr Exp $
+
+*castor-0.9.9.1-r3 (14 Feb 2008)
+
+  14 Feb 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  -castor-0.9.9.1-r1.ebuild, +castor-0.9.9.1-r3.ebuild:
+  Switched to java-virtuals/servlet-api, set EAPI=1 and switched to slot deps
 
   15 Sep 2007; Robert Buchholz <rbu@gentoo.org> castor-0.9.9.1-r2.ebuild:
   amd64 stable (bug #181425)
diff --git a/dev-java/castor/Manifest b/dev-java/castor/Manifest
index be6a1577c851..63cab63f4b68 100644
--- a/dev-java/castor/Manifest
+++ b/dev-java/castor/Manifest
@@ -2,8 +2,8 @@ AUX 0.9.5.3-jikes.patch 1316 RMD160 aee024aa5b1ec75cba60c1f6b27e213178fee51f SHA
 AUX 1.1.1-jdk-1.4.patch 1403 RMD160 7fff35b713fa4da38cc5236e60268a1a848573e3 SHA1 c35fb38155f1befbc2bb47a75752d38749b4c035 SHA256 5d49640c380ffedbc54223944226f6320636a9996e328abe280b8de9344248dc
 DIST castor-0.9.9.1-src.tgz 6794995 RMD160 b308fa49edb708963f6abbde2719b7995ba168ed SHA1 e7baee694f48b56b20af77adead2144cb7b70bca SHA256 df569ab985714477956e68ed497ac1fa9fde5f95a8bc0264ee2d31125a970f81
 DIST castor-1.1.1-src.tgz 9067936 RMD160 85c0379d3d9e71a1e365075ae6465018793165fe SHA1 9747840c2c0ce7640f94fdeb33dd90889b2daa69 SHA256 f39f96e7f42cbe429ea8050e2f600783cd04c3b07642486a8c1e23dcf2a1cfda
-EBUILD castor-0.9.9.1-r1.ebuild 1825 RMD160 ecd1ba62a7845a69f96977fefb26c552176d24a4 SHA1 e13674726adb4133c5a8741ec7cb16c473cc3929 SHA256 b27c3d666b4fea34a1943c5758c8945afd7f17cd7cb0ceaf437ad6de4ab38909
 EBUILD castor-0.9.9.1-r2.ebuild 1714 RMD160 1a546c2aa7c4d025398c82e14764dc90b286adae SHA1 eba675eb260fdb59ee46d26e134b822a363b7d9a SHA256 f55b206500fab8bfc56678a54c6dda810a3be293205f7da10ad027eb82ca0f47
+EBUILD castor-0.9.9.1-r3.ebuild 1707 RMD160 648242dc0a3943d2843d386cb28dc99e1481b502 SHA1 3b9aef8c63650916b65657e6f51d6e9879fd1385 SHA256 0766e5541121aeed6cdd3be62d906987f1cb8df72d0304556d942125a9f02f12
 EBUILD castor-1.1.1.ebuild 2471 RMD160 e4901214224540ff8a08d98d7382699420534fdf SHA1 b6ac1ae682288832b96b5554690645dfaea5a14c SHA256 d97d18978b95236dbb08e5f4c36b305032d0595d38f5238be300dabe46274298
-MISC ChangeLog 5351 RMD160 1b5138cc6149e09c6c01a1cf724699ef73227976 SHA1 cdea238650893d2bb93c40365fb633e0faafa2de SHA256 573a5ec52313142dd33284b5745e5203ad4c4b51c043418490de7ceb91278c39
+MISC ChangeLog 5579 RMD160 53809c85158156035ddbd5c31515d9c1c6e59878 SHA1 5e1ff40b05cf41d0a5d2df08e6cec6e807d68ef0 SHA256 366e72672c2f1d0fd23ed5d1ff878c08b419eb729450e9036bae0e7de28209bd
 MISC metadata.xml 414 RMD160 ae2ab751d67371740056ee20caaf7e597f78b429 SHA1 c6a7294af545b1ccdbd2f6476840f306e141c8e3 SHA256 fc981b706c1199b5fdd5636a4514f7e214c5a504e9f44c2a4dcd6ca17946c575
diff --git a/dev-java/castor/castor-0.9.9.1-r1.ebuild b/dev-java/castor/castor-0.9.9.1-r3.ebuild
index 3be4553b0b97..6c9f8f7ee692 100644
--- a/dev-java/castor/castor-0.9.9.1-r1.ebuild
+++ b/dev-java/castor/castor-0.9.9.1-r3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.9.1-r1.ebuild,v 1.6 2007/05/19 17:01:57 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.9.1-r3.ebuild,v 1.1 2008/02/14 02:36:40 wltjr Exp $
 
+EAPI=1
 JAVA_PKG_IUSE="doc source"
 inherit eutils java-pkg-2 java-ant-2
 
@@ -9,22 +10,20 @@ DESCRIPTION="Data binding framework for Java"
 SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${P}-src.tgz"
 HOMEPAGE="http://www.castor.org"
 LICENSE="Exolab"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 SLOT="0.9"
-IUSE="doc examples postgres source"
+IUSE="doc examples"
 
 COMMON_DEP="
-	>=dev-java/adaptx-0.9.5.3
+	dev-java/adaptx:0.9
 	>=dev-java/commons-logging-1.0.4
-	=dev-java/jakarta-oro-2.0*
-	=dev-java/jakarta-regexp-1.3*
-	>=dev-java/ldapsdk-4.1.7
-	=dev-java/servletapi-2.3*
-	=dev-java/xerces-1.3*
-	=dev-java/cglib-2.0*
-	postgres? ( =dev-java/jdbc2-postgresql-7.3* )"
+	dev-java/jakarta-oro:2.0
+	dev-java/jakarta-regexp:1.3
+	dev-java/ldapsdk:4.1
+	java-virtuals/servlet-api:2.3
+	dev-java/xerces:1.3
+	dev-java/cglib:2"
 RDEPEND=">=virtual/jre-1.4
-	dev-java/ant-core
 	${COMMON_DEP}"
 # Does not like Java 1.6's JDBC API
 DEPEND="|| (
@@ -42,16 +41,15 @@ src_unpack() {
 
 	cd "${S}/lib"
 	rm -f *.jar
-	java-pkg_jar-from ant-core ant.jar
+	java-pkg_jar-from --build-only ant-core ant.jar
 	java-pkg_jar-from adaptx-0.9
 	java-pkg_jar-from commons-logging
 	java-pkg_jar-from cglib-2
 	java-pkg_jar-from jakarta-oro-2.0 jakarta-oro.jar oro.jar
 	java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar
-	java-pkg_jar-from servletapi-2.3
+	java-pkg_jar-from --virtual servlet-api-2.3
 	java-pkg_jar-from xerces-1.3
 	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
-	use postgres && java-pkg_jar-from jdbc2-postgresql-5
 }
 
 src_compile() {