Revbump to fix bug #382811.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

4 files changed, 112 insertions, 3 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/Manifest b/dev-java/avalon-logkit/Manifest
index a61ee690bcc6..c9bf50dd998b 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX avalon-logkit-1.2.2-java6.patch 590 RMD160 e36da2a8650c757d3f9ea631c1bf3bb79beeb053 SHA1 ba127ebedd983f66105e1b2432bb5cb777036370 SHA256 23db9e9ac6d4b2bf48fbadda14ae4311e03a0b439d74cb27f16aa24a77fc057f
+AUX avalon-logkit-2.1-java7.patch 1155 RMD160 92a45e44baaac0168a4dc39715cd24dd2a1d7804 SHA1 a1040710ff7f639b58626d5c4dfe0949c8401e22 SHA256 eaca6fe80dc80a40f18ad242ed4a68d37a181fcbfe7f94ab60bde3e2c4f82a8e
 DIST avalon-logkit-2.1-src.tar.gz 60218 RMD160 03d42940610150390744a9e2bd546be4537a371e SHA1 a1fc2054d375461b6781fa9b5274298d0b158c7a SHA256 a5f158a52db9acd58648ffe75a023f43c5cbb94d027bb2beccf4983614d4e155
 DIST logkit-1.2.2-src.tar.gz 113180 RMD160 484c0860154f306d9773fba6a21c7d565d443d73 SHA1 45135c2f8345fb32fde0534e7bddcdeae0d3c435 SHA256 2c81edc87571fbd05797da7f65515e089c62cbb735bdbd10f93e29bd3aa3ddb8
 EBUILD avalon-logkit-1.2.2.ebuild 2751 RMD160 1b364d4e358eb0ff3c3a3f75d05d0d2ac3872d2a SHA1 030eeafefb3f60a8971eddb7cb948adda6657557 SHA256 118a0fb1350a6d3dfef55f09cb4cec1731129847c57747671ebe62304f9991f2
 EBUILD avalon-logkit-2.1-r4.ebuild 1536 RMD160 74477f056eaa73387a9a79dfc26b41ef151d72e5 SHA1 2a90def282bc734e920b3f1bf48b8c41d8c1077e SHA256 1c04b6593054b7b471c734537dcb8fb5e88b08af52713594fc75fe3b6b24a648
-MISC ChangeLog 11674 RMD160 b9849029adfec9a10efb0b0e987b63cf40c72407 SHA1 781e225f20ff332d55c0763be72cc4cd7bd1749e SHA256 3d9d6898fdba414f786cf315b889fb71274c0e5ddad6724ce9fed22bbe265625
+EBUILD avalon-logkit-2.1-r5.ebuild 1531 RMD160 b81ccb5216c3be63f00d49cefd513a61de137908 SHA1 8feaa05fb4f5db91f138fcdd0a7d4db87a71c46c SHA256 de458041b4d13a0977c486a439c6cac39a11346b7879a5c99e1d4853a4ec2530
+MISC ChangeLog 11858 RMD160 c2efcfbc94c5e7311651933ba49124e8db1b5478 SHA1 6a852153525c914f50668afd8ede5998c4aa5b36 SHA256 e1322d4cc33f8fdc840d509e4be1863966b58aa09196e5fdf17023ef7a969bd0
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk6BX8MACgkQRh6X64ivZaLq8ACfT5XZ3RV5Jn1ZZDLww72Tqol8
+AM8Ani4eLJX97N3lfyAiCx1djXwWlsM/
+=eFwA
+-----END PGP SIGNATURE-----
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");
++    }
+ }