Remove java-virtuals/javamail 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, 78 insertions, 19 deletions

diff --git a/app-office/borg/ChangeLog b/app-office/borg/ChangeLog
index c0ded4c82fdc..f607787d1699 100644
--- a/app-office/borg/ChangeLog
+++ b/app-office/borg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/borg
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/borg/ChangeLog,v 1.15 2015/06/09 11:55:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/borg/ChangeLog,v 1.16 2015/08/06 15:34:10 monsieurp Exp $
+
+*borg-1.7.4-r3 (06 Aug 2015)
+
+  06 Aug 2015; Patrice Clement <monsieurp@gentoo.org> +borg-1.7.4-r3.ebuild:
+  Remove java-virtuals/javamail and replace it with oracle-javamail. Fixed bug
+  553186.
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/app-office/borg/Manifest b/app-office/borg/Manifest
index e61f11e40a20..1bedb0d25fe7 100644
--- a/app-office/borg/Manifest
+++ b/app-office/borg/Manifest
@@ -1,27 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST borg_src_1_7_4.zip 4012440 SHA256 b27eb694987c25134d8381d70f4daeb13c6702f75887768e49c0746ad4fb0d1c SHA512 6b68826dbdf958089be2ecee3d05e10750ae3512a40409642ab37913351298f8c180632932a570c5b5ceb6a3f574ceb86fca889e213bf0deaaa787b35307923e WHIRLPOOL 787e8f379274099d93328c3ab9e1297402a1af1977bae29b1d4982e8b9eb8be8da63521192f025244137fdcd09bb2da69c4e08afd2a0622e00705ca5e1dd142a
 EBUILD borg-1.7.4-r1.ebuild 1544 SHA256 2b38d62ef2e68a3034d7bcd5158e7778fc04b0c31cde4632c5fe5d0730ba17a5 SHA512 35d33886eed3f5da9605a697b6d1b828181eb2304135b544960234b03c56238cf16a3b0c60bb473306c2a221ae2d40dd5ca1d6ed8d4b0b4c69c936c62d86176a WHIRLPOOL f12e50003b5bcde5cff3dde81b54962dd375619778b5f00106fda963cfae025548aee1f1922786760442ef9e3dee492a72f2686e85b76db2db9a37309e953a3e
 EBUILD borg-1.7.4-r2.ebuild 1547 SHA256 8e0f75f0f77cfb18bd83ecf5c6c7e13a7df95d321bdd0783d5083a1f1d2b5946 SHA512 ea5b3bad6024da914dc3df67ac298d67bf07df167388fb383633412a0f67f397bd7cdbf07a2eced2d897716d55f92d40dcff1095ef9897ca7f26283caa166c96 WHIRLPOOL 343cbb6e60b50556f4c1b6da3ed3d7a6272a43fcec5d8a63ad639f1c734047e8305063d38cbf43b0cab6b8002cd82c030ecea63509506e9a466487af199ebc59
-MISC ChangeLog 2165 SHA256 4a0b7ab83993f60d750d30253c279667cec47e4679932295b36c41d34083a3c1 SHA512 5b732b7fa3560594803e7271b0b6bfa98f838d02f14aa1f6a6647ca7ea926c7aa7446721a6e5b0308f421212cc4122c409784e9a57811432a5689e220ae02cf5 WHIRLPOOL be4b0523d7be1b86fe87946edd864b863163c131ebc6e0ae7cb28c8cb377ef6559501473de3ea35ace7b5e4becac07e9c034d5deb7fe037295f13422f6f3fce5
+EBUILD borg-1.7.4-r3.ebuild 1547 SHA256 eac803120b4eef6091abccfd93c4729144bb6835427d1fddf2f7878f50a970d2 SHA512 eac5fb60b8663cbe27fda1d5b9271f430fd78488f4df358785b2873e902fc92b9a1d5d989b7ca840b8b0d89c4e92a4d23c6ac02c76461e0caefb875fefecd143 WHIRLPOOL b411763ac1b2eb0632b113184f920c166f1d8a4f63ec6f63c28a9d06762baa1e1f975a4328ba87739454e4bc69579301949c7353213be5ad12a31204552c733e
+MISC ChangeLog 2367 SHA256 a67344c0c3ea2d445d4bcd84cd29bb2601cf6b7ca837533dacbdaf218191274e SHA512 72b42ffdd648f21e79d7cb009329f05a993535c9fa636dc5ff0642080a28bd8f61e3634cb1f53a5e63856709d9ab7fd1b6a53a265aa1ba56a6c68cda3ca11f34 WHIRLPOOL 6a55aab24e6ba3ea1ed642948ab893b5d80342064d74b441cc7df9f8e297ae20a9bb982a83f2b1a7efac218156f550999e9511b232f39130588642ad0b47c4e6
 MISC metadata.xml 241 SHA256 90c252ebf16bd02e98dcc36ee8cf98008f6cddc757c654d817351217354890c9 SHA512 7574f76d1cbd843404064285cb5d2d10dbea5a8b19c6e1baada63fa1de25584a13bbf2317261f88cc491e4bf98fca57c829c2c156f8542c78e2d428cd20c2044 WHIRLPOOL 0129537fd23ff419c278a3d02e327bd41ec50fbc5f95d6c8266c86c67be713430214835c95553c41c027a47d3fade7a8d5199f9bc662ecdd0b16c17bca930e7a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVdtQcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiL2QP/304qRyZQesIBKE06r9n4EL8
