Version bump

(Portage version: 2.1.4.1)

2 files changed, 78 insertions, 2 deletions

diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index 732ebcd5aa7d..7e86bc065212 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.57 2007/11/28 07:35:56 ali_bush Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.58 2008/02/06 16:47:53 fordfrog Exp $
+
+*log4j-1.2.15 (06 Feb 2008)
+
+  06 Feb 2008; Miroslav Šulc <fordfrog@gentoo.org> +log4j-1.2.15.ebuild:
+  Version bump
 
   28 Nov 2007; <alistair@gentoo.org> log4j-1.2.14-r2.ebuild:
   Dropping ~arch's not keyworded in java-virtuals/javamail yet.
diff --git a/dev-java/log4j/log4j-1.2.15.ebuild b/dev-java/log4j/log4j-1.2.15.ebuild
new file mode 100644
index 000000000000..cdc0319d9327
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.15.ebuild
@@ -0,0 +1,71 @@
+# 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.ebuild,v 1.1 2008/02/06 16:47:53 fordfrog Exp $
+
+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-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# 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
+
+	if use doc ; then
+		java-pkg_dojavadoc site/apidocs
+		java-pkg_dohtml -r site/*
+		rm -fr "${D}/usr/share/doc/${P}/html/apidocs"
+		cd "${D}/usr/share/doc/${P}/html"
+		ln -s api apidocs
+		cd "${S}"
+	fi
+	use source && java-pkg_dosrc src/main/java/*
+}