public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in sci-chemistry/jmol: jmol-12.2.27.ebuild ChangeLog
@ 2012-05-31 21:00 Jeffrey Gardner (je_fro)
  0 siblings, 0 replies; 3+ messages in thread
From: Jeffrey Gardner (je_fro) @ 2012-05-31 21:00 UTC (permalink / raw
  To: gentoo-commits

je_fro      12/05/31 21:00:54

  Modified:             ChangeLog
  Added:                jmol-12.2.27.ebuild
  Log:
  Latest version
  
  (Portage version: 2.1.10.63/cvs/Linux x86_64)

Revision  Changes    Path
1.13                 sci-chemistry/jmol/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/ChangeLog?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/ChangeLog?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/ChangeLog?r1=1.12&r2=1.13

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ChangeLog	15 Feb 2012 14:14:10 -0000	1.12
+++ ChangeLog	31 May 2012 21:00:54 -0000	1.13
@@ -1,6 +1,12 @@
 # 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.12 2012/02/15 14:14:10 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/ChangeLog,v 1.13 2012/05/31 21:00:54 je_fro Exp $
+
+*jmol-12.2.27 (31 May 2012)
+
+  31 May 2012; Jeff Gardner <je_fro@gentoo.org> +jmol-12.2.27.ebuild,
+  +files/jmol-12.2.27-nointl.patch:
+  Latest version
 
   15 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> jmol-11.0.3-r1.ebuild:
   Fix SRC_URI



1.1                  sci-chemistry/jmol/jmol-12.2.27.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/jmol-12.2.27.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/jmol-12.2.27.ebuild?rev=1.1&content-type=text/plain

Index: jmol-12.2.27.ebuild
===================================================================
# 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-12.2.27.ebuild,v 1.1 2012/05/31 21:00:54 je_fro Exp $

EAPI=1
WEBAPP_OPTIONAL="yes"

inherit eutils webapp java-pkg-2 java-ant-2

MY_P="Jmol"

DESCRIPTION="Jmol is a java molecular viever for 3-D chemical structures."
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"

IUSE="client-only vhosts"

WEBAPP_MANUAL_SLOT="yes"
SLOT="0"

COMMON_DEP="dev-java/commons-cli
	dev-java/itext:0
	sci-libs/jmol-acme
	sci-libs/vecmath-objectclub
	sci-libs/naga"
RDEPEND=">=virtual/jre-1.5
	${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.5
	dev-java/saxon:6.5
	!client-only? ( ${WEBAPP_DEPEND} )
	${COMMON_DEP}"

pkg_setup() {

	use client-only || webapp_pkg_setup
	java-pkg-2_pkg_setup
}

src_unpack() {

	unpack ${A}
	cd "${S}"

	epatch "${FILESDIR}"/${P}-nointl.patch

	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
	java-pkg_jar-from naga
	java-pkg_jar-from saxon-6.5 saxon.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

}






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-chemistry/jmol: jmol-12.2.27.ebuild ChangeLog
@ 2012-05-31 21:16 Jeffrey Gardner (je_fro)
  0 siblings, 0 replies; 3+ messages in thread
From: Jeffrey Gardner (je_fro) @ 2012-05-31 21:16 UTC (permalink / raw
  To: gentoo-commits

je_fro      12/05/31 21:16:59

  Modified:             jmol-12.2.27.ebuild ChangeLog
  Log:
  Make client-only the default
  
  (Portage version: 2.1.10.63/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  sci-chemistry/jmol/jmol-12.2.27.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/jmol-12.2.27.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/jmol-12.2.27.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/jmol-12.2.27.ebuild?r1=1.1&r2=1.2

Index: jmol-12.2.27.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/jmol-12.2.27.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jmol-12.2.27.ebuild	31 May 2012 21:00:54 -0000	1.1
+++ jmol-12.2.27.ebuild	31 May 2012 21:16:59 -0000	1.2
@@ -1,6 +1,6 @@
 # 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-12.2.27.ebuild,v 1.1 2012/05/31 21:00:54 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/jmol-12.2.27.ebuild,v 1.2 2012/05/31 21:16:59 je_fro Exp $
 
 EAPI=1
 WEBAPP_OPTIONAL="yes"
@@ -18,7 +18,7 @@
 KEYWORDS="~x86 ~amd64"
 LICENSE="LGPL-2.1"
 
-IUSE="client-only vhosts"
+IUSE="+client-only vhosts"
 
 WEBAPP_MANUAL_SLOT="yes"
 SLOT="0"



1.14                 sci-chemistry/jmol/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/ChangeLog?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/ChangeLog?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/ChangeLog?r1=1.13&r2=1.14

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ChangeLog	31 May 2012 21:00:54 -0000	1.13
+++ ChangeLog	31 May 2012 21:16:59 -0000	1.14
@@ -1,6 +1,9 @@
 # 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.13 2012/05/31 21:00:54 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/ChangeLog,v 1.14 2012/05/31 21:16:59 je_fro Exp $
+
+  31 May 2012; Jeff Gardner <je_fro@gentoo.org> jmol-12.2.27.ebuild:
+  Make client-only the default
 
 *jmol-12.2.27 (31 May 2012)
 






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in sci-chemistry/jmol: jmol-12.2.27.ebuild ChangeLog
@ 2012-06-21 14:41 Jeffrey Gardner (je_fro)
  0 siblings, 0 replies; 3+ messages in thread
From: Jeffrey Gardner (je_fro) @ 2012-06-21 14:41 UTC (permalink / raw
  To: gentoo-commits

je_fro      12/06/21 14:41:23

  Modified:             jmol-12.2.27.ebuild ChangeLog
  Log:
  Add --build-only to saxon, fix bug 422757 thanks to Diego Elio Petteno
  
  (Portage version: 2.1.10.65/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  sci-chemistry/jmol/jmol-12.2.27.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/jmol-12.2.27.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/jmol-12.2.27.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/jmol-12.2.27.ebuild?r1=1.2&r2=1.3

Index: jmol-12.2.27.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/jmol-12.2.27.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jmol-12.2.27.ebuild	31 May 2012 21:16:59 -0000	1.2
+++ jmol-12.2.27.ebuild	21 Jun 2012 14:41:23 -0000	1.3
@@ -1,6 +1,6 @@
 # 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-12.2.27.ebuild,v 1.2 2012/05/31 21:16:59 je_fro Exp $
+# $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 $
 
 EAPI=1
 WEBAPP_OPTIONAL="yes"
@@ -63,7 +63,7 @@
 	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
 	java-pkg_jar-from naga
-	java-pkg_jar-from saxon-6.5 saxon.jar
+	java-pkg_jar-from --build-only saxon-6.5 saxon.jar
 
 	mkdir -p "${S}/build/appjars" || die
 }



1.15                 sci-chemistry/jmol/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/ChangeLog?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/ChangeLog?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/jmol/ChangeLog?r1=1.14&r2=1.15

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ChangeLog	31 May 2012 21:16:59 -0000	1.14
+++ ChangeLog	21 Jun 2012 14:41:23 -0000	1.15
@@ -1,6 +1,9 @@
 # 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.14 2012/05/31 21:16:59 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/jmol/ChangeLog,v 1.15 2012/06/21 14:41:23 je_fro Exp $
+
+  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
 
   31 May 2012; Jeff Gardner <je_fro@gentoo.org> jmol-12.2.27.ebuild:
   Make client-only the default






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-06-21 14:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-31 21:16 [gentoo-commits] gentoo-x86 commit in sci-chemistry/jmol: jmol-12.2.27.ebuild ChangeLog Jeffrey Gardner (je_fro)
  -- strict thread matches above, loose matches on Subject: below --
2012-06-21 14:41 Jeffrey Gardner (je_fro)
2012-05-31 21:00 Jeffrey Gardner (je_fro)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox