Stable on amd64, bug #172895. Removed older version in same slot.

(Portage version: 2.1.2.3)

5 files changed, 8 insertions, 143 deletions

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 34a98fcc34db..be72ee117fec 100644
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/avalon-logkit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.42 2007/04/08 12:16:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.43 2007/04/08 20:13:40 wltjr Exp $
+
+  08 Apr 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -files/2.0-build.xml, -avalon-logkit-2.0-r2.ebuild,
+  avalon-logkit-2.1.ebuild:
+  Stable on amd64, bug #172895. Removed older version in same slot.
 
   08 Apr 2007; Markus Rothe <corsair@gentoo.org> avalon-logkit-2.1.ebuild:
   Stable on ppc64; bug #172895
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.0-r2.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.0-r2.ebuild
deleted file mode 100644
index 0ad3a8809893..000000000000
--- a/dev-java/avalon-logkit/avalon-logkit-2.0-r2.ebuild
+++ /dev/null
@@ -1,73 +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-2.0-r2.ebuild,v 1.5 2007/01/30 21:19:24 wolf31o2 Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Easy-to-use Java logging toolkit"
-HOMEPAGE="http://avalon.apache.org/"
-SRC_URI="mirror://apache/avalon/avalon-logkit/distributions/${P}.dev-0-src.tar.gz"
-KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
-LICENSE="Apache-2.0"
-SLOT="2.0"
-IUSE="doc javamail jms source"
-COMMON_DEP="
-	dev-java/log4j
-	jms? ( dev-java/sun-jms )
-	javamail? (
-		dev-java/sun-jaf
-		dev-java/sun-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.3*
-		=virtual/jdk-1.4*
-		=virtual/jdk-1.5*
-	)
-	source? ( app-arch/zip )
-	dev-java/ant-core
-	${COMMON_DEP}"
-
-S="${WORKDIR}/${P}.dev-0"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# the build.xml file for ant
-	cp ${FILESDIR}/${PV}-build.xml ./build.xml
-
-	local libs="log4j,servletapi-2.4"
-	use jms && libs="${libs},sun-jms"
-	use javamail && libs="${libs},sun-jaf,sun-javamail"
-
-	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
-
-	cd "${S}/src/java/org/apache/log/output/"
-
-	if ! use jms; then
-		einfo "Removing jms related files"
-		rm -rf jms || die "JMS Failure!"
-		rm -f ServletOutputLogTarget.java || die "JMS Failure!"
-	fi
-
-	if ! use javamail; then
-		einfo "Removing javamail related files"
-		rm -rf net || die "JavaMail Failure!"
-	fi
-}
-
-src_compile() {
-	eant $(use_doc) jar
-}
-
-src_install() {
-	java-pkg_dojar ${S}/dist/avalon-logkit.jar || die "Install Failed!"
-
-	dodoc README.txt LICENSE.txt
-	use doc && java-pkg_dohtml -r ${S}/dist/docs/*
-	use source && java-pkg_dosrc src/java/*
-}
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1.ebuild
index b81ec038bdaa..82389d93d3ab 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.1.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1.ebuild
@@ -1,6 +1,6 @@
 # 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-2.1.ebuild,v 1.8 2007/04/08 12:16:01 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.1.ebuild,v 1.9 2007/04/08 20:13:40 wltjr Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86"
 LICENSE="Apache-2.0"
 SLOT="2.0"
 IUSE="doc source test"
diff --git a/dev-java/avalon-logkit/files/2.0-build.xml b/dev-java/avalon-logkit/files/2.0-build.xml
deleted file mode 100644
index 0585b4d59fb0..000000000000
--- a/dev-java/avalon-logkit/files/2.0-build.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="jar" name="avalon-logkit" basedir=".">
-   <property file="build.properties"/>
-   <property file="default.properties"/>
-   
-   <property name="libs" value="${basedir}/libs"/>
-   <property name="src" value="${basedir}/src/java"/>
-   <property name="target" value="${basedir}/target"/>
-   <property name="dist" value="${basedir}/dist"/>
-
-   <property name="jarfile" value="avalon-logkit.jar"/>
-   
-   <property name="javadoc" value="${dist}/docs"/>
-   <property name="packages" value="org.apache.log.*"/>
-
-   <target name="init">
-      <tstamp/>
-      <mkdir dir="${target}"/>
-      <mkdir dir="${dist}"/>
-      <mkdir dir="${javadoc}"/>
-   </target>
-
-   <target name="compile" depends="init">
-      <javac srcdir="${src}"
-             destdir="${target}"
-             deprecation="true"
-             excludes="**/package.html"
-             classpath="${classpath}"/>
-
-      <copy toDir="${target}">
-         <fileset dir="${src}">
-            <include name="**/*.dtd"/>
-            <include name="**/*.properties"/>
-            <include name="**/*.xinfo"/>
-            <include name="**/*.xtype"/>
-            <include name="**/*.xprofile"/>
-            <include name="**/*.xconfig"/>
-            <include name="**/*.xml"/>
-            <include name="**/*.xservice"/>
-         </fileset>
-      </copy>
-
-      <copy toDir="${target}">
-         <fileset dir=".">
-            <include name="block.xml"/>
-         </fileset>
-      </copy>
-   </target>
-
-   <target name="javadoc" depends="compile">
-      <javadoc sourcepath="${src}"
-               destdir="${javadoc}"
-               packagenames="${packages}"
-               classpath="${classpath}"
-               source="1.4"/>
-   </target>
-   
-   <target name="jar" depends="init,compile">
-      <jar jarfile="${dist}/${jarfile}"
-           excludes="**/package.html"
-           basedir="${target}"/>
-   </target>
-</project>
diff --git a/dev-java/avalon-logkit/files/digest-avalon-logkit-2.0-r2 b/dev-java/avalon-logkit/files/digest-avalon-logkit-2.0-r2
deleted file mode 100644
index f3b61f61b52c..000000000000
--- a/dev-java/avalon-logkit/files/digest-avalon-logkit-2.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fded0316383d82b1cee4c799876f56d5 avalon-logkit-2.0.dev-0-src.tar.gz 59466
-RMD160 1442119fb23ed8f7e3c6fcfad39af88ed0e33d71 avalon-logkit-2.0.dev-0-src.tar.gz 59466
-SHA256 05cb4fa477871d07b494ac3e0b148cb089276afc4d10b2ad8f5414d8fa21d53a avalon-logkit-2.0.dev-0-src.tar.gz 59466