3 files changed, 80 insertions, 2 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/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
+}