fix deps, and source useflag support, small cleanups

(Portage version: 2.0.51.22-r1)

4 files changed, 34 insertions, 33 deletions

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 50d57ed67c0b..44a42086e1ec 100644
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/avalon-logkit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.18 2005/05/30 19:19:32 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.19 2005/07/09 15:59:10 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> avalon-logkit-1.2.ebuild,
+  avalon-logkit-2.0.ebuild:
+  fix deps, and source useflag support, small cleanups
 
   30 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   avalon-logkit-1.2.ebuild, avalon-logkit-2.0.ebuild:
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest
index d9f3100b2193..0a00f6ae8d1a 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 310fb2e8e90c44ff32e13c663b590b02 ChangeLog 1842
-MD5 8d0be60770cc6b6464a7b957c7c6c2ed avalon-logkit-1.2.ebuild 1714
-MD5 1e677209e608094a4aa80974004233f2 avalon-logkit-2.0.ebuild 2227
+MD5 0b2f058e0f143ca4f0254c2543917b1d ChangeLog 2001
+MD5 0a317cf2c5ff67e255eb937e82fe7d93 avalon-logkit-1.2.ebuild 1813
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 15a52bc93b08536ccdbc1e51dd06da9d avalon-logkit-2.0.ebuild 2313
 MD5 1d4fb92234d539c16377690ccc278dbb files/2.0-build.xml 1931
 MD5 59f31286545f93f7dfa4a5e40cfb19a4 files/digest-avalon-logkit-1.2 66
 MD5 f5ee024795ce428b5418141110096d4d files/digest-avalon-logkit-2.0 78
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCm2dvKRy60XGEcJIRAh7MAJ45IIjHr+XCU0NMTHjcH7L0GAw9DgCglIhi
-8uAms5ssc+1UXjtOQMlwQPw=
-=nGFj
------END PGP SIGNATURE-----
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild
index 39f5e709acdf..be381d66a51d 100644
--- a/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild
@@ -1,16 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild,v 1.19 2005/05/30 19:19:32 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild,v 1.20 2005/07/09 15:59:10 axxo Exp $
 
 inherit java-pkg
 
 DESCRIPTION="LogKit is an easy-to-use Java logging toolkit designed for secure, performance-oriented logging."
 HOMEPAGE="http://avalon.apache.org/"
 SRC_URI="mirror://apache/avalon/logkit/v${PV}/LogKit-${PV}-src.tar.gz"
-DEPEND=">=virtual/jdk-1.3
-	dev-java/ant-core
-	dev-java/junit
-	jikes? ( dev-java/jikes )"
 RDEPEND=">=virtual/jre-1.3
 	javamail? (
 		dev-java/sun-jaf-bin
@@ -24,17 +20,24 @@ RDEPEND=">=virtual/jre-1.3
 			dev-java/jms
 		)
 	)"
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
+	dev-java/junit
+	source? ( app-arch/zip )
+	jikes? ( dev-java/jikes )
+	${RDEPEND}"
 
 LICENSE="Apache-1.1"
 SLOT="1.2"
 KEYWORDS="x86 amd64 ppc64 sparc ppc"
-IUSE="doc javamail jikes jms"
+IUSE="doc javamail jikes jms source"
 
 S=${WORKDIR}/LogKit-${PV}
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}/lib
+	rm -f *.jar
 
 	# decide which mail implementation we use
 	if use javamail; then
@@ -68,4 +71,5 @@ src_compile() {
 src_install () {
 	java-pkg_dojar ${S}/build/lib/*.jar || die "Unable to Install"
 	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/java/*
 }
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild
index c388801ed02e..29ba5e489bbb 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild
@@ -1,20 +1,16 @@
 # Copyright 1999-2005 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.ebuild,v 1.11 2005/05/30 19:19:32 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild,v 1.12 2005/07/09 15:59:10 axxo Exp $
 
 inherit java-pkg
 
 DESCRIPTION="Easy-to-use Java logging toolkit"
 HOMEPAGE="http://avalon.apache.org/"
-SRC_URI="mirror://apache/avalon/avalon-logkit/distributions/${PF}.dev-0-src.tar.gz"
+SRC_URI="mirror://apache/avalon/avalon-logkit/distributions/${P}.dev-0-src.tar.gz"
 KEYWORDS="x86 amd64 ppc64 sparc ppc"
 LICENSE="Apache-2.0"
 SLOT="2.0"
-IUSE="doc jikes jms javamail"
-DEPEND=">=virtual/jdk-1.4
-		jikes? ( >=dev-java/jikes-1.21 )
-		>=dev-java/ant-1.5
-		dev-java/junit"
+IUSE="doc jikes jms javamail source"
 RDEPEND=">=virtual/jre-1.4
 		dev-java/log4j
 		jms? ( || (
@@ -27,9 +23,15 @@ RDEPEND=">=virtual/jre-1.4
 				dev-java/sun-javamail-bin
 			)
 		)
-		=dev-java/servletapi-2.3*"
+		=dev-java/servletapi-2.4*"
+DEPEND=">=virtual/jdk-1.4
+		jikes? ( >=dev-java/jikes-1.21 )
+		source? ( app-arch/zip )
+		dev-java/ant-core
+		dev-java/junit
+		${RDEPEND}"
 
-S=${WORKDIR}/${PF}.dev-0
+S=${WORKDIR}/${P}.dev-0
 
 src_unpack() {
 	unpack ${A}
@@ -58,22 +60,22 @@ src_unpack() {
 		fi
 	fi
 
-	local libs="log4j,servletapi-2.3"
+	local libs="log4j,servletapi-2.4"
 	use jms && libs="${libs},${jms}"
 	use javamail && libs="${libs},${javamail}"
 
-	echo "classpath=`java-config -p ${libs}`" > build.properties
+	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"
+		echo "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"
+		echo "Removing javamail related files"
 		rm -rf net || die "JavaMail Failure!"
 	fi
 }
@@ -90,4 +92,5 @@ src_install() {
 
 	dodoc README.txt LICENSE.txt
 	use doc && java-pkg_dohtml -r ${S}/dist/docs/*
+	use source && java-pkg_dosrc src/java/*
 }