Use jms virtual instead of openjms for jms api.

Package-Manager: portage-2.2_rc28/cvs/Linux i686

3 files changed, 84 insertions, 5 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/Manifest b/dev-java/log4j/Manifest
index 2bd304b02c53..9e825dd5ce8f 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -5,12 +5,13 @@ DIST apache-log4j-1.2.15.tar.gz 2099264 RMD160 280adfcd45c291d5bd45fbc5d5a9b0585
 DIST logging-log4j-1.2.14.tar.gz 2771881 RMD160 d640c0182deebe1aabf14105b7b89294601bacce SHA1 2365021f8f277e77e281b0e01333ecea7c721e3e SHA256 51e4fcb3c3677fcdb9fe45ca0f73378680537491c9c9e65a9b63c7f54678f90c
 EBUILD log4j-1.2.14-r1.ebuild 2203 RMD160 9645a72741ecbf6ded33bbe55470da76ab5b0dc4 SHA1 cd46504ba69a3f9d5f33ee3baa9d6b827fc8120d SHA256 cb81f2366f02c0b8b025e86356131eef6e258984fef0e92265990d509d8b2d5e
 EBUILD log4j-1.2.15-r1.ebuild 1924 RMD160 f3dc58a26a5ded2a5e36e0c77a253f29f5f2f7a8 SHA1 8d4dd379efe5fb96ec673a493dd3cd078b4ff052 SHA256 acce0a767fda53b89dd1de0015dfd0a1ad381f6379d401107ec28cb974c19495
-MISC ChangeLog 9199 RMD160 5410909ae54e6b8f0a950d4cac9c865a317191f5 SHA1 8e7b78c24e6500e851a37f5b05da3273ceb352ea SHA256 013c37a123ae19bf33f3c0b40bdcd295e61be82ef19763c79bf25c681240834c
+EBUILD log4j-1.2.15-r2.ebuild 1912 RMD160 dfba5e733b769d81bdccac98d4b1ba31ede34ce1 SHA1 2dd0dcfd4ffd76d9791059e56f0696ccf34e3e79 SHA256 51cb5829e19bccf24ab7721498809ffdc508d8baf486311ed292b5549fa68bb7
+MISC ChangeLog 9362 RMD160 10768c4e06d360546b12a9cad2fdb522f0a930c0 SHA1 be42bc7a545eadd01adcdcd9d05e9583a8908bff SHA256 5cd8180245a4d51e8193513809f8b1f224bbe8262d38b402235aac41bc4b6596
 MISC metadata.xml 336 RMD160 8e73534440e5bab2c74a32fae436b9da50dcc0f6 SHA1 bcc0f5d89af0df96af4e1402adc3432f5ae82211 SHA256 7639c588f513ed8f1c2392e04ef8846157e7da5f11e8d1dfb111dc8a87dec152
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoRu9MACgkQcxLzpIGCsLS1XQCeOJLI0fBKs1FTtvGM6W2CfyFY
-j4IAnR+/ogovWHbjz3kn+3xBtokfRQJB
-=roh8
+iEYEARECAAYFAkoRvM4ACgkQcxLzpIGCsLQzkACglG97fQbWTNHv0I19dKshdmuh
+p5cAnArg6N+3l9RyaCJ8pTdFMkSNaLde
+=yLfn
 -----END PGP SIGNATURE-----
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/*
+}