monsieurp 15/08/06 22:16:18 Modified: ChangeLog Added: log4j-1.2.17-r1.ebuild Log: Remove java-virtuals/javamail dependency and replace it with oracle-javamail. Fixes bug 553186. Signed-off-by: Patrice Clement <monsie...@gentoo.org> (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.97 dev-java/log4j/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/log4j/ChangeLog?rev=1.97&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/log4j/ChangeLog?rev=1.97&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/log4j/ChangeLog?r1=1.96&r2=1.97 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- ChangeLog 11 Jul 2015 09:22:15 -0000 1.96 +++ ChangeLog 6 Aug 2015 22:16:18 -0000 1.97 @@ -1,6 +1,12 @@ # ChangeLog for dev-java/log4j # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.96 2015/07/11 09:22:15 chewi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.97 2015/08/06 22:16:18 monsieurp Exp $ + +*log4j-1.2.17-r1 (06 Aug 2015) + + 06 Aug 2015; Patrice Clement <monsie...@gentoo.org> +log4j-1.2.17-r1.ebuild: + Remove java-virtuals/javamail dependency and replace it with oracle-javamail. + Fixes bug 553186. 11 Jul 2015; James Le Cuirot <ch...@gentoo.org> log4j-1.2.16.ebuild, log4j-1.2.17.ebuild: 1.1 dev-java/log4j/log4j-1.2.17-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/log4j/log4j-1.2.17-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/log4j/log4j-1.2.17-r1.ebuild?rev=1.1&content-type=text/plain Index: log4j-1.2.17-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.17-r1.ebuild,v 1.1 2015/08/06 22:16:18 monsieurp Exp $ EAPI=5 JAVA_PKG_IUSE="doc javamail jms jmx source" inherit java-pkg-2 java-ant-2 DESCRIPTION="A low-overhead robust logging package for Java" SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz" HOMEPAGE="http://logging.apache.org/log4j/"; LICENSE="Apache-2.0" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" IUSE="doc javamail jms jmx source" CDEPEND="javamail? ( dev-java/oracle-javamail:0 java-virtuals/jaf:0 ) jmx? ( dev-java/sun-jmx:0 ) jms? ( java-virtuals/jms:0 )" RDEPEND=">=virtual/jre-1.6 ${CDEPEND}" DEPEND=">=virtual/jdk-1.6 ${CDEPEND}" MY_P="apache-${P}" S="${WORKDIR}/${MY_P}" java_prepare() { rm -rf dist || die java-pkg_filter-compiler jikes rm -v *.jar || die } JAVA_ANT_REWRITE_CLASSPATH="true" JAVA_ANT_IGNORE_SYSTEM_CLASSES="true" EANT_BUILD_TARGET="log4j.jar" EANT_EXTRA_ARGS="-Djaxp-present=true" EANT_DOC_TARGET="" src_compile() { if use javamail; then EANT_GENTOO_CLASSPATH+="javamail,jaf" EANT_EXTRA_ARGS+=" -Djavamail-present=true" fi if use jmx; then if use javamail; then EANT_GENTOO_CLASSPATH+="," fi EANT_GENTOO_CLASSPATH+="sun-jmx" EANT_EXTRA_ARGS+=" -Djmx-present=true" fi if use jms; then EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)" fi java-pkg-2_src_compile } src_install() { java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar if use doc ; then java-pkg_dohtml -r site/* rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs" java-pkg_dojavadoc --symlink apidocs site/apidocs fi if use source; then java-pkg_dosrc src/main/java/* fi }
