* [gentoo-commits] gentoo-x86 commit in sci-mathematics/coq: ChangeLog coq-8.3_p2.ebuild coq-8.3_p3.ebuild
@ 2012-03-24 13:59 Mark Wright (gienah)
0 siblings, 0 replies; only message in thread
From: Mark Wright (gienah) @ 2012-03-24 13:59 UTC (permalink / raw
To: gentoo-commits
gienah 12/03/24 13:59:39
Modified: ChangeLog coq-8.3_p2.ebuild coq-8.3_p3.ebuild
Log:
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
(Portage version: 2.1.10.51/cvs/Linux x86_64)
Revision Changes Path
1.69 sci-mathematics/coq/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/ChangeLog?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/ChangeLog?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/ChangeLog?r1=1.68&r2=1.69
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ChangeLog 23 Feb 2012 21:15:41 -0000 1.68
+++ ChangeLog 24 Mar 2012 13:59:39 -0000 1.69
@@ -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)
1.3 sci-mathematics/coq/coq-8.3_p2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/coq-8.3_p2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/coq-8.3_p2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/coq-8.3_p2.ebuild?r1=1.2&r2=1.3
Index: coq-8.3_p2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.3_p2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- coq-8.3_p2.ebuild 5 Oct 2011 18:54:43 -0000 1.2
+++ coq-8.3_p2.ebuild 24 Mar 2012 13:59:39 -0000 1.3
@@ -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 @@
# 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() {
1.2 sci-mathematics/coq/coq-8.3_p3.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/coq-8.3_p3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/coq-8.3_p3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/coq-8.3_p3.ebuild?r1=1.1&r2=1.2
Index: coq-8.3_p3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.3_p3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- coq-8.3_p3.ebuild 23 Feb 2012 21:15:41 -0000 1.1
+++ coq-8.3_p3.ebuild 24 Mar 2012 13:59:39 -0000 1.2
@@ -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 @@
# 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() {
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-03-24 13:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-24 13:59 [gentoo-commits] gentoo-x86 commit in sci-mathematics/coq: ChangeLog coq-8.3_p2.ebuild coq-8.3_p3.ebuild Mark Wright (gienah)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox