diff options
| -rw-r--r-- | sci-chemistry/jmol/ChangeLog | 10 | ||||
| -rw-r--r-- | sci-chemistry/jmol/Manifest | 23 | ||||
| -rw-r--r-- | sci-chemistry/jmol/files/digest-jmol-11.0.3-r1 | 3 | ||||
| -rw-r--r-- | sci-chemistry/jmol/jmol-11.0.3-r1.ebuild | 110 | ||||
| -rw-r--r-- | sci-chemistry/jmol/jmol-11.0.3.ebuild | 4 |
5 files changed, 139 insertions, 11 deletions
diff --git a/sci-chemistry/jmol/ChangeLog b/sci-chemistry/jmol/ChangeLog index 3c689643f275..941d0b1d4b8a 100644 --- a/sci-chemistry/jmol/ChangeLog +++ b/sci-chemistry/jmol/ChangeLog @@ -1,6 +1,14 @@ # 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.1 2007/06/15 08:21:59 je_fro Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/ChangeLog,v 1.2 2007/06/22 08:30:25 caster Exp $ + +*jmol-11.0.3-r1 (22 Jun 2007) + + 22 Jun 2007; Vlastimil Babka <caster@gentoo.org> jmol-11.0.3.ebuild, + +jmol-11.0.3-r1.ebuild: + Revbump for java-related fixes - install jars we've built and not the + bundled ones, don't absorb dependencies' classes, depend only on what's + actually needed, use java dolauncher instead of supplied one. Keyword ~x86. *jmol-11.0.3 (15 Jun 2007) diff --git a/sci-chemistry/jmol/Manifest b/sci-chemistry/jmol/Manifest index c9ac852275b2..238214099ea2 100644 --- a/sci-chemistry/jmol/Manifest +++ b/sci-chemistry/jmol/Manifest @@ -19,14 +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.ebuild 3499 RMD160 235f612e9bf9401f401dd00df0c614b8bf128520 SHA1 412646ad1ad960ca85b57f89f54b45eeee894ac6 SHA256 6c2e3e22fb81c6b74c28b3b5e9218fb0283915d2ea8bec715601be626510d339 -MD5 b1aa3cdd36b89f69371bec1f966b9c36 jmol-11.0.3.ebuild 3499 -RMD160 235f612e9bf9401f401dd00df0c614b8bf128520 jmol-11.0.3.ebuild 3499 -SHA256 6c2e3e22fb81c6b74c28b3b5e9218fb0283915d2ea8bec715601be626510d339 jmol-11.0.3.ebuild 3499 -MISC ChangeLog 490 RMD160 8b150559040a0a8d9b22b5e14aab365f4bd67886 SHA1 6bacf5c4709b50bc52ba7c9851b6eff857d6a8b5 SHA256 7b3fc9de6719787f23d91c358c7b56d3e42f29dd395b14440284fa98f6993428 -MD5 2004fc280250e2474470e95e8d675e6d ChangeLog 490 -RMD160 8b150559040a0a8d9b22b5e14aab365f4bd67886 ChangeLog 490 -SHA256 7b3fc9de6719787f23d91c358c7b56d3e42f29dd395b14440284fa98f6993428 ChangeLog 490 +EBUILD jmol-11.0.3-r1.ebuild 2966 RMD160 9391b1c75edf7fbe49538057eaa9b9fd36402c03 SHA1 16f09822ecf17af1c7fc7ceb6437a5df474a5f8d SHA256 66f628ca7130bd778bc91116df59c826d902f871ff94baeba6049e5142153264 +MD5 91994f892086792c47841221d2502020 jmol-11.0.3-r1.ebuild 2966 +RMD160 9391b1c75edf7fbe49538057eaa9b9fd36402c03 jmol-11.0.3-r1.ebuild 2966 +SHA256 66f628ca7130bd778bc91116df59c826d902f871ff94baeba6049e5142153264 jmol-11.0.3-r1.ebuild 2966 +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 843 RMD160 61fba55291424cce7479025d2f3724b94b5aa3e3 SHA1 70c74fb571c37d69f2c6a28a36ae36c6f04d6894 SHA256 b7b89d63b3299b0f237ed48fdb473dc42876b3a7c14bf6b6c9fd8d64c72c57d7 +MD5 2934dbd9b295dfa6e21af2242747befb ChangeLog 843 +RMD160 61fba55291424cce7479025d2f3724b94b5aa3e3 ChangeLog 843 +SHA256 b7b89d63b3299b0f237ed48fdb473dc42876b3a7c14bf6b6c9fd8d64c72c57d7 ChangeLog 843 MISC metadata.xml 253 RMD160 59050ef726d30aa457b0dabb61494f8386687bd6 SHA1 f5ea0ad09e8f7647830e3b912eafa71f28b054a0 SHA256 f20f704428c998a9fa8511f02730d72435a0a2e168c6f6ef5c6005bc1608841a MD5 5a3da73e18cd061fb7f74cfc718a90d3 metadata.xml 253 RMD160 59050ef726d30aa457b0dabb61494f8386687bd6 metadata.xml 253 @@ -34,3 +38,6 @@ SHA256 f20f704428c998a9fa8511f02730d72435a0a2e168c6f6ef5c6005bc1608841a metadata 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-r1 b/sci-chemistry/jmol/files/digest-jmol-11.0.3-r1 new file mode 100644 index 000000000000..8a749a8f3cc5 --- /dev/null +++ b/sci-chemistry/jmol/files/digest-jmol-11.0.3-r1 @@ -0,0 +1,3 @@ +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 new file mode 100644 index 000000000000..0c47238a96cd --- /dev/null +++ b/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild @@ -0,0 +1,110 @@ +# 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.1 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" + +COMMON_DEP="dev-java/commons-cli + dev-java/itext + sci-libs/jmol-acme + sci-libs/vecmath-objectclub" + +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" +DEPEND=">=virtual/jdk-1.4 + vhosts? ( app-admin/webapp-config ) + ${COMMON_DEP}" + +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 + + mkdir "${S}"/selfSignedCertificate || die "Failed to create Cert directory." + cp "${FILESDIR}"/selfSignedCertificate.store "${S}"/selfSignedCertificate/ \ + || die "Failed to install Cert file." + + rm -v "${S}"/*.jar "${S}"/plugin-jars/*.jar || die + cd "${S}/jars" + rm -v *.jar *.tar.gz || die + + 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 + java-pkg_jar-from jmol-acme jmol-acme.jar Acme.jar + java-pkg_jar-from commons-cli-1 commons-cli.jar commons-cli-1.0.jar + + mkdir -p "${S}/build/appjars" || die +} + +src_compile() { + # prevent absorbing dep's classes + eant -Dlibjars.uptodate=true main +} + +src_install() { + + java-pkg_dojar build/Jmol.jar + dohtml -r build/doc/* || die "Failed to install html docs." + dodoc *.txt doc/*license* || die "Failed to install licenses." + + java-pkg_dolauncher ${PN} --main org.openscience.jmol.app.Jmol \ + --java_args "-Xmx512m" + + if ! use client-only ; then + webapp_src_preinst || die "Failed webapp_src_preinst." + cmd="cp Jmol.js build/Jmol.jar "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ + || die "${cmd} failed." + cmd="cp build/JmolApplet*.jar "${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/appletjars/* "${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 + +} diff --git a/sci-chemistry/jmol/jmol-11.0.3.ebuild b/sci-chemistry/jmol/jmol-11.0.3.ebuild index 4fbd59bfddf2..da4da1858fb0 100644 --- a/sci-chemistry/jmol/jmol-11.0.3.ebuild +++ b/sci-chemistry/jmol/jmol-11.0.3.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.ebuild,v 1.1 2007/06/15 08:21:59 je_fro Exp $ +# $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" +KEYWORDS="~amd64 ~x86" LICENSE="LGPL-2.1" IUSE="client-only vhosts" |