Use java-virtuals/jaf, fix LICENSE to Apache-2.0 and use java-pkg-2_src_compile.

Package-Manager: portage-2.1.5_rc6

3 files changed, 92 insertions, 2 deletions

diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index 1468abf18c17..b8676d081e02 100644
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/log4j
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.64 2008/04/04 01:01:32 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.65 2008/04/28 20:59:41 betelgeuse Exp $
+
+*log4j-1.2.15-r1 (28 Apr 2008)
+
+  28 Apr 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +log4j-1.2.15-r1.ebuild:
+  Use java-virtuals/jaf, fix LICENSE to Apache-2.0 and use
+  java-pkg-2_src_compile.
 
   04 Apr 2008; Kenneth Prugh <ken69267@gentoo.org> log4j-1.2.15.ebuild:
   amd64 stable, bug #214782
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index f832e1579ce8..e177b0ef6556 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST apache-log4j-1.2.15.tar.gz 2099264 RMD160 280adfcd45c291d5bd45fbc5d5a9b0585374e4e0 SHA1 d6daea1586b932b1e38dc3fbac68624372bec6db SHA256 f5d9f6aa78b9156ae2de2a32d0f26507d2e73db4993d501db2e79f0bd803ab31
 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.14-r2.ebuild 2225 RMD160 195da08465997b60f00d4e8bc85f47b2afa59a80 SHA1 894e173142b02de4d184c01942f1f4f097322523 SHA256 17c90ae9a7e57efad61e41e207cd62abf035464960c6cc465d2fe212ee903764
+EBUILD log4j-1.2.15-r1.ebuild 1888 RMD160 6055d4dea97b5edd5a37311edb187480f1cdeba3 SHA1 9c411107d12bf31f8bc7a7d44806b8d210a3ad38 SHA256 3e7d29cf9a00b578daeba1904ac5722bfafd11cdc65417b6d48bde3e36fa6bdc
 EBUILD log4j-1.2.15.ebuild 2398 RMD160 fb6cbf74ef6986a459d509326d86c7a77292f2d5 SHA1 1dc0b3becce9172890a89d9bebebc2b626d72999 SHA256 030f7518c2eb3a778ae6d8f706b8d9324e30cb5e5202a9dc60ae707fdc898baa
-MISC ChangeLog 8128 RMD160 7cb07751cca96a854e7fc87aaf95c4897cba9ae0 SHA1 e2407719cd481fa738e1168cd9808ca4d08f6150 SHA256 c19f8dab33a18be890d9cf65baaa1d0ad2f9e670ac37a64e1acb302f518d2497
+MISC ChangeLog 8328 RMD160 cd1455b262279b17fdc7ec508fa4c1f68d207d0a SHA1 ba3a4525418e7f0d170e6521c760e4faef9be16e SHA256 33ac826c7de146a61a0b89398eb7c3c7cf5fcf790b835321b228a436ab639b7d
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgWOrAACgkQcxLzpIGCsLTEMgCgheQQikn0b0a2Wdun3qIjap7q
+ZmQAn2ktsXJUdAdQbcBOYq1dIRDJKJFo
+=NNZJ
+-----END PGP SIGNATURE-----
diff --git a/dev-java/log4j/log4j-1.2.15-r1.ebuild b/dev-java/log4j/log4j-1.2.15-r1.ebuild
new file mode 100644
index 000000000000..8076335cc152
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.15-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2008 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-r1.ebuild,v 1.1 2008/04/28 20:59:41 betelgeuse Exp $
+
+EAPI=1
+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? ( =dev-java/openjms-bin-0.7.6 )"
+
+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}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	rm -rf dist/
+	java-pkg_filter-compiler jikes
+}
+
+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
+		EANT_GENTOO_CLASSPATH+=",sun-jmx"
+		EANT_EXTRA_ARGS+=" -Djmx-present=true"
+	fi
+	if use jms; then
+		EANT_EXTRA_ARGS+=" -Djms-present=true -Djms.jar=/opt/openjms/lib/jms-1.0.2a.jar"
+	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/*
+}