Bumping to support javamail virtual.

(Portage version: 2.1.3.19)

5 files changed, 135 insertions, 1 deletions

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 331e81f8ad40..ec93d5b18a7e 100644
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/avalon-logkit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.53 2007/08/21 19:29:50 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.54 2007/11/20 05:23:03 ali_bush Exp $
+
+*avalon-logkit-2.1-r2 (20 Nov 2007)
+*avalon-logkit-1.2-r3 (20 Nov 2007)
+
+  20 Nov 2007; <alistair@gentoo.org> +avalon-logkit-1.2-r3.ebuild,
+  +avalon-logkit-2.1-r2.ebuild:
+  Bumping to support javamail virtual.
 
   21 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
   avalon-logkit-2.1-r1.ebuild:
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2-r3.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2-r3.ebuild
new file mode 100644
index 000000000000..755ac32d3bad
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2007 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-r3.ebuild,v 1.1 2007/11/20 05:23:03 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc javamail jms source"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="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"
+COMMON_DEP="
+	javamail? (
+		dev-java/sun-jaf
+		java-virtuals/javamail
+	)
+	jms? ( dev-java/sun-jms )"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+
+# Doesn't like 1.6 changes to JDBC
+DEPEND="|| (
+		=virtual/jdk-1.5*
+		=virtual/jdk-1.4*
+	)
+	${COMMON_DEP}"
+
+LICENSE="Apache-1.1"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/LogKit-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	rm -rf "${S}/src/test/org"
+	cd "${S}/lib"
+
+	if use javamail; then
+		java-pkg_jar-from sun-jaf
+		java-pkg_jar-from --virtual javamail
+	fi
+
+	use jms && java-pkg_jar-from sun-jms
+
+}
+
+src_compile() {
+	# not generating api docs because we would
+	# need avalon-site otherwise
+	eant jar
+}
+
+src_install() {
+	java-pkg_dojar "${S}/build/lib/*.jar"
+	use doc && dohtml -r docs/*
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild
new file mode 100644
index 000000000000..72e2ffb448a1
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2007 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-r2.ebuild,v 1.1 2007/11/20 05:23:03 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc source test"
+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 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+LICENSE="Apache-2.0"
+SLOT="2.0"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/log4j
+	dev-java/sun-jms
+	java-virtuals/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.5*
+		=virtual/jdk-1.4*
+	)
+	test? (
+		=dev-java/junit-3*
+		dev-java/ant-junit
+	)
+	${COMMON_DEP}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	java-ant_ignore-system-classes
+
+	java-ant_xml-rewrite -f build.xml \
+		-c -e available -a classpathref -v 'build.classpath' || die
+
+	mkdir -p target/lib || die
+	cd target/lib || die
+	java-pkg_jar-from servletapi-2.4
+	java-pkg_jar-from sun-jms
+	java-pkg_jar-from --virtual javamail
+	java-pkg_jar-from log4j
+	java-pkg_filter-compiler jikes
+}
+
+src_test() {
+	java-pkg_jar-from --into target/lib junit
+	ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.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-1.2-r3 b/dev-java/avalon-logkit/files/digest-avalon-logkit-1.2-r3
new file mode 100644
index 000000000000..de6d03862951
--- /dev/null
+++ b/dev-java/avalon-logkit/files/digest-avalon-logkit-1.2-r3
@@ -0,0 +1,3 @@
+MD5 17ede0a7d297ad610b47c476757c2b96 LogKit-1.2-src.tar.gz 239132
+RMD160 76310c6d26c816f3fa6d33b3da326475c29ef495 LogKit-1.2-src.tar.gz 239132
+SHA256 63fce9268f21696b284a7e942925806bf733a0e4086f76f565c35c7df4d06a2c LogKit-1.2-src.tar.gz 239132
diff --git a/dev-java/avalon-logkit/files/digest-avalon-logkit-2.1-r2 b/dev-java/avalon-logkit/files/digest-avalon-logkit-2.1-r2
new file mode 100644
index 000000000000..a40d200da378
--- /dev/null
+++ b/dev-java/avalon-logkit/files/digest-avalon-logkit-2.1-r2
@@ -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