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.

Package-Manager: portage-2.1.2_rc3-r6

4 files changed, 110 insertions, 22 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/Manifest b/dev-java/avalon-logkit/Manifest
index 88c727dce440..e3da9823478b 100644
--- a/dev-java/avalon-logkit/Manifest
+++ b/dev-java/avalon-logkit/Manifest
@@ -1,13 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.0-build.xml 1931 RMD160 bec909f272841137ee864c05cee3f3c054a93ad0 SHA1 eed74be47d64917c56a8e175df037d4fa82cb5d3 SHA256 19a06dedbfd65a2e50d04f93335ab1ccc7ba9d6bc402503c1313274ed93121c5
 MD5 1d4fb92234d539c16377690ccc278dbb files/2.0-build.xml 1931
 RMD160 bec909f272841137ee864c05cee3f3c054a93ad0 files/2.0-build.xml 1931
 SHA256 19a06dedbfd65a2e50d04f93335ab1ccc7ba9d6bc402503c1313274ed93121c5 files/2.0-build.xml 1931
 DIST LogKit-1.2-src.tar.gz 239132 RMD160 76310c6d26c816f3fa6d33b3da326475c29ef495 SHA1 e5ed86b664bd67481948ad30548587a27cbc8d4a SHA256 63fce9268f21696b284a7e942925806bf733a0e4086f76f565c35c7df4d06a2c
 DIST avalon-logkit-2.0.dev-0-src.tar.gz 59466 RMD160 1442119fb23ed8f7e3c6fcfad39af88ed0e33d71 SHA1 621cf2ab62c70124d5a257137164674ba4626bcf SHA256 05cb4fa477871d07b494ac3e0b148cb089276afc4d10b2ad8f5414d8fa21d53a
-EBUILD avalon-logkit-1.2-r1.ebuild 1907 RMD160 29f8e0e60cde6739468f5c7f6fc9efce742c9325 SHA1 72f56ec45233091959d1eea8bc74991ca1f6ea41 SHA256 9e296d27129bd1ea2dbb6597fa07dd554e7f18bc871ba73cb85a814282b9c7e2
-MD5 9b08c2d52e60f78db8abaf2a45ee4cc7 avalon-logkit-1.2-r1.ebuild 1907
-RMD160 29f8e0e60cde6739468f5c7f6fc9efce742c9325 avalon-logkit-1.2-r1.ebuild 1907
-SHA256 9e296d27129bd1ea2dbb6597fa07dd554e7f18bc871ba73cb85a814282b9c7e2 avalon-logkit-1.2-r1.ebuild 1907
+DIST avalon-logkit-2.1-src.tar.gz 60218 RMD160 03d42940610150390744a9e2bd546be4537a371e SHA1 a1fc2054d375461b6781fa9b5274298d0b158c7a SHA256 a5f158a52db9acd58648ffe75a023f43c5cbb94d027bb2beccf4983614d4e155
+EBUILD avalon-logkit-1.2-r1.ebuild 1803 RMD160 a2eed2b765f92f67bffd0a1c7110eb2d862d38c5 SHA1 787b240a8a5a2347f9f6e1c238d399a5cd647700 SHA256 c68755c348888a204bab211d9b2dffbdd2650775c75ac7692a6c085d1201a09f
+MD5 c3e2baf709b3292f1c646b9986c9d6ab avalon-logkit-1.2-r1.ebuild 1803
+RMD160 a2eed2b765f92f67bffd0a1c7110eb2d862d38c5 avalon-logkit-1.2-r1.ebuild 1803
+SHA256 c68755c348888a204bab211d9b2dffbdd2650775c75ac7692a6c085d1201a09f avalon-logkit-1.2-r1.ebuild 1803
 EBUILD avalon-logkit-1.2-r2.ebuild 1424 RMD160 a70b215599ed1881a09e1eed7d29a297bbb49d47 SHA1 5f3f933378b8b964f7aa7793a3ad6d14f4655623 SHA256 62071143f63122fc2114939bc14f6837a77b7eb3e5cb3262c628f430787f240d
 MD5 506b304ccae69a3b751092ee48cfb2b9 avalon-logkit-1.2-r2.ebuild 1424
 RMD160 a70b215599ed1881a09e1eed7d29a297bbb49d47 avalon-logkit-1.2-r2.ebuild 1424
