Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-biology/seqclean/, profiles/, sci-biology/seqclean/files/
Date: Tue, 31 Aug 2021 09:24:14
Message-Id: 1630401638.8f7b92289adb3326f0e6cb43697fdbcc4a8a950a.andrewammerlaan@gentoo
1 commit: 8f7b92289adb3326f0e6cb43697fdbcc4a8a950a
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 31 09:20:38 2021 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 31 09:20:38 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=8f7b9228
7
8 sci-biology/seqclean: remove last-rited pack
9
10 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
11
12 profiles/package.mask | 1 -
13 .../seqclean/files/seqclean-110625-build.patch | 135 ---------------------
14 sci-biology/seqclean/metadata.xml | 12 --
15 sci-biology/seqclean/seqclean-110625.ebuild | 54 ---------
16 4 files changed, 202 deletions(-)
17
18 diff --git a/profiles/package.mask b/profiles/package.mask
19 index f8e1e4d32..6b58c272e 100644
20 --- a/profiles/package.mask
21 +++ b/profiles/package.mask
22 @@ -37,7 +37,6 @@
23 # Bug #798015, removal in 30 days.
24 # Perhaps these packages work with the newer ncbi-tools++? If anyone is actively
25 # using these packages please open a bug report
26 -sci-biology/seqclean
27 sci-chemistry/talosn
28 # revdep of seqclean
29 sci-biology/rum
30
31 diff --git a/sci-biology/seqclean/files/seqclean-110625-build.patch b/sci-biology/seqclean/files/seqclean-110625-build.patch
32 deleted file mode 100644
33 index b5797618f..000000000
34 --- a/sci-biology/seqclean/files/seqclean-110625-build.patch
35 +++ /dev/null
36 @@ -1,135 +0,0 @@
37 - mdust/Makefile | 18 +++++++++---------
38 - mdust/fastafile.c | 3 ++-
39 - mdust/mdust.c | 1 +
40 - trimpoly/Makefile | 16 ++++++++--------
41 - 4 files changed, 20 insertions(+), 18 deletions(-)
42 -
43 -diff --git a/mdust/Makefile b/mdust/Makefile
44 -index 81bf4e9..0c75e69 100644
45 ---- a/mdust/Makefile
46 -+++ b/mdust/Makefile
47 -@@ -1,40 +1,40 @@
48 - # Useful directories
49 -
50 - # Directories to search for header files
51 --SEARCHDIRS := -I. -I-
52 -+SEARCHDIRS := -I. -iquote
53 -
54 -
55 - #SYSTYPE := $(shell uname)
56 -
57 --CC := gcc
58 --CFLAGS = -O2 -Wall ${SEARCHDIRS} -D_REENTRANT
59 -+CC ?= gcc
60 -+CFLAGS += ${SEARCHDIRS} -D_REENTRANT
61 -+CXXFLAGS += ${SEARCHDIRS} -D_REENTRANT
62 -
63 - %.o : %.c
64 - ${CC} ${CFLAGS} -c $< -o $@
65 -
66 - %.o : %.cc
67 -- ${CC} ${CFLAGS} -c $< -o $@
68 -+ ${CXX} ${CXXFLAGS} -c $< -o $@
69 -
70 - %.o : %.C
71 -- ${CC} ${CFLAGS} -c $< -o $@
72 -+ ${CXX} ${CXXFLAGS} -c $< -o $@
73 -
74 - %.o : %.cpp
75 -- ${CC} ${CFLAGS} -c $< -o $@
76 -+ ${CXX} ${CXXFLAGS} -c $< -o $@
77 -
78 - %.o : %.cxx
79 -- ${CC} ${CFLAGS} -c $< -o $@
80 -+ ${CXX} ${CXXFLAGS} -c $< -o $@
81 -
82 - # C/C++ linker
83 -
84 - LINKER := gcc
85 --LDFLAGS =
86 - LOADLIBES :=
87 -
88 - .PHONY : all
89 - all: mdust
90 -
91 - mdust: ./mdust.o ./dust.o ./fastafile.o
92 -- ${LINKER} ${LDFLAGS} -o $@ ${filter-out %.a %.so, $^} ${LOADLIBES}
93 -+ ${CXX} ${LDFLAGS} -o $@ ${filter-out %.a %.so, $^} ${LOADLIBES}
94 -
95 - # target for removing all object files
96 -
97 -diff --git a/mdust/fastafile.c b/mdust/fastafile.c
98 -index 6c14b99..5f70f14 100644
99 ---- a/mdust/fastafile.c
100 -+++ b/mdust/fastafile.c
101 -@@ -1,7 +1,8 @@
102 - #include <stdio.h>
103 - #include <ctype.h>
104 - #include <malloc.h>
105 --
106 -+#include <string.h>
107 -+#include <stdlib.h>
108 - #include "fastafile.h"
109 -
110 -
111 -diff --git a/mdust/mdust.c b/mdust/mdust.c
112 -index f2bae99..c3ee686 100644
113 ---- a/mdust/mdust.c
114 -+++ b/mdust/mdust.c
115 -@@ -1,6 +1,7 @@
116 - #include <stdlib.h>
117 - #include <stdio.h>
118 - #include <ctype.h>
119 -+#include <string.h>
120 - #include "dust.h"
121 - #include "fastafile.h"
122 -
123 -diff --git a/trimpoly/Makefile b/trimpoly/Makefile
124 -index 84db22d..71145c2 100644
125 ---- a/trimpoly/Makefile
126 -+++ b/trimpoly/Makefile
127 -@@ -3,28 +3,28 @@
128 - # Directories to search for header files
129 - SEARCHDIRS := -I.
130 -
131 --CC := gcc
132 --CFLAGS = -O2 -Wall ${SEARCHDIRS} -D_REENTRANT
133 -+CC ?= gcc
134 -+CFLAGS += ${SEARCHDIRS} -D_REENTRANT
135 -+CXXFLAGS += ${SEARCHDIRS} -D_REENTRANT
136 -
137 - %.o : %.c
138 - ${CC} ${CFLAGS} -c $< -o $@
139 -
140 - %.o : %.cc
141 -- ${CC} ${CFLAGS} -c $< -o $@
142 -+ ${CXX} ${CXXFLAGS} -c $< -o $@
143 -
144 - %.o : %.C
145 -- ${CC} ${CFLAGS} -c $< -o $@
146 -+ ${CXX} ${CXXFLAGS} -c $< -o $@
147 -
148 - %.o : %.cpp
149 -- ${CC} ${CFLAGS} -c $< -o $@
150 -+ ${CXX} ${CXXFLAGS} -c $< -o $@
151 -
152 - %.o : %.cxx
153 -- ${CC} ${CFLAGS} -c $< -o $@
154 -+ ${CXX} ${CXXFLAGS} -c $< -o $@
155 -
156 - # C/C++ linker
157 -
158 - LINKER := gcc
159 --LDFLAGS =
160 - LOADLIBES =
161 - SYSTYPE := $(shell uname)
162 - #ifeq ($(SYSTYPE), Linux)
163 -@@ -37,7 +37,7 @@ SYSTYPE := $(shell uname)
164 - all: trimpoly
165 -
166 - trimpoly: ./trimpoly.o color_c.o
167 -- ${LINKER} ${LDFLAGS} -o $@ ${filter-out %.a %.so, $^} ${LOADLIBES}
168 -+ ${CXX} ${LDFLAGS} -o $@ ${filter-out %.a %.so, $^} ${LOADLIBES}
169 -
170 - # target for removing all object files
171 -
172
173 diff --git a/sci-biology/seqclean/metadata.xml b/sci-biology/seqclean/metadata.xml
174 deleted file mode 100644
175 index 138cb7705..000000000
176 --- a/sci-biology/seqclean/metadata.xml
177 +++ /dev/null
178 @@ -1,12 +0,0 @@
179 -<?xml version="1.0" encoding="UTF-8"?>
180 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
181 -<pkgmetadata>
182 - <maintainer type="person">
183 - <email>mmokrejs@×××××××××××××××.cz</email>
184 - <name>Martin Mokrejs</name>
185 - </maintainer>
186 - <maintainer type="project">
187 - <email>sci-biology@g.o</email>
188 - <name>Gentoo Biology Project</name>
189 - </maintainer>
190 -</pkgmetadata>
191
192 diff --git a/sci-biology/seqclean/seqclean-110625.ebuild b/sci-biology/seqclean/seqclean-110625.ebuild
193 deleted file mode 100644
194 index f98fdf3b8..000000000
195 --- a/sci-biology/seqclean/seqclean-110625.ebuild
196 +++ /dev/null
197 @@ -1,54 +0,0 @@
198 -# Copyright 1999-2021 Gentoo Authors
199 -# Distributed under the terms of the GNU General Public License v2
200 -
201 -EAPI=7
202 -
203 -inherit toolchain-funcs
204 -
205 -DESCRIPTION="Trimpoly and mdust for trimming and validation of ESTs/DNA sequences"
206 -HOMEPAGE="https://web.archive.org/web/20140726030702/http://compbio.dfci.harvard.edu/tgi/software/"
207 -for i in seqcl_scripts mdust trimpoly; do
208 - SRC_URI="${SRC_URI} ftp://occams.dfci.harvard.edu/pub/bio/tgi/software/seqclean/${i}.tar.gz -> ${i}-${PV}.tar.gz"
209 -done
210 -
211 -LICENSE="Artistic"
212 -SLOT="0"
213 -KEYWORDS="~amd64 ~x86"
214 -
215 -DEPEND="
216 - dev-lang/perl
217 - sci-biology/ncbi-tools"
218 -RDEPEND="${DEPEND}"
219 -
220 -S=${WORKDIR}
221 -
222 -PATCHES=(
223 - "${FILESDIR}"/${P}-build.patch
224 -)
225 -
226 -src_prepare() {
227 - default
228 - # disable the necessity to install Mailer.pm with this tool
229 - einfo "Disabling mailer feature within seqclean"
230 - sed -i 's/use Mailer;/#use Mailer;/' "${S}"/"${PN}"/"${PN}" || die
231 - tc-export CC CXX
232 -}
233 -
234 -src_compile() {
235 - for i in mdust trimpoly; do
236 - LDLFAGS="${LDFLAGS}" \
237 - emake -C "${S}"/${i}
238 - done
239 -}
240 -
241 -src_install() {
242 - dobin seqclean/{seqclean,cln2qual,bin/seqclean.psx}
243 - newdoc seqclean/README README.seqclean
244 - for i in mdust trimpoly; do
245 - dobin ${i}/${i}
246 - done
247 -
248 - einfo "Optionally, you may want to download UniVec from NCBI if you do not have your own"
249 - einfo "fasta file with vector sequences you want to remove from sequencing"
250 - einfo "reads. See http://www.ncbi.nlm.nih.gov/VecScreen/UniVec.html"
251 -}