summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-chemistry/gopenmol/ChangeLog6
-rw-r--r--sci-chemistry/gopenmol/gopenmol-3.00-r1.ebuild66
-rw-r--r--sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild4
-rw-r--r--sci-chemistry/molmol/ChangeLog6
-rw-r--r--sci-chemistry/molmol/molmol-2k_p2-r1.ebuild69
-rw-r--r--sci-chemistry/molmol/molmol-2k_p2-r2.ebuild4
-rw-r--r--sci-chemistry/molmol/molmol-2k_p2.ebuild4
-rw-r--r--sci-chemistry/molscript/ChangeLog6
-rw-r--r--sci-chemistry/molscript/molscript-2.1.2-r1.ebuild4
-rw-r--r--sci-chemistry/molscript/molscript-2.1.2.ebuild62
-rw-r--r--sci-chemistry/mosflm/Manifest14
11 files changed, 31 insertions, 214 deletions
diff --git a/sci-chemistry/gopenmol/ChangeLog b/sci-chemistry/gopenmol/ChangeLog
index df2db237a534..71a80b0005fa 100644
--- a/sci-chemistry/gopenmol/ChangeLog
+++ b/sci-chemistry/gopenmol/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-chemistry/gopenmol
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/ChangeLog,v 1.10 2010/09/16 17:25:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/ChangeLog,v 1.11 2010/11/08 17:12:40 xarthisius Exp $
+
+ 08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
+ -gopenmol-3.00-r1.ebuild, gopenmol-3.00-r2.ebuild:
+ media-libs/jpeg -> virtual/jpeg. Drop old.
16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
gopenmol-3.00-r1.ebuild, gopenmol-3.00-r2.ebuild:
diff --git a/sci-chemistry/gopenmol/gopenmol-3.00-r1.ebuild b/sci-chemistry/gopenmol/gopenmol-3.00-r1.ebuild
deleted file mode 100644
index 69f7181be76d..000000000000
--- a/sci-chemistry/gopenmol/gopenmol-3.00-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/gopenmol-3.00-r1.ebuild,v 1.3 2010/09/16 17:25:29 scarabeus Exp $
-
-inherit eutils
-
-DESCRIPTION="gOpenMol is a tool for the visualization and analysis of molecular structures"
-HOMEPAGE="http://www.csc.fi/gopenmol"
-SRC_URI="${HOMEPAGE}/distribute/${P}-linux.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="=dev-lang/tcl-8.4*
- =dev-lang/tk-8.4*
- dev-tcltk/bwidget
- virtual/opengl
- media-libs/freeglut
- media-libs/jpeg
- dev-lang/python
- x11-libs/libXmu
- x11-libs/libICE
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXi
- x11-libs/libXxf86vm"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/gOpenMol-${PV}/src"
-
-src_unpack() {
- unpack ${A}
- epatch ${FILESDIR}/${PV}-include-config-for-plugins.patch
-}
-
-src_compile() {
- econf || die "./configure failed"
-
- emake || die "emake failed"
-
- # Plugins are not built by default
- cd ${S}/plugins
- emake || die "emake plugins failed"
-
- # Utilities are not built by default
- cd ${S}/utility
- emake || die "emake utility failed"
-}
-
-src_install() {
- einstall || die "einstall failed"
-
- cd ${S}/plugins
- einstall || die "einstall plugins failed"
-
- cd ${S}/utility
- einstall || die "einstall utility failed"
-
- dosed /usr/bin/rungOpenMol
-}
-
-pkg_postinst() {
- einfo "Run gOpenMol using the rungOpenMol script."
-}
diff --git a/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild b/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild
index 7a5891fca0aa..8f6c2adaa258 100644
--- a/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild
+++ b/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild,v 1.3 2010/09/16 17:25:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/gopenmol/gopenmol-3.00-r2.ebuild,v 1.4 2010/11/08 17:12:40 xarthisius Exp $
EAPI="3"
@@ -20,7 +20,7 @@ IUSE=""
RDEPEND="
=dev-lang/tk-8.4*
dev-tcltk/bwidget
- media-libs/jpeg
+ virtual/jpeg
media-libs/freeglut
virtual/opengl
x11-libs/libICE
diff --git a/sci-chemistry/molmol/ChangeLog b/sci-chemistry/molmol/ChangeLog
index f16dd2c96a55..fe87d721cced 100644
--- a/sci-chemistry/molmol/ChangeLog
+++ b/sci-chemistry/molmol/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-chemistry/molmol
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.22 2010/10/10 21:26:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/ChangeLog,v 1.23 2010/11/08 17:14:25 xarthisius Exp $
+
+ 08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> molmol-2k_p2.ebuild,
+ -molmol-2k_p2-r1.ebuild, molmol-2k_p2-r2.ebuild:
+ media-libs/jpeg -> virtual/jpeg. Drop old.
10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> molmol-2k_p2.ebuild,
molmol-2k_p2-r1.ebuild, molmol-2k_p2-r2.ebuild:
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r1.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r1.ebuild
deleted file mode 100644
index 466295c71bc3..000000000000
--- a/sci-chemistry/molmol/molmol-2k_p2-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r1.ebuild,v 1.2 2010/10/10 21:26:18 ulm Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs multilib
-
-MY_PV="${PV/_p/.}.0"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Publication-quality molecular visualization package"
-HOMEPAGE="http://hugin.ethz.ch/wuthrich/software/molmol/index.html"
-SRC_URI="ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-src.tar.gz
- ftp://ftp.mol.biol.ethz.ch/software/MOLMOL/unix-gzip/${MY_P}-doc.tar.gz"
-LICENSE="molmol"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-DEPEND=">=x11-libs/openmotif-2.3:0
- x11-libs/libXpm
- media-libs/mesa[motif]
- media-libs/jpeg
- media-libs/tiff
- media-libs/libpng
- sys-libs/zlib"
-# Run-time dependencies, same as DEPEND if RDEPEND isn't defined:
-#RDEPEND=""
-# Yeah, the gz's aren't in a subdir.
-S=${WORKDIR}
-
-MMDIR="/usr/$(get_libdir)/molmol"
-
-src_prepare() {
- # Patch from http://pjf.net/science/molmol.html, where src.rpm is provided
- epatch ${FILESDIR}/pjf_RH9_molmol2k2.diff
-
- ln -s makedef.lnx ${S}/makedef
-
- # 1) The Korn shell is only taken by default because the Bourne shell
- # on DEC systems cannot handle the script.
- # We don't want this needless dependency.
- # 2) Fix up MOLMOLHOME, which determines the directory the binary's in.
- sed -i \
- -e "s:/bin/ksh:${EPREFIX}/bin/sh:" \
- -e "s:^MOLMOLHOME.*:MOLMOLHOME=${EPREFIX}/${MMDIR}:" \
- ${S}/molmol
- # 1) Set CFLAGS.
- # 2) Set compiler.
- sed -i \
- -e "s:^MCFLAGS.*:MCFLAGS = ${CFLAGS}:" \
- -e "s:^CC.*:CC = $(tc-getCC):" \
- ${S}/makedef
-}
-
-src_compile() {
- emake -j1 || die "emake failed"
-}
-
-src_install() {
- dobin molmol || die
-
- exeinto ${MMDIR}
- newexe src/main/molmol molmol.lnx || die
- insinto ${MMDIR}
- doins -r auxil help macros man setup tips || die
-
- dodoc HISTORY README || die
-}
diff --git a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild b/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
index b452ba1cf3fc..033b8fc00d15 100644
--- a/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild,v 1.3 2010/10/10 21:26:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2-r2.ebuild,v 1.4 2010/11/08 17:14:25 xarthisius Exp $
EAPI="3"
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND="
media-libs/mesa[motif]
- media-libs/jpeg
+ virtual/jpeg
media-libs/tiff
media-libs/libpng
sys-libs/zlib
diff --git a/sci-chemistry/molmol/molmol-2k_p2.ebuild b/sci-chemistry/molmol/molmol-2k_p2.ebuild
index d02336b4ac1f..04c810b36ccc 100644
--- a/sci-chemistry/molmol/molmol-2k_p2.ebuild
+++ b/sci-chemistry/molmol/molmol-2k_p2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2.ebuild,v 1.14 2010/10/10 21:26:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molmol/molmol-2k_p2.ebuild,v 1.15 2010/11/08 17:14:25 xarthisius Exp $
EAPI="2"
@@ -20,7 +20,7 @@ IUSE=""
DEPEND=">=x11-libs/openmotif-2.3:0
x11-libs/libXpm
media-libs/mesa[motif]
- media-libs/jpeg
+ virtual/jpeg
media-libs/tiff
media-libs/libpng
sys-libs/zlib"
diff --git a/sci-chemistry/molscript/ChangeLog b/sci-chemistry/molscript/ChangeLog
index 8440432f5853..1c0aa5f044b9 100644
--- a/sci-chemistry/molscript/ChangeLog
+++ b/sci-chemistry/molscript/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-chemistry/molscript
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/ChangeLog,v 1.11 2010/09/16 17:27:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/ChangeLog,v 1.12 2010/11/08 17:16:15 xarthisius Exp $
+
+ 08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
+ -molscript-2.1.2.ebuild, molscript-2.1.2-r1.ebuild:
+ media-libs/jpeg -> virtual/jpeg. Drop old.
16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
molscript-2.1.2.ebuild, molscript-2.1.2-r1.ebuild:
diff --git a/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild b/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild
index 94301616f13d..f6592f9bd59d 100644
--- a/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild
+++ b/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild,v 1.4 2010/09/16 17:27:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2-r1.ebuild,v 1.5 2010/11/08 17:16:15 xarthisius Exp $
EAPI="3"
@@ -17,7 +17,7 @@ RESTRICT="fetch"
IUSE=""
DEPEND="
- media-libs/jpeg
+ virtual/jpeg
media-libs/libpng
media-libs/gd
media-libs/freeglut
diff --git a/sci-chemistry/molscript/molscript-2.1.2.ebuild b/sci-chemistry/molscript/molscript-2.1.2.ebuild
deleted file mode 100644
index 06b6b578e816..000000000000
--- a/sci-chemistry/molscript/molscript-2.1.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/molscript/molscript-2.1.2.ebuild,v 1.6 2010/09/16 17:27:21 scarabeus Exp $
-
-inherit toolchain-funcs eutils
-
-DESCRIPTION="Display molecular 3D structures, such as proteins, in both schematic and detailed representations."
-HOMEPAGE="http://www.avatar.se/molscript/"
-SRC_URI="${P}.tar.gz"
-LICENSE="glut molscript"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-RESTRICT="fetch"
-IUSE=""
-DEPEND="media-libs/jpeg
- media-libs/libpng
- media-libs/gd
- media-libs/freeglut
- || ( x11-libs/libXmu
- x11-libs/libXext
- x11-libs/libX11 )"
-RDEPEND="${DEPEND}"
-
-pkg_nofetch() {
- elog "Please visit ${HOMEPAGE}"
- elog "and get ${A}."
- elog "Place it in ${DISTDIR}"
-}
-
-src_unpack() {
- unpack ${A}
- epatch ${FILESDIR}/fix-makefile-shared.patch
-
- # Provide glutbitmap.h, because freeglut doesn't have it
- cp ${FILESDIR}/glutbitmap.h ${S}/clib/
-
- # Stop an incredibly hacky include
- sed -i -e 's:<../lib/glut/glutbitmap.h>:"glutbitmap.h":g' \
- ${S}/clib/ogl_bitmap_character.c
-}
-
-src_compile() {
- # Prefix of programs it links with
- export FREEWAREDIR="/usr"
-
- ln -s Makefile.complete Makefile
-
- # Honor CC and CFLAGS from environment;
- # unfortunately a bash bug prevents us from doing typeset and
- # assignment on the same line.
- typeset -a args
- args=( CC="$(tc-getCC)" \
- COPT="${CFLAGS}" )
-
- emake "${args[@]}" || die "emake failed"
-}
-
-src_install() {
- exeinto /usr/bin
- doexe molscript molauto
- dohtml ${S}/doc/*.html
-}
diff --git a/sci-chemistry/mosflm/Manifest b/sci-chemistry/mosflm/Manifest
index d99d1dbc3895..d19fac9968f5 100644
--- a/sci-chemistry/mosflm/Manifest
+++ b/sci-chemistry/mosflm/Manifest
@@ -4,13 +4,15 @@ Hash: SHA1
AUX 7.0.6-Makefile.patch 352 RMD160 69fd182574615b90bbeb1b633885006051e81683 SHA1 f2964f48bb4bf89880fe47f0af1bff090c59092e SHA256 d5b62b78ab3b89d36fad10e31cd5e5e8087d5dc4976ad03ef1995bea08e27ac7
AUX 7.0.6-parallel.patch 654 RMD160 f28cdb670c3ecfcc4ec194dd44136182fbf9cf7f SHA1 bf6742b58d6e9ce67e76f38e81aeb64f88fae729 SHA256 c821e031a039502364c4ae151fd64886a6a33153e5c746d55838a99050d18c60
DIST mosflm706.tgz 3468405 RMD160 fb0b7e51ed9845d4d17aa804cb1424e5aa0f24b8 SHA1 f9a771c3991c7ad3125a7e39d5c59b3049784f4f SHA256 5e26a49fd37749a14e7a1d1e867c1c0333db3bbcc01376fb7a516d4a67b1ebb0
-EBUILD mosflm-7.0.6-r2.ebuild 1785 RMD160 7ccadd5942e3ceb23511dcec284754aad22a6d6c SHA1 d4c5863c0cf5698fac531c81a425ec3917b4b207 SHA256 0fee3a7ccef8d1aba32d5d6d3d3d4c8487c1a6de56e1800c70613f2e1429c3fc
-MISC ChangeLog 803 RMD160 4899363b271eeb8f74363d9ef885e9af097f062e SHA1 e0da497284caa497e1704ad447da3a87190c47b3 SHA256 b1d63a9b012ffed28ac5d1313d3668a1a573585a0d3d7375be6223cd9fbb7d53
+EBUILD mosflm-7.0.6-r2.ebuild 1788 RMD160 37a9bbe26fc29413ba56db0f0533323f8c9791fb SHA1 4026e63f4ace0e572973cb084a7400d49f1ab200 SHA256 8fcf28724d17b0cacd0eb13fa0c93efe6cdbc31f921821cd478dbecc955d1919
+MISC ChangeLog 924 RMD160 c33279d96fc94d899fee53b21ce3829c3be6301b SHA1 1c9938580169e410847576728974750a05991bdf SHA256 12f6efbc838997d78adb3d98882bd9866bd33dbe380be4e2610185559d751cac
MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAkwXisYACgkQgAnW8HDreRZVWQCglWjgZlSyl1+57A30lwSckN9C
-qKIAoL/DNzBCDNjDIhEhjLhrR6WqnfyS
-=KfXL
+iJwEAQECAAYFAkzYMMEACgkQIiMqcbOVdxRtMwP/VCeooNNNNUxsqBkTlYLHtACo
+11w6yZCDRJp1BrCW1uCiZaCGg9uA7zcYbfvC4e6w27NcHrRJrxLpMSI9/UV6e1ov
+iJHEus31EA4CNAUOd+WQhRYPWge1f/PRrsLyQjvMiFYrO419KX8sWjQqaLi2p8Ho
+1AJHK3ymIfcjV0X2xVE=
+=oCgL
-----END PGP SIGNATURE-----