Remove java-virtuals/javamail dependency and replace it with oracle-javamail. Fixes bug 553186.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 101 insertions, 18 deletions

diff --git a/dev-java/log4j/ChangeLog b/dev-java/log4j/ChangeLog
index b054482c3079..b6801ba72cc7 100644
--- a/dev-java/log4j/ChangeLog
+++ b/dev-java/log4j/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/log4j
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.96 2015/07/11 09:22:15 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/log4j/ChangeLog,v 1.97 2015/08/06 22:16:18 monsieurp Exp $
+
+*log4j-1.2.17-r1 (06 Aug 2015)
+
+  06 Aug 2015; Patrice Clement <monsieurp@gentoo.org> +log4j-1.2.17-r1.ebuild:
+  Remove java-virtuals/javamail dependency and replace it with oracle-javamail.
+  Fixes bug 553186.
 
   11 Jul 2015; James Le Cuirot <chewi@gentoo.org> log4j-1.2.16.ebuild,
   log4j-1.2.17.ebuild:
diff --git a/dev-java/log4j/Manifest b/dev-java/log4j/Manifest
index eff86b133059..5cc128ff36c5 100644
--- a/dev-java/log4j/Manifest
+++ b/dev-java/log4j/Manifest
@@ -4,25 +4,18 @@ 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 1851 SHA256 65d493fbc5e43c1f9a8d31bf90606f6ba2169ee30da869ca9bd89d24de458964 SHA512 6ae290107a0f3e4a0f257a700b2a1c0b6fbf360ea3f57e31c27fb0359347a13aae10216940f1c333a4b0a13a6dad09f7e8a114d9d7b3912cb3dcedf01374e1a6 WHIRLPOOL 743ab1cb7cd47ae471d6d6494210a5ac75c28c2b14d4e0a4588a48f6f73411bdbeacede13a617c19448b6711bcc07120c16f96cc153b90f41a31c89a70496744
+EBUILD log4j-1.2.17-r1.ebuild 1824 SHA256 d0e9c10aab707946c22ff385ed3421a61e3a99374f2428cd23ace7050c1226de SHA512 919e13b738a6a5fb83d46e94aa2de19b0173677c88a1c2c5b294e93e033975c14a5e0643292b4b7dae4077dcba8863ce9cb7ad4e11c1359c5a6020d9daa8048b WHIRLPOOL 6e5b6375cd70e9bf37325d0b26273afb74552d38e563ee7d533b92158e40ed0561c828303209e94b7e4f7ba7ccaf1e6303e461bae8709c22e80f9aa6183352d7
 EBUILD log4j-1.2.17.ebuild 1797 SHA256 a6e188d66c09b2cc3505ebc4285f4c6a6d292ee8eebbf9464d2be0cf93102422 SHA512 19c26135d170a5ee4a690a8f98593003de549615234d8742c53b74853152784b39dd4566ba382bfc44b4dd5907ac9d17a2b2622bc9b8eb2d8982a07f59ad6d3b WHIRLPOOL 6d2c191a8724cd6cb4489fa55d6d87b7dc0c397a9b11c51e644e9b24f3a3ccc0e8d68159555f0fcf5c7716e363deab755586cb359993bd60fb9105435ec114d7
