gienah 15/02/15 06:46:47 Modified: coq-8.4_p5.ebuild ChangeLog Log: Fix generation of /usr/share/doc/coq-8.4_p5/html/refman/index_urls.txt, patch from upstream: http://lists.gforge.inria.fr/pipermail/coq-commits/2014-October/013582.html. Replace sed to avoid installing revision with patch. Patch Makefile.build to avoid deleting html/refman/index_urls.txt in the test phase and then failing to install with FEATURES=test and USE=doc (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Revision Changes Path 1.3 sci-mathematics/coq/coq-8.4_p5.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/coq-8.4_p5.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/coq-8.4_p5.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/coq-8.4_p5.ebuild?r1=1.2&r2=1.3 Index: coq-8.4_p5.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.4_p5.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- coq-8.4_p5.ebuild 28 Nov 2014 19:11:10 -0000 1.2 +++ coq-8.4_p5.ebuild 15 Feb 2015 06:46:47 -0000 1.3 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.4_p5.ebuild,v 1.2 2014/11/28 19:11:10 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.4_p5.ebuild,v 1.3 2015/02/15 06:46:47 gienah Exp $ EAPI="5" @@ -37,9 +37,11 @@ S=${WORKDIR}/${MY_P} src_prepare() { - sed -e 's@\($(INSTALLLIB)\) revision@\1@' \ - -i "${S}/Makefile.build" \ - || die "Could not edit Makefile.build to remove install revision" + epatch "${FILESDIR}/${PN}-8.4_p5-do-not-install-revision.patch" + # Fix generation of the index_urls.txt file with Gentoo dev-tex/hevea versions. + # http://lists.gforge.inria.fr/pipermail/coq-commits/2014-October/013582.html + epatch "${FILESDIR}/${P}-hevea.patch" + epatch "${FILESDIR}/${PN}-8.4_p5-no-clean-before-test.patch" } src_configure() { @@ -89,8 +91,12 @@ emake STRIP="true" -j1 world VERBOSE=1 } +src_test() { + emake STRIP="true" check VERBOSE=1 +} + src_install() { - emake STRIP="true" COQINSTALLPREFIX="${D}" install + emake STRIP="true" COQINSTALLPREFIX="${D}" install VERBOSE=1 dodoc README CREDITS CHANGES use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png" 1.85 sci-mathematics/coq/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/ChangeLog?rev=1.85&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/ChangeLog?rev=1.85&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/ChangeLog?r1=1.84&r2=1.85 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- ChangeLog 28 Nov 2014 19:11:10 -0000 1.84 +++ ChangeLog 15 Feb 2015 06:46:47 -0000 1.85 @@ -1,6 +1,16 @@ # ChangeLog for sci-mathematics/coq -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.84 2014/11/28 19:11:10 aballier Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.85 2015/02/15 06:46:47 gienah Exp $ + + 15 Feb 2015; Mark Wright <gie...@gentoo.org> + +files/coq-8.4_p5-do-not-install-revision.patch, + +files/coq-8.4_p5-hevea.patch, +files/coq-8.4_p5-no-clean-before-test.patch, + coq-8.4_p5.ebuild: + Fix generation of /usr/share/doc/coq-8.4_p5/html/refman/index_urls.txt, patch + from upstream: http://lists.gforge.inria.fr/pipermail/coq- + commits/2014-October/013582.html. Replace sed to avoid installing revision + with patch. Patch Makefile.build to avoid deleting html/refman/index_urls.txt + in the test phase and then failing to install with FEATURES=test and USE=doc 28 Nov 2014; Alexis Ballier <aball...@gentoo.org> coq-8.4_p5.ebuild: update deps for ocaml 4.02
