Version bump.

(Portage version: 2.1_pre3-r1)

4 files changed, 66 insertions, 11 deletions

diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index 290b3d0d50a0..21368e5dbd25 100644
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/log4j
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.38 2006/01/08 22:13:19 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.39 2006/01/08 23:14:15 nichoj Exp $
+
+*log4j-1.2.13 (08 Jan 2006)
+
+  08 Jan 2006; Joshua Nichols <nichoj@gentoo.org> +log4j-1.2.13.ebuild:
+  Version bump.
 
   08 Jan 2006; Joshua Nichols <nichoj@gentoo.org> log4j-1.2.12.ebuild:
   Disabled jikes support due to bug #108819.
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index 1a76b64a3dd0..83a6588b2603 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 21f4347afd04aa23d59d807f7edb2927 ChangeLog 4671
 MD5 c7a6fa71142e97d11735ceccc088752b files/digest-log4j-1.2.11 73
 MD5 d30ee0a14e3537d3f518067d60130a47 files/digest-log4j-1.2.12 73
+MD5 37008eaacb6c8eaa46001bb4ba6538c9 files/digest-log4j-1.2.13 73
 MD5 d55e5a6d5e0b3b7044122df1b3c55830 files/digest-log4j-1.2.9 72
 MD5 66f688f3902333537517ca8743b019b6 log4j-1.2.11.ebuild 1797
 MD5 f9ae00ccc75c8a06b1511814dca9c143 log4j-1.2.12.ebuild 1987
+MD5 8c023cda4bdb083a953648bbcd3acae7 log4j-1.2.13.ebuild 1990
 MD5 9c63997323bb4971620df8065b8bc388 log4j-1.2.9.ebuild 1737
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDwY+zndWRXhKOboURAtFGAKDqF4pomrU5cj9zlyujeL1ucKYq+wCdGjwV
-/fXbwKr/GjLDP17fJPitzlI=
-=F8Et
------END PGP SIGNATURE-----
diff --git a/dev-java/log4j/files/digest-log4j-1.2.13 b/dev-java/log4j/files/digest-log4j-1.2.13
new file mode 100644
index 000000000000..9c817fad0d2f
--- /dev/null
+++ b/dev-java/log4j/files/digest-log4j-1.2.13
@@ -0,0 +1 @@
+MD5 080a645669672dd3fc22f0d8deaf06ac logging-log4j-1.2.13.tar.gz 2752053
diff --git a/dev-java/log4j/log4j-1.2.13.ebuild b/dev-java/log4j/log4j-1.2.13.ebuild
new file mode 100644
index 000000000000..d34fb9a12bb0
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.13.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.13.ebuild,v 1.1 2006/01/08 23:14:15 nichoj Exp $
+
+inherit java-pkg
+
+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 ~ppc ~ppc64 ~sparc ~x86"
+# jikes support disabled: bug #108819
+IUSE="doc javamail jms jmx source"
+
+RDEPEND=">=virtual/jre-1.4
+	javamail? ( dev-java/sun-javamail-bin dev-java/sun-jaf-bin )
+	jmx? ( dev-java/sun-jmx )
+	jms? ( =dev-java/openjms-bin-0.7.6 )"
+
+# 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
+	source? ( app-arch/zip )
+	${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	rm -rf dist/
+}
+
+src_compile() {
+	local antflags="jar"
+	use javamail && antflags="${antflags} -Djavamail.jar=$(java-pkg_getjar sun-javamail-bin mail.jar) -Dactivation.jar=$(java-pkg_getjar sun-jaf-bin 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"
+	ant ${antflags} || die "compilation error"
+}
+
+src_install() {
+	java-pkg_newjar dist/lib/${P}.jar ${PN}.jar
+
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc src/java/*
+}