Marking stable on x86 & cleanup

4 files changed, 7 insertions, 50 deletions

diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog
index 25a48e5102e4..dff53f9e79be 100644
--- a/dev-java/commons-logging/ChangeLog
+++ b/dev-java/commons-logging/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-logging
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.20 2004/07/31 11:51:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.21 2004/08/24 03:55:11 zx Exp $
+
+  23 Aug 2004; Chris Aniszczyk <zx@gentoo.org>
+  -commons-logging-1.0.3-r1.ebuild, commons-logging-1.0.4.ebuild:
+  Marking stable on x86 & cleanup
 
   31 Jul 2004; Thomas Matthijs <axxo@gentoo.org>
   commons-logging-1.0.3-r1.ebuild, commons-logging-1.0.4.ebuild:
diff --git a/dev-java/commons-logging/commons-logging-1.0.3-r1.ebuild b/dev-java/commons-logging/commons-logging-1.0.3-r1.ebuild
deleted file mode 100644
index a374970c2489..000000000000
--- a/dev-java/commons-logging/commons-logging-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2004 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.0.3-r1.ebuild,v 1.8 2004/07/31 11:51:12 axxo Exp $
-
-inherit java-pkg
-
-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/${PN}-${PV}-src.tar.gz"
-DEPEND=">=dev-java/log4j-1.2.5
-	dev-java/avalon-logkit-bin
-	>=dev-java/ant-1.4
-	jikes? ( dev-java/jikes )
-	junit? ( >=dev-java/junit-3.7 >=virtual/jdk-1.4 )
-	!junit? ( >=virtual/jdk-1.3 )"
-RDEPEND=">=virtual/jdk-1.3"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
-IUSE="doc jikes junit"
-
-S="${WORKDIR}/${P}-src/"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	echo "log4j.jar=`java-config -p log4j`" > build.properties
-	echo "logkit.jar=`java-config -p avalon-logkit-bin`" >> build.properties
-	echo "junit.jar=`java-config -p junit`" >> build.properties
-}
-
-src_compile() {
-	local antflags="compile"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadoc"
-	use junit && antflags="${antflags} test"
-	ant ${antflags} || die "compile problem"
-}
-
-src_install() {
-	java-pkg_dojar target/${PN}-api.jar target/${PN}.jar
-
-	dodoc RELEASE-NOTES.txt
-	dohtml PROPOSAL.html STATUS.html usersguide.html
-	use doc && dohtml -r dist/docs/
-}
diff --git a/dev-java/commons-logging/commons-logging-1.0.4.ebuild b/dev-java/commons-logging/commons-logging-1.0.4.ebuild
index ea6fa565c7be..537c561b00d5 100644
--- a/dev-java/commons-logging/commons-logging-1.0.4.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.0.4.ebuild,v 1.5 2004/07/31 11:51:12 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.0.4.ebuild,v 1.6 2004/08/24 03:55:11 zx Exp $
 
 inherit java-pkg
 
@@ -16,7 +16,7 @@ DEPEND=">=dev-java/log4j-1.2.5
 RDEPEND=">=virtual/jdk-1.3"
 LICENSE="Apache-1.1"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86 ppc sparc amd64"
 IUSE="doc jikes junit"
 
 S="${WORKDIR}/${P}-src/"
diff --git a/dev-java/commons-logging/files/digest-commons-logging-1.0.3-r1 b/dev-java/commons-logging/files/digest-commons-logging-1.0.3-r1
deleted file mode 100644
index 095408c78caf..000000000000
--- a/dev-java/commons-logging/files/digest-commons-logging-1.0.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d40606211a1559a9d9fd35eb9091ac15 commons-logging-1.0.3-src.tar.gz 45202