diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2016-09-15 23:19:15 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2016-09-15 23:19:15 +0200 |
commit | a36ff5457de13eb896fc4741d691c72b94491d49 (patch) | |
tree | e00432b38dfd0c7fb82b8c8e785ec3ef5310cd0c | |
parent | Add java 9 JDK (diff) | |
download | portage-a36ff5457de13eb896fc4741d691c72b94491d49.tar.xz portage-a36ff5457de13eb896fc4741d691c72b94491d49.zip |
Remove java
-rw-r--r-- | dev-java/oracle-jdk-bin/Manifest | 7 | ||||
-rw-r--r-- | dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env | 15 | ||||
-rw-r--r-- | dev-java/oracle-jdk-bin/oracle-jdk-bin-9_pre135.ebuild | 310 | ||||
-rw-r--r-- | virtual/jdk/jdk-9.ebuild | 13 | ||||
-rw-r--r-- | virtual/jre/jre-9.ebuild | 14 |
5 files changed, 0 insertions, 359 deletions
diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest deleted file mode 100644 index e66a164..0000000 --- a/dev-java/oracle-jdk-bin/Manifest +++ /dev/null @@ -1,7 +0,0 @@ -DIST jdk-9-ea+135_linux-arm32-vfp-hflt_bin.tar.gz 144620233 SHA256 36148331b3c3937e6a2079a5c6cc56ce95b3038fdb7ed93837e0fb01d889b2c0 SHA512 b895a874b9fb621e055f8a0bdc6481bd1bfac61f45992e99f78250107691ec73a114c68dbfe54a1d6f708a2281fe8c88b4ad64adb7cbfad1e45ec6c3a4118b15 WHIRLPOOL f01ee04fa9203582f3af0598837f92d87c76e1a8f16554496dafce179575cfaf1efcad69ae7d495168084e53f5edd81a31a87203bdaed018eaa62bb56544c47a -DIST jdk-9-ea+135_linux-arm64-vfp-hflt_bin.tar.gz 144658828 SHA256 a26bbd77881ffb74c230b604a00a0ac5605c1f05189d1e335932d98c50cfd15c SHA512 710166ef7670054bdc076982ea35836b4995168784e97a79f136767df5f2534c2bb9a8c0a651068d9ad7c82bed0321b3cc2ecd158212135df6c3385bba610231 WHIRLPOOL bffa04db69d046aa1ed6213472831c973f72c888dfdc9fa97b1c3870695f05062a4b2d2492eb6521f5652bbf44ea8ca863f32ae6f960c800c479dd9b685597a0 -DIST jdk-9-ea+135_linux-x64_bin.tar.gz 238939861 SHA256 a57119f265ec773004ef6787c1889e617f63dd0724e4f7baa0017bb60c15d8ad SHA512 65cc1be49b31d986afd4eecb4a514d76ec9e4a89ba9431f5a6218a4ab0516b58daf57ab9a83e240aff6e1dae5ba6b4792ef6d8d3a7d95480148c6359a0cc4254 WHIRLPOOL e3cba6954bcb2ad2be5f952e406c341c1dda7e81ff6c41bd2c812a16201e20325f6bcc025b8cca11d789445e140fb9c8ff8c6250c12191a3cd891ab331e97e77 -DIST jdk-9-ea+135_linux-x86_bin.tar.gz 241529001 SHA256 1a7e8ba8faf931cadb4a1c25ee4e708f5987ddff96755e09f3003559bea662e0 SHA512 981c49408ba7c124ae73878ab78754c67f6b623b12e2fb8b3530198407640af286111e1e067a2ea863070fc8255b4a82beadcfa26d6064293c0ef5dd834f4b6d WHIRLPOOL 748ced06411c607c715f34760e765c0f79c7c895cc3e79b210281e42d18188187a6ad7f3dec1d5335d4ddc25e330f456d52a6b110865c2854c0ab317397c9c0e -DIST jdk-9-ea+135_osx-x64_bin.dmg 277956842 SHA256 1b9d771f5a7ef53272138ade63760733b0cb57f811ffc44208953da832916690 SHA512 68e644598cc63010c91f797dda4f62440bef18f8a3d26b2670d13e37f080b2aad39a50111e5f65e3e8246048ce4873e9d653dd523bd360fff7861798683ac454 WHIRLPOOL f8b8c27cb5457838acf45fdb76335788b218762441c0734f66b7042e40ac8ade670ed5331b1280597da622003c4ee02e22b102ae20c7423530b60f118174ff8e -DIST jdk-9-ea+135_solaris-sparcv9_bin.tar.gz 186620142 SHA256 1df4ed4a14790df0e0bace03b25810834e9e5cda54561f8aefc8e0e3c7e9120c SHA512 6e7a041b93d2acaacb7c2972a77594caac79081967c419b7d30a3fafd2771c8418e01b0ee4118cf0066e8b595445979791fe29e9554467065e00e06bc9dfa845 WHIRLPOOL dddb72eeb0d216abbc80e3cf0d4a35d837092228ed24bede1bebf81d88d516e06d55ab38c93fb0aab26a02d88ab964235ac4ef18752201a7061c5101d1da20da -DIST jdk-9-ea+135_solaris-x64_bin.tar.gz 185145232 SHA256 9fce945f7d2275999f707176b1d3569b98b193c73f0ac4c5215d5bc632a427b2 SHA512 487160234225a384ab282c6c47987113c4a85a113facbdc2941640280360f078b7dc912b817bc73d3130224ad8403765ed1b07eed03e83ebfac1ee8481b85618 WHIRLPOOL 43beeddabf1316378c07915c583a15de05e93eaa77c09a50c8edf86f2b0eb34ee6b98fcab7980ab838826f27e77f9e1dc9f130eb4b8fb108c80e107eaf376ac3 diff --git a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env b/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env deleted file mode 100644 index f6a0452..0000000 --- a/dev-java/oracle-jdk-bin/files/oracle-jdk-bin-9.env +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -VERSION="Oracle JDK @PV@" -JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@" -JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@" -JAVAC=${JAVA_HOME}/bin/javac -PATH="${JAVA_HOME}/bin" -ROOTPATH="${JAVA_HOME}/bin" -LDPATH="${JAVA_HOME}/lib/@PLATFORM@/:${JAVA_HOME}/lib/@PLATFORM@/server/" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="9" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH" diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9_pre135.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9_pre135.ebuild deleted file mode 100644 index 8c36a4e..0000000 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9_pre135.ebuild +++ /dev/null @@ -1,310 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils java-vm-2 prefix versionator - -JDK_URI="https://jdk9.java.net/download/" - -BUILD_NUMBER="$(get_version_component_range 2)" -MY_PV="$(get_version_component_range 1)-ea+${BUILD_NUMBER#pre}" - -# This is a list of archs supported by this update. -# Currently arm comes and goes. -AT_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x64-macos arm arm64 ) - -AT_amd64="jdk-${MY_PV}_linux-x64_bin.tar.gz" -AT_arm="jdk-${MY_PV}_linux-arm32-vfp-hflt_bin.tar.gz" -AT_arm64="jdk-${MY_PV}_linux-arm64-vfp-hflt_bin.tar.gz" -AT_x86="jdk-${MY_PV}_linux-x86_bin.tar.gz" -AT_x64_solaris="jdk-${MY_PV}_solaris-x64_bin.tar.gz" -AT_sparc64_solaris="${AT_sparc_solaris} jdk-${MY_PV}_solaris-sparcv9_bin.tar.gz" -AT_x64_macos="jdk-${MY_PV}_osx-x64_bin.dmg" - -DESCRIPTION="Oracle's Java SE Development Kit" -HOMEPAGE="http://www.oracle.com/technetwork/java/javase/" -for d in "${AT_AVAILABLE[@]}"; do - SRC_URI+=" ${d}? ( $(eval "echo \${$(echo AT_${d/-/_})}")" - SRC_URI+=" )" -done -unset d - -LICENSE="Oracle-EADLA" # will probably change to Oracle-BCLA-JavaSE when released -SLOT="9" -KEYWORDS="~arm ~arm64 ~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc64-solaris ~x64-solaris" -IUSE="alsa cups derby doc +fontconfig headless-awt javafx jce nsplugin pax_kernel selinux source" -REQUIRED_USE="javafx? ( alsa fontconfig )" - -RESTRICT="fetch preserve-libs strip" -QA_PREBUILT="*" - -# NOTES: -# -# * cups is dlopened. -# -# * libpng is also dlopened but only by libsplashscreen, which isn't -# important, so we can exclude that. -# -# * We still need to work out the exact AWT and JavaFX dependencies -# under MacOS. It doesn't appear to use many, if any, of the -# dependencies below. -# -RDEPEND="!x64-macos? ( - !headless-awt? ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrender - x11-libs/libXtst - ) - javafx? ( - dev-libs/glib:2 - dev-libs/libxml2:2 - dev-libs/libxslt - media-libs/freetype:2 - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXtst - x11-libs/libXxf86vm - x11-libs/pango - virtual/opengl - ) - ) - alsa? ( media-libs/alsa-lib ) - cups? ( net-print/cups ) - doc? ( dev-java/java-sdk-docs:${SLOT} ) - fontconfig? ( media-libs/fontconfig:1.0 ) - !prefix? ( sys-libs/glibc:* ) - selinux? ( sec-policy/selinux-java )" - -# A PaX header isn't created by scanelf so depend on paxctl to avoid -# fallback marking. See bug #427642. -DEPEND="app-arch/zip - pax_kernel? ( sys-apps/paxctl )" - -S="${WORKDIR}/jdk" - -check_tarballs_available() { - local uri=$1; shift - local dl= unavailable= - for dl in "${@}" ; do - [[ ! -f "${DISTDIR}/${dl}" ]] && unavailable+=" ${dl}" - done - - if [[ -n "${unavailable}" ]] ; then - if [[ -z ${_check_tarballs_available_once} ]] ; then - einfo - einfo "Oracle requires you to download the needed files manually after" - einfo "accepting their license through a javascript capable web browser." - einfo - _check_tarballs_available_once=1 - fi - einfo "Download the following files:" - for dl in ${unavailable}; do - einfo " ${dl}" - done - einfo "at '${uri}'" - einfo "and move them to '${DISTDIR}'" - 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:" - einfo - einfo " https://jdk9.java.net/download/" - einfo - fi -} - -pkg_nofetch() { - local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") ) - check_tarballs_available "${JDK_URI}" "${distfiles[@]}" - -} - -src_unpack() { - if use x64-macos ; then - pushd "${T}" > /dev/null - mkdir dmgmount - hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \ - -mountpoint "${T}"/dmgmount - local update=$(get_version_component_range 4) - [[ ${#update} == 1 ]] && update="0${update}" - xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg - hdiutil detach "${T}"/dmgmount - zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv - mv Contents/Home "${WORKDIR}"/jdk${MY_PV} - popd > /dev/null - else - default - fi - - # Upstream is changing their versioning scheme every release around 1.8.0.*; - # to stop having to change it over and over again, just wildcard match and - # live a happy life instead of trying to get this new jdk1.8.0_05 to work. - mv "${WORKDIR}"/jdk* "${S}" || die -} - -src_prepare() { - if use jce ; then - cp lib/security/unlimited_policy/*.jar lib/security/ || die - fi - - if [[ -n ${JAVA_PKG_STRICT} ]] ; then - # Mark this binary early to run it now. - pax-mark Cm ./bin/javap - - eqawarn "Ensure that this only calls trackJavaUsage(). If not, see bug #559936." - eqawarn - eqawarn "$(./bin/javap -J-Duser.home=${T} -c jdk.internal.vm.PostVMInitHook || die)" - fi -} - -src_install() { - local dest="/opt/${P}" - local ddest="${ED}${dest#/}" - - # Create files used as storage for system preferences. - mkdir .systemPrefs || die - touch .systemPrefs/.system.lock || die - touch .systemPrefs/.systemRootModFile || die - - if ! use alsa ; then - rm -vf lib/*/libjsoundalsa.* || die - fi - - if use headless-awt ; then - rm -vf lib/*/lib*{[jx]awt,splashscreen}* \ - bin/{javaws,policytool} \ - bin/appletviewer || die - fi - - if ! use javafx ; then - rm -vf lib/*/lib*{decora,fx,glass,prism}* \ - lib/*/libgstreamer-lite.* lib/{,ext/}*fx* \ - bin/*javafx* bin/javapackager || die - fi - - if ! use nsplugin ; then - rm -vf lib/*/libnpjp2.* || die - else - local nsplugin=$(echo lib/*/libnpjp2.*) - fi - - # Even though plugins linked against multiple ffmpeg versions are - # provided, they generally lag behind what Gentoo has available. - rm -vf lib/*/libavplugin* || die - - dodoc COPYRIGHT - dodir "${dest}" - cp -pPR bin include lib "${ddest}" || die - - if use derby ; then - cp -pPR db "${ddest}" || die - fi - - if use nsplugin ; then - local nsplugin_link=${nsplugin##*/} - nsplugin_link=${nsplugin_link/./-${PN}-${SLOT}.} - dosym "${dest}/${nsplugin}" "/usr/$(get_libdir)/nsbrowser/plugins/${nsplugin_link}" - fi - - if use source ; then - cp -v src.zip "${ddest}" || die - - if use javafx ; then - cp -v javafx-src.zip "${ddest}" || die - fi - fi - - if [[ -d lib/desktop ]] ; then - # Install desktop file for the Java Control Panel. - # Using ${PN}-${SLOT} to prevent file collision with jdk and or - # other slots. make_desktop_entry can't be used as ${P} would - # end up in filename. - newicon lib/desktop/icons/hicolor/48x48/apps/sun-jcontrol.png \ - sun-jcontrol-${PN}-${SLOT}.png || die - sed -e "s#Name=.*#Name=Java Control Panel for Oracle JDK ${SLOT}#" \ - -e "s#Exec=.*#Exec=/opt/${P}/jdk/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ - -e "s#Application;##" \ - -e "/Encoding/d" \ - lib/desktop/applications/sun_java.desktop \ - > "${T}"/jcontrol-${PN}-${SLOT}.desktop || die - domenu "${T}"/jcontrol-${PN}-${SLOT}.desktop - fi - - # Prune all fontconfig files so libfontconfig will be used and only install - # a Gentoo specific one if fontconfig is disabled. - # http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html - rm "${ddest}"/jdk/lib/fontconfig.* - if ! use fontconfig ; then - cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die - eprefixify "${T}"/fontconfig.properties - insinto "${dest}"/lib/ - doins "${T}"/fontconfig.properties - fi - - # This needs to be done before CDS - #215225 - java-vm_set-pax-markings "${ddest}" - - # see bug #207282 - einfo "Creating the Class Data Sharing archives" - case ${ARCH} in - arm|ia64) - ${ddest}/bin/java -client -Xshare:dump || die - ;; - x86) - ${ddest}/bin/java -client -Xshare:dump || die - # limit heap size for large memory on x86 #467518 - # this is a workaround and shouldn't be needed. - ${ddest}/bin/java -server -Xms64m -Xmx64m -Xshare:dump || die - ;; - *) - ${ddest}/bin/java -server -Xshare:dump || die - ;; - esac - - # Remove empty dirs we might have copied. - find "${D}" -type d -empty -exec rmdir -v {} + || die - - if use x64-macos ; then - # Fix miscellaneous install_name issues. - pushd "${ddest}"/jdk/lib > /dev/null || die - local lib needed nlib npath - for lib in decora_sse glass prism_{common,es2,sw} ; do - lib=lib${lib}.dylib - einfo "Fixing self-reference of ${lib}" - install_name_tool \ - -id "${EPREFIX}${dest}/jdk/lib/${lib}" \ - "${lib}" - done - popd > /dev/null - - # This is still jdk1{5,6}, even on Java 8, so don't change it - # until you know different. - 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 -} - -pkg_postinst() { - java-vm-2_pkg_postinst - - if ! use headless-awt && ! use javafx; then - ewarn "You have disabled the javafx flag. Some modern desktop Java applications" - ewarn "require this and they may fail with a confusing error message." - fi -} diff --git a/virtual/jdk/jdk-9.ebuild b/virtual/jdk/jdk-9.ebuild deleted file mode 100644 index 09de360..0000000 --- a/virtual/jdk/jdk-9.ebuild +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="6" - -DESCRIPTION="Virtual for Java Development Kit (JDK)" -SLOT="9" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" - -RDEPEND="|| ( - dev-java/oracle-jdk-bin:9 - )" diff --git a/virtual/jre/jre-9.ebuild b/virtual/jre/jre-9.ebuild deleted file mode 100644 index e9ba86b..0000000 --- a/virtual/jre/jre-9.ebuild +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="6" - -DESCRIPTION="Virtual for Java Runtime Environment (JRE)" -SLOT="9" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" - -RDEPEND="|| ( - virtual/jdk:9 - dev-java/oracle-jre-bin:9 - )" |