| 1 |
commit: fb6d3bdb8b350200f25783f60cfb7e4c917c9359 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 22 10:49:03 2016 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 22 10:49:03 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=fb6d3bdb |
| 7 |
|
| 8 |
app-forensics/vine: Bump to EAPI=6 |
| 9 |
|
| 10 |
* Amend patches for -p1 |
| 11 |
* Use PATCHES=() |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.27 |
| 14 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 15 |
|
| 16 |
app-forensics/vine/files/vine-1.0-binutils.patch | 4 +-- |
| 17 |
app-forensics/vine/files/vine-1.0-gcc46.patch | 8 +++--- |
| 18 |
app-forensics/vine/files/vine-1.0-install.patch | 32 +++++++++++----------- |
| 19 |
.../vine/files/vine-1.0-ocamlgraph182.patch | 8 +++--- |
| 20 |
app-forensics/vine/vine-1.0.ebuild | 19 ++++++------- |
| 21 |
5 files changed, 35 insertions(+), 36 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 |
index b9d55da..737f10c 100644 |
| 25 |
--- a/app-forensics/vine/files/vine-1.0-binutils.patch |
| 26 |
+++ b/app-forensics/vine/files/vine-1.0-binutils.patch |
| 27 |
@@ -2,8 +2,8 @@ https://groups.google.com/d/msg/bitblaze-users/Zpg7Ddzngns/o7LNnR0qqxwJ |
| 28 |
|
| 29 |
Index: libasmir/src/disasm/asm_program.cpp |
| 30 |
=================================================================== |
| 31 |
---- libasmir/src/disasm/asm_program.cpp (older version) |
| 32 |
-+++ libasmir/src/disasm/asm_program.cpp (fixed version) |
| 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 |
|
| 39 |
diff --git a/app-forensics/vine/files/vine-1.0-gcc46.patch b/app-forensics/vine/files/vine-1.0-gcc46.patch |
| 40 |
index 89a5229..41dc0ae 100644 |
| 41 |
--- a/app-forensics/vine/files/vine-1.0-gcc46.patch |
| 42 |
+++ b/app-forensics/vine/files/vine-1.0-gcc46.patch |
| 43 |
@@ -2,8 +2,8 @@ https://groups.google.com/d/msg/bitblaze-users/sTTPlFEzWo0/0ZjPL0QYC8IJ |
| 44 |
|
| 45 |
Index: libasmir/src/vex/irtoir-i386.cpp |
| 46 |
=================================================================== |
| 47 |
---- libasmir/src/vex/irtoir-i386.cpp (old revision) |
| 48 |
-+++ libasmir/src/vex/irtoir-i386.cpp (new revision) |
| 49 |
+--- a/libasmir/src/vex/irtoir-i386.cpp (old revision) |
| 50 |
++++ b/libasmir/src/vex/irtoir-i386.cpp (new revision) |
| 51 |
@@ -9,6 +9,13 @@ |
| 52 |
web site at: http://bitblaze.cs.berkeley.edu/ |
| 53 |
*/ |
| 54 |
@@ -20,8 +20,8 @@ Index: libasmir/src/vex/irtoir-i386.cpp |
| 55 |
#include <iostream> |
| 56 |
Index: libasmir/src/vex/irtoir-arm.cpp |
| 57 |
=================================================================== |
| 58 |
---- libasmir/src/vex/irtoir-arm.cpp (old revision) |
| 59 |
-+++ libasmir/src/vex/irtoir-arm.cpp (new revision) |
| 60 |
+--- a/libasmir/src/vex/irtoir-arm.cpp (old revision) |
| 61 |
++++ b/libasmir/src/vex/irtoir-arm.cpp (new revision) |
| 62 |
@@ -9,6 +9,12 @@ |
| 63 |
web site at: http://bitblaze.cs.berkeley.edu/ |
| 64 |
*/ |
| 65 |
|
| 66 |
diff --git a/app-forensics/vine/files/vine-1.0-install.patch b/app-forensics/vine/files/vine-1.0-install.patch |
| 67 |
index 62a84bc..166bd1c 100644 |
| 68 |
--- a/app-forensics/vine/files/vine-1.0-install.patch |
| 69 |
+++ b/app-forensics/vine/files/vine-1.0-install.patch |
| 70 |
@@ -1,5 +1,5 @@ |
| 71 |
---- vine-1.0.orig/stp/ocaml/Makefile 2009-09-24 15:45:57.000000000 -0600 |
| 72 |
-+++ vine-1.0/stp/ocaml/Makefile 2013-03-14 20:22:49.993194747 -0600 |
| 73 |
+--- a/stp/ocaml/Makefile 2009-09-24 15:45:57.000000000 -0600 |
| 74 |
++++ b/stp/ocaml/Makefile 2013-03-14 20:22:49.993194747 -0600 |
| 75 |
@@ -14,3 +14,6 @@ |
| 76 |
Makefile |
| 77 |
|
| 78 |
@@ -7,8 +7,8 @@ |
| 79 |
+ |
| 80 |
+install: rawinstall |
| 81 |
+ |
| 82 |
---- vine-1.0.orig/stp/ocaml/OCamlMakefile 2009-09-24 15:45:57.000000000 -0600 |
| 83 |
-+++ vine-1.0/stp/ocaml/OCamlMakefile 2013-03-14 20:20:23.012069386 -0600 |
| 84 |
+--- a/stp/ocaml/OCamlMakefile 2009-09-24 15:45:57.000000000 -0600 |
| 85 |
++++ b/stp/ocaml/OCamlMakefile 2013-03-14 20:20:23.012069386 -0600 |
| 86 |
@@ -1126,10 +1126,10 @@ |
| 87 |
.PHONY: rawinstall |
| 88 |
rawinstall: all |
| 89 |
@@ -23,8 +23,8 @@ |
| 90 |
done |
| 91 |
$(QUIET)printf "\nInstallation successful.\n" |
| 92 |
|
| 93 |
---- vine-1.0.orig/ocaml/Makefile 2009-09-24 15:45:57.000000000 -0600 |
| 94 |
-+++ vine-1.0/ocaml/Makefile 2013-03-14 20:22:49.993194747 -0600 |
| 95 |
+--- a/ocaml/Makefile 2009-09-24 15:45:57.000000000 -0600 |
| 96 |
++++ b/ocaml/Makefile 2013-03-14 20:22:49.993194747 -0600 |
| 97 |
@@ -14,3 +14,6 @@ |
| 98 |
|
| 99 |
|
| 100 |
@@ -32,8 +32,8 @@ |
| 101 |
+ |
| 102 |
+install: rawinstall |
| 103 |
+ |
| 104 |
---- vine-1.0.orig/ocaml/OCamlMakefile 2009-09-24 15:45:57.000000000 -0600 |
| 105 |
-+++ vine-1.0/ocaml/OCamlMakefile 2013-03-14 20:20:23.012069386 -0600 |
| 106 |
+--- a/ocaml/OCamlMakefile 2009-09-24 15:45:57.000000000 -0600 |
| 107 |
++++ b/ocaml/OCamlMakefile 2013-03-14 20:20:23.012069386 -0600 |
| 108 |
@@ -1126,10 +1126,10 @@ |
| 109 |
.PHONY: rawinstall |
| 110 |
rawinstall: all |
| 111 |
@@ -47,8 +47,8 @@ |
| 112 |
fi; \ |
| 113 |
done |
| 114 |
$(QUIET)printf "\nInstallation successful.\n" |
| 115 |
---- vine-1.0.orig/trace/Makefile 2009-09-24 15:45:57.000000000 -0600 |
| 116 |
-+++ vine-1.0/trace/Makefile 2013-03-14 20:22:49.993194747 -0600 |
| 117 |
+--- a/trace/Makefile 2009-09-24 15:45:57.000000000 -0600 |
| 118 |
++++ b/trace/Makefile 2013-03-14 20:22:49.993194747 -0600 |
| 119 |
@@ -14,3 +14,6 @@ |
| 120 |
|
| 121 |
|
| 122 |
@@ -56,8 +56,8 @@ |
| 123 |
+ |
| 124 |
+install: rawinstall |
| 125 |
+ |
| 126 |
---- vine-1.0.orig/trace_utils/Makefile 2009-09-24 15:45:57.000000000 -0600 |
| 127 |
-+++ vine-1.0/trace_utils/Makefile 2013-03-16 14:31:46.375690732 -0600 |
| 128 |
+--- a/trace_utils/Makefile 2009-09-24 15:45:57.000000000 -0600 |
| 129 |
++++ b/trace_utils/Makefile 2013-03-16 14:31:46.375690732 -0600 |
| 130 |
@@ -88,6 +88,8 @@ |
| 131 |
# * subprjs |
| 132 |
|
| 133 |
@@ -67,8 +67,8 @@ |
| 134 |
|
| 135 |
%: |
| 136 |
make -f $(OCAMLMAKEFILE) subprojs SUBTARGET=$@ |
| 137 |
---- vine-1.0.orig/utils/Makefile 2009-09-24 15:45:57.000000000 -0600 |
| 138 |
-+++ vine-1.0/utils/Makefile 2013-03-16 14:31:46.375690732 -0600 |
| 139 |
+--- a/utils/Makefile 2009-09-24 15:45:57.000000000 -0600 |
| 140 |
++++ b/utils/Makefile 2013-03-16 14:31:46.375690732 -0600 |
| 141 |
@@ -88,6 +88,8 @@ |
| 142 |
# * subprjs |
| 143 |
|
| 144 |
@@ -78,8 +78,8 @@ |
| 145 |
|
| 146 |
%: |
| 147 |
make -f $(OCAMLMAKEFILE) subprojs SUBTARGET=$@ |
| 148 |
---- vine-1.0.orig/doc/Makefile 2009-09-24 15:45:57.000000000 -0600 |
| 149 |
-+++ vine-1.0/doc/Makefile 2013-03-16 14:41:59.182926821 -0600 |
| 150 |
+--- a/doc/Makefile 2009-09-24 15:45:57.000000000 -0600 |
| 151 |
++++ b/doc/Makefile 2013-03-16 14:41:59.182926821 -0600 |
| 152 |
@@ -17,3 +17,6 @@ |
| 153 |
|
| 154 |
clean: |
| 155 |
|
| 156 |
diff --git a/app-forensics/vine/files/vine-1.0-ocamlgraph182.patch b/app-forensics/vine/files/vine-1.0-ocamlgraph182.patch |
| 157 |
index 5cb79f2..e9a2f5d 100644 |
| 158 |
--- a/app-forensics/vine/files/vine-1.0-ocamlgraph182.patch |
| 159 |
+++ b/app-forensics/vine/files/vine-1.0-ocamlgraph182.patch |
| 160 |
@@ -1,7 +1,7 @@ |
| 161 |
Index: ocaml/vine_cfg.mli |
| 162 |
=================================================================== |
| 163 |
---- ocaml/vine_cfg.mli (old version) |
| 164 |
-+++ ocaml/vine_cfg.mli (new version) |
| 165 |
+--- a/ocaml/vine_cfg.mli (old version) |
| 166 |
++++ b/ocaml/vine_cfg.mli (new version) |
| 167 |
@@ -86,6 +86,11 @@ |
| 168 |
(** [cfg#iter_edges f] calls [f a b] forall [(a,b)] where there is an edge |
| 169 |
vine-1.0-from [a] to [b] in the CFG. *) |
| 170 |
@@ -24,8 +24,8 @@ Index: ocaml/vine_cfg.mli |
| 171 |
val in_degree : t -> vertex -> int |
| 172 |
Index: ocaml/vine_cfg.ml |
| 173 |
=================================================================== |
| 174 |
---- ocaml/vine_cfg.ml (old version) |
| 175 |
-+++ ocaml/vine_cfg.ml (new version) |
| 176 |
+--- a/ocaml/vine_cfg.ml (old version) |
| 177 |
++++ b/ocaml/vine_cfg.ml (new version) |
| 178 |
@@ -115,6 +115,7 @@ |
| 179 |
method iter_bb : ('a bb -> unit) -> unit |
| 180 |
method fold_bb : 'b. ('a bb -> 'b -> 'b) -> 'b -> 'b |
| 181 |
|
| 182 |
diff --git a/app-forensics/vine/vine-1.0.ebuild b/app-forensics/vine/vine-1.0.ebuild |
| 183 |
index 683f9c9..3ee5782 100644 |
| 184 |
--- a/app-forensics/vine/vine-1.0.ebuild |
| 185 |
+++ b/app-forensics/vine/vine-1.0.ebuild |
| 186 |
@@ -1,8 +1,8 @@ |
| 187 |
-# Copyright 1999-2015 Gentoo Foundation |
| 188 |
+# Copyright 1999-2016 Gentoo Foundation |
| 189 |
# Distributed under the terms of the GNU General Public License v2 |
| 190 |
# $Id$ |
| 191 |
|
| 192 |
-EAPI=5 |
| 193 |
+EAPI=6 |
| 194 |
|
| 195 |
inherit eutils toolchain-funcs |
| 196 |
|
| 197 |
@@ -26,14 +26,13 @@ RDEPEND="${DEPEND}" |
| 198 |
|
| 199 |
MAKEOPTS="${MAKEOPTS} -j1" |
| 200 |
|
| 201 |
-src_prepare() { |
| 202 |
- epatch \ |
| 203 |
- "${FILESDIR}"/${P}-binutils.patch \ |
| 204 |
- "${FILESDIR}"/${P}-gcc46.patch \ |
| 205 |
- "${FILESDIR}"/${P}-install.patch \ |
| 206 |
- "${FILESDIR}"/${P}-ocamlgraph182.patch |
| 207 |
-} |
| 208 |
+PATCHES=( |
| 209 |
+ "${FILESDIR}"/${P}-binutils.patch |
| 210 |
+ "${FILESDIR}"/${P}-gcc46.patch |
| 211 |
+ "${FILESDIR}"/${P}-install.patch |
| 212 |
+ "${FILESDIR}"/${P}-ocamlgraph182.patch |
| 213 |
+) |
| 214 |
|
| 215 |
src_compile() { |
| 216 |
- emake CC=$(tc-getCC) CCFLAGS="${CFLAGS} -fpic" |
| 217 |
+ emake CC=$(tc-getCC) CCFLAGS="${CFLAGS} -fPIC" |
| 218 |
} |
Archives