Fix coq 8.3_p2 and 8.3_p3 builds with dev-ml/camlp5-6.05. Stdpp.Exc_located is an alias for Ploc.Exc, it has been deprecated for a while, and was removed in dev-ml/camlp5-6.05. Fixed by upstream in svn repo: https://coq.inria.fr/bugs/show_bug.cgi?id=2728

Package-Manager: portage-2.1.10.51/cvs/Linux x86_64

4 files changed, 67 insertions, 12 deletions

diff --git a/sci-mathematics/coq/ChangeLog b/sci-mathematics/coq/ChangeLog
index 035656887ea9..2196c6f840ee 100644
--- a/sci-mathematics/coq/ChangeLog
+++ b/sci-mathematics/coq/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/coq
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.68 2012/02/23 21:15:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.69 2012/03/24 13:59:39 gienah Exp $
+
+  24 Mar 2012; Mark Wright <gienah@gentoo.org> coq-8.3_p2.ebuild,
+  coq-8.3_p3.ebuild:
+  Fix coq 8.3_p2 and 8.3_p3 builds with dev-ml/camlp5-6.05. Stdpp.Exc_located
+  is an alias for Ploc.Exc, it has been deprecated for a while, and was removed
+  in dev-ml/camlp5-6.05. Fixed by upstream in svn repo:
+  https://coq.inria.fr/bugs/show_bug.cgi?id=2728
 
 *coq-8.3_p3 (23 Feb 2012)
 
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 576ed9b3759b..bddde3297930 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX coqide.desktop 233 RMD160 3f9d112d7f55454f72c42b427005b37971c6e928 SHA1 40571b86c25793e7d4e9bef80f637d7440b03704 SHA256 dba2e81a408ae51e187c2a164794f9505c4abfa0b92f47a44d0e9f96e2b6dfac
 DIST coq-8.3pl1.tar.gz 3756961 RMD160 687983bcaca723299b6ea902a1e1b07338209d55 SHA1 3fae9fa2fd6f39c9fb3c0b67fcd5e71f1e7a5f9f SHA256 3a497386bd74f43a5af1d0c53f29a017ce7ed1b1e60c052217fe04b7f40be928
 DIST coq-8.3pl2.tar.gz 3760176 RMD160 f59ee288a35c1009f88f050362bee21311b459a8 SHA1 8506761e4755739cc728aff790dd778db8217f3f SHA256 b82b44ec585903b6bfadca02008eb5549cda46038c776ec115bc408c4e0f34f1
 DIST coq-8.3pl3.tar.gz 3859883 RMD160 8d44bb8df810c644d10c53d0496cd28ea66fcbb3 SHA1 a5b0cbca8bf556fe7eb804ccdb39bba49e1ae014 SHA256 af259e9a723761327137018fdc0b98ada71095ff033b9e169d175d92b9537947
 EBUILD coq-8.3_p1.ebuild 2142 RMD160 9f6c3f5ffcd8a6575ab544eb1a30e10a353d23ee SHA1 7385d4ac8d7ec8b248a152942afbe8bc07941f51 SHA256 812c6ef68e6cbd4608eec74489e850c8349be6d79901d76f31e4c709be67767b
-EBUILD coq-8.3_p2.ebuild 2216 RMD160 ba1d1da6b97b0b4085d4daae3f6b0d36c91fe46a SHA1 d0e0ce2d40ec489a0adc301861daaf2292a1459d SHA256 9c3560e18a37da322ee9f5a2e89929164734eb887255e1dca54de4e7fc1800aa
-EBUILD coq-8.3_p3.ebuild 2216 RMD160 14ffbe87a77268dea5b027996d3119cfa93dc427 SHA1 82fccd246971d527ef0ac46a56e2335e8f982cbc SHA256 09a50c701b25b1313acdcdd16f09e65bd53b0ed5a2131e1a3a5d608af4df7a2f
-MISC ChangeLog 11061 RMD160 ca9845dd4e39f253f640b67e4c2e506984206475 SHA1 f421f5714f4af8e5f7b5aa0330db05b49e5e4e56 SHA256 e48c065f5beefed60d2d1f4e0dbefa73b68b2c09c5f120fcf71edae779aefd29
+EBUILD coq-8.3_p2.ebuild 3163 RMD160 5c1786fc791605cd3f69bf709e8b7489d980b7a7 SHA1 125fa92ffa6271eaf8ad69e084285c9278f22d44 SHA256 c20212a95b2aa6cd7e9a889ae2f26c512ddc46322d487d5d87be31170edbed97
+EBUILD coq-8.3_p3.ebuild 3163 RMD160 d777060a3af22b750e1621a188ebe6360aa23ade SHA1 995ca24bcaa5ac1c78f77b3fc19c77050c2fd5b0 SHA256 4e32cd0c79e31db0e3bae0d5bb758d29d27b1041831969e3e007b8dc6cfe7f14
+MISC ChangeLog 11410 RMD160 181f29c19c67beb8e63b5e1402394b21424d7890 SHA1 ff4d0a27f595421e214249b969c78cb37530c34d SHA256 929d9a03089e239c3dd3a4d489397a71f64fe62d914ce0d9fa17c25f22414549
 MISC metadata.xml 788 RMD160 98e6a38354c1398f7bed64f34aa88e1d439190b3 SHA1 7d9ce5fed17eaf9bf756b493c76c27678212995b SHA256 5028003bf6d1ec17b51ce45c17bb565137f825a5eefcdf57de4a98c5c61d0626
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9GrIIACgkQvFcC4BYPU0qyywCgv1XMRfLYPrn44OD7z/WezCjf
-lOgAn3/Mx5iZzG5mJv+ja1Cau1GdloOO
-=rceO
+iF4EAREIAAYFAk9t01oACgkQoBEVQmGOlx8hhQEAyE3LSLH9ru9PS+PMNIsgKTzO
+uzjRNwwVihKcivhLka0A/RSWqfQ1qssOVGts7MUCK6OmCTFrPoATspD40quSPC1X
+=1Cr6
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/coq/coq-8.3_p2.ebuild b/sci-mathematics/coq/coq-8.3_p2.ebuild
index 24cd4b890f10..37dc9f4b8047 100644
--- a/sci-mathematics/coq/coq-8.3_p2.ebuild
+++ b/sci-mathematics/coq/coq-8.3_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.3_p2.ebuild,v 1.2 2011/10/05 18:54:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.3_p2.ebuild,v 1.3 2012/03/24 13:59:39 gienah Exp $
 
 EAPI="2"
 
