sci-libs/taucs: Remove support for dev-lang/cilk

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: David Seifert <soap@gentoo.org>

3 files changed, 26 insertions, 58 deletions

diff --git a/sci-libs/taucs/files/taucs-2.2-no-test-cilk.patch b/sci-libs/taucs/files/taucs-2.2-no-test-cilk.patch
deleted file mode 100644
index 332d1138dea0..000000000000
--- a/sci-libs/taucs/files/taucs-2.2-no-test-cilk.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/testscript
-+++ b/testscript
-@@ -12,17 +12,6 @@
- ulimit -s >> testscript.log
- echo '==============' >> testscript.log
- echo =============== >> testscript.log
--echo = test_cilk_snmf = >> testscript.log
--. ./configure in=progs/test_cilk_snmf.c $*
--echo last conf is $TAUCS_LASTCONF >> testscript.log
--make -f build/${TAUCS_LASTCONF}/makefile
--if bin/${TAUCS_LASTCONF}/test_cilk_snmf >> testscript.log ; then
--echo = TEST PASSED test_cilk_snmf >> testscript.log
--else
--echo = TEST FAILED test_cilk_snmf >> testscript.log
--fi
--echo =============== >> testscript.log
--echo =============== >> testscript.log
- echo = test_complex = >> testscript.log
- . ./configure in=progs/test_complex.c $*
- echo last conf is $TAUCS_LASTCONF >> testscript.log
diff --git a/sci-libs/taucs/metadata.xml b/sci-libs/taucs/metadata.xml
index b1b1d0e9c3fd..507e3718bcb6 100644
--- a/sci-libs/taucs/metadata.xml
+++ b/sci-libs/taucs/metadata.xml
@@ -1,32 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-  TAUCS is a C library of sparse linear solvers.
-  The current version of the library (1.0) includes the following
-  functionality:
-
-  * Multifrontal Supernodal Cholesky Factorization.
-  * Left-Looking Supernodal Cholesky Factorization.
-  * Drop-Tolerance Incomplete-Cholesky Factorization.
-  * Out-of-Core, Left-Looking Supernodal Sparse Cholesky Factorization.
-  * Out-of-Core Sparse LU with Partial Pivoting Factor and Solve.
-  * Ordering Codes and Interfaces to Existing Ordering Codes.
-  * Multilevel-Support-Graph Preconditioners.
-  * Matrix Operations.
-  * Matrix Input/Output.
-  * Matrix Generators.
-  * Iterative Solvers.
-  * Vaidya's Preconditioners.
-  * Recursive Vaidya's Preconditioners.
-  * Multilevel-Support-Graph Preconditioners.
-  * Utility Routines
-</longdescription>
-  <use>
-    <flag name="cilk">Enable multithreading using <pkg>dev-lang/cilk</pkg></flag>
-  </use>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		TAUCS is a C library of sparse linear solvers.
+		The current version of the library (1.0) includes the following
+		functionality:
+		* Multifrontal Supernodal Cholesky Factorization.
+		* Left-Looking Supernodal Cholesky Factorization.
+		* Drop-Tolerance Incomplete-Cholesky Factorization.
+		* Out-of-Core, Left-Looking Supernodal Sparse Cholesky Factorization.
+		* Out-of-Core Sparse LU with Partial Pivoting Factor and Solve.
+		* Ordering Codes and Interfaces to Existing Ordering Codes.
+		* Multilevel-Support-Graph Preconditioners.
+		* Matrix Operations.
+		* Matrix Input/Output.
+		* Matrix Generators.
+		* Iterative Solvers.
+		* Vaidya's Preconditioners.
+		* Recursive Vaidya's Preconditioners.
+		* Multilevel-Support-Graph Preconditioners.
+		* Utility Routines
+	</longdescription>
 </pkgmetadata>
diff --git a/sci-libs/taucs/taucs-2.2.ebuild b/sci-libs/taucs/taucs-2.2-r1.ebuild
index 8ff8000be8dd..7b91afeeed64 100644
--- a/sci-libs/taucs/taucs-2.2.ebuild
+++ b/sci-libs/taucs/taucs-2.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.tau.ac.il/~stoledo/${PN}/${PV}/${PN}.tgz -> ${P}.tgz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cilk doc"
+IUSE="doc"
 RESTRICT="test"
 
 RDEPEND="
@@ -21,16 +21,13 @@ RDEPEND="
 	|| (
 		sci-libs/metis
 		sci-libs/parmetis
-	)
-	cilk? ( dev-lang/cilk )"
+	)"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 S="${WORKDIR}"
 
 PATCHES=(
-	# test with cilk has memory leaks
-	"${FILESDIR}"/${P}-no-test-cilk.patch
 	# bug 725588
 	"${FILESDIR}"/${P}-respect-ar.patch
 )
@@ -52,11 +49,6 @@ src_configure() {
 
 	echo "LIBMETIS=$($(tc-getPKG_CONFIG) --libs metis)" >> config/linux_shared.mk || die
 	# no cat <<EOF because -o has a trailing space
-	if use cilk; then
-		echo "CILKC=cilkc" >> config/linux_shared.mk || die
-		echo "CILKFLAGS=-O2 -I${EPREFIX}/usr/include/cilk -fPIC" >> config/linux_shared.mk || die
-		echo "CILKOUTFLG=-o " >> config/linux_shared.mk || die
-	fi
 	sed -e 's/ -fPIC//g' config/linux_shared.mk || die
 }