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 | 55d97bb8fef9e8ade32f4504bd6c909cf49653b0 (patch) | |
| tree | b3ce0d912f04635f540667fb7a272f1145146391 /sci-chemistry | |
| parent | Removed cruft. (diff) | |
| download | historical-55d97bb8fef9e8ade32f4504bd6c909cf49653b0.tar.gz historical-55d97bb8fef9e8ade32f4504bd6c909cf49653b0.tar.bz2 historical-55d97bb8fef9e8ade32f4504bd6c909cf49653b0.zip | |
Fixing conditional code to move netscape.jar wrt bug #191032
Package-Manager: portage-2.1.3.7
Diffstat (limited to 'sci-chemistry')
| -rw-r--r-- | sci-chemistry/jmol/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-chemistry/jmol/Manifest | 16 | ||||
| -rw-r--r-- | sci-chemistry/jmol/jmol-11.0.3-r1.ebuild | 10 |
3 files changed, 18 insertions, 13 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/Manifest b/sci-chemistry/jmol/Manifest index 64dd5e95814b..613cd52bdad2 100644 --- a/sci-chemistry/jmol/Manifest +++ b/sci-chemistry/jmol/Manifest @@ -19,14 +19,14 @@ MD5 bf2be32212c831e4fa369809a639b75d files/selfSignedCertificate.store 1516 RMD160 583b7bab5578e1e32f649388b7009dc654df1199 files/selfSignedCertificate.store 1516 SHA256 81b69722530d94dc599ce79382a3386cce518baa7ab79fbb530d13483b51bed5 files/selfSignedCertificate.store 1516 DIST jmol-11.0.3-full.tar.gz 13578526 RMD160 53e34c52d6085635daea74cd9c5787da67ef483e SHA1 35dc9d3d3cfe08cbe3076a6939f62361b2c59c86 SHA256 210eb7d119e53ed0b7f41939321bcfcdb4d7312761d8002e340c83ff49664616 -EBUILD jmol-11.0.3-r1.ebuild 3244 RMD160 5a7095f98475e526f7b64caf75e8abb7371100b7 SHA1 5f5b5f28b819b929528b656514bddbf3b91f2631 SHA256 30bc95a1d06de6f055d7a3438ad0f73032c46aafb9cfd5dee18d25cdb216d4d3 -MD5 464aa776cd62a88caab4e6e791fd10b7 jmol-11.0.3-r1.ebuild 3244 -RMD160 5a7095f98475e526f7b64caf75e8abb7371100b7 jmol-11.0.3-r1.ebuild 3244 -SHA256 30bc95a1d06de6f055d7a3438ad0f73032c46aafb9cfd5dee18d25cdb216d4d3 jmol-11.0.3-r1.ebuild 3244 -MISC ChangeLog 1140 RMD160 a284b602319aa1a6b30dfcd22cbacb81d51351c1 SHA1 23b2973cb8a87c9ecf32cadb94c531989dbfee3c SHA256 a20f8bdea41d2b5627c7146d5c96bb7bfb4a20b88367707392494ec9696563d7 -MD5 484d23640e24c0e2b35c6819e53959b5 ChangeLog 1140 -RMD160 a284b602319aa1a6b30dfcd22cbacb81d51351c1 ChangeLog 1140 -SHA256 a20f8bdea41d2b5627c7146d5c96bb7bfb4a20b88367707392494ec9696563d7 ChangeLog 1140 +EBUILD jmol-11.0.3-r1.ebuild 3270 RMD160 3fe602c77a996db7f4ec393a536fcaee62374048 SHA1 fb126774160d7d92ceb82ed6c5ef7f5eee36ee8d SHA256 c8a67f322fed3858a9e74988707fd4e0278f0dbfcf1488d9dbee6fc70d6fa9a1 +MD5 2364dfc0eca4df45714319c7956beee4 jmol-11.0.3-r1.ebuild 3270 +RMD160 3fe602c77a996db7f4ec393a536fcaee62374048 jmol-11.0.3-r1.ebuild 3270 +SHA256 c8a67f322fed3858a9e74988707fd4e0278f0dbfcf1488d9dbee6fc70d6fa9a1 jmol-11.0.3-r1.ebuild 3270 +MISC ChangeLog 1256 RMD160 cb86d1b6da435cdb6b2af284f8c8019307d7b726 SHA1 5427263f3e404fa46772f164e7589d7782b6bd31 SHA256 c7aef3ce1f7325012e8e066cfbd4da46db7d719bf3c23903cfa927373a3801d8 +MD5 52dd4c0c1b7d24ddba15c7f2d48003d3 ChangeLog 1256 +RMD160 cb86d1b6da435cdb6b2af284f8c8019307d7b726 ChangeLog 1256 +SHA256 c7aef3ce1f7325012e8e066cfbd4da46db7d719bf3c23903cfa927373a3801d8 ChangeLog 1256 MISC metadata.xml 253 RMD160 59050ef726d30aa457b0dabb61494f8386687bd6 SHA1 f5ea0ad09e8f7647830e3b912eafa71f28b054a0 SHA256 f20f704428c998a9fa8511f02730d72435a0a2e168c6f6ef5c6005bc1608841a MD5 5a3da73e18cd061fb7f74cfc718a90d3 metadata.xml 253 RMD160 59050ef726d30aa457b0dabb61494f8386687bd6 metadata.xml 253 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 |