diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-29 11:22:34 +0000 |
commit | bd7908c6630f38067350d396ac5d18c3cc2434a0 (patch) | |
tree | 3559b3e11424f5529527f2474d8a977a91ee3389 /dev-java/oracle-jre-bin | |
parent | 8b2628ad8526c806375e7b157889e4274b70248b (diff) |
gentoo resync : 29.10.2017
Diffstat (limited to 'dev-java/oracle-jre-bin')
-rw-r--r-- | dev-java/oracle-jre-bin/Manifest | 7 | ||||
-rw-r--r-- | dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152-r1.ebuild (renamed from dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.144.ebuild) | 35 |
2 files changed, 8 insertions, 34 deletions
diff --git a/dev-java/oracle-jre-bin/Manifest b/dev-java/oracle-jre-bin/Manifest index e2edb93607e2..42af440de73a 100644 --- a/dev-java/oracle-jre-bin/Manifest +++ b/dev-java/oracle-jre-bin/Manifest @@ -1,9 +1,8 @@ AUX fontconfig.Gentoo.properties 11196 SHA256 9372ca516ff36609d846a9cb446dde3212e976c10166d8e231312d6238d1db0c SHA512 1802e52383a04efd0d7fb4d6a3903f99128dce90afcb10b9dd0d3515e5feafb807449024dbe5742c7dfa9d43736e474412e1a289e06b29cf3a58e59deedd56f9 WHIRLPOOL f4c5364255f8da18bf61501d6fac10972216182e891cadd90e2cccd27917caaeeb29cf3691e865ce02937904efb30716fd8de2fca875929ff89b06ada2cff0b6 AUX oracle-jre-bin.env.sh 785 SHA256 77cc6b99e02f7f2837b649d002129d3a1ef90ac047afaebbcdb2925e5895e747 SHA512 fee30a728d97822e0189e6687ac285e72270207d43ae2859159cbd212b3897cfa153aa27f66b06ee704ac24637f2d88b579c3aedc4026fd8508d59622e68b0e6 WHIRLPOOL fa163eedb0139bbe01644739609b7678ca6050c890233c5d5deed7e0810714d529e033bc5615f634a2d60b49365d9981a928c05c1a699a6a0c8996b296c98249 -DIST jce_policy-8.zip 8409 SHA256 f3020a3922efd6626c2fff45695d527f34a8020e938a49292561f18ad1320b59 SHA512 abbaa81a35f904ec61b4cf3c2d1ca8c8d49e53bb248e698185eea906939d68f5063412800585ec74027aab1012ef189aebe1dc99fe8ef4230a0ecb0b527f88e5 WHIRLPOOL 8c9ce1ea4673b75fa6271b74e598880f98361d5d2c9c25439fa0af3d07cfeb871b39682dae4e38160f49770b1fec953162e451b9b2cf44d2c72a226944212bcc -DIST jre-8u144-linux-i586.tar.gz 78658631 SHA256 9ac5b0d6cda9279a4959a6eb635d849d745a37dafc24666539d1c8f7d76ab77a SHA512 038e367fb00007e6b0f70ed3e48f318cfcb4144ef88b3a33d6c152cb186ede43622bc5d2fb40b39c695fdbe1fa735ab97f501a6ad0ed0a6cf48b286cc08e9ceb WHIRLPOOL 0bac95fc572bb1466b3f69c7e3dd03a77611366bc7c8076eb2feac41ecfde9a4aea6bb60b52b9db1dc0ec2bffcf553abe4ac4b1ffd28f7f3e1b6b71cd8ffc2fb -DIST jre-8u144-linux-x64.tar.gz 75922776 SHA256 4e6e11aad54ae3c716a5607ee88d81f3f1e8b5b23ee474b0272dba351ee9f28a SHA512 fba5a5f5959746cb76a71847f5c6e3142816940d18c0022c0baf59611d43b24fae1052eeb217f09e840b5c393118260fb99dd38d1db7e74bb07ab0c34c2e1d60 WHIRLPOOL ac1921780076ff7ab5be5b942d5be0bab7fe12c027f1564b91734086d14c5a0da6b66d137034d7ee0318c4f72cb843013488591d1066a5f55c66dd4f53561a6f -EBUILD oracle-jre-bin-1.8.0.144.ebuild 7192 SHA256 42b4605835176fc8e924d3b57688daaff1ab892c9e39ff0fcd6e9f5a867c7cd8 SHA512 8fb779937cb7cf443ca8c22230e98e5f2116ce8b5e6616239ee52f6f615c1c8f348dfcb96b5ff2cbde12885f1765a8049c265e3190776f3e7fb0ccc38d4eae5b WHIRLPOOL bff60b6fce8bcf801cb900edaa8fbaa5555df58a85a6eb6d56955b926187151663b6ee68fe44cf6555496aecc8a2b28e1c0862794417229324d1f5a0418c227d +DIST jre-8u152-linux-i586.tar.gz 83131659 SHA256 1d0c9202fbed3136d46674547b92d467e28b6256dce5d1793c55c284c285a14d SHA512 8bd655ae97c333ed57991ed6d13d2c2647f85e5a1c853dd76031b8e7689db9a1b183bc665acc5b9f989139b34300ac65ab65c80e18234d6d1b06a4512fc4e542 WHIRLPOOL ea908a4efed078433cfb21ae6f015292ad0910e716e3f1a8748336e44484f0848dc317518e4fac04fd38aa6338f43b389c586b1cb6164639830f0024313688b7 +DIST jre-8u152-linux-x64.tar.gz 80061016 SHA256 ed04ffbf8050a69b15f02c51a2cae8e0de9362e7f6fe8995b1c39c613fc20ede SHA512 7c58ff2c3ac9af423ffab0ebfbfa7b4842072f6554569d76a99f8c82fa6935e36dbcf811f9c5510d71fc87db9520e684d877d99cae95f4874578ba42157ce85d WHIRLPOOL 7a3f4e34d70b4ccc850df754084448065c844973d77dec98ff57c2c8fa6338417b4e3f732995fcbc4e66cd8cbc34a2306aff11c4579749d66e33538c0d724682 +EBUILD oracle-jre-bin-1.8.0.152-r1.ebuild 6433 SHA256 ed549ed2892862187e85e3a298e0c51788e8939dcc717a140d875aec7fbcb57a SHA512 2b26c0a9250fa719b1da5370b8cb632a6bcf6f2336cabe21d086ed73030757776d94de13e3be8a64b1002dfcf3af61501f6a08eb6e903b79888df0e9b96c9908 WHIRLPOOL a980ec648242f82885f84fe576b1d370fa086d3d6d7e414691ce08e9d9190bb5dc970ee615a843bb9b6a09e6379fdf1af0dc95d31402ef72606eee2070935053 MISC ChangeLog 11392 SHA256 39a831c8202ef166f0d803392aaf33a5a6601418ca79f8ecaa6c83b68d9502a7 SHA512 0ddcfde062ed95e4a63eab563ea82e8d3056ecae7a6846932cebc632678ecd67471642f4855034eeeff1576309d7980f0b29a5ef7258b403803e39cf581d0ec5 WHIRLPOOL c35c02a9ec841f374ee9ab380945c7a9fb3368a9383191e20e0ec790b16a68d704641be1c5793a25fcd6a91803ea6039ce34d194851fa8ce8238832d2d8375c6 MISC ChangeLog-2015 14832 SHA256 8c74c97192cc9a77e2b2b78a095c8dc32cf08bf6237e2258d5cd130ed763d2fa SHA512 f48a6130827e7069f75f02aaf80121b8c0b7610dfff47b23e99e373222dd6cfcd45281efa5ec7e9a216af5d6119b261585a3071d21d3cb0156acfaf240017d20 WHIRLPOOL ddc5ae2510ec21d4ab0e197a6bfef8d84f803312bcb8a95df409f8bbbd3cc2e8f7f004bbe54419c2841386ae67fe5651645cb326f590f95c7cd34d04d1beab78 MISC metadata.xml 743 SHA256 d3a8894bd17fccb6162d8d164bae71ca97c90f60ff1ecc64cc414d1daf7d15c0 SHA512 31515728907e1fdc96fe6a27f62585c528370a544a306b4a3a26cf86d8a248211e3852e4a532d9a59be0e534393e6f11bd46df39b439084eb1234d7a6bea4d42 WHIRLPOOL 92faa7971ee6177414168ce1c8a12c9af87653e30f51b98d2d0a16e63f7d35fbb3467a83547f0c59a7f3665aee9ed915a806539b4b0501babb3e8de210b28207 diff --git a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.144.ebuild b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152-r1.ebuild index 0829cfb55ff3..cdc8dfd0e2db 100644 --- a/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.144.ebuild +++ b/dev-java/oracle-jre-bin/oracle-jre-bin-1.8.0.152-r1.ebuild @@ -5,9 +5,8 @@ EAPI=6 inherit eutils java-vm-2 prefix versionator -# This URIs need updating when bumping! +# This URI needs to be updated when bumping! JRE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jre8-downloads-2133155.html" -JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html" if [[ "$(get_version_component_range 4)" == 0 ]] ; then S_PV="$(get_version_component_range 1-3)" @@ -21,15 +20,11 @@ MY_PV="$(get_version_component_range 2)${MY_PV_EXT}" AT_amd64="jre-${MY_PV}-linux-x64.tar.gz" AT_x86="jre-${MY_PV}-linux-i586.tar.gz" -JCE_DIR="UnlimitedJCEPolicyJDK8" -JCE_FILE="jce_policy-8.zip" - DESCRIPTION="Oracle's Java SE Runtime Environment" HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" SRC_URI=" amd64? ( ${AT_amd64} ) - x86? ( ${AT_x86} ) - jce? ( ${JCE_FILE} )" + x86? ( ${AT_x86} )" LICENSE="Oracle-BCLA-JavaSE" SLOT="1.8" @@ -78,8 +73,7 @@ RDEPEND="!x64-macos? ( !prefix? ( sys-libs/glibc:* ) selinux? ( sec-policy/selinux-java )" -DEPEND="app-arch/zip - jce? ( app-arch/unzip )" +DEPEND="app-arch/zip" S="${WORKDIR}/jre" @@ -91,12 +85,6 @@ pkg_nofetch() { einfo "'${JRE_URI}'" einfo "and move it to '${DISTDIR}'" - if use jce; then - einfo "Also download '${JCE_FILE}' from:" - einfo "'${JCE_URI}'" - einfo "and move it to '${DISTDIR}'" - fi - einfo einfo "If the above mentioned urls do not point to the correct version anymore," einfo "please download the files from Oracle's java download archive:" @@ -116,10 +104,6 @@ src_unpack() { } src_prepare() { - if use jce ; then - mv "${WORKDIR}"/${JCE_DIR} lib/security/ || die - fi - default # Remove the hook that calls Oracle's evil usage tracker. Not just @@ -170,17 +154,8 @@ src_install() { dodir "${dest}" cp -pPR bin lib man "${ddest}" || die - if use jce ; then - dodir ${dest}/lib/security/strong-jce - mv "${ddest}"/lib/security/US_export_policy.jar \ - "${ddest}"/lib/security/strong-jce || die - mv "${ddest}"/lib/security/local_policy.jar \ - "${ddest}"/lib/security/strong-jce || die - dosym "${dest}"/lib/security/${JCE_DIR}/US_export_policy.jar \ - "${dest}"/lib/security/US_export_policy.jar - dosym "${dest}"/lib/security/${JCE_DIR}/local_policy.jar \ - "${dest}"/lib/security/local_policy.jar - fi + ln -s policy/$(usex jce unlimited limited)/{US_export,local}_policy.jar \ + "${ddest}"/lib/security/ || die if use nsplugin ; then local nsplugin_link=${nsplugin##*/} |