diff options
| -rw-r--r-- | dev-java/avalon-logkit/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-java/avalon-logkit/avalon-logkit-1.2.2.ebuild | 93 | ||||
| -rw-r--r-- | dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java6.patch | 17 |
3 files changed, 119 insertions, 1 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/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); ++ } + } |