sci-chemistry/oasis: Resolve clash with dev-ml/oasis, #436800

Package-Manager: portage-2.2.0_alpha135/cvs/Linux x86_64

4 files changed, 92 insertions, 12 deletions

diff --git a/sci-chemistry/oasis/ChangeLog b/sci-chemistry/oasis/ChangeLog
index cc1acca4483f..f256025b93e6 100644
--- a/sci-chemistry/oasis/ChangeLog
+++ b/sci-chemistry/oasis/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/oasis
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/ChangeLog,v 1.17 2012/04/14 09:50:57 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/ChangeLog,v 1.18 2012/10/06 16:53:01 jlec Exp $
+
+*oasis-4.0-r3 (06 Oct 2012)
+
+  06 Oct 2012; Justin Lecher <jlec@gentoo.org> oasis-4.0-r2.ebuild,
+  +oasis-4.0-r3.ebuild:
+  Resolve clash with dev-ml/oasis, #436800
 
   14 Apr 2012; Andreas Schuerch <nativemad@gentoo.org> oasis-4.0-r2.ebuild:
   x86 stable, see bug 375917, thanks all.
diff --git a/sci-chemistry/oasis/Manifest b/sci-chemistry/oasis/Manifest
index 910ca0582160..0677328bb532 100644
--- a/sci-chemistry/oasis/Manifest
+++ b/sci-chemistry/oasis/Manifest
@@ -1,15 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-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-r2.ebuild 1741 RMD160 17bf29e92843934527116a8b019303fb8751641f SHA1 f0e3aecf207cafbf13835cf850ff975394da11c9 SHA256 a361b15db472583a7faff446b37890fa5dc72ac3d446b9b11c7f6f8bc8b4913d
-MISC ChangeLog 2209 RMD160 0542274c11d2878c9621b74acf68e2ea37ce600d SHA1 14563235ed8a0c69ce326947da620589e67a68f8 SHA256 3af086479e3b4dac703b41e1d37b68dc99f15f2db76a513fd3c931e7392ccee8
-MISC metadata.xml 304 RMD160 8a72ce2430e73f642ec7673ecbbd3e253723dd66 SHA1 95b27ac4c11b1c2d1f7c8a0c0211b08a805c7c6a SHA256 ede492f822520097150d4823539ead42be380db51dc1257744c569ccd75a4092
+AUX 4.0-makefile.patch 1277 SHA256 4bafff2ae7e58a908d7203e56643122f56c0cc0ebca8a103f2ca73fefa5986ce SHA512 9fa284c966500ec8a180f422b234ee6742b2ee00d89eee45e782516194a2533f2075063612e809ba232fd05bf8565f7e1467c90915365ffe6f3d44b8e3d53aa9 WHIRLPOOL 44e9a279b65bb7548abfd96928f8f59c240e53b738ac920578b15c07de54b37eacafa3cc66cd71e7bdd08128d402c59e8b26ca2285be6ea562255246f9cbf5a5
+DIST oasis4.0_Linux.zip 6714528 SHA256 56da70ce0c2750aaddf64ad2cd7852fc341d2022209484beb356b4e73dec61ba SHA512 b43b8315e8e3bc8531e11021605100f231635e2363256a19ed0f51015913221eb9e37b3891b9b1239bf83c9ada8f65a1bdc79ec5745201436f8c3b5019bd4bf7 WHIRLPOOL 24d337391997d036bd657ab22aecc77d36f7fa0af573d17433869a29640a8a10368c75ebee114071c577cc0cce34d838271147599d99e2c389088b8c6185f41b
+EBUILD oasis-4.0-r2.ebuild 1751 SHA256 371fb5ea58c00cb7015b72d8455b67cd60cea1d74eebf209003ee8ef89939ef4 SHA512 0fec0e82dd226f16409eecdf6b0975cc85b8c3b30e4bfbd2186d3027c30c1519f7a4f018a052099e7433f6fc6bf13672d84ff129ae328f07eda2f880880af3fc WHIRLPOOL b9574153b016cffc88ad9d71c95970fe99ada397b35f3ef46bed5219f9cb5fe8c3979c1dc708279d40594994be7108f903ea8c94dce7df595f07939da5d53c45
+EBUILD oasis-4.0-r3.ebuild 1639 SHA256 e134dab36bf4f104f005eca17789c0752025d7eb98ff60a524af11e0f68d3861 SHA512 020c313db489495e565349eb5137fde326892d10d764842c1d7d368c13686229331cd46ef25e7e8af89cce72bed3531ff5dadc8ca2850d33e31ebfb6da8341b9 WHIRLPOOL 68143ac2a1daaa5a7f247e34388f563781bd439d6f1f1c2d7be57b08cc1368422a07b0cece54526b28e669f7cd5022e12db7184dd5eccea1d7da59186498de69
+MISC ChangeLog 2369 SHA256 0b4bdb81c77d9c68c9f7fef82d7c51521b01358d512784717479e2a313470b02 SHA512 1e4e8ef360060f8b0160f6332ecd1ea76f78ef470d40ca0f4d57bd6e11b7a36cf895649ae5b2f312fe4145a4f775da8423efdf2b5bf1541f711ecf630e2ed827 WHIRLPOOL ede41436aff215e154a91914db18172998af15b4ee71feb774628c536bc118599735d43b09319b2130c0310c368d2a59240757773733befa7599e95aca2af494
+MISC metadata.xml 304 SHA256 ede492f822520097150d4823539ead42be380db51dc1257744c569ccd75a4092 SHA512 597724826335a524a009a7536c5fc0a7c1945ce10d9830754d791ba8c81d92aad2eed386629f60b2565efe12a0fa422e5b169c4d4755a1fecb86f9f4705b182c WHIRLPOOL c090508b66a56804a45c5d259b31aa6d558157735968d5aa03cc4ffe61aa04364be888f8c9f33ea144608dca20a0d362baf2b9fb6650325cad236df9a9c5f160
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk+JSGoACgkQakKUmsHeVLLnvwCcDc7GeWbQIRPACN/OElVi7Q0k
-wR4An18gMTYL0E38RCbhCHfJHWoaKiAy
-=zOwU
+iEYEAREIAAYFAlBwYe4ACgkQgAnW8HDreRbo/QCfW+gaMbfrg+dvQWWTxHX1exva
+qAsAoIWkD65OgcoderkEe178pEGyOzvS
+=eAuO
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/oasis/oasis-4.0-r2.ebuild b/sci-chemistry/oasis/oasis-4.0-r2.ebuild
index de69266dab95..2a26987dedcd 100644
--- a/sci-chemistry/oasis/oasis-4.0-r2.ebuild
+++ b/sci-chemistry/oasis/oasis-4.0-r2.ebuild
@@ -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/oasis/oasis-4.0-r2.ebuild,v 1.11 2012/04/14 09:50:57 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0-r2.ebuild,v 1.12 2012/10/06 16:53:01 jlec Exp $
 
 EAPI=3
 
