| 1 |
commit: 8cc2d3d6d6e310d0dc892ea075fd6843b866f127 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 23 10:41:05 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 23 10:41:05 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cc2d3d6 |
| 7 |
|
| 8 |
dev-java/oracle-jdk-bin: Fix jce USE flag (bug #635070) |
| 9 |
|
| 10 |
The JCE files are now bundled with the JDK. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
| 13 |
|
| 14 |
...2.ebuild => oracle-jdk-bin-1.8.0.152-r1.ebuild} | 27 +++------------------- |
| 15 |
1 file changed, 3 insertions(+), 24 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.152.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.152-r1.ebuild |
| 18 |
similarity index 91% |
| 19 |
rename from dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.152.ebuild |
| 20 |
rename to dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.152-r1.ebuild |
| 21 |
index 13e99349fc5..23f3d4e3b5a 100644 |
| 22 |
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.152.ebuild |
| 23 |
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.152-r1.ebuild |
| 24 |
@@ -5,9 +5,8 @@ EAPI=6 |
| 25 |
|
| 26 |
inherit eutils java-vm-2 prefix versionator |
| 27 |
|
| 28 |
-# This URIs need to be updated when bumping! |
| 29 |
+# This URI needs to be updated when bumping! |
| 30 |
JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html" |
| 31 |
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html" |
| 32 |
|
| 33 |
# This is a list of archs supported by this update. |
| 34 |
# Currently arm comes and goes. |
| 35 |
@@ -42,9 +41,6 @@ DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz" |
| 36 |
DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz" |
| 37 |
DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip" |
| 38 |
|
| 39 |
-JCE_DIR="UnlimitedJCEPolicyJDK8" |
| 40 |
-JCE_FILE="jce_policy-8.zip" |
| 41 |
- |
| 42 |
DESCRIPTION="Oracle's Java SE Development Kit" |
| 43 |
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" |
| 44 |
for d in "${AT_AVAILABLE[@]}"; do |
| 45 |
@@ -55,7 +51,6 @@ for d in "${AT_AVAILABLE[@]}"; do |
| 46 |
SRC_URI+=" )" |
| 47 |
done |
| 48 |
unset d |
| 49 |
-SRC_URI+=" jce? ( ${JCE_FILE} )" |
| 50 |
|
| 51 |
LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" |
| 52 |
SLOT="1.8" |
| 53 |
@@ -107,7 +102,6 @@ RDEPEND="!x64-macos? ( |
| 54 |
selinux? ( sec-policy/selinux-java )" |
| 55 |
|
| 56 |
DEPEND="app-arch/zip |
| 57 |
- jce? ( app-arch/unzip ) |
| 58 |
examples? ( x64-macos? ( app-arch/unzip ) )" |
| 59 |
|
| 60 |
S="${WORKDIR}/jdk" |
| 61 |
@@ -148,7 +142,6 @@ pkg_nofetch() { |
| 62 |
distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") ) |
| 63 |
fi |
| 64 |
check_tarballs_available "${JDK_URI}" "${distfiles[@]}" |
| 65 |
- use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}" |
| 66 |
} |
| 67 |
|
| 68 |
src_unpack() { |
| 69 |
@@ -163,7 +156,6 @@ src_unpack() { |
| 70 |
zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv || die |
| 71 |
mv Contents/Home "${WORKDIR}"/jdk${MY_PV} || die |
| 72 |
popd > /dev/null || die |
| 73 |
- use jce && unpack "${JCE_FILE}" |
| 74 |
else |
| 75 |
default |
| 76 |
fi |
| 77 |
@@ -175,10 +167,6 @@ src_unpack() { |
| 78 |
} |
| 79 |
|
| 80 |
src_prepare() { |
| 81 |
- if use jce ; then |
| 82 |
- mv "${WORKDIR}"/${JCE_DIR} jre/lib/security/ || die |
| 83 |
- fi |
| 84 |
- |
| 85 |
default |
| 86 |
|
| 87 |
if [[ -n ${JAVA_PKG_STRICT} ]] ; then |
| 88 |
@@ -251,17 +239,8 @@ src_install() { |
| 89 |
cp -pPR demo sample "${ddest}" || die |
| 90 |
fi |
| 91 |
|
| 92 |
- if use jce ; then |
| 93 |
- dodir "${dest}"/jre/lib/security/strong-jce |
| 94 |
- mv "${ddest}"/jre/lib/security/US_export_policy.jar \ |
| 95 |
- "${ddest}"/jre/lib/security/strong-jce || die |
| 96 |
- mv "${ddest}"/jre/lib/security/local_policy.jar \ |
| 97 |
- "${ddest}"/jre/lib/security/strong-jce || die |
| 98 |
- dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \ |
| 99 |
- "${dest}"/jre/lib/security/US_export_policy.jar |
| 100 |
- dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \ |
| 101 |
- "${dest}"/jre/lib/security/local_policy.jar |
| 102 |
- fi |
| 103 |
+ ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \ |
| 104 |
+ "${ddest}"/jre/lib/security/ || die |
| 105 |
|
| 106 |
if use nsplugin ; then |
| 107 |
local nsplugin_link=${nsplugin##*/} |
Archives