dev-java/bcmail: Remove dev-java/sun-jaf dependency and swap it for java-virtuals/jaf. Fixes bug 548726.

Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

4 files changed, 117 insertions, 7 deletions

diff --git a/dev-java/bcmail/bcmail-1.38-r5.ebuild b/dev-java/bcmail/bcmail-1.38-r5.ebuild
new file mode 100644
index 000000000000..3ff2db80394d
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.38-r5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk14-${PV/./}"
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.38"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="
+	dev-java/bcprov:${SLOT}
+	dev-java/junit:0
+	java-virtuals/jaf:0
+	dev-java/oracle-javamail:0
+"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	jaf
+	junit
+	bcprov-${SLOT}
+	oracle-javamail
+"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcmail/bcmail-1.45-r4.ebuild b/dev-java/bcmail/bcmail-1.45-r4.ebuild
new file mode 100644
index 000000000000..0c6fd8674c64
--- /dev/null
+++ b/dev-java/bcmail/bcmail-1.45-r4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_P="${PN}-jdk15-${PV/./}"
+DESCRIPTION="Java cryptography APIs"
+HOMEPAGE="http://www.bouncycastle.org/java.html"
+SRC_URI="http://www.bouncycastle.org/download/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="1.45"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+CDEPEND="
+	dev-java/bcprov:${SLOT}
+	dev-java/junit:0
+	java-virtuals/jaf:0
+	dev-java/oracle-javamail:0
+"
+DEPEND=">=virtual/jdk-1.6
+	app-arch/unzip
+	${CDEPEND}"
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+JAVA_GENTOO_CLASSPATH="
+	jaf
+	junit
+	bcprov-${SLOT}
+	oracle-javamail
+"
+
+src_unpack() {
+	default
+	cd "${S}"
+	unpack ./src.zip
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	use source && java-pkg_dosrc org
+}
diff --git a/dev-java/bcmail/bcmail-1.50-r2.ebuild b/dev-java/bcmail/bcmail-1.50-r2.ebuild
index f8a2985c586e..625fc0c0aee5 100644
--- a/dev-java/bcmail/bcmail-1.50-r2.ebuild
+++ b/dev-java/bcmail/bcmail-1.50-r2.ebuild
@@ -19,10 +19,10 @@ SLOT="1.50"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
 
 CDEPEND="dev-java/bcprov:${SLOT}
-		dev-java/bcpkix:${SLOT}
-		dev-java/sun-jaf:0
-		dev-java/junit:0
-		dev-java/oracle-javamail:0"
+	dev-java/bcpkix:${SLOT}
+	java-virtuals/jaf:0
+	dev-java/junit:0
+	dev-java/oracle-javamail:0"
 
 DEPEND=">=virtual/jdk-1.6
 	app-arch/unzip
@@ -34,10 +34,10 @@ RDEPEND=">=virtual/jre-1.6
 S="${WORKDIR}/${MY_P}"
 
 JAVA_GENTOO_CLASSPATH="
+	jaf
 	junit
 	bcprov-${SLOT}
 	bcpkix-${SLOT}
-	sun-jaf
 	oracle-javamail
 "
 
diff --git a/dev-java/bcmail/bcmail-1.52-r2.ebuild b/dev-java/bcmail/bcmail-1.52-r2.ebuild
index bd9c91155d11..b298d16a9a2f 100644
--- a/dev-java/bcmail/bcmail-1.52-r2.ebuild
+++ b/dev-java/bcmail/bcmail-1.52-r2.ebuild
@@ -20,8 +20,8 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 
 CDEPEND="dev-java/bcprov:${SLOT}
 		dev-java/bcpkix:${SLOT}
-		dev-java/sun-jaf:0
 		dev-java/junit:0
+		java-virtuals/jaf:0
 		dev-java/oracle-javamail:0"
 
 DEPEND=">=virtual/jdk-1.6
@@ -34,10 +34,10 @@ RDEPEND=">=virtual/jre-1.6
 S="${WORKDIR}/${MY_P}"
 
 JAVA_GENTOO_CLASSPATH="
+	jaf
 	junit
 	bcprov-${SLOT}
 	bcpkix-${SLOT}
-	sun-jaf
 	oracle-javamail
 "