| 1 |
commit: c64a8869e050ab84fb8d72d1c6da48c1742774b7 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 23 20:11:17 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 23 20:11:17 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c64a8869 |
| 7 |
|
| 8 |
dev-java/oracle-jre-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.12, Repoman-2.3.2 |
| 13 |
|
| 14 |
...2.ebuild => oracle-jre-bin-1.8.0.152-r1.ebuild} | 35 ++++------------------ |
| 15 |
1 file changed, 5 insertions(+), 30 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152-r1.ebuild |
| 18 |
similarity index 86% |
| 19 |
rename from dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152.ebuild |
| 20 |
rename to dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152-r1.ebuild |
| 21 |
index 3e8dc3535e7..e3f6cb61215 100644 |
| 22 |
--- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152.ebuild |
| 23 |
+++ b/dev-java/oracle-jre-bin/oracle-jre-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 updating when bumping! |
| 29 |
+# This URI needs to be updated when bumping! |
| 30 |
JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html" |
| 31 |
-JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html" |
| 32 |
|
| 33 |
if [[ "$(get_version_component_range 4)" == 0 ]] ; then |
| 34 |
S_PV="$(get_version_component_range 1-3)" |
| 35 |
@@ -21,15 +20,11 @@ MY_PV="$(get_version_component_range 2)${MY_PV_EXT}" |
| 36 |
AT_amd64="jre-${MY_PV}-linux-x64.tar.gz" |
| 37 |
AT_x86="jre-${MY_PV}-linux-i586.tar.gz" |
| 38 |
|
| 39 |
-JCE_DIR="UnlimitedJCEPolicyJDK8" |
| 40 |
-JCE_FILE="jce_policy-8.zip" |
| 41 |
- |
| 42 |
DESCRIPTION="Oracle's Java SE Runtime Environment" |
| 43 |
HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" |
| 44 |
SRC_URI=" |
| 45 |
amd64? ( ${AT_amd64} ) |
| 46 |
- x86? ( ${AT_x86} ) |
| 47 |
- jce? ( ${JCE_FILE} )" |
| 48 |
+ x86? ( ${AT_x86} )" |
| 49 |
|
| 50 |
LICENSE="Oracle-BCLA-JavaSE" |
| 51 |
SLOT="1.8" |
| 52 |
@@ -78,8 +73,7 @@ RDEPEND="!x64-macos? ( |
| 53 |
!prefix? ( sys-libs/glibc:* ) |
| 54 |
selinux? ( sec-policy/selinux-java )" |
| 55 |
|
| 56 |
-DEPEND="app-arch/zip |
| 57 |
- jce? ( app-arch/unzip )" |
| 58 |
+DEPEND="app-arch/zip" |
| 59 |
|
| 60 |
S="${WORKDIR}/jre" |
| 61 |
|
| 62 |
@@ -91,12 +85,6 @@ pkg_nofetch() { |
| 63 |
einfo "'${JRE_URI}'" |
| 64 |
einfo "and move it to '${DISTDIR}'" |
| 65 |
|
| 66 |
- if use jce; then |
| 67 |
- einfo "Also download '${JCE_FILE}' from:" |
| 68 |
- einfo "'${JCE_URI}'" |
| 69 |
- einfo "and move it to '${DISTDIR}'" |
| 70 |
- fi |
| 71 |
- |
| 72 |
einfo |
| 73 |
einfo "If the above mentioned urls do not point to the correct version anymore," |
| 74 |
einfo "please download the files from Oracle's java download archive:" |
| 75 |
@@ -116,10 +104,6 @@ src_unpack() { |
| 76 |
} |
| 77 |
|
| 78 |
src_prepare() { |
| 79 |
- if use jce ; then |
| 80 |
- mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die |
| 81 |
- fi |
| 82 |
- |
| 83 |
default |
| 84 |
|
| 85 |
# Remove the hook that calls Oracle's evil usage tracker. Not just |
| 86 |
@@ -170,17 +154,8 @@ src_install() { |
| 87 |
dodir "${dest}" |
| 88 |
cp -pPR bin lib man "${ddest}" || die |
| 89 |
|
| 90 |
- if use jce ; then |
| 91 |
- dodir ${dest}/lib/security/strong-jce |
| 92 |
- mv "${ddest}"/lib/security/US_export_policy.jar \ |
| 93 |
- "${ddest}"/lib/security/strong-jce || die |
| 94 |
- mv "${ddest}"/lib/security/local_policy.jar \ |
| 95 |
- "${ddest}"/lib/security/strong-jce || die |
| 96 |
- dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \ |
| 97 |
- "${dest}"/lib/security/US_export_policy.jar |
| 98 |
- dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \ |
| 99 |
- "${dest}"/lib/security/local_policy.jar |
| 100 |
- fi |
| 101 |
+ ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \ |
| 102 |
+ "${ddest}"/lib/security/ || die |
| 103 |
|
| 104 |
if use nsplugin ; then |
| 105 |
local nsplugin_link=${nsplugin##*/} |
Archives