NM: Cleanup superseeded ebuilds.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key )

3 files changed, 6 insertions, 156 deletions

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 84a4982c54ef..509c03fe7065 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.97 2013/09/05 13:46:01 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.98 2014/06/17 11:05:36 mrueg Exp $
+
+  17 Jun 2014; Manuel Rüger <mrueg@gentoo.org> -avalon-logkit-1.2.2.ebuild,
+  -avalon-logkit-2.1-r4.ebuild:
+  NM: Cleanup superseeded ebuilds.
 
   05 Sep 2013; Agostino Sarubbo <ago@gentoo.org> avalon-logkit-1.2.2-r1.ebuild:
   Stable for ppc64, wrt bug #481956
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2.2.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2.2.ebuild
deleted file mode 100644
index 96d66ee2284a..000000000000
--- a/dev-java/avalon-logkit/avalon-logkit-1.2.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 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.2.ebuild,v 1.11 2012/01/01 14:00:54 sera Exp $
-
-EAPI=2
-JAVA_PKG_IUSE="doc source test"
-inherit eutils java-pkg-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/source/logkit-${PV}-src.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="1.2"
-IUSE=""
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-
-COMMON_DEP="
-	dev-java/avalon-framework:4.1
-	dev-java/sun-jaf:0
-	dev-java/log4j:0
-	dev-java/servletapi:2.3
-	dev-java/sun-javamail:0
-	dev-java/sun-jms:0"
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-
-DEPEND=">=virtual/jdk-1.4
-	test? ( dev-java/junit:4 )
-	${COMMON_DEP}"
-
-S="${WORKDIR}/logkit-${PV}-dev"
-SRC_DIR="${S}/src/java"
-JAVADOC_DIR="${S}/javadoc"
-
-java_prepare() {
-	epatch "${FILESDIR}/${P}-java6.patch"
-}
-
-src_compile() {
-	mkdir classes || die "Could not create compile output dir"
-
-	ejavac \
-		-encoding "ISO-8859-1" \
-		-classpath $(java-pkg_getjars sun-jaf,sun-javamail,sun-jms,log4j,servletapi-2.3,avalon-framework-4.1) \
-		-d classes $(find "${SRC_DIR}" -name "*.java") \
-		|| die "Compilation failed"
-
-	jar -cf "${S}/${PN}.jar" -C classes . || die "Could not create jar"
-
-	#Generate javadoc
-	if use doc ; then
-		mkdir "${JAVADOC_DIR}" || die "Could not create javadoc dir"
-		cd "${SRC_DIR}"
-		javadoc \
-			-encoding "ISO-8859-1" \
-			-sourcepath "${SRC_DIR}" \
-			-classpath $(java-pkg_getjars sun-jaf,sun-javamail,sun-jms,log4j,servletapi-2.3,avalon-framework-4.1) \
-			-source "${JAVA_VERSION}" \
-			-d "${JAVADOC_DIR}" \
-			$(find "org/apache/log" -type d | tr '/' '.') \
-			|| die "Could not create javadoc"
-	fi
-}
-
-src_test() {
-	mkdir test-classes || die "Unable to make dir"
-	local TESTJAR="avalon-logkit-test.jar"
-
-	ejavac \
-		-encoding "ISO-8859-1" \
-		-classpath "avalon-logkit.jar:$(java-config -p junit-4)" \
-		-d test-classes \
-		$(find src/test -name '*.java')
-
-	jar -cf "${TESTJAR}" -C test-classes .
-
-	java -cp "avalon-logkit.jar:${TESTJAR}:$(java-config -p junit:4)" \
-		org.junit.runner.JUnitCore org.apache.log.format.test.FormatterTestCase \
-		org.apache.log.output.test.RevolvingFileStrategyTestCase \
-		org.apache.log.output.test.OutputTargetTestCase \
-		org.apache.log.output.test.DBTargetTestCase \
-		org.apache.log.util.test.UtilTestCase \
-		org.apache.log.test.LoggerListenerTestCase \
-		org.apache.log.test.WrappingTargetTestCase \
-		org.apache.log.test.InheritanceTestCase
-}
-
-src_install() {
-	java-pkg_dojar "${PN}.jar"
-	use doc && java-pkg_dojavadoc "${JAVADOC_DIR}"
-	use source && java-pkg_dosrc "${SRC_DIR}/*"
-}
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 e37915bb7de0..000000000000
--- a/dev-java/avalon-logkit/avalon-logkit-2.1-r4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2012 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.11 2012/01/01 14:00:54 sera 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 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-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/*
-}