From fa08a86dffa51ef920c03b19f3f9aced3eefcb4e Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Sat, 4 Apr 2015 00:46:39 +0000 Subject: [PATCH] Version and EAPI 5 bump. Fix bug 530818. Signed-off-by: monsieurp@gentoo.org Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x93491BB8 --- dev-java/log4j/ChangeLog | 9 +++- dev-java/log4j/Manifest | 18 ++++--- dev-java/log4j/log4j-1.2.17.ebuild | 80 ++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 dev-java/log4j/log4j-1.2.17.ebuild diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog index a1eb69c8de9c..4ff7d01d52f8 100644 --- a/dev-java/log4j/ChangeLog +++ b/dev-java/log4j/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/log4j -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.94 2014/08/02 16:51:16 sera Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.95 2015/04/04 00:46:30 monsieurp Exp $ + +*log4j-1.2.17 (04 Apr 2015) + + 04 Apr 2015; Patrice Clement +log4j-1.2.17.ebuild: + Version and EAPI 5 bump. Fix bug 530818. 02 Aug 2014; Ralph Sennhauser -log4j-1.2.15-r2.ebuild: Remove old diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest index d0b0df063cd2..fb0a0f5fefe8 100644 --- a/dev-java/log4j/Manifest +++ b/dev-java/log4j/Manifest @@ -2,17 +2,19 @@ Hash: SHA256 DIST apache-log4j-1.2.16.tar.gz 2791979 SHA256 3a93ef38eb7ac9f851626d8b27cde7db1bfc78c1b587520fd740a0ab03e44c89 SHA512 d519c761579ce632a388164d9e492cf0327c4ed96522c92e3d9addfdb2c3a12b4a63a6ff7fc7455236bda61e265c1521ddf39cd8dfeac3e8c808ca982acaee97 WHIRLPOOL 07c67669d8670e7a624f14f3757b2be595a5f05b59e4c98b6ac0af12ead0a52b9608dc1068ef4737aee8cb653f3a81ca0a96fdcf7efb36f06e51a2b30f33d969 +DIST log4j-1.2.17.tar.gz 2864448 SHA256 a528e3771ee6234661b5eb0fa02e14faee89dfec38de94088c163ddf2a0a8663 SHA512 7df8dca721f960b9fd22dd5f642dbe7d89167f167aa11604c5f9fe54d649a26dd05af88d7188b47abfb91d501535a4b3665dd84d7e0058ef77159713a10b5af8 WHIRLPOOL 1fc1b420e78bb56ca05282c81f12d5911f8966228194a8f5090a32cfa0403332b36589c7841b06c3bfd602f0f13cdf8342e678de01446e4260cffd8a57a6c175 EBUILD log4j-1.2.16.ebuild 1860 SHA256 43395cb8b2f822460c56248060490d47e3bdf74d985b34b6ad0bd7335e3064a1 SHA512 753b21f844e25068beb0699ce6a91b69ead843d045a25bbbad9d098f73e24b9c029f195b927f3daca2620cbb73a52c7179003d1e1a0927ea2e592c5ee59a00ae WHIRLPOOL 7904e08575294a6bf2c7b302d244f57a9cb0154c582e2a8fb545f228ff93226c5c815b5ab6e05231bffe64ea928982cc77d8e74fc637066f369620cbcaead1ee -MISC ChangeLog 11337 SHA256 465135657e08ff0d9f12438d0d107d6727c9d589c4fb705d704f3f1da5847d5a SHA512 3ef2a9c39d5b48a7bbb49d3a3c61be7ca70a85083d6bfd664965f0f37a46e6a1dc5781a782585a87f3583bde4ef72956d7a219226c5807b4969af98e3e9ad01b WHIRLPOOL f8900a76fc7ae603c25d94babdba45c3e85e2f6f6a33ef182066d99a59f8d5185d21453c923e1049b72e72dd192027f6234a6ca638f5eff5b81d395885ad4bdf +EBUILD log4j-1.2.17.ebuild 1807 SHA256 a9336f75155586b6cdf10c8444b638a01c34997252e41047dfd6119fc5632011 SHA512 1bc0bf70b4d2c318dedc9940e1383536ad65dded3d26abc3fb76b59a58a6466e058dcf6ed8c2c10c2332cddf542454510bbb9b432178c9493319941b07d2fe2e WHIRLPOOL d5fb164d1fd5c312b6780ca61b4f7410660a7ea144e6db319af27d289356b03196f9085842cc14e7fce882548e9850323c5f868a006a1fc09de2b89c1035d0b9 +MISC ChangeLog 11491 SHA256 063417ba124d7aa1eb8eded278c14ad7890e9234b58cf86497e5ce336c8de71e SHA512 79ce7038863ac2dd26a25afd21973796de2585ec2b55f3d4e678cac6fcf61e55fda4b3962084bae36b8427eb58a2ec7a9ff248999977f4ff1e6f25d3156b81db WHIRLPOOL c68f819a717284aef6525c643a2b657aaba04ef3cf45fa5d87bab672471c3c88ba29b96ec458ee7c265d34fd939bda5e50948b2472c002018099521a106ea371 MISC metadata.xml 336 SHA256 7639c588f513ed8f1c2392e04ef8846157e7da5f11e8d1dfb111dc8a87dec152 SHA512 69338dfa07acd9352dd9daf0514de5ee3f244d0ede5a243cb7021c26391003a2308a78cc9d74408bd30b4baeedb16fb046d1de521f9f1b778584b629dd6ea0a3 WHIRLPOOL 3202fdbb6ffe5fe9a896c57202ce5927bf3f7424d3f17bb23da5e414ab2c20113043dca7d560e4c12345760846ef55b37e62523b51d8a6e8dfa1b619abeb9746 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJT3RcOAAoJELjwI6Q8XPdawgEIAJ5+a/0Vl1NciGeMCjfu1o7d -vAKZDI/sug2cc9lMn6UIcHV++7pLN7Lg3vHU5nUMTBFyj7QgHea7xn58x+IRU5h1 -Wy5KvxbEt8Tp4MLxFyBoKeP2zCiq8lOQnmQxDoFCkfU3YfJ9Ib3iAaT2Y9zFZCuX -QTQx4E8EXdpfVo6U8a15z3lZb01uvetBN3owVM5Chvw1A/0JwwM2O4Q2TQSfaQsg -WFQ5x7ZdhqwZMjOxQ35SXPrn89r6klzDfuLfTm1Cu5zNzag00Bor3Ec2ewZ6dpto -cQOeqq00kjwc2bd850bV3/8oDdLPLtVqEtUctcuT1QyC5Oo1bhkV3F84cNUmUSI= -=uG3J +iQEcBAEBCAAGBQJVHzRqAAoJEJGRpfGTSRu4qZYH/jhzve6X/HDXCkspeCZGtn3V +ts8Rd6XvEcvEzuB7i0OzIt0nWK+2GhFVfUP0bkEl9DK4h1RrlN9TnlAGo7tFY2Rn +aEsjeHf08z2rI98/+MYgWKpo7f/FjGq6DaZn+mc8OwI+IIDkaBNnHHmYWGude8pR +tcyGPRf/05XiFq0xeZmTp8TwgrOxbzKd2ZWO35kzC0KhSPIo5RMPISnlU2eUmaT0 +WJoTsUWgtG84i+vo105/vOBqNncF1uLJmp2YctYHtJXSQsyf7XNTl9RqfsXBZGqQ +Pe5MTcjTxjvc7JZRR5tfQzX8XSUwX29ieE+RmVhf54EDsQRb6udLyShCuwd6S6U= +=dGdH -----END PGP SIGNATURE----- diff --git a/dev-java/log4j/log4j-1.2.17.ebuild b/dev-java/log4j/log4j-1.2.17.ebuild new file mode 100644 index 000000000000..79691a048775 --- /dev/null +++ b/dev-java/log4j/log4j-1.2.17.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/log4j-1.2.17.ebuild,v 1.1 2015/04/04 00:46:30 monsieurp Exp $ + +EAPI=5 +JAVA_PKG_IUSE="doc javamail jms jmx source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="A low-overhead robust logging package for Java" +SRC_URI="mirror://apache/logging/${PN}/${PV}/${P}.tar.gz" +HOMEPAGE="http://logging.apache.org/log4j/" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="doc javamail jms jmx source" + +CDEPEND="javamail? ( + java-virtuals/javamail + java-virtuals/jaf + ) + jmx? ( dev-java/sun-jmx ) + jms? ( java-virtuals/jms )" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +DEPEND=">=virtual/jdk-1.6 + ${CDEPEND}" + +MY_P="apache-${P}" +S="${WORKDIR}/${MY_P}" + +java_prepare() { + rm -rf dist || die + 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 + if use javamail; then + EANT_GENTOO_CLASSPATH+="," + fi + + 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() { + java-pkg_newjar dist/lib/${PN}-1.2.17.jar ${PN}.jar + + if use doc ; then + java-pkg_dohtml -r site/* + rm -fr "${ED}/usr/share/doc/${PF}/html/apidocs" + java-pkg_dojavadoc --symlink apidocs site/apidocs + fi + + if use source; then + java-pkg_dosrc src/main/java/* + fi +} -- 2.26.2