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, 72 insertions, 3 deletions

diff --git a/dev-java/logback/ChangeLog b/dev-java/logback/ChangeLog
index d8e2db81f424..53827b4cda74 100644
--- a/dev-java/logback/ChangeLog
+++ b/dev-java/logback/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/logback
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/logback/ChangeLog,v 1.1 2013/12/23 07:38:53 ercpe Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/logback/ChangeLog,v 1.2 2015/08/06 22:27:42 monsieurp Exp $
+
+*logback-1.0.13-r1 (06 Aug 2015)
+
+  06 Aug 2015; Patrice Clement <monsieurp@gentoo.org> +logback-1.0.13-r1.ebuild:
+  Remove java-virtuals/javamail dependency and replace it with oracle-javamail.
+  Fixes bug 553186.
 
 *logback-1.0.13 (23 Dec 2013)
 
diff --git a/dev-java/logback/Manifest b/dev-java/logback/Manifest
index 24acaf328882..34200eef868b 100644
--- a/dev-java/logback/Manifest
+++ b/dev-java/logback/Manifest
@@ -1,5 +1,6 @@
 DIST logback-1.0.13-build.tar.bz2 2079 SHA256 eba80470d668ff30478d8ce060a97beaf1f2478db3785279e9c102c57ced52db SHA512 4d5a4385f427dbb6a0897459ab6d691c4b77460ea667d7e7a05e2f353730ef78ff712b1c0538e5c5f04fa4daf6605ca1da2dc1b9d0a35741192236b40e44d81e WHIRLPOOL 17554dc78acc7663475b52690c31d4be514f2c32cf0875894f42fb635e04292c4520735cb9187631baf14a13a56b33c678014b86cd07bf3413810f9e7559e887
 DIST logback-1.0.13.tar.gz 6989078 SHA256 4e5479b0d7f563e327cae486e4e3d7a1e1ec9aa950d7a0f60ea310db6223d5cd SHA512 974cdb6ba77c4654fa3f3bd6e7526eacfd6cf6369118e37436e441ac7742b0e98e4de49af4677cb0524b571639843059c6252751b2eeca58a39d6e9a12aa3814 WHIRLPOOL b7cf4be408499ae4f606dbce0a84fe0bb9e97c8aab88f097a8bdbfaaf44cb3fa035847213ed851520a1202f04b1915fc29d0af54c86ad7b2cb698c3891cf5d83
+EBUILD logback-1.0.13-r1.ebuild 1787 SHA256 de1cae2340863c7d7653347007231215d1f0fbdd4a74da16b3d3ddcfb745b5a5 SHA512 d6923ea4f1d58a908133bad2756e6b9dd553ea6d80996100e6ab818935bda8167ce3de347ad1f3703dee89c889ede285bd56507a9e3f0e984a0a2af36f9129e2 WHIRLPOOL fc92cf736a7bf60f385568ae92171b84e4fda2cf099f27817684c01e4a41f67cbbba76f73854e31f085e1921e72c7bede16faca4fddb2b029c5a3e328eaaefc2
 EBUILD logback-1.0.13.ebuild 1766 SHA256 c4766e5608c5f732ec586dc834843aee6eb6173d6153b6cc23b25bf04092f8ec SHA512 0a4237ec2c7e6dce78bef7236ccb6676e50814a2f38231289e8647e0cca05a459e24dcd766918e1332a288e5aeb931dd7ebce8c527ed7d7dca847a29ba7c959c WHIRLPOOL 5fba37a094792ccf152b3424bb2538bd2e04a604eea9cb2bb0e325320fe8d38d882056d3b989fae02d0bc0a93da1be980a93c0adb9b31f7ed214ca0f19044f13
