Protecting netscape.jar from removal on amd64.

Package-Manager: portage-2.1.2.9

5 files changed, 18 insertions, 141 deletions

diff --git a/sci-chemistry/jmol/ChangeLog b/sci-chemistry/jmol/ChangeLog
index 3df06819c855..5a23e6f84eeb 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.3 2007/06/22 22:43:14 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/ChangeLog,v 1.4 2007/07/05 00:17:58 je_fro Exp $
+
+  05 Jul 2007; Jeff Gardner <je_fro@gentoo.org> jmol-11.0.3-r1.ebuild:
+  Protecting netscape.jar from removal on amd64.
 
   22 Jun 2007; Jeff Gardner <je_fro@gentoo.org> jmol-11.0.3-r1.ebuild:
   Removing ~amd64 for jmol-11.0.3-r1 because the bundled netscape.jar is still
diff --git a/sci-chemistry/jmol/Manifest b/sci-chemistry/jmol/Manifest
index 1e454a1921e8..64dd5e95814b 100644
--- a/sci-chemistry/jmol/Manifest
+++ b/sci-chemistry/jmol/Manifest
@@ -19,25 +19,18 @@ 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 2959 RMD160 a5215635c35c20c073f6085d4f630c6805b9db93 SHA1 a0165e104b67f1a2d087fb808b5a113311167ceb SHA256 4f1caa74510d2adf42f5b8f7dd51e3220cb5058103e945058ed63fb4f2f9ced2
-MD5 2308209958cff6d98c08290192990f62 jmol-11.0.3-r1.ebuild 2959
-RMD160 a5215635c35c20c073f6085d4f630c6805b9db93 jmol-11.0.3-r1.ebuild 2959
-SHA256 4f1caa74510d2adf42f5b8f7dd51e3220cb5058103e945058ed63fb4f2f9ced2 jmol-11.0.3-r1.ebuild 2959
-EBUILD jmol-11.0.3.ebuild 3504 RMD160 921dcbb65b232511ef19183a16c62ba89717479a SHA1 5e4b6f7ed9aa31384ba4a7804cc52c0d1f90e665 SHA256 57d5bd35041e9381a1b49ee5d16f1a672e3251bcde6c4e47157a166b9a9b9dd9
-MD5 2808bd5f4ae8373cd4088daf4ba8c7a7 jmol-11.0.3.ebuild 3504
-RMD160 921dcbb65b232511ef19183a16c62ba89717479a jmol-11.0.3.ebuild 3504
-SHA256 57d5bd35041e9381a1b49ee5d16f1a672e3251bcde6c4e47157a166b9a9b9dd9 jmol-11.0.3.ebuild 3504
-MISC ChangeLog 1019 RMD160 9d9a918e8050371453bb15078c5e39e75b82d963 SHA1 f0e3626f8fda895a1a64b60cee8fe6ec81f10d7a SHA256 f2820443b676fecd3e1f87e3f341cf02353c3344481368d47ef47ade9b1f7f85
-MD5 358f9cf3b10cbe35d9b8782f6842a032 ChangeLog 1019
-RMD160 9d9a918e8050371453bb15078c5e39e75b82d963 ChangeLog 1019
-SHA256 f2820443b676fecd3e1f87e3f341cf02353c3344481368d47ef47ade9b1f7f85 ChangeLog 1019
+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
 MISC metadata.xml 253 RMD160 59050ef726d30aa457b0dabb61494f8386687bd6 SHA1 f5ea0ad09e8f7647830e3b912eafa71f28b054a0 SHA256 f20f704428c998a9fa8511f02730d72435a0a2e168c6f6ef5c6005bc1608841a
 MD5 5a3da73e18cd061fb7f74cfc718a90d3 metadata.xml 253
 RMD160 59050ef726d30aa457b0dabb61494f8386687bd6 metadata.xml 253
 SHA256 f20f704428c998a9fa8511f02730d72435a0a2e168c6f6ef5c6005bc1608841a metadata.xml 253
-MD5 4474d7ff73147d373b76fc7cc9361806 files/digest-jmol-11.0.3 256
-RMD160 f8d2a3980cf89147b84f30dd195c898ee07e258b files/digest-jmol-11.0.3 256
-SHA256 8c5917e259cefb8aae76765625422987300243e5e698c0149db9bf8ad3dcb3a1 files/digest-jmol-11.0.3 256
 MD5 4474d7ff73147d373b76fc7cc9361806 files/digest-jmol-11.0.3-r1 256
 RMD160 f8d2a3980cf89147b84f30dd195c898ee07e258b files/digest-jmol-11.0.3-r1 256
 SHA256 8c5917e259cefb8aae76765625422987300243e5e698c0149db9bf8ad3dcb3a1 files/digest-jmol-11.0.3-r1 256
diff --git a/sci-chemistry/jmol/files/digest-jmol-11.0.3 b/sci-chemistry/jmol/files/digest-jmol-11.0.3
deleted file mode 100644
index 8a749a8f3cc5..000000000000
--- a/sci-chemistry/jmol/files/digest-jmol-11.0.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 09a589e1fc1099a522b96a7bda16fdd0 jmol-11.0.3-full.tar.gz 13578526
-RMD160 53e34c52d6085635daea74cd9c5787da67ef483e jmol-11.0.3-full.tar.gz 13578526
-SHA256 210eb7d119e53ed0b7f41939321bcfcdb4d7312761d8002e340c83ff49664616 jmol-11.0.3-full.tar.gz 13578526
diff --git a/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild b/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild
index 8bca784581df..a71a7f948d1b 100644
--- a/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild
+++ b/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild
@@ -1,13 +1,13 @@
 # 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.2 2007/06/22 22:43:14 je_fro Exp $
