Revbump to fix bug #382811.

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

3 files changed, 99 insertions, 2 deletions

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 33f38d1f4dc2..4361b0ac586d 100644
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/avalon-logkit
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.86 2010/04/24 16:42:06 grobian Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.87 2011/09/27 05:31:39 serkan Exp $
+
+*avalon-logkit-2.1-r5 (27 Sep 2011)
+
+  27 Sep 2011; Serkan Kaba <serkan@gentoo.org> +avalon-logkit-2.1-r5.ebuild,
+  +files/avalon-logkit-2.1-java7.patch:
+  Revbump to fix bug #382811.
 
   24 Apr 2010; Fabian Groffen <grobian@gentoo.org>
   avalon-logkit-2.1-r4.ebuild:
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild
new file mode 100644
index 000000000000..08c319bbafba
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 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-r5.ebuild,v 1.1 2011/09/27 05:31:39 serkan Exp $
+
+EAPI=2
+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 ~ia64 ~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
+	java-virtuals/jms
+	java-virtuals/javamail
+	=dev-java/servletapi-2.4*"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+# Doesn't like 1.6 changes to JDBC
+DEPEND=">=virtual/jdk-1.4
+	test? (
+		=dev-java/junit-3*
+		dev-java/ant-junit
+	)
+	${COMMON_DEP}"
+
+java_prepare() {
+	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
+
+	mkdir -p target/lib || die
+	cd target/lib || die
+	java-pkg_jar-from servletapi-2.4
+	java-pkg_jar-from jms
+	java-pkg_jar-from --virtual javamail
+	java-pkg_jar-from log4j
+	java-pkg_filter-compiler jikes
+}
+
+src_test() {
+	java-pkg_jar-from --into target/lib junit
+	ANT_TASKS="ant-junit" eant 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-2.1-java7.patch b/dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch
new file mode 100644
index 000000000000..cb2611bf0de4
--- /dev/null
+++ b/dev-java/avalon-logkit/files/avalon-logkit-2.1-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");
++    }
+ }