[gentoo-commits] repo/gentoo:master commit in: sci-biology/abyss/

["Sergei Trofimovich" <slyfox@gentoo.org>]

commit:     a50e1769e82e28dedb16083ac9136f17f9af2297
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Feb  8 23:33:45 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Feb  8 23:33:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a50e1769

sci-biology/abyss: fix automagic haskell deps, bug #534412

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/534412

Package-Manager: portage-2.2.27

 sci-biology/abyss/abyss-1.3.6.ebuild | 19 +++++++++++++++----
 sci-biology/abyss/metadata.xml       |  7 +++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/sci-biology/abyss/abyss-1.3.6.ebuild b/sci-biology/abyss/abyss-1.3.6.ebuild
index 04dcc7c..904b3e1 100644
--- a/sci-biology/abyss/abyss-1.3.6.ebuild
+++ b/sci-biology/abyss/abyss-1.3.6.ebuild
@@ -14,14 +14,21 @@ SRC_URI="http://www.bcgsc.ca/downloads/abyss/${P}.tar.gz"
 
 LICENSE="abyss"
 SLOT="0"
-IUSE="+mpi openmp"
+IUSE="+mpi openmp misc-haskell"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="
+RDEPEND="
 	dev-cpp/sparsehash
 	dev-libs/boost
-	mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
+	misc-haskell? ( dev-libs/gmp:0=
+			virtual/libffi:0=
+	)
+	mpi? ( virtual/mpi )
+"
+DEPEND="${RDEPEND}
+	misc-haskell? ( dev-lang/ghc
+			dev-haskell/mmap )
+"
 
 # todo: --enable-maxk=N configure option
 # todo: fix automagic mpi toggling
@@ -39,6 +46,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# disable building haskell tool Misc/samtobreak
+	# unless request by user: bug #534412
+	use misc-haskell || export ac_cv_prog_ac_ct_GHC=
+
 	local myeconfargs=(
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		$(use_enable openmp)

diff --git a/sci-biology/abyss/metadata.xml b/sci-biology/abyss/metadata.xml
index 959160f..c0c84f0 100644
--- a/sci-biology/abyss/metadata.xml
+++ b/sci-biology/abyss/metadata.xml
@@ -5,4 +5,11 @@
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>
+  <maintainer type="project">
+    <email>haskell@gentoo.org</email>
+    <name>Gentoo Haskell</name>
+  </maintainer>
+  <use>
+    <flag name='misc-haskell'>build abyss-samtobreak tool, pull in haskell toolchain</flag>
+  </use>
 </pkgmetadata>