Version bump, thanks to Marat Radchenko <marat@slonopotamus.org> in bug #176116 and java-experimental overlay. Added patch to allow compiling with java6.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

4 files changed, 123 insertions, 2 deletions

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 7444f7b28545..7c87a21ee5fe 100644
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/avalon-logkit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.70 2009/07/19 13:59:29 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.71 2009/11/06 17:13:53 caster Exp $
+
+*avalon-logkit-1.2.2 (06 Nov 2009)
+
+  06 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  +avalon-logkit-1.2.2.ebuild, +files/avalon-logkit-1.2.2-java6.patch:
+  Version bump, thanks to Marat Radchenko <marat@slonopotamus.org> in bug
+  #176116 and java-experimental overlay. Added patch to allow compiling with
+  java6.
 
   19 Jul 2009; nixnut <nixnut@gentoo.org> avalon-logkit-1.2-r4.ebuild,
   avalon-logkit-2.1-r3.ebuild:
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index 92e2fab6d849..7c666f69e527 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,10 +1,13 @@
+AUX avalon-logkit-1.2.2-java6.patch 590 RMD160 e36da2a8650c757d3f9ea631c1bf3bb79beeb053 SHA1 ba127ebedd983f66105e1b2432bb5cb777036370 SHA256 23db9e9ac6d4b2bf48fbadda14ae4311e03a0b439d74cb27f16aa24a77fc057f
 DIST LogKit-1.2-src.tar.gz 239132 RMD160 76310c6d26c816f3fa6d33b3da326475c29ef495 SHA1 e5ed86b664bd67481948ad30548587a27cbc8d4a SHA256 63fce9268f21696b284a7e942925806bf733a0e4086f76f565c35c7df4d06a2c
 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-r2.ebuild 1325 RMD160 322fc6b5773eeb4e06c1a2ddad74838cce55b5ef SHA1 2d08c8f9a4178d8500a654338b4a166a0d560f5d SHA256 dd840aea45e97154513be1db2afe8770f67a06e8f8db2b6163995160c3db0286
 EBUILD avalon-logkit-1.2-r3.ebuild 1380 RMD160 fe9086c39cec24dac5d6412aa90a6620233e0958 SHA1 70fbfc565a1d7e6240d409cca0e6d384b4bfa9f5 SHA256 7ccd71c7df78a55cf44d86e7f6c533bc06158060c93d03d40b7701691a209b62
 EBUILD avalon-logkit-1.2-r4.ebuild 1376 RMD160 711f223d5c0775929b8204c7c235160d62cf8fc8 SHA1 0de92c54a97a1e1926fd0141f9d675ea19b3f3a0 SHA256 8cfcce964901b7b55307a9d6384f1d8ab4ad090b84e6a7cf0c57a93ba9363a15
+EBUILD avalon-logkit-1.2.2.ebuild 2741 RMD160 8f8d5277cd769c66d8e761307b7a28a7f04fa87f SHA1 4b2ec05c3115d86d5b523dede2760426e4e900ea SHA256 2a5ffa8ecbc208d05d48e31455bdd4ee99a37466a3c9d0837b528ac41aa450e8
 EBUILD avalon-logkit-2.1-r1.ebuild 1453 RMD160 2dd8fa60690786b7b547ec59d7f641b7722546df SHA1 1fe2e6e790bc282a7fa5a5c8a932f240bff04aa8 SHA256 634a8806c3408b298ef632c066d22a45fdf5e799c4662919e3eb75fa71167df9
 EBUILD avalon-logkit-2.1-r2.ebuild 1452 RMD160 f0d5c58274bd259bbcc62564835e060c54506cde SHA1 c4b9acdf2681150d560d4ab8d8d0d7d5b763cec5 SHA256 20776e331260e48c43b1d336ef77f1fd6402316b3eae6f1c3314b8fe5e008829
 EBUILD avalon-logkit-2.1-r3.ebuild 1458 RMD160 487a35b894f2652bd23d5047304114ce75666d84 SHA1 7bcc9443eb2237a5bb5009c9da9119a712333c0f SHA256 0b1e1e8b87769acf25902bbc82a57011cbf4f17dc8317ac1cb6e4794d936573e
-MISC ChangeLog 9351 RMD160 969897c32484e1ce9f83bfa8d30b5f3b5819c4d4 SHA1 ef95081d18ec42055362aeccddaa5e920604258c SHA256 968a37d921b4941902debb747dd1239f3d28180f8d3bc364f1e673a105db3d9d
+MISC ChangeLog 9670 RMD160 c396aa8bc3adab2587ce37474cd39e17e85f44c2 SHA1 0be041c29eef23d5a35cca94f607f3a1d8faabd4 SHA256 896074fd3a8cc6d20933b11989bb20e241d7d9de369a41fe5b9e4e75a633458d
 MISC metadata.xml 311 RMD160 07e159ca280065f33123b03260935fd3241d1431 SHA1 61fa2665915b5c880e24507934cd30524c655a94 SHA256 45bb3113a8dd927f5af7ad3ed3a894275f32040b1656be8e1ea36cb4b1e5af86
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2.2.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2.2.ebuild
new file mode 100644
index 000000000000..6bcf097d8cd0
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2009 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.ebuild,v 1.5 2009/11/06 17:13:53 caster Exp $
+
+EAPI=2
+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 ~ia64 ~ppc ~ppc64 ~x86"
+
+COMMON_DEP="
+	dev-java/avalon-framework:4.1
+	dev-java/sun-jaf:0
+	dev-java/log4j:0
+	dev-java/servletapi:2.3
+	dev-java/sun-javamail:0
+	dev-java/sun-jms:0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+DEPEND=">=virtual/jdk-1.4
+	test? ( dev-java/junit:4 )
+	${COMMON_DEP}"
+
+S="${WORKDIR}/logkit-${PV}-dev"
+SRC_DIR="${S}/src/java"
+JAVADOC_DIR="${S}/javadoc"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-java6.patch"
+}
+
+src_compile() {
+	mkdir classes || die "Could not create compile output dir"
+
+	ejavac \
+		-encoding "ISO-8859-1" \
+		-classpath $(java-pkg_getjars sun-jaf,sun-javamail,sun-jms,log4j,servletapi-2.3,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 sun-jaf,sun-javamail,sun-jms,log4j,servletapi-2.3,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/files/avalon-logkit-1.2.2-java6.patch b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java6.patch
new file mode 100644
index 000000000000..07c4930d3a1d
--- /dev/null
+++ b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java6.patch
@@ -0,0 +1,17 @@
+# Patch by Vlastimil Babka <caster@gentoo.org>
+# Straightforward compatilibity with java6 interface extensions
+--- src/java/org/apache/log/output/db/DefaultDataSource.java.orig	2009-11-06 18:03:16.000000000 +0100
++++ src/java/org/apache/log/output/db/DefaultDataSource.java	2009-11-06 18:04:05.000000000 +0100
+@@ -149,4 +149,12 @@
+     {
+         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);
++    }
+ }