-MISC ChangeLog 11603 SHA256 066f51f9dc2302621d654db610ff517c0be5f4099f5be4be1f718a0a7ed1a3a9 SHA512 11ba7f783f24b162d395c7868ab0d85f245b3a00ed6cf9cba9d229cba95b04af981735cdf8ca29a0450fb4c2b1d710f2e750fe9e959a6fd9e4168d01665c5a7b WHIRLPOOL 4132cdc137508081705d37b6b461772bf8a93ae6022e995746bd099ee6a077cf9d850b6343bb260ed753921973036d8ec2e8af1dcfabd933293b80ac6f1bd981
+MISC ChangeLog 11819 SHA256 56cfb70fd35ce0819e14aa0f417d55460f566eae4c6b387915abf1f2a5aa7572 SHA512 b17a0ed9ed94ae7eeadae5557c2ff1fe1df4f98516ef757cfa7027009c91b54c50f1a3660cef21529caaa2866d8bce59800f1c958316f4376986f7073c8c3be6 WHIRLPOOL cba9b47f4252a0c037d16c1151b06832978d0c1a739893f01ac23922b046d8a23d2197f73fe712a590e28fc3543c37faa848c938d8bd995fc95daae8aee4b40a
 MISC metadata.xml 336 SHA256 7639c588f513ed8f1c2392e04ef8846157e7da5f11e8d1dfb111dc8a87dec152 SHA512 69338dfa07acd9352dd9daf0514de5ee3f244d0ede5a243cb7021c26391003a2308a78cc9d74408bd30b4baeedb16fb046d1de521f9f1b778584b629dd6ea0a3 WHIRLPOOL 3202fdbb6ffe5fe9a896c57202ce5927bf3f7424d3f17bb23da5e414ab2c20113043dca7d560e4c12345760846ef55b37e62523b51d8a6e8dfa1b619abeb9746
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVoOBIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3khi4QAJsBkg/zUkw+UZcJEjCV15yy
-DarqvXRg2RSCpvvLQ+CwToUsW/flSLLabPXxKakcm0Ft6gc1FL4wtAex86JBQWMU
-p4sbY/0yC/vswRXkhlFX7sOwbOilp5fw2Ye4JW+STIg+kDNAKdmT6NvMHWiG5Uvg
-+zNhzEzbOuqiuDWyrOC1aD+MAV/cjnHaTzTHB6+r2Yp+tr8IL+QDV78+TlLsm1QJ
-+PU43XcqKfHfpz2AxbvAndS23jM9lWz0kpP0dU2XraZQ8f3icRceQ+aui6DCjJvf
-tJmQ2yr+D8asWzhYY7kL8zWOebVDzRHCTEwHB0AK/nGRymAsNKuxg/mGMR9Y5vdC
-6CSqgPprJj0fIVMqDXruV4yBp0Epc/jPw7sQ3OqNUHcu9/R9+8357eudThvYLvnI
-KGXpQSTjIjohYSZQIw7GrqcHgyQkAbskXTh/eP0AsievMa9GAXqjNntz1oZmvrv8
-0Ob7nlY6ZLyQi+6MF2pK0AGlXEB1zY7vR7CEztwPQyEvWP/rcIzlCUaulsZSz2BY
-I3ImRKGLeSfwkwroSer+Bcb5doq2eAtR1+sUvlOw8+x3IU23FqDyoGUBuJ/72zae
-zdKYq1jVyStxbUC1TufdxdDzG2lYw/PfyxMQUuPzH+dus3+2VxqO1n7fS1IBSub4
-xUnxrD6kgeq+T2/yR08A
-=+q5f
+iQEcBAEBCAAGBQJVw+rxAAoJEJGRpfGTSRu4k0MH+wYQeO2UThSN4JRMQWOISc8c
+98tWFZPUepY4MHM5HfbDwN7kxLf1Dq6FIEA9AfUnIovUjm7x1UmLAuD6/3ktIvpH
+8lQkt77csREX+Um6cLekIWWtjpit6GPxyx29ibzcBzSqCT6AQNNvIQOQ1dgA/VSy
+ZIo1/0JxHCC24SX6untqdL5r5EJDRbA7Uh+YOcuIsM8Q0+xRnHBPsP6WvU1QPLb7
+NmW6NuzGPmm9yTgc0LDHnV7+bjY7JeCVoTKFYWAl9QJT1FB0iqVUyqwT1EH5QRSU
+YlFY6lOsLy1pwQhJY5vvX+bJH1G1LT/tIU132NOrlGTxamlVvpj4xp+/DswhG4w=
+=jU5V
 -----END PGP SIGNATURE-----
diff --git a/dev-java/log4j/log4j-1.2.17-r1.ebuild b/dev-java/log4j/log4j-1.2.17-r1.ebuild
new file mode 100644
index 000000000000..b2c79c24c60b
--- /dev/null
+++ b/dev-java/log4j/log4j-1.2.17-r1.ebuild
@@ -0,0 +1,84 @@
+# 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-r1.ebuild,v 1.1 2015/08/06 22:16:18 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 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc javamail jms jmx source"
+
+CDEPEND="javamail? (
+			dev-java/oracle-javamail:0
+			java-virtuals/jaf:0
+		)
+		jmx? (
+			dev-java/sun-jmx:0
+		)
+		jms? (
+			java-virtuals/jms:0
+		)"
+
+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
+}