Fixes for bug 314053

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/sci-chemistry/oasis/ChangeLog b/sci-chemistry/oasis/ChangeLog
index da9037166fd10dd6a69b50796c6631ab506a4be7..1b60f3c3da40b396c1a22bf55d4d2d3abfcce70d 100644 (file)
--- a/sci-chemistry/oasis/ChangeLog
+++ b/sci-chemistry/oasis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-chemistry/oasis
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/ChangeLog,v 1.4 2010/04/25 11:29:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/ChangeLog,v 1.5 2010/05/22 10:04:30 jlec Exp $
+
+*oasis-4.0-r1 (22 May 2010)
+
+  22 May 2010; Justin Lecher <jlec@gentoo.org> +oasis-4.0-r1.ebuild:
+  Fixes for bug 314053
 
   05 Apr 2010; Justin Lecher <jlec@gentoo.org> oasis-4.0.ebuild:
   Keyworded for ~x86-linux ~amd64-linux, tested by me

diff --git a/sci-chemistry/oasis/Manifest b/sci-chemistry/oasis/Manifest
index c7c2b784c148b714d398f0b2cdd3cad6dfd35ed6..30e25532e4347192dfa25a3e04a7fa28b57b26c8 100644 (file)
--- a/sci-chemistry/oasis/Manifest
+++ b/sci-chemistry/oasis/Manifest
@@ -3,13 +3,14 @@ Hash: SHA1
 
 AUX 4.0-makefile.patch 1277 RMD160 8c5a9c6feec0bbb1e80f4a1a48fd016ffc3ad77f SHA1 6d0a3503f650cafe67d5d5b1a7c0561de20c90b5 SHA256 4bafff2ae7e58a908d7203e56643122f56c0cc0ebca8a103f2ca73fefa5986ce
 DIST oasis4.0_Linux.zip 6714528 RMD160 9d5b46e06ab6b2e7e301622978056bf7b4208a79 SHA1 fab2e4556ad04556f918bae153e13a843415f0c9 SHA256 56da70ce0c2750aaddf64ad2cd7852fc341d2022209484beb356b4e73dec61ba
+EBUILD oasis-4.0-r1.ebuild 1628 RMD160 419cb5d7aa7515b44078722a8b925c3a4d475e79 SHA1 baa7d211f000218acbd3b2699655a2c055f1ac7e SHA256 5edef651fe9916825cdae926d2e43fc5b0e233be3e686846c353b0b665b9a2bb
 EBUILD oasis-4.0.ebuild 1495 RMD160 5130ac48cf7897affaa66b71abf3054bc775f141 SHA1 2cf36ac5dbd505d25042863055263be7bc7f17df SHA256 a4b5334a3e2794cf3ccdb62624750e2ea930315ac67e2bcc9fb49e58ee430f10
-MISC ChangeLog 652 RMD160 dace5cd309802a2f55718711ad795331edaa5a75 SHA1 20227e191a9767f1f7d1aa3ce2e68251e131655c SHA256 2dc7bdeda60c98c004acc231261606f53575bbeb79015ee66cf60d9d77baaaba
+MISC ChangeLog 774 RMD160 7b037e5a1286d8d03c5f09990ff6be5a92d0a924 SHA1 8166a6792865e749f414eda71df9f1bb7efd3cee SHA256 3ce08f4d9f20837e2f3827f80ec4f63ff5159cf46c58bc7ceb5d4c24ca95e870
 MISC metadata.xml 298 RMD160 a811ceba16c1dfc0bf5cd95aac1fbeda93a01140 SHA1 5da5e120e5cb3ade8f5b3f4d6c2521dbe49dc2ee SHA256 47989b12cffa652d3b2fca1b8a9ad02f4e258df562fabc458dc9782f3789a8d0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkvUJ7cACgkQgAnW8HDreRbE9QCeInuyHmnyq8fygcn+BgQgqTPy
-I1EAoK0quIi4NuFkiI8A63sUVFJmnjuV
-=EPlq
+iEYEARECAAYFAkv3rC8ACgkQgAnW8HDreRZNkACghf0Hu5zKAzUm3jp7JGfrCCXD
+a+kAnjsxrKhZsfasNG3laWP9RZ5+JyA4
+=7T/6
 -----END PGP SIGNATURE-----

diff --git a/sci-chemistry/oasis/oasis-4.0-r1.ebuild b/sci-chemistry/oasis/oasis-4.0-r1.ebuild
new file mode 100644 (file)
index 0000000..36d0c60
--- /dev/null
+++ b/sci-chemistry/oasis/oasis-4.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0-r1.ebuild,v 1.1 2010/05/22 10:04:30 jlec Exp $
+
+EAPI="3"
+
+inherit eutils multilib toolchain-funcs
+
+MY_P="${PN}${PV}_Linux"
+
+DESCRIPTION="A direct-method program for SAD/SIR phasing"
+HOMEPAGE="http://cryst.iphy.ac.cn/Project/protein/protein-I.html"
+SRC_URI="http://dev.gentooexperimental.org/~jlec/distfiles/${MY_P}.zip"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+LICENSE="ccp4 oasis"
+IUSE="examples +minimal"
+
+RDEPEND="
+       ${RDEPEND}
+       sci-chemistry/ccp4-apps
+       sci-chemistry/pymol
+       sci-libs/mmdb
+       sci-visualization/gnuplot
+       !minimal? (
+               sci-chemistry/solve-resolve-bin
+               sci-chemistry/arp-warp-bin
+       )"
+DEPEND="sci-libs/ccp4-libs"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+       rm bin/{fnp2fp,gnuplot,oasis4-0,seq} || die
+       epatch "${FILESDIR}"/${PV}-makefile.patch
+}
+
+src_compile() {
+       emake \
+               -C src \
+               F77="$(tc-getFC)" \
+               CCP4_LIB="${EPREFIX}/usr/$(get_libdir)" \
+               Linux || die
+}
+
+src_install() {
+       exeinto /usr/libexec/ccp4/bin/
+       doexe src/{${PN},fnp2fp} || die
+       dosym ../libexec/ccp4/bin/${PN} /usr/bin/${PN}
+       dosym ../libexec/ccp4/bin/fnp2fp /usr/bin/fnp2fp
+
+       exeinto /usr/$(get_libdir)/${PN}
+       doexe bin/*.*sh || die
+
+       insinto /usr/$(get_libdir)/${PN}/html
+       doins bin/html/* || die
+       chmod 755 "${ED}"/usr/$(get_libdir)/${PN}/html/*.{csh,awk} || die
+
+       if use examples; then
+               insinto /usr/share/${PN}
+               doins -r examples || die
+       fi
+
+       cat >> "${T}"/25oasis <<- EOF
+       oasisbin="${EPREFIX}/usr/$(get_libdir)/${PN}"
+       EOF
+
+       doenvd "${T}"/25oasis
+}