Gentoo Archives: gentoo-commits

From: Martin Mokrejs <mmokrejs@×××××××××××××××.cz>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/mothur/, sci-biology/mothur/files/
Date: Mon, 30 Nov 2015 23:51:21
Message-Id: 1448927430.4301eeb9419fd475d20e7c46d5fe4ea0bcbda847.mmokrejs@gentoo
1 commit: 4301eeb9419fd475d20e7c46d5fe4ea0bcbda847
2 Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
3 AuthorDate: Mon Nov 30 23:50:30 2015 +0000
4 Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz>
5 CommitDate: Mon Nov 30 23:50:30 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=4301eeb9
7
8 sci-biology/mothur: version bump; update makefile patch, the other patch from 1.27 series seems not necessary anymore; added few more IUSE values but the makefile could ideally respect them before forcing boost and zlib libraries into LIBS
9
10 Package-Manager: portage-2.2.18
11
12 sci-biology/mothur/ChangeLog | 12 +++++
13 .../mothur/files/mothur-1.36.1-makefile.patch | 61 ++++++++++++++++++++++
14 sci-biology/mothur/metadata.xml | 5 ++
15 sci-biology/mothur/mothur-1.36.1.ebuild | 46 ++++++++++++++++
16 4 files changed, 124 insertions(+)
17
18 diff --git a/sci-biology/mothur/ChangeLog b/sci-biology/mothur/ChangeLog
19 new file mode 100644
20 index 0000000..7e1aa76
21 --- /dev/null
22 +++ b/sci-biology/mothur/ChangeLog
23 @@ -0,0 +1,12 @@
24 +# ChangeLog for sci-biology/mothur
25 +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
26 +# $Id$
27 +
28 +*mothur-1.36.1 (30 Nov 2015)
29 +
30 + 30 Nov 2015; Martin Mokrejs <mmokrejs@×××××××××××××××.cz>
31 + +files/mothur-1.36.1-makefile.patch, +metadata.xml, +mothur-1.36.1.ebuild:
32 + sci-biology/mothur: version bump; update makefile patch, the other patch from
33 + 1.27 series seems not necessary anymore; added few more IUSE values but the
34 + makefile could ideally respect them before forcing boost and zlib libraries
35 + into LIBS
36
37 diff --git a/sci-biology/mothur/files/mothur-1.36.1-makefile.patch b/sci-biology/mothur/files/mothur-1.36.1-makefile.patch
38 new file mode 100644
39 index 0000000..08e0b7b
40 --- /dev/null
41 +++ b/sci-biology/mothur/files/mothur-1.36.1-makefile.patch
42 @@ -0,0 +1,61 @@
43 +--- mothur-1.36.1/makefile.ori 2015-11-30 18:38:40.511576683 +0100
44 ++++ mothur-1.36.1/makefile 2015-11-30 18:41:24.261579412 +0100
45 +@@ -9,7 +9,7 @@
46 + #
47 +
48 + USEMPI ?= no
49 +-64BIT_VERSION ?= yes
50 ++64BIT_VERSION ?= no
51 + USEREADLINE ?= yes
52 + USECOMPRESSION ?= no
53 + USEBOOST ?= yes
54 +@@ -18,7 +18,7 @@
55 + VERSION = "\"1.36.1\""
56 +
57 + # Optimize to level 3:
58 +-CXXFLAGS += -O3
59 ++# CXXFLAGS += -O3
60 +
61 +
62 + ifeq ($(strip $(64BIT_VERSION)),yes)
63 +@@ -58,7 +58,7 @@
64 +
65 +
66 + ifeq ($(strip $(USEMPI)),yes)
67 +- CXX = mpic++
68 ++# CXX = mpic++
69 + CXXFLAGS += -DUSE_MPI
70 + endif
71 +
72 +@@ -106,10 +106,8 @@
73 + OBJECTS+=$(patsubst %.cpp,%.o,$(wildcard *.cpp))
74 + OBJECTS+=$(patsubst %.c,%.o,$(wildcard *.c))
75 +
76 +-mothur : $(OBJECTS) uchime
77 ++mothur : $(OBJECTS)
78 + $(CXX) $(LDFLAGS) $(TARGET_ARCH) -o $@ $(OBJECTS) $(LIBS)
79 +- strip mothur
80 +-
81 +
82 + uchime:
83 + cd source/uchime_src && ./mk && mv uchime ../../ && cd ..
84 +--- mothur-1.36.1/makefile.ori 2015-11-30 18:46:41.411584697 +0100
85 ++++ mothur-1.36.1/makefile 2015-11-30 19:15:18.531613315 +0100
86 +@@ -64,14 +64,12 @@
87 +
88 + #The boost libraries allow you to read gz files.
89 + ifeq ($(strip $(USEBOOST)),yes)
90 +- BOOST_INCLUDE_DIR="/usr/local/include"
91 +- BOOST_LIBRARY_DIR="/usr/local/lib"
92 ++ BOOST_INCLUDE_DIR="/usr/include"
93 ++ BOOST_LIBRARY_DIR="/usr/lib"
94 +
95 + CXXFLAGS += -DUSE_BOOST
96 +
97 +- LIBS += \
98 +- ${BOOST_LIBRARY_DIR}/libboost_iostreams.a \
99 +- ${BOOST_LIBRARY_DIR}/zlib.a
100 ++ LIBS += -lboost_iostreams -lz
101 +
102 + #if linux or windows then ${BOOST_LIBRARY_DIR}/libz.a
103 + endif
104
105 diff --git a/sci-biology/mothur/metadata.xml b/sci-biology/mothur/metadata.xml
106 new file mode 100644
107 index 0000000..f17a827
108 --- /dev/null
109 +++ b/sci-biology/mothur/metadata.xml
110 @@ -0,0 +1,5 @@
111 +<?xml version="1.0" encoding="UTF-8"?>
112 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
113 +<pkgmetadata>
114 + <herd>sci-biology</herd>
115 +</pkgmetadata>
116
117 diff --git a/sci-biology/mothur/mothur-1.36.1.ebuild b/sci-biology/mothur/mothur-1.36.1.ebuild
118 new file mode 100644
119 index 0000000..c82f7fc
120 --- /dev/null
121 +++ b/sci-biology/mothur/mothur-1.36.1.ebuild
122 @@ -0,0 +1,46 @@
123 +# Copyright 1999-2015 Gentoo Foundation
124 +# Distributed under the terms of the GNU General Public License v2
125 +# $Id$
126 +
127 +EAPI=5
128 +
129 +inherit eutils flag-o-matic fortran-2 toolchain-funcs
130 +
131 +DESCRIPTION="A suite of algorithms for ecological bioinformatics"
132 +HOMEPAGE="http://www.mothur.org/"
133 +SRC_URI="https://github.com/mothur/mothur/archive/v${PV}.tar.gz -> ${P}.tar.gz"
134 +
135 +LICENSE="GPL-3"
136 +SLOT="0"
137 +IUSE="mpi readline zlib"
138 +KEYWORDS="~amd64 ~x86"
139 +
140 +CDEPEND="dev-libs/boost"
141 +RDEPEND="
142 + sci-biology/uchime
143 + mpi? ( virtual/mpi )"
144 +DEPEND="${RDEPEND}
145 + app-arch/unzip"
146 +
147 +pkg_setup() {
148 + fortran-2_pkg_setup
149 + use mpi && export CXX=mpicxx || export CXX=$(tc-getCXX)
150 + use amd64 && append-cppflags -DBIT_VERSION
151 + use readline && export USEREADLINE=yes || export USEREADLINE=no
152 + # use boost && export USEBOOST=yes || export USEBOOST=no
153 + use zlib && export USECOMPRESSION=yes || export USECOMPRESSION=no
154 +}
155 +
156 +src_prepare() {
157 + epatch \
158 + "${FILESDIR}"/${P}-makefile.patch \
159 +# "${FILESDIR}"/${PN}-1.27.0-overflows.patch
160 +}
161 +
162 +src_compile() {
163 + emake USEMPI=$(usex mpi) USEREADLINE=$(usex readline) USEBOOST=$(usex boost) USECOMPRESSION=$(usex zlib)
164 +}
165 +
166 +src_install() {
167 + dobin ${PN}
168 +}