Remove unneeded dependency on adaptx.

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo i686

2 files changed, 99 insertions, 4 deletions

diff --git a/dev-java/castor/castor-0.9.9.1-r4.ebuild b/dev-java/castor/castor-0.9.9.1-r4.ebuild
index 45756385331b..4ab4b674386f 100644
--- a/dev-java/castor/castor-0.9.9.1-r4.ebuild
+++ b/dev-java/castor/castor-0.9.9.1-r4.ebuild
@@ -1,6 +1,6 @@
 # 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-r4.ebuild,v 1.2 2008/07/20 16:29:20 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.9.1-r4.ebuild,v 1.3 2008/08/03 22:32:13 betelgeuse Exp $
 
 EAPI=1
 JAVA_PKG_IUSE="doc examples source"
@@ -20,7 +20,6 @@ COMMON_DEP="
 	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
@@ -42,7 +41,7 @@ src_unpack() {
 	cd "${S}/lib"
 	rm -v *.jar || die
 	#FIXME: uses these bundled classes
-	#rm -v tests/*.jar || die
+	rm -v tests/*.jar || die
 	java-pkg_jar-from --build-only ant-core ant.jar
 	#Only used by examples and tests and we aren't building them
 	#java-pkg_jar-from adaptx-0.9
@@ -50,7 +49,6 @@ src_unpack() {
 	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 --virtual servlet-api-2.3
 	java-pkg_jar-from xerces-1.3
 	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
 }
diff --git a/dev-java/castor/castor-1.1.1-r2.ebuild b/dev-java/castor/castor-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..52f5181dd694
--- /dev/null
+++ b/dev-java/castor/castor-1.1.1-r2.ebuild
@@ -0,0 +1,97 @@
+# 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-1.1.1-r2.ebuild,v 1.1 2008/08/03 22:32:13 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc examples source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Data binding framework for Java"
+HOMEPAGE="http://www.castor.org"
+SRC_URI="http://dist.codehaus.org/${PN}/${PV}/${P}-src.tgz"
+
+#SRC_URI="mirror://gentoo/${P}.tar.bz2"
+# svn co https://svn.codehaus.org/castor/castor/tags/1.0.3/ castor-1.0.3
+# cd castor-1.0.3
+# mvn ant:ant
+# do some magic to build.xml
+# rm lib/*
+# cd ../
+# tar cjvf castor-1.0.3.tar.bz2 --exclude=.svn castor-1.0.3
+
+LICENSE="Exolab"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# tests and full documentation when support will be added
+#	dev-java/log4j
+#	~dev-java/servletapi-2.4
+#	dev-java/junit"
+
+COMMON_DEPS="
+	=dev-java/cglib-2.1*
+	dev-java/commons-logging
+	=dev-java/jakarta-oro-2.0*
+	=dev-java/jakarta-regexp-1.3*
+	java-virtuals/transaction-api
+	=dev-java/ldapsdk-4.1*
+	dev-java/ant-core"
+
+DEPEND=">=virtual/jdk-1.4
+	${COMMON_DEPS}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPS}"
+
+src_unpack() {
+	unpack ${A}
+
+	java-ant_rewrite-classpath "${S}/anttask/build.xml"
+
+	cd "${S}"
+	# http://jira.codehaus.org/browse/CASTOR-2008
+	epatch "${FILESDIR}/1.1.1-jdk-1.4.patch"
+
+	cd "${S}/lib"
+	rm -v *.jar tests/*.jar
+	java-pkg_jar-from cglib-2.1 cglib.jar
+	java-pkg_jar-from commons-logging \
+		commons-logging-api.jar	commons-logging-1.1.jar
+	java-pkg_jar-from jakarta-oro-2.0
+	java-pkg_jar-from jakarta-regexp-1.3
+	java-pkg_jar-from transaction-api
+	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
+	java-pkg_jar-from ant-core ant.jar
+
+	# These are only used for tests or documentation
+	#java-pkg_jar-from junit
+	#java-pkg_jar-from adaptx-0.9
+	#java-pkg_jar-from log4j
+	#java-pkg_jar-from servletapi-2.4 servlet-api.jar
+	use doc && mkdir "${S}/bin/lib"
+	java-pkg_filter-compiler jikes
+}
+
+# clean target is borked
+# http://jira.codehaus.org/browse/CASTOR-2009
+EANT_BUILD_XML="src/build.xml"
+EANT_GENTOO_CLASSPATH="ant-core"
+
+# Needs for example mockejb which is not packaged yet
+#src_test() {
+#	cd "${S}"/src/
+#	eant tests
+#}
+
+src_install() {
+	cd dist
+	for jar in *.jar; do
+		java-pkg_newjar ${jar} ${jar//-${PV}}
+	done
+	cd ..
+	dodoc src/etc/CHANGELOG || die
+	java-pkg_register-ant-task
+	use source && java-pkg_dosrc */main/java/org
+	use doc && java-pkg_dojavadoc build/doc/javadoc
+	use examples && java-pkg_doexamples src/examples
+}