summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Bush <ali_bush@gentoo.org>2007-11-20 05:27:33 +0000
committerAlistair Bush <ali_bush@gentoo.org>2007-11-20 05:27:33 +0000
commit803447a173e4cd1d36f3d10c8381d3ae12a1d6e4 (patch)
tree3f981844a3a24262a7cadde4d2101b8f7e165a01 /dev-java
parentStable on mips, per #195253. (diff)
downloadhistorical-803447a173e4cd1d36f3d10c8381d3ae12a1d6e4.tar.gz
historical-803447a173e4cd1d36f3d10c8381d3ae12a1d6e4.tar.bz2
historical-803447a173e4cd1d36f3d10c8381d3ae12a1d6e4.zip
Bumping to support javamail virtual.
Package-Manager: portage-2.1.3.19
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/avalon-logkit/ChangeLog9
-rw-r--r--dev-java/avalon-logkit/avalon-logkit-1.2-r3.ebuild58
-rw-r--r--dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild63
-rw-r--r--dev-java/avalon-logkit/files/digest-avalon-logkit-1.2-r33
-rw-r--r--dev-java/avalon-logkit/files/digest-avalon-logkit-2.1-r23
-rw-r--r--dev-java/bcmail/ChangeLog7
-rw-r--r--dev-java/bcmail/bcmail-1.37-r1.ebuild53
-rw-r--r--dev-java/bcmail/files/digest-bcmail-1.37-r13
-rw-r--r--dev-java/excalibur-logger/ChangeLog7
-rw-r--r--dev-java/excalibur-logger/excalibur-logger-2.1-r1.ebuild55
-rw-r--r--dev-java/excalibur-logger/files/digest-excalibur-logger-2.1-r13
-rw-r--r--dev-java/jax-rpc/ChangeLog7
-rw-r--r--dev-java/jax-rpc/files/digest-jax-rpc-1.1.3.01-r13
-rw-r--r--dev-java/jax-rpc/jax-rpc-1.1.3.01-r1.ebuild82
-rw-r--r--dev-java/log4j/ChangeLog7
-rw-r--r--dev-java/log4j/files/digest-log4j-1.2.14-r23
-rw-r--r--dev-java/log4j/log4j-1.2.14-r2.ebuild65
17 files changed, 426 insertions, 5 deletions
diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 331e81f8ad40..ec93d5b18a7e 100644
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-java/avalon-logkit
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.53 2007/08/21 19:29:50 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.54 2007/11/20 05:23:03 ali_bush Exp $
+
+*avalon-logkit-2.1-r2 (20 Nov 2007)
+*avalon-logkit-1.2-r3 (20 Nov 2007)
+
+ 20 Nov 2007; <alistair@gentoo.org> +avalon-logkit-1.2-r3.ebuild,
+ +avalon-logkit-2.1-r2.ebuild:
+ Bumping to support javamail virtual.
21 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
avalon-logkit-2.1-r1.ebuild:
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2-r3.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2-r3.ebuild
new file mode 100644
index 000000000000..755ac32d3bad
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2-r3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2007 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-r3.ebuild,v 1.1 2007/11/20 05:23:03 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc javamail jms source"
+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
+ java-virtuals/javamail
+ )
+ jms? ( dev-java/sun-jms )"
+RDEPEND=">=virtual/jre-1.4
+ ${COMMON_DEP}"
+
+# Doesn't like 1.6 changes to JDBC
+DEPEND="|| (
+ =virtual/jdk-1.5*
+ =virtual/jdk-1.4*
+ )
+ ${COMMON_DEP}"
+
+LICENSE="Apache-1.1"
+SLOT="1.2"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+S="${WORKDIR}/LogKit-${PV}"
+
+src_unpack() {
+ unpack ${A}
+ rm -rf "${S}/src/test/org"
+ cd "${S}/lib"
+
+ if use javamail; then
+ java-pkg_jar-from sun-jaf
+ java-pkg_jar-from --virtual 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
+}
+
+src_install() {
+ java-pkg_dojar "${S}/build/lib/*.jar"
+ use doc && dohtml -r docs/*
+ use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild
new file mode 100644
index 000000000000..72e2ffb448a1
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2007 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.1-r2.ebuild,v 1.1 2007/11/20 05:23:03 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc source test"
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Easy-to-use Java logging toolkit"
+HOMEPAGE="http://avalon.apache.org/"
+SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+LICENSE="Apache-2.0"
+SLOT="2.0"
+IUSE=""
+
+COMMON_DEP="
+ dev-java/log4j
+ dev-java/sun-jms
+ java-virtuals/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.5*
+ =virtual/jdk-1.4*
+ )
+ test? (
+ =dev-java/junit-3*
+ dev-java/ant-junit
+ )
+ ${COMMON_DEP}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ java-ant_ignore-system-classes
+
+ java-ant_xml-rewrite -f build.xml \
+ -c -e available -a classpathref -v 'build.classpath' || die
+
+ mkdir -p target/lib || die
+ cd target/lib || die
+ java-pkg_jar-from servletapi-2.4
+ java-pkg_jar-from sun-jms
+ java-pkg_jar-from --virtual javamail
+ java-pkg_jar-from log4j
+ java-pkg_filter-compiler jikes
+}
+
+src_test() {
+ java-pkg_jar-from --into target/lib junit
+ ANT_TASKS="ant-junit" eant test
+}
+
+src_install() {
+ java-pkg_newjar target/${P}.jar
+ use doc && java-pkg_dojavadoc dist/docs/api
+ use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/avalon-logkit/files/digest-avalon-logkit-1.2-r3 b/dev-java/avalon-logkit/files/digest-avalon-logkit-1.2-r3
new file mode 100644
index 000000000000..de6d03862951
--- /dev/null
+++ b/dev-java/avalon-logkit/files/digest-avalon-logkit-1.2-r3
@@ -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.1-r2 b/dev-java/avalon-logkit/files/digest-avalon-logkit-2.1-r2
new file mode 100644
index 000000000000..a40d200da378
--- /dev/null
+++ b/dev-java/avalon-logkit/files/digest-avalon-logkit-2.1-r2
@@ -0,0 +1,3 @@
+MD5 fee6f5f2db70c320aafbfb4cc32c1c43 avalon-logkit-2.1-src.tar.gz 60218
+RMD160 03d42940610150390744a9e2bd546be4537a371e avalon-logkit-2.1-src.tar.gz 60218
+SHA256 a5f158a52db9acd58648ffe75a023f43c5cbb94d027bb2beccf4983614d4e155 avalon-logkit-2.1-src.tar.gz 60218
diff --git a/dev-java/bcmail/ChangeLog b/dev-java/bcmail/ChangeLog
index 94682ce627b3..db659177c64c 100644
--- a/dev-java/bcmail/ChangeLog
+++ b/dev-java/bcmail/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/bcmail
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/ChangeLog,v 1.14 2007/10/15 14:07:12 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/ChangeLog,v 1.15 2007/11/20 05:24:13 ali_bush Exp $
+
+*bcmail-1.37-r1 (20 Nov 2007)
+
+ 20 Nov 2007; <alistair@gentoo.org> +bcmail-1.37-r1.ebuild:
+ Bumping to support javamail virtual.
15 Oct 2007; Markus Rothe <corsair@gentoo.org> bcmail-1.37.ebuild:
Stable on ppc64
diff --git a/dev-java/bcmail/bcmail-1.37-r1.ebuild b/dev-java/bcmail/bcmail-1.37-r1.ebuild
new file mode 100644
index 000000000000..06e2285901a9
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.37-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/bcmail/bcmail-1.37-r1.ebuild,v 1.1 2007/11/20 05:24:13 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="${PN}-jdk14-${PV/./}"
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+COMMON_DEPEND="~dev-java/bcprov-${PV}
+ dev-java/junit
+ dev-java/sun-jaf
+ java-virtuals/javamail"
+DEPEND=">=virtual/jdk-1.4
+ app-arch/unzip
+ ${COMMON_DEPEND}"
+RDEPEND=">=virtual/jre-1.4
+ ${COMMON_DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ unpack ./src.zip
+}
+
+src_compile() {
+ mkdir "${S}/classes"
+
+ find org -name "*.java" > "${T}/src.list"
+ ejavac -d "${S}/classes" \
+ -classpath $(java-pkg_getjars bcprov,junit,sun-jaf,javamail) \
+ "@${T}/src.list"
+
+ cd "${S}/classes"
+ jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+}
+
+src_install() {
+ java-pkg_dojar "${S}/${PN}.jar"
+
+ use source && java-pkg_dosrc org
+ use doc && java-pkg_dojavadoc docs
+}
diff --git a/dev-java/bcmail/files/digest-bcmail-1.37-r1 b/dev-java/bcmail/files/digest-bcmail-1.37-r1
new file mode 100644
index 000000000000..dc0e4eb8895b
--- /dev/null
+++ b/dev-java/bcmail/files/digest-bcmail-1.37-r1
@@ -0,0 +1,3 @@
+MD5 b802105780c4a464a3ed2d056911bf1e bcmail-jdk14-137.tar.gz 383382
+RMD160 fde025a6e68d8a12a1649279345a084e5014b505 bcmail-jdk14-137.tar.gz 383382
+SHA256 f13a04a83ed33232d23e223e4e8987486615ff0a960ddd81d5e04de8d327de4d bcmail-jdk14-137.tar.gz 383382
diff --git a/dev-java/excalibur-logger/ChangeLog b/dev-java/excalibur-logger/ChangeLog
index 2e915ec0913f..147b025c0d1a 100644
--- a/dev-java/excalibur-logger/ChangeLog
+++ b/dev-java/excalibur-logger/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/excalibur-logger
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/excalibur-logger/ChangeLog,v 1.3 2007/04/13 01:18:26 ali_bush Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/excalibur-logger/ChangeLog,v 1.4 2007/11/20 05:27:33 ali_bush Exp $
+
+*excalibur-logger-2.1-r1 (20 Nov 2007)
+
+ 20 Nov 2007; <alistair@gentoo.org> +excalibur-logger-2.1-r1.ebuild:
+ Bumping to support javamail virtual.
13 Apr 2007; Alistair John Bush <ali_bush@gentoo.org>
excalibur-logger-2.1.ebuild:
diff --git a/dev-java/excalibur-logger/excalibur-logger-2.1-r1.ebuild b/dev-java/excalibur-logger/excalibur-logger-2.1-r1.ebuild
new file mode 100644
index 000000000000..a3f99e45c319
--- /dev/null
+++ b/dev-java/excalibur-logger/excalibur-logger-2.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/excalibur-logger/excalibur-logger-2.1-r1.ebuild,v 1.1 2007/11/20 05:27:33 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Logger from the Excalibur containerkit"
+HOMEPAGE="http://excalibur.apache.org/containerkit.html"
+SRC_URI="mirror://apache/${PN//-logger}/${PN}/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+# Needs 2.1 of avalon-logkit
+# which does not have the jms and javamail use flags
+# that are needed for this package to build
+CDEP="
+ =dev-java/avalon-logkit-2.1*
+ =dev-java/avalon-framework-4.2*
+ dev-java/log4j
+ =dev-java/servletapi-2.4*
+ java-virtuals/javamail
+ dev-java/sun-jms"
+
+RDEPEND=">=virtual/jre-1.4
+ ${CDEP}"
+
+DEPEND=">=virtual/jdk-1.4
+ dev-java/ant-core
+ ${CDEP}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ mkdir -p target/lib
+ cd target/lib
+ java-pkg_jar-from avalon-logkit-2.0
+ java-pkg_jar-from avalon-framework-4.2
+ java-pkg_jar-from log4j
+ java-pkg_jar-from servletapi-2.4
+ java-pkg_jar-from --virtual javamail
+ java-pkg_jar-from sun-jms
+}
+
+src_install() {
+ java-pkg_newjar target/${P}.jar
+ dodoc NOTICE.txt
+ use doc && java-pkg_dojavadoc dist/docs/api
+ use source && java-pkg_dosrc src/java/*
+}
diff --git a/dev-java/excalibur-logger/files/digest-excalibur-logger-2.1-r1 b/dev-java/excalibur-logger/files/digest-excalibur-logger-2.1-r1
new file mode 100644
index 000000000000..bd29b1983534
--- /dev/null
+++ b/dev-java/excalibur-logger/files/digest-excalibur-logger-2.1-r1
@@ -0,0 +1,3 @@
+MD5 af99365d9b99596ab3b1a4c531c5643f excalibur-logger-2.1-src.tar.gz 45812
+RMD160 9440e1510fd2e803bdc4ec4a0ce7f5c846814605 excalibur-logger-2.1-src.tar.gz 45812
+SHA256 7e32a772fb595b49eb6c24e861b10ad25b0407e13a7af8b9fbc26a42848bd2b1 excalibur-logger-2.1-src.tar.gz 45812
diff --git a/dev-java/jax-rpc/ChangeLog b/dev-java/jax-rpc/ChangeLog
index 1067e6e47638..fcd320322292 100644
--- a/dev-java/jax-rpc/ChangeLog
+++ b/dev-java/jax-rpc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/jax-rpc
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jax-rpc/ChangeLog,v 1.7 2007/11/15 00:49:17 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jax-rpc/ChangeLog,v 1.8 2007/11/20 05:26:23 ali_bush Exp $
+
+*jax-rpc-1.1.3.01-r1 (20 Nov 2007)
+
+ 20 Nov 2007; <alistair@gentoo.org> +jax-rpc-1.1.3.01-r1.ebuild:
+ Bumping to support javamail virtual.
15 Nov 2007; Petteri Räty <betelgeuse@gentoo.org>
jax-rpc-1.1.3.01.ebuild:
diff --git a/dev-java/jax-rpc/files/digest-jax-rpc-1.1.3.01-r1 b/dev-java/jax-rpc/files/digest-jax-rpc-1.1.3.01-r1
new file mode 100644
index 000000000000..450b73ec5400
--- /dev/null
+++ b/dev-java/jax-rpc/files/digest-jax-rpc-1.1.3.01-r1
@@ -0,0 +1,3 @@
+MD5 74dd8c5c740a6ea444212061eaa85292 jax-rpc-1.1.3.01.tar.bz2 763737
+RMD160 08821b69d431e1a59ca5d0018cd5d28a13d8b8ff jax-rpc-1.1.3.01.tar.bz2 763737
+SHA256 54d29016732aefb35892b98a7393a8d47061e37933e8387292fd103d2488542e jax-rpc-1.1.3.01.tar.bz2 763737
diff --git a/dev-java/jax-rpc/jax-rpc-1.1.3.01-r1.ebuild b/dev-java/jax-rpc/jax-rpc-1.1.3.01-r1.ebuild
new file mode 100644
index 000000000000..fb9cbb0e9627
--- /dev/null
+++ b/dev-java/jax-rpc/jax-rpc-1.1.3.01-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jax-rpc/jax-rpc-1.1.3.01-r1.ebuild,v 1.1 2007/11/20 05:26:23 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Reference Implementation of JAX-RPC, the Java APIs for XML based RPC"
+HOMEPAGE="http://jax-rpc.dev.java.net/"
+# CVS: cvs -d :pserver:guest@cvs.dev.java.net:/cvs checkout -r JAXRPC_1_1_3_01_PKG_081806 jax-rpc/jaxrpc-ri
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEP="=dev-java/servletapi-2.4*
+ dev-java/fastinfoset
+ dev-java/jaxp
+ dev-java/jsr67
+ dev-java/jsr101
+ dev-java/jsr173
+ dev-java/relaxng-datatype
+ dev-java/saaj
+ dev-java/sax
+ dev-java/sun-jaf
+ java-virtuals/javamail
+ dev-java/xsdlib
+ >=dev-java/xerces-2.8"
+RDEPEND=">=virtual/jre-1.5
+ ${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+ ${COMMON_DEP}"
+
+EANT_BUILD_TARGET="image"
+EANT_DOC_TARGET="javadocs"
+EANT_EXTRA_ARGS="-Djava.mail=lib/mail.jar"
+
+S="${WORKDIR}/jaxrpc-ri"
+
+src_unpack() {
+
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-length.patch"
+
+ cd "${S}/lib"
+
+ java-pkg_jar-from --build-only ant-core
+ java-pkg_jar-from fastinfoset fastinfoset.jar FastInfoset.jar
+ java-pkg_jar-from jaxp
+ java-pkg_jar-from jsr67 jsr67.jar saaj-api.jar
+ java-pkg_jar-from jsr101
+ java-pkg_jar-from jsr173 jsr173.jar jsr173_api.jar
+ java-pkg_jar-from relaxng-datatype
+ java-pkg_jar-from saaj saaj.jar saaj-impl.jar
+ java-pkg_jar-from sax
+ java-pkg_jar-from servletapi-2.4 servlet-api.jar servlet.jar
+ java-pkg_jar-from sun-jaf
+ java-pkg_jar-from --virtual javamail
+ java-pkg_jar-from xsdlib
+ java-pkg_jar-from xerces-2
+
+ cd "${S}/src"
+ find . -name '*.java' -exec sed -i \
+ -e 's,com.sun.org.apache.xerces.internal,org.apache.xerces,g' \
+ {} \;
+
+}
+
+src_install() {
+
+ java-pkg_dojar "build/lib/jaxrpc-spi.jar"
+ java-pkg_dojar "build/lib/jaxrpc-impl.jar"
+
+ use doc && java-pkg_dojavadoc build/javadocs
+ use source && java-pkg_dosrc src
+
+}
diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index ae1ecdb4ed43..b7863085ef1f 100644
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/log4j
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.55 2007/07/24 08:40:41 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.56 2007/11/20 05:25:22 ali_bush Exp $
+
+*log4j-1.2.14-r2 (20 Nov 2007)
+
+ 20 Nov 2007; <alistair@gentoo.org> +log4j-1.2.14-r2.ebuild:
+ Bumping to support javamail virtual.
24 Jul 2007; Christian Faulhammer <opfer@gentoo.org>
log4j-1.2.14-r1.ebuild:
diff --git a/dev-java/log4j/files/digest-log4j-1.2.14-r2 b/dev-java/log4j/files/digest-log4j-1.2.14-r2
new file mode 100644
index 000000000000..7747cfecca5a
--- /dev/null
+++ b/dev-java/log4j/files/digest-log4j-1.2.14-r2
@@ -0,0 +1,3 @@
+MD5 7d8d02888b93e6f8d67b8e5f746196ae logging-log4j-1.2.14.tar.gz 2771881
+RMD160 d640c0182deebe1aabf14105b7b89294601bacce logging-log4j-1.2.14.tar.gz 2771881
+SHA256 51e4fcb3c3677fcdb9fe45ca0f73378680537491c9c9e65a9b63c7f54678f90c logging-log4j-1.2.14.tar.gz 2771881
diff --git a/dev-java/log4j/log4j-1.2.14-r2.ebuild b/dev-java/log4j/log4j-1.2.14-r2.ebuild
new file mode 100644
index 000000000000..2332da0e9cf0
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.14-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.14-r2.ebuild,v 1.1 2007/11/20 05:25:22 ali_bush Exp $
+
+JAVA_PKG_IUSE="doc javamail jms jmx source"
+
+inherit java-pkg-2 java-ant-2
+
+MY_P="logging-${P}"
+DESCRIPTION="A low-overhead robust logging package for Java"
+SRC_URI="mirror://apache/logging/log4j/${PV}/${MY_P}.tar.gz"
+HOMEPAGE="http://logging.apache.org/log4j/"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+# jikes support disabled: bug #108819
+IUSE="doc javamail jms jmx source"
+
+CDEPEND="javamail? ( java-virtuals/javamail dev-java/sun-jaf )
+ jmx? ( dev-java/sun-jmx )
+ 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* ))"
+
+# Needs the a newer ant-core because otherwise source 1.1 and target 1.1 fails
+# on at least blackdown-jdk-1.4.2.02. The other way to go around this is to
+# explicitly set the javac.source and javac.target properties in the ebuild.
+
+DEPEND=">=virtual/jdk-1.4
+ >=dev-java/ant-core-1.6.5
+ ${CDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ rm -rf dist/
+ # Takes javamail from system env without this
+ xml-rewrite.py -f build.xml -c -e available -a ignoresystemclasses -v "true"
+ java-pkg_filter-compiler jikes
+}
+
+src_compile() {
+ # Because we depend on >=1.4 we always have jaxp
+ local antflags="jar -Djaxp-present=true"
+ use javamail && antflags="${antflags} -Djavamail.jar=$(java-pkg_getjar javamail mail.jar) -Dactivation.jar=$(java-pkg_getjar sun-jaf activation.jar)"
+ use jmx && antflags="${antflags} -Djmx.jar=$(java-pkg_getjar sun-jmx jmxri.jar) -Djmx-extra.jar=$(java-pkg_getjar sun-jmx jmxtools.jar)"
+ #use jms && antflags="${antflags} -Djms.jar=$(java-pkg_getjar openjms jms.jar)"
+ use jms && antflags="${antflags} -Djms.jar=/opt/openjms/lib/jms-1.0.2a.jar"
+ eant ${antflags}
+}
+
+src_install() {
+ java-pkg_newjar dist/lib/${P}.jar ${PN}.jar
+
+ use doc && dohtml -r docs/*
+ use source && java-pkg_dosrc src/java/*
+}