Gentoo Archives: gentoo-commits

From: Aisha Tammy <gentoo@×××××.cc>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: app-forensics/vine/, app-forensics/vine/files/
Date: Wed, 30 Dec 2020 17:48:54
Message-Id: 1609350480.5e1bce674bb1ec350ca0459dd07a92d100a71234.epsilon-0@gentoo
1 commit: 5e1bce674bb1ec350ca0459dd07a92d100a71234
2 Author: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
3 AuthorDate: Wed Dec 30 17:48:00 2020 +0000
4 Commit: Aisha Tammy <gentoo <AT> aisha <DOT> cc>
5 CommitDate: Wed Dec 30 17:48:00 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=5e1bce67
7
8 app-forensics/vine: drop dead package
9
10 does not build, reverse dependency gmetadom
11 is not available
12
13 Signed-off-by: Aisha Tammy <gentoo <AT> aisha.cc>
14
15 app-forensics/vine/files/vine-1.0-binutils.patch | 16 ----
16 app-forensics/vine/files/vine-1.0-gcc46.patch | 37 ---------
17 app-forensics/vine/files/vine-1.0-install.patch | 89 ----------------------
18 .../vine/files/vine-1.0-ocamlgraph182.patch | 68 -----------------
19 app-forensics/vine/metadata.xml | 8 --
20 app-forensics/vine/vine-1.0.ebuild | 37 ---------
21 6 files changed, 255 deletions(-)
22
23 diff --git a/app-forensics/vine/files/vine-1.0-binutils.patch b/app-forensics/vine/files/vine-1.0-binutils.patch
24 deleted file mode 100644
25 index 737f10ce2..000000000
26 --- a/app-forensics/vine/files/vine-1.0-binutils.patch
27 +++ /dev/null
28 @@ -1,16 +0,0 @@
29 -https://groups.google.com/d/msg/bitblaze-users/Zpg7Ddzngns/o7LNnR0qqxwJ
30 -
31 -Index: libasmir/src/disasm/asm_program.cpp
32 -===================================================================
33 ---- a/libasmir/src/disasm/asm_program.cpp (older version)
34 -+++ b/libasmir/src/disasm/asm_program.cpp (fixed version)
35 -@@ -7,6 +7,11 @@
36 - #include "debug.h"
37 - #include "asm_program.h"
38 - #include "objdump.h"
39 -+/* Some versions of glibc and the binutils libiberty library give
40 -+ conflicting prototypes for basename(). We don't use that function
41 -+ anyway, but to work around the problem, make libliberty.h think
42 -+ that it has already been declared. */
43 -+#define HAVE_DECL_BASENAME 1
44 - #include "libiberty.h"
45
46 diff --git a/app-forensics/vine/files/vine-1.0-gcc46.patch b/app-forensics/vine/files/vine-1.0-gcc46.patch
47 deleted file mode 100644
48 index 41dc0ae40..000000000
49 --- a/app-forensics/vine/files/vine-1.0-gcc46.patch
50 +++ /dev/null
51 @@ -1,37 +0,0 @@
52 -https://groups.google.com/d/msg/bitblaze-users/sTTPlFEzWo0/0ZjPL0QYC8IJ
53 -
54 -Index: libasmir/src/vex/irtoir-i386.cpp
55 -===================================================================
56 ---- a/libasmir/src/vex/irtoir-i386.cpp (old revision)
57 -+++ b/libasmir/src/vex/irtoir-i386.cpp (new revision)
58 -@@ -9,6 +9,13 @@
59 - web site at: http://bitblaze.cs.berkeley.edu/
60 - */
61 -
62 -+/* Because we use offsetof() for values that go in switch statement
63 -+ cases, we need a definition in terms of __builtin_offsetof so that
64 -+ GCC >= 4.6 can accept the results of offsetof() as a constant
65 -+ expression. They've stopped supporting the traditional definition
66 -+ as a macro &((type*)0)->memb, which appears in VEX's headers. */
67 -+#include <stddef.h>
68 -+
69 - #include <string>
70 - #include <vector>
71 - #include <iostream>
72 -Index: libasmir/src/vex/irtoir-arm.cpp
73 -===================================================================
74 ---- a/libasmir/src/vex/irtoir-arm.cpp (old revision)
75 -+++ b/libasmir/src/vex/irtoir-arm.cpp (new revision)
76 -@@ -9,6 +9,12 @@
77 - web site at: http://bitblaze.cs.berkeley.edu/
78 - */
79 -
80 -+/* Because we use offsetof() for values that go in switch statement
81 -+ cases, we need a definition in terms of __builtin_offsetof so that
82 -+ GCC >= 4.6 can accept the results of offsetof() as a constant
83 -+ expression. They've stopped supporting the traditional definition
84 -+ as a macro &((type*)0)->memb, which appears in VEX's headers. */
85 -+#include <stddef.h>
86 -
87 - #include "irtoir-internal.h"
88 - #include "libvex_guest_arm.h"
89
90 diff --git a/app-forensics/vine/files/vine-1.0-install.patch b/app-forensics/vine/files/vine-1.0-install.patch
91 deleted file mode 100644
92 index 166bd1c4e..000000000
93 --- a/app-forensics/vine/files/vine-1.0-install.patch
94 +++ /dev/null
95 @@ -1,89 +0,0 @@
96 ---- a/stp/ocaml/Makefile 2009-09-24 15:45:57.000000000 -0600
97 -+++ b/stp/ocaml/Makefile 2013-03-14 20:22:49.993194747 -0600
98 -@@ -14,3 +14,6 @@
99 - Makefile
100 -
101 - include $(OCAMLMAKEFILE)
102 -+
103 -+install: rawinstall
104 -+
105 ---- a/stp/ocaml/OCamlMakefile 2009-09-24 15:45:57.000000000 -0600
106 -+++ b/stp/ocaml/OCamlMakefile 2013-03-14 20:20:23.012069386 -0600
107 -@@ -1126,10 +1126,10 @@
108 - .PHONY: rawinstall
109 - rawinstall: all
110 - $(QUIET)printf "\nInstalling library to: $(OCAML_LIB_INSTALL)\n"
111 -- -install -d $(OCAML_LIB_INSTALL)
112 -+ -install -d $(DESTDIR)$(OCAML_LIB_INSTALL)
113 - for i in $(LIBINSTALL_FILES); do \
114 - if [ -f $$i ]; then \
115 -- install -c -m 0644 $$i $(OCAML_LIB_INSTALL); \
116 -+ install -c -m 0644 $$i $(DESTDIR)$(OCAML_LIB_INSTALL); \
117 - fi; \
118 - done
119 - $(QUIET)printf "\nInstallation successful.\n"
120 -
121 ---- a/ocaml/Makefile 2009-09-24 15:45:57.000000000 -0600
122 -+++ b/ocaml/Makefile 2013-03-14 20:22:49.993194747 -0600
123 -@@ -14,3 +14,6 @@
124 -
125 -
126 - include $(OCAMLMAKEFILE)
127 -+
128 -+install: rawinstall
129 -+
130 ---- a/ocaml/OCamlMakefile 2009-09-24 15:45:57.000000000 -0600
131 -+++ b/ocaml/OCamlMakefile 2013-03-14 20:20:23.012069386 -0600
132 -@@ -1126,10 +1126,10 @@
133 - .PHONY: rawinstall
134 - rawinstall: all
135 - $(QUIET)printf "\nInstalling library to: $(OCAML_LIB_INSTALL)\n"
136 -- -install -d $(OCAML_LIB_INSTALL)
137 -+ -install -d $(DESTDIR)$(OCAML_LIB_INSTALL)
138 - for i in $(LIBINSTALL_FILES); do \
139 - if [ -f $$i ]; then \
140 -- install -c -m 0644 $$i $(OCAML_LIB_INSTALL); \
141 -+ install -c -m 0644 $$i $(DESTDIR)$(OCAML_LIB_INSTALL); \
142 - fi; \
143 - done
144 - $(QUIET)printf "\nInstallation successful.\n"
145 ---- a/trace/Makefile 2009-09-24 15:45:57.000000000 -0600
146 -+++ b/trace/Makefile 2013-03-14 20:22:49.993194747 -0600
147 -@@ -14,3 +14,6 @@
148 -
149 -
150 - include $(OCAMLMAKEFILE)
151 -+
152 -+install: rawinstall
153 -+
154 ---- a/trace_utils/Makefile 2009-09-24 15:45:57.000000000 -0600
155 -+++ b/trace_utils/Makefile 2013-03-16 14:31:46.375690732 -0600
156 -@@ -88,6 +88,8 @@
157 - # * subprjs
158 -
159 -
160 -+install:
161 -+
162 -
163 - %:
164 - make -f $(OCAMLMAKEFILE) subprojs SUBTARGET=$@
165 ---- a/utils/Makefile 2009-09-24 15:45:57.000000000 -0600
166 -+++ b/utils/Makefile 2013-03-16 14:31:46.375690732 -0600
167 -@@ -88,6 +88,8 @@
168 - # * subprjs
169 -
170 -
171 -+install:
172 -+
173 -
174 - %:
175 - make -f $(OCAMLMAKEFILE) subprojs SUBTARGET=$@
176 ---- a/doc/Makefile 2009-09-24 15:45:57.000000000 -0600
177 -+++ b/doc/Makefile 2013-03-16 14:41:59.182926821 -0600
178 -@@ -17,3 +17,6 @@
179 -
180 - clean:
181 - (cd howto && $(MAKE) clean)
182 -+
183 -+install:
184 -+
185
186 diff --git a/app-forensics/vine/files/vine-1.0-ocamlgraph182.patch b/app-forensics/vine/files/vine-1.0-ocamlgraph182.patch
187 deleted file mode 100644
188 index e9a2f5d6a..000000000
189 --- a/app-forensics/vine/files/vine-1.0-ocamlgraph182.patch
190 +++ /dev/null
191 @@ -1,68 +0,0 @@
192 -Index: ocaml/vine_cfg.mli
193 -===================================================================
194 ---- a/ocaml/vine_cfg.mli (old version)
195 -+++ b/ocaml/vine_cfg.mli (new version)
196 -@@ -86,6 +86,11 @@
197 - (** [cfg#iter_edges f] calls [f a b] forall [(a,b)] where there is an edge
198 - vine-1.0-from [a] to [b] in the CFG. *)
199 -
200 -+ method fold_edges : 'b. ('a bb -> 'a bb -> 'b -> 'b) -> 'b -> 'b
201 -+ (** [cfg#fold_edges f init] computes [f uN uN (... (f u1 v1
202 -+init)...)] where [(u1, v1) ... (uN, vN)] is an enumeration of all
203 -+the edges in the graph, in an unspecified order. *)
204 -+
205 - method get_info : 'a bb -> 'a
206 - (** Returns the info associated with the given bb. *)
207 -
208 -@@ -225,6 +230,7 @@
209 - val iter_vertex : (bbid -> unit) -> t -> unit
210 - val fold_vertex : (vertex -> 'a -> 'a) -> t -> 'a -> 'a
211 - val iter_edges_e : (E.t -> unit) -> t -> unit
212 -+ val fold_edges_e : (E.t -> 'a -> 'a) -> t -> 'a -> 'a
213 - val iter_succ : (vertex -> unit) -> t -> vertex -> unit
214 - val iter_pred : (vertex -> unit) -> t -> vertex -> unit
215 - val in_degree : t -> vertex -> int
216 -Index: ocaml/vine_cfg.ml
217 -===================================================================
218 ---- a/ocaml/vine_cfg.ml (old version)
219 -+++ b/ocaml/vine_cfg.ml (new version)
220 -@@ -115,6 +115,7 @@
221 - method iter_bb : ('a bb -> unit) -> unit
222 - method fold_bb : 'b. ('a bb -> 'b -> 'b) -> 'b -> 'b
223 - method iter_edges : ('a bb -> 'a bb -> unit) -> unit
224 -+ method fold_edges : 'b. ('a bb -> 'a bb -> 'b -> 'b) -> 'b -> 'b
225 - method get_info : 'a bb -> 'a
226 - method set_info : 'a bb -> 'a -> unit
227 - method get_id : 'a bb -> bbid
228 -@@ -306,6 +307,14 @@
229 - self#iter_bb (fun b -> List.iter (f b) (self#succ b));
230 - self#check_graph;
231 -
232 -+ method fold_edges f a =
233 -+ self#check_graph;
234 -+ let res = self#fold_bb
235 -+ (fun b a2 -> List.fold_left (fun a3 b2 -> f b b2 a3) a2 (self#succ b)) a
236 -+ in
237 -+ self#check_graph;
238 -+ res
239 -+
240 - method length = Hashtbl.length blktbl
241 -
242 - method get_info b =
243 -@@ -1122,6 +1131,7 @@
244 - val iter_vertex : (bbid -> unit) -> t -> unit
245 - val fold_vertex : (bbid -> 'a -> 'a) -> t -> 'a -> 'a
246 - val iter_edges_e : (E.t -> unit) -> t -> unit
247 -+ val fold_edges_e : (E.t -> 'a -> 'a) -> t -> 'a -> 'a
248 - val iter_succ : (vertex -> unit) -> t -> vertex -> unit
249 - val iter_pred : (vertex -> unit) -> t -> vertex -> unit
250 - val in_degree : t -> vertex -> int
251 -@@ -1170,6 +1180,8 @@
252 - let fold_vertex f (g:t) a = g#fold_bb (fun b -> f b.id) a
253 - let iter_edges_e f (g:t) =
254 - g#iter_edges (fun x y -> f (g#get_id x, g#get_id y))
255 -+ let fold_edges_e f (g:t) a =
256 -+ g#fold_edges (fun x y a -> f (g#get_id x, g#get_id y) a) a
257 - let iter_succ f g v = List.iter f (bb_succ g v)
258 - let iter_pred f g v = List.iter f (bb_pred g v)
259 - let in_degree g v = List.length (bb_pred g v)
260
261 diff --git a/app-forensics/vine/metadata.xml b/app-forensics/vine/metadata.xml
262 deleted file mode 100644
263 index 9dee8db11..000000000
264 --- a/app-forensics/vine/metadata.xml
265 +++ /dev/null
266 @@ -1,8 +0,0 @@
267 -<?xml version="1.0" encoding="UTF-8"?>
268 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
269 -<pkgmetadata>
270 - <maintainer type="person">
271 - <email>ottxor@g.o</email>
272 - <name>Christoph Junghans</name>
273 - </maintainer>
274 -</pkgmetadata>
275
276 diff --git a/app-forensics/vine/vine-1.0.ebuild b/app-forensics/vine/vine-1.0.ebuild
277 deleted file mode 100644
278 index 6ddc2ddbe..000000000
279 --- a/app-forensics/vine/vine-1.0.ebuild
280 +++ /dev/null
281 @@ -1,37 +0,0 @@
282 -# Copyright 1999-2016 Gentoo Foundation
283 -# Distributed under the terms of the GNU General Public License v2
284 -
285 -EAPI=6
286 -
287 -inherit eutils toolchain-funcs
288 -
289 -DESCRIPTION="The BitBlaze Static Analysis Component"
290 -HOMEPAGE="http://bitblaze.cs.berkeley.edu/vine.html"
291 -SRC_URI="http://bitblaze.cs.berkeley.edu/release/${P}/${P}.tar.gz"
292 -
293 -LICENSE="GPL-2+"
294 -SLOT="0"
295 -KEYWORDS=""
296 -IUSE=""
297 -
298 -DEPEND="
299 - dev-lang/ocaml
300 - dev-ml/findlib
301 - dev-ml/camlidl
302 - >=dev-libs/gmetadom-0.2.6-r1[ocaml]
303 - dev-ml/extlib
304 - dev-ml/ocamlgraph"
305 -RDEPEND="${DEPEND}"
306 -
307 -MAKEOPTS="${MAKEOPTS} -j1"
308 -
309 -PATCHES=(
310 - "${FILESDIR}"/${P}-binutils.patch
311 - "${FILESDIR}"/${P}-gcc46.patch
312 - "${FILESDIR}"/${P}-install.patch
313 - "${FILESDIR}"/${P}-ocamlgraph182.patch
314 -)
315 -
316 -src_compile() {
317 - emake CC=$(tc-getCC) CCFLAGS="${CFLAGS} -fPIC"
318 -}