monsieurp 15/04/22 21:50:06 Modified: commons-logging-1.1.1.ebuild ChangeLog Added: commons-logging-1.2.ebuild Log: Version bump courtesy of Andreas Sturmlechner <andreas.sturmlech...@gmail.com>. Fix bug 496036. (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key )
Revision Changes Path 1.14 dev-java/commons-logging/commons-logging-1.1.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-logging/commons-logging-1.1.1.ebuild?rev=1.14&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-logging/commons-logging-1.1.1.ebuild?rev=1.14&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-logging/commons-logging-1.1.1.ebuild?r1=1.13&r2=1.14 Index: commons-logging-1.1.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1.1.ebuild,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- commons-logging-1.1.1.ebuild 10 Aug 2014 20:11:43 -0000 1.13 +++ commons-logging-1.1.1.ebuild 22 Apr 2015 21:50:06 -0000 1.14 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1.1.ebuild,v 1.13 2014/08/10 20:11:43 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.1.1.ebuild,v 1.14 2015/04/22 21:50:06 monsieurp Exp $ EAPI="1" JAVA_PKG_IUSE="doc source test" 1.73 dev-java/commons-logging/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-logging/ChangeLog?rev=1.73&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-logging/ChangeLog?rev=1.73&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-logging/ChangeLog?r1=1.72&r2=1.73 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- ChangeLog 10 Aug 2014 20:11:43 -0000 1.72 +++ ChangeLog 22 Apr 2015 21:50:06 -0000 1.73 @@ -1,6 +1,14 @@ # ChangeLog for dev-java/commons-logging -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.72 2014/08/10 20:11:43 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.73 2015/04/22 21:50:06 monsieurp Exp $ + +*commons-logging-1.2 (22 Apr 2015) + + 22 Apr 2015; Patrice Clement <monsie...@gentoo.org> + +commons-logging-1.2.ebuild, +files/commons-logging-1.2-gentoo.patch, + +files/commons-logging-1.2-servletapi.patch, commons-logging-1.1.1.ebuild: + Version bump courtesy of Andreas Sturmlechner + <andreas.sturmlech...@gmail.com>. Fix bug 496036. 10 Aug 2014; Sergei Trofimovich <sly...@gentoo.org> commons-logging-1.1.1.ebuild: 1.1 dev-java/commons-logging/commons-logging-1.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-logging/commons-logging-1.2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/commons-logging/commons-logging-1.2.ebuild?rev=1.1&content-type=text/plain Index: commons-logging-1.2.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.2.ebuild,v 1.1 2015/04/22 21:50:06 monsieurp Exp $ EAPI="5" JAVA_PKG_IUSE="doc source test" inherit java-pkg-2 java-ant-2 java-osgi DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different 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 ~ppc ~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-logkit log4j servletapi avalon-framework" COMMON_DEP=" avalon-logkit? ( dev-java/avalon-logkit:1.2 ) log4j? ( dev-java/log4j:0 ) servletapi? ( java-virtuals/servlet-api:2.3 ) avalon-framework? ( dev-java/avalon-framework:4.2 )" # ATTENTION: Add this when log4j-1.3 is out # =dev-java/log4j-1.3* RDEPEND=">=virtual/jre-1.6 ${COMMON_DEP}" DEPEND=">=virtual/jdk-1.6 ${COMMON_DEP} test? ( dev-java/ant-junit:0 )" S="${WORKDIR}/${P}-src/" RESTRICT="!servletapi? ( test )" java_prepare() { epatch "${FILESDIR}/${P}-gentoo.patch" # patch to make the build.xml respect no servletapi # TODO file upstream -nichoj epatch "${FILESDIR}/${P}-servletapi.patch" # bug 200918 java-ant_ignore-system-classes # bug #208098 echo "jdk.1.4.present=true" > build.properties use log4j && echo "log4j12.jar=$(java-pkg_getjars log4j)" >> build.properties # ATTENTION: Add this when log4j-1.3 is out (check the SLOT) #echo "log4j13.jar=$(java-pkg_getjars log4j-1.3)" > build.properties use avalon-logkit && echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties use servletapi && echo "servletapi.jar=$(java-pkg_getjar --virtual servlet-api-2.3 servlet.jar)" >> build.properties use avalon-framework && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties java-pkg_filter-compiler jikes ecj-3.2 if use test && ! use servletapi; then eerror "Tests need use servletapi, tests not executed" fi } EANT_BUILD_TARGET="compile" src_install() { java-osgi_newjar "target/${P}.jar" "org.apache.commons.logging" "Apache Commons Logging" "org.apache.commons.logging;version=\"${PV}\", org.apache.commons.logging.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 }
