[gentoo-commits] repo/gentoo:master commit in: dev-java/log4j/

[Patrice Clement]

commit:     6243c9708fc548253965e41f725956f98613271e
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 17:09:29 2015 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 21:19:00 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6243c970

dev-java/log4j: Clean up old.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/log4j/Manifest               |  1 -
 dev-java/log4j/log4j-1.2.16.ebuild    | 70 ----------------------------------
 dev-java/log4j/log4j-1.2.17-r2.ebuild | 71 -----------------------------------
 3 files changed, 142 deletions(-)

diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index 7fc2d24..b68b117 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,2 +1 @@
-DIST apache-log4j-1.2.16.tar.gz 2791979 SHA256 3a93ef38eb7ac9f851626d8b27cde7db1bfc78c1b587520fd740a0ab03e44c89 SHA512 d519c761579ce632a388164d9e492cf0327c4ed96522c92e3d9addfdb2c3a12b4a63a6ff7fc7455236bda61e265c1521ddf39cd8dfeac3e8c808ca982acaee97 WHIRLPOOL 07c67669d8670e7a624f14f3757b2be595a5f05b59e4c98b6ac0af12ead0a52b9608dc1068ef4737aee8cb653f3a81ca0a96fdcf7efb36f06e51a2b30f33d969
 DIST log4j-1.2.17.tar.gz 2864448 SHA256 a528e3771ee6234661b5eb0fa02e14faee89dfec38de94088c163ddf2a0a8663 SHA512 7df8dca721f960b9fd22dd5f642dbe7d89167f167aa11604c5f9fe54d649a26dd05af88d7188b47abfb91d501535a4b3665dd84d7e0058ef77159713a10b5af8 WHIRLPOOL 1fc1b420e78bb56ca05282c81f12d5911f8966228194a8f5090a32cfa0403332b36589c7841b06c3bfd602f0f13cdf8342e678de01446e4260cffd8a57a6c175

diff --git a/dev-java/log4j/log4j-1.2.16.ebuild b/dev-java/log4j/log4j-1.2.16.ebuild
deleted file mode 100644
index 88f4d8e..0000000
--- a/dev-java/log4j/log4j-1.2.16.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-JAVA_PKG_IUSE="doc javamail jms jmx source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_P="apache-${P}"
-DESCRIPTION="A low-overhead robust logging package for Java"
-SRC_URI="mirror://apache/logging/${PN}/${PV}/${MY_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"
-# jikes support disabled: bug #108819
-IUSE="doc javamail jms jmx source"
-
-CDEPEND="javamail? ( java-virtuals/javamail java-virtuals/jaf )
-		jmx? ( dev-java/sun-jmx:0 )
-		jms? ( java-virtuals/jms )"
-
-RDEPEND=">=virtual/jre-1.4
-		${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.4
-		${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
-	rm -rf dist/
-	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
-		use javamail && EANT_GENTOO_CLASSPATH+=","
-		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() {
-	# the build still builds files with older version in name
-	java-pkg_newjar dist/lib/${PN}-1.2.15.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
-	use source && java-pkg_dosrc src/main/java/*
-}

diff --git a/dev-java/log4j/log4j-1.2.17-r2.ebuild b/dev-java/log4j/log4j-1.2.17-r2.ebuild
deleted file mode 100644
index f20c311..0000000
--- a/dev-java/log4j/log4j-1.2.17-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2015 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
-
-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="javamail jms"
-
-CDEPEND="javamail? (
-			dev-java/oracle-javamail:0
-			java-virtuals/jaf: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 -Djmx-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 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
-}