Use virtuals for jaf javamail jms and servlet-api.

Use slot deps.
Fix building slot 1.2 with jdk7.

(Portage version: 2.1.11.13/cvs/Linux x86_64)

4 files changed, 190 insertions, 1 deletions

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 84c88c8cc91f..e1b97c00d113 100644
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/avalon-logkit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.92 2012/05/14 21:27:43 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.93 2012/09/29 11:04:43 sera Exp $
+
+*avalon-logkit-2.1-r6 (29 Sep 2012)
+*avalon-logkit-1.2.2-r1 (29 Sep 2012)
+
+  29 Sep 2012; Ralph Sennhauser <sera@gentoo.org>
+  +avalon-logkit-1.2.2-r1.ebuild, +files/avalon-logkit-1.2.2-java7.patch,
+  +avalon-logkit-2.1-r6.ebuild:
+  Use virtuals for jaf javamail jms and servlet-api.
+  Use slot deps.
+  Fix building slot 1.2 with jdk7.
 
   14 May 2012; Mark Loeser <halcy0n@gentoo.org> avalon-logkit-2.1-r5.ebuild:
   Stable for ppc64; bug #384613
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..b24cc5b93e5f
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild,v 1.1 2012/09/29 11:04:43 sera Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2
+
+DESCRIPTION="An easy-to-use Java logging toolkit designed for secure, performance-oriented logging."
+HOMEPAGE="http://avalon.apache.org/"
+SRC_URI="mirror://apache/avalon/logkit/source/logkit-${PV}-src.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="1.2"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+
+COMMON_DEP="
+	dev-java/avalon-framework:4.1
+	dev-java/log4j:0
+	java-virtuals/jaf:0
+	java-virtuals/javamail:0
+	java-virtuals/jms:0
+	java-virtuals/servlet-api:2.5"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	test? ( dev-java/junit:4 )"
+
+S="${WORKDIR}/logkit-${PV}-dev"
+SRC_DIR="${S}/src/java"
+JAVADOC_DIR="${S}/javadoc"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-java7.patch"
+}
+
+src_compile() {
+	mkdir classes || die "Could not create compile output dir"
+
+	ejavac \
+		-encoding "ISO-8859-1" \
+		-classpath $(java-pkg_getjars jaf,javamail,jms,log4j,servlet-api-2.5,avalon-framework-4.1) \
+		-d classes $(find "${SRC_DIR}" -name "*.java") \
+		|| die "Compilation failed"
+
+	jar -cf "${S}/${PN}.jar" -C classes . || die "Could not create jar"
+
+	#Generate javadoc
+	if use doc ; then
+		mkdir "${JAVADOC_DIR}" || die "Could not create javadoc dir"
+		cd "${SRC_DIR}"
+		javadoc \
+			-encoding "ISO-8859-1" \
+			-sourcepath "${SRC_DIR}" \
+			-classpath $(java-pkg_getjars jaf,javamail,jms,log4j,servlet-api-2.5,avalon-framework-4.1) \
+			-source "${JAVA_VERSION}" \
+			-d "${JAVADOC_DIR}" \
+			$(find "org/apache/log" -type d | tr '/' '.') \
+			|| die "Could not create javadoc"
+	fi
+}
+
+src_test() {
+	mkdir test-classes || die "Unable to make dir"
+	local TESTJAR="avalon-logkit-test.jar"
+
+	ejavac \
+		-encoding "ISO-8859-1" \
+		-classpath "avalon-logkit.jar:$(java-config -p junit-4)" \
+		-d test-classes \
+		$(find src/test -name '*.java')
+
+	jar -cf "${TESTJAR}" -C test-classes .
+
+	java -cp "avalon-logkit.jar:${TESTJAR}:$(java-config -p junit:4)" \
+		org.junit.runner.JUnitCore org.apache.log.format.test.FormatterTestCase \
+		org.apache.log.output.test.RevolvingFileStrategyTestCase \
+		org.apache.log.output.test.OutputTargetTestCase \
+		org.apache.log.output.test.DBTargetTestCase \
+		org.apache.log.util.test.UtilTestCase \
+		org.apache.log.test.LoggerListenerTestCase \
+		org.apache.log.test.WrappingTargetTestCase \
+		org.apache.log.test.InheritanceTestCase
+}
+
+src_install() {
+	java-pkg_dojar "${PN}.jar"
+	use doc && java-pkg_dojavadoc "${JAVADOC_DIR}"
+	use source && java-pkg_dosrc "${SRC_DIR}/*"
+}
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild
new file mode 100644
index 000000000000..4d5e87173ef6
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild,v 1.1 2012/09/29 11:04:43 sera Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Easy-to-use Java logging toolkit"
+HOMEPAGE="http://avalon.apache.org/"
+SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="2.0"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/log4j:0
+	java-virtuals/jms:0
+	java-virtuals/javamail:0
+	java-virtuals/servlet-api:2.5"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-1.4"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-1.4
+	test? ( dev-java/ant-junit )"
+
+java_prepare() {
+	# Doesn't like 1.6 / 1.7 changes to JDBC
+	epatch "${FILESDIR}/${P}-java7.patch"
+
+	java-ant_ignore-system-classes
+
+	java-ant_xml-rewrite -f build.xml \
+		-c -e available -a classpathref -v 'build.classpath' || die
+
+	java-pkg_filter-compiler jikes
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="javamail,jms,log4j,servlet-api-2.5"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch
new file mode 100644
index 000000000000..cb2611bf0de4
--- /dev/null
+++ b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch
@@ -0,0 +1,30 @@
+diff -Nur avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java
+--- avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java	2005-08-30 05:03:49.000000000 +0300
++++ avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java	2011-09-27 08:27:49.313005212 +0300
+@@ -20,7 +20,9 @@
+ import java.sql.Connection;
+ import java.sql.DriverManager;
+ import java.sql.SQLException;
++import java.sql.SQLFeatureNotSupportedException;
+ import javax.sql.DataSource;
++import java.util.logging.Logger;
+ 
+ /**
+  * A basic datasource that doesn't do any pooling but just wraps
+@@ -111,4 +113,16 @@
+     {
+         m_logWriter = logWriter;
+     }
++
++    public boolean isWrapperFor(Class cls) {
++        return false;
++    }
++ 
++    public Object unwrap(Class cls) throws SQLException {
++        throw new SQLException("Not a wrapper for " + cls);
++    }
++    
++    public Logger getParentLogger() throws SQLFeatureNotSupportedException {
++        throw new SQLFeatureNotSupportedException("Not a supported feature");
++    }
+ }