commit: fb6d3bdb8b350200f25783f60cfb7e4c917c9359 Author: Justin Lecher <jlec <AT> gentoo <DOT> org> AuthorDate: Mon Feb 22 10:49:03 2016 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> CommitDate: Mon Feb 22 10:49:03 2016 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=fb6d3bdb
app-forensics/vine: Bump to EAPI=6 * Amend patches for -p1 * Use PATCHES=() Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> app-forensics/vine/files/vine-1.0-binutils.patch | 4 +-- app-forensics/vine/files/vine-1.0-gcc46.patch | 8 +++--- app-forensics/vine/files/vine-1.0-install.patch | 32 +++++++++++----------- .../vine/files/vine-1.0-ocamlgraph182.patch | 8 +++--- app-forensics/vine/vine-1.0.ebuild | 19 ++++++------- 5 files changed, 35 insertions(+), 36 deletions(-) diff --git a/app-forensics/vine/files/vine-1.0-binutils.patch b/app-forensics/vine/files/vine-1.0-binutils.patch index b9d55da..737f10c 100644 --- a/app-forensics/vine/files/vine-1.0-binutils.patch +++ b/app-forensics/vine/files/vine-1.0-binutils.patch @@ -2,8 +2,8 @@ https://groups.google.com/d/msg/bitblaze-users/Zpg7Ddzngns/o7LNnR0qqxwJ Index: libasmir/src/disasm/asm_program.cpp =================================================================== ---- libasmir/src/disasm/asm_program.cpp (older version) -+++ libasmir/src/disasm/asm_program.cpp (fixed version) +--- a/libasmir/src/disasm/asm_program.cpp (older version) ++++ b/libasmir/src/disasm/asm_program.cpp (fixed version) @@ -7,6 +7,11 @@ #include "debug.h" #include "asm_program.h" diff --git a/app-forensics/vine/files/vine-1.0-gcc46.patch b/app-forensics/vine/files/vine-1.0-gcc46.patch index 89a5229..41dc0ae 100644 --- a/app-forensics/vine/files/vine-1.0-gcc46.patch +++ b/app-forensics/vine/files/vine-1.0-gcc46.patch @@ -2,8 +2,8 @@ https://groups.google.com/d/msg/bitblaze-users/sTTPlFEzWo0/0ZjPL0QYC8IJ Index: libasmir/src/vex/irtoir-i386.cpp =================================================================== ---- libasmir/src/vex/irtoir-i386.cpp (old revision) -+++ libasmir/src/vex/irtoir-i386.cpp (new revision) +--- a/libasmir/src/vex/irtoir-i386.cpp (old revision) ++++ b/libasmir/src/vex/irtoir-i386.cpp (new revision) @@ -9,6 +9,13 @@ web site at: http://bitblaze.cs.berkeley.edu/ */ @@ -20,8 +20,8 @@ Index: libasmir/src/vex/irtoir-i386.cpp #include <iostream> Index: libasmir/src/vex/irtoir-arm.cpp =================================================================== ---- libasmir/src/vex/irtoir-arm.cpp (old revision) -+++ libasmir/src/vex/irtoir-arm.cpp (new revision) +--- a/libasmir/src/vex/irtoir-arm.cpp (old revision) ++++ b/libasmir/src/vex/irtoir-arm.cpp (new revision) @@ -9,6 +9,12 @@ web site at: http://bitblaze.cs.berkeley.edu/ */ diff --git a/app-forensics/vine/files/vine-1.0-install.patch b/app-forensics/vine/files/vine-1.0-install.patch index 62a84bc..166bd1c 100644 --- a/app-forensics/vine/files/vine-1.0-install.patch +++ b/app-forensics/vine/files/vine-1.0-install.patch @@ -1,5 +1,5 @@ ---- vine-1.0.orig/stp/ocaml/Makefile 2009-09-24 15:45:57.000000000 -0600 -+++ vine-1.0/stp/ocaml/Makefile 2013-03-14 20:22:49.993194747 -0600 +--- a/stp/ocaml/Makefile 2009-09-24 15:45:57.000000000 -0600 ++++ b/stp/ocaml/Makefile 2013-03-14 20:22:49.993194747 -0600 @@ -14,3 +14,6 @@ Makefile @@ -7,8 +7,8 @@ + +install: rawinstall + ---- vine-1.0.orig/stp/ocaml/OCamlMakefile 2009-09-24 15:45:57.000000000 -0600 -+++ vine-1.0/stp/ocaml/OCamlMakefile 2013-03-14 20:20:23.012069386 -0600 +--- a/stp/ocaml/OCamlMakefile 2009-09-24 15:45:57.000000000 -0600 ++++ b/stp/ocaml/OCamlMakefile 2013-03-14 20:20:23.012069386 -0600 @@ -1126,10 +1126,10 @@ .PHONY: rawinstall rawinstall: all @@ -23,8 +23,8 @@ done $(QUIET)printf "\nInstallation successful.\n" ---- vine-1.0.orig/ocaml/Makefile 2009-09-24 15:45:57.000000000 -0600 -+++ vine-1.0/ocaml/Makefile 2013-03-14 20:22:49.993194747 -0600 +--- a/ocaml/Makefile 2009-09-24 15:45:57.000000000 -0600 ++++ b/ocaml/Makefile 2013-03-14 20:22:49.993194747 -0600 @@ -14,3 +14,6 @@ @@ -32,8 +32,8 @@ + +install: rawinstall + ---- vine-1.0.orig/ocaml/OCamlMakefile 2009-09-24 15:45:57.000000000 -0600 -+++ vine-1.0/ocaml/OCamlMakefile 2013-03-14 20:20:23.012069386 -0600 +--- a/ocaml/OCamlMakefile 2009-09-24 15:45:57.000000000 -0600 ++++ b/ocaml/OCamlMakefile 2013-03-14 20:20:23.012069386 -0600 @@ -1126,10 +1126,10 @@ .PHONY: rawinstall rawinstall: all @@ -47,8 +47,8 @@ fi; \ done $(QUIET)printf "\nInstallation successful.\n" ---- vine-1.0.orig/trace/Makefile 2009-09-24 15:45:57.000000000 -0600 -+++ vine-1.0/trace/Makefile 2013-03-14 20:22:49.993194747 -0600 +--- a/trace/Makefile 2009-09-24 15:45:57.000000000 -0600 ++++ b/trace/Makefile 2013-03-14 20:22:49.993194747 -0600 @@ -14,3 +14,6 @@ @@ -56,8 +56,8 @@ + +install: rawinstall + ---- vine-1.0.orig/trace_utils/Makefile 2009-09-24 15:45:57.000000000 -0600 -+++ vine-1.0/trace_utils/Makefile 2013-03-16 14:31:46.375690732 -0600 +--- a/trace_utils/Makefile 2009-09-24 15:45:57.000000000 -0600 ++++ b/trace_utils/Makefile 2013-03-16 14:31:46.375690732 -0600 @@ -88,6 +88,8 @@ # * subprjs @@ -67,8 +67,8 @@ %: make -f $(OCAMLMAKEFILE) subprojs SUBTARGET=$@ ---- vine-1.0.orig/utils/Makefile 2009-09-24 15:45:57.000000000 -0600 -+++ vine-1.0/utils/Makefile 2013-03-16 14:31:46.375690732 -0600 +--- a/utils/Makefile 2009-09-24 15:45:57.000000000 -0600 ++++ b/utils/Makefile 2013-03-16 14:31:46.375690732 -0600 @@ -88,6 +88,8 @@ # * subprjs @@ -78,8 +78,8 @@ %: make -f $(OCAMLMAKEFILE) subprojs SUBTARGET=$@ ---- vine-1.0.orig/doc/Makefile 2009-09-24 15:45:57.000000000 -0600 -+++ vine-1.0/doc/Makefile 2013-03-16 14:41:59.182926821 -0600 +--- a/doc/Makefile 2009-09-24 15:45:57.000000000 -0600 ++++ b/doc/Makefile 2013-03-16 14:41:59.182926821 -0600 @@ -17,3 +17,6 @@ clean: diff --git a/app-forensics/vine/files/vine-1.0-ocamlgraph182.patch b/app-forensics/vine/files/vine-1.0-ocamlgraph182.patch index 5cb79f2..e9a2f5d 100644 --- a/app-forensics/vine/files/vine-1.0-ocamlgraph182.patch +++ b/app-forensics/vine/files/vine-1.0-ocamlgraph182.patch @@ -1,7 +1,7 @@ Index: ocaml/vine_cfg.mli =================================================================== ---- ocaml/vine_cfg.mli (old version) -+++ ocaml/vine_cfg.mli (new version) +--- a/ocaml/vine_cfg.mli (old version) ++++ b/ocaml/vine_cfg.mli (new version) @@ -86,6 +86,11 @@ (** [cfg#iter_edges f] calls [f a b] forall [(a,b)] where there is an edge vine-1.0-from [a] to [b] in the CFG. *) @@ -24,8 +24,8 @@ Index: ocaml/vine_cfg.mli val in_degree : t -> vertex -> int Index: ocaml/vine_cfg.ml =================================================================== ---- ocaml/vine_cfg.ml (old version) -+++ ocaml/vine_cfg.ml (new version) +--- a/ocaml/vine_cfg.ml (old version) ++++ b/ocaml/vine_cfg.ml (new version) @@ -115,6 +115,7 @@ method iter_bb : ('a bb -> unit) -> unit method fold_bb : 'b. ('a bb -> 'b -> 'b) -> 'b -> 'b diff --git a/app-forensics/vine/vine-1.0.ebuild b/app-forensics/vine/vine-1.0.ebuild index 683f9c9..3ee5782 100644 --- a/app-forensics/vine/vine-1.0.ebuild +++ b/app-forensics/vine/vine-1.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit eutils toolchain-funcs @@ -26,14 +26,13 @@ RDEPEND="${DEPEND}" MAKEOPTS="${MAKEOPTS} -j1" -src_prepare() { - epatch \ - "${FILESDIR}"/${P}-binutils.patch \ - "${FILESDIR}"/${P}-gcc46.patch \ - "${FILESDIR}"/${P}-install.patch \ - "${FILESDIR}"/${P}-ocamlgraph182.patch -} +PATCHES=( + "${FILESDIR}"/${P}-binutils.patch + "${FILESDIR}"/${P}-gcc46.patch + "${FILESDIR}"/${P}-install.patch + "${FILESDIR}"/${P}-ocamlgraph182.patch +) src_compile() { - emake CC=$(tc-getCC) CCFLAGS="${CFLAGS} -fpic" + emake CC=$(tc-getCC) CCFLAGS="${CFLAGS} -fPIC" }
