Changed jms and javamail dependencies to sun-jms and sun-javamail instead of -bin variants (merging changes from migrated-java-experimental-overlay), removed openjms and gnu-javamail variants for incompatible package names. Fixes bug #152597.

(Portage version: 2.1.2_pre3-r7)

5 files changed, 150 insertions, 1 deletions

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index eb3b1d763e9f..6e2e4b2730a4 100644
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,16 @@
 # 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.26 2006/10/17 03:15:36 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.27 2006/10/24 09:11:46 caster Exp $
+
+*avalon-logkit-2.0-r2 (24 Oct 2006)
+*avalon-logkit-1.2-r2 (24 Oct 2006)
+
+  24 Oct 2006; Vlastimil Babka <caster@gentoo.org>
+  +avalon-logkit-1.2-r2.ebuild, +avalon-logkit-2.0-r2.ebuild:
+  Changed jms and javamail dependencies to sun-jms and sun-javamail instead of
+  -bin variants (merging changes from migrated-java-experimental-overlay),
+  removed openjms and gnu-javamail variants for incompatible package names.
+  Fixes bug #152597.
 
   17 Oct 2006; Joshua Nichols <nichoj@gentoo.org>
   avalon-logkit-1.2-r1.ebuild, avalon-logkit-2.0-r1.ebuild:
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2-r2.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2-r2.ebuild
new file mode 100644
index 000000000000..e41134f198d5
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2-r2.ebuild
@@ -0,0 +1,60 @@
+# 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-r2.ebuild,v 1.1 2006/10/24 09:11:46 caster Exp $
+
+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
+		dev-java/sun-javamail
+	)
+	jms? ( dev-java/sun-jms )"
+RDEPEND=">=virtual/jre-1.3
+	${COMMON_DEP}"
+
+# Doesn't like 1.6 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="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="doc javamail jms source"
+
+S="${WORKDIR}/LogKit-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}/lib"
+	rm -f *.jar
+
+	if use javamail; then
+		java-pkg_jar-from sun-jaf
+		java-pkg_jar-from sun-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 -Djunit.jar=$(java-pkg_getjar --build-only 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-r2.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.0-r2.ebuild
new file mode 100644
index 000000000000..e52124b3c5c1
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.0-r2.ebuild
@@ -0,0 +1,73 @@
+# 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-r2.ebuild,v 1.1 2006/10/24 09:11:46 caster 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="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="2.0"
+IUSE="doc javamail jms source"
+COMMON_DEP="
+	dev-java/log4j
+	jms? ( dev-java/sun-jms )
+	javamail? (
+		dev-java/sun-jaf
+		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*
+	)
+	source? ( app-arch/zip )
+	dev-java/ant-core
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${P}.dev-0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# the build.xml file for ant
+	cp ${FILESDIR}/${PV}-build.xml ./build.xml
+
+	local libs="log4j,servletapi-2.4"
+	use jms && libs="${libs},sun-jms"
+	use javamail && libs="${libs},sun-jaf,sun-javamail"
+
+	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"
+		rm -rf jms || die "JMS Failure!"
+		rm -f ServletOutputLogTarget.java || die "JMS Failure!"
+	fi
+
+	if ! use javamail; then
+		einfo "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-r2 b/dev-java/avalon-logkit/files/digest-avalon-logkit-1.2-r2
new file mode 100644
index 000000000000..de6d03862951
--- /dev/null
+++ b/dev-java/avalon-logkit/files/digest-avalon-logkit-1.2-r2
@@ -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-r2 b/dev-java/avalon-logkit/files/digest-avalon-logkit-2.0-r2
new file mode 100644
index 000000000000..f3b61f61b52c
--- /dev/null
+++ b/dev-java/avalon-logkit/files/digest-avalon-logkit-2.0-r2
@@ -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