@@ -18,6 +18,7 @@ LICENSE="ccp4 oasis"
 IUSE="examples +minimal"
 
 RDEPEND="
+	!dev-ml/oasis
 	sci-chemistry/ccp4-apps
 	sci-chemistry/pymol
 	sci-libs/mmdb
diff --git a/sci-chemistry/oasis/oasis-4.0-r3.ebuild b/sci-chemistry/oasis/oasis-4.0-r3.ebuild
new file mode 100644
index 000000000000..83ee35c21192
--- /dev/null
+++ b/sci-chemistry/oasis/oasis-4.0-r3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0-r3.ebuild,v 1.1 2012/10/06 16:53:01 jlec Exp $
+
+EAPI=3
+
+inherit eutils fortran-2 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 ~ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="ccp4 oasis"
+IUSE="examples +minimal"
+
+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="${RDEPEND}
+	virtual/fortran
+	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)" \
+		CFLAGS="${FFLAGS}" \
+		CCP4_LIB="${EPREFIX}/usr/$(get_libdir)" \
+		Linux || die
+}
+
+src_install() {
+	exeinto /usr/libexec/ccp4/bin/
+	doexe src/{${PN},fnp2fp} || die
+
+	exeinto /usr/$(get_libdir)/${PN}
+	doexe bin/*.*sh || die
+
+	insinto /usr/share/doc/${PF}/html
+	doins bin/html/* || die
+	dosym ../../share/doc/${PF}/html /usr/$(get_libdir)/${PN}/html
+	chmod 755 "${ED}"/usr/share/doc/${PF}/html/*.{*sh,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
+}