fix deps, some cleanups

(Portage version: 2.0.51.22-r1)

5 files changed, 18 insertions, 77 deletions

diff --git a/dev-java/commons-logging/ChangeLog b/dev-java/commons-logging/ChangeLog
index 538655c5185f..6ae0e40e75b1 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.33 2005/06/08 15:34:59 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/ChangeLog,v 1.34 2005/07/09 16:01:07 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
+  -commons-logging-1.0.4.ebuild, commons-logging-1.0.4-r1.ebuild:
+  fix deps, some cleanups
 
   08 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   commons-logging-1.0.4-r1.ebuild:
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 85cc7419582f..76de8084d0d8 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,16 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 6e08e06ce6bd628d1dba7fc96e7ac87c commons-logging-1.0.4-r1.ebuild 1567
+MD5 0bc50585bdb116a8c3425135b39e359c ChangeLog 4686
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 ad5ec96d01324f469e03d297e10caaab commons-logging-1.0.4-r1.ebuild 1564
-MD5 0626fe661ad5c0ea60a9c17e620685d8 commons-logging-1.0.4.ebuild 1533
-MD5 7a0dbab9aeb6be05746564940b1bf375 ChangeLog 4544
 MD5 1e62b8a1770a8f7d817420e0c0d5f651 files/digest-commons-logging-1.0.4-r1 77
-MD5 1e62b8a1770a8f7d817420e0c0d5f651 files/digest-commons-logging-1.0.4 77
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCpxAwKRy60XGEcJIRAkGuAJoCGs2kpvJE5oE18aHkGBKCXVp2VwCdHW0v
-yXavsNZ5fKldXX7WrKeQQGM=
-=u4em
------END PGP SIGNATURE-----
diff --git a/dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild b/dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild
index d4e46b0794ab..c96bb8fd893e 100644
--- a/dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild
@@ -1,26 +1,27 @@
 # Copyright 1999-2005 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-r1.ebuild,v 1.7 2005/06/08 15:34:59 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-logging/commons-logging-1.0.4-r1.ebuild,v 1.8 2005/07/09 16:01:07 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"
+SRC_URI="mirror://apache/jakarta/commons/logging/source/${P}-src.tar.gz"
 
 LICENSE="Apache-1.1"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc64 sparc ppc"
 IUSE="avalon doc jikes source"
 
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
+RDEPEND=">=virtual/jre-1.3
 	=dev-java/avalon-logkit-1.2*
 	dev-java/log4j
-	avalon? ( =dev-java/avalon-framework-4.2* )
+	avalon? ( =dev-java/avalon-framework-4.2* )"
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
 	jikes? ( >=dev-java/jikes-1.21 )
-	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.3"
+	source? ( app-arch/zip )
+	${RDEPEND}"
 
 S="${WORKDIR}/${P}-src/"
 
@@ -28,11 +29,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	echo "log4j.jar=$(java-config -p log4j)" > build.properties
-	echo "logkit.jar=$(java-config -p avalon-logkit-1.2)" >> build.properties
-	use avalon && \
-		echo "avalon-framework.jar=$(java-config -p avalon-framework-4.2)" \
-		>> build.properties
+	echo "log4j.jar=$(java-pkg_getjars log4j)" > build.properties
+	echo "logkit.jar=$(java-pkg_getjars avalon-logkit-1.2)" >> build.properties
+	use avalon && echo "avalon-framework.jar=$(java-pkg_getjars avalon-framework-4.2)" >> build.properties
 }
 
 src_compile() {
diff --git a/dev-java/commons-logging/commons-logging-1.0.4.ebuild b/dev-java/commons-logging/commons-logging-1.0.4.ebuild
deleted file mode 100644
index d0e99e99422c..000000000000
--- a/dev-java/commons-logging/commons-logging-1.0.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 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.13 2005/01/26 21:07:48 corsair 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-core-1.4
-	jikes? ( >=dev-java/jikes-1.21 )
-	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 ppc64"
-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
-
-	if use junit; then
-		echo "junit.jar=$(java-config -p junit)" >> build.properties
-	fi
-}
-
-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 && java-pkg_dohtml -r dist/docs/
-}
diff --git a/dev-java/commons-logging/files/digest-commons-logging-1.0.4 b/dev-java/commons-logging/files/digest-commons-logging-1.0.4
deleted file mode 100644
index f624da15c5f7..000000000000
--- a/dev-java/commons-logging/files/digest-commons-logging-1.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 db5dc75c89e794f794be92d10df6be1b commons-logging-1.0.4-src.tar.gz 101017