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

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 93491BB8)

2 files changed, 70 insertions, 1 deletions

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index c210a8f06f7d..47464457c624 100644
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/avalon-logkit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.100 2015/08/01 20:05:43 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.101 2015/08/06 16:21:07 monsieurp Exp $
+
+*avalon-logkit-2.1-r8 (06 Aug 2015)
+
+  06 Aug 2015; Patrice Clement <monsieurp@gentoo.org>
+  +avalon-logkit-2.1-r8.ebuild:
+  Remove java-virtuals/javamail dependency and replace it with oracle-javamail.
+  Fixed bug 553186.
 
 *avalon-logkit-2.1-r7 (01 Aug 2015)
 
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild
new file mode 100644
index 000000000000..a0d880018d3a
--- /dev/null
+++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.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/avalon-logkit/avalon-logkit-2.1-r8.ebuild,v 1.1 2015/08/06 16:21:07 monsieurp Exp $
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2
+
+# NB: this project is dead and we should look into removing it from the tree.
+# Take a look at the homepage.
+DESCRIPTION="Easy-to-use Java logging toolkit"
+HOMEPAGE="http://avalon.apache.org/"
+SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+LICENSE="Apache-2.0"
+SLOT="2.0"
+IUSE=""
+
+CDEPEND="
+	dev-java/log4j:0
+	java-virtuals/jms:0
+	dev-java/oracle-javamail:0
+	java-virtuals/servlet-api:3.0"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.6"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6
+	test? (
+		dev-java/ant-junit:0
+	)"
+
+java_prepare() {
+	# Doesn't like 1.6 / 1.7 changes to JDBC
+	epatch "${FILESDIR}/${P}-java7.patch"
+
+	java-ant_ignore-system-classes
+
+	java-ant_xml-rewrite \
+		-f build.xml \
+		-c -e available \
+		-a classpathref \
+		-v 'build.classpath' || die
+
+	java-pkg_filter-compiler jikes
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="oracle-javamail,jms,log4j,servlet-api-3.0"
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_newjar target/${P}.jar
+	use doc && java-pkg_dojavadoc dist/docs/api
+	use source && java-pkg_dosrc src/java/*
+}