diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2011-10-22 23:50:32 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2011-10-22 23:50:32 +0000 |
| commit | 202214f75a610ec9dc1a8b2b8f042801d4013b8b (patch) | |
| tree | 4b380e87a35d005324a8efeed2c40a8ca6616df3 | |
| parent | Version bug, security bug #387851. Unfortunately had to change license and ma... (diff) | |
| download | gentoo-2-202214f75a610ec9dc1a8b2b8f042801d4013b8b.tar.gz gentoo-2-202214f75a610ec9dc1a8b2b8f042801d4013b8b.tar.bz2 gentoo-2-202214f75a610ec9dc1a8b2b8f042801d4013b8b.zip | |
Simplify unpacking.
(Portage version: 2.2.0_alpha68/cvs/Linux x86_64)
| -rw-r--r-- | dev-java/sun-jdk/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild | 44 |
2 files changed, 6 insertions, 43 deletions
diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 877292f76cdf..3b549a14f90c 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/sun-jdk # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.306 2011/10/22 22:59:59 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.307 2011/10/22 23:50:32 caster Exp $ + + 22 Oct 2011; Vlastimil Babka <caster@gentoo.org> sun-jdk-1.6.0.29.ebuild: + Simplify unpacking. *sun-jdk-1.6.0.29 (22 Oct 2011) diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild index fca540e68914..dfd9a30044b2 100644 --- a/dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild,v 1.1 2011/10/22 22:59:59 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.29.ebuild,v 1.2 2011/10/22 23:50:32 caster Exp $ EAPI="4" @@ -62,42 +62,7 @@ pkg_nofetch() { } src_unpack() { - # Do a little voodoo to extract the distfile - # Find the ELF in the script - testExp=$(echo -e '\0105\0114\0106') - startAt=$(grep -aonm 1 ${testExp} ${DISTDIR}/${A} | cut -d: -f1) - # Extract and run it - tail -n +${startAt} "${DISTDIR}"/${A} > install.sfx - chmod +x install.sfx - ./install.sfx >/dev/null || die - rm install.sfx - - local packed_jars=( - jre/lib/deploy.jar - jre/lib/charsets.jar - jre/lib/javaws.jar - jre/lib/jsse.jar - jre/lib/ext/localedata.jar - jre/lib/plugin.jar - jre/lib/rt.jar - lib/tools.jar) - - if [ -f "${S}"/bin/unpack200 ]; then - UNPACK_CMD="${S}"/bin/unpack200 - chmod +x $UNPACK_CMD - sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD - for i in "${packed_jars[@]}"; do - PACK_FILE=${S}/$(dirname $i)/$(basename $i .jar).pack - if [ -f ${PACK_FILE} ]; then - echo " unpacking: $i" - $UNPACK_CMD ${PACK_FILE} "${S}"/$i || die "unpack failed" - rm -f ${PACK_FILE} || die "rm ${PACK_FILE} failed" - fi - done - rm -f ${UNPACK_CMD} || die "rm ${UNPACK_CMD} failed" - else - die "unpack not found" - fi + sh "${DISTDIR}"/${A} -noregister || die "Failed to unpack" } src_compile() { @@ -111,11 +76,6 @@ src_compile() { "${S}"/bin/java -client -Xshare:dump || die fi "${S}"/bin/java -server -Xshare:dump || die - - # Create files used as storage for system preferences. - mkdir jre/.systemPrefs || die - touch jre/.systemPrefs/.system.lock || die - touch jre/.systemPrefs/.systemRootModFile || die } src_install() { |