fix deps, cleanups

(Portage version: 2.0.51.22-r1)

4 files changed, 25 insertions, 29 deletions

diff --git a/dev-java/avalon-framework/ChangeLog b/dev-java/avalon-framework/ChangeLog
index 4122eb5fdaaa..72440cb583a8 100644
--- a/dev-java/avalon-framework/ChangeLog
+++ b/dev-java/avalon-framework/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/avalon-framework
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/ChangeLog,v 1.7 2005/05/30 19:22:00 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/ChangeLog,v 1.8 2005/07/09 15:58:54 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org>
+  avalon-framework-4.1.5.ebuild, avalon-framework-4.2.0.ebuild:
+  fix deps, cleanups
 
   30 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   avalon-framework-4.1.5.ebuild, avalon-framework-4.2.0.ebuild:
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
index 641cf09c90ac..626043169f8a 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 11ee494876a84fbca343c696a2c08243 avalon-framework-4.1.5.ebuild 1285
+MD5 934994e968525f34b717dac45dd78f25 avalon-framework-4.2.0.ebuild 1290
 MD5 bafb213ba2bb41be60542f63c28aeeee ChangeLog 1361
-MD5 483b46815af794f95260747c93cde2c9 avalon-framework-4.1.5.ebuild 1253
-MD5 3119192dc88c032c031b7ed8b5e735c1 avalon-framework-4.2.0.ebuild 1276
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 3c945053b5c79d286570b89c81418996 files/build.xml 1838
 MD5 5807e384e64fab8fd562ba9d3e171916 files/digest-avalon-framework-4.1.5 77
 MD5 56cf84c7d1a8b0f6e856ab1390bae920 files/digest-avalon-framework-4.2.0 77
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCm2fuKRy60XGEcJIRAqhUAJ0abDWCwLt9AdG/CkHvhGiyewYF1wCfVEYJ
-TGhThMIfnmJe8YSfnj0adgI=
-=sH4Q
------END PGP SIGNATURE-----
diff --git a/dev-java/avalon-framework/avalon-framework-4.1.5.ebuild b/dev-java/avalon-framework/avalon-framework-4.1.5.ebuild
index ad959daaa5e2..9139e08914cf 100644
--- a/dev-java/avalon-framework/avalon-framework-4.1.5.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/avalon-framework-4.1.5.ebuild,v 1.5 2005/05/30 19:22:00 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/avalon-framework-4.1.5.ebuild,v 1.6 2005/07/09 15:58:54 axxo Exp $
 
 inherit java-pkg
 
@@ -11,15 +11,16 @@ SRC_URI="mirror://apache/avalon/avalon-framework/source/${PF}.src.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="4.1"
 KEYWORDS="amd64 x86 sparc ~ppc"
-IUSE="doc jikes source "
+IUSE="doc jikes source"
 
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.5
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4
 	=dev-java/avalon-logkit-2*
 	>=dev-java/log4j-1.2.9"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.5
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )
+	${RDEPEND}"
 
 S=${WORKDIR}/${PN}
 
@@ -29,7 +30,7 @@ src_unpack() {
 
 	cp ${FILESDIR}/build.xml ./build.xml || die "ANT update failure!"
 	local libs="log4j,avalon-logkit-2.0"
-	echo "classpath=`java-config -p ${libs}`" > build.properties
+	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
 }
 
 src_compile() {
@@ -42,6 +43,7 @@ src_compile() {
 src_install() {
 	java-pkg_dojar ${S}/dist/avalon-framework.jar
 
+	dodoc NOTICE.TXT
 	use doc && java-pkg_dohtml -r ${S}/target/docs/*
 	use source && java-pkg_dosrc impl/src/java/*
 }
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0.ebuild
index 51d3679bfe8b..58e0a66cb970 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/avalon-framework-4.2.0.ebuild,v 1.8 2005/05/30 19:22:00 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-framework/avalon-framework-4.2.0.ebuild,v 1.9 2005/07/09 15:58:54 axxo Exp $
 
 inherit java-pkg
 
@@ -13,30 +13,30 @@ SLOT="4.2"
 KEYWORDS="amd64 x86 ppc64 sparc ppc"
 IUSE="doc jikes source"
 
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.5
-	jikes? ( dev-java/jikes )
-	source? ( app-arch/zip )"
 RDEPEND=">=virtual/jre-1.4
 	=dev-java/avalon-logkit-2*
 	>=dev-java/log4j-1.2.9"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.5
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )
+	${RDEPEND}"
 
 S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
-	cp ${FILESDIR}/build.xml ./build.xml || die "ANT update failure!"
 
+	cp ${FILESDIR}/build.xml ./build.xml || die "ANT update failure!"
 	local libs="log4j,avalon-logkit-2.0"
-	echo "classpath=`java-config -p ${libs}`" > build.properties
+	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
 }
 
 src_compile() {
 	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} javadoc"
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "Compile failed!"
 }