From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5D277138222 for ; Tue, 3 May 2016 09:14:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 019B321C00C; Tue, 3 May 2016 09:14:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8FC1821C01D for ; Tue, 3 May 2016 09:14:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C4F4C340BBE for ; Tue, 3 May 2016 09:14:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0388B929 for ; Tue, 3 May 2016 09:14:12 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1462266832.7972add23cda61c8a53bb27cd71e1dff60b55070.aballier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-mathematics/coq/files/, sci-mathematics/coq/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-mathematics/coq/coq-8.5_p1.ebuild sci-mathematics/coq/files/oc43.patch X-VCS-Directories: sci-mathematics/coq/ sci-mathematics/coq/files/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 7972add23cda61c8a53bb27cd71e1dff60b55070 X-VCS-Branch: master Date: Tue, 3 May 2016 09:14:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a3b07f1a-974b-4da7-9c95-717e10cce6a4 X-Archives-Hash: b848afc77f7f0623fdc47cb5a6fd006b commit: 7972add23cda61c8a53bb27cd71e1dff60b55070 Author: Alexis Ballier gentoo org> AuthorDate: Sun May 1 17:42:45 2016 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Tue May 3 09:13:52 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7972add2 sci-mathematics/coq: fix build with ocaml 4.03 Package-Manager: portage-2.2.28 Signed-off-by: Alexis Ballier gentoo.org> sci-mathematics/coq/coq-8.5_p1.ebuild | 1 + sci-mathematics/coq/files/oc43.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/sci-mathematics/coq/coq-8.5_p1.ebuild b/sci-mathematics/coq/coq-8.5_p1.ebuild index 1dffb39..b1cc467 100644 --- a/sci-mathematics/coq/coq-8.5_p1.ebuild +++ b/sci-mathematics/coq/coq-8.5_p1.ebuild @@ -39,6 +39,7 @@ S=${WORKDIR}/${MY_P} src_prepare() { epatch "${FILESDIR}/${PN}-8.5-do-not-install-revision.patch" epatch "${FILESDIR}/${PN}-8.4_p5-no-clean-before-test.patch" + has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch" } src_configure() { diff --git a/sci-mathematics/coq/files/oc43.patch b/sci-mathematics/coq/files/oc43.patch new file mode 100644 index 0000000..47fa10a --- /dev/null +++ b/sci-mathematics/coq/files/oc43.patch @@ -0,0 +1,13 @@ +Index: coq-8.5pl1/Makefile.common +=================================================================== +--- coq-8.5pl1.orig/Makefile.common ++++ coq-8.5pl1/Makefile.common +@@ -231,7 +231,7 @@ endif + LINKCMO:=$(CORECMA) $(STATICPLUGINS) + LINKCMX:=$(CORECMA:.cma=.cmxa) $(STATICPLUGINS:.cma=.cmxa) + +-IDEDEPS:=lib/clib.cma lib/xml_lexer.cmo lib/xml_parser.cmo lib/xml_printer.cmo lib/errors.cmo lib/spawn.cmo ++IDEDEPS:=lib/clib.cma lib/errors.cmo lib/spawn.cmo + IDECMA:=ide/ide.cma + IDETOPLOOPCMA=ide/coqidetop.cma +