Add dependency on sci-mathematics/sha1-polyml, which fixes warnings for some functionality, like using Simpl/Vcg.

(Portage version: 2.1.11.33/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

4 files changed, 32 insertions, 4 deletions

diff --git a/sci-mathematics/isabelle/files/isabelle-2011.1-libsha1.patch b/sci-mathematics/isabelle/files/isabelle-2011.1-libsha1.patch
new file mode 100644
index 000000000000..905a1eb60e5f
--- /dev/null
+++ b/sci-mathematics/isabelle/files/isabelle-2011.1-libsha1.patch
@@ -0,0 +1,11 @@
+--- Isabelle2011-1-orig/src/Pure/General/sha1_polyml.ML	2011-10-10 01:47:58.000000000 +1100
++++ Isabelle2011-1/src/Pure/General/sha1_polyml.ML	2012-12-05 23:28:15.004733643 +1100
+@@ -18,7 +18,7 @@
+   in (op ^) (pairself hex_digit (Integer.div_mod (Char.ord c) 16)) end
+ 
+ val lib_path =
+-  ("$ML_HOME/" ^ (if ML_System.platform_is_cygwin then "sha1.dll" else "libsha1.so"))
++  ("$SHA1_HOME/" ^ (if ML_System.platform_is_cygwin then "sha1.dll" else "libsha1.so"))
+   |> Path.explode;
+ 
+ fun digest_external str =
diff --git a/sci-mathematics/isabelle/files/isabelle-2012-libsha1.patch b/sci-mathematics/isabelle/files/isabelle-2012-libsha1.patch
new file mode 100644
index 000000000000..06933669de7f
--- /dev/null
+++ b/sci-mathematics/isabelle/files/isabelle-2012-libsha1.patch
@@ -0,0 +1,11 @@
+--- Isabelle2012-orig/src/Pure/General/sha1_polyml.ML	2012-05-20 19:34:33.000000000 +1000
++++ Isabelle2012/src/Pure/General/sha1_polyml.ML	2012-12-05 23:24:06.263793934 +1100
+@@ -18,7 +18,7 @@
+   in (op ^) (pairself hex_digit (Integer.div_mod (Char.ord c) 16)) end
+ 
+ val lib_path =
+-  ("$ML_HOME/" ^ (if ML_System.platform_is_cygwin then "sha1.dll" else "libsha1.so"))
++  ("$SHA1_HOME/" ^ (if ML_System.platform_is_cygwin then "sha1.dll" else "libsha1.so"))
+   |> Path.explode;
+ 
+ fun digest_external str =
diff --git a/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild b/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild
index 0eb7f06c3637..60ef15746dc7 100644
--- a/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild
+++ b/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild,v 1.3 2012/12/05 10:09:32 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2011.1-r1.ebuild,v 1.4 2012/12/09 09:24:29 gienah Exp $
 
 EAPI="5"
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 ALL_LOGICS="Pure FOL +HOL ZF CCL CTT Cube FOLP LCF Sequents"
 IUSE="${ALL_LOGICS} doc graphbrowsing ledit readline +proofgeneral test"
 
@@ -28,6 +28,7 @@ DEPEND=">=app-shells/bash-3.0
 		>=dev-lang/perl-5.8.8-r2"
 
 RDEPEND="dev-perl/libwww-perl
+	sci-mathematics/sha1-polyml
 	doc? (
 		virtual/latex-base
 		dev-tex/rail
@@ -79,6 +80,7 @@ src_prepare() {
 		-i "${S}/etc/settings" \
 		|| die "Could not configure Isabelle lib directory in etc/settings"
 	epatch "${FILESDIR}/${PN}-2011.1-graphbrowser.patch"
+	epatch "${FILESDIR}/${PN}-2011.1-libsha1.patch"
 	cat <<- EOF >> "${S}/etc/settings"
 
 		ISABELLE_GHC="${ROOT}usr/bin/ghc"
@@ -86,6 +88,7 @@ src_prepare() {
 		ISABELLE_SWIPL="${ROOT}usr/bin/swipl"
 		ISABELLE_JDK_HOME="\$(java-config --jdk-home)"
 		SCALA_HOME="${ROOT}usr/share/scala"
+		SHA1_HOME="/usr/$(get_libdir)/sha1-polyml"
 	EOF
 	if use ledit && !use readline; then
 		epatch "${FILESDIR}/${PN}-2011.1-reverse-line-editor-order.patch"
diff --git a/sci-mathematics/isabelle/isabelle-2012.ebuild b/sci-mathematics/isabelle/isabelle-2012.ebuild
index aa4bd69bd633..26c607bfd936 100644
--- a/sci-mathematics/isabelle/isabelle-2012.ebuild
+++ b/sci-mathematics/isabelle/isabelle-2012.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2012.ebuild,v 1.4 2012/12/05 10:09:32 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/isabelle/isabelle-2012.ebuild,v 1.5 2012/12/09 09:24:29 gienah Exp $
 
 EAPI="5"
 
@@ -22,7 +22,7 @@ SRC_URI="http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 ALL_LOGICS="Pure FOL +HOL ZF CCL CTT Cube FOLP LCF Sequents"
 IUSE="${ALL_LOGICS} doc graphbrowsing ledit readline pide +proofgeneral test"
 
@@ -34,6 +34,7 @@ DEPEND=">=app-shells/bash-3.0
 		>=dev-lang/perl-5.8.8-r2"
 
 RDEPEND="dev-perl/libwww-perl
+	sci-mathematics/sha1-polyml
 	doc? (
 		virtual/latex-base
 		dev-tex/rail
@@ -93,6 +94,7 @@ src_prepare() {
 		-i "${S}/etc/settings" \
 		|| die "Could not configure Isabelle lib directory in etc/settings"
 	epatch "${FILESDIR}/${PN}-2012-graphbrowser.patch"
+	epatch "${FILESDIR}/${PN}-2012-libsha1.patch"
 	cat <<- EOF >> "${S}/etc/settings"
 
 		ISABELLE_GHC="${ROOT}usr/bin/ghc"
@@ -100,6 +102,7 @@ src_prepare() {
 		ISABELLE_SWIPL="${ROOT}usr/bin/swipl"
 		ISABELLE_JDK_HOME="\$(java-config --jdk-home)"
 		SCALA_HOME="${ROOT}usr/share/scala"
+		SHA1_HOME="/usr/$(get_libdir)/sha1-polyml"
 	EOF
 	if use pide; then
 		cat <<- EOF >> "${S}/etc/settings"