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

[James Le Cuirot]

commit:     3ee951f48488a6b3d8cbfc09977b2aaa1f9663d0
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 28 21:58:41 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Aug 28 22:01:45 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ee951f4

dev-java/commons-logging: Remove old 1.2

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 .../commons-logging/commons-logging-1.2.ebuild     | 70 ----------------------
 1 file changed, 70 deletions(-)

diff --git a/dev-java/commons-logging/commons-logging-1.2.ebuild b/dev-java/commons-logging/commons-logging-1.2.ebuild
deleted file mode 100644
index 024eb121b50..00000000000
--- a/dev-java/commons-logging/commons-logging-1.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source test"
-
-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 ~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
-}