Version bump that works at runtime with jdk-1.4 and compiles with >1.5. Added examples use flag and use cglib-2.1 instead of cglib-2.0.

(Portage version: 2.1.2.9)

4 files changed, 127 insertions, 1 deletions

diff --git a/dev-java/castor/ChangeLog b/dev-java/castor/ChangeLog
index 1d02a291be5f..5901df5c9819 100644
--- a/dev-java/castor/ChangeLog
+++ b/dev-java/castor/ChangeLog
@@ -1,6 +1,13 @@
 # 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.33 2007/05/20 17:09:08 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.34 2007/06/09 14:30:09 betelgeuse Exp $
+
+*castor-1.1.1 (09 Jun 2007)
+
+  09 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/1.1.1-jdk-1.4.patch, +castor-1.1.1.ebuild:
+  Version bump that works at runtime with jdk-1.4 and compiles with >1.5.
+  Added examples use flag and use cglib-2.1 instead of cglib-2.0.
 
   20 May 2007; Vlastimil Babka <caster@gentoo.org> -files/build-xml.patch,
   -castor-0.9.9.1.ebuild:
@@ -65,6 +72,8 @@
   castor-0.9.7.ebuild, castor-0.9.9.ebuild:
   Removed log4j dependency (bug #100275).
 
+*castor-0.9.9 (21 Nov 2005)
+
   21 Nov 2005; Joshua Nichols <nichoj@gentoo.org> +castor-0.9.9.ebuild:
   Version bump to 0.9.9 (bug #111845).
 
diff --git a/dev-java/castor/castor-1.1.1.ebuild b/dev-java/castor/castor-1.1.1.ebuild
new file mode 100644
index 000000000000..18bc3575ab02
--- /dev/null
+++ b/dev-java/castor/castor-1.1.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2007 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.ebuild,v 1.1 2007/06/09 14:30:09 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/adaptx-0.9*
+	=dev-java/cglib-2.1*
+	dev-java/commons-logging
+	=dev-java/jakarta-oro-2.0*
+	=dev-java/jakarta-regexp-1.3*
+	dev-java/jta
+	=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 jta
+	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"
+}
+
+# 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
+}
diff --git a/dev-java/castor/files/1.1.1-jdk-1.4.patch b/dev-java/castor/files/1.1.1-jdk-1.4.patch
new file mode 100644
index 000000000000..b2da71002139
--- /dev/null
+++ b/dev-java/castor/files/1.1.1-jdk-1.4.patch
@@ -0,0 +1,18 @@
+diff -ru castor-1.1.1.old/src/main/java/org/exolab/castor/mapping/loader/Types.java castor-1.1.1/src/main/java/org/exolab/castor/mapping/loader/Types.java
+--- castor-1.1.1.old/src/main/java/org/exolab/castor/mapping/loader/Types.java	2007-06-09 16:54:52.000000000 +0300
++++ castor-1.1.1/src/main/java/org/exolab/castor/mapping/loader/Types.java	2007-06-09 16:56:57.000000000 +0300
+@@ -500,11 +500,11 @@
+         new TypeInfo( "boolean",     java.lang.Boolean.TYPE,

+                       java.lang.Boolean.class,    true,     Boolean.FALSE ),

+         new TypeInfo( "double",      java.lang.Double.TYPE,

+-                      java.lang.Double.class,     true,     new Double( 0 ) ),

++                      java.lang.Double.class,     true,     new Double( 0.0 ) ),

+         new TypeInfo( "float",       java.lang.Float.TYPE,

+-                      java.lang.Float.class,      true,     new Float( 0 ) ),

++                      java.lang.Float.class,      true,     new Float( 0.0f ) ),

+         new TypeInfo( "big-decimal", null,

+-                      java.math.BigDecimal.class, true,     new BigDecimal( 0 ) ),

++                      java.math.BigDecimal.class, true,     new BigDecimal( 0.0 ) ),

+         new TypeInfo( "byte",        java.lang.Byte.TYPE,

+                       java.lang.Byte.class,       true,     new Byte( (byte) 0 ) ),

+         new TypeInfo( "date",        null,

diff --git a/dev-java/castor/files/digest-castor-1.1.1 b/dev-java/castor/files/digest-castor-1.1.1
new file mode 100644
index 000000000000..fccddae9b9e8
--- /dev/null
+++ b/dev-java/castor/files/digest-castor-1.1.1
@@ -0,0 +1,3 @@
+MD5 6fb8ae817df30c82afa779c29d66e426 castor-1.1.1-src.tgz 9067936
+RMD160 85c0379d3d9e71a1e365075ae6465018793165fe castor-1.1.1-src.tgz 9067936
+SHA256 f39f96e7f42cbe429ea8050e2f600783cd04c3b07642486a8c1e23dcf2a1cfda castor-1.1.1-src.tgz 9067936