Switched to java-virtuals/servlet-api, EAPI=1 slots, and removed unused stable version

Package-Manager: portage-2.1.4.1

3 files changed, 27 insertions, 19 deletions

diff --git a/dev-java/openjms/ChangeLog b/dev-java/openjms/ChangeLog
index f09bccf6d3df..1e371778d56c 100644
--- a/dev-java/openjms/ChangeLog
+++ b/dev-java/openjms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/openjms
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/ChangeLog,v 1.18 2007/12/11 17:44:42 opfer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/ChangeLog,v 1.19 2008/03/22 21:14:57 wltjr Exp $
+
+*openjms-0.7.6.1-r4 (22 Mar 2008)
+
+  22 Mar 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  -openjms-0.7.6.1-r2.ebuild, +openjms-0.7.6.1-r4.ebuild:
+  Switched to java-virtuals/servlet-api, EAPI=1 slots, and removed unused
+  stable version
 
   11 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
   openjms-0.7.6.1-r3.ebuild:
diff --git a/dev-java/openjms/Manifest b/dev-java/openjms/Manifest
index 918ca9608cec..39a0967d6b5a 100644
--- a/dev-java/openjms/Manifest
+++ b/dev-java/openjms/Manifest
@@ -5,7 +5,7 @@ AUX 0.7.6.1/rc2 759 RMD160 b0a8586acefb52fddee5ea1aa6fe7251247dcc60 SHA1 a79d667
 AUX 0.7.6.1/source.patch 19624 RMD160 45cb1711b342717fd62535e2b3f868fa57393cfe SHA1 3ac6b2d49bad090fbe95753fb514fb0fea3479d4 SHA256 00e26e2c4a356564940c2b662e7994d74583474354c85a9cfafb2cd39edd6028
 DIST openjms-0.7.6.1-scripts.tar.gz 8737 RMD160 77dae767b598805d3d6305410f2bb5b3a8dd76d8 SHA1 ec1edd9e4e00d8d083884dce54a5a271e8817e1b SHA256 beff639bbfc2d26e5cdba560261d1fc4635c6ccb1d1b9dee597add788f071cb2
 DIST openjms-0.7.6.1-src.tar.gz 7665924 RMD160 52a9c91e3f7542d9f718a30b1e862264a3ed2b18 SHA1 70bc2397fbd1e3420d1508893b6b15a6c63a6327 SHA256 9c47eb526643a19de739825f0a511a8fdd4762b07033a857d1b2adb325a84ac2
-EBUILD openjms-0.7.6.1-r2.ebuild 2176 RMD160 8e36c3e617116b7b6648705099c53e94e6931c2c SHA1 2fb848a7c05304f7b5f0efcc78d044b3960a813d SHA256 fe8347e36f335f72b20f6096c43e1c697d7c2b07e508db0a90dc57bec4adb813
 EBUILD openjms-0.7.6.1-r3.ebuild 2275 RMD160 619605e7176bf5dd1f7eedb09a4536d631ad5a44 SHA1 5a5a1a08eb3a7d474ddc0d9329c59cdf112e16c7 SHA256 3ca29d2c7e05c281591ed125c5bd75d5e6abc3b11ed2c4c06d7177a647ca4ec8
-MISC ChangeLog 2744 RMD160 26bc3a5558c99039c2cc62e99d2e3b60639e60c5 SHA1 700916524007b79f7223719d8da2293764c031ea SHA256 575ff0e86ca5e2366a60b296226d02c3e7a9bdde544d6a0acd6c768bf9e12b1e
+EBUILD openjms-0.7.6.1-r4.ebuild 2295 RMD160 798c6262daf5acd8a7d7d18abefd92d9eec2b5c9 SHA1 6c71809ad3d851c39606a5d3c16a0444ce7e293d SHA256 71723ab1f2289ba1703315c2b5a14a096f5d269acd9d933fcf478f6687cdc837
+MISC ChangeLog 2986 RMD160 1e1c1de0864a92b989ce81a384863823ef40902a SHA1 b38a8c8654bafec41122d697fba66103b267ab62 SHA256 47cf8d3fd5878455a280ee5fbab2a6cca7c2e8242ce6e0cadcda6b6b44266048
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/openjms/openjms-0.7.6.1-r2.ebuild b/dev-java/openjms/openjms-0.7.6.1-r4.ebuild
index de6edbf891b4..30cea8e427cc 100644
--- a/dev-java/openjms/openjms-0.7.6.1-r2.ebuild
+++ b/dev-java/openjms/openjms-0.7.6.1-r4.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/openjms/openjms-0.7.6.1-r2.ebuild,v 1.3 2007/10/24 05:46:17 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/openjms-0.7.6.1-r4.ebuild,v 1.1 2008/03/22 21:14:57 wltjr Exp $
 
+EAPI=1
 JAVA_PKG_IUSE="doc"
 WANT_ANT_TASKS="ant-antlr"
 
@@ -11,13 +12,13 @@ SLOT="0"
 LICENSE="GPL-2"
 DESCRIPTION="Open Java Messaging System"
 HOMEPAGE="http://openjms.sourceforge.net/"
-KEYWORDS="~amd64 x86"
+KEYWORDS="~amd64 ~x86"
 SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz mirror://gentoo/${P}-scripts.tar.gz"
 IUSE=""
 RDEPEND="=virtual/jre-1.4*
 	dev-java/antlr
-	=dev-java/castor-0.9*
-	dev-java/cdegroot-db
+	dev-java/castor:0.9
+	dev-java/cdegroot-db:1
 	dev-java/commons-collections
 	dev-java/commons-dbcp
 	dev-java/commons-logging
@@ -25,13 +26,13 @@ RDEPEND="=virtual/jre-1.4*
 	dev-java/concurrent-util
 	dev-java/exolabcore
 	dev-db/hsqldb
-	dev-java/jdbm
+	dev-java/jdbm:1
 	dev-java/sun-jms
 	dev-java/jta
 	dev-java/log4j
-	=dev-java/jakarta-oro-2.0*
-	~dev-java/servletapi-2.3
-	=dev-java/xerces-2.3*"
+	dev-java/jakarta-oro:2.0
+	java-virtuals/servlet-api:2.3
+	dev-java/xerces:2"
 DEPEND="=virtual/jdk-1.4*
 	${RDEPEND}
 	dev-java/ant-core"
@@ -46,7 +47,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PV}/source.patch"
 
 	cd "${S}/lib"
-	rm -f *.jar
+	rm -v *.jar || die
 
 	java-pkg_jar-from antlr
 	java-pkg_jar-from castor-0.9
@@ -62,14 +63,14 @@ src_unpack() {
 	java-pkg_jar-from sun-jms
 	java-pkg_jar-from jta
 	java-pkg_jar-from log4j
-	java-pkg_jar-from servletapi-2.3
-	java-pkg_jar-from xerces-2.3
+	java-pkg_jar-from --virtual servlet-api-2.3
+	# The build.xml runs java with something that uses xerces
+	java-pkg_jar-from --with-dependencies xerces-2
 	java-pkg_jar-from jakarta-oro-2.0
 }
 
-src_compile() {
-	eant jar war
-}
+EANT_DOC_TARGET=""
+EANT_BUILD_TARGET="jar war"
 
 src_install() {
 	java-pkg_newjar lib/${P}.jar ${PN}.jar