Version bump. Does not provide jms and javamail use flags any more because that option is not available upstream. This ebuild adds support for src_test. Fixes bug #158496.

(Portage version: 2.1.2_rc3-r6)

4 files changed, 87 insertions, 14 deletions

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 8875ed384f9e..3692d91b2bbd 100644
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/avalon-logkit
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.29 2006/12/17 16:09:31 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.30 2006/12/20 22:54:46 betelgeuse Exp $
+
+*avalon-logkit-2.1 (20 Dec 2006)
+
+  20 Dec 2006; Petteri Räty <betelgeuse@gentoo.org>
+  +avalon-logkit-2.1.ebuild:
+  Version bump. Does not provide jms and javamail use flags any more because
+  that option is not available upstream. This ebuild adds support for
+  src_test. Fixes bug #158496.
 
   17 Dec 2006; Tobias Scherbaum <dertobi123@gentoo.org>
   avalon-logkit-2.0-r2.ebuild:
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2-r1.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2-r1.ebuild
index ab9c245ec98b..7bd98f6f05ca 100644
--- a/dev-java/avalon-logkit/avalon-logkit-1.2-r1.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r1.ebuild,v 1.4 2006/10/17 03:15:36 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2-r1.ebuild,v 1.5 2006/12/20 22:54:46 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -8,18 +8,18 @@ DESCRIPTION="LogKit is an easy-to-use Java logging toolkit designed for secure,
 HOMEPAGE="http://avalon.apache.org/"
 SRC_URI="mirror://apache/avalon/logkit/v${PV}/LogKit-${PV}-src.tar.gz"
 COMMON_DEP="
-       javamail? (
-               dev-java/sun-jaf-bin
-               || (
-                       dev-java/sun-javamail-bin
-                       =dev-java/gnu-javamail-1.0*
-               )
-       )
-       jms? ( || (
-                       !ppc? ( dev-java/openjms )
-                       dev-java/sun-jms
-               )
-       )"
+	   javamail? (
+			   dev-java/sun-jaf-bin
+			   || (
+					   dev-java/sun-javamail-bin
+					   =dev-java/gnu-javamail-1.0*
+			   )
+	   )
+	   jms? ( || (
+					   !ppc? ( dev-java/openjms )
+					   dev-java/sun-jms
+			   )
+	   )"
 RDEPEND=">=virtual/jre-1.3
 	${COMMON_DEP}"
 
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1.ebuild
new file mode 100644
index 000000000000..b2f677a1649a
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2006 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.1 2006/12/20 22:54:46 betelgeuse Exp $
+
+inherit java-pkg-2 java-ant-2
+
+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 ~ppc ~ppc64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="2.0"
+IUSE="doc source test"
+
+COMMON_DEP="
+	dev-java/log4j
+	dev-java/sun-jms
+	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*
+	)
+	test? ( =dev-java/junit-3* dev-java/ant-tasks )
+	source? ( app-arch/zip )
+	dev-java/ant-core
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	xml-rewrite2.py -f build.xml \
+		-c -e available -a ignoresystemclasses -v "true" \
+		-a classpathref -v 'build.classpath'|| die
+
+	mkdir -p target/lib
+	cd target/lib
+	java-pkg_jar-from servletapi-2.4
+	java-pkg_jar-from sun-jms
+	java-pkg_jar-from sun-javamail
+	java-pkg_jar-from log4j
+}
+
+src_test() {
+	cd target/lib
+	java-pkg_jar-from junit
+	cd "${S}"
+	eant test
+}
+
+src_install() {
+	java-pkg_newjar target/*.jar
+	use doc && java-pkg_dojavadoc /dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/avalon-logkit/files/digest-avalon-logkit-2.1 b/dev-java/avalon-logkit/files/digest-avalon-logkit-2.1
new file mode 100644
index 000000000000..a40d200da378
--- /dev/null
+++ b/dev-java/avalon-logkit/files/digest-avalon-logkit-2.1
@@ -0,0 +1,3 @@
+MD5 fee6f5f2db70c320aafbfb4cc32c1c43 avalon-logkit-2.1-src.tar.gz 60218
+RMD160 03d42940610150390744a9e2bd546be4537a371e avalon-logkit-2.1-src.tar.gz 60218
+SHA256 a5f158a52db9acd58648ffe75a023f43c5cbb94d027bb2beccf4983614d4e155 avalon-logkit-2.1-src.tar.gz 60218