From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QbVOn-00067p-NU for garchives@archives.gentoo.org; Tue, 28 Jun 2011 10:20:11 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 46ABF1C012; Tue, 28 Jun 2011 10:19:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D8E1E1C012 for ; Tue, 28 Jun 2011 10:19:57 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 58E551B4024 for ; Tue, 28 Jun 2011 10:19:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6A9798003C for ; Tue, 28 Jun 2011 10:19:56 +0000 (UTC) From: "Jeffrey Gardner" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jeffrey Gardner" Message-ID: <0ce38ac5eff628ffd73df9251f5a2889df029559.je_fro@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/jmol/files/12.0.34/, sci-chemistry/jmol/, ... X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/jmol/files/12.0.34/jmol-manifest.patch sci-chemistry/jmol/files/12.0.34/jmol-nointl.patch sci-chemistry/jmol/files/jmol-11.6-manifest.patch sci-chemistry/jmol/files/jmol-11.6-nointl.patch sci-chemistry/jmol/jmol-11.6.ebuild sci-chemistry/jmol/jmol-12.0.34.ebuild sci-chemistry/jmol/jmol-12.0.45-r1.ebuild sci-chemistry/jmol/jmol-12.0.45.ebuild X-VCS-Directories: sci-chemistry/jmol/files/12.0.34/ sci-chemistry/jmol/ sci-chemistry/jmol/files/ X-VCS-Committer: je_fro X-VCS-Committer-Name: Jeffrey Gardner X-VCS-Revision: 0ce38ac5eff628ffd73df9251f5a2889df029559 Date: Tue, 28 Jun 2011 10:19:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 1f6b83576201253b709d1f3b0d7a96d0 commit: 0ce38ac5eff628ffd73df9251f5a2889df029559 Author: je_fro gentoo org> AuthorDate: Tue Jun 28 10:19:38 2011 +0000 Commit: Jeffrey Gardner gentoo org> CommitDate: Tue Jun 28 10:19:38 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D0ce38ac5 Cleanup --- .../jmol/files/12.0.34/jmol-manifest.patch | 96 ------ sci-chemistry/jmol/files/12.0.34/jmol-nointl.patch | 313 --------------= ------ sci-chemistry/jmol/files/jmol-11.6-manifest.patch | 96 ------ sci-chemistry/jmol/files/jmol-11.6-nointl.patch | 274 --------------= --- sci-chemistry/jmol/jmol-11.6.ebuild | 119 -------- sci-chemistry/jmol/jmol-12.0.34.ebuild | 122 -------- ...{jmol-12.0.45.ebuild =3D> jmol-12.0.45-r1.ebuild} | 0 7 files changed, 0 insertions(+), 1020 deletions(-) diff --git a/sci-chemistry/jmol/files/12.0.34/jmol-manifest.patch b/sci-c= hemistry/jmol/files/12.0.34/jmol-manifest.patch deleted file mode 100644 index 3b43c21..0000000 --- a/sci-chemistry/jmol/files/12.0.34/jmol-manifest.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -aurN jmol-11.0.3-orig/manifest/applet0.txt jmol-11.0.3/manifest/ap= plet0.txt ---- jmol-11.0.3-orig/manifest/applet0.txt 1969-12-31 18:00:00.000000000 = -0600 -+++ jmol-11.0.3/manifest/applet0.txt 2007-05-16 01:54:10.000000000 -0500 -@@ -0,0 +1,6 @@ -+Main-Class: JmolApplet -+Sealed: true -+ -+Name: org/jmol/api/ -+Sealed: false -+ -diff -aurN jmol-11.0.3-orig/manifest/applet1.txt jmol-11.0.3/manifest/ap= plet1.txt ---- jmol-11.0.3-orig/manifest/applet1.txt 1969-12-31 18:00:00.000000000 = -0600 -+++ jmol-11.0.3/manifest/applet1.txt 2007-05-16 01:54:10.000000000 -0500 -@@ -0,0 +1,6 @@ -+Name: org/jmol/api/ -+Sealed: false -+ -+Name: org/jmol/applet/ -+Sealed: true -+ -diff -aurN jmol-11.0.3-orig/manifest/applet2.txt jmol-11.0.3/manifest/ap= plet2.txt ---- jmol-11.0.3-orig/manifest/applet2.txt 1969-12-31 18:00:00.000000000 = -0600 -+++ jmol-11.0.3/manifest/applet2.txt 2007-05-16 01:56:19.000000000 -0500 -@@ -0,0 +1,3 @@ -+Name: javax/vecmath/ -+ -+ -diff -aurN jmol-11.0.3-orig/manifest/applet3.txt jmol-11.0.3/manifest/ap= plet3.txt ---- jmol-11.0.3-orig/manifest/applet3.txt 1969-12-31 18:00:00.000000000 = -0600 -+++ jmol-11.0.3/manifest/applet3.txt 2007-05-16 01:56:47.000000000 -0500 -@@ -0,0 +1,4 @@ -+ -+Name: org/jmol/g3d/ -+Sealed: true -+ -diff -aurN jmol-11.0.3-orig/manifest/applet4.txt jmol-11.0.3/manifest/ap= plet4.txt ---- jmol-11.0.3-orig/manifest/applet4.txt 1969-12-31 18:00:00.000000000 = -0600 -+++ jmol-11.0.3/manifest/applet4.txt 2007-05-16 01:57:05.000000000 -0500 -@@ -0,0 +1,4 @@ -+ -+Name: org/jmol/adapter/smarter/ -+Sealed: true -+ -diff -aurN jmol-11.0.3-orig/manifest/applet5.txt jmol-11.0.3/manifest/ap= plet5.txt ---- jmol-11.0.3-orig/manifest/applet5.txt 1969-12-31 18:00:00.000000000 = -0600 -+++ jmol-11.0.3/manifest/applet5.txt 2007-05-16 01:57:23.000000000 -0500 -@@ -0,0 +1,4 @@ -+Name: org/openscience/jmol/ui/ -+Sealed: true -+ -+ -diff -aurN jmol-11.0.3-orig/manifest/applet6.txt jmol-11.0.3/manifest/ap= plet6.txt ---- jmol-11.0.3-orig/manifest/applet6.txt 1969-12-31 18:00:00.000000000 = -0600 -+++ jmol-11.0.3/manifest/applet6.txt 2007-05-16 01:57:46.000000000 -0500 -@@ -0,0 +1,4 @@ -+ -+Name: org/jmol/viewer/ -+Sealed: true -+ -diff -aurN jmol-11.0.3-orig/manifest/appletMain.txt jmol-11.0.3/manifest= /appletMain.txt ---- jmol-11.0.3-orig/manifest/appletMain.txt 1969-12-31 18:00:00.0000000= 00 -0600 -+++ jmol-11.0.3/manifest/appletMain.txt 2007-05-16 01:54:10.000000000 -0= 500 -@@ -0,0 +1,5 @@ -+Manifest-Version: 1.0 -+Sealed: true -+ -+Name: org/jmol/api/ -+Sealed: false -diff -aurN jmol-11.0.3-orig/manifest/appletMonolithic.txt jmol-11.0.3/ma= nifest/appletMonolithic.txt ---- jmol-11.0.3-orig/manifest/appletMonolithic.txt 1969-12-31 18:00:00.0= 00000000 -0600 -+++ jmol-11.0.3/manifest/appletMonolithic.txt 2007-05-16 01:54:10.000000= 000 -0500 -@@ -0,0 +1,7 @@ -+Main-Class: JmolApplet -+Sealed: true -+ -+Name: org/jmol/api/ -+Sealed: false -+ -+ -diff -aurN jmol-11.0.3-orig/manifest/applet.txt jmol-11.0.3/manifest/app= let.txt ---- jmol-11.0.3-orig/manifest/applet.txt 1969-12-31 18:00:00.000000000 -= 0600 -+++ jmol-11.0.3/manifest/applet.txt 2007-05-16 01:54:10.000000000 -0500 -@@ -0,0 +1,2 @@ -+Manifest-Version: 1.0 -+Sealed: true -\ No newline at end of file -diff -aurN jmol-11.0.3-orig/manifest/application.txt jmol-11.0.3/manifes= t/application.txt ---- jmol-11.0.3-orig/manifest/application.txt 1969-12-31 18:00:00.000000= 000 -0600 -+++ jmol-11.0.3/manifest/application.txt 2007-05-16 01:54:10.000000000 -= 0500 -@@ -0,0 +1 @@ -+Main-Class: org.openscience.jmol.app.Jmol -diff -aurN jmol-11.0.3-orig/manifest/jvxl.txt jmol-11.0.3/manifest/jvxl.= txt ---- jmol-11.0.3-orig/manifest/jvxl.txt 1969-12-31 18:00:00.000000000 -06= 00 -+++ jmol-11.0.3/manifest/jvxl.txt 2007-05-16 01:54:10.000000000 -0500 -@@ -0,0 +1 @@ -+Main-Class: org.openscience.jvxl.Jvxl diff --git a/sci-chemistry/jmol/files/12.0.34/jmol-nointl.patch b/sci-che= mistry/jmol/files/12.0.34/jmol-nointl.patch deleted file mode 100644 index c1b22e8..0000000 --- a/sci-chemistry/jmol/files/12.0.34/jmol-nointl.patch +++ /dev/null @@ -1,313 +0,0 @@ ---- build.xml 2011-02-25 12:59:43.000000000 -0600 -+++ build.xml.new 2011-02-27 12:16:02.398959959 -0600 -@@ -110,10 +110,6 @@ - - -- -- -- - - -=20 -@@ -123,14 +119,6 @@ - - -- -- -- -- -- -- - - - =20 -@@ -140,14 +128,6 @@ - - -- -- -- -- -- -- - - -=20 -@@ -157,14 +137,6 @@ - - -- -- -- -- -- -- - - -=20 -@@ -385,17 +357,12 @@ - -=20 - -+ depends=3D"init,classes,jmolGuide,jmolHistory,jmolDevelopersG= uide,libjars"> - - - - - -- -- -- -- -- - - - -@@ -587,18 +554,6 @@ - - -=20 -- -- -- -- -- -- -- -- -- -- - - - -@@ -712,7 +667,6 @@ - - - -- - - - -@@ -738,7 +692,6 @@ - - - -- - - - -@@ -851,16 +804,6 @@ - keystore=3D"selfSignedCertificate/selfSignedCertificate.st= ore" - storepass=3D"selfSignedCertificate" alias=3D"selfSignedCer= tificate" /> -=20 -- -- -- -- -- -- - - -@@ -1104,7 +1032,7 @@ - -=20 - -+ depends=3D"doc,main,signed-applet"> - - - -@@ -1163,7 +1091,6 @@ - - - -- - - -=20 -@@ -1246,7 +1173,6 @@ - - - -- - - -=20 -@@ -1342,7 +1268,7 @@ - - -=20 -- -+ - - - -@@ -1406,16 +1332,6 @@ - - - -- -- -- -- -- -- -- -- - -=20 - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -=20 - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -=20 - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -=20 - -@@ -1543,12 +1403,4 @@ - - -=20 -- -- -- -- -- -- -- -- - diff --git a/sci-chemistry/jmol/files/jmol-11.6-manifest.patch b/sci-chem= istry/jmol/files/jmol-11.6-manifest.patch deleted file mode 100644 index 3b43c21..0000000 --- a/sci-chemistry/jmol/files/jmol-11.6-manifest.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -aurN jmol-11.0.3-orig/manifest/applet0.txt jmol-11.0.3/manifest/ap= plet0.txt ---- jmol-11.0.3-orig/manifest/applet0.txt 1969-12-31 18:00:00.000000000 = -0600 -+++ jmol-11.0.3/manifest/applet0.txt 2007-05-16 01:54:10.000000000 -0500 -@@ -0,0 +1,6 @@ -+Main-Class: JmolApplet -+Sealed: true -+ -+Name: org/jmol/api/ -+Sealed: false -+ -diff -aurN jmol-11.0.3-orig/manifest/applet1.txt jmol-11.0.3/manifest/ap= plet1.txt ---- jmol-11.0.3-orig/manifest/applet1.txt 1969-12-31 18:00:00.000000000 = -0600 -+++ jmol-11.0.3/manifest/applet1.txt 2007-05-16 01:54:10.000000000 -0500 -@@ -0,0 +1,6 @@ -+Name: org/jmol/api/ -+Sealed: false -+ -+Name: org/jmol/applet/ -+Sealed: true -+ -diff -aurN jmol-11.0.3-orig/manifest/applet2.txt jmol-11.0.3/manifest/ap= plet2.txt ---- jmol-11.0.3-orig/manifest/applet2.txt 1969-12-31 18:00:00.000000000 = -0600 -+++ jmol-11.0.3/manifest/applet2.txt 2007-05-16 01:56:19.000000000 -0500 -@@ -0,0 +1,3 @@ -+Name: javax/vecmath/ -+ -+ -diff -aurN jmol-11.0.3-orig/manifest/applet3.txt jmol-11.0.3/manifest/ap= plet3.txt ---- jmol-11.0.3-orig/manifest/applet3.txt 1969-12-31 18:00:00.000000000 = -0600 -+++ jmol-11.0.3/manifest/applet3.txt 2007-05-16 01:56:47.000000000 -0500 -@@ -0,0 +1,4 @@ -+ -+Name: org/jmol/g3d/ -+Sealed: true -+ -diff -aurN jmol-11.0.3-orig/manifest/applet4.txt jmol-11.0.3/manifest/ap= plet4.txt ---- jmol-11.0.3-orig/manifest/applet4.txt 1969-12-31 18:00:00.000000000 = -0600 -+++ jmol-11.0.3/manifest/applet4.txt 2007-05-16 01:57:05.000000000 -0500 -@@ -0,0 +1,4 @@ -+ -+Name: org/jmol/adapter/smarter/ -+Sealed: true -+ -diff -aurN jmol-11.0.3-orig/manifest/applet5.txt jmol-11.0.3/manifest/ap= plet5.txt ---- jmol-11.0.3-orig/manifest/applet5.txt 1969-12-31 18:00:00.000000000 = -0600 -+++ jmol-11.0.3/manifest/applet5.txt 2007-05-16 01:57:23.000000000 -0500 -@@ -0,0 +1,4 @@ -+Name: org/openscience/jmol/ui/ -+Sealed: true -+ -+ -diff -aurN jmol-11.0.3-orig/manifest/applet6.txt jmol-11.0.3/manifest/ap= plet6.txt ---- jmol-11.0.3-orig/manifest/applet6.txt 1969-12-31 18:00:00.000000000 = -0600 -+++ jmol-11.0.3/manifest/applet6.txt 2007-05-16 01:57:46.000000000 -0500 -@@ -0,0 +1,4 @@ -+ -+Name: org/jmol/viewer/ -+Sealed: true -+ -diff -aurN jmol-11.0.3-orig/manifest/appletMain.txt jmol-11.0.3/manifest= /appletMain.txt ---- jmol-11.0.3-orig/manifest/appletMain.txt 1969-12-31 18:00:00.0000000= 00 -0600 -+++ jmol-11.0.3/manifest/appletMain.txt 2007-05-16 01:54:10.000000000 -0= 500 -@@ -0,0 +1,5 @@ -+Manifest-Version: 1.0 -+Sealed: true -+ -+Name: org/jmol/api/ -+Sealed: false -diff -aurN jmol-11.0.3-orig/manifest/appletMonolithic.txt jmol-11.0.3/ma= nifest/appletMonolithic.txt ---- jmol-11.0.3-orig/manifest/appletMonolithic.txt 1969-12-31 18:00:00.0= 00000000 -0600 -+++ jmol-11.0.3/manifest/appletMonolithic.txt 2007-05-16 01:54:10.000000= 000 -0500 -@@ -0,0 +1,7 @@ -+Main-Class: JmolApplet -+Sealed: true -+ -+Name: org/jmol/api/ -+Sealed: false -+ -+ -diff -aurN jmol-11.0.3-orig/manifest/applet.txt jmol-11.0.3/manifest/app= let.txt ---- jmol-11.0.3-orig/manifest/applet.txt 1969-12-31 18:00:00.000000000 -= 0600 -+++ jmol-11.0.3/manifest/applet.txt 2007-05-16 01:54:10.000000000 -0500 -@@ -0,0 +1,2 @@ -+Manifest-Version: 1.0 -+Sealed: true -\ No newline at end of file -diff -aurN jmol-11.0.3-orig/manifest/application.txt jmol-11.0.3/manifes= t/application.txt ---- jmol-11.0.3-orig/manifest/application.txt 1969-12-31 18:00:00.000000= 000 -0600 -+++ jmol-11.0.3/manifest/application.txt 2007-05-16 01:54:10.000000000 -= 0500 -@@ -0,0 +1 @@ -+Main-Class: org.openscience.jmol.app.Jmol -diff -aurN jmol-11.0.3-orig/manifest/jvxl.txt jmol-11.0.3/manifest/jvxl.= txt ---- jmol-11.0.3-orig/manifest/jvxl.txt 1969-12-31 18:00:00.000000000 -06= 00 -+++ jmol-11.0.3/manifest/jvxl.txt 2007-05-16 01:54:10.000000000 -0500 -@@ -0,0 +1 @@ -+Main-Class: org.openscience.jvxl.Jvxl diff --git a/sci-chemistry/jmol/files/jmol-11.6-nointl.patch b/sci-chemis= try/jmol/files/jmol-11.6-nointl.patch deleted file mode 100644 index 351093f..0000000 --- a/sci-chemistry/jmol/files/jmol-11.6-nointl.patch +++ /dev/null @@ -1,274 +0,0 @@ ---- jmol-11.6/build.xml 2008-10-08 19:03:17.000000000 +0200 -+++ jmol-11.6/build.xml.new 2009-04-23 11:05:58.000000000 +0200 -@@ -100,10 +100,6 @@ - - -- -- -- - - -=20 -@@ -113,14 +109,6 @@ - - -- -- -- -- -- -- - - - =20 -@@ -130,14 +118,6 @@ - - -- -- -- -- -- -- - - -=20 -@@ -147,14 +127,6 @@ - - -- -- -- -- -- -- - - -=20 -@@ -348,17 +320,12 @@ - -=20 - -+ depends=3D"init,classes,jmolGuide,jmolHistory,jmolDevelopersG= uide,libjars"> - - - - - -- -- -- -- -- - - - -@@ -505,11 +472,6 @@ - - - =09 -- -- -- -- -- - - - -@@ -606,7 +568,6 @@ - - - -- - - - -@@ -628,7 +589,6 @@ - - - -- - - - -@@ -713,11 +673,6 @@ - keystore=3D"selfSignedCertificate/selfSignedCertificate.st= ore" - storepass=3D"selfSignedCertificate" alias=3D"selfSignedCer= tificate" /> - =09 -- -- - - - - -@@ -824,7 +777,6 @@ - - - -- - - -=20 -@@ -903,7 +855,6 @@ - - - -- - - -=20 -@@ -995,7 +946,7 @@ - - -=20 -- -+ - - - -@@ -1058,16 +1009,6 @@ - - - -- -- -- -- -- -- -- -- - -=20 - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -=20 - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -=20 - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- - -=20 - -@@ -1195,12 +1080,4 @@ - - -=20 -- -- -- -- -- -- -- -- - diff --git a/sci-chemistry/jmol/jmol-11.6.ebuild b/sci-chemistry/jmol/jmo= l-11.6.ebuild deleted file mode 100644 index 486705d..0000000 --- a/sci-chemistry/jmol/jmol-11.6.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D1 -WEBAPP_OPTIONAL=3D"yes" - -inherit eutils java-pkg-2 java-ant-2 webapp - -DESCRIPTION=3D"Jmol is a java molecular viever for 3-D chemical structur= es." -SRC_URI=3D"mirror://sourceforge/${PN}/${P}-full.tar.gz" -HOMEPAGE=3D"http://jmol.sourceforge.net/" -KEYWORDS=3D"~x86 ~amd64" -LICENSE=3D"LGPL-2.1" - -IUSE=3D"client-only vhosts" - -WEBAPP_MANUAL_SLOT=3D"yes" -SLOT=3D"0" - -COMMON_DEP=3D"dev-java/commons-cli:1 - dev-java/itext:0 - sci-libs/jmol-acme:0 - sci-libs/vecmath-objectclub:0" - -RDEPEND=3D">=3Dvirtual/jre-1.4 - ${COMMON_DEP}" -DEPEND=3D">=3Dvirtual/jdk-1.4 - !client-only? ( ${WEBAPP_DEPEND} ) - ${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 direct= ory." - cp "${FILESDIR}"/selfSignedCertificate.store "${S}"/selfSignedCertifica= te/ \ - || 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.ja= r." - rm -v *.jar *.tar.gz || die "Failed to remove jars." - mv -v netscape.tempjar netscape.jar || die "Failed to move netscape.te= mpjar." - 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=3Dtrue 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=3D"cp Jmol.js build/Jmol.jar "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd=3D"cp build/JmolApplet*.jar "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd=3D"cp applet.classes "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd=3D"cp -r build/classes/* "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd=3D"cp -r build/appletjars/* "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd=3D"cp "${FILESDIR}"/caffeine.xyz "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd=3D"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-12.0.34.ebuild b/sci-chemistry/jmol/= jmol-12.0.34.ebuild deleted file mode 100644 index aec92ee..0000000 --- a/sci-chemistry/jmol/jmol-12.0.34.ebuild +++ /dev/null @@ -1,122 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=3D1 -WEBAPP_OPTIONAL=3D"yes" - -inherit eutils java-pkg-2 java-ant-2 webapp - -MY_P=3DJmol - -DESCRIPTION=3D"Jmol is a java molecular viever for 3-D chemical structur= es." -SRC_URI=3D"mirror://sourceforge/${PN}/${MY_P}-${PV}-full.tar.gz" -HOMEPAGE=3D"http://jmol.sourceforge.net/" -KEYWORDS=3D"~amd64 ~x86" -LICENSE=3D"LGPL-2.1" - -IUSE=3D"client-only vhosts" - -WEBAPP_MANUAL_SLOT=3D"yes" -SLOT=3D"0" - -COMMON_DEP=3D"dev-java/commons-cli:1 - dev-java/itext:0 - sci-libs/jmol-acme:0 - sci-libs/vecmath-objectclub:0" - -RDEPEND=3D">=3Dvirtual/jre-1.4 - ${COMMON_DEP}" -DEPEND=3D">=3Dvirtual/jdk-1.4 - !client-only? ( ${WEBAPP_DEPEND} ) - ${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} - cd "${S}" - epatch "${FILESDIR}"/${PV}/${PN}-nointl.patch - epatch "${FILESDIR}"/${PV}/${PN}-manifest.patch - - mkdir "${S}"/selfSignedCertificate || die "Failed to create Cert direct= ory." - cp "${FILESDIR}"/selfSignedCertificate.store "${S}"/selfSignedCertifica= te/ \ - || 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.ja= r." - rm -v *.jar *.tar.gz || die "Failed to remove jars." - mv -v netscape.tempjar netscape.jar || die "Failed to move netscape.te= mpjar." - 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=3Dtrue 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=3D"cp Jmol.js build/Jmol.jar "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd=3D"cp build/JmolApplet*.jar "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd=3D"cp applet.classes "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd=3D"cp -r build/classes/* "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd=3D"cp -r build/appletjars/* "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd=3D"cp "${FILESDIR}"/caffeine.xyz "${D}${MY_HTDOCSDIR}"" ; ${cmd} \ - || die "${cmd} failed." - cmd=3D"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-12.0.45.ebuild b/sci-chemistry/jmol/= jmol-12.0.45-r1.ebuild similarity index 100% rename from sci-chemistry/jmol/jmol-12.0.45.ebuild rename to sci-chemistry/jmol/jmol-12.0.45-r1.ebuild