dev-java/log4j: version bump

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

3 files changed, 80 insertions, 13 deletions

diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index 720addca9600..617fa7ad10ba 100644
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/log4j
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.82 2010/03/20 14:12:55 betelgeuse Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.83 2011/01/29 10:21:53 fordfrog Exp $
+
+*log4j-1.2.16 (29 Jan 2011)
+
+  29 Jan 2011; Miroslav Šulc <fordfrog@gentoo.org> +log4j-1.2.16.ebuild:
+  Version bump
 
   20 Mar 2010; Petteri Räty <betelgeuse@gentoo.org>
   -log4j-1.2.14-r1.ebuild, -log4j-1.2.15-r1.ebuild:
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index 1e483d0c05e6..523b42a53939 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST apache-log4j-1.2.15.tar.gz 2099264 RMD160 280adfcd45c291d5bd45fbc5d5a9b0585374e4e0 SHA1 d6daea1586b932b1e38dc3fbac68624372bec6db SHA256 f5d9f6aa78b9156ae2de2a32d0f26507d2e73db4993d501db2e79f0bd803ab31
+DIST apache-log4j-1.2.16.tar.gz 2791979 RMD160 b80cd2d55e10322e7903ffb355d36c93daceece6 SHA1 5d0547046eceedcd4bd9e816a93540dbf8f4ca93 SHA256 3a93ef38eb7ac9f851626d8b27cde7db1bfc78c1b587520fd740a0ab03e44c89
 EBUILD log4j-1.2.15-r2.ebuild 1747 RMD160 cd6183bc2236225f45493803d4d9c7623110139a SHA1 79ad115e4b0f49cd4dca39b4c8254a921dd8f13b SHA256 28a2eb486fc317add5413daf8ca429bc914b057be13349825cf97f0cfb896742
-MISC ChangeLog 10280 RMD160 a2e021ed676b9029034f7e79293fc65372640b94 SHA1 d5177233519cc8b30b469fe78516f4fb300bfab9 SHA256 5e1e91adf9fb1cd2ffbafacea98b6cb6516bc9e025b659a1554c6b57fb13f99e
+EBUILD log4j-1.2.16.ebuild 1845 RMD160 7571320a4e0ded5a684dccf6991d30c04e16c768 SHA1 38f83191b9496e666b52e9c896643110001af5f7 SHA256 70864329ec3dc4f53154f069a29481fe0815f013d92683419ab300962a9bc66e
+MISC ChangeLog 10397 RMD160 784fab367b3cc3beab4abbcb73463485f57d9777 SHA1 84aba911bce3a3e9f099d7fd94e88aab07844722 SHA256 e1f12a6b78a80e19e360d6d0a16ee0278105e1ed7be807dbb26056a0810c9fbf
 MISC metadata.xml 336 RMD160 8e73534440e5bab2c74a32fae436b9da50dcc0f6 SHA1 bcc0f5d89af0df96af4e1402adc3432f5ae82211 SHA256 7639c588f513ed8f1c2392e04ef8846157e7da5f11e8d1dfb111dc8a87dec152
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuk1+4ACgkQcxLzpIGCsLSygwCdHLC6J2XYky4nPT6qBKjbGECb
-EncAn0kVh/RV1kGayOYVE+kX/b0csYa6
-=VFG+
------END PGP SIGNATURE-----
diff --git a/dev-java/log4j/log4j-1.2.16.ebuild b/dev-java/log4j/log4j-1.2.16.ebuild
new file mode 100644
index 000000000000..220e506384f9
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.16.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.16.ebuild,v 1.1 2011/01/29 10:21:53 fordfrog 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 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+# 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}"
+
+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_BUILD_TARGET="log4j.jar"
+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() {
+	# the build still builds files with older version in name
+	java-pkg_newjar dist/lib/${PN}-1.2.15.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/*
+}