Cleanup.

(Portage version: 2.1.4.1)

4 files changed, 6 insertions, 181 deletions

diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog
index f149459729f6..98672d2d7e39 100644
--- a/dev-java/commons-logging/ChangeLog
+++ b/dev-java/commons-logging/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/commons-logging
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.58 2008/02/06 15:25:30 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.59 2008/02/06 18:18:21 caster Exp $
+
+  06 Feb 2008; Vlastimil Babka <caster@gentoo.org>
+  -commons-logging-1.1-r2.ebuild, -commons-logging-1.1-r3.ebuild,
+  -commons-logging-1.1-r4.ebuild:
+  Cleanup.
 
 *commons-logging-1.1.1 (06 Feb 2008)
 
diff --git a/dev-java/commons-logging/commons-logging-1.1-r2.ebuild b/dev-java/commons-logging/commons-logging-1.1-r2.ebuild
deleted file mode 100644
index 251356c541e0..000000000000
--- a/dev-java/commons-logging/commons-logging-1.1-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 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-r2.ebuild,v 1.11 2007/12/15 20:11:52 betelgeuse Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries."
-HOMEPAGE="http://jakarta.apache.org/commons/logging/"
-SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="avalon-logkit log4j servletapi avalon-framework doc source"
-
-RDEPEND=">=virtual/jre-1.3
-	avalon-logkit? ( =dev-java/avalon-logkit-1.2* )
-	log4j? ( =dev-java/log4j-1.2* )
-	servletapi? ( =dev-java/servletapi-2.3* )
-	avalon-framework? ( =dev-java/avalon-framework-4.2* )"
-# ATTENTION: Add this when log4j-1.3 is out
-#	=dev-java/log4j-1.3*
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	source? ( app-arch/zip )
-	${RDEPEND}"
-
-S="${WORKDIR}/${P}-src/"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	# TODO file upstream -nichoj
-	epatch "${FILESDIR}/${P}-servletapi.patch"
-
-	java-ant_ignore-system-classes
-
-	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_getjars servletapi-2.3)" >> 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
-}
-
-EANT_BUILD_TARGET="compile"
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-	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 STATUS.html || die
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/commons-logging/commons-logging-1.1-r3.ebuild b/dev-java/commons-logging/commons-logging-1.1-r3.ebuild
deleted file mode 100644
index 9352e60e4c44..000000000000
--- a/dev-java/commons-logging/commons-logging-1.1-r3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 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-r3.ebuild,v 1.2 2008/01/12 15:13:04 caster Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The Jakarta-Commons Logging package is an ultra-thin bridge between different logging libraries."
-HOMEPAGE="http://jakarta.apache.org/commons/logging/"
-SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="avalon-logkit log4j servletapi avalon-framework doc source"
-
-RDEPEND=">=virtual/jre-1.3
-	avalon-logkit? ( =dev-java/avalon-logkit-1.2* )
-	log4j? ( =dev-java/log4j-1.2* )
-	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*
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	source? ( app-arch/zip )
-	${RDEPEND}"
-
-S="${WORKDIR}/${P}-src/"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	# TODO file upstream -nichoj
-	epatch "${FILESDIR}/${P}-servletapi.patch"
-
-	java-ant_ignore-system-classes
-
-	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
-}
-
-EANT_BUILD_TARGET="compile"
-
-src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
-	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 STATUS.html || die
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/commons-logging/commons-logging-1.1-r4.ebuild b/dev-java/commons-logging/commons-logging-1.1-r4.ebuild
deleted file mode 100644
index 561ea2c93318..000000000000
--- a/dev-java/commons-logging/commons-logging-1.1-r4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 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-r4.ebuild,v 1.1 2008/01/14 16:22:37 elvanor Exp $
-
-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://jakarta.apache.org/commons/logging/"
-SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="avalon-logkit log4j servletapi avalon-framework doc source"
-
-RDEPEND=">=virtual/jre-1.3
-	avalon-logkit? ( =dev-java/avalon-logkit-1.2* )
-	log4j? ( =dev-java/log4j-1.2* )
-	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*
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	source? ( app-arch/zip )
-	${RDEPEND}"
-
-S="${WORKDIR}/${P}-src/"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	# patch to make the build.xml respect no servletapi
-	# TODO file upstream -nichoj
-	epatch "${FILESDIR}/${P}-servletapi.patch"
-
-	java-ant_ignore-system-classes
-
-	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
-}
-
-EANT_BUILD_TARGET="compile"
-
-src_install() {
-	java-osgi_newjar-fromfile "target/${P}.jar" "${FILESDIR}/${P}-manifest" "Apache Commons Logging"
-	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 STATUS.html || die
-	use doc && java-pkg_dojavadoc target/docs/
-	use source && java-pkg_dosrc src/java/org
-}