| 1 |
commit: 21cf596d519d5891ad9e8c0a8745ae6613800bed |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 23 20:41:00 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 23 22:52:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21cf596d |
| 7 |
|
| 8 |
dev-java/oracle-jdk-bin: Add some missing dies |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
.../oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild | 26 +++++++++------------- |
| 13 |
1 file changed, 11 insertions(+), 15 deletions(-) |
| 14 |
|
| 15 |
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 |
| 16 |
index ac3ee6a..12a7f62 100644 |
| 17 |
--- a/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild |
| 18 |
+++ b/dev-java/oracle-jdk-bin/oracle-jdk-bin-1.8.0.121.ebuild |
| 19 |
@@ -149,23 +149,21 @@ pkg_nofetch() { |
| 20 |
distfiles+=( $(eval "echo \${$(echo DEMOS_${ARCH/-/_})}") ) |
| 21 |
fi |
| 22 |
check_tarballs_available "${JDK_URI}" "${distfiles[@]}" |
| 23 |
- |
| 24 |
use jce && check_tarballs_available "${JCE_URI}" "${JCE_FILE}" |
| 25 |
} |
| 26 |
|
| 27 |
src_unpack() { |
| 28 |
if use x64-macos ; then |
| 29 |
- pushd "${T}" > /dev/null |
| 30 |
- mkdir dmgmount |
| 31 |
+ pushd "${T}" > /dev/null || die |
| 32 |
+ mkdir dmgmount || die |
| 33 |
hdiutil attach "${DISTDIR}"/jdk-${MY_PV}-macosx-x64.dmg \ |
| 34 |
- -mountpoint "${T}"/dmgmount |
| 35 |
- local update=$(get_version_component_range 4) |
| 36 |
- [[ ${#update} == 1 ]] && update="0${update}" |
| 37 |
- xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg |
| 38 |
- hdiutil detach "${T}"/dmgmount |
| 39 |
- zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv |
| 40 |
- mv Contents/Home "${WORKDIR}"/jdk${MY_PV} |
| 41 |
- popd > /dev/null |
| 42 |
+ -mountpoint "${T}"/dmgmount || die |
| 43 |
+ printf -v update "%02d" $(get_version_component_range 4) || die |
| 44 |
+ xar -xf dmgmount/JDK\ $(get_version_component_range 2)\ Update\ ${update}.pkg || die |
| 45 |
+ hdiutil detach "${T}"/dmgmount || die |
| 46 |
+ zcat jdk1${MY_PV%u*}0${update}.pkg/Payload | cpio -idv || die |
| 47 |
+ mv Contents/Home "${WORKDIR}"/jdk${MY_PV} || die |
| 48 |
+ popd > /dev/null || die |
| 49 |
use jce && unpack "${JCE_FILE}" |
| 50 |
else |
| 51 |
default |
| 52 |
@@ -298,7 +296,7 @@ src_install() { |
| 53 |
# Prune all fontconfig files so libfontconfig will be used and only install |
| 54 |
# a Gentoo specific one if fontconfig is disabled. |
| 55 |
# http://docs.oracle.com/javase/8/docs/technotes/guides/intl/fontconfig.html |
| 56 |
- rm "${ddest}"/jre/lib/fontconfig.* |
| 57 |
+ rm "${ddest}"/jre/lib/fontconfig.* || die |
| 58 |
if ! use fontconfig ; then |
| 59 |
cp "${FILESDIR}"/fontconfig.Gentoo.properties "${T}"/fontconfig.properties || die |
| 60 |
eprefixify "${T}"/fontconfig.properties |
| 61 |
@@ -331,16 +329,14 @@ src_install() { |
| 62 |
|
| 63 |
if use x64-macos ; then |
| 64 |
# Fix miscellaneous install_name issues. |
| 65 |
- pushd "${ddest}"/jre/lib > /dev/null || die |
| 66 |
local lib |
| 67 |
for lib in decora_sse glass prism_{common,es2,sw} ; do |
| 68 |
lib=lib${lib}.dylib |
| 69 |
einfo "Fixing self-reference of ${lib}" |
| 70 |
install_name_tool \ |
| 71 |
-id "${EPREFIX}${dest}/jre/lib/${lib}" \ |
| 72 |
- "${lib}" |
| 73 |
+ "${ddest}"/jre/lib/${lib} || die |
| 74 |
done |
| 75 |
- popd > /dev/null |
| 76 |
fi |
| 77 |
|
| 78 |
java-vm_install-env "${FILESDIR}"/${PN}.env.sh |
Archives