[gentoo-commits] proj/sci:master commit in: sci-mathematics/why/files/, sci-mathematics/why/

["Jonathan-Christofer Demay" <jcdemay@gmail.com>]

commit:     e3c726212dd711c207595d0a3a1c3635a4de15c0
Author:     Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
AuthorDate: Mon Feb 14 15:31:35 2011 +0000
Commit:     Jonathan-Christofer Demay <jcdemay <AT> gmail <DOT> com>
CommitDate: Mon Feb 14 15:31:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e3c72621

sci-mathematics/why: version bump

---
 sci-mathematics/why/ChangeLog                      |    8 +++-
 sci-mathematics/why/files/why_jessie-carbon.patch  |   36 ++++++++++++++++++++
 .../why/{why-2.26.ebuild => why-2.28.ebuild}       |    3 +-
 3 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/sci-mathematics/why/ChangeLog b/sci-mathematics/why/ChangeLog
index b2e6fb9..dcc0e0f 100644
--- a/sci-mathematics/why/ChangeLog
+++ b/sci-mathematics/why/ChangeLog
@@ -1,14 +1,18 @@
 # ChangeLog for sci-mathematics/why
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  14 Feb 2011; J.-C. Demay <jcdemay@gmail.com>
+  -why-2.26.ebuild, +why-2.28.ebuild, files/why_jessie-carbon.patch:
+  version bump
+
   11 Jul 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
   why-2.26.ebuild:
   Silenced repoman; dropped ~sparc since dependencies cannot be fulfilled.
 
   08 Jul 2010; J.-C. Demay <jcdemay@gmail.com>
   -why-2.19.ebuild, +why-2.26.ebuild:
-  Version Bump
+  version Bump
 
   08 Jul 2010; J.-C. Demay <jcdemay@gmail.com>
   +ChangeLog, +metadata.xml:

diff --git a/sci-mathematics/why/files/why_jessie-carbon.patch b/sci-mathematics/why/files/why_jessie-carbon.patch
new file mode 100644
index 0000000..0288bc7
--- /dev/null
+++ b/sci-mathematics/why/files/why_jessie-carbon.patch
@@ -0,0 +1,36 @@
+diff -Naurp why-2.28-orig/jc/jc_annot_inference.ml why-2.28/jc/jc_annot_inference.ml
+--- why-2.28/jc/jc_annot_inference.ml	2010-12-17 20:06:44.000000000 +0000
++++ why-2.28/jc/jc_annot_inference.ml	2011-02-14 11:34:21.000000000 +0000
+@@ -150,8 +150,8 @@ let rec destruct_pointer t =
+     | JCTvar _ | JCTderef _ | JCTapp _ | JCTold _ | JCTat _ | JCTif _ 
+     | JCTrange _ | JCTmatch _ | JCTaddress _ | JCTbase_block _
+     | JCTconst _ | JCTbinary _ | JCTunary _ | JCToffset _ | JCTinstanceof _ 
+-    | JCTreal_cast _ | JCTrange_cast _ | JCTbitwise_cast _ | JCTcast _ ->
+-	None
++    | JCTreal_cast _ | JCTrange_cast _ | JCTbitwise_cast _ | JCTcast _
++    | JCTlet (_, _, _) -> None
+ 
+ let equality_operator_of_type ty = `Beq, operator_of_type ty
+ 
+@@ -610,8 +610,8 @@ let rec atp_of_term t =
+ 	Atp.Var (Vwp.variable_for_term t)
+     | JCTshift _ | JCTold _ | JCTat _ | JCTmatch _ | JCTinstanceof _ 
+     | JCTcast _ | JCTrange_cast _ | JCTbitwise_cast _ | JCTreal_cast _ 
+-    | JCTaddress _ | JCTif _ | JCTrange _ | JCTunary _ | JCTbase_block _ ->
+-	err ()
++    | JCTaddress _ | JCTif _ | JCTrange _ | JCTunary _ | JCTbase_block _
++    | JCTlet (_, _, _) -> err ()
+ 
+ let rec term_of_atp tm =
+   try
+@@ -1198,8 +1198,8 @@ let linearize t =
+       | JCTunary _ | JCTshift _ | JCTinstanceof _ | JCTmatch _ 
+       | JCTold _ | JCTat _ | JCTcast _ | JCTbitwise_cast _ 
+       | JCTrange_cast _ | JCTreal_cast _ | JCTaddress _ | JCTbase_block _
+-      | JCTrange _ | JCTif _ -> 
+-	  err ()
++      | JCTrange _ | JCTif _
++      | JCTlet (_, _, _) -> err ()
+     with Failure "linearize" -> 
+       (TermMap.add t (Int 1) TermMap.empty, Int 0)
+   in aux t

diff --git a/sci-mathematics/why/why-2.26.ebuild b/sci-mathematics/why/why-2.28.ebuild
similarity index 96%
rename from sci-mathematics/why/why-2.26.ebuild
rename to sci-mathematics/why/why-2.28.ebuild
index 57ed678..2095e82 100644
--- a/sci-mathematics/why/why-2.26.ebuild
+++ b/sci-mathematics/why/why-2.28.ebuild
@@ -36,7 +36,8 @@ src_prepare() {
 		-e "s/oct_caml/octMPQ_caml/g" \
 		-e "s/box_caml/boxMPQ_caml/g" \
 		-e "s/polka_caml/polkaMPQ_caml/g"
-
+	
+	epatch "${FILESDIR}"/${PN}_jessie-carbon.patch
 	eautoreconf
 }