@@ -40,6 +40,30 @@ src_prepare() {
 	# wild sed which replaces \"$LABLGTKLIB\" by $LABLGTKLIB.  Note
 	# during pl2-bump: Hmm, my patch did not get applied upstream?
 	sed -i "s/\\\\\"\\\$LABLGTKLIB\\\\\"/\\\$LABLGTKLIB/" configure
+	# Stdpp.Exc_located is an alias for Ploc.Exc, it has been
+	# deprecated for a while, and was removed in dev-ml/camlp5-6.05
+	# Fixed by upstream in svn repo:
+	# https://coq.inria.fr/bugs/show_bug.cgi?id=2728
+	sed -e 's@Stdpp.Exc_located@Ploc.Exc@g' \
+		-i "${S}/checker/checker.ml" \
+		-i "${S}/ide/coq.ml" \
+		-i "${S}/lib/util.ml" \
+		-i "${S}/lib/util.mli" \
+		-i "${S}/parsing/ppvernac.ml" \
+		-i "${S}/plugins/subtac/subtac_obligations.ml" \
+		-i "${S}/pretyping/cases.ml" \
+		-i "${S}/pretyping/pretype_errors.ml" \
+		-i "${S}/pretyping/typeclasses_errors.ml" \
+		-i "${S}/proofs/logic.ml" \
+		-i "${S}/proofs/refiner.ml" \
+		-i "${S}/tactics/class_tactics.ml4" \
+		-i "${S}/tactics/extratactics.ml4" \
+		-i "${S}/tactics/rewrite.ml4" \
+		-i "${S}/tactics/tacinterp.ml" \
+		-i "${S}/toplevel/cerrors.ml" \
+		-i "${S}/toplevel/toplevel.ml" \
+		-i "${S}/toplevel/vernac.ml" \
+		|| die "Could not rename deprecated Stdpp.Exc_located to Ploc.Exc"
 }
 
 src_configure() {
diff --git a/sci-mathematics/coq/coq-8.3_p3.ebuild b/sci-mathematics/coq/coq-8.3_p3.ebuild
index 8836580a4c88..0f6bea9a97c2 100644
--- a/sci-mathematics/coq/coq-8.3_p3.ebuild
+++ b/sci-mathematics/coq/coq-8.3_p3.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/coq/coq-8.3_p3.ebuild,v 1.1 2012/02/23 21:15:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.3_p3.ebuild,v 1.2 2012/03/24 13:59:39 gienah Exp $
 
 EAPI="2"
 
@@ -40,6 +40,30 @@ src_prepare() {
 	# wild sed which replaces \"$LABLGTKLIB\" by $LABLGTKLIB.  Note
 	# during pl2-bump: Hmm, my patch did not get applied upstream?
 	sed -i "s/\\\\\"\\\$LABLGTKLIB\\\\\"/\\\$LABLGTKLIB/" configure
+	# Stdpp.Exc_located is an alias for Ploc.Exc, it has been
+	# deprecated for a while, and was removed in dev-ml/camlp5-6.05
+	# Fixed by upstream in svn repo:
+	# https://coq.inria.fr/bugs/show_bug.cgi?id=2728
+	sed -e 's@Stdpp.Exc_located@Ploc.Exc@g' \
+		-i "${S}/checker/checker.ml" \
+		-i "${S}/ide/coq.ml" \
+		-i "${S}/lib/util.ml" \
+		-i "${S}/lib/util.mli" \
+		-i "${S}/parsing/ppvernac.ml" \
+		-i "${S}/plugins/subtac/subtac_obligations.ml" \
+		-i "${S}/pretyping/cases.ml" \
+		-i "${S}/pretyping/pretype_errors.ml" \
+		-i "${S}/pretyping/typeclasses_errors.ml" \
+		-i "${S}/proofs/logic.ml" \
+		-i "${S}/proofs/refiner.ml" \
+		-i "${S}/tactics/class_tactics.ml4" \
+		-i "${S}/tactics/extratactics.ml4" \
+		-i "${S}/tactics/rewrite.ml4" \
+		-i "${S}/tactics/tacinterp.ml" \
+		-i "${S}/toplevel/cerrors.ml" \
+		-i "${S}/toplevel/toplevel.ml" \
+		-i "${S}/toplevel/vernac.ml" \
+		|| die "Could not rename deprecated Stdpp.Exc_located to Ploc.Exc"
 }
 
 src_configure() {