diff options
| author |   Simon Stelling <blubb@gentoo.org> | 2006-02-12 15:01:20 +0000 |
|---|---|---|
| committer | Simon Stelling <blubb@gentoo.org> | 2006-02-12 15:01:20 +0000 |
| commit | 5a9bfc67007da801839189e638b0221164b6ff41 (patch) | |
| tree | 5c81109dcd79f66f51d51042b863703c34ea3073 /app-emulation | |
| parent | Added a fix for bug #122310. (diff) | |
| download | gentoo-2-5a9bfc67007da801839189e638b0221164b6ff41.tar.gz gentoo-2-5a9bfc67007da801839189e638b0221164b6ff41.tar.bz2 gentoo-2-5a9bfc67007da801839189e638b0221164b6ff41.zip | |
minor code cleanup
(Portage version: 2.1_pre4-r1)
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/emul-linux-x86-java/ChangeLog | 8 | ||||
| -rw-r--r-- | app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.ebuild | 14 |
2 files changed, 15 insertions, 7 deletions
diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog index 13de0237168e..c8809f06b798 100644 --- a/app-emulation/emul-linux-x86-java/ChangeLog +++ b/app-emulation/emul-linux-x86-java/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/emul-linux-x86-java # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.6 2006/01/19 12:19:46 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.7 2006/02/12 15:01:20 blubb Exp $ + + 12 Feb 2006; Simon Stelling <blubb@gentoo.org> + emul-linux-x86-java-1.4.2.03-r1.ebuild: + minor code cleanup: + * move ABI=x86 to pkg_setup + * `dirname $i`/`basename $i .jar` -> ${i%.jar} 19 Jan 2006; Marcus D. Hanwell <cryos@gentoo.org> emul-linux-x86-java-1.4.2.03-r1.ebuild: diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.ebuild index 0f284be11089..a3844dffd393 100644 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.ebuild +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.ebuild,v 1.2 2006/01/19 12:19:46 cryos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r1.ebuild,v 1.3 2006/02/12 15:01:20 blubb Exp $ inherit multilib java versionator @@ -29,7 +29,9 @@ S="${WORKDIR}/j2re${JV}" JAVAHOME="${D}/opt/java32" # 32bit binary package -ABI="x86" +pkg_setup() { + ABI="x86" +} # Extract the 'skip' value (offset of tarball) we should pass to tail get_offset() { @@ -70,16 +72,16 @@ unpack_jars() { #packerror="" sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD for i in $PACKED_JARS; do - if [ -f "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack" ]; then - einfo "Creating ${JAVAHOME}/${i}\n" - "$UNPACK_CMD" "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack" "$JAVAHOME/$i" + if [ -f "$JAVAHOME/${i%.jar}.pack" ]; then + einfo "Creating ${JAVAHOME}/${i}" + "$UNPACK_CMD" "$JAVAHOME/${i%.jar}.pack" "$JAVAHOME/$i" if [ ! -f "$JAVAHOME/$i" ]; then die "Failed to unpack jar files ${i}." # Please refer\n" #ewarn "to the Troubleshooting section of the Installation\n" #ewarn "Instructions on the download page for more information.n" #packerror="1" fi - rm -f "$JAVAHOME/`dirname $i`/`basename $i .jar`.pack" + rm -f "$JAVAHOME/${i%.jar}.pack" fi done fi |