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

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 34a98fcc34db45dc79998d337d35e9ea5f435f64..be72ee117fecf82b0760ed11db9cf210dfb83f9e 100644 (file)
--- 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/Manifest b/dev-java/avalon-logkit/Manifest
index c5d11eb02663738768488ee5c1901054f25a33c6..047517501179304d3cef4591450632d124807a9c 100644 (file)
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,26 +1,17 @@
-AUX 2.0-build.xml 1931 RMD160 bec909f272841137ee864c05cee3f3c054a93ad0 SHA1 eed74be47d64917c56a8e175df037d4fa82cb5d3 SHA256 19a06dedbfd65a2e50d04f93335ab1ccc7ba9d6bc402503c1313274ed93121c5
-MD5 1d4fb92234d539c16377690ccc278dbb files/2.0-build.xml 1931
-RMD160 bec909f272841137ee864c05cee3f3c054a93ad0 files/2.0-build.xml 1931
-SHA256 19a06dedbfd65a2e50d04f93335ab1ccc7ba9d6bc402503c1313274ed93121c5 files/2.0-build.xml 1931
 DIST LogKit-1.2-src.tar.gz 239132 RMD160 76310c6d26c816f3fa6d33b3da326475c29ef495 SHA1 e5ed86b664bd67481948ad30548587a27cbc8d4a SHA256 63fce9268f21696b284a7e942925806bf733a0e4086f76f565c35c7df4d06a2c
-DIST avalon-logkit-2.0.dev-0-src.tar.gz 59466 RMD160 1442119fb23ed8f7e3c6fcfad39af88ed0e33d71 SHA1 621cf2ab62c70124d5a257137164674ba4626bcf SHA256 05cb4fa477871d07b494ac3e0b148cb089276afc4d10b2ad8f5414d8fa21d53a
 DIST avalon-logkit-2.1-src.tar.gz 60218 RMD160 03d42940610150390744a9e2bd546be4537a371e SHA1 a1fc2054d375461b6781fa9b5274298d0b158c7a SHA256 a5f158a52db9acd58648ffe75a023f43c5cbb94d027bb2beccf4983614d4e155
 EBUILD avalon-logkit-1.2-r2.ebuild 1420 RMD160 daa9814306ee88fdae793e7741eee71d264cc1ca SHA1 7502ce37b6b1652cc30787cd5c9fbe0925eb50ed SHA256 898a4ef3c95d5357c2cf01d7e55cdeeb3f5c2f4695dbd70351b0da8794a878d7
 MD5 b2e12ca531adacce7e2b517d91b81ebc avalon-logkit-1.2-r2.ebuild 1420
 RMD160 daa9814306ee88fdae793e7741eee71d264cc1ca avalon-logkit-1.2-r2.ebuild 1420
 SHA256 898a4ef3c95d5357c2cf01d7e55cdeeb3f5c2f4695dbd70351b0da8794a878d7 avalon-logkit-1.2-r2.ebuild 1420
