Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/abyss/files/, sci-biology/abyss/
Date: Mon, 25 May 2020 10:56:33
Message-Id: 1590403871.363526d4663d10660c2c593d11a9ab3707443572.slyfox@gentoo
1 commit: 363526d4663d10660c2c593d11a9ab3707443572
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 25 10:51:11 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Mon May 25 10:51:11 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=363526d4
7
8 sci-biology/abyss: respect AR override, bug #725300
9
10 Use AM_PROG_AR to default to standard AR discovery
11 instead of make's 'ar'.
12
13 Reported-by: Agostino Sarubbo
14 Closes: https://bugs.gentoo.org/725300
15 Package-Manager: Portage-2.3.100, Repoman-2.3.22
16 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
17
18 sci-biology/abyss/abyss-2.0.3-r1.ebuild | 56 +++++++++++++++++++++++
19 sci-biology/abyss/files/abyss-2.0.3-prog-AR.patch | 11 +++++
20 2 files changed, 67 insertions(+)
21
22 diff --git a/sci-biology/abyss/abyss-2.0.3-r1.ebuild b/sci-biology/abyss/abyss-2.0.3-r1.ebuild
23 new file mode 100644
24 index 00000000000..6c8571fafa6
25 --- /dev/null
26 +++ b/sci-biology/abyss/abyss-2.0.3-r1.ebuild
27 @@ -0,0 +1,56 @@
28 +# Copyright 1999-2020 Gentoo Authors
29 +# Distributed under the terms of the GNU General Public License v2
30 +
31 +EAPI=6
32 +
33 +inherit autotools toolchain-funcs
34 +
35 +DESCRIPTION="Assembly By Short Sequences - a de novo, parallel, paired-end sequence assembler"
36 +HOMEPAGE="http://www.bcgsc.ca/platform/bioinfo/software/abyss/"
37 +SRC_URI="https://github.com/bcgsc/abyss/archive/${PV}.tar.gz -> ${P}.tar.gz"
38 +
39 +LICENSE="abyss"
40 +SLOT="0"
41 +IUSE="+mpi openmp misc-haskell"
42 +KEYWORDS="~amd64 ~x86"
43 +
44 +RDEPEND="
45 + dev-cpp/sparsehash
46 + dev-libs/boost:=
47 + misc-haskell? (
48 + dev-libs/gmp:0=
49 + virtual/libffi:0=
50 + )
51 + mpi? ( sys-cluster/openmpi )"
52 +DEPEND="${RDEPEND}
53 + misc-haskell? (
54 + dev-lang/ghc
55 + )"
56 +
57 +PATCHES=("${FILESDIR}"/${PN}-2.0.3-prog-AR.patch)
58 +
59 +# todo: --enable-maxk=N configure option
60 +# todo: fix automagic mpi toggling
61 +
62 +pkg_pretend() {
63 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
64 +}
65 +
66 +pkg_setup() {
67 + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
68 +}
69 +
70 +src_prepare() {
71 + default
72 + sed -i -e "s/-Werror//" configure.ac || die #365195
73 + sed -i -e "/dist_pkgdoc_DATA/d" Makefile.am || die
74 + eautoreconf
75 +}
76 +
77 +src_configure() {
78 + # disable building haskell tool Misc/samtobreak
79 + # unless request by user: bug #534412
80 + use misc-haskell || export ac_cv_prog_ac_ct_GHC=
81 +
82 + econf $(use_enable openmp)
83 +}
84
85 diff --git a/sci-biology/abyss/files/abyss-2.0.3-prog-AR.patch b/sci-biology/abyss/files/abyss-2.0.3-prog-AR.patch
86 new file mode 100644
87 index 00000000000..d41c58ad261
88 --- /dev/null
89 +++ b/sci-biology/abyss/files/abyss-2.0.3-prog-AR.patch
90 @@ -0,0 +1,11 @@
91 +https://bugs.gentoo.org/725300
92 +--- a/configure.ac
93 ++++ b/configure.ac
94 +@@ -17,6 +17,7 @@ AC_CHECK_TOOL(GHC, ghc)
95 + AM_CONDITIONAL([HAVE_GHC], ["$GHC" --version])
96 + AC_CHECK_PROG(PANDOC, pandoc, yes)
97 + AM_CONDITIONAL([HAVE_PANDOC], [test x"$PANDOC" = x"yes"])
98 ++AM_PROG_AR
99 +
100 + # Checks for header files.
101 + AC_CHECK_HEADERS([dlfcn.h fcntl.h float.h limits.h \