From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9ED8E13908F for ; Mon, 23 Jan 2017 22:52:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9234E21C060; Mon, 23 Jan 2017 22:52:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 62333234002 for ; Mon, 23 Jan 2017 22:52:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 54613341265 for ; Mon, 23 Jan 2017 22:52:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 25BFE2D15 for ; Mon, 23 Jan 2017 22:52:39 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1485211934.21cf596d519d5891ad9e8c0a8745ae6613800bed.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/oracle-jdk-bin/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild X-VCS-Directories: dev-java/oracle-jdk-bin/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 21cf596d519d5891ad9e8c0a8745ae6613800bed X-VCS-Branch: master Date: Mon, 23 Jan 2017 22:52:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 819b1815-48b7-4afa-90e3-647dc6079a8c X-Archives-Hash: 479832bd8f3a6d0190938ec7ea1db881 commit: 21cf596d519d5891ad9e8c0a8745ae6613800bed Author: James Le Cuirot gentoo org> AuthorDate: Mon Jan 23 20:41:00 2017 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Mon Jan 23 22:52:14 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21cf596d dev-java/oracle-jdk-bin: Add some missing dies Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild | 26 +++++++++------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild index ac3ee6a..12a7f62 100644 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild @@ -149,23 +149,21 @@ pkg_nofetch() { 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 x64-macos ; then - pushd "${T}" > /dev/null - mkdir dmgmount + pushd "${T}" > /dev/null || die + mkdir dmgmount || die 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 + -mountpoint "${T}"/dmgmount || die + printf -v update "%02d" $(get_version_component_range 4) || die + xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg || die + hdiutil detach "${T}"/dmgmount || die + zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv || die + mv Contents/Home "${WORKDIR}"/jdk${MY_PV} || die + popd > /dev/null || die use jce && unpack "${JCE_FILE}" else default @@ -298,7 +296,7 @@ src_install() { # 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.* + rm "${ddest}"/jre/lib/fontconfig.* || die if ! use fontconfig ; then cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die eprefixify "${T}"/fontconfig.properties @@ -331,16 +329,14 @@ src_install() { if use x64-macos ; then # Fix miscellaneous install_name issues. - pushd "${ddest}"/jre/lib > /dev/null || die local lib 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}/jre/lib/${lib}" \ - "${lib}" + "${ddest}"/jre/lib/${lib} || die done - popd > /dev/null fi java-vm_install-env "${FILESDIR}"/${PN}.env.sh