commit: d5766ee0e57dca0ff92479fd51d61256b3bb22c9
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 17 14:43:26 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 14:43:26 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5766ee0
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 <AT> gentoo.org>
...bcmail-1.50-r2.ebuild => bcmail-1.38-r5.ebuild} | 38 ++++++++--------------
...bcmail-1.50-r2.ebuild => bcmail-1.45-r4.ebuild} | 38 ++++++++--------------
dev-java/bcmail/bcmail-1.50-r2.ebuild | 10 +++---
dev-java/bcmail/bcmail-1.52-r2.ebuild | 4 +--
4 files changed, 33 insertions(+), 57 deletions(-)
diff --git a/dev-java/bcmail/bcmail-1.50-r2.ebuild
b/dev-java/bcmail/bcmail-1.38-r5.ebuild
similarity index 55%
copy from dev-java/bcmail/bcmail-1.50-r2.ebuild
copy to dev-java/bcmail/bcmail-1.38-r5.ebuild
index f8a2985..3ff2db8 100644
--- a/dev-java/bcmail/bcmail-1.50-r2.ebuild
+++ b/dev-java/bcmail/bcmail-1.38-r5.ebuild
@@ -4,59 +4,47 @@
EAPI=5
-JAVA_PKG_IUSE="doc source test"
+JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
-MY_P="${PN}-jdk15on-${PV/./}"
-
+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.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"
-
+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}
- bcpkix-${SLOT}
- sun-jaf
oracle-javamail
"
-# Package can't be built with test as bcprov and bcpkix can't be built with
test.
-RESTRICT="test"
-
src_unpack() {
default
cd "${S}"
unpack ./src.zip
}
-java_prepare() {
- JAVA_RM_FILES=(
- org/bouncycastle/mail/smime/test/*
- org/bouncycastle/mail/smime/examples/CreateSignedMail.java
- )
-}
-
src_compile() {
java-pkg-simple_src_compile
}
diff --git a/dev-java/bcmail/bcmail-1.50-r2.ebuild
b/dev-java/bcmail/bcmail-1.45-r4.ebuild
similarity index 55%
copy from dev-java/bcmail/bcmail-1.50-r2.ebuild
copy to dev-java/bcmail/bcmail-1.45-r4.ebuild
index f8a2985..0c6fd86 100644
--- a/dev-java/bcmail/bcmail-1.50-r2.ebuild
+++ b/dev-java/bcmail/bcmail-1.45-r4.ebuild
@@ -4,59 +4,47 @@
EAPI=5
-JAVA_PKG_IUSE="doc source test"
+JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
-MY_P="${PN}-jdk15on-${PV/./}"
-
+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.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"
-
+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}
- bcpkix-${SLOT}
- sun-jaf
oracle-javamail
"
-# Package can't be built with test as bcprov and bcpkix can't be built with
test.
-RESTRICT="test"
-
src_unpack() {
default
cd "${S}"
unpack ./src.zip
}
-java_prepare() {
- JAVA_RM_FILES=(
- org/bouncycastle/mail/smime/test/*
- org/bouncycastle/mail/smime/examples/CreateSignedMail.java
- )
-}
-
src_compile() {
java-pkg-simple_src_compile
}
diff --git a/dev-java/bcmail/bcmail-1.50-r2.ebuild
b/dev-java/bcmail/bcmail-1.50-r2.ebuild
index f8a2985..625fc0c 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 bd9c911..b298d16 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
"