-RCIqQLYMeZjpjunL/lWHDHxeWVl4GS64RpOyud4xLmdQ5Dx4ATmSQBgBn6wDVdEk
-/c0OOJJ55hhaqRlIKknUKaZB2OuLUJdj0uSMZ94M+EtWQRdidL/ExmRQlKCX/XtT
-waC4WSxJQX/BsFfay/mDHxk1KFsTkcDMvgJkanhiiEY/leO3HelPjWn7Ra5tf3bb
-d4u+cc5ghdBokyorA8L3nUXXYyS574IAWsbl5OEtzVBn+OLZ98xZxDjM7oGnE/EY
-ybf3SGAFGGkxCrXkP73qRj9erUrj+zx9hA9VzXf1VSF5sZgaVcp5IzRExPVpLcRI
-+rNOc8/zLrAGiBMvNl1Cskgq9Zuk4v/EHRiku5EKT4O+KJJ+KrS5BWr4E3ly6cwH
-iQeVfFT2jWxXFj1oy5SSDCrRfsbeP7g/RULSWhSUjtgHFCnCD2i8nfk6tTRvAZbB
-ebkE3JHa0ezCsGZIEhEXkF5nLQn2Y3K9l8scClyrLmJJ9mFzf9UroFpudLehGzhb
-9CJdydIXd4lODnUH8CcAP/0jxv3x/C8SkR0MZvH/nwCqkFOsBRxyEIQwaxfxM/Ss
-68oO9euwl/7+YBspXy4IEEuVaClFxjsmUgId0CqVgZAQsZgdvf89joGo9YeXp7N8
-fuTMAope5GT2zVyQ05QT
-=RIIQ
+iQEcBAEBCAAGBQJVw4ykAAoJEJGRpfGTSRu4ne8H/03Xjwr9zjRxqZbIDQO1Azt9
+W9P8m2waW5xQa8YeLeoAlBx4zDO+plajGrNydg6VIN/AAMXpNhSIO1sctjYzgSRx
+wjKzk6ywvu9X7v14CJ9g4lHsx20BlhqYHdC8fZooauHFBCO/Vci410JB3hSC+wZ3
+Do44EAZLBOgNO3HYeiBLwo4evdCVg/JpP13dul3OQIHTOZFV24ZGEvZ475S0s4ay
+90K9rNdnI+6AR3evXECY70ff94jkq8AEA0GB+PwBGEJZUIlozIKSlnb0Jv9IegEd
+HImVbFRLSmEdSE17eV6b9yy5JnirIPC+Vo5/DzjqkWDPYa6Fjy7B/7aK6VERpt0=
+=E41c
 -----END PGP SIGNATURE-----
diff --git a/app-office/borg/borg-1.7.4-r3.ebuild b/app-office/borg/borg-1.7.4-r3.ebuild
new file mode 100644
index 000000000000..b6847e1684fa
--- /dev/null
+++ b/app-office/borg/borg-1.7.4-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/borg/borg-1.7.4-r3.ebuild,v 1.1 2015/08/06 15:34:10 monsieurp Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit versionator java-pkg-2 java-ant-2
+
+MY_PN="${PN}_src"
+MY_PV="$(replace_all_version_separators _ )"
+
+DESCRIPTION="Calendar and task tracker, written in Java"
+HOMEPAGE="http://borg-calendar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/borg-calendar/borg%201.7/BORG%20${PV}/${MY_PN}_${MY_PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/javahelp:0
+	dev-java/oracle-javamail:0"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6
+	dev-db/hsqldb:0
+	dev-java/jgoodies-looks:2.0"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}/BORGCalendar"
+
+java_prepare() {
+	# Upstream is dead and we already have dev-java/jcalendar
+	# but it's not the same thing.
+	find -name '*.jar' -! -name 'jcalendar.jar' \
+		-exec rm -v {} + || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+EANT_BUILD_XML="ant/build.xml"
+EANT_BUILD_TARGET="borg-jar help-jar"
+EANT_GENTOO_CLASSPATH="javahelp oracle-javamail"
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dojar build/lib/${PN}help.jar
+	java-pkg_dojar lib/jcalendar.jar
+	java-pkg_register-dependency hsqldb,jgoodies-looks-2.0
+
+	java-pkg_dolauncher ${PN} --main net.sf.borg.control.Borg
+
+	use doc && java-pkg_dojavadoc docs
+	use doc && java-pkg_dosrc src/*
+}