From 7353ebbad0d74ee2aab5c1d133740407e2c9f369 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Thu, 17 Sep 2015 21:56:10 +0100
Subject: [PATCH] dev-java/log4j: Remove old

Package-Manager: portage-2.2.20.1
---
 dev-java/log4j/log4j-1.2.17-r1.ebuild | 84 ---------------------------
 dev-java/log4j/log4j-1.2.17.ebuild    | 80 -------------------------
 2 files changed, 164 deletions(-)
 delete mode 100644 dev-java/log4j/log4j-1.2.17-r1.ebuild
 delete mode 100644 dev-java/log4j/log4j-1.2.17.ebuild

diff --git a/dev-java/log4j/log4j-1.2.17-r1.ebuild b/dev-java/log4j/log4j-1.2.17-r1.ebuild
deleted file mode 100644
index 9b57f95a0b61..000000000000
--- a/dev-java/log4j/log4j-1.2.17-r1.ebuild
+++ /dev/null
@@ -1,84 +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 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
-}
diff --git a/dev-java/log4j/log4j-1.2.17.ebuild b/dev-java/log4j/log4j-1.2.17.ebuild
deleted file mode 100644
index a16563b116f9..000000000000
--- a/dev-java/log4j/log4j-1.2.17.ebuild
+++ /dev/null
@@ -1,80 +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 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? (
-			java-virtuals/javamail
-			java-virtuals/jaf
-		)
-		jmx? ( dev-java/sun-jmx )
-		jms? ( java-virtuals/jms )"
-
-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
-}
-- 
2.26.2