Drop old

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 10 insertions, 79 deletions

diff --git a/sci-chemistry/oasis/ChangeLog b/sci-chemistry/oasis/ChangeLog
index c158f95c7f49..e4d581c3f050 100644
--- a/sci-chemistry/oasis/ChangeLog
+++ b/sci-chemistry/oasis/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/oasis
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/ChangeLog,v 1.25 2013/12/24 12:43:46 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/ChangeLog,v 1.26 2015/03/09 13:33:02 jlec Exp $
+
+  09 Mar 2015; Justin Lecher <jlec@gentoo.org> -oasis-4.0-r2.ebuild,
+  oasis-4.0-r3.ebuild:
+  Drop old
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> oasis-4.0-r3.ebuild:
   Stable for x86, wrt bug #485944
diff --git a/sci-chemistry/oasis/oasis-4.0-r2.ebuild b/sci-chemistry/oasis/oasis-4.0-r2.ebuild
deleted file mode 100644
index 5b1f95aca5e9..000000000000
--- a/sci-chemistry/oasis/oasis-4.0-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.13 2012/10/19 10:04:45 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="
-	!dev-ml/oasis
-	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}
-	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
-	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/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
-}
diff --git a/sci-chemistry/oasis/oasis-4.0-r3.ebuild b/sci-chemistry/oasis/oasis-4.0-r3.ebuild
index a7726f948a48..b7ec6733af2c 100644
--- a/sci-chemistry/oasis/oasis-4.0-r3.ebuild
+++ b/sci-chemistry/oasis/oasis-4.0-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 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.6 2013/12/24 12:43:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/oasis/oasis-4.0-r3.ebuild,v 1.7 2015/03/09 13:33:02 jlec Exp $
 
 EAPI=5
 
@@ -10,7 +10,7 @@ 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"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${MY_P}.zip"
 
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
@@ -20,7 +20,7 @@ IUSE="examples +minimal"
 RDEPEND="
 	sci-chemistry/ccp4-apps
 	sci-chemistry/pymol
-	sci-libs/mmdb
+	sci-libs/mmdb:0
 	sci-visualization/gnuplot
 	!minimal? (
 		sci-chemistry/solve-resolve-bin