Revision bumps to support new Java system.

(Portage version: 2.1.1_pre1)

7 files changed, 189 insertions, 1 deletions

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 718b6cd08dd9..b3f34c80a7a7 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.22 2006/01/05 12:57:15 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.23 2006/07/02 20:47:09 nichoj Exp $
+
+  02 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
+  +avalon-logkit-1.2-r1.ebuild, +avalon-logkit-2.0-r1.ebuild:
+  Revision bumps to support new Java system.
 
   05 Jan 2006; Petteri Räty <betelgeuse@gentoo.org>
   avalon-logkit-1.2.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
new file mode 100644
index 000000000000..e23ad8af154d
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2-r1.ebuild
@@ -0,0 +1,75 @@
+# 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.1 2006/07/02 20:47:09 nichoj Exp $
+
+inherit java-pkg-2 java-ant-2
+
+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"
+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
+               )
+       )"
+RDEPEND=">=virtual/jre-1.3
+	${COMMON_DEP}"
+
+# Doesn't like 1.5 changes to JDBC
+DEPEND="|| (
+		=virtual/jdk-1.3*
+		=virtual/jdk-1.4*
+		=virtual/jdk-1.5*
+	)
+	dev-java/ant-core
+	dev-java/junit
+	source? ( app-arch/zip )
+	${COMMON_DEP}"
+
+LICENSE="Apache-1.1"
+SLOT="1.2"
+KEYWORDS="~x86 ~amd64 ~ppc64 ~sparc ~ppc"
+IUSE="doc javamail jms source"
+
+S=${WORKDIR}/LogKit-${PV}
+
+ant_src_unpack() {
+	unpack ${A}
+	cd ${S}/lib
+	rm -f *.jar
+
+	# decide which mail implementation we use
+	if use javamail; then
+		java-pkg_jar-from sun-jaf-bin
+		if has_version dev-java/gnu-javamail; then
+			java-pkg_jar-from gnu-javamail-1
+		elif has_version dev-java/sun-javamail-bin; then
+			java-pkg_jar-from sun-javamail-bin
+		fi
+	fi
+
+	# decide which jms implementation we use
+	if use jms; then
+		java-pkg_jar-from jms
+	fi
+}
+
+src_compile() {
+	# not generating api docs because we would 
+	# need avalon-site otherwise
+	eant jar -Djunit.jar=$(java-pkg_getjar junit junit.jar)
+}
+
+src_install() {
+	java-pkg_dojar ${S}/build/lib/*.jar
+	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-r1.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.0-r1.ebuild
new file mode 100644
index 000000000000..473a753fa354
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.0-r1.ebuild
@@ -0,0 +1,99 @@
+# 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.0-r1.ebuild,v 1.1 2006/07/02 20:47:09 nichoj Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Easy-to-use Java logging toolkit"
+HOMEPAGE="http://avalon.apache.org/"
+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 jms javamail source"
+COMMON_DEP="
+		dev-java/log4j
+		jms? ( || (
+			dev-java/sun-jms
+			!ppc? ( dev-java/openjms )
+			)
+		)
+		javamail? ( || (
+				=dev-java/gnu-javamail-1.0*
+				dev-java/sun-javamail-bin
+			)
+		)
+		=dev-java/servletapi-2.4*"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+# Doesn't like 1.5 changes to JDBC
+DEPEND="|| (
+		=virtual/jdk-1.3*
+		=virtual/jdk-1.4*
+		=virtual/jdk-1.5*
+	)
+	source? ( app-arch/zip )
+	dev-java/ant-core
+	dev-java/junit
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${P}.dev-0
+
+ant_src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# the build.xml file for ant
+	cp ${FILESDIR}/${PV}-build.xml ./build.xml
+
+	# decide which mail implementation we use
+	local javamail=""
+	if use javamail; then
+		if has_version dev-java/gnu-javamail; then
+			javamail="gnu-javamail-1"
+		elif has_version dev-java/sun-javamail-bin; then
+			javamail="sun-javamail-bin"
+		fi
+	fi
+
+	# decide which jms implementation we use
+	local jms=""
+	if use jms; then
+		if has_version dev-java/openjms; then
+			jms="openjms"
+		elif has_version dev-java/sun-jms; then
+			jms="sun-jms"
+		fi
+	fi
+
+	local libs="log4j,servletapi-2.4"
+	use jms && libs="${libs},${jms}"
+	use javamail && libs="${libs},${javamail}"
+
+	echo "classpath=$(java-pkg_getjars ${libs})" > build.properties
+
+	cd ${S}/src/java/org/apache/log/output/
+
+	if ! use jms; then
+		echo "Removing jms related files"
+		rm -rf jms || die "JMS Failure!"
+		rm -f ServletOutputLogTarget.java || die "JMS Failure!"
+	fi
+
+	if ! use javamail; then
+		echo "Removing javamail related files"
+		rm -rf net || die "JavaMail Failure!"
+	fi
+}
+
+src_compile() {
+	eant $(use_doc) jar
+}
+
+src_install() {
+	java-pkg_dojar ${S}/dist/avalon-logkit.jar || die "Install Failed!"
+
+	dodoc README.txt LICENSE.txt
+	use doc && java-pkg_dohtml -r ${S}/dist/docs/*
+	use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/avalon-logkit/files/digest-avalon-logkit-1.2 b/dev-java/avalon-logkit/files/digest-avalon-logkit-1.2
index 95649c6de514..de6d03862951 100644
--- a/dev-java/avalon-logkit/files/digest-avalon-logkit-1.2
+++ b/dev-java/avalon-logkit/files/digest-avalon-logkit-1.2
@@ -1 +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-1.2-r1 b/dev-java/avalon-logkit/files/digest-avalon-logkit-1.2-r1
new file mode 100644
index 000000000000..de6d03862951
--- /dev/null
+++ b/dev-java/avalon-logkit/files/digest-avalon-logkit-1.2-r1
@@ -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.0 b/dev-java/avalon-logkit/files/digest-avalon-logkit-2.0
index bb30207dc871..f3b61f61b52c 100644
--- a/dev-java/avalon-logkit/files/digest-avalon-logkit-2.0
+++ b/dev-java/avalon-logkit/files/digest-avalon-logkit-2.0
@@ -1 +1,3 @@
 MD5 fded0316383d82b1cee4c799876f56d5 avalon-logkit-2.0.dev-0-src.tar.gz 59466
+RMD160 1442119fb23ed8f7e3c6fcfad39af88ed0e33d71 avalon-logkit-2.0.dev-0-src.tar.gz 59466
+SHA256 05cb4fa477871d07b494ac3e0b148cb089276afc4d10b2ad8f5414d8fa21d53a avalon-logkit-2.0.dev-0-src.tar.gz 59466
diff --git a/dev-java/avalon-logkit/files/digest-avalon-logkit-2.0-r1 b/dev-java/avalon-logkit/files/digest-avalon-logkit-2.0-r1
new file mode 100644
index 000000000000..f3b61f61b52c
--- /dev/null
+++ b/dev-java/avalon-logkit/files/digest-avalon-logkit-2.0-r1
@@ -0,0 +1,3 @@
+MD5 fded0316383d82b1cee4c799876f56d5 avalon-logkit-2.0.dev-0-src.tar.gz 59466
+RMD160 1442119fb23ed8f7e3c6fcfad39af88ed0e33d71 avalon-logkit-2.0.dev-0-src.tar.gz 59466
+SHA256 05cb4fa477871d07b494ac3e0b148cb089276afc4d10b2ad8f5414d8fa21d53a avalon-logkit-2.0.dev-0-src.tar.gz 59466