gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-11-06 17:47:07 -08:00
Code Issues Projects Releases Wiki Activity

dev-java/oracle-jdk-bin: unbreak darwin, a -O snuck in on the xar command

Browse Source 
Package-Manager: Portage-2.3.19, Repoman-2.3.6
This commit is contained in:
Fabian Groffen
2018-01-25 12:51:04 +01:00
parent a21e4476a8
commit 944e0594a2
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.162.ebuild
+8 -2
View File
@@ -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
dev-java/oracle-jdk-bin/oracle-jdk-bin-9.0.4.ebuild
+5 -2
View File
@@ -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}"