Remove old

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 5 insertions, 120 deletions

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index e9d105e94360..7803d244087b 100644
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/avalon-logkit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.83 2010/04/12 10:11:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.84 2010/04/12 12:43:01 caster Exp $
+
+  12 Apr 2010; Vlastimil Babka <caster@gentoo.org>
+  -avalon-logkit-1.2-r2.ebuild, -avalon-logkit-2.1-r4.ebuild:
+  Remove old
 
   12 Apr 2010; Alexis Ballier <aballier@gentoo.org>
   avalon-logkit-1.2.2.ebuild, avalon-logkit-2.1-r4.ebuild:
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2-r2.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2-r2.ebuild
deleted file mode 100644
index d49d080c7b43..000000000000
--- a/dev-java/avalon-logkit/avalon-logkit-1.2-r2.ebuild
+++ /dev/null
@@ -1,58 +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/avalon-logkit/avalon-logkit-1.2-r2.ebuild,v 1.8 2007/06/26 01:46:36 mr_bones_ Exp $
-
-JAVA_PKG_IUSE="doc javamail jms source"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="An easy-to-use Java logging toolkit designed for secure, performance-oriented logging."
-HOMEPAGE="http://avalon.apache.org/"
-SRC_URI="mirror://apache/avalon/logkit/v${PV}/LogKit-${PV}-src.tar.gz"
-COMMON_DEP="
-	javamail? (
-		dev-java/sun-jaf
-		dev-java/sun-javamail
-	)
-	jms? ( dev-java/sun-jms )"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-# Doesn't like 1.6 changes to JDBC
-DEPEND="|| (
-		=virtual/jdk-1.5*
-		=virtual/jdk-1.4*
-	)
-	${COMMON_DEP}"
-
-LICENSE="Apache-1.1"
-SLOT="1.2"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/LogKit-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	rm -rf "${S}/src/test/org"
-	cd "${S}/lib"
-
-	if use javamail; then
-		java-pkg_jar-from sun-jaf
-		java-pkg_jar-from sun-javamail
-	fi
-
-	use jms && java-pkg_jar-from sun-jms
-
-}
-
-src_compile() {
-	# not generating api docs because we would
-	# need avalon-site otherwise
-	eant jar
-}
-
-src_install() {
-	java-pkg_dojar ${S}/build/lib/*.jar
-	use doc && java-pkg_dohtml -r docs/*
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild
deleted file mode 100644
index 146cb95e89f0..000000000000
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild,v 1.7 2010/04/12 10:11:21 aballier Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Easy-to-use Java logging toolkit"
-HOMEPAGE="http://avalon.apache.org/"
-SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
-
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-LICENSE="Apache-2.0"
-SLOT="2.0"
-IUSE=""
-
-COMMON_DEP="
-	dev-java/log4j
-	java-virtuals/jms
-	java-virtuals/javamail
-	=dev-java/servletapi-2.4*"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-# Doesn't like 1.6 changes to JDBC
-DEPEND=">=virtual/jdk-1.4
-	test? (
-		=dev-java/junit-3*
-		dev-java/ant-junit
-	)
-	${COMMON_DEP}"
-
-java_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2.2-java6.patch"
-
-	java-ant_ignore-system-classes
-
-	java-ant_xml-rewrite -f build.xml \
-		-c -e available -a classpathref -v 'build.classpath' || die
-
-	mkdir -p target/lib || die
-	cd target/lib || die
-	java-pkg_jar-from servletapi-2.4
-	java-pkg_jar-from jms
-	java-pkg_jar-from --virtual javamail
-	java-pkg_jar-from log4j
-	java-pkg_filter-compiler jikes
-}
-
-src_test() {
-	java-pkg_jar-from --into target/lib junit
-	ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
-	java-pkg_newjar target/${P}.jar
-	use doc && java-pkg_dojavadoc dist/docs/api
-	use source && java-pkg_dosrc src/java/*
-}