sci-chemistry/jmol: Straigthen out ebuild style

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

6 files changed, 84 insertions, 192 deletions

diff --git a/sci-chemistry/jmol/ChangeLog b/sci-chemistry/jmol/ChangeLog
index 55208e1c4e26..6b751cffb28f 100644
--- a/sci-chemistry/jmol/ChangeLog
+++ b/sci-chemistry/jmol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/jmol
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/ChangeLog,v 1.15 2012/06/21 14:41:23 je_fro Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/ChangeLog,v 1.16 2013/08/09 11:56:40 jlec Exp $
+
+  09 Aug 2013; Justin Lecher <jlec@gentoo.org> -jmol-11.0.3-r1.ebuild,
+  jmol-12.0.45.ebuild, jmol-12.2.27.ebuild, metadata.xml:
+  Straigthen out ebuild style
 
   21 Jun 2012; Jeff Gardner <je_fro@gentoo.org> jmol-12.2.27.ebuild:
   Add --build-only to saxon, fix bug 422757 thanks to Diego Elio Petteno
diff --git a/sci-chemistry/jmol/Manifest b/sci-chemistry/jmol/Manifest
index d3367a5745fe..7345d8c1723b 100644
--- a/sci-chemistry/jmol/Manifest
+++ b/sci-chemistry/jmol/Manifest
@@ -1,16 +1,34 @@
-AUX 12.0.45/jmol-manifest.patch 3726 RMD160 03e1e11fdd29fb63de15934fff166348577084b0 SHA1 925a957bc30e1fbab9fd773dc07f83411f667d30 SHA256 74cdf274352161ffdf155b34b8d9110dad9c4a15720467f73d301104005566bd
-AUX 12.0.45/jmol-nointl.patch 13315 RMD160 9b6ca307d5e40af72bf07e668d3ad58bbde66a48 SHA1 f98f3df84369a2c63e54fd891ed1f63410dc6472 SHA256 6bbf13c59bc3633dc089346c1133ad2b3d0614463abdf364f5ec2e2ccd658df0
-AUX caffeine.xyz 1116 RMD160 92b432c6584cd927fa1bfb155ea41011ab7a82d8 SHA1 d0f35a447b333b8ea51c15ab0ac67d887556e43c SHA256 45a9afac0b247780595944a98f8e1076a7e7e0dbb3e02cb54cecb0764b1cb67f
-AUX index.html 328 RMD160 60d2a573c228e018a864fd7d9cfc7554264ccd6b SHA1 7ab256d768d3a4da43b5e497dfb1c3a53a8068a9 SHA256 8cba2c5eb7f25c0ecf23bc007eb61549a7d2177ac327db6c1e5f51f333ae2451
-AUX jmol-11.0.3-manifest.patch 3726 RMD160 03e1e11fdd29fb63de15934fff166348577084b0 SHA1 925a957bc30e1fbab9fd773dc07f83411f667d30 SHA256 74cdf274352161ffdf155b34b8d9110dad9c4a15720467f73d301104005566bd
-AUX jmol-11.0.3-nointl.patch 11109 RMD160 ea8808469e488c3c7d8a75d2273fefdae32c3011 SHA1 891b83352cdf940c0da2d903b1cf6a9da31f67d7 SHA256 56ad460779a0ecfb90ad61cf4cfae2fad9b017f9f78581a720241e4ea208b49a
-AUX jmol-12.2.27-nointl.patch 13821 RMD160 4d6a6a598f4b550b6c2e3665c01b4f915d39c563 SHA1 2bc04f7a5e781f8628622a69f12d1f4a33b26140 SHA256 330a911405f00552d37a9c241c4a18b9d3e6812ce858933dbc4574df8248e345
-DIST Jmol-12.0.45-full.tar.gz 26501382 RMD160 0d9a4212abf45852706f92cb16aedae7632763c5 SHA1 c43b0542be8bd845dadbcacdd41e47482e23fe03 SHA256 f9a3fe242841f9b56a718f8da2efe4130e497afe2c12d77f2e68344c62d7f70e
-DIST Jmol-12.2.27-full.tar.gz 29493780 RMD160 e0f530e92ed079b1debf9fbd5c720ad19ba71977 SHA1 663a3a83a1fff373cea624d4cec4fdd71efcd505 SHA256 f2ca3b810ea16a488f6f57003d2a407c8ac040d610479a7ae6d95631157db801
-DIST jmol-11.0.3-full.tar.gz 13578526 RMD160 53e34c52d6085635daea74cd9c5787da67ef483e SHA1 35dc9d3d3cfe08cbe3076a6939f62361b2c59c86 SHA256 210eb7d119e53ed0b7f41939321bcfcdb4d7312761d8002e340c83ff49664616
-DIST jmol-selfSignedCertificate.store.tar 10240 RMD160 a6d4df5f108a2c13074190569b95d3310439ea57 SHA1 218fff84df0c542b634ba08ed2e82d3d3280a481 SHA256 416744934991ef4f1fa298c0afc8e855d43771de2f2278ed3fbc60f707ea46b2
-EBUILD jmol-11.0.3-r1.ebuild 3222 RMD160 2dfaaba68c311b7aaa92ca27a9e898d35349c237 SHA1 4d5e6b6d85692313a96ec50f12d3ddcb68290085 SHA256 e05e4b2c974e280e83740cf91bd2ba03b08e9b671061f795d0a41407305f7d36
-EBUILD jmol-12.0.45.ebuild 3259 RMD160 f8173f281f5f6018ac33199757a6c89eb7f487a2 SHA1 39c7b6cd6552673c323d0e3f36c0e1641c8001bb SHA256 3c1001b3c03f71ef9077dc61bcb45cc217e91e4669fe4a35986de61a88b8cfc6
-EBUILD jmol-12.2.27.ebuild 3236 RMD160 c4e285438ae890dfedc8be5098959a52a8996f04 SHA1 5ef6fa4d2d0d87e79c46b85b3b3a4c037a1e93d5 SHA256 51ce3c71ca757afe2b614ca1d62c3ca2712198584e47279225d7ff639572159a
-MISC ChangeLog 2574 RMD160 9683975087dfe2b6b10583713573a42aff45de4e SHA1 74b75602ea31759043789b6b8116aae28abb94a0 SHA256 9c966459bf587b73f2a232d8469425b175c305620fcdff70168b929836e4db58
-MISC metadata.xml 355 RMD160 2c279aeab8c72ba2ac5573ccd72a69726166c638 SHA1 3cf53d45ceec1ed494d8c7312f60933657356e48 SHA256 a26dbd57c95fd7f37b7ade989dca90933da7f75fe7c27ac54c030d275edf12b4
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX 12.0.45/jmol-manifest.patch 3726 SHA256 74cdf274352161ffdf155b34b8d9110dad9c4a15720467f73d301104005566bd SHA512 016e57a3c3e55d89fe2a72447160c0b6359affec305c6b4949892ddec3b4a648bad96b87ff0aa5cb0c5187f59e825b441cbbe60e6936a14df536ed0095f67112 WHIRLPOOL abb250bc77d15a5f3e0a441dd0ffd8809642d8959f896c1ae394b85695b74bd4578013ad99b38abca822ad5db514562b121ad6b2f0265090653d7e359ee85a2f
+AUX 12.0.45/jmol-nointl.patch 13315 SHA256 6bbf13c59bc3633dc089346c1133ad2b3d0614463abdf364f5ec2e2ccd658df0 SHA512 deb54c7f94e3fd4b43a701d58c992edbc80f650397feea97594a8f00cdc14463a19e2314fa616fb3a0ca42af8b70770c0426b8eacfe1d81a30b53c566e6342c0 WHIRLPOOL 570e359517e1011ba76447161e6c03925db0e6533d262f11f13d9553f75989faa27a0ae5f39352dad19ec53e804e8e39e76bbc79f1b44b495fe948e7b8633472
+AUX caffeine.xyz 1116 SHA256 45a9afac0b247780595944a98f8e1076a7e7e0dbb3e02cb54cecb0764b1cb67f SHA512 863ee4a327b2d765ed042cf24055c708d3970a20c3c3b2ee45b46096390be11a7c02915faedb30ee6cb69101faa5942fcfb19fe2b530afb93460a2cd167c3688 WHIRLPOOL 18df972f5cbafc35be4bf20de29ad8049e7c6f921a668f0c80cd9aff2c3ede32b9b30e830f2629be2136923c554c3711b809915d45ea1bd1da854d8768d6e254
+AUX index.html 328 SHA256 8cba2c5eb7f25c0ecf23bc007eb61549a7d2177ac327db6c1e5f51f333ae2451 SHA512 e89c62ba91ecebb38d6f9c88cc1f257600bd7d6005df97713f2715036d3308dee53f7b838ca749c1acc810cc4701c384525f2763b96ac2f1d6802e639cd1961b WHIRLPOOL 0b407f950f4f2523d21c03b6e4f20f9ef4009e54d666ad3a222b87b0e49576816f3940e4fe076e55e9fda9832170c54f17ed543420333fe489f45f4d7296ee79
+AUX jmol-11.0.3-manifest.patch 3726 SHA256 74cdf274352161ffdf155b34b8d9110dad9c4a15720467f73d301104005566bd SHA512 016e57a3c3e55d89fe2a72447160c0b6359affec305c6b4949892ddec3b4a648bad96b87ff0aa5cb0c5187f59e825b441cbbe60e6936a14df536ed0095f67112 WHIRLPOOL abb250bc77d15a5f3e0a441dd0ffd8809642d8959f896c1ae394b85695b74bd4578013ad99b38abca822ad5db514562b121ad6b2f0265090653d7e359ee85a2f
+AUX jmol-11.0.3-nointl.patch 11109 SHA256 56ad460779a0ecfb90ad61cf4cfae2fad9b017f9f78581a720241e4ea208b49a SHA512 0fe07fb53d989298f7395be39c6ee75f56ab59fc096e956d8481c38581706b17f799e745fcd5b6652c4f1115d4425e7ff9ebef454b606d8de7829e07e26b27e2 WHIRLPOOL daf992208b99fec51f5f0b26ca22d520ebd820a22d439c7baa2b84f2b4b3829ac7139d7d3c48076dd4681af1296fd5e61badd91332efa03cc97e58027b21697a
+AUX jmol-12.2.27-nointl.patch 13821 SHA256 330a911405f00552d37a9c241c4a18b9d3e6812ce858933dbc4574df8248e345 SHA512 6ad196dfd6d38a086fad461f8170340f8ef3beb7ae69916e0285d8e30ce8a40efc278e461a3d0ae0da71611529f4a0e58c9a73336319764b1fef62d75336a8dc WHIRLPOOL 94be437d33ec73ed53c8461e78a7799c2aa34c9b606e309554da191ff74a465fe2243f4953a615aca790d3558e2b69b7edd122526f900475f5b05bb20d98d0fe
+DIST Jmol-12.0.45-full.tar.gz 26501382 SHA256 f9a3fe242841f9b56a718f8da2efe4130e497afe2c12d77f2e68344c62d7f70e
+DIST Jmol-12.2.27-full.tar.gz 29493780 SHA256 f2ca3b810ea16a488f6f57003d2a407c8ac040d610479a7ae6d95631157db801
+DIST jmol-selfSignedCertificate.store.tar 10240 SHA256 416744934991ef4f1fa298c0afc8e855d43771de2f2278ed3fbc60f707ea46b2
+EBUILD jmol-12.0.45.ebuild 3056 SHA256 b63d9a7088a700493c5700ba87d6a7887655e9e1494af9bec0837c248d848f82 SHA512 27dd4e1d1f29d6153d666b363b5b246bf1e61198e428c49413d504d9b9d29b035f3f71fd39ec73943397ddef932a63fd511857d2d86dd1b7cdb0ab2328756814 WHIRLPOOL 4c286f8748058449aa2a5507aadfe56333666df66e9fd123be455eee3a79e227461b92b822d074e8ff5b79abe4a0ebeddc75bc04691b83e6a92fd5c14768ca68
+EBUILD jmol-12.2.27.ebuild 2917 SHA256 fcad56eb690ffe302baaa7da4d584fba8488ed756b624754f845049917d13a8c SHA512 8ecebcac146de51db9ae591eecb030e499e0321737b227dc7b280743699ba9a6b17dd1edb089d930665d2df73b359a431946fb10d3eaefde96df5d6342f1f819 WHIRLPOOL f44495e18efcc72b6a752a27b6b1d18bc529c6906d1d0dd8fab9eb0f1dbd43bc852e2205661bd55551a305d0f2b1c8af537ba4a17d129b31c99904c515c41812
+MISC ChangeLog 2732 SHA256 3e68f1e1c346495914f39c77c261b6b83d8980a9c6245ae8c79d5433bc43ceba SHA512 f8a222ff449717affcc0eb9d2a58bd5fbd1d6c98226045576bb728dd0d85495fef9520ff524f56ce386bce682f49a18725cac52adf9614f572470b74e2e0579c WHIRLPOOL a3d86d3bed61b10f5a3f4c61caf3e85f643b17a0b68478ac6e8f79e4ef4576fbed1d4d68ac82c43ba9f36955387ff97f4bfda90fcf6324fb0b0c76b25f387f17
+MISC metadata.xml 375 SHA256 350185fefb6cb6a2f75b8a1bf43e8c5711d337b2764d1c6416a9e1196e807c2d SHA512 9a3fc8e4cb347ccf47695e48bd15fd9aae9f89a65da617aee46f9584e82d14dadfc6c8a6cf8f75311e29251f9cb0b764de47308b0cac02ace424977334d15d3a WHIRLPOOL db08de8e77110061ab04a82386aeb21c0d2e7a588cb6c62a452ece08a1d51852d0fbb68ee4fa5f3a5853fa7cd36aaeda77290a582a1ac092a4ce99d83493d177
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQIcBAEBCgAGBQJSBNj5AAoJELnU8jG9FVir+SsP/AlhcR4LSJEwHzq5Qw05O79Q
+R6b9gHUO/yXtTnW2b9ACware5bIg1AN5VVBd2HOmqlgn8pU+o6/QAJsBmPaLeyGQ
+OnNLBobHR2g4sbdVQySvnru53M6Rv2rKALgKCdkhlZviGqJWsGvLNA3DUZzU0Ied
+BjcBe9Luk5xmjTGV9Q1QGmKln53YjEwzk9BO9zTlgJKUkiXWnw34fsnLYSyBHVlB
++cDX7ZmmzQycIjFFRNDMHBB0zAuTLQY7wD+o7NYZLQEO0n4QDug0pQnYN79dinov
+l3X+E3UsTVVh7UJ34s4BELqsKDHlIM9OrsyIvPh7Nsmo661qoe83Jcve5Fdt7QdX
+4ve536YV3PttQF/m5NohYmTaBDcN+7v79NPyyhfK1TtjudALHbMSgDf91cJL8EqV
+99WBegSrt2jf2HDqUUl7pZ7MGKxTHrt8B733daFjKqek/sLcySmF/ey4PWpRkOs6
+5P+lt9wjPTTtb/tD7xy9Cpz/36Au4nvdOK4yDiJjtzHhOXbs7fHjTiQNozZPTzCC
+fUqb15+OzlgcdSE7BsDMjhUi4QBoDO1ISlZwBCCvWApbH9wHgcd4U6BIweBotCan
+V4fW7xTzf39H6zgkjJuoWmIoNgwswh/6vV6Yn6LztvATQvhrWjRG8MT4yuSkgfO8
+HolRH3/9iQHZpsUEc0AA
+=DKCQ
+-----END PGP SIGNATURE-----
diff --git a/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild b/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild
deleted file mode 100644
index 38e14332e39c..000000000000
--- a/sci-chemistry/jmol/jmol-11.0.3-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 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.8 2012/02/15 14:14:10 xarthisius Exp $
-
-EAPI=1
-WEBAPP_OPTIONAL="yes"
-
-inherit eutils webapp java-pkg-2 java-ant-2
-
-DESCRIPTION="Java molecular viever for 3-D chemical structures"
-HOMEPAGE="http://jmol.sourceforge.net/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}-full.tar.gz
-	http://dev.gentoo.org/~jlec/distfiles/${PN}-selfSignedCertificate.store.tar"
-
-WEBAPP_MANUAL_SLOT="yes"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LICENSE="LGPL-2.1"
-IUSE="client-only vhosts"
-
-COMMON_DEP="dev-java/commons-cli:1
-	dev-java/itext:0
-	sci-libs/jmol-acme:0
-	sci-libs/vecmath-objectclub:0"
-
-RDEPEND=">=virtual/jre-1.4
-	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.4
-	!client-only? ( ${WEBAPP_DEPEND} )
-	${COMMON_DEP}"
-
-pkg_setup() {
-	use client-only || webapp_pkg_setup
-	java-pkg-2_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch \
-		"${FILESDIR}"/${P}-nointl.patch \
-		"${FILESDIR}"/${P}-manifest.patch
-
-	mkdir "${S}"/selfSignedCertificate || die "Failed to create Cert directory."
-	cp "${WORKDIR}"/selfSignedCertificate.store "${S}"/selfSignedCertificate/ \
-		|| die "Failed to install Cert file."
-
-	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.
-	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
-	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() {
-	use client-only || webapp_pkg_postinst
-}
-
-pkg_prerm() {
-	use client-only || webapp_pkg_prerm
-}
diff --git a/sci-chemistry/jmol/jmol-12.0.45.ebuild b/sci-chemistry/jmol/jmol-12.0.45.ebuild
index 0b468f1e773f..e715a0120332 100644
--- a/sci-chemistry/jmol/jmol-12.0.45.ebuild
+++ b/sci-chemistry/jmol/jmol-12.0.45.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/jmol-12.0.45.ebuild,v 1.2 2012/01/26 17:34:04 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/jmol-12.0.45.ebuild,v 1.3 2013/08/09 11:56:40 jlec Exp $
 
 EAPI=1
 WEBAPP_OPTIONAL="yes"
@@ -21,7 +21,8 @@ KEYWORDS="~amd64 ~x86"
 LICENSE="LGPL-2.1"
 IUSE="client-only vhosts"
 
-COMMON_DEP="dev-java/commons-cli:1
+COMMON_DEP="
+	dev-java/commons-cli:1
 	dev-java/itext:0
 	sci-libs/jmol-acme:0
 	sci-libs/vecmath-objectclub:0"
@@ -80,23 +81,16 @@ src_install() {
 		--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"
+		webapp_src_preinst
+		cp Jmol.js build/Jmol.jar "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
+		cp build/JmolApplet*.jar "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
+		cp applet.classes "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
+		cp -r build/classes/* "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
+		cp -r build/appletjars/* "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
+		cp "${FILESDIR}"/caffeine.xyz "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
+		cp "${FILESDIR}"/index.html "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
+
+		webapp_src_install
 	fi
 }
 
diff --git a/sci-chemistry/jmol/jmol-12.2.27.ebuild b/sci-chemistry/jmol/jmol-12.2.27.ebuild
index 373bce9c17ac..1f24c821c436 100644
--- a/sci-chemistry/jmol/jmol-12.2.27.ebuild
+++ b/sci-chemistry/jmol/jmol-12.2.27.ebuild
@@ -1,32 +1,32 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/jmol-12.2.27.ebuild,v 1.3 2012/06/21 14:41:23 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/jmol-12.2.27.ebuild,v 1.4 2013/08/09 11:56:40 jlec Exp $
 
 EAPI=1
 WEBAPP_OPTIONAL="yes"
 
 inherit eutils webapp java-pkg-2 java-ant-2
 
-MY_P="Jmol"
+MY_P=Jmol
 
-DESCRIPTION="Jmol is a java molecular viever for 3-D chemical structures."
+DESCRIPTION="Java molecular viever for 3-D chemical structures"
+HOMEPAGE="http://jmol.sourceforge.net/"
 SRC_URI="
 	mirror://sourceforge/${PN}/${MY_P}-${PV}-full.tar.gz
 	http://dev.gentoo.org/~jlec/distfiles/${PN}-selfSignedCertificate.store.tar"
 
-HOMEPAGE="http://jmol.sourceforge.net/"
-KEYWORDS="~x86 ~amd64"
 LICENSE="LGPL-2.1"
-
+KEYWORDS="~x86 ~amd64"
 IUSE="+client-only vhosts"
 
 WEBAPP_MANUAL_SLOT="yes"
 SLOT="0"
 
-COMMON_DEP="dev-java/commons-cli
+COMMON_DEP="
+	dev-java/commons-cli:1
 	dev-java/itext:0
-	sci-libs/jmol-acme
-	sci-libs/vecmath-objectclub
+	sci-libs/jmol-acme:0
+	sci-libs/vecmath-objectclub:0
 	sci-libs/naga"
 RDEPEND=">=virtual/jre-1.5
 	${COMMON_DEP}"
@@ -36,13 +36,11 @@ DEPEND=">=virtual/jdk-1.5
 	${COMMON_DEP}"
 
 pkg_setup() {
-
 	use client-only || webapp_pkg_setup
 	java-pkg-2_pkg_setup
 }
 
 src_unpack() {
-
 	unpack ${A}
 	cd "${S}"
 
@@ -74,7 +72,6 @@ src_compile() {
 }
 
 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."
@@ -83,38 +80,23 @@ src_install() {
 		--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"
+		webapp_src_preinst
+		cp Jmol.js build/Jmol.jar "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
+		cp build/JmolApplet*.jar "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
+		cp applet.classes "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
+		cp -r build/classes/* "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
+		cp -r build/appletjars/* "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
+		cp "${FILESDIR}"/caffeine.xyz "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
+		cp "${FILESDIR}"/index.html "${ED}"${MY_HTDOCSDIR} || die "${cmd} failed."
+
+		webapp_src_install
 	fi
 }
 
 pkg_postinst() {
-
-	if ! use client-only ; then
-		webapp_pkg_postinst || die "webapp_pkg_postinst failed"
-	fi
-
+	use client-only || webapp_pkg_postinst
 }
 
 pkg_prerm() {
-
-	if ! use client-only ; then
-		webapp_pkg_prerm || die "webapp_pkg_prerm failed"
-	fi
-
+	use client-only || webapp_pkg_prerm
 }
diff --git a/sci-chemistry/jmol/metadata.xml b/sci-chemistry/jmol/metadata.xml
index ee65d2c2a3d9..294a2616f568 100644
--- a/sci-chemistry/jmol/metadata.xml
+++ b/sci-chemistry/jmol/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-chemistry</herd>
-<maintainer>
-<email>je_fro@gentoo.org</email>
-<name>Jeff Gardner</name>
-</maintainer>
-<use>
-  <flag name='client-only'>Install the viewer only, no applet files for httpd
+  <herd>sci-chemistry</herd>
+  <maintainer>
+    <email>je_fro@gentoo.org</email>
+    <name>Jeff Gardner</name>
+  </maintainer>
+  <use>
+    <flag name="client-only">Install the viewer only, no applet files for httpd
     </flag>
-</use>
+  </use>
 </pkgmetadata>