commit: a5e68f7eff5d7c836a1b977d2c2eab5749870ef7 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Tue Apr 26 21:44:59 2016 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Tue Apr 26 21:47:44 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e68f7e
dev-java/commons-logging: Use newer deps, fix tests, general tidy up - Use newer avalon-logkit so we can kill 1.2 - Use newer servlet-api because it's very compatible - log4j 1.3 was never actually released - java-pkg-2_src_test isn't called automatically - jikes is dead and we don't really support other compilers anyway Package-Manager: portage-2.2.28 .../commons-logging/commons-logging-1.2-r1.ebuild | 66 ++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild new file mode 100644 index 0000000..0dc2cc8 --- /dev/null +++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 java-osgi + +DESCRIPTION="An ultra-thin bridge between different Java logging libraries" +HOMEPAGE="http://commons.apache.org/logging/"; +SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="avalon-framework avalon-logkit log4j servletapi test" +RESTRICT="!servletapi? ( test )" + +CDEPEND="avalon-framework? ( dev-java/avalon-framework:4.2 ) + avalon-logkit? ( dev-java/avalon-logkit:2.0 ) + log4j? ( dev-java/log4j:0 ) + servletapi? ( java-virtuals/servlet-api:3.1 )" + +RDEPEND="${CDEPEND} + >=virtual/jre-1.6" + +DEPEND="${CDEPEND} + >=virtual/jdk-1.6 + test? ( dev-java/ant-junit:0 )" + +S="${WORKDIR}/${P}-src" + +EANT_BUILD_TARGET="compile" +JAVA_ANT_REWRITE_CLASSPATH="yes" +JAVA_ANT_IGNORE_SYSTEM_CLASSES="yes" + +java_prepare() { + epatch "${FILESDIR}/${P}-gentoo.patch" + # patch to make the build.xml respect no servletapi + epatch "${FILESDIR}/${P}-servletapi.patch" + + # bug #208098 + echo "jdk.1.4.present=true" > build.properties + + use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties + use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-2.0)" >> build.properties + use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties + use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-3.1 servlet-api.jar)" >> build.properties +} + +src_install() { + local pkg=org.apache.commons.logging + java-osgi_newjar "target/${P}.jar" "${pkg}" "Apache Commons Logging" "${pkg};version=\"${PV}\", ${pkg}.impl;version=\"${PV}\"" + java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar + java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar + + dodoc RELEASE-NOTES.txt || die + dohtml PROPOSAL.html || die + use doc && java-pkg_dojavadoc target/docs/ + use source && java-pkg_dosrc src/main/java/org +} + +src_test() { + java-pkg-2_src_test +}
