Fix oracle-jdk-bin-1.7.0.80 to EAPI 6
This commit is contained in:
parent
b901f032b8
commit
24912cb667
|
|
@ -7,5 +7,5 @@ DIST jdk-7u80-linux-i586.tar.gz 154850445 BLAKE2B a94426088fa12456b74b24938279e9
|
|||
DIST jdk-7u80-linux-x64.tar.gz 153530841 BLAKE2B 9ff05c97b65b3b49f4d5088fa4b021aaa58806a1d9937b3c65db8e25bd44465880e66f60b75483bed12b9f562d3bf6430480516a86724a16262776231044a95e SHA512 a772878f740e87835bafc82841e8f4c1dfbe8bc79e072d3f6c5c74d3a206eb9001a53b474d91a22819c7c0d6407ed88993635c39738779c2b08c22c7a1c2e9e9
|
||||
DIST jdk-8u241-linux-i586.tar.gz 195143852 BLAKE2B 595e614fb34122a72fca5ce70a4ed4702e725a2f3a3084c7f6a86be8901799f9b4eb11b04b9b054d59d011a285276922532dbc52a04e33a5c49b9a22fe9bdcb4 SHA512 66edeb10d4ab38e05f74a17f8bdfe681069e2ca14a42b2c0f6159cefed6ccba69581086d0d6209476cb731913451b58a3a503bc28456ac6c5ef68722d124a04d
|
||||
DIST jdk-8u241-linux-x64.tar.gz 194545143 BLAKE2B 13369d68bc0c328c4efbba90697080fe4d65fb8167bc9b20b92b6d4d6845c48486c53f2371e362fdb6195e8ffdb3ad8f4b486115ffbcf3e2f8e2966b6ad46d4c SHA512 1123fb82926ac207fdbfc1dd3efd588832feed15cac755d1ca604e321816c2fb3c695b9ce3f99b5a14f6c45973cc8dadae87d5c79c49d67336f8a5cb50c56050
|
||||
EBUILD oracle-jdk-bin-1.7.0.80.ebuild 10272 BLAKE2B cad97300b23d96d407e41bc4e0e11b615a1aa0809ad5ff034ddb1c518222e5af5c49c215cb7be6abe750deceb20c7d69418d899cac1652506f88d1f36c90207f SHA512 4462863229905d6d18f4260174195f33a86a0b47579e6699ec593c205c47f3863baa1553613a74c9c158aef3a492b4739cf4ffafee2fc31ace451dd9c6b9cdd4
|
||||
EBUILD oracle-jdk-bin-1.7.0.80.ebuild 7525 BLAKE2B cf5997f8872494b1334653c7637a72472326f04be56460c5cdce7b318b96867fbd921c2d1a124f29e78d1e0a0c1e5bf9c1841af8e22a8daac22ba55ccb41975b SHA512 5526de842d446d6e78ab783cb905c11733b951e61f2f4b6d0bd2a0bdc5776e6c83b10612d1889dcef139e352fa6f187facb60633ab80496da30bcd8cd70f3508
|
||||
EBUILD oracle-jdk-bin-1.8.0.241.ebuild 8238 BLAKE2B 39a8ef091be7f6195367ae50fb18d7d12f0e9255ce9d04012eb2da8f6be067c096f8f3d17b266c16409391ff6b64236434b273a2c4b36b8aad640af86100aca1 SHA512 e5877fc6bcf3498300e516384434ff423fb7920de365278a1aa104c1147398af1e7b263d2dff94e0321d84d0dfacc0b04b0e337cbcb32339e504a9d44f4fe563
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI="5"
|
||||
EAPI="6"
|
||||
|
||||
inherit eutils java-vm-2 prefix versionator
|
||||
|
||||
|
|
@ -23,25 +23,11 @@ FX_VERSION="2_2_$(get_version_component_range 4)"
|
|||
|
||||
AT_x86="jdk-${MY_PV}-linux-i586.tar.gz"
|
||||
AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz"
|
||||
AT_arm="jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz"
|
||||
AT_x86_solaris="jdk-${MY_PV}-solaris-i586.tar.gz"
|
||||
AT_x64_solaris="${AT_x86_solaris} jdk-${MY_PV}-solaris-x64.tar.gz"
|
||||
AT_sparc_solaris="jdk-${MY_PV}-solaris-sparc.tar.gz"
|
||||
AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9.tar.gz"
|
||||
AT_x86_macos="jdk-${MY_PV}-macosx-x64.dmg"
|
||||
AT_x64_macos="jdk-${MY_PV}-macosx-x64.dmg"
|
||||
|
||||
FXDEMOS_linux="javafx_samples-${FX_VERSION}-linux.zip"
|
||||
|
||||
DEMOS_x86="${FXDEMOS_linux} jdk-${MY_PV}-linux-i586-demos.tar.gz"
|
||||
DEMOS_amd64="${FXDEMOS_linux} jdk-${MY_PV}-linux-x64-demos.tar.gz"
|
||||
DEMOS_arm="${FXDEMOS_linux} jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz"
|
||||
DEMOS_x86_solaris="jdk-${MY_PV}-solaris-i586-demos.tar.gz"
|
||||
DEMOS_x64_solaris="${DEMOS_x86_solaris} jdk-${MY_PV}-solaris-x64-demos.tar.gz"
|
||||
DEMOS_sparc_solaris="jdk-${MY_PV}-solaris-sparc-demos.tar.gz"
|
||||
DEMOS_sparc64_solaris="${DEMOS_sparc_solaris} jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz"
|
||||
DEMOS_x86_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
|
||||
DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.tar.gz"
|
||||
|
||||
JCE_DIR="UnlimitedJCEPolicy"
|
||||
JCE_FILE="${JCE_DIR}JDK7.zip"
|
||||
|
|
@ -130,37 +116,11 @@ pkg_nofetch() {
|
|||
use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}"
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
# Special case for ARM soft VS hard float.
|
||||
if use arm ; then
|
||||
if [[ ${CHOST} == *-hardfloat-* ]] ; then
|
||||
unpack jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz
|
||||
use examples && unpack jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz
|
||||
else
|
||||
unpack jdk-${MY_PV}-linux-arm-vfp-sflt.tar.gz
|
||||
use examples && unpack jdk-${MY_PV}-linux-arm-vfp-sflt-demos.tar.gz
|
||||
fi
|
||||
use examples && unpack javafx_samples-${FX_VERSION}-linux.zip
|
||||
use jce && unpack ${JCE_FILE}
|
||||
elif use x86-macos || use x64-macos ; then
|
||||
pushd "${T}" > /dev/null
|
||||
mkdir dmgmount
|
||||
hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \
|
||||
-mountpoint "${T}"/dmgmount
|
||||
xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ $(get_version_component_range 4).pkg
|
||||
hdiutil detach "${T}"/dmgmount
|
||||
zcat jdk1${MY_PV/u/0}.pkg/Payload | cpio -idv
|
||||
mv Contents/Home "${S}"
|
||||
popd > /dev/null
|
||||
else
|
||||
default
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if use jce; then
|
||||
mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die
|
||||
fi
|
||||
eapply_user
|
||||
}
|
||||
|
||||
src_install() {
|
||||
|
|
@ -188,7 +148,8 @@ src_install() {
|
|||
fi
|
||||
|
||||
dodoc COPYRIGHT
|
||||
dohtml README.html
|
||||
docinto html
|
||||
dodoc README.html
|
||||
|
||||
dodir "${dest}"
|
||||
cp -pPR bin include jre lib man "${ddest}" || die
|
||||
|
|
@ -217,15 +178,15 @@ src_install() {
|
|||
"${dest}"/jre/lib/security/local_policy.jar
|
||||
fi
|
||||
|
||||
if use nsplugin; then
|
||||
install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
|
||||
fi
|
||||
# if use nsplugin; then
|
||||
# install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so
|
||||
# fi
|
||||
|
||||
if use source; then
|
||||
cp -p src.zip "${ddest}" || die
|
||||
fi
|
||||
|
||||
if use !arm && use !x86-macos && use !x64-macos ; then
|
||||
if use !arm ; then
|
||||
# Install desktop file for the Java Control Panel.
|
||||
# Using ${PN}-${SLOT} to prevent file collision with jre and or
|
||||
# other slots. make_desktop_entry can't be used as ${P} would
|
||||
|
|
@ -276,32 +237,6 @@ src_install() {
|
|||
# Remove empty dirs we might have copied
|
||||
find "${D}" -type d -empty -exec rmdir -v {} + || die
|
||||
|
||||
if use x86-macos || use x64-macos ; then
|
||||
# fix misc install_name issues
|
||||
pushd "${ddest}"/jre/lib > /dev/null || die
|
||||
local lib needed nlib npath
|
||||
for lib in \
|
||||
libJObjC libdecora-sse libglass libjavafx-{font,iio} \
|
||||
libjfxmedia libjfxwebkit libprism-es2 ;
|
||||
do
|
||||
lib=${lib}.dylib
|
||||
einfo "Fixing self-reference of ${lib}"
|
||||
install_name_tool \
|
||||
-id "${EPREFIX}${dest}/jre/lib/${lib}" \
|
||||
"${lib}"
|
||||
done
|
||||
popd > /dev/null
|
||||
for nlib in jdk1{5,6} ; do
|
||||
install_name_tool -change \
|
||||
/usr/lib/libgcc_s_ppc64.1.dylib \
|
||||
/usr/lib/libSystem.B.dylib \
|
||||
"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
|
||||
install_name_tool -id \
|
||||
"${EPREFIX}${dest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib \
|
||||
"${ddest}"/lib/visualvm/profiler/lib/deployed/${nlib}/mac/libprofilerinterface.jnilib
|
||||
done
|
||||
fi
|
||||
|
||||
set_java_env
|
||||
java-vm_revdep-mask
|
||||
java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
|
||||
|
|
|
|||
Loading…
Reference in a new issue