+# $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 $
 
 inherit eutils webapp java-pkg-2 java-ant-2
 
 DESCRIPTION="Jmol is a java molecular viever for 3-D chemical structures."
 SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.gz"
 HOMEPAGE="http://jmol.sourceforge.net/"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 LICENSE="LGPL-2.1"
 
 IUSE="client-only vhosts"
@@ -48,7 +48,11 @@ src_unpack() {
 
 	rm -v "${S}"/*.jar "${S}"/plugin-jars/*.jar || die
 	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."
 
 	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
diff --git a/sci-chemistry/jmol/jmol-11.0.3.ebuild b/sci-chemistry/jmol/jmol-11.0.3.ebuild
deleted file mode 100644
index da4da1858fb0..000000000000
--- a/sci-chemistry/jmol/jmol-11.0.3.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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.ebuild,v 1.2 2007/06/22 08:30:25 caster Exp $
-
-inherit eutils webapp java-pkg-2 java-ant-2
-
-DESCRIPTION="Jmol is a java molecular viever for 3-D chemical structures."
-SRC_URI="mirror://sourceforge/${PN}/${P}-full.tar.gz"
-HOMEPAGE="http://jmol.sourceforge.net/"
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2.1"
-
-IUSE="client-only vhosts"
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-SAXON_SLOT="6.5"
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	dev-java/ant-contrib
-	dev-java/commons-cli
-	dev-java/itext
-	dev-java/junit
-	dev-java/gnu-jaxp
-	dev-java/sax
-	=dev-java/saxon-6.5.5
-	sci-libs/jmol-acme
-	sci-libs/vecmath-objectclub
-	vhosts? ( app-admin/webapp-config )"
-
-pkg_setup() {
-
-	if ! use client-only ; then
-		webapp_pkg_setup || die "Failed to setup webapp"
-	fi
-
-	java-pkg-2_pkg_setup
-
-}
-
-src_unpack() {
-
-	unpack ${A}
-	epatch "${FILESDIR}"/${P}-nointl.patch
-	epatch "${FILESDIR}"/${P}-manifest.patch
-
-	sed -i -e '/^command=java/a source \/etc\/env.d\/java\/30jmol' "${S}/${PN}" || die "sed failed"
-
-	mkdir "${S}"/selfSignedCertificate || die "Failed to create Cert directory."
-	cp "${FILESDIR}"/selfSignedCertificate.store "${S}"/selfSignedCertificate/ \
-		|| die "Failed to install Cert file."
-
-# The only bundled jar we still rely on is netscape.jar.
-	cd "${S}/jars"
-
-	java-pkg_jar-from --build-only ant-contrib
-	java-pkg_jar-from --build-only itext iText.jar itext-1.4.5.jar
-	java-pkg_jar-from --build-only junit
-	java-pkg_jar-from --build-only gnu-jaxp
-	java-pkg_jar-from --build-only saxon-${SAXON_SLOT} saxon.jar saxon.jar
-	java-pkg_jar-from --build-only commons-cli-1 commons-cli.jar commons-cli-1.0.jar
-	java-pkg_jar-from --build-only jmol-acme jmol-acme.jar Acme.jar
-	java-pkg_jar-from --build-only vecmath-objectclub vecmath-objectclub.jar vecmath1.2-1.14.jar
-	java-pkg_jar-from --build-only gnu-jaxp gnujaxp.jar gnujaxp-onlysax.jar
-
-}
-
-src_install() {
-
-	java-pkg_dojar Jmol.jar JmolApplet.jar
-	dohtml -r  build/doc/* || die "Failed to install html docs."
-	dodoc *.txt doc/*license* || die "Failed to install licenses."
-	edos2unix jmol || die "Failed to convert jmol from DOS format."
-	dobin jmol || die "Failed to install startup script."
-
-	dodir /etc/env.d/java
-	cat >> "${D}"/etc/env.d/java/30jmol << EOF
-JMOL_HOME=/usr/share/${PN}/lib
-EOF
-
-	if ! use client-only ; then
-		webapp_src_preinst || die "Failed webapp_src_preinst."
-		cmd="cp Jmol.* "${D}${MY_HTDOCSDIR}"" ; ${cmd} \
-		|| die "${cmd} failed."
-		cmd="cp jmol "${D}${MY_HTDOCSDIR}"" ; ${cmd} \
-		|| die "${cmd} failed."
-		cmd="cp JmolApplet.* "${D}${MY_HTDOCSDIR}"" ; ${cmd} \
-		|| die "${cmd} failed."
-		cmd="cp applet.classes "${D}${MY_HTDOCSDIR}"" ; ${cmd} \
-		|| die "${cmd} failed."
-		cmd="cp -r build/classes/* "${D}${MY_HTDOCSDIR}"" ; ${cmd} \
-		|| die "${cmd} failed."
-		cmd="cp -r build/appjars/* "${D}${MY_HTDOCSDIR}"" ; ${cmd} \
-		|| die "${cmd} failed."
-		cmd="cp "${FILESDIR}"/caffeine.xyz "${D}${MY_HTDOCSDIR}"" ; ${cmd} \
-		|| die "${cmd} failed."
-		cmd="cp "${FILESDIR}"/index.html "${D}${MY_HTDOCSDIR}"" ; ${cmd} \
-		|| die "${cmd} failed."
-
-		webapp_src_install || die "Failed running webapp_src_install"
-	fi
-}
-
-pkg_postinst() {
-
-	if ! use client-only ; then
-		webapp_pkg_postinst || die "webapp_pkg_postinst failed"
-	fi
-
-}
-
-pkg_prerm() {
-
-	if ! use client-only ; then
-		webapp_pkg_prerm || die "webapp_pkg_prerm failed"
-	fi
-
-}