Gentoo Archives: gentoo-commits

From: "Jakov Smolić" <jsmolic@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, sci-biology/njplot/files/, sci-biology/njplot/
Date: Mon, 30 Aug 2021 17:39:30
Message-Id: 1630345129.1d628ae01ed5cc7b4bf4502efab58fc104589428.jsmolic@gentoo
1 commit: 1d628ae01ed5cc7b4bf4502efab58fc104589428
2 Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 30 17:16:11 2021 +0000
4 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 30 17:38:49 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d628ae0
7
8 sci-biology/njplot: Remove last-rited package
9
10 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
11
12 profiles/package.mask | 1 -
13 sci-biology/njplot/Manifest | 1 -
14 .../njplot/files/njplot-2.3-buildsystem.patch | 59 ----------------------
15 .../njplot/files/njplot-2.3-format-security.patch | 16 ------
16 sci-biology/njplot/metadata.xml | 15 ------
17 sci-biology/njplot/njplot-2.3-r2.ebuild | 38 --------------
18 6 files changed, 130 deletions(-)
19
20 diff --git a/profiles/package.mask b/profiles/package.mask
21 index 484e5b1182a..a91a2a5b53e 100644
22 --- a/profiles/package.mask
23 +++ b/profiles/package.mask
24 @@ -285,7 +285,6 @@ sci-libs/sktime
25 # anymore, tons of bugs. Revdeps are unmaintained too and out of date.
26 # Bug #798015, removal in 30 days.
27 sci-biology/ncbi-tools
28 -sci-biology/njplot
29
30 # Andreas K. Hüttel <dilfridge@g.o> (2021-07-31)
31 # Obsolete; all versions in current Perl core distributions
32
33 diff --git a/sci-biology/njplot/Manifest b/sci-biology/njplot/Manifest
34 deleted file mode 100644
35 index 6cec177af40..00000000000
36 --- a/sci-biology/njplot/Manifest
37 +++ /dev/null
38 @@ -1 +0,0 @@
39 -DIST njplot-2.3.tar.gz 83641 BLAKE2B 3dd2798c190a103e88babb592cda184ae7ab4839cc779f739205480e2cce641bc9f8a57d20bd96ce8fc4a1e662a81de0bb13f2a4ffa9d03f8e0f286c762b993a SHA512 51e7d48187f88c4afb36d55cf8de98dad3cd4cd541137262885fe84bedff9db83224cdfa3c6a14518cd8170a06139b798518afe9fbadd89162986ed788355059
40
41 diff --git a/sci-biology/njplot/files/njplot-2.3-buildsystem.patch b/sci-biology/njplot/files/njplot-2.3-buildsystem.patch
42 deleted file mode 100644
43 index 61f8b95ea16..00000000000
44 --- a/sci-biology/njplot/files/njplot-2.3-buildsystem.patch
45 +++ /dev/null
46 @@ -1,59 +0,0 @@
47 - makefile | 16 ++++++++--------
48 - 1 file changed, 8 insertions(+), 8 deletions(-)
49 -
50 -diff --git a/makefile b/makefile
51 -index ccb7dc2..9488c2a 100644
52 ---- a/makefile
53 -+++ b/makefile
54 -@@ -7,10 +7,10 @@ NO_PDF = -DNO_PDF
55 - #PDFLIB = -L$(PDF) -lpdf
56 -
57 - # c compiler and linker
58 --CC = gcc
59 -+CC ?= gcc
60 -
61 - # Vibrant top directory
62 --VIBRANT = /banques0/ncbiJun04
63 -+VIBRANT = /usr/include/ncbi
64 -
65 -
66 - # X11 include directory
67 -@@ -24,15 +24,15 @@ OBJECTS = njplot-vib.o
68 - OBJUNROOTED = unrooted-vib.o preptree.o
69 -
70 -
71 --CFLAGS = -c -DWIN_MOTIF -Dunix -I$(VIBRANT)/include -I$(VIBRANT)/vibrant -I$(VIBRANT)/corelib \
72 -+CFLAGS += -c -DWIN_MOTIF -Dunix -I$(VIBRANT)/include -I$(VIBRANT)/vibrant -I$(VIBRANT)/corelib \
73 - -I$(VIBRANT) -I$(PDF) -I$(X11INCL) -I$(MOTIFINCL) $(HELPFILENAME) $(NO_PDF) \
74 -- -Wimplicit-function-declaration -g
75 -+ -Wimplicit-function-declaration
76 -
77 - all: njplot unrooted newicktops newicktotxt
78 -
79 -
80 - njplot : $(OBJECTS)
81 -- $(CC) -g -o njplot $(OBJECTS) \
82 -+ $(CC) $(LDFLAGS) -o njplot $(OBJECTS) \
83 - -L$(VIBRANT)/lib \
84 - -lvibrant -lncbi \
85 - $(PDFLIB) \
86 -@@ -40,16 +40,16 @@ njplot : $(OBJECTS)
87 - -L/usr/X11R6/lib -lXmu -lXt -lX11 -lm
88 -
89 - unrooted : $(OBJUNROOTED)
90 -- $(CC) -g -o unrooted $(OBJUNROOTED) \
91 -+ $(CC) $(LDFLAGS) -o unrooted $(OBJUNROOTED) \
92 - -L$(VIBRANT)/lib -lvibrant -lncbi \
93 - -L$(MOTIFLIB) -lXm \
94 - -L/usr/X11R6/lib -lXmu -lXt -lX11 -lm
95 -
96 - newicktops: njplot-vib.c
97 -- $(CC) -DNO_GUI -DNO_PDF -o $@ njplot-vib.c -lm
98 -+ $(CC) $(LDFLAGS) $(CFLAGS) -DNO_GUI -DNO_PDF -o $@ njplot-vib.c -lm
99 -
100 - newicktotxt: njplot-vib.c
101 -- $(CC) -DTTY -o $@ njplot-vib.c -lm
102 -+ $(CC) -DTTY $(LDFLAGS) $(CFLAGS) -o $@ njplot-vib.c -lm
103 -
104 -
105 - .c.o :
106
107 diff --git a/sci-biology/njplot/files/njplot-2.3-format-security.patch b/sci-biology/njplot/files/njplot-2.3-format-security.patch
108 deleted file mode 100644
109 index 686b8475e9e..00000000000
110 --- a/sci-biology/njplot/files/njplot-2.3-format-security.patch
111 +++ /dev/null
112 @@ -1,16 +0,0 @@
113 - njplot-vib.c | 2 +-
114 - 1 file changed, 1 insertion(+), 1 deletion(-)
115 -
116 -diff --git a/njplot-vib.c b/njplot-vib.c
117 -index fe55609..63fd3b6 100644
118 ---- a/njplot-vib.c
119 -+++ b/njplot-vib.c
120 -@@ -1976,7 +1976,7 @@ PDFONLY" no window interface, just write the PDF/PostScript tree plot\n"
121 - #else
122 - fprintf(stderr,
123 - #endif
124 -- message);
125 -+ "%s", message);
126 - exit(0);
127 - }
128 - }
129
130 diff --git a/sci-biology/njplot/metadata.xml b/sci-biology/njplot/metadata.xml
131 deleted file mode 100644
132 index 2a3eb314096..00000000000
133 --- a/sci-biology/njplot/metadata.xml
134 +++ /dev/null
135 @@ -1,15 +0,0 @@
136 -<?xml version="1.0" encoding="UTF-8"?>
137 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
138 -<pkgmetadata>
139 - <maintainer type="project">
140 - <email>sci-biology@g.o</email>
141 - <name>Gentoo Biology Project</name>
142 - </maintainer>
143 - <longdescription>
144 - NJplot is a tree drawing program able to draw any phylogenetic tree
145 - expressed in the Newick phylogenetic tree format (e.g., the format used
146 - by the PHYLIP package). NJplot is especially convenient for rooting the
147 - unrooted trees obtained from parsimony, distance or maximum likelihood
148 - tree-building methods.
149 - </longdescription>
150 -</pkgmetadata>
151
152 diff --git a/sci-biology/njplot/njplot-2.3-r2.ebuild b/sci-biology/njplot/njplot-2.3-r2.ebuild
153 deleted file mode 100644
154 index 420861dac42..00000000000
155 --- a/sci-biology/njplot/njplot-2.3-r2.ebuild
156 +++ /dev/null
157 @@ -1,38 +0,0 @@
158 -# Copyright 1999-2017 Gentoo Foundation
159 -# Distributed under the terms of the GNU General Public License v2
160 -
161 -EAPI=6
162 -
163 -inherit toolchain-funcs
164 -
165 -DESCRIPTION="A phylogenetic tree drawing program which supports tree rooting"
166 -HOMEPAGE="http://pbil.univ-lyon1.fr/software/njplot.html"
167 -SRC_URI="ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/njplot/archive/njplot-${PV}.tar.gz"
168 -
169 -LICENSE="public-domain"
170 -SLOT="0"
171 -KEYWORDS="~amd64 ~x86"
172 -IUSE=""
173 -
174 -RDEPEND="
175 - sci-biology/ncbi-tools[X,static-libs]
176 - x11-libs/libXmu"
177 -DEPEND="${RDEPEND}"
178 -
179 -PATCHES=(
180 - "${FILESDIR}"/${P}-format-security.patch
181 - "${FILESDIR}"/${P}-buildsystem.patch
182 -)
183 -
184 -src_prepare() {
185 - default
186 - sed -i -e "s:njplot.help:${EPREFIX}/usr/share/doc/${PF}/njplot.help:" njplot-vib.c || die
187 -
188 - tc-export CC
189 -}
190 -
191 -src_install() {
192 - dobin newicktops newicktotxt njplot unrooted
193 - doman *.1
194 - dodoc README njplot.help
195 -}