diff options
author | Jeffrey Gardner <je_fro@gentoo.org> | 2007-09-02 23:29:48 +0000 |
---|---|---|
committer | Jeffrey Gardner <je_fro@gentoo.org> | 2007-09-02 23:29:48 +0000 |
commit | 4a93e5d51d5332eebd04d59c9f79d4c7d6d6cebb (patch) | |
tree | b8612772539bb49a6c968bf3be109955a121b3dd /sci-chemistry/jmol | |
parent | Removed cruft. (diff) | |
download | gentoo-2-4a93e5d51d5332eebd04d59c9f79d4c7d6d6cebb.tar.gz gentoo-2-4a93e5d51d5332eebd04d59c9f79d4c7d6d6cebb.tar.bz2 gentoo-2-4a93e5d51d5332eebd04d59c9f79d4c7d6d6cebb.zip |
Fixing conditional code to move netscape.jar wrt bug #191032
(Portage version: 2.1.3.7)
Diffstat (limited to 'sci-chemistry/jmol')
-rw-r--r-- | sci-chemistry/jmol/ChangeLog | 5 | ||||
-rw-r--r-- | sci-chemistry/jmol/jmol-11.0.3-r1.ebuild | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/sci-chemistry/jmol/ChangeLog b/sci-chemistry/jmol/ChangeLog index 5a23e6f84eeb..6eb85329980c 100644 --- a/sci-chemistry/jmol/ChangeLog +++ b/sci-chemistry/jmol/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sci-chemistry/jmol # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/ChangeLog,v 1.4 2007/07/05 00:17:58 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/ChangeLog,v 1.5 2007/09/02 23:29:48 je_fro Exp $ + + 02 Sep 2007; <jeff@gentoo.org> jmol-11.0.3-r1.ebuild: + Fix conditional code moving netscape.jar wrt bug #191032 05 Jul 2007; Jeff Gardner <je_fro@gentoo.org> jmol-11.0.3-r1.ebuild: Protecting netscape.jar from removal on amd64. diff --git a/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild b/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild index a71a7f948d1b..cc89d4eb21a9 100644 --- a/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild +++ b/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild,v 1.3 2007/07/05 00:17:58 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild,v 1.4 2007/09/02 23:29:48 je_fro Exp $ inherit eutils webapp java-pkg-2 java-ant-2 @@ -50,9 +50,11 @@ src_unpack() { cd "${S}/jars" # We still have to use netscape.jar on amd64 until a nice way to include plugin.jar comes along. - use amd64 && mv -v netscape.jar netscape.tempjar || die "Failed to move netscape.jar." - rm -v *.jar *.tar.gz || die - use amd64 && mv -v netscape.tempjar netscape.jar || die "Failed to move netscape.tempjar." + if use amd64; then + mv -v netscape.jar netscape.tempjar || die "Failed to move netscape.jar." + rm -v *.jar *.tar.gz || die "Failed to remove jars." + mv -v netscape.tempjar netscape.jar || die "Failed to move netscape.tempjar." + fi java-pkg_jar-from vecmath-objectclub vecmath-objectclub.jar vecmath1.2-1.14.jar java-pkg_jar-from itext iText.jar itext-1.4.5.jar |