Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-biology/meme/files/, profiles/, sci-biology/meme/
Date: Fri, 09 Oct 2020 07:35:35
Message-Id: 1602228899.d2b309d1c7920bd32c4aa6d4f1c58c70a0201ce8.mgorny@gentoo
1 commit: d2b309d1c7920bd32c4aa6d4f1c58c70a0201ce8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 9 07:33:17 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 9 07:34:59 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b309d1
7
8 sci-biology/meme: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/735446
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/package.mask | 1 -
14 sci-biology/meme/Manifest | 1 -
15 .../files/meme-4.11.2_p2-fix-build-system.patch | 346 -------------------
16 sci-biology/meme/files/meme-4.11.2_p2-patch1.patch | 383 ---------------------
17 sci-biology/meme/files/meme-4.11.2_p2-patch2.patch | 54 ---
18 sci-biology/meme/meme-4.11.2_p2.ebuild | 109 ------
19 sci-biology/meme/metadata.xml | 8 -
20 7 files changed, 902 deletions(-)
21
22 diff --git a/profiles/package.mask b/profiles/package.mask
23 index 2845ca18263..0ba68128733 100644
24 --- a/profiles/package.mask
25 +++ b/profiles/package.mask
26 @@ -516,7 +516,6 @@ net-wireless/mousejack
27 net-wireless/python-wifi
28 sci-biology/amos
29 sci-biology/embassy-meme
30 -sci-biology/meme
31
32 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@×××××.com> (2020-09-01)
33 # Mismatched version (bug #695022). Masked to force upgrade to 2.0.4_pre20200306162733.
34
35 diff --git a/sci-biology/meme/Manifest b/sci-biology/meme/Manifest
36 deleted file mode 100644
37 index fd161837618..00000000000
38 --- a/sci-biology/meme/Manifest
39 +++ /dev/null
40 @@ -1 +0,0 @@
41 -DIST meme_4.11.2.tar.gz 18004930 BLAKE2B accacc7d2422ff6ea3411ff43ea664c94f5d6ba320e1cfec642a88cb6ea5303b2fe8c99a6c35d865c377560118402ab11f869930fd108f02eeaa06321db21655 SHA512 c97c3815e71e2fb5491548152f00688cdfbf4365f6027657e0ffc68e5d96cdd10a4708e0882ab7a5a61d78d93113c925cf5bb300fbe93fa4b2961becef497894
42
43 diff --git a/sci-biology/meme/files/meme-4.11.2_p2-fix-build-system.patch b/sci-biology/meme/files/meme-4.11.2_p2-fix-build-system.patch
44 deleted file mode 100644
45 index b548de5a39a..00000000000
46 --- a/sci-biology/meme/files/meme-4.11.2_p2-fix-build-system.patch
47 +++ /dev/null
48 @@ -1,346 +0,0 @@
49 -Fix and modernise build system
50 -* Remove all *FLAGS setting, just append to the user-supplied ones
51 -* Add --enable-doc and --enable-examples configure flags
52 -* Install documentation and examples in correct directories
53 -* Discover libxml2 and libxslt dependencies using PKG_CHECK_MODULES
54 -* Install python and perl modules correctly
55 -
56 ---- a/configure.ac
57 -+++ b/configure.ac
58 -@@ -76,61 +76,10 @@
59 - AM_CONDITIONAL(WANT_STRLCPY, test ["$have_strlcpy" = no])
60 -
61 - # Check for compiler-specific settings
62 --LARGE_FILE_SUPPORT=`getconf LFS_CFLAGS`
63 --if test "${GCC}" = "yes"; then
64 -- ac_cc_opt="-O3"
65 -- ac_cc_debug_opt="-O0"
66 -- ac_cc_warn="-Wall -Wno-unused"
67 -- ac_cc_debug="-ggdb"
68 -- # Check for OS X llvm (clang) compiler
69 -- if `gcc --version |grep llvm >/dev/null`; then
70 -- ac_cc_debug="-g"
71 -- fi
72 -- CFLAGS="-std="gnu89" $ac_cc_warn -DUNIX -D__USE_FIXED_PROTOTYPES__ $LARGE_FILE_SUPPORT"
73 --else
74 -- ac_cc_opt="-O"
75 -- ac_cc_debug_opt=""
76 -- ac_cc_warn=""
77 -- ac_cc_debug="-g"
78 -- CFLAGS="$ac_cc_warn -DUNIX -D__USE_FIXED_PROTOTYPES__ $LARGE_FILE_SUPPORT"
79 --fi
80 --
81 --# Set up default libxml2 settings
82 --# check for installed copy of libxml2
83 --build_libxml2="yes"
84 --if test -n "$XML2_CONFIG"; then
85 -- # Require at least version 2.6
86 -- required_libxml2_version="2006000"
87 -- LIBXML2_VERSION="`$XML2_CONFIG --version | \
88 -- awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`"
89 -- if test -n "$LIBXML2_VERSION" && \
90 -- test "$LIBXML2_VERSION" -ge "$required_libxml2_version"; then
91 -- build_libxml2="no"
92 -- LIBXML2_LIBS="`$XML2_CONFIG --libs`"
93 -- LIBXML2_CFLAGS="`$XML2_CONFIG --cflags`"
94 -- fi
95 --fi
96 --if test -z "$LIBXML2_LIBS"; then
97 -- AC_MSG_WARN([libxml2 library not found])
98 -- LIBXML2_LIBS="\${top_builddir}/src/libxml2/libxml2.la"
99 -- LIBXML2_CFLAGS="-I\${top_srcdir}/src/libxml2/include"
100 --fi
101 --
102 --# Set up default libxslt settings
103 --# check for installed copy of libxslt
104 --build_libxslt="yes"
105 --if test -n "$XSLT_CONFIG"; then
106 -- build_libxslt="no"
107 -- LIBXSLT_LIBS="`$XSLT_CONFIG --libs` -lexslt"
108 -- LIBXSLT_CFLAGS="`$XSLT_CONFIG --cflags`"
109 --fi
110 --if test -z "$LIBXSLT_LIBS"; then
111 -- AC_MSG_WARN([libxslt library not found])
112 -- LIBEXSLT_LIBS="\${top_builddir}/src/libexslt/libexslt.la"
113 -- LIBXSLT_LIBS="\${top_builddir}/src/libxslt/libxslt.la"
114 -- LIBEXSLT_CFLAGS="-I\${top_srcdir}/src/libexslt"
115 -- LIBXSLT_CFLAGS="-I\${top_srcdir}/src/"
116 --fi
117 -+AC_PROG_MKDIR_P
118 -+AC_SYS_LARGEFILE
119 -+CFLAGS="-std=gnu89 -Wall -Wno-unused ${CFLAGS}"
120 -+CPPFLAGS="-DUNIX -D__USE_FIXED_PROTOTYPES__ ${CPPFLAGS}"
121 -
122 - # who is installing
123 - USER=`whoami`
124 -@@ -279,6 +227,16 @@
125 - AM_CONDITIONAL(PARALLEL, test ["$parallel" != no])
126 - AM_CONDITIONAL(PARALLEL_IS_LAM, test -n ["$lammpi"])
127 -
128 -+dnl Documentation
129 -+AC_ARG_ENABLE([doc],
130 -+ AS_HELP_STRING([--enable-doc], [Enable installation of documentation]))
131 -+AM_CONDITIONAL([ENABLE_DOC], [test "x$enable_doc" = "xyes"])
132 -+
133 -+dnl Examples
134 -+AC_ARG_ENABLE([examples],
135 -+ AS_HELP_STRING([--enable-examples], [Enable installation of examples]))
136 -+AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"])
137 -+
138 - AC_ARG_ENABLE(
139 - webservice,
140 - [ --enable-webservice=deploy_dir Deploy the MEME service on an existing Opal 2.5+ installation],
141 -@@ -309,24 +267,35 @@
142 - AM_CONDITIONAL(WEBEITHER, test ["x$OPAL_DEPLOY" != "x" -o "x$OPAL_URL" != "xno"])
143 -
144 - # enable building of included libxml2
145 --AC_ARG_ENABLE(
146 -- build_libxml2,
147 -- [ --enable-build-libxml2 Build included version of libxml2. Default is to use pre-existing locally installed copy.],
148 -- build_libxml2=$enableval; \
149 -- LIBXML2_LIBS="\${top_builddir}/src/libxml2/libxml2.la"; \
150 -- LIBXML2_CFLAGS="-I\${top_srcdir}/src/libxml2/include" , )
151 --AM_CONDITIONAL(BUILD_LIBXML2, test ["$build_libxml2" = yes])
152 -+AC_ARG_ENABLE([build-libxml2],
153 -+ AS_HELP_STRING([--enable-build-libxml2], [Build included version of libxml2. Default is to use pre-existing locally installed copy.]))
154 -+AS_IF([test "x$enable_build_libxml2" = "xyes"], [
155 -+ dnl Enable building of bundled libs
156 -+ LIBXML2_CFLAGS="-I\${top_srcdir}/src/libxml2/include"
157 -+ LIBXML2_LIBS="\${top_builddir}/src/libxml2/libxml2.la"
158 -+ ],[
159 -+ dnl Use system libraries
160 -+ PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6])
161 -+])
162 -+AM_CONDITIONAL([BUILD_LIBXML2], [test "x$enable_build_libxml2" = "xyes"])
163 -+
164 -
165 - # enable building of included libxslt
166 --AC_ARG_ENABLE(
167 -- build_libxslt,
168 -- [ --enable-build-libxslt Build included version of libxslt. Default is to use pre-existing locally installed copy.],
169 -- build_libxslt=$enableval; \
170 -- LIBEXSLT_LIBS="\${top_builddir}/src/libexslt/libexslt.la"; \
171 -- LIBXSLT_LIBS="\${top_builddir}/src/libxslt/libxslt.la"; \
172 -- LIBEXSLT_CFLAGS="-I\${top_srcdir}/src/libexslt"; \
173 -- LIBXSLT_CFLAGS="-I\${top_srcdir}/src/" , )
174 --AM_CONDITIONAL(BUILD_LIBXSLT, test ["$build_libxslt" = yes])
175 -+AC_ARG_ENABLE([build-libxslt],
176 -+ AS_HELP_STRING([--enable-build-libxslt], [Build included version of libxslt. Default is to use pre-existing locally installed copy.]))
177 -+AS_IF([test "x$enable_build_libxslt" = "xyes"], [
178 -+ dnl Enable building of bundled libs
179 -+ LIBXSLT_CFLAGS="-I\${top_srcdir}/src/"
180 -+ LIBXSLT_LIBS="\${top_builddir}/src/libxslt/libxslt.la"
181 -+
182 -+ LIBEXSLT_CFLAGS="-I\${top_srcdir}/src/libexslt"
183 -+ LIBEXSLT_LIBS="\${top_builddir}/src/libexslt/libexslt.la"
184 -+ ],[
185 -+ dnl Use system libraries
186 -+ PKG_CHECK_MODULES([LIBXSLT], [libxslt])
187 -+ PKG_CHECK_MODULES([LIBEXSLT], [libexslt])
188 -+])
189 -+AM_CONDITIONAL([BUILD_LIBXSLT], [test "x$enable_build_libxslt" = "xyes"])
190 -
191 - # set website url
192 - AC_ARG_WITH(
193 -@@ -427,13 +396,13 @@
194 - [AC_PATH_PROG(PERL, perl)])
195 - AC_DEFINE_UNQUOTED(PERL, "$PERL", [Path to Perl] )
196 -
197 -+AC_ARG_WITH([perl-dir],
198 -+ AS_HELP_STRING([--with-perl-dir], [Perl modules directory]), [perlmoddir="$with_perl_dir"], [perlmoddir="lib/perl"])
199 -+AC_SUBST([perlmoddir])
200 -+
201 -+
202 - # set path to Python
203 --AC_ARG_WITH(
204 -- python,
205 -- [ --with-python=NAME Set path to Python. Default is to take from user's PATH.],
206 -- [PYTHON=$withval],
207 -- [AC_PATH_PROG(PYTHON, python)])
208 --AC_DEFINE_UNQUOTED(PYTHON, "$PYTHON", [Path to Python] )
209 -+AM_PATH_PYTHON
210 -
211 - # set path to convert utility
212 - AC_ARG_WITH(
213 -@@ -586,13 +555,15 @@
214 - Configuration parameters
215 - ========================
216 -
217 -- Install path: ${prefix}
218 -+ Install path (prefix): ${prefix}
219 - Install UID: ${MEME_USER}
220 - Version: ${VERSION}
221 -- C compiler: ${CC}
222 -- C compiler flags: ${CFLAGS}
223 -- Linker: ${LD}
224 -- Special Libs: ${LIBS}
225 -+ C compiler (CC): ${CC}
226 -+ C compiler flags (CFLAGS): ${CFLAGS}
227 -+ C preproc flags (CPPFLAGS): ${CPPFLAGS}
228 -+ Linker (LD): ${LD}
229 -+ Linker flags (LDFLAGS): ${LDFLAGS}
230 -+ Special Libs (LIBS): ${LIBS}
231 - MPICC ${MPICC}
232 - MPIRUN ${MPIRUN}
233 - MPI_CMD ${MPI_CMD}
234 ---- a/doc/css/Makefile.am
235 -+++ b/doc/css/Makefile.am
236 -@@ -5,7 +5,7 @@
237 -
238 - EXTRA_DIST = $(NORMAL_FILES)
239 -
240 --if ! WEBSITE
241 --doccssdir = $(prefix)/doc/css
242 -+if ENABLE_DOC
243 -+doccssdir = $(htmldir)/css
244 - doccss_DATA = $(NORMAL_FILES)
245 - endif
246 ---- a/doc/examples/compute_prior_dist_example_output_files/Makefile.am
247 -+++ b/doc/examples/compute_prior_dist_example_output_files/Makefile.am
248 -@@ -7,8 +7,8 @@
249 - EXAMPLES = \
250 - prior.dist.txt
251 -
252 --if ! WEBSITE
253 --exdir = $(prefix)/doc/examples/compute_prior_dist_example_output_files
254 -+if ENABLE_EXAMPLES
255 -+exdir = $(docdir)/examples/compute_prior_dist_example_output_files
256 - ex_DATA = $(EXAMPLES)
257 - endif
258 -
259 ---- a/doc/examples/Makefile.am
260 -+++ b/doc/examples/Makefile.am
261 -@@ -22,8 +22,8 @@
262 - # load the EXAMPLE_OUTPUT_FILES variable
263 - include examples.mk
264 -
265 --if ! WEBSITE
266 --exdir = $(prefix)/doc/examples
267 -+if ENABLE_EXAMPLES
268 -+exdir = $(docdir)/examples
269 - nobase_dist_ex_DATA = $(EXAMPLES) $(EXAMPLE_OUTPUT_FILES)
270 - endif
271 -
272 ---- a/doc/examples/sample_opal_scripts/Makefile.am
273 -+++ b/doc/examples/sample_opal_scripts/Makefile.am
274 -@@ -15,8 +15,8 @@
275 - MemeClient.pl \
276 - MemeClient.py
277 -
278 --if ! WEBSITE
279 --exdir = $(prefix)/doc/examples/sample_opal_scripts
280 -+if ENABLE_EXAMPLES
281 -+exdir = $(docdir)/examples/sample_opal_scripts
282 - ex_DATA = $(EXAMPLES)
283 - endif
284 -
285 ---- a/doc/images/Makefile.am
286 -+++ b/doc/images/Makefile.am
287 -@@ -30,8 +30,8 @@
288 -
289 - MEME_IMAGES = $(PROGRAM_ICONS) $(OTHER_IMAGES)
290 -
291 --if ! WEBSITE
292 --memeimgdir = $(prefix)/doc/images
293 -+if ENABLE_DOC
294 -+memeimgdir = $(htmldir)/images
295 - memeimg_DATA = $(MEME_IMAGES)
296 - endif
297 -
298 ---- a/doc/js/Makefile.am
299 -+++ b/doc/js/Makefile.am
300 -@@ -41,8 +41,8 @@
301 -
302 - BUILT_SOURCES = $(BUILT_FILES)
303 -
304 --if ! WEBSITE
305 --docjsdir = $(prefix)/doc/js
306 -+if ENABLE_DOC
307 -+docjsdir = $(htmldir)/js
308 - docjs_DATA = $(NORMAL_FILES) $(BUILT_FILES) $(SYMLINK_FILES)
309 - endif
310 -
311 ---- a/doc/Makefile.am
312 -+++ b/doc/Makefile.am
313 -@@ -129,8 +129,8 @@
314 - update-sequence-db.html \
315 - ismb94.pdf
316 -
317 --if ! WEBSITE
318 --memedocdir = $(prefix)/doc
319 -+if ENABLE_DOC
320 -+memedocdir = $(htmldir)
321 - memedoc_DATA = $(NORMAL_FILES)
322 - endif
323 -
324 ---- a/Makefile.am
325 -+++ b/Makefile.am
326 -@@ -52,7 +52,7 @@
327 - endif
328 -
329 - dbdir:
330 -- mkdir -p $(MEME_DB)
331 -+ $(MKDIR_P) $(DESTDIR)/$(MEME_DB)
332 -
333 - all-local:
334 - if WEBSITE
335 -@@ -64,8 +64,8 @@
336 - endif
337 -
338 - install-data-local:
339 -- mkdir -p $(MEME_LOGS)
340 -- chmod a+w $(MEME_LOGS)
341 -+ $(MKDIR_P) $(DESTDIR)/$(MEME_LOGS)
342 -+ chmod a+w $(DESTDIR)/$(MEME_LOGS)
343 -
344 - distdir = $(PACKAGE)_$(VERSION)
345 -
346 ---- a/scripts/Makefile.am
347 -+++ b/scripts/Makefile.am
348 -@@ -22,8 +22,8 @@
349 - -e 's%@WHICHJAVA@%$(JAVA)%' \
350 - -e 's%@WHICHCONVERT@%$(CONVERT)%' \
351 - -e 's%@WHICHGHOSTSCRIPT@%$(GHOSTSCRIPT)%' \
352 -- -e 's%@PERLLIBDIR@%$(libdir)/perl%' \
353 -- -e 's%@PYTHONLIBDIR@%$(libdir)/python%' \
354 -+ -e 's%@PERLLIBDIR@%$(perlmoddir)%' \
355 -+ -e 's%@PYTHONLIBDIR@%$(pythondir)%' \
356 - -e 's%@JAVALIBDIR@%$(libdir)/java%' \
357 - -e 's%@LAM_BIN@%$(LAMBIN)%' \
358 - -e 's%@APPCONFIGDIR@%$(sysconfdir)%' \
359 -@@ -62,7 +62,7 @@
360 - DiffXML.pm \
361 - HypergeometricDynProg.pm
362 -
363 --perlmoddir=$(libdir)/perl
364 -+perlmoddir = $(exec_prefix)/@perlmoddir@
365 - perlmod_SCRIPTS = \
366 - $(BUILT_PERL_MOD) \
367 - $(NORMAL_PERL_MOD)
368 -@@ -76,8 +76,7 @@
369 - hypergeometric.py \
370 - sequence.py
371 -
372 --pythonlibdir=$(libdir)/python
373 --pythonlib_SCRIPTS = \
374 -+python_PYTHON = \
375 - $(BUILT_PYTHON_LIB) \
376 - $(NORMAL_PYTHON_LIB)
377 -
378 ---- a/src/Makefile.am
379 -+++ b/src/Makefile.am
380 -@@ -19,7 +19,13 @@
381 - ARCHIVE_REVISION = $(shell cat ../ARCHIVE_REVISION)
382 - ARCHIVE_DATE = $(shell cat ../ARCHIVE_DATE)
383 -
384 --SUBDIRS = filters libxml2 libxslt libexslt . parallel
385 -+SUBDIRS = filters . parallel
386 -+if BUILD_LIBXML2
387 -+SUBDIRS += libxml2
388 -+endif
389 -+if BUILD_LIBXSLT
390 -+SUBDIRS += libxslt libexslt
391 -+endif
392 -
393 - BUILT_SOURCES = dir.h projrel.h
394 -
395
396 diff --git a/sci-biology/meme/files/meme-4.11.2_p2-patch1.patch b/sci-biology/meme/files/meme-4.11.2_p2-patch1.patch
397 deleted file mode 100644
398 index 30a182f8f43..00000000000
399 --- a/sci-biology/meme/files/meme-4.11.2_p2-patch1.patch
400 +++ /dev/null
401 @@ -1,383 +0,0 @@
402 ---- a/doc/alphabet-format.html
403 -+++ b/doc/alphabet-format.html
404 -@@ -233,7 +233,7 @@
405 - providing a reference on the meaning of the symbols used. If present, the
406 - symbol name must be the second field.</p>
407 - <p>The &quot;<span class="pdat">name</span>&quot; follows the rules of
408 -- <a href="qstr">quoted text</a>.</p>
409 -+ <a href="#qstr">quoted text</a>.</p>
410 - </div>
411 - <h5>color</h5>
412 - <div class="indent">
413 ---- a/doc/release-notes.html
414 -+++ b/doc/release-notes.html
415 -@@ -14,8 +14,26 @@
416 - <h2>Motif-based sequence analysis tools</h2>
417 - </div>
418 - <h2>MEME Suite Release Notes</h2>
419 -+ <hr>
420 -+ <b>MEME version 4.11.2 patch 1 -- June 16, 2016</b>
421 -+ <ul>
422 -+ <li>
423 -+ <b>Bug fixes</b>
424 -+ <ul>
425 -+ <li>
426 -+ Fixed bug in MCAST 4.11.2 that caused it to prematurely truncate
427 -+ reading the sequence file.
428 -+ </li>
429 -+ <li>
430 -+ Modified MEME to fall back to a simple Dirichlet prior when
431 -+ using DNA or a custom alphabet with a prior that requires
432 -+ a prior library, but no prior libray is specified.
433 -+ </li>
434 -+ </ul
435 -+ </li>
436 -+ </ul>
437 -+ <p>
438 - <hr>
439 -- <p>
440 - <b>MEME version 4.11.2 -- May 5 2016</b>
441 - </p>
442 - <ul>
443 ---- a/src/fasta-io.c
444 -+++ b/src/fasta-io.c
445 -@@ -14,6 +14,7 @@
446 - #include "alphabet.h"
447 - #include "fasta-io.h"
448 - #include "io.h"
449 -+#include "seq-reader-from-fasta.h"
450 - #include "prior-reader-from-psp.h"
451 - #include "seq.h"
452 -
453 -@@ -159,61 +160,6 @@
454 - }
455 -
456 - /****************************************************************************
457 -- * Read raw sequence until a new sequence is encountered or too many letters
458 -- * are read. The new sequence is appended to the end of the given
459 -- * sequence.
460 -- *
461 -- * Return: Was the sequence read completely?
462 -- ****************************************************************************/
463 --static BOOLEAN_T read_raw_sequence_from_reader(
464 -- DATA_BLOCK_READER_T *fasta_reader, // Sequence source
465 -- char* name, // Sequence ID (used in error messages).
466 -- ALPH_T* alph, // Alphabet in use
467 -- unsigned int offset, // Current position in raw_sequence.
468 -- unsigned int max_chars, // Maximum chars in raw_sequence.
469 -- char* raw_sequence // Pre-allocated sequence.
470 --) {
471 -- // tlb; change a_char to integer so it will compile on SGI
472 -- int a_char;
473 -- int start_update;
474 -- BOOLEAN_T return_value = TRUE;
475 --
476 -- // Start at the end of the given sequence.
477 -- assert(offset < max_chars);
478 --
479 -- DATA_BLOCK_T *seq_block = new_sequence_block(max_chars - offset);
480 -- return_value = !fasta_reader->get_next_block(fasta_reader, seq_block);
481 --
482 -- char *seq_buffer = get_sequence_from_data_block(seq_block);
483 -- size_t seq_buffer_size = get_num_read_into_data_block(seq_block);
484 -- int i;
485 -- for (i = 0; i < seq_buffer_size; ++i) {
486 -- a_char = seq_buffer[i];
487 -- // Skip non-alphabetic characters.
488 -- if (!isalnum(a_char) && a_char != '-' && a_char != '*' && a_char != '.') {
489 -- if ((a_char != ' ') && (a_char != '\t') && (a_char != '\n') && (a_char != '\r')) {
490 -- fprintf(stderr, "Warning: Skipping character %c in sequence %s.\n",
491 -- a_char, name);
492 -- }
493 -- } else {
494 -- // skip check if unknown alph
495 -- if (alph != NULL && !alph_is_known(alph, a_char)) {
496 -- fprintf(stderr, "Warning: Converting illegal character %c to %c ",
497 -- a_char, alph_wildcard(alph));
498 -- fprintf(stderr, "in sequence %s.\n", name);
499 -- a_char = alph_wildcard(alph);
500 -- }
501 -- raw_sequence[offset] = (char) a_char;
502 -- ++offset;
503 -- }
504 -- }
505 --
506 -- raw_sequence[offset] = '\0';
507 -- free_data_block(seq_block);
508 -- return(return_value);
509 --}
510 --
511 --/****************************************************************************
512 - * Read one sequence from a file in Fasta format.
513 - *
514 - * Return: Was a sequence successfully read?
515 -@@ -320,44 +266,6 @@
516 - }
517 -
518 - /****************************************************************************
519 -- * Read up to max_chars letters of one sequence from a DATA_BLOCK_T readder
520 -- * and copy them in to the raw sequence in the SEQ_T object starting at the
521 -- * given buffer offset.
522 -- ****************************************************************************/
523 --void read_one_fasta_segment_from_reader(
524 -- DATA_BLOCK_READER_T *fasta_reader,
525 -- size_t max_size,
526 -- size_t buffer_offset,
527 -- SEQ_T *sequence
528 --) {
529 --
530 -- assert(sequence != NULL);
531 -- assert(get_seq_length(sequence) <= max_size);
532 --
533 -- // Get the raw sequence buffer from the SEQ_T
534 -- char *raw_sequence = get_raw_sequence(sequence);
535 -- if (raw_sequence == NULL) {
536 -- // Allocate space for raw sequence if not done yet.
537 -- raw_sequence = mm_malloc(sizeof(char) * max_size + 1);
538 -- raw_sequence[0] = 0;
539 -- }
540 --
541 -- // Read a block of sequence charaters into the
542 -- // raw sequence buffer for the SEQ_T.
543 -- char *name = get_seq_name(sequence);
544 -- BOOLEAN_T is_complete = read_raw_sequence_from_reader(
545 -- fasta_reader,
546 -- name,
547 -- NULL, //FIXME this is dodgy, need a proper way of getting the alphabet. The fasta_reader has it but it is not accessable!
548 -- buffer_offset,
549 -- max_size,
550 -- raw_sequence
551 -- );
552 -- set_raw_sequence(raw_sequence, is_complete, sequence);
553 --
554 --}
555 --
556 --/****************************************************************************
557 - * Read all the sequences from a FASTA file at once.
558 - Multiple files can be appended by calling this more than once.
559 - ****************************************************************************/
560 ---- a/src/fasta-io.h
561 -+++ b/src/fasta-io.h
562 -@@ -43,19 +43,6 @@
563 - );
564 -
565 - /****************************************************************************
566 -- * Read up to max_chars letters of one sequence from a DATA_BLOCK_T readder
567 -- * and copy them in to the raw sequence in the SEQ_T object starting at the
568 -- * given buffer offset.
569 -- ****************************************************************************/
570 --void read_one_fasta_segment_from_reader(
571 -- DATA_BLOCK_READER_T *fasta_reader,
572 -- size_t max_size,
573 -- size_t buffer_offset,
574 -- SEQ_T* sequence
575 --);
576 --
577 --
578 --/****************************************************************************
579 - * Read all the sequences from a file in Fasta format.
580 - ****************************************************************************/
581 - void read_many_fastas
582 ---- a/src/init.c
583 -+++ b/src/init.c
584 -@@ -767,10 +767,16 @@
585 - if (alph_is_builtin_protein(alph)) { // default mixture prior for proteins
586 - plib_name = make_path_to_file(get_meme_etc_dir(), PROTEIN_PLIB);
587 - } else {
588 -- fprintf(stderr, "The prior library must be specified for DNA or custom "
589 -- "alphabets when specifiying a prior type of 'dmix', 'mega' "
590 -- "or 'megap'.");
591 -- exit(1);
592 -+ fprintf(
593 -+ stderr,
594 -+ "WARNING: When using DNA or a custom alphabet, "
595 -+ "and specifiying a prior type of\n"
596 -+ "'dmix', 'mega' or 'megap', a prior library must be provided.\n"
597 -+ "No prior library was provided, so a simple Dirichlet prior will be used.\n"
598 -+ );
599 -+ prior = "dirichlet";
600 -+ ptype = Dirichlet;
601 -+ if (beta <= 0) beta = 0.01; // default b = 0.01 for simple Dirichlet
602 - }
603 - }
604 - }
605 ---- a/src/seq-reader-from-fasta.c
606 -+++ b/src/seq-reader-from-fasta.c
607 -@@ -639,11 +639,140 @@
608 - return fasta_reader->current_position;
609 - }
610 -
611 -+
612 -+/****************************************************************************
613 -+ * Read up to max_chars letters of one sequence from a DATA_BLOCK_T readder
614 -+ * and copy them in to the raw sequence in the SEQ_T object starting at the
615 -+ * given buffer offset.
616 -+ ****************************************************************************/
617 -+void read_one_fasta_segment_from_reader(
618 -+ DATA_BLOCK_READER_T *fasta_reader,
619 -+ size_t max_size,
620 -+ size_t offset,
621 -+ SEQ_T *sequence
622 -+) {
623 -+
624 -+
625 -+ assert(sequence != NULL);
626 -+ assert(offset < max_size);
627 -+
628 -+ // Get the raw sequence buffer from the SEQ_T
629 -+ char *raw_sequence = get_raw_sequence(sequence);
630 -+ if (raw_sequence == NULL) {
631 -+ // Allocate space for raw sequence if not done yet.
632 -+ raw_sequence = mm_malloc(sizeof(char) * max_size + 1);
633 -+ raw_sequence[0] = 0;
634 -+ }
635 -+
636 -+ // Read a block of sequence charaters into the
637 -+ // raw sequence buffer for the SEQ_T, starting at offset.
638 -+ BOOLEAN_T is_complete = read_raw_sequence_from_reader(
639 -+ fasta_reader,
640 -+ max_size - offset,
641 -+ raw_sequence + offset
642 -+ );
643 -+ set_raw_sequence(raw_sequence, is_complete, sequence);
644 -+}
645 -+
646 -+/****************************************************************************
647 -+ * Read raw sequence until a new sequence is encountered or too many letters
648 -+ * are read.
649 -+ *
650 -+ * Return: Was the sequence read completely?
651 -+ ****************************************************************************/
652 -+BOOLEAN_T read_raw_sequence_from_reader(
653 -+ DATA_BLOCK_READER_T *reader, // Sequence source
654 -+ unsigned int max_chars, // Maximum chars in raw_sequence.
655 -+ char* raw_sequence // Pre-allocated sequence buffer.
656 -+) {
657 -+
658 -+ SEQ_READER_FROM_FASTA_T *fasta_reader
659 -+ = (SEQ_READER_FROM_FASTA_T *) get_data_block_reader_data(reader);
660 -+
661 -+ // Read sequence into temp. buffer from the sequence file.
662 -+ char buffer[max_chars];
663 -+ long start_file_pos = ftell(fasta_reader->fasta_file);
664 -+ size_t seq_index = 0;
665 -+ size_t total_read = 0;
666 -+ while (seq_index < max_chars) {
667 -+
668 -+ size_t num_char_read = fread(
669 -+ buffer,
670 -+ sizeof(char),
671 -+ max_chars - seq_index,
672 -+ fasta_reader->fasta_file
673 -+ );
674 -+ fasta_reader->current_position += num_char_read;
675 -+ total_read += num_char_read;
676 -+
677 -+ if (feof(fasta_reader->fasta_file)) {
678 -+ fasta_reader->at_end_of_file = TRUE;
679 -+ }
680 -+ else if (num_char_read < (max_chars - seq_index)) {
681 -+ die(
682 -+ "Error while reading sequence from file:%s.\nError message: %s\n",
683 -+ fasta_reader->filename,
684 -+ strerror(ferror(fasta_reader->fasta_file))
685 -+ );
686 -+ }
687 -+
688 -+ size_t i;
689 -+ for(i = 0; i < num_char_read; ++i) {
690 -+ char c = buffer[i];
691 -+ assert(c != 0);
692 -+ if (isspace(c)) {
693 -+ // Skip over white space
694 -+ fasta_reader->at_start_of_line = (c == '\n');
695 -+ }
696 -+ else if (c == '>' && fasta_reader->at_start_of_line == TRUE) {
697 -+ // We found the start of a new sequence while trying
698 -+ // to fill the buffer. Leave the buffer incomplete.
699 -+ // and wind back the file
700 -+ fseek(fasta_reader->fasta_file, start_file_pos + i - 1, SEEK_SET);
701 -+ fasta_reader->current_position = start_file_pos + i - 1;
702 -+ fasta_reader->at_end_of_seq = TRUE;
703 -+ fasta_reader->at_start_of_line = FALSE;
704 -+ fasta_reader->at_end_of_file = FALSE;
705 -+ break;
706 -+ }
707 -+ else {
708 -+ fasta_reader->at_start_of_line = FALSE;
709 -+ // Check that character is legal in alphabet.
710 -+ // If not, replace with wild card character.
711 -+ if (alph_is_known(fasta_reader->alphabet, c)) {
712 -+ raw_sequence[seq_index] = c;
713 -+ }
714 -+ else {
715 -+ raw_sequence[seq_index] = alph_wildcard(fasta_reader->alphabet);
716 -+ fprintf(
717 -+ stderr,
718 -+ "Warning: %c is not a valid character in %s alphabet.\n"
719 -+ " Converting %c to %c.\n",
720 -+ c,
721 -+ alph_name(fasta_reader->alphabet),
722 -+ c,
723 -+ raw_sequence[i]
724 -+ );
725 -+ }
726 -+ ++seq_index;
727 -+ }
728 -+ }
729 -+ if (fasta_reader->at_end_of_seq | fasta_reader->at_end_of_file) {
730 -+ break;
731 -+ }
732 -+ }
733 -+
734 -+ raw_sequence[seq_index] = '\0';
735 -+ return(fasta_reader->at_end_of_seq | fasta_reader->at_end_of_file);
736 -+}
737 -+
738 - /******************************************************************************
739 -- * Fills in the next data block for the sequence.
740 -- * During the first call for the sequence it fills in the full data block.
741 -- * On successive calls, shifts the sequence in the block down one position
742 -- * and reads one more character.
743 -+ * Populates the data block for the with the next block of sequence.
744 -+ *
745 -+ * During the first call for the sequence it fills in a buffer from a file,
746 -+ * The sequence pointer in the data block is set to point at the start of the buffer.
747 -+ * On successive calls, the sequence pointer in the block is shifted down one position
748 -+ * in the buffer. When the end of the buffer is reached, it is filled again from the file.
749 - *
750 - * Returns TRUE if it was able to completely fill the block, FALSE if
751 - * the next sequence or EOF was reached before the block was filled.
752 ---- a/src/seq-reader-from-fasta.h
753 -+++ b/src/seq-reader-from-fasta.h
754 -@@ -37,5 +37,30 @@
755 - int * end_ptr // end position of sequence (chr:\d+-(\d+))
756 - );
757 -
758 -+/****************************************************************************
759 -+ * Read raw sequence until a new sequence is encountered or too many letters
760 -+ * are read.
761 -+ *
762 -+ * Return: Was the sequence read completely?
763 -+ ****************************************************************************/
764 -+BOOLEAN_T read_raw_sequence_from_reader(
765 -+ DATA_BLOCK_READER_T *fasta_reader, // Sequence source
766 -+ unsigned int max_chars, // Maximum chars in raw_sequence.
767 -+ char* raw_sequence // Pre-allocated sequence.
768 -+);
769 -+
770 -+/****************************************************************************
771 -+ * Read up to max_chars letters of one sequence from a DATA_BLOCK_T readder
772 -+ * and copy them in to the raw sequence in the SEQ_T object starting at the
773 -+ * given buffer offset.
774 -+ ****************************************************************************/
775 -+void read_one_fasta_segment_from_reader(
776 -+ DATA_BLOCK_READER_T *reader,
777 -+ size_t max_size,
778 -+ size_t offset,
779 -+ SEQ_T *sequence
780 -+);
781 -+
782 -+
783 - size_t get_current_pos_from_seq_reader_from_fasta(DATA_BLOCK_READER_T *reader);
784 - #endif
785
786 diff --git a/sci-biology/meme/files/meme-4.11.2_p2-patch2.patch b/sci-biology/meme/files/meme-4.11.2_p2-patch2.patch
787 deleted file mode 100644
788 index 498d1df7b66..00000000000
789 --- a/sci-biology/meme/files/meme-4.11.2_p2-patch2.patch
790 +++ /dev/null
791 @@ -1,54 +0,0 @@
792 ---- a/doc/release-notes.html
793 -+++ b/doc/release-notes.html
794 -@@ -15,6 +15,21 @@
795 - </div>
796 - <h2>MEME Suite Release Notes</h2>
797 - <hr>
798 -+ <b>MEME version 4.11.2 patch 2 -- October 24, 2016</b>
799 -+ <ul>
800 -+ <li>
801 -+ <b>Bug fixes</b>
802 -+ <ul>
803 -+ <li>
804 -+ Fixed bug in handling of RNA-like custom alphabets.
805 -+ </li>
806 -+ <li>
807 -+ Fixed bug in MAST -comp option.
808 -+ </li>
809 -+ </ul
810 -+ </li>
811 -+ </ul>
812 -+ <hr>
813 - <b>MEME version 4.11.2 patch 1 -- June 16, 2016</b>
814 - <ul>
815 - <li>
816 ---- a/src/alph-in.c
817 -+++ b/src/alph-in.c
818 -@@ -1044,7 +1044,7 @@
819 - lookup[0] = sym->complement;
820 - comp2 = (ALPH_SYM_T*)rbtree_get(reader->merged, lookup);
821 - }
822 -- if (comp1 != comp2) {
823 -+ if (comp1 && (comp1 != comp2)) {
824 - add_msg(reader, parmsg_create(SEVERITY_ERROR, -1, -1, -1,
825 - "not like %s alphabet as %c complement rules are incorrect",
826 - ext_name, req_syms[i]));
827 ---- a/src/mast-util.c
828 -+++ b/src/mast-util.c
829 -@@ -740,14 +740,14 @@
830 -
831 - // create the frequency array
832 - alph = xlate ? xlate_dest_alph(xlate) : alph;
833 -- freq = allocate_array(alph_size_core(alph));
834 -+ freq = allocate_array(alph_size_full(alph));
835 - init_array(0, freq);
836 -
837 - // count the number of letters of each type
838 - if (xlate) {
839 - for (n=0; sequence[n]; n++) {
840 - i = xlate_index(xlate, false, sequence+n);
841 -- if (i > 0 && i < alph_size_core(alph)) incr_array_item(i, 1, freq);
842 -+ if (i > 0 && i < alph_size_full(alph)) incr_array_item(i, 1, freq);
843 - }
844 - } else {
845 - for (n=0; sequence[n]; n++) {
846
847 diff --git a/sci-biology/meme/meme-4.11.2_p2.ebuild b/sci-biology/meme/meme-4.11.2_p2.ebuild
848 deleted file mode 100644
849 index 0f7d25b4336..00000000000
850 --- a/sci-biology/meme/meme-4.11.2_p2.ebuild
851 +++ /dev/null
852 @@ -1,109 +0,0 @@
853 -# Copyright 1999-2017 Gentoo Foundation
854 -# Distributed under the terms of the GNU General Public License v2
855 -
856 -EAPI=6
857 -
858 -PYTHON_COMPAT=( python2_7 )
859 -
860 -inherit autotools perl-functions python-single-r1 versionator
861 -
862 -MY_PV=$(get_version_component_range 1-3)
863 -MY_P=${PN}_${MY_PV}
864 -
865 -DESCRIPTION="The MEME/MAST system - Motif discovery and search"
866 -HOMEPAGE="http://meme-suite.org/tools/meme"
867 -SRC_URI="http://meme-suite.org/meme-software/${MY_PV}/${MY_P}.tar.gz"
868 -
869 -LICENSE="meme"
870 -SLOT="0"
871 -KEYWORDS="~amd64 ~x86"
872 -IUSE="debug doc examples mpi"
873 -
874 -RDEPEND="
875 - ${PYTHON_DEPS}
876 - app-shells/tcsh
877 - dev-libs/libxml2:2
878 - dev-libs/libxslt
879 - sys-libs/zlib
880 - app-text/ghostscript-gpl
881 - media-gfx/imagemagick
882 - dev-lang/perl:=
883 - dev-perl/HTML-Parser
884 - dev-perl/HTML-Template
885 - dev-perl/Log-Log4perl
886 - dev-perl/Math-CDF
887 - dev-perl/XML-Compile-SOAP
888 - dev-perl/XML-Compile-WSDL11
889 - dev-perl/XML-Parser
890 - dev-perl/XML-Simple
891 - virtual/perl-Data-Dumper
892 - virtual/perl-Exporter
893 - virtual/perl-File-Path
894 - virtual/perl-File-Spec
895 - virtual/perl-File-Temp
896 - virtual/perl-Getopt-Long
897 - virtual/perl-Scalar-List-Utils
898 - virtual/perl-Time-HiRes
899 - mpi? ( virtual/mpi )"
900 -DEPEND="${RDEPEND}"
901 -REQUIRED_USE="${PYTHON_REQUIRED_USE}"
902 -
903 -S="${WORKDIR}/${MY_P}"
904 -PATCHES=(
905 - "${FILESDIR}"/${PN}-4.11.2_p2-patch1.patch
906 - "${FILESDIR}"/${PN}-4.11.2_p2-patch2.patch
907 - "${FILESDIR}"/${PN}-4.11.2_p2-fix-build-system.patch
908 -)
909 -
910 -pkg_setup() {
911 - python-single-r1_pkg_setup
912 - perl_set_version
913 -}
914 -
915 -src_prepare() {
916 - default
917 - eautoreconf
918 -}
919 -
920 -src_configure() {
921 - econf \
922 - --sysconfdir="${EPREFIX}"/etc/${PN} \
923 - --with-logs="${EPREFIX}"/var/log/${PN} \
924 - --with-perl=perl \
925 - --with-convert=convert \
926 - --with-gs=gs \
927 - --disable-build-libxml2 \
928 - --disable-build-libxslt \
929 - $(use_enable debug) \
930 - $(use_enable doc) \
931 - $(use_enable examples) \
932 - $(use_enable !mpi serial) \
933 - --with-perl-dir="${VENDOR_LIB#${EPREFIX}/usr}" \
934 - PYTHON="${EPYTHON}"
935 -
936 - # delete bundled libs, just to be sure. These need
937 - # to be removed after econf, else AC_OUTPUT will fail
938 - rm -r src/{libxml2,lib{,e}xslt} || die
939 -}
940 -
941 -src_test() {
942 - # bug #297070
943 - emake -j1 test
944 -}
945 -
946 -src_install() {
947 - default
948 - docompress -x /usr/share/doc/${PF}/examples
949 -
950 - # prefix all binaries with 'meme-', in order
951 - # to prevent collisions, bug 455010
952 - cd "${ED%/}"/usr/bin/ || die
953 - local i
954 - for i in *; do
955 - if [[ $i != meme-* ]]; then
956 - mv {,meme-}"${i}" || die
957 - fi
958 - done
959 -
960 - keepdir /var/log/meme
961 -}
962
963 diff --git a/sci-biology/meme/metadata.xml b/sci-biology/meme/metadata.xml
964 deleted file mode 100644
965 index 959160fe46b..00000000000
966 --- a/sci-biology/meme/metadata.xml
967 +++ /dev/null
968 @@ -1,8 +0,0 @@
969 -<?xml version="1.0" encoding="UTF-8"?>
970 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
971 -<pkgmetadata>
972 - <maintainer type="project">
973 - <email>sci-biology@g.o</email>
974 - <name>Gentoo Biology Project</name>
975 - </maintainer>
976 -</pkgmetadata>