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

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 93769e4624e3b316b237f1aff10feb4f6a79a149..a57793e032f0acd791064472c1b27c8f48debbe8 100644 (file)
--- 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 f86453303c6156021cf32b799427d30859af4fcb..fee4dd82f889900352eea78d46b928d9b4662bcd 100644 (file)
--- 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}"