-EBUILD avalon-logkit-2.0-r2.ebuild 1784 RMD160 9ae88141d88055bfae2fb00fa0fa74e3b92aef65 SHA1 6111086fbfca642ca0cb457c774f24d3a886a574 SHA256 f257a913008ff9ae9f6dac1240cff485f4fed04690b0caf9c2385e4c725eee11
-MD5 30b15de4e00d77dc523c08fd9e5ffe05 avalon-logkit-2.0-r2.ebuild 1784
-RMD160 9ae88141d88055bfae2fb00fa0fa74e3b92aef65 avalon-logkit-2.0-r2.ebuild 1784
-SHA256 f257a913008ff9ae9f6dac1240cff485f4fed04690b0caf9c2385e4c725eee11 avalon-logkit-2.0-r2.ebuild 1784
-EBUILD avalon-logkit-2.1.ebuild 1474 RMD160 4858cb961eb50245a06837bdcb93401a3a6199e1 SHA1 e7cc617f729979ef82a0ad3e7c77900a30093917 SHA256 d9a78416e0b270a6723163afbb351dc6a5c52e090fe5e54eb8053e54f68ed62e
-MD5 1dbe911aef4018c30a9cee7ac40f0e2f avalon-logkit-2.1.ebuild 1474
-RMD160 4858cb961eb50245a06837bdcb93401a3a6199e1 avalon-logkit-2.1.ebuild 1474
-SHA256 d9a78416e0b270a6723163afbb351dc6a5c52e090fe5e54eb8053e54f68ed62e avalon-logkit-2.1.ebuild 1474
-MISC ChangeLog 5576 RMD160 8e46d5d6d3d17a85492c1b716eff90c72a4b34b9 SHA1 1f810366b2b137a9858ff13da30bbb2ec0106389 SHA256 a7b2e7e5faf453703178f1718c9fa1fcab2b082cd13125583dc78a272b1b7b09
-MD5 4b68f5d2b8bffcb64622eda3f8ac4bf0 ChangeLog 5576
-RMD160 8e46d5d6d3d17a85492c1b716eff90c72a4b34b9 ChangeLog 5576
-SHA256 a7b2e7e5faf453703178f1718c9fa1fcab2b082cd13125583dc78a272b1b7b09 ChangeLog 5576
+EBUILD avalon-logkit-2.1.ebuild 1471 RMD160 c0c787f02baf88f5583decf6ae262d93772c5d07 SHA1 0a5c74bfbec7ba04f311dc0d281f0a0bec047420 SHA256 d6805155518200289ba61969221143c40788f766c317b05c2331d44e0c7fb28d
+MD5 b95905fc0f67a2cba256c696a9af67d8 avalon-logkit-2.1.ebuild 1471
+RMD160 c0c787f02baf88f5583decf6ae262d93772c5d07 avalon-logkit-2.1.ebuild 1471
+SHA256 d6805155518200289ba61969221143c40788f766c317b05c2331d44e0c7fb28d avalon-logkit-2.1.ebuild 1471
+MISC ChangeLog 5782 RMD160 547188caa7f68a992de008ca77bfa55cedf84acc SHA1 a8392688345eb3dcdd6d6079298110295acdce42 SHA256 77b1fbd468283ab2438a193775ef2e0a98cf303403593e9b350198ad3aeda35b
+MD5 ef7176ab0d84659b9b46aa0599dcd131 ChangeLog 5782
+RMD160 547188caa7f68a992de008ca77bfa55cedf84acc ChangeLog 5782
+SHA256 77b1fbd468283ab2438a193775ef2e0a98cf303403593e9b350198ad3aeda35b ChangeLog 5782
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -28,9 +19,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata
 MD5 859fcf425f41b844a5286d23efe3db74 files/digest-avalon-logkit-1.2-r2 244
 RMD160 570f9d7bfd46c872bf09ad08288c30be547fda88 files/digest-avalon-logkit-1.2-r2 244
 SHA256 37328c380c7e2d18c1a9125d84a4c3b0471276cb6d56f8484f081b5f3c72d7e0 files/digest-avalon-logkit-1.2-r2 244
-MD5 7cbd49bfbba70d98bf56698822227c97 files/digest-avalon-logkit-2.0-r2 280
-RMD160 d974eca7896af7f551f5eafb530d23da24a5e8b4 files/digest-avalon-logkit-2.0-r2 280
-SHA256 02c6398115ffb6a9dd0427bc508d45afe4652ad590b34f01393cd76538a930a2 files/digest-avalon-logkit-2.0-r2 280
 MD5 aca53784896d9411474d17b63601c55a files/digest-avalon-logkit-2.1 262
 RMD160 0d222afb4ee150800d8189c0f0f64f2958370b1f files/digest-avalon-logkit-2.1 262
 SHA256 4ffa59089d71ef1974924cb003620be3cb0127c5a6583badae4ae8e3f0263ef7 files/digest-avalon-logkit-2.1 262

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 (file)
index 0ad3a88..0000000
--- 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 b81ec038bdaa351ad8ec70913692a5ba2f6a35eb..82389d93d3ab9c610db5f658c8c253a1c8338e23 100644 (file)
--- 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 (file)
index 0585b4d..0000000
--- 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 (file)
index f3b61f6..0000000
--- 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