Use jms virtual instead of openjms for jms api.

(Portage version: 2.2_rc28/cvs/Linux i686)

2 files changed, 79 insertions, 1 deletions

diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index d6d9125f7c77..8e1335ba2425 100644
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/log4j
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.73 2009/05/18 19:49:37 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.74 2009/05/18 19:53:47 betelgeuse Exp $
+
+*log4j-1.2.15-r2 (18 May 2009)
+
+  18 May 2009; Petteri Räty <betelgeuse@gentoo.org>
+  +log4j-1.2.15-r2.ebuild:
+  Use jms virtual instead of openjms for jms api.
 
   18 May 2009; Petteri Räty <betelgeuse@gentoo.org> -log4j-1.2.15.ebuild:
   Remove old revision.
diff --git a/dev-java/log4j/log4j-1.2.15-r2.ebuild b/dev-java/log4j/log4j-1.2.15-r2.ebuild
new file mode 100644
index 000000000000..108120cda9a4
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.15-r2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.15-r2.ebuild,v 1.1 2009/05/18 19:53:47 betelgeuse Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc javamail jms jmx source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="apache-${P}"
+DESCRIPTION="A low-overhead robust logging package for Java"
+SRC_URI="mirror://apache/logging/${PN}/${PV}/${MY_P}.tar.gz"
+HOMEPAGE="http://logging.apache.org/log4j/"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+# jikes support disabled: bug #108819
+IUSE="doc javamail jms jmx source"
+
+CDEPEND="javamail? ( java-virtuals/javamail java-virtuals/jaf )
+		jmx? ( dev-java/sun-jmx:0 )
+		jms? ( java-virtuals/jms )"
+
+RDEPEND=">=virtual/jre-1.4
+		${CDEPEND}"
+
+# We should get log4j working with openjms but at the moment that would bring
+# a circular dependency.
+#	jms? ( || (=dev-java/openjms-0.7.6* =dev-java/openjms-bin-0.7.6* ))"
+
+DEPEND=">=virtual/jdk-1.4
+		${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+java_prepare() {
+	rm -rf dist/
+	java-pkg_filter-compiler jikes
+	rm -v *.jar || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+EANT_EXTRA_ARGS="-Djaxp-present=true"
+EANT_DOC_TARGET=""
+
+src_compile() {
+	if use javamail; then
+		EANT_GENTOO_CLASSPATH+="javamail,jaf"
+		EANT_EXTRA_ARGS+=" -Djavamail-present=true"
+	fi
+	if use jmx; then
+		use javamail && EANT_GENTOO_CLASSPATH+=","
+		EANT_GENTOO_CLASSPATH+="sun-jmx"
+		EANT_EXTRA_ARGS+=" -Djmx-present=true"
+	fi
+	if use jms; then
+		EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=$(java-pkg_getjars jms)"
+	fi
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_newjar dist/lib/${P}.jar ${PN}.jar
+
+	if use doc ; then
+		java-pkg_dohtml -r site/*
+		rm -fr "${D}/usr/share/doc/${PF}/html/apidocs"
+		java-pkg_dojavadoc --symlink apidocs site/apidocs
+	fi
+	use source && java-pkg_dosrc src/main/java/*
+}