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 D402F1382C5 for ; Thu, 25 Jan 2018 11:51:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E577DE0971; Thu, 25 Jan 2018 11:51:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B4C1CE0971 for ; Thu, 25 Jan 2018 11:51:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 75E22335C2C for ; Thu, 25 Jan 2018 11:51:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ABF581C0 for ; Thu, 25 Jan 2018 11:51:08 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1516881064.944e0594a235aac7e9fc6d4e0c44ca6af437d517.grobian@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.162.ebuild dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild X-VCS-Directories: dev-java/oracle-jdk-bin/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 944e0594a235aac7e9fc6d4e0c44ca6af437d517 X-VCS-Branch: master Date: Thu, 25 Jan 2018 11:51:08 +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: 38ef1d5e-d7ea-4a9d-8d3c-cfc9984daf13 X-Archives-Hash: d1746696713af0bec4cdc43bbe0f3f37 commit: 944e0594a235aac7e9fc6d4e0c44ca6af437d517 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 25 11:50:49 2018 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 25 11:51:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=944e0594 dev-java/oracle-jdk-bin: unbreak darwin, a -O snuck in on the xar command Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild | 10 ++++++++-- dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild | 7 +++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild index 93769e4624e..a57793e032f 100644 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild @@ -113,8 +113,14 @@ pkg_nofetch() { src_unpack() { if use x64-macos ; then mkdir -p "${T}"/dmgmount || die - hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg -mountpoint "${T}"/dmgmount || die - xar -Oxf "${T}"/dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg jdk${PV//.}.pkg/Payload | zcat | cpio -idv || die + hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \ + -mountpoint "${T}"/dmgmount || die + local jdkgen=$(get_version_component_range 2) + local uver=$(get_version_component_range 4) + ( cd "${T}" && + xar -xf "${T}/dmgmount/JDK ${jdkgen} Update ${uver}.pkg" \ + jdk${PV//.}.pkg/Payload ) || die + zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die hdiutil detach "${T}"/dmgmount || die mv Contents/Home "${S}" || die fi diff --git a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild index f86453303c6..fee4dd82f88 100644 --- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild +++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -92,7 +92,10 @@ src_unpack() { S="${WORKDIR}/Contents/Home" mkdir -p "${T}"/dmgmount || die hdiutil attach "${DISTDIR}/${A}" -mountpoint "${T}"/dmgmount || die - xar -Oxf "${T}"/dmgmount/JDK\ ${PV}.pkg jdk${PV//.}.pkg/Payload | zcat | cpio -idv || die + ( cd "${T}" && + xar -xf "${T}/dmgmount/JDK ${PV}.pkg" \ + jdk${PV//.}.pkg/Payload ) || die + zcat "${T}"/jdk${PV//.}.pkg/Payload | cpio -idv || die hdiutil detach "${T}"/dmgmount || die else S="${WORKDIR}/jdk-${PV}"