@@ -28,10 +32,14 @@ EBUILD avalon-logkit-2.0.ebuild 2363 RMD160 715bc16b1581009e28c1e8d45941fb3eb537
 MD5 12ed0d54677c5ae19389db59edbf884d avalon-logkit-2.0.ebuild 2363
 RMD160 715bc16b1581009e28c1e8d45941fb3eb537d46d avalon-logkit-2.0.ebuild 2363
 SHA256 cc6bbd1dc3620ca828db7506b1520ef90301398a590165d11d6fe9beaf3a29ae avalon-logkit-2.0.ebuild 2363
-MISC ChangeLog 3795 RMD160 762ee22da7a6a46425b3c676c8195439e3da5190 SHA1 a45ff589f80020dff3317ea705ed9644f95d327c SHA256 d558944e847fd881986553b2d6400318a049a9d22f1c4181d242ca4b467f9478
-MD5 727f714fcf4d5483a8dd5e87290dd9e1 ChangeLog 3795
-RMD160 762ee22da7a6a46425b3c676c8195439e3da5190 ChangeLog 3795
-SHA256 d558944e847fd881986553b2d6400318a049a9d22f1c4181d242ca4b467f9478 ChangeLog 3795
+EBUILD avalon-logkit-2.1.ebuild 1401 RMD160 76ecbe102854e10fd4d5e058306f9d0202629008 SHA1 d4b1d9a1da1efea2fc4b43fdaad2a3c0fb541242 SHA256 fb9fc8e06689090441066f52314b6fe9ce79fff183c7121d917ec4f49efa514a
+MD5 4c6bd9f5608f4a05251a678401fadf10 avalon-logkit-2.1.ebuild 1401
+RMD160 76ecbe102854e10fd4d5e058306f9d0202629008 avalon-logkit-2.1.ebuild 1401
+SHA256 fb9fc8e06689090441066f52314b6fe9ce79fff183c7121d917ec4f49efa514a avalon-logkit-2.1.ebuild 1401
+MISC ChangeLog 4090 RMD160 d2b473e8b88561b13585e73c9548054a9c3f317a SHA1 fbffc6fa88417b6fa56df202963c5ffd91f5d665 SHA256 100e2dac1db00cc624222530fba243c445e218582e456bfc21332c8d0a2d393b
+MD5 a87d3e729a423dac3fec136c6e15ec2d ChangeLog 4090
+RMD160 d2b473e8b88561b13585e73c9548054a9c3f317a ChangeLog 4090
+SHA256 100e2dac1db00cc624222530fba243c445e218582e456bfc21332c8d0a2d393b ChangeLog 4090
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -54,3 +62,13 @@ SHA256 02c6398115ffb6a9dd0427bc508d45afe4652ad590b34f01393cd76538a930a2 files/di
 MD5 7cbd49bfbba70d98bf56698822227c97 files/digest-avalon-logkit-2.0-r2 280
 RMD160 d974eca7896af7f551f5eafb530d23da24a5e8b4 files/digest-avalon-logkit-2.0-r2 280
 SHA256 02c6398115ffb6a9dd0427bc508d45afe4652ad590b34f01393cd76538a930a2 files/digest-avalon-logkit-2.0-r2 280
+MD5 aca53784896d9411474d17b63601c55a files/digest-avalon-logkit-2.1 262
+RMD160 0d222afb4ee150800d8189c0f0f64f2958370b1f files/digest-avalon-logkit-2.1 262
+SHA256 4ffa59089d71ef1974924cb003620be3cb0127c5a6583badae4ae8e3f0263ef7 files/digest-avalon-logkit-2.1 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFicArcxLzpIGCsLQRAklrAJ4prOUg8cRBAKvwJwX5FoVedWtIpACbB8EV
+yLe5EK2lhBwtIuiqSaYKlqU=
+=ESK7
+-----END PGP SIGNATURE-----
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/*
+}