sci-biology/raxml: Drop old; stop building when non sse3 capable CPU is detected, #375061

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

6 files changed, 21 insertions, 139 deletions

diff --git a/sci-biology/raxml/ChangeLog b/sci-biology/raxml/ChangeLog
index 18a21292326a..034eb24478d0 100644
--- a/sci-biology/raxml/ChangeLog
+++ b/sci-biology/raxml/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-biology/raxml
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/raxml/ChangeLog,v 1.7 2011/06/27 05:59:01 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/raxml/ChangeLog,v 1.8 2013/02/18 12:20:50 jlec Exp $
+
+  18 Feb 2013; Justin Lecher <jlec@gentoo.org> -raxml-7.2.2.ebuild,
+  -raxml-7.2.5.ebuild, -raxml-7.2.5-r1.ebuild, raxml-7.2.6.ebuild,
+  metadata.xml:
+  Drop old; stop building when non sse3 capable CPU is detected, #375061
 
 *raxml-7.2.6 (27 Jun 2011)
 
diff --git a/sci-biology/raxml/metadata.xml b/sci-biology/raxml/metadata.xml
index 9fbd5c20ef5f..9d616102c9e4 100644
--- a/sci-biology/raxml/metadata.xml
+++ b/sci-biology/raxml/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>weaver@gentoo.org</email>
-		<name>Andrey Kislyuk</name>
-	</maintainer>
-	<herd>sci-biology</herd>
-	<use>
-		<flag name="sse3">Enable optimization for SSE3 capable chips</flag>
-	</use>
+  <maintainer>
+    <email>weaver@gentoo.org</email>
+    <name>Andrey Kislyuk</name>
+  </maintainer>
+  <herd>sci-biology</herd>
+  <use>
+    <flag name="sse3">Enable optimization for SSE3 capable chips</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-biology/raxml/raxml-7.2.2.ebuild b/sci-biology/raxml/raxml-7.2.2.ebuild
deleted file mode 100644
index 27a52f2f18d2..000000000000
--- a/sci-biology/raxml/raxml-7.2.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/raxml/raxml-7.2.2.ebuild,v 1.4 2011/06/21 06:38:10 jlec Exp $
-
-EAPI=2
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Program for Sequential, Parallel & Distributed Inference of Large Phylogenetic Trees"
-HOMEPAGE="http://wwwkramer.in.tum.de/exelixis/software.html"
-SRC_URI="http://wwwkramer.in.tum.de/exelixis/software/RAxML-${PV}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+threads"
-
-# mpi is not supported in version 7.2.2. mpi is enabled by adding -DPARALLEL to CFLAGS
-DEPEND="" # mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/RAxML-${PV}"
-
-src_prepare() {
-	sed \
-		-e 's/CFLAGS =/CFLAGS := ${CFLAGS}/' \
-		-e 's/CC = gcc/CC = '$(tc-getCC)'/' \
-		-i Makefile.* || die
-}
-
-src_compile() {
-	emake -f Makefile.gcc || die
-	emake -f Makefile.SSE3.gcc clean && emake -f Makefile.SSE3.gcc || die
-	if use threads; then
-		emake -f Makefile.PTHREADS.gcc clean && emake -f Makefile.PTHREADS.gcc || die
-		emake -f Makefile.SSE3.PTHREADS.gcc clean && emake -f Makefile.SSE3.PTHREADS.gcc || die
-	fi
-}
-
-src_install() {
-	dobin raxmlHPC raxmlHPC-SSE3 || die
-	if use threads; then dobin raxmlHPC-PTHREADS raxmlHPC-PTHREADS-SSE3 || die; fi
-}
diff --git a/sci-biology/raxml/raxml-7.2.5-r1.ebuild b/sci-biology/raxml/raxml-7.2.5-r1.ebuild
deleted file mode 100644
index 5ec6822f113d..000000000000
--- a/sci-biology/raxml/raxml-7.2.5-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/raxml/raxml-7.2.5-r1.ebuild,v 1.1 2011/06/21 06:38:10 jlec Exp $
-
-EAPI=4
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A Program for Sequential, Parallel & Distributed Inference of Large Phylogenetic Trees"
-HOMEPAGE="http://wwwkramer.in.tum.de/exelixis/software.html"
-SRC_URI="http://wwwkramer.in.tum.de/exelixis/software/RAxML-${PV}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="sse3 +threads"
-
-# mpi is not supported in version 7.2.2. mpi is enabled by adding -DPARALLEL to CFLAGS
-DEPEND="" # mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/RAxML-${PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-
-	use sse3 && append-cflags -D__SIM_SSE3
-	use threads && \
-		append-cflags -D_USE_PTHREADS && \
-		append-ldflags -pthread
-
-	tc-export CC
-}
-
-src_compile() {
-	emake -f Makefile.gcc
-}
-
-src_install() {
-	dobin raxmlHPC
-}
diff --git a/sci-biology/raxml/raxml-7.2.5.ebuild b/sci-biology/raxml/raxml-7.2.5.ebuild
deleted file mode 100644
index b33622313705..000000000000
--- a/sci-biology/raxml/raxml-7.2.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/raxml/raxml-7.2.5.ebuild,v 1.2 2011/06/21 06:38:10 jlec Exp $
-
-EAPI=2
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Program for Sequential, Parallel & Distributed Inference of Large Phylogenetic Trees"
-HOMEPAGE="http://wwwkramer.in.tum.de/exelixis/software.html"
-SRC_URI="http://wwwkramer.in.tum.de/exelixis/software/RAxML-${PV}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+threads"
-
-# mpi is not supported in version 7.2.2. mpi is enabled by adding -DPARALLEL to CFLAGS
-DEPEND="" # mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/RAxML-${PV}"
-
-src_prepare() {
-	sed \
-		-e 's/CFLAGS =/CFLAGS := ${CFLAGS}/' \
-		-e 's/CC = gcc/CC = '$(tc-getCC)'/' \
-		-i Makefile.* || die
-}
-
-src_compile() {
-	emake -f Makefile.gcc || die
-	emake -f Makefile.SSE3.gcc clean && emake -f Makefile.SSE3.gcc || die
-	if use threads; then
-		emake -f Makefile.PTHREADS.gcc clean && emake -f Makefile.PTHREADS.gcc || die
-		emake -f Makefile.SSE3.PTHREADS.gcc clean && emake -f Makefile.SSE3.PTHREADS.gcc || die
-	fi
-}
-
-src_install() {
-	dobin raxmlHPC raxmlHPC-SSE3 || die
-	if use threads; then dobin raxmlHPC-PTHREADS raxmlHPC-PTHREADS-SSE3 || die; fi
-}
diff --git a/sci-biology/raxml/raxml-7.2.6.ebuild b/sci-biology/raxml/raxml-7.2.6.ebuild
index 5d573e87651d..6339dd23bc1c 100644
--- a/sci-biology/raxml/raxml-7.2.6.ebuild
+++ b/sci-biology/raxml/raxml-7.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/raxml/raxml-7.2.6.ebuild,v 1.1 2011/06/27 05:59:01 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/raxml/raxml-7.2.6.ebuild,v 1.2 2013/02/18 12:20:50 jlec Exp $
 
 EAPI=4
 
@@ -21,6 +21,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/RAxML-${PV}"
 
+pkg_pretend() {
+	use sse3 || die "This package needs sse3 support in your CPU"
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-makefile.patch