From 7da85f55402f785d6176860e311498ed2fd5fa31 Mon Sep 17 00:00:00 2001 From: Patrice Clement Date: Thu, 26 Mar 2015 16:06:22 +0000 Subject: [PATCH] Revert previous commit and revbump the file instead. Signed-off-by: monsieurp@gentoo.org Package-Manager: portage-2.2.14/cvs/Linux i686 Manifest-Sign-Key: 0x93491BB8 --- dev-java/oracle-jdk-bin/ChangeLog | 8 +- dev-java/oracle-jdk-bin/Manifest | 19 +- .../oracle-jdk-bin-1.8.0.40-r1.ebuild | 317 ++++++++++++++++++ .../oracle-jdk-bin-1.8.0.40.ebuild | 9 +- 4 files changed, 336 insertions(+), 17 deletions(-) create mode 100644 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40-r1.ebuild diff --git a/dev-java/oracle-jdk-bin/ChangeLog b/dev-java/oracle-jdk-bin/ChangeLog index 22c85cb8d63f..fbecc5aa4add 100644 --- a/dev-java/oracle-jdk-bin/ChangeLog +++ b/dev-java/oracle-jdk-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/oracle-jdk-bin # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.89 2015/03/26 15:52:34 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/ChangeLog,v 1.90 2015/03/26 16:06:11 monsieurp Exp $ + +*oracle-jdk-bin-1.8.0.40-r1 (26 Mar 2015) + + 26 Mar 2015; Patrice Clement + +oracle-jdk-bin-1.8.0.40-r1.ebuild, oracle-jdk-bin-1.8.0.40.ebuild: + Revert previous commit and revbump the file instead. 26 Mar 2015; Patrice Clement metadata.xml, oracle-jdk-bin-1.8.0.40.ebuild: diff --git a/dev-java/oracle-jdk-bin/Manifest b/dev-java/oracle-jdk-bin/Manifest index 81746a922d19..99f733c091b0 100644 --- a/dev-java/oracle-jdk-bin/Manifest +++ b/dev-java/oracle-jdk-bin/Manifest @@ -52,17 +52,18 @@ DIST jdk-8u40-solaris-x64-demos.tar.gz 9737226 SHA256 8240f6e2816dcf3e7669fe3134 DIST jdk-8u40-solaris-x64.tar.gz 94276101 SHA256 d84da462b1214947038336e967371e3a818ef30f2e2c5ae35600c5803862712d SHA512 84a98a89343beeaab6d5f4985cbeeb57443a7b7cccd936b40350ecd9a1334a14bcd06f6a67df172406e76efdea5236986bec38833350a8547e15e14926370b4c WHIRLPOOL 5b3656cded7616f8b6a11c04447fd503ba48752866313d1fbf0824c14a312c2b4c04dfe7c0175ba3a7a6dd01301f892569856e84c16dd6d6f5a17c8784812caa EBUILD oracle-jdk-bin-1.7.0.60.ebuild 9910 SHA256 ba9f626a5e86a9860fa995debef6c60b5a0842d6bee5384f7bf64112026fa232 SHA512 1261a52e8dfb9112dab4e5f03b47cdb5552a99fa8929db6f527f937110320da535fc97914d4be655b78b64f82c0c477ab6bd5bb273c34e1aa27a0e289d8bcda8 WHIRLPOOL 0a3424b4d9cc3e10c5649bd3e45774b63b9acaec6cf03bf5dfabd49324487d9a3fba9dd6bb572167ccbf5495a391aeff14feb629fc448880e0315ddd91478cf8 EBUILD oracle-jdk-bin-1.7.0.76.ebuild 10594 SHA256 7db1e102db082bfd98059f6ee2b36e97f307885d1ee129ea3148d5ec72a35877 SHA512 e4d4fce0cb16fd24dad6c9b7381e73bce5ffff5ebba8d6fc346128b5d6d559999342cfd9a5889ae00237cfb50bd881918fa9f3a489df58ee836c0201247645f0 WHIRLPOOL f432fb61efac033c4ab56d25d3e9d1c895b1b620be7efb74d585a4277ddb0ed3c093a48ddc4043bfb7b6ad769e221bd4243122bb849fd3420248892652aa3ea2 -EBUILD oracle-jdk-bin-1.8.0.40.ebuild 10477 SHA256 207ef07b9f8395f6eadea52f43b5365612e073bfc6ea791841a17be7fd6dd553 SHA512 45b515ddb88a75d48f2679cf48e81d1b9dcd32f439cb0a79ffec2f34b5e534c609059b5ac960f4e1c9c13f2f269ab00a4a27a760846ec2c12fa13e009a3867ed WHIRLPOOL 8335e29de9a4c7f576cc16ff1e517007e13ef7b692b5da6cabef31d3f9118b776b804135f04de58b5e4a8e06ca49f9e0f8f911402f446e131c8955b7ff65e65a -MISC ChangeLog 15722 SHA256 118a8936847a7f8914b2bc24067b44a6f6103d22ea80b5892e3cb39645f6439a SHA512 0557b5feb24d2646779b6c42872454e76e85a5504eb706f72e13dd374f3dc9437bf6895f271cebc41cc143577c0b00b1eff293b09d2d36af581db15fb054ba57 WHIRLPOOL cb8a37d0d2692733097bd2aa4e35f85ee4e9393a1d099f4a7ae569d1772217d59267b02ce811946815580ff76f7c0360d88ddcc639eb889c409cac4a160cac16 +EBUILD oracle-jdk-bin-1.8.0.40-r1.ebuild 10480 SHA256 3ae3938667290c1abbde6f0d361b5ce779fc2bc3b17120924b2f8fc7b9d2c0dd SHA512 072cf5b02a7d85e7fe8150af232caa24e216c8b3c371a168bd0213454f240a01dc2897b5406edde389b79690ac3dadf75c7353a0149c032e1da486c3f2e23367 WHIRLPOOL f547830229bd9c552aadd9c2cccd3381b930066d491efa379c644207f286704ba13fe4b7a8f5050815a6cca3bd85af1caa5347c119a510e50588eee05a5891a6 +EBUILD oracle-jdk-bin-1.8.0.40.ebuild 10359 SHA256 e69e217d8309f93a3ce86fc82954c7dd5f642bbd1bcff9cc7cf041f9e525868e SHA512 b64a5769c26ca8261f54b58cd8d1349deb13959ee69a4675b30635c5359b6aa0421b0ae9d5c75bbfe545c66b9a8b162149e45fd7c8f84ee1c0c28f46006ecd19 WHIRLPOOL f07d65638d9e1e96ee51e203b659f75e4449ed0f40e5ef9e480a597c0f888ad81a3834820dc1bac7a80f8d16b6bbc4c19c99286646b2e96f400889f03365f189 +MISC ChangeLog 15945 SHA256 0ffb9b2160d67aab13120b11e50430db678387fb24d65ead5dde2bb6e2c380ff SHA512 3ce5deae084f5ce36ff4cafa872832a5a955e565d442b8b91f4aa21550158bf4f99a8ca8a29bcc4502cefb384162bd549b18a216fe40ca21f28631f40c581a0a WHIRLPOOL e1c29cab7412a52466d27b9083f8ec158306de8ded5477e8ce383d538ed39308e0ab6764ce6f8c10eba2bcab9a0bc72c19561e9d17419ff76f04b909566add3a MISC metadata.xml 582 SHA256 2115f948949343a0508b93b9664bed54d6cf051f70f26b33dd5a759b556b03a7 SHA512 4afb2242de1f65646e1fce1e46f64b4ba34c507f9eeba967127d55fd192f104633e3f126c1ce99834e7d154eabcbf6db8c1442649001734c58156d55c572c9cd WHIRLPOOL e6ea5237dd342d2acc868eda5a564c3d48f1114359763cb1037e408ff98555213bdb2c555cedc6d0ec5de3f02cf6caaf17c8f1562ccd6cb4f8b4cca562db5316 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJVFCt/AAoJEJGRpfGTSRu4WH8IAINP+Dk8khXkvfXGZE4wpUvO -nQ7gtnQq+RHkbanlkfF1zzqRW8VWKcfWljXjLN1LB7EH3pxyIBXYyuAh8a9T2vLW -Z/roJsovFI7q66cj71MRD3LoP2p4dvhq/YHdgrsg8PB2P/HgjKnUSxUtex/O6ADt -OC6qHuT+d4m6vCf/16rXOyM+kYOkHLSCN6WY8zer6PgwGYtOFVJbmtbeTSJqbjpG -aGjYv/lViFsKeP+YXfrCBh7BOmB7JrNIMsRbeRwpoqR296KJHjALx4Hv5wbO1V3M -nHupBLtWPN+1O8agoTgLFrjGkKgVPqIWYJEb725yQR8qCGNLxnBVFzuzRR+w5fk= -=3ojG +iQEcBAEBCAAGBQJVFC6NAAoJEJGRpfGTSRu43skIAMSw005lk6WhlzFawOum6ZdX +v2RCOASiPZXa9S7oFF3CNKwWcSKGeNzF6kq+j7vsWkZSd9jo4k0f5KsFrZbqlY3z +aM+Spl85ZQVCU1LUDw5STPU8t/GBSQmFQnj97PK6kpFerTq46oC/I3iQrRMmgGhx +yRZIPaZrmtrOyaYcbC7ApHNJ3v6xFyigDd97T6LOn+ZAusmkj1U0eb99/3uVLywp +1AM73OoMNNSw5wRADFlvG+m+K8iFunK8ZsaqmZFa8htQvDN1m/m50BgyyOSDn64H +w7hvPyiIX1hjkphofP829sDDOySSwIvM8BZ6bvvoGCtkYA6xYHKmMXoWYxptdwY= +=I/bH -----END PGP SIGNATURE----- diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40-r1.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40-r1.ebuild new file mode 100644 index 000000000000..d83d2cebece7 --- /dev/null +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40-r1.ebuild @@ -0,0 +1,317 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40-r1.ebuild,v 1.1 2015/03/26 16:06:11 monsieurp Exp $ + +EAPI="5" + +inherit eutils java-vm-2 prefix versionator + +# This URIs need to be updated when bumping! +JDK_URI="http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html" +JCE_URI="http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html" + +# This is a list of archs supported by this update. +# Currently arm comes and goes. +AT_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x86-macos x64-macos ) + +# Sometimes some or all of the demos are missing, this is to not have to rewrite half +# the ebuild when it happens. +DEMOS_AVAILABLE=( amd64 x86 x64-solaris sparc64-solaris x86-macos x64-macos ) + +if [[ "$(get_version_component_range 4)" == 0 ]] ; then + S_PV="$(get_version_component_range 1-3)" +else + MY_PV_EXT="u$(get_version_component_range 4)" + S_PV="$(get_version_component_range 1-4)" +fi + +MY_PV="$(get_version_component_range 2)${MY_PV_EXT}" + +AT_amd64="jdk-${MY_PV}-linux-x64.tar.gz" +AT_arm="jdk-${MY_PV}-linux-arm-vfp-hflt.tar.gz" +AT_x86="jdk-${MY_PV}-linux-i586.tar.gz" +AT_x64_solaris="jdk-${MY_PV}-solaris-x64.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" + +DEMOS_amd64="jdk-${MY_PV}-linux-x64-demos.tar.gz" +DEMOS_arm="jdk-${MY_PV}-linux-arm-vfp-hflt-demos.tar.gz" +DEMOS_x86="jdk-${MY_PV}-linux-i586-demos.tar.gz" +DEMOS_x64_solaris="jdk-${MY_PV}-solaris-x64-demos.tar.gz" +DEMOS_sparc64_solaris="jdk-${MY_PV}-solaris-sparcv9-demos.tar.gz" +DEMOS_x86_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip" +DEMOS_x64_macos="jdk-${MY_PV}-macosx-x86_64-demos.zip" + +JCE_DIR="UnlimitedJCEPolicyJDK8" +JCE_FILE="jce_policy-8.zip" + +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/-/_})}")" + if has ${d} "${DEMOS_AVAILABLE[@]}"; then + SRC_URI+=" examples? ( $(eval "echo \${$(echo DEMOS_${d/-/_})}") )" + fi + SRC_URI+=" )" +done +unset d +SRC_URI+=" jce? ( ${JCE_FILE} )" + +LICENSE="Oracle-BCLA-JavaSE examples? ( BSD )" +SLOT="1.8" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" +IUSE="+X alsa aqua derby doc examples +fontconfig jce nsplugin pax_kernel selinux source" + +RESTRICT="fetch strip" +QA_PREBUILT="*" + +COMMON_DEP="" +RDEPEND="${COMMON_DEP} + X? ( !aqua? ( + x11-libs/libX11:0 + x11-libs/libXext:0 + x11-libs/libXi:0 + x11-libs/libXrender:0 + x11-libs/libXtst:0 + ) ) + alsa? ( media-libs/alsa-lib:0 ) + 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="${COMMON_DEP} + jce? ( app-arch/unzip:0 ) + examples? ( kernel_linux? ( app-arch/unzip:0 ) ) + pax_kernel? ( sys-apps/paxctl:0 )" + +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 " http://www.oracle.com/technetwork/java/javase/downloads/java-archive-javase8-2177648.html#jdk-${MY_PV}-oth-JPR" + einfo + fi +} + +pkg_nofetch() { + local distfiles=( $(eval "echo \${$(echo AT_${ARCH/-/_})}") ) + if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}"; then + distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") ) + fi + check_tarballs_available "${JDK_URI}" "${distfiles[@]}" + + use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}" +} + +src_unpack() { + if use arm ; then + # Special case for ARM soft VS hard float. + #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 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 + 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 + mv "${WORKDIR}"/${JCE_DIR} "${S}"/jre/lib/security/ || die + fi +} + +src_install() { + local dest="/opt/${P}" + local ddest="${ED}${dest}" + + # Create files used as storage for system preferences. + mkdir jre/.systemPrefs || die + touch jre/.systemPrefs/.system.lock || die + touch jre/.systemPrefs/.systemRootModFile || die + + # We should not need the ancient plugin for Firefox 2 anymore, plus it has + # writable executable segments + if use x86 ; then + rm -vf {,jre/}lib/i386/libjavaplugin_oji.so \ + {,jre/}lib/i386/libjavaplugin_nscp*.so + rm -vrf jre/plugin/i386 + fi + + # Without nsplugin flag, also remove the new plugin + local arch=${ARCH}; + use x86 && arch=i386; + if ! use nsplugin ; then + rm -vf {,jre/}lib/${arch}/libnpjp2.so \ + {,jre/}lib/${arch}/libjavaplugin_jni.so + fi + + dodoc COPYRIGHT + dohtml README.html + + dodir "${dest}" + cp -pPR bin include jre lib man "${ddest}" || die + + if use derby ; then + cp -pPR db "${ddest}" || die + fi + + if use examples && has ${ARCH} "${DEMOS_AVAILABLE[@]}" ; then + cp -pPR demo sample "${ddest}" || die + fi + + if use jce ; then + dodir "${dest}"/jre/lib/security/strong-jce + mv "${ddest}"/jre/lib/security/US_export_policy.jar \ + "${ddest}"/jre/lib/security/strong-jce || die + mv "${ddest}"/jre/lib/security/local_policy.jar \ + "${ddest}"/jre/lib/security/strong-jce || die + dosym "${dest}"/jre/lib/security/${JCE_DIR}/US_export_policy.jar \ + "${dest}"/jre/lib/security/US_export_policy.jar + dosym "${dest}"/jre/lib/security/${JCE_DIR}/local_policy.jar \ + "${dest}"/jre/lib/security/local_policy.jar + fi + + if use nsplugin ; then + install_mozilla_plugin "${dest}"/jre/lib/${arch}/libnpjp2.so + fi + + if use source ; then + for mysrc in src javafx-src; do + mysrc="${mysrc}.zip" + ebegin "Copying source file ${mysrc}" + cp -p "${mysrc}" "${ddest}" || die + eend $? + done + fi + + if [[ -d jre/lib/desktop ]] ; 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 + # end up in filename. + newicon jre/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}/jre/bin/jcontrol#" \ + -e "s#Icon=.*#Icon=sun-jcontrol-${PN}-${SLOT}#" \ + -e "s#Application;##" \ + -e "/Encoding/d" \ + jre/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}"/jre/lib/fontconfig.* + if ! use fontconfig ; then + cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die + eprefixify "${T}"/fontconfig.properties + insinto "${dest}"/jre/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 x86-macos || use x64-macos ; then + # Fix miscellaneous install_name issues. + pushd "${ddest}"/jre/lib > /dev/null || die + local lib needed nlib npath + for lib in \ + decora_sse glass jfx{media,webkit} \ + javafx_{font,font_t2k,iio} prism_{common,es2,sw} \ + ; do + lib=lib${lib}.dylib + einfo "Fixing self-reference of ${lib}" + install_name_tool \ + -id "${EPREFIX}${dest}/jre/lib/${lib}" \ + "${lib}" + done + popd > /dev/null + + # TODO: This reads "jdk1{5,6}", what about "jdk1{7,8}"? + for nlib in jdk1{5,6} ; do + install_name_tool -change \ + /usr/lib/libgcc_s_ppc64.1.dylib \ + $($(tc-getCC) -print-file-name=libgcc_s_ppc64.1.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 +} diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40.ebuild index a7a662a54789..9d9e88e15174 100644 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40.ebuild +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40.ebuild,v 1.2 2015/03/26 15:52:34 monsieurp Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.40.ebuild,v 1.3 2015/03/26 16:06:11 monsieurp Exp $ EAPI="5" @@ -224,12 +224,7 @@ src_install() { fi if use source ; then - for mysrc in src javafx-src; do - mysrc="${mysrc}.zip" - ebegin "Copying source file ${mysrc}" - cp -p "${mysrc}" "${ddest}" || die - eend $? - done + cp -p "${mysrc}" "${ddest}" || die fi if [[ -d jre/lib/desktop ]] ; then -- 2.26.2