EAPI 5 bump and SLOT bump from dev-java/cglib:2.2 to :3 wrt bug 546288.

Signed-off-by: monsieurp@gentoo.org
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

3 files changed, 179 insertions, 2 deletions

diff --git a/dev-java/castor/ChangeLog b/dev-java/castor/ChangeLog
index 1007ab9d1969..c3f6857742fc 100644
--- a/dev-java/castor/ChangeLog
+++ b/dev-java/castor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/castor
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.56 2010/04/05 22:49:32 caster Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.57 2015/04/11 21:58:31 monsieurp Exp $
+
+*castor-0.9.9.1-r7 (11 Apr 2015)
+*castor-1.1.1-r3 (11 Apr 2015)
+
+  11 Apr 2015; Patrice Clement <monsieurp@gentoo.org> +castor-0.9.9.1-r7.ebuild,
+  +castor-1.1.1-r3.ebuild:
+  EAPI 5 bump and SLOT bump from dev-java/cglib:2.2 to :3 wrt bug 546288.
 
   05 Apr 2010; Vlastimil Babka <caster@gentoo.org>
   -castor-0.9.9.1-r5.ebuild:
diff --git a/dev-java/castor/castor-0.9.9.1-r7.ebuild b/dev-java/castor/castor-0.9.9.1-r7.ebuild
new file mode 100644
index 000000000000..9d612cc1a2dd
--- /dev/null
+++ b/dev-java/castor/castor-0.9.9.1-r7.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 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-r7.ebuild,v 1.1 2015/04/11 21:58:31 monsieurp Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc examples source"
+JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
+
+inherit eutils java-pkg-2 java-ant-2
+
+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"
+SLOT="0.9"
+IUSE=""
+
+COMMON_DEP=">=dev-java/commons-logging-1.0.4
+	dev-java/jakarta-oro:2.0
+	dev-java/jakarta-regexp:1.3
+	dev-java/ldapsdk:4.1
+	dev-java/xerces:1.3
+	dev-java/cglib:3
+	java-virtuals/transaction-api"
+RDEPEND=">=virtual/jre-1.6
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.6
+	${COMMON_DEP}"
+
+java_prepare() {
+	# TODO this should be filed upstream
+	epatch "${FILESDIR}/0.9.5.3-jikes.patch"
+
+	# Does not like Java 1.6's JDBC API
+	java-ant_rewrite-bootclasspath 1.5 src/build.xml
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+	#FIXME: uses these bundled classes
+	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
+	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 xerces-1.3
+	java-pkg_jar-from ldapsdk-4.1 ldapjdk.jar
+	java-pkg_jar-from transaction-api
+
+	# Remove special characters
+	cd ../
+
+	ebegin 'Removing special characters'
+	perl -i'' -npe 's/S.bastien/Sebastien/g;' src/main/org/exolab/castor/types/DateTimeBase.java
+	perl -i'' -npe 's/.actual value./actual value/g;' src/main/org/exolab/castor/xml/schema/reader/ImportUnmarshaller.java
+	eend $?
+}
+
+EANT_BUILD_XML="src/build.xml"
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar
+	java-pkg_newjar dist/${P}-xml.jar ${PN}-xml.jar
+
+	use doc && java-pkg_dojavadoc build/doc/javadoc
+	use examples && java-pkg_doexamples src/examples
+	use source && java-pkg_dosrc src/main/org
+}
diff --git a/dev-java/castor/castor-1.1.1-r3.ebuild b/dev-java/castor/castor-1.1.1-r3.ebuild
new file mode 100644
index 000000000000..3ca5a9b2adaf
--- /dev/null
+++ b/dev-java/castor/castor-1.1.1-r3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2015 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-r3.ebuild,v 1.1 2015/04/11 21:58:31 monsieurp Exp $
+EAPI=5
+
+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"
+
+CDEPEND="dev-java/cglib:3
+	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.6
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+
+	java-ant_rewrite-classpath "${S}/anttask/build.xml"
+
+	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
+}
+
+#src_prepare() {
+#	# http://jira.codehaus.org/browse/CASTOR-2008
+#	epatch "${FILESDIR}/1.1.1-jdk-1.4.patch"
+#}
+
+# 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
+}