-MISC ChangeLog 352 SHA256 86fe21277e2bc2209d2fc1707807c16c8fb81d34df85e576e7c89d4f8c4020ce SHA512 6a02884ade5dbd8a9a226c6051afc6ff9c39d35f9e82679dbccfcd66c4cd6e5845e7ba7078f774f0db5d64c507e522eae002eb437141165234831aafeda37384 WHIRLPOOL 90b423157abd03da008cbcc9b50d7a29e1f7d2449ad6213f246461cf56c47ef07f5763de3c6a284f140a832119f6d22d80ee1ea6571e68e34de3ab830af5d6f5
+MISC ChangeLog 572 SHA256 2b9eb45a2eb5d8e0d62db46c24308c3bd372fa31eadf4a33fd556561cf9127ad SHA512 67021c7715f1d6b9b39eb7e73d51f4b9e534c136b4a4a11f2880d80115f03e0fe1506a6d0eb5c3aa06f4944ca2ed00b80ce0b8247f48a9cc9047a8636f041674 WHIRLPOOL 5326facfec82209a02a2563d82812f489ad5be27f71280486d2159dd907b7a35d7643b2b00cb7e096cac6e8098ee73982435beb839e53e8667ae622cb53297a0
 MISC metadata.xml 232 SHA256 1557510e17d19ae7cd75b1cc6c7cf8d5874743559aac0f2259cbeb72efe64ec3 SHA512 135ecd14c490327840036dfe124b255ac6e901f2089cdc60c6ed6c23f24905001f4bd6aa27f55d1dd7f1d555e3ade2784cffa2454a8d128f4200924954c00a64 WHIRLPOOL bd5072e277f442ddaacfa5243ccc63111bbac037fba49f40a690dff389353214b07599c60e439825f838b179661171b3ebbdcc804a32ee5dee39093a328ad84a
diff --git a/dev-java/logback/logback-1.0.13-r1.ebuild b/dev-java/logback/logback-1.0.13-r1.ebuild
new file mode 100644
index 000000000000..3031f697c7cf
--- /dev/null
+++ b/dev-java/logback/logback-1.0.13-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/logback/logback-1.0.13-r1.ebuild,v 1.1 2015/08/06 22:27:42 monsieurp Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A generic, reliable, fast & flexible logging framework for Java"
+HOMEPAGE="http://logback.qos.ch/"
+SRC_URI="http://logback.qos.ch/dist/${PN}-${PV}.tar.gz
+		http://dev.gentoo.org/~ercpe/distfiles/${CATEGORY}/${PN}/${P}-build.tar.bz2"
+
+LICENSE="|| ( EPL-1.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tomcat"
+
+CDEPEND="
+	dev-java/jansi:0
+	dev-java/janino:0
+	dev-java/slf4j-api:0
+	dev-java/oracle-javamail:0
+	java-virtuals/servlet-api:3.0
+	tomcat? ( www-servers/tomcat:7 )
+"
+
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6"
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="
+	jansi
+	janino
+	slf4j-api
+	oracle-javamail
+	servlet-api-3.0
+"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/${PN}-core/target/${PN}-core.jar"
+
+java_prepare() {
+	find "${S}" -name "*.jar" -delete || die
+
+	use tomcat || rm -r "${S}"/${PN}-access/src/main/java/ch/qos/logback/access/tomcat/ || die
+	# remove the next line when we have jetty in the tree
+	rm -r "${S}"/${PN}-access/src/main/java/ch/qos/logback/access/jetty/ || die
+
+	use tomcat && EANT_GENTOO_CLASSPATH+=",tomcat-7"
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/${PN}-core/target/${PN}-core.jar
+	java-pkg_dojar "${S}"/${PN}-access/target/${PN}-access.jar
+
+	use source && java-pkg_dosrc "${S}"/${PN}-core/src/main/java "${S}"/${PN}-access/src/main/java
+	use doc && java-pkg_dojavadoc "${S}"/${PN}-core/target/site/apidocs
+	use examples && java-pkg_doexamples "${S}"/${PN}-examples/src/main/java/chapters/*
+}