Remove java-virtuals/javamail dependency and replace it with oracle-javamail. Fixed 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, 38 insertions, 18 deletions

diff --git a/dev-java/ant-javamail/ChangeLog b/dev-java/ant-javamail/ChangeLog
index efb8827c39f4..c95ce69ef1c5 100644
--- a/dev-java/ant-javamail/ChangeLog
+++ b/dev-java/ant-javamail/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/ant-javamail
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ChangeLog,v 1.44 2015/07/09 21:11:19 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ChangeLog,v 1.45 2015/08/06 16:05:17 monsieurp Exp $
+
+*ant-javamail-1.9.2-r1 (06 Aug 2015)
+
+  06 Aug 2015; Patrice Clement <monsieurp@gentoo.org>
+  +ant-javamail-1.9.2-r1.ebuild:
+  Remove java-virtuals/javamail dependency and replace it with oracle-javamail.
+  Fixed bug 553186.
 
   09 Jul 2015; James Le Cuirot <chewi@gentoo.org> -ant-javamail-1.8.2.ebuild,
   -ant-javamail-1.8.4.ebuild, -ant-javamail-1.9.1.ebuild:
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
index 6773b50c5bee..ba86ac002f22 100644
--- a/dev-java/ant-javamail/Manifest
+++ b/dev-java/ant-javamail/Manifest
@@ -3,25 +3,18 @@ Hash: SHA256
 
 DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
 DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
+EBUILD ant-javamail-1.9.2-r1.ebuild 652 SHA256 b8cac459b39515d97fdb19a763038a0ad61dba18dfc3ba360a8e155329a4a319 SHA512 f02016ac31720ce1d5275f169b00ae8536f9080533d3f31d85164a081cd8346de5ae3714f0c2b6187ba4212e0e242cd2b12b1e2e9d10764765ab2c1ec742ac4c WHIRLPOOL 142b5bf5da2f9259685d64b312b4142320beac3aa31404c1b3ecdc26aa2a8f67f614ef6690c7a74c4a4b723f7cfd87de5f8575c126d9c94eea77cbec7781f9a2
 EBUILD ant-javamail-1.9.2.ebuild 626 SHA256 4fc656c0aa97b0ae4d1e9cba2b6bdfabd05fdf8de6585eeb16fbfe9d3b48ee42 SHA512 65b2d24e015c7243017383b6f1a6b0232e8d8d75665aecea4a212d04ddf03c396b623712cbeb51e26b718dc0b4677ab0087f7b9a3c45a8327e4d11003844e969 WHIRLPOOL 9a9793bfd7a6755f12f03e94f2a3241fed09a21efca57db6760bc1a5505dc0b8472df700f5f50127a34a57d58cb9196a0016d37549a0e3eb1bb21086cbf294db
-MISC ChangeLog 5600 SHA256 76b5e61982bf4aa32fd9d6c60c0cb0319463d7f8fa712e100fc905cbc2f02128 SHA512 38ad9f66fe736e24a48acefc34149965849b314e2d15a2dfe69ae60d6d247922c7eb14e0c0e03f01d58f1837e1bc2bccfcfbd15145652e9c93dc001614eab94a WHIRLPOOL 9309577f6b5711701b99b49db3a91d5d87e79be7221125685d496076b971d2cfe119fb1c4edfef203f4ba9803949464d1550d7253dea69962de88c9b130bf24f
+MISC ChangeLog 5830 SHA256 ec757634001d909d2a1b112e3ef42107ceff8b6afbd77cac5c477e4a8e8d67cf SHA512 f91a67d25ba13a1f485e219dd0ce8aa2adc017cece401c90259d2203724a9dbdd3c16037a3e6269159d66730b04cd8fdb38213d996fbe814b7a86f070b90c5f1 WHIRLPOOL 752ea233de135f420d7282e9794e4f743fdce2b1949750bfeea8d0a403e8fd04ad76891debeb26d6c9d9ae1c4aa0a2394696ed8e824931721dce9c593e29ca08
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVnuN4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kUzgQAIkXkbql7rnjJmmXnZWO41UO
-NdR80xJZXEUFQ7vdh3YAWtW+4Eq5XpcSCXW8Iq63uCYIBsc0gICuGxnbCKbdUoDe
-4voqwTqPBxChKfmdQj9NF8u90wk714MWiowt/FUyYREArShS/XQcMMTA6SSgy58u
-SYo8j34nYkesjAdA8I/BCA+8ApT3pcYM0CJEiNQoz52M1jFuxQ2HRtF1nZ3sNgoK
-1A4cS7mxyVkaDpgpHWYh5jw+SduyRP6Bd1GeJ1WjmMMgLk+ONZqHC+Gj++FfLj+G
-5ynhu1301a/Jl4uuQerfkWi0mCIMAfz7B3TK7WneIBoEem8ZeUxR43KfNOUL0Q8w
-FOPmJjc47HWgGEFHjMwpCYRELrpXhw4pAhd8RfzS6NmMeR2BA+XYBF805AqsLg08
-BIJanfvKye8MIi5TaEoADkTrD6UsmigV+gv/plgdMDMRG/fXGbMIDIs/ckWKUFfL
-bSUaALNDq39gnAxUPB6KwJQ9/kHuTNqIxPeqLvlNiyOxhB8NqRKpMEZBdOpS5Qsf
-wx/TPaFUglNeMfwEviRJ/Ke1sEqxRu+9cDIlvQX2NZywAhVSE6oBJbptXTryBjaD
-pz0lWKB2c6KPYg+NIWugvF1t8n4Cxc3tgBhToW+ceD9RNbPBgDTwP4Y+y7GOW/hc
-G9Pwg4X5RAMf7X0N2et9
-=ZoNc
+iQEcBAEBCAAGBQJVw5PvAAoJEJGRpfGTSRu4jQwH/0HG1Ow5OqVMNHns8s/sn83i
+VffjJAhjWGaMljiBO/4M6a97ZXMbY90zDoT1Vwbnlp+rCWOAWZg2IeMO2yjrTlSW
+8GCcNoYD0Jcm68kXA9TkQvGDD7gvmlXzmilhVesIgDKhN03dulxMlzY+bbgLR1nT
+i4zfeEFCh0k+OZHD/N5tcOoKx8iO7+W3/Vi0gw/b/yz6S5PuG2OK/I7q9G5JUyzp
+HHW0XbU9UnMvfJn9ODh/WjW/80libSBXB60EtSCSeEmYAq0ySlkK8nz4FUO60Wgg
+GZVJ0BmxGJ+zi4XjF8+kYfUO+a9WNxEzoElSUYt+kGaDI+WMYvMKQuhS3e04Yss=
+=gpa5
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ant-javamail/ant-javamail-1.9.2-r1.ebuild b/dev-java/ant-javamail/ant-javamail-1.9.2-r1.ebuild
new file mode 100644
index 000000000000..23fac95d3b45
--- /dev/null
+++ b/dev-java/ant-javamail/ant-javamail-1.9.2-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-javamail/ant-javamail-1.9.2-r1.ebuild,v 1.1 2015/08/06 16:05:17 monsieurp Exp $
+
+EAPI="5"
+
+ANT_TASK_DEPNAME="--virtual oracle-javamail"
+
+inherit ant-tasks
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND="dev-java/oracle-javamail:0
+	java-virtuals/jaf:0"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	ant-tasks_src_unpack all
+	java-pkg_jar-from --virtual jaf
+}