aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sci-chemistry')
-rw-r--r--sci-chemistry/chimera-bin/Manifest6
-rw-r--r--sci-chemistry/chimera-bin/chimera-bin-1.11.2.ebuild (renamed from sci-chemistry/chimera-bin/chimera-bin-1.10.2.ebuild)6
-rw-r--r--sci-chemistry/chimera-bin/chimera-bin-1.9.ebuild95
3 files changed, 5 insertions, 102 deletions
diff --git a/sci-chemistry/chimera-bin/Manifest b/sci-chemistry/chimera-bin/Manifest
index a6d0350d1..72c72bc43 100644
--- a/sci-chemistry/chimera-bin/Manifest
+++ b/sci-chemistry/chimera-bin/Manifest
@@ -1,4 +1,2 @@
-DIST chimera-1.10.2-linux.bin 115920965 SHA256 e0174757e71cfdfc84255768236f90c55005fd3276ba450ffac2404e21f7eae7 SHA512 8bc26c70207f0e004e09ba13881c10c8485542caae9bfbc1ecf4dca159e11e41c98a58549d69bbce84e31127a0120232c69005218e22d4bbf56fa218592d8798 WHIRLPOOL 1a83ad14f0e0895f4d114db9f9566bc1b85b9ae49fea2139b50f74db02d6d1445d387ca5b97813d833b282f20815ec8c598329b58a9331526ae5987a529b8d45
-DIST chimera-1.10.2-linux_x86_64.bin 117855354 SHA256 1181041f5ae1f30265d0d8549454f011ab33419dbb9042d3316695a7bee29ad1 SHA512 5fcaedda698e3e8e3c0a19b75f90835d5c4acb26c26ef636c3926b22bbd32f8ae5f4ec62715f81c78298569cdbb34d81d87f670bc4c54ad6f6aaf4f57a626a7d WHIRLPOOL 361088927c28b5956bb2c521b0cef513da7c863b6a50597d60f553a9b12846f81ae99609d2cd24253cadb953d6fbd062712440fdbea020f00f1db30dfc008159
-DIST chimera-1.9-linux.bin 114083133 SHA256 b9ea5def8692936bd8bdf2f7a4e0a34c0d4bfefb3c33cea1120459d9dde39902 SHA512 10f5550309a34c667c6af6ac11a62676f7320eb6fdd70e880fb5276893140a3f97d1eec7743248102f2e15316491564b1326526c2dee5c4d059929c5e4e45c38 WHIRLPOOL faeac184262c913bede52a5f8aa4636452c9de8bc006ce7c2eef54c225ad6b8df4ce62789f78970a7b5f5aca36fe1e29a0a27d7fe883d8f78529014cfd52a92c
-DIST chimera-1.9-linux_x86_64.bin 116013121 SHA256 f9b40b350ed034fd89f7e0b5ad1b7059745be2cff08263cd013c83c1b21fc23e SHA512 07a0c415d552452bb8e6b74818947fda4f1bc00b9ec7f421ea2f0b0731a27822a15f71126103651768cc34a5fd183f7828619886027df550b95740c8c0b50eff WHIRLPOOL bc522278af00a3d9fa826283870456b08090fd613645efde563b8937fe19117111b44bc42a1784e5e3aee4ef504caaed4c9412c0b91508e6bebe4f50d799e8bf
+DIST chimera-1.11.2-linux.bin 119741818 SHA256 b71e552f58f54e7881fcecae622f9bc7f1087230214ad6d4665a0aeb717e2f8e SHA512 d10ddc4ca2b2ead248cab09da4a45a4856992825e902d10f8d446960a413ebbc62d9ba6496482ca5af2c0e592fb0d02333d81721f00111db43c3de59337c9885 WHIRLPOOL 545ce9795a6bca66ccecfff6f9b9cfc7a04936fa26ae16710866a43c085d241ed72c0dc17869d81940322327ffb2cf91ed17d2151907b8469566864ad6d93787
+DIST chimera-1.11.2-linux_x86_64.bin 121926923 SHA256 d8bb4d0e049762e1b3fc1fab950478881464c9cdb318909269ac7a081e7b44bd SHA512 d9594bcf0812adbdf82c2706f9c14dba74286ed6c1390503c9af84d356531f97be85cc13cc8a9ffb500092e9356c285b93d19798ed066822d1a3c37fb5ae9197 WHIRLPOOL 387c0fce9d189adb13d2ae7de059aef54e61347ec35df9d799f2524c61c9b5e6d0172fdf3731e99e6c3dcbefef3a658912122501ab69eed6fbb4b748f5a203ef
diff --git a/sci-chemistry/chimera-bin/chimera-bin-1.10.2.ebuild b/sci-chemistry/chimera-bin/chimera-bin-1.11.2.ebuild
index eca8c5fb6..0e2fff6e8 100644
--- a/sci-chemistry/chimera-bin/chimera-bin-1.10.2.ebuild
+++ b/sci-chemistry/chimera-bin/chimera-bin-1.11.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
inherit eutils
@@ -47,7 +47,7 @@ RDEPEND="
x11-libs/libXrender
x11-libs/libSM
x11-libs/libXt
- || ( x11-libs/libGLw <media-libs/mesa-8 )"
+ x11-libs/libGLw"
S="${WORKDIR}"
diff --git a/sci-chemistry/chimera-bin/chimera-bin-1.9.ebuild b/sci-chemistry/chimera-bin/chimera-bin-1.9.ebuild
deleted file mode 100644
index f312545bf..000000000
--- a/sci-chemistry/chimera-bin/chimera-bin-1.9.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="An extensible Molecular Modelling System"
-HOMEPAGE="http://www.cgl.ucsf.edu/chimera"
-SRC_URI="
- amd64? ( chimera-${PV}-linux_x86_64.bin )
- x86? ( chimera-${PV}-linux.bin )"
-
-SLOT="0"
-LICENSE="chimera"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="prefix? ( dev-util/patchelf )"
-RDEPEND="
- dev-lang/tcl
- dev-lang/tk
- dev-libs/expat
- dev-libs/libotf
- dev-libs/openssl:0
- dev-libs/libpcre
- sys-libs/zlib
- media-libs/fontconfig
- media-libs/freetype
- media-libs/ftgl
- media-libs/libpng:1.2
- media-libs/tiff
- media-libs/tiff:3
- sci-libs/hdf5
- sys-devel/gcc[openmp,fortran]
- virtual/jpeg
- virtual/glu
- virtual/opengl
- x11-libs/libX11
- x11-libs/libICE
- x11-libs/libXext
- x11-libs/libXft
- x11-libs/libXmu
- x11-libs/libXpm
- x11-libs/libXrender
- x11-libs/libSM
- x11-libs/libXt
- || ( x11-libs/libGLw <media-libs/mesa-8 )"
-
-S="${WORKDIR}"
-
-RESTRICT="fetch strip"
-
-QA_PREBUILT="opt/.*"
-
-pkg_nofetch() {
- elog "Please visit"
- elog "http://www.cgl.ucsf.edu/chimera/download.html"
- elog "or"
- elog "http://www.cgl.ucsf.edu/chimera/olddownload.html"
- elog "and download ${A} into ${DISTDIR}"
-}
-
-src_unpack() {
- cp "${DISTDIR}"/${A} ${A}.zip
- unzip ${A}.zip || die
-}
-
-src_install() {
- chmod +x ./chimera.bin
- dodir /opt/
- ./chimera.bin -d foo || die
- doicon foo/chimeraIcon.png
- mv foo "${ED}/opt/${PN}" || die
-
- cat >> "${T}"/chimera <<- EOF
- #!${EPREFX}/bin/bash
-
- export PATH="${EPREFIX}/opt/${PN}/bin:\${PATH}"
- "${EPREFIX}/opt/${PN}/bin/chimera" \$@
- EOF
-
- exeinto /opt/bin/
- doexe "${T}"/chimera
-
- make_desktop_entry "${EPREFIX}/opt/bin/chimera" Chimera chimeraIcon
-
- if use prefix; then
- local i
- for i in "${ED}"/opt/${PN}/bin/{tiffcp,povray,al2co} "${ED}"/opt/${PN}/lib/*.so; do
- patchelf --set-rpath "${EPREFIX}/usr/lib:${EPREFIX}/opt/${PN}/lib" "${i}" || die
- done
- fi
-}