aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sci-mathematics/frama-c/ChangeLog4
-rw-r--r--sci-mathematics/frama-c/Manifest34
-rw-r--r--sci-mathematics/frama-c/files/frama-c-20090901-ocamlgraph_link.patch22
-rw-r--r--sci-mathematics/frama-c/files/frama-c-20090901-varinfo_export.patch11
-rw-r--r--sci-mathematics/frama-c/files/frama-c-20090901-why_link.patch55
-rw-r--r--sci-mathematics/frama-c/files/frama-c-20100401-always_init.patch (renamed from sci-mathematics/frama-c/files/frama-c-20090901-always_init.patch)46
-rw-r--r--sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch33
-rw-r--r--sci-mathematics/frama-c/frama-c-20100401.ebuild (renamed from sci-mathematics/frama-c/frama-c-20090901.ebuild)30
-rw-r--r--sci-mathematics/frama-c/metadata.xml29
9 files changed, 98 insertions, 166 deletions
diff --git a/sci-mathematics/frama-c/ChangeLog b/sci-mathematics/frama-c/ChangeLog
index aa89b8bfb..5030da185 100644
--- a/sci-mathematics/frama-c/ChangeLog
+++ b/sci-mathematics/frama-c/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 08 Jul 2010; J.-C. Demay <jcdemay@gmail.com>
+ frama-c-20100401.ebuild:
+ Version bump
+
22 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
frama-c-20090901.ebuild, +metadata.xml:
QA fixes
diff --git a/sci-mathematics/frama-c/Manifest b/sci-mathematics/frama-c/Manifest
index 0e6ec8d3b..f4b2d6986 100644
--- a/sci-mathematics/frama-c/Manifest
+++ b/sci-mathematics/frama-c/Manifest
@@ -1,28 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX frama-c-20090901-always_init.patch 5326 RMD160 db1e04cf3003179f98a52c83cee6a60eb1bd6338 SHA1 2d2aed9c2ee68129be95e42cf768873ac9fdaab1 SHA256 2b01e04686974136fbf3ece2c92537615d10b6d46345d276de89a940881dd353
-AUX frama-c-20090901-ocamlgraph_link.patch 721 RMD160 0b78639b9f31c62575a0552c93b48dd82faeb513 SHA1 ac84c82de12c8436973a97c2e62eceac8c0fd12d SHA256 5003ddacc4b90dfb6e61af643a0d22bf2135f1d7bdb10fe1f6e20d783da5207a
-AUX frama-c-20090901-varinfo_export.patch 672 RMD160 987c2ca3b627eaf500e5db8ad91ca8a81e3a1bd4 SHA1 d2cdbd2107058476b460d9986f7bb95ca5d6138e SHA256 03d8aee3083f9b35d535882124305d99964b193931eca877d45202abcf6d9186
-AUX frama-c-20090901-why_link.patch 2172 RMD160 bc971e4d99a8a8b7570fd1da8e5f751b70b4a73f SHA1 6e8d3c337715af9d94f996aa2ca5a63dbae20ae9 SHA256 0f4020d2562cf32f85e1ee605464c2e48cffa0448245999fd063b70095640357
-DIST frama-c-Beryllium-20090901.tar.gz 18162700 RMD160 b29038e948b898196947cae636eef9adbea99ed6 SHA1 17b1516e9807a9a34ab20a3413efc372549e6fed SHA256 ac420d72b9d0062dd1213a6e595a01c32d0cd5a465c8736c65a42cc717742cc9
-EBUILD frama-c-20090901.ebuild 1612 RMD160 e2ddb395e5260d6bcf06f8c4209c4ba92a6060b3 SHA1 4219c7927317335b47a6fe4355a12b229b886aad SHA256 0b7002bdfdc2115eaa86e80f7d6c806f009899f69872ec8debd67af7c2027310
-MISC ChangeLog 244 RMD160 c91c5d4d6e5ded3fff8953ec4d60cb92420aa703 SHA1 57934c819e45664d78f23f5ef496a2cda50d43c6 SHA256 c8572dd9c80af0f83b5b32fc93d61b6caa1b04589e801d6e930fdcba38633f81
-MISC metadata.xml 410 RMD160 42b87dc255b6328ef40a91b0995d6ffa38637525 SHA1 073298bab444113fe9d57a3b5ff7c3f1c260113f SHA256 da7a73eb810c8fcf2c32571843276ec327ee710589caa266bc7f88196d577516
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iQIcBAEBAgAGBQJMISoTAAoJENwGBM22xffeI9MP/0xhzogNx//vSHJrcj1/zydN
-PxN+7c0TYICIGVRZSNVBS1m8PNRlICwvWJTKR8B4tZpgX5MIPC+SatyaO/epe9yh
-/ZcmOPwDK2jHlDzERHk4+3NkTClpt49B7YskEekmAqHe1wqKkST4X53iErQdI2UL
-B/7sazurjPRf1wRi0t74O3xzWNDxo/+5FCP6/EPmIu2cP1xtbOxsd//RulXG7zQK
-8lX1bngM2MH9MQ5ZY0eiia6J48roMV0YxVJfWQd0ehu5LWtwI+bWoScW/ryvPE1w
-1aIY3NCpe/fU5CGgSlXoZPM0R/dAuosu06+IOMypylt942oc+No0pkEvHGRDTzap
-eUpQPaX2OcWqdUjUtlzJFMmZDdafjc4TaqHMWux3bXTywnKxqkXiI+oWhww+cBnn
-N9X/JpYxaEzMRU4tE8y9y4J4ejH7qvPN+XYs+MlSuBlkQIyVo1jXEqY36OwGzywL
-sWpFYrIXwG/sTPrxVdbge2OnqPufYuLQ5wICxmC9mH3lfn5dnLblLmlAv0es/rli
-CHg866RhzrcNkUlM0LVWXPCsHKILiZ6IPKD8bxEEWsZ+J/KAj8BCECpUhM2J02e2
-EtAIs5t39DG3+1MceUOaC6Rt5WYpr3Te27UDe9dgveLVoDWDcScKYGp10llTDRhQ
-Qr0wk5l37ROcwHKxMwAO
-=utvz
------END PGP SIGNATURE-----
+AUX frama-c-20100401-always_init.patch 5161 RMD160 5d03ac3c2b16df3f84ebd481f5cec7ef15cfe38a SHA1 4549ec4921f41115899fa970efa0d31db264fc60 SHA256 dc72a42885d8125a0d5f84c72fa0763cae73a46c8e3ae26f3489fbddc2b4e58a
+AUX frama-c-20100401-plugin_install.patch 1442 RMD160 41ee9fc7b2e057497baf3af63a5d3325c8dc9826 SHA1 519a30d1988309606596411c38c40885dea26ee6 SHA256 2c496724bf528fa3e60cc660fcf9767a44bba070bf4538aa6407186ba718225a
+DIST frama-c-Boron-20100401.tar.gz 24143452 RMD160 ff2a7571cbc80cf2cb6896ab7b5d9250e3b8098c SHA1 77063ba16e2371310a70b950b5c28301db6b58a0 SHA256 78070b9899ba806740f583fb63e22f89bf5dd6508498a79567dec6bab16d5ac6
+EBUILD frama-c-20100401.ebuild 1510 RMD160 bd56856686aadf93d4e7aaacece4e6d416c78f39 SHA1 55727c61a4bdc709089be8783496939e788aa6bf SHA256 2e5ba0afd4cac8dcb8c92566f783ef214485879ae9d218dbf85d62ed93f44db5
+MISC ChangeLog 334 RMD160 07ee88ca2a6dbb47e66a3007f79087d75b5ffe7b SHA1 06264d1290c91133271341a876898841bf005927 SHA256 adc33307ba53b295725bd53fadca752c3139f22f0c2bcd7e78105308b517c78c
+MISC metadata.xml 815 RMD160 464879bb226169c1b7e06f13c90f70639b25487e SHA1 abeb18a64d38099e51e2b6c0c1027cb9671f30e4 SHA256 e03ee0bab13f2fb45987440ec7498bf629aa5a8f7217ae7dbeab461c23e89ea8
diff --git a/sci-mathematics/frama-c/files/frama-c-20090901-ocamlgraph_link.patch b/sci-mathematics/frama-c/files/frama-c-20090901-ocamlgraph_link.patch
deleted file mode 100644
index 518aada60..000000000
--- a/sci-mathematics/frama-c/files/frama-c-20090901-ocamlgraph_link.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mehdi Dogguy <mehdi@debian.org>
-Date: Wed, 9 Sep 2009 17:25:18 +0200
-Subject: [PATCH] Add dGraphView.cmo when linking
-
----
- Makefile | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 65d9f77..3a70533 100644
---- a/Makefile
-+++ b/Makefile
-@@ -357,7 +357,7 @@ OPT_LIBS+= graph.cmxa
- ifeq ($(HAS_GNOMECANVAS),yes)
- ifeq ($(ENABLE_SYNTACTIC_CALLGRAPH),yes)
- GRAPH_GUICMO_BASE= xDotDraw.cmo dGraphModel.cmo xDot.cmo dGraphViewItem.cmo \
-- concreteModel.cmo
-+ dGraphView.cmo concreteModel.cmo
- GRAPH_GUICMO_BASE+= viewGraph.cmo viewGraph_select.cmo viewGraph_utils.cmo
- GRAPH_GUICMO=$(GRAPH_GUICMO_BASE:%=$(OCAMLGRAPH_HOME)/%)
- GRAPH_GUICMX= $(GRAPH_GUICMO:.cmo=.cmx)
---
diff --git a/sci-mathematics/frama-c/files/frama-c-20090901-varinfo_export.patch b/sci-mathematics/frama-c/files/frama-c-20090901-varinfo_export.patch
deleted file mode 100644
index 5b6264f66..000000000
--- a/sci-mathematics/frama-c/files/frama-c-20090901-varinfo_export.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur frama-c-Beryllium-20090601-beta1-orig/src/ai/base.mli frama-c-Beryllium-20090601-beta1-ptch/src/ai/base.mli
---- frama-c-Beryllium-20090601-beta1-orig/src/ai/base.mli 2009-05-05 14:29:35.000000000 +0000
-+++ frama-c-Beryllium-20090601-beta1-ptch/src/ai/base.mli 2009-07-12 17:09:54.000000000 +0000
-@@ -61,6 +61,7 @@
- val is_block_local: t -> Cil_types.block -> bool
- val is_hidden_variable : t -> bool
- val validity_from_type : Cil_types.varinfo -> validity
-+val get_varinfo : t -> Cil_types.varinfo
- val create_varinfo : Cil_types.varinfo -> t
- val create_logic : Cil_types.varinfo -> validity -> t
- val create_initialized : Cil_types.varinfo -> validity -> t
diff --git a/sci-mathematics/frama-c/files/frama-c-20090901-why_link.patch b/sci-mathematics/frama-c/files/frama-c-20090901-why_link.patch
deleted file mode 100644
index 66cbf7044..000000000
--- a/sci-mathematics/frama-c/files/frama-c-20090901-why_link.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From: Mehdi Dogguy <mehdi@debian.org>
-Date: Wed, 9 Sep 2009 16:51:55 +0200
-Subject: [PATCH] Make Jessie plugin use Jc from Why 2.19
-
----
- src/jessie/interp.ml | 14 ++++++--------
- 1 files changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/src/jessie/interp.ml b/src/jessie/interp.ml
-index c3057db..84ae55d 100644
---- a/src/jessie/interp.ml
-+++ b/src/jessie/interp.ml
-@@ -2060,8 +2060,8 @@ let global vardefs g =
- | GCompTag(compinfo,pos) when compinfo.cstruct -> (* struct type *)
- let field fi =
- let this =
-- default_field_modifiers,
-- ctype ?bitsize:fi.fsize_in_bits fi.ftype,
-+ false,
-+ (ctype ?bitsize:fi.fsize_in_bits fi.ftype:Jc_ast.ptype),
- fi.fname, fi.fsize_in_bits
- in
- let padding_size =
-@@ -2069,8 +2069,8 @@ let global vardefs g =
- in
- if padding_size = 0 then [this] else
- let padding =
-- default_field_modifiers,
-- type_of_padding, unique_name "padding", fi.fpadding_in_bits
-+ false,
-+ (type_of_padding:Jc_ast.ptype), unique_name "padding", fi.fpadding_in_bits
- in
- [this;padding]
- in
-@@ -2131,8 +2131,8 @@ let global vardefs g =
- in
- let padding =
- if union_size = 0 then [] else
-- [default_field_modifiers,
-- type_of_padding, unique_name "padding", Some union_size]
-+ [false,
-+ (type_of_padding:Jc_ast.ptype), unique_name "padding", Some union_size]
- in
- let union_tag = JCDtag(compinfo.cname,[],None,padding,[]) in
- let fields = List.map field compinfo.cfields in
-@@ -2397,8 +2397,6 @@ let pragma = function
- [Jc_output.JCfloat_model Jc_env.FMstrict]
- | "full" -> float_model := `Full;
- [Jc_output.JCfloat_model Jc_env.FMfull]
-- | "multirounding" -> float_model := `Multirounding;
-- [Jc_output.JCfloat_model Jc_env.FMmultirounding]
- | s ->
- Jessie_options.warning ~current:true
- "pragma %s: identifier %s is not a valid value (ignored)."
---
diff --git a/sci-mathematics/frama-c/files/frama-c-20090901-always_init.patch b/sci-mathematics/frama-c/files/frama-c-20100401-always_init.patch
index 30753ac17..6f012c865 100644
--- a/sci-mathematics/frama-c/files/frama-c-20090901-always_init.patch
+++ b/sci-mathematics/frama-c/files/frama-c-20100401-always_init.patch
@@ -1,7 +1,7 @@
-diff -Naurp frama-c-Beryllium-20090901-orig/src/value/eval.ml frama-c-Beryllium-20090901-ptch/src/value/eval.ml
---- frama-c-Beryllium-20090901-orig/src/value/eval.ml 2009-08-31 15:38:54.000000000 +0000
-+++ frama-c-Beryllium-20090901-ptch/src/value/eval.ml 2009-11-26 02:04:43.000000000 +0000
-@@ -1688,7 +1688,7 @@ let make_well size hidden_base state loc
+diff -Naurp frama-c-Boron-20100401-orig/src/value/eval.ml frama-c-Boron-20100401/src/value/eval.ml
+--- frama-c-Boron-20100401/src/value/eval.ml 2010-04-13 11:52:01.000000000 +0000
++++ frama-c-Boron-20100401/src/value/eval.ml 2010-07-04 20:28:33.000000000 +0000
+@@ -1854,7 +1854,7 @@ let make_well size hidden_base state loc
(** [initialize_var_using_type varinfo state] uses the type of [varinfo]
to create an initial value in [state]. *)
@@ -10,7 +10,7 @@ diff -Naurp frama-c-Beryllium-20090901-orig/src/value/eval.ml frama-c-Beryllium-
CurrentLoc.set varinfo.vdecl;
let rec add_offsetmap depth v name_desc name typ offset_orig typ_orig state =
let typ = Cil.unrollType typ in
-@@ -1739,7 +1739,10 @@ let initialize_var_using_type varinfo st
+@@ -1905,7 +1905,10 @@ let initialize_var_using_type varinfo st
(Cvalue_type.V.top_leaf_origin ())
| TPtr (typ, _) as full_typ
when depth <= Value_parameters.AutomaticContextMaxDepth.get () ->
@@ -22,7 +22,7 @@ diff -Naurp frama-c-Beryllium-20090901-orig/src/value/eval.ml frama-c-Beryllium-
if not (isVoidType typ) && not (isFunctionType typ) then
let i = match findAttribute "arraylen" attr with
-@@ -1806,7 +1809,7 @@ let initialize_var_using_type varinfo st
+@@ -1973,7 +1976,7 @@ let initialize_var_using_type varinfo st
else
Base.Unknown (Int.zero,Bit_utils.max_bit_address ()))
in
@@ -31,7 +31,7 @@ diff -Naurp frama-c-Beryllium-20090901-orig/src/value/eval.ml frama-c-Beryllium-
| TArray (typ, len, _, _) ->
begin try
-@@ -1926,6 +1929,12 @@ let initialize_var_using_type varinfo st
+@@ -2093,6 +2096,12 @@ let initialize_var_using_type varinfo st
(Base.create_varinfo varinfo)
varinfo.vname varinfo.vname varinfo.vtype NoOffset varinfo.vtype state
@@ -41,10 +41,10 @@ diff -Naurp frama-c-Beryllium-20090901-orig/src/value/eval.ml frama-c-Beryllium-
+let initialize_var_using_type varinfo state =
+ initialize_all_var_using_type false varinfo state
+
- let initial_state_only_globals () =
- Value_parameters.feedback "Computing globals values";
- let state = ref Relations_type.Model.empty in
-@@ -2034,6 +2043,8 @@ let initial_state_only_globals () =
+ let initial_state_only_globals =
+ let module S =
+ Computation.OptionRef
+@@ -2216,6 +2225,8 @@ function () ->
if varinfo.vstorage = Extern then
(* Must not initialize when the storage is extern. *)
state := initialize_var_using_type varinfo !state
@@ -53,9 +53,9 @@ diff -Naurp frama-c-Beryllium-20090901-orig/src/value/eval.ml frama-c-Beryllium-
else complete_init 0 varinfo.vtype [] (Var varinfo,NoOffset)
(* | None ->
(* Cannot initialize with a default when type is incomplete. *)
-@@ -4315,13 +4326,20 @@ let compute_with_initial_state kf initia
+@@ -4765,13 +4776,20 @@ let compute_with_initial_state kf initia
+ | Declaration _ -> assert false
| Definition (f,_) ->
- let initial_state = check_precondition kf initial_state in
let initial_state =
- List.fold_left
- (fun acc local ->
@@ -79,12 +79,12 @@ diff -Naurp frama-c-Beryllium-20090901-orig/src/value/eval.ml frama-c-Beryllium-
+ initial_state
+ f.slocals
in
- compute_using_cfg kf (ref (State_set.singleton initial_state))
-
-diff -Naurp frama-c-Beryllium-20090901-orig/src/value/value_parameters.ml frama-c-Beryllium-20090901-ptch/src/value/value_parameters.ml
---- frama-c-Beryllium-20090901-orig/src/value/value_parameters.ml 2009-08-31 15:38:54.000000000 +0000
-+++ frama-c-Beryllium-20090901-ptch/src/value/value_parameters.ml 2009-11-26 02:05:49.000000000 +0000
-@@ -136,6 +136,24 @@ module PropagateTop =
+ let initial_state = check_fct_preconditions kf initial_state in
+ compute_using_cfg kf initial_state
+diff -Naurp frama-c-Boron-20100401-orig/src/value/value_parameters.ml frama-c-Boron-20100401/src/value/value_parameters.ml
+--- frama-c-Boron-20100401-orig/src/value/value_parameters.ml 2010-04-13 11:52:01.000000000 +0000
++++ frama-c-Boron-20100401/src/value/value_parameters.ml 2010-07-04 20:27:15.000000000 +0000
+@@ -161,6 +161,24 @@ module PropagateTop =
let () = add_dependency PropagateTop.self
let () = Plugin.set_group precision_tuning
@@ -109,10 +109,10 @@ diff -Naurp frama-c-Beryllium-20090901-orig/src/value/value_parameters.ml frama-
module WideningLevel =
Int
(struct
-diff -Naurp frama-c-Beryllium-20090901-orig/src/value/value_parameters.mli frama-c-Beryllium-20090901-ptch/src/value/value_parameters.mli
---- frama-c-Beryllium-20090901-orig/src/value/value_parameters.mli 2009-08-31 15:38:54.000000000 +0000
-+++ frama-c-Beryllium-20090901-ptch/src/value/value_parameters.mli 2009-11-26 02:04:43.000000000 +0000
-@@ -29,6 +29,9 @@ module WarnUnspecifiedOrder: Plugin.BOOL
+diff -Naurp frama-c-Boron-20100401-orig/src/value/value_parameters.mli frama-c-Boron-20100401/src/value/value_parameters.mli
+--- frama-c-Boron-20100401-orig/src/value/value_parameters.mli 2010-04-13 11:52:01.000000000 +0000
++++ frama-c-Boron-20100401/src/value/value_parameters.mli 2010-07-04 20:27:15.000000000 +0000
+@@ -27,6 +27,9 @@ module ForceValues: Plugin.BOOL
module PropagateTop: Plugin.BOOL
diff --git a/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch b/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch
new file mode 100644
index 000000000..c5463ccc5
--- /dev/null
+++ b/sci-mathematics/frama-c/files/frama-c-20100401-plugin_install.patch
@@ -0,0 +1,33 @@
+diff -Naurp frama-c-Boron-20100401/share/Makefile.dynamic frama-c-Boron-20100401b/share/Makefile.dynamic
+--- frama-c-Boron-20100401/share/Makefile.dynamic 2010-04-13 11:52:53.000000000 +0000
++++ frama-c-Boron-20100401/share/Makefile.dynamic 2010-07-04 19:48:52.000000000 +0000
+@@ -113,7 +113,7 @@ endif #FRAMAC_MAKE
+
+ PLUGIN_LIB_DIR ?= $(PLUGIN_DIR)
+ PLUGIN_GUI_LIB_DIR ?= $(PLUGIN_DIR)/gui
+-PLUGIN_INSTALL_DIR ?=$(FRAMAC_PLUGINDIR)
++PLUGIN_INSTALL_DIR ?=$(DESTDIR)$(FRAMAC_PLUGINDIR)
+
+ PLUGIN_FLAGS:=$(FLAGS) $(DEBUG) $(FRAMAC_INCLUDES) -I $(FRAMAC_LIBDIR)
+ PLUGIN_BFLAGS:=$(PLUGIN_FLAGS) $(PLUGIN_BFLAGS)
+@@ -182,6 +182,7 @@ endif
+ ifneq ($(PLUGIN_ENABLE),no)
+ install::
+ $(PRINT_CP) $(PLUGIN_INSTALL_DIR)
++ $(MKDIR) $(PLUGIN_INSTALL_DIR)
+ $(CP) $(TARGETS) $(PLUGIN_INSTALL_DIR)
+ $(PRINT_CP) $(BINDIR)
+ if [ -f frama-c-$(PLUGIN_NAME).byte$(EXE) ]; then \
+@@ -191,9 +192,9 @@ install::
+ $(CP) frama-c-$(PLUGIN_NAME).$(OCAMLBEST)$(EXE) \
+ $(BINDIR)/frama-c-$(PLUGIN_NAME)$(EXE); \
+ fi
+- $(PRINT_UPDATE) $(FRAMAC_SHARE)/known_plugins.ac
+- echo "ENABLE_`echo $(PLUGIN_NAME) | tr "a-z" "A-Z"`=$(PLUGIN_ENABLE)" \
+- >> $(FRAMAC_SHARE)/known_plugins.ac
++ #$(PRINT_UPDATE) $(FRAMAC_SHARE)/known_plugins.ac
++ #echo "ENABLE_`echo $(PLUGIN_NAME) | tr "a-z" "A-Z"`=$(PLUGIN_ENABLE)" \
++ # >> $(FRAMAC_SHARE)/known_plugins.ac
+ ifeq ($(HAS_GUI),yes)
+ $(PRINT_CP) $(PLUGIN_INSTALL_DIR)/gui
+ $(CP) $(TARGETS_GUI) $(PLUGIN_INSTALL_DIR)/gui
diff --git a/sci-mathematics/frama-c/frama-c-20090901.ebuild b/sci-mathematics/frama-c/frama-c-20100401.ebuild
index 966a6a2a2..4375878f7 100644
--- a/sci-mathematics/frama-c/frama-c-20090901.ebuild
+++ b/sci-mathematics/frama-c/frama-c-20100401.ebuild
@@ -8,36 +8,34 @@ inherit autotools eutils
DESCRIPTION="Frama-C is a suite of tools dedicated to the analysis of the source code of software written in C."
HOMEPAGE="http://www.frama-c.cea.fr/"
-NAME="Beryllium"
-SRC_URI="http://www.frama-c.cea.fr/download/${PN/-c/-c-$NAME}-${PV/_/-}.tar.gz"
+NAME="Boron"
+SRC_URI="http://www.frama-c.com/download/${PN/-c/-c-$NAME}-${PV/_/-}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="apron coq doc gappa gtk pff +why"
+IUSE="apron doc gtk +why"
RESTRICT="strip"
DEPEND=">=dev-lang/ocaml-3.10.2
- >=dev-ml/ocamlgraph-1.2
- gtk? ( >=dev-ml/lablgtk-2.12 )
+ >=dev-ml/ocamlgraph-1.4
+ gtk? ( >=x11-libs/gtksourceview-2.8
+ >=gnome-base/libgnomecanvas-2.26
+ >=dev-ml/lablgtk-2.14 )
sci-mathematics/ltl2ba
- apron? ( sci-mathematics/apron )
- coq? ( sci-mathematics/coq )
- gappa? ( sci-mathematics/gappalib-coq )
- pff? ( sci-mathematics/pff )
- why? ( sci-mathematics/why )"
+ apron? ( sci-mathematics/apron )"
RDEPEND="${DEPEND}"
+PDEPEND="why? ( >=sci-mathematics/why-2.26 )"
S="${WORKDIR}/${PN/-c/-c-$NAME}-${PV/_/-}"
src_prepare(){
- touch config_file
-
- epatch "${FILESDIR}/${P}-varinfo_export.patch"
- epatch "${FILESDIR}/${P}-why_link.patch"
- epatch "${FILESDIR}/${P}-ocamlgraph_link.patch"
+ epatch "${FILESDIR}/${P}-plugin_install.patch"
epatch "${FILESDIR}/${P}-always_init.patch"
+ touch config_file
+ sed -i configure.in \
+ -e "s:1.4):1.5):g"
eautoreconf
}
@@ -48,7 +46,7 @@ src_configure() {
myconf="--disable-gui"
fi
- econf ${myconf} --with-whydir=no || die "econf failed"
+ econf ${myconf} || die "econf failed"
}
src_compile() {
diff --git a/sci-mathematics/frama-c/metadata.xml b/sci-mathematics/frama-c/metadata.xml
index c029f41a6..bcd42f6df 100644
--- a/sci-mathematics/frama-c/metadata.xml
+++ b/sci-mathematics/frama-c/metadata.xml
@@ -1,15 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<maintainer>
- <email>sci@gentoo.org</email>
-</maintainer>
- <use>
- <flag name="apron">?apron?</flag>
- <flag name="coq">?coq?</flag>
- <flag name="gappa">?gappa?</flag>
- <flag name="pff">?pff?</flag>
- <flag name="why">?why?</flag>
- </use>
+ <herd>sci</herd>
+ <longdescription>
+ Frama-C is a suite of tools dedicated to the analysis of the source code
+ of software written in C. It gathers several static analysis techniques
+ in a single collaborative framework. The collaborative approach of
+ Frama-C allows static analyzers to build upon the results already
+ computed by other analyzers in the framework. Thanks to this approach,
+ Frama-C provides sophisticated tools, such as a slicer and dependency
+ analysis.
+ </longdescription>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="apron">?apron?</flag>
+ <flag name="gtk">?gtk?</flag>
+ <flag name="why">?why?</flag>
+ </use>
</pkgmetadata>