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/vienna-rna/files/, profiles/, sci-biology/vienna-rna/
Date: Fri, 09 Oct 2020 07:23:48
Message-Id: 1602228157.79d0df0bd01844a81e723571b5ea2f52ac32dafa.mgorny@gentoo
1 commit: 79d0df0bd01844a81e723571b5ea2f52ac32dafa
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 9 07:22:37 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 9 07:22:37 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d0df0b
7
8 sci-biology/vienna-rna: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/735438
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/package.mask | 2 -
14 sci-biology/vienna-rna/Manifest | 1 -
15 .../files/vienna-rna-2.1.1-impl-decl.patch | 15 ---
16 .../vienna-rna/files/vienna-rna-2.1.1-prll.patch | 30 ------
17 .../vienna-rna/files/vienna-rna-2.1.8-bindir.patch | 10 --
18 sci-biology/vienna-rna/metadata.xml | 25 -----
19 sci-biology/vienna-rna/vienna-rna-2.1.8.ebuild | 112 ---------------------
20 7 files changed, 195 deletions(-)
21
22 diff --git a/profiles/package.mask b/profiles/package.mask
23 index eed0607c6c6..e017a399cbf 100644
24 --- a/profiles/package.mask
25 +++ b/profiles/package.mask
26 @@ -529,9 +529,7 @@ x11-misc/dsx
27 # to build anyway.
28 #
29 # net-analyzer/mk-livestatus: py3 bug #735394, build failure bug #705430
30 -# sci-biology/vienna-rna: py3 bug #735438, build failure bug #707158
31 net-analyzer/mk-livestatus
32 -sci-biology/vienna-rna
33
34 # Arfrever Frehtes Taifersar Arahesis <arfrever.fta@×××××.com> (2020-09-01)
35 # Mismatched version (bug #695022). Masked to force upgrade to 2.0.4_pre20200306162733.
36
37 diff --git a/sci-biology/vienna-rna/Manifest b/sci-biology/vienna-rna/Manifest
38 deleted file mode 100644
39 index 8acf7884e03..00000000000
40 --- a/sci-biology/vienna-rna/Manifest
41 +++ /dev/null
42 @@ -1 +0,0 @@
43 -DIST ViennaRNA-2.1.8.tar.gz 5464683 BLAKE2B ed2086461b37c90de11638852680507c823495abacec1e797c589c22d07dc48b4833d8d6916e5c95083bb9b970c659bbfb14ca45e155486333a915593c4caf01 SHA512 84f9db1247ff7a77aa6550b6285d9bed31fa6ce179aab26eef798c65a07f5cbd89f944630dfa5d29a43401b12a439324b57ee69047a3985e3a4f1e88dffca60e
44
45 diff --git a/sci-biology/vienna-rna/files/vienna-rna-2.1.1-impl-decl.patch b/sci-biology/vienna-rna/files/vienna-rna-2.1.1-impl-decl.patch
46 deleted file mode 100644
47 index de457f318e8..00000000000
48 --- a/sci-biology/vienna-rna/files/vienna-rna-2.1.1-impl-decl.patch
49 +++ /dev/null
50 @@ -1,15 +0,0 @@
51 - Readseq/readseq.c | 1 +
52 - 1 file changed, 1 insertion(+)
53 -
54 -diff --git a/Readseq/readseq.c b/Readseq/readseq.c
55 -index 8af7b39..56a25ae 100644
56 ---- a/Readseq/readseq.c
57 -+++ b/Readseq/readseq.c
58 -@@ -171,6 +171,7 @@ link -w -o readseq -t MPST -c 'MPS '
59 - #include <stdio.h>
60 - #include <string.h>
61 - #include <ctype.h>
62 -+#include <stdlib.h>
63 -
64 - #include "ureadseq.h"
65 -
66
67 diff --git a/sci-biology/vienna-rna/files/vienna-rna-2.1.1-prll.patch b/sci-biology/vienna-rna/files/vienna-rna-2.1.1-prll.patch
68 deleted file mode 100644
69 index ee4aef5c330..00000000000
70 --- a/sci-biology/vienna-rna/files/vienna-rna-2.1.1-prll.patch
71 +++ /dev/null
72 @@ -1,30 +0,0 @@
73 - Readseq/Makefile | 6 +++---
74 - 1 file changed, 3 insertions(+), 3 deletions(-)
75 -
76 -diff --git a/Readseq/Makefile b/Readseq/Makefile
77 -index f073aaa..05f2edd 100644
78 ---- a/Readseq/Makefile
79 -+++ b/Readseq/Makefile
80 -@@ -6,11 +6,11 @@
81 - #
82 -
83 - # pick an ANSI C compiler (the default Sun CC is not ANSI)
84 --CC=gcc # Gnu C Compiler
85 -+CC?=gcc # Gnu C Compiler
86 - #CC=cc # SGI Irix
87 - #CC=vcc # some DEC Ultrix
88 -
89 --CFLAGS=
90 -+CFLAGS?=
91 - #CFLAGS= -DSMALLCHECKSUM # if you prefer to use a GCG-standard 13 bit checksum
92 - # instead of a full 32 bit checksum. This may enhance compatibility w/ GCG software
93 -
94 -@@ -40,7 +40,7 @@ all: build test
95 -
96 - build: $(SOURCES)
97 - @echo "Compiling readseq..."
98 -- $(CC) $(LDFLAGS) $(CFLAGS) -o readseq readseq.c ureadseq.c
99 -+ $(CC) $(LDFLAGS) $(CFLAGS) -o readseq readseq.c ureadseq.c ureadasn.c
100 -
101 - # if using NCBI, uncomment these lines in place of build: above
102 - #build: $(SOURCES)
103
104 diff --git a/sci-biology/vienna-rna/files/vienna-rna-2.1.8-bindir.patch b/sci-biology/vienna-rna/files/vienna-rna-2.1.8-bindir.patch
105 deleted file mode 100644
106 index e54dff95b48..00000000000
107 --- a/sci-biology/vienna-rna/files/vienna-rna-2.1.8-bindir.patch
108 +++ /dev/null
109 @@ -1,10 +0,0 @@
110 -diff --git a/Utils/Makefile.am b/Utils/Makefile.am
111 -index f42ebf4..d84a0f1 100644
112 ---- a/Utils/Makefile.am
113 -+++ b/Utils/Makefile.am
114 -@@ -1,4 +1,4 @@
115 --pkgbindir = $(pkgdatadir)/bin
116 -+pkgbindir = $(prefix)/bin
117 - pkgbin_PROGRAMS = b2ct popt ct2db
118 -
119 - pscript = b2mt.pl ct2b.pl dpzoom.pl mountain.pl relplot.pl rotate_ss.pl cmount.pl colorrna.pl coloraln.pl refold.pl switch.pl
120
121 diff --git a/sci-biology/vienna-rna/metadata.xml b/sci-biology/vienna-rna/metadata.xml
122 deleted file mode 100644
123 index bbc3d41fb4a..00000000000
124 --- a/sci-biology/vienna-rna/metadata.xml
125 +++ /dev/null
126 @@ -1,25 +0,0 @@
127 -<?xml version="1.0" encoding="UTF-8"?>
128 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
129 -<pkgmetadata>
130 - <maintainer type="project">
131 - <email>sci-biology@g.o</email>
132 - <name>Gentoo Biology Project</name>
133 - </maintainer>
134 - <longdescription>
135 - The Vienna RNA Package consists of a C code library and several
136 - stand-alone programs for the prediction and comparison of RNA secondary
137 - structures. RNA secondary structure prediction through energy
138 - minimization is the most used function in the package. We provide three
139 - kinds of dynamic programming algorithms for structure prediction: the
140 - minimum free energy algorithm of (Zuker and Stiegler 1981) which yields a
141 - single optimal structure, the partition function algorithm of
142 - (McCaskill 1990) which calculates base pair probabilities in the
143 - thermodynamic ensemble, and the suboptimal folding algorithm of
144 - (Wuchty et.al 1999) which generates all suboptimal structures within a
145 - given energy range of the optimal energy. For secondary structure
146 - comparison, the package contains several measures of distance
147 - (dissimilarities) using either string alignment or tree-editing
148 - (Shapiro and Zhang 1990). Finally, we provide an algorithm to design
149 - sequences with a predefined structure (inverse folding).
150 - </longdescription>
151 -</pkgmetadata>
152
153 diff --git a/sci-biology/vienna-rna/vienna-rna-2.1.8.ebuild b/sci-biology/vienna-rna/vienna-rna-2.1.8.ebuild
154 deleted file mode 100644
155 index 7664f6d3dc6..00000000000
156 --- a/sci-biology/vienna-rna/vienna-rna-2.1.8.ebuild
157 +++ /dev/null
158 @@ -1,112 +0,0 @@
159 -# Copyright 1999-2017 Gentoo Foundation
160 -# Distributed under the terms of the GNU General Public License v2
161 -
162 -EAPI=5
163 -
164 -PYTHON_COMPAT=( python2_7 )
165 -DISTUTILS_OPTIONAL=true
166 -AUTOTOOLS_AUTORECONF=true
167 -AUTOTOOLS_IN_SOURCE_BUILD=1
168 -
169 -inherit autotools-utils distutils-r1 multilib perl-module toolchain-funcs
170 -
171 -DESCRIPTION="RNA secondary structure prediction and comparison"
172 -HOMEPAGE="http://www.tbi.univie.ac.at/~ivo/RNA/"
173 -SRC_URI="http://www.tbi.univie.ac.at/RNA/packages/source/ViennaRNA-${PV}.tar.gz"
174 -
175 -SLOT="0"
176 -LICENSE="vienna-rna"
177 -KEYWORDS="~amd64 ~ppc ~x86"
178 -IUSE="doc openmp python static-libs"
179 -
180 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
181 -
182 -RDEPEND="
183 - dev-lang/perl
184 - media-libs/gd
185 - doc? ( dev-texlive/texlive-latex )
186 - python? ( ${PYTHON_DEPS} )"
187 -DEPEND="${RDEPEND}
188 - python? ( dev-lang/swig:0 )"
189 -
190 -S="${WORKDIR}/ViennaRNA-${PV}"
191 -
192 -PATCHES=(
193 - "${FILESDIR}"/${P}-bindir.patch
194 - "${FILESDIR}"/${PN}-2.1.1-prll.patch
195 - "${FILESDIR}"/${PN}-2.1.1-impl-decl.patch
196 -)
197 -
198 -src_prepare() {
199 - sed -i 's/ getline/ v_getline/' Readseq/ureadseq.c || die
200 - sed -i 's/@PerlCmd@ Makefile.PL/& INSTALLDIRS=vendor/' interfaces/Perl/Makefile.am || die
201 -
202 - autotools-utils_src_prepare
203 -
204 - if use python; then
205 - cd interfaces/Python || die
206 - local PATCHES=()
207 - distutils-r1_src_prepare
208 - fi
209 -}
210 -
211 -src_configure() {
212 - local myeconfargs=(
213 - --with-cluster
214 - $(use_enable openmp)
215 - )
216 -
217 - use doc || \
218 - myeconfargs+=(
219 - --without-doc-pdf
220 - --without-doc-html
221 - --without-doc
222 - )
223 - autotools-utils_src_configure
224 - sed \
225 - -e "s:CC=gcc:CC=$(tc-getCC):" \
226 - -e "s:^CFLAGS=:CFLAGS=${CFLAGS}:" \
227 - -i Readseq/Makefile || die
228 - if use python; then
229 - cd interfaces/Python || die
230 - distutils-r1_src_configure
231 - fi
232 -}
233 -
234 -src_compile() {
235 - autotools-utils_src_compile
236 - autotools-utils_src_compile -C Readseq build CC=$(tc-getCC)
237 -
238 - # TODO: Add (optional?) support for the NCBI toolkit.
239 - if use python; then
240 - cd interfaces/Python || die
241 - emake RNA_wrap.c
242 - distutils-r1_src_compile
243 - fi
244 -}
245 -
246 -src_test() {
247 - autotools-utils_src_compile -C interfaces/Perl check
248 - use python && autotools-utils_src_compile -C interfaces/Python check
249 - autotools-utils_src_compile -C Readseq test
250 -}
251 -
252 -src_install() {
253 - autotools-utils_src_install
254 -
255 - if ! use static-libs; then
256 - rm -f "${ED}"/usr/$(get_libdir)/*.a || die
257 - fi
258 -
259 - newbin Readseq/readseq readseq-vienna
260 - dodoc Readseq/Readseq.help
261 - newdoc Readseq/Readme README.readseq
262 - newdoc Readseq/Formats Formats.readseq
263 -
264 - # remove perlocal.pod to avoid file collisions (see #240358)
265 - perl_delete_localpod || die "Failed to remove perlocal.pod"
266 - if use python; then
267 - cd interfaces/Python || die
268 - distutils-r1_src_install
269 - fi
270 -}