gienah 15/02/15 06:46:47
Added: coq-8.4_p5-no-clean-before-test.patch
coq-8.4_p5-do-not-install-revision.patch
coq-8.4_p5-hevea.patch
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.1
sci-mathematics/coq/files/coq-8.4_p5-no-clean-before-test.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/files/coq-8.4_p5-no-clean-before-test.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/files/coq-8.4_p5-no-clean-before-test.patch?rev=1.1&content-type=text/plain
Index: coq-8.4_p5-no-clean-before-test.patch
===================================================================
--- coq-8.4pl5-orig/Makefile.build 2015-02-15 12:06:48.044999959 +1100
+++ coq-8.4pl5/Makefile.build 2015-02-15 16:41:06.521892146 +1100
@@ -395,8 +395,7 @@
check:: validate test-suite
-test-suite: world $(ALLSTDLIB).v
- $(MAKE) $(MAKE_TSOPTS) clean
+test-suite: $(ALLSTDLIB).v
$(MAKE) $(MAKE_TSOPTS) all
$(HIDE)if grep -F 'Error!' test-suite/summary.log ; then false; fi
1.1
sci-mathematics/coq/files/coq-8.4_p5-do-not-install-revision.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/files/coq-8.4_p5-do-not-install-revision.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/files/coq-8.4_p5-do-not-install-revision.patch?rev=1.1&content-type=text/plain
Index: coq-8.4_p5-do-not-install-revision.patch
===================================================================
--- coq-8.4pl5-orig/Makefile.build 2014-10-22 19:30:53.000000000 +1100
+++ coq-8.4pl5/Makefile.build 2015-02-15 12:06:48.044999959 +1100
@@ -655,16 +655,12 @@
# it with libraries
-$(MKDIR) $(FULLCOQLIB)/plugins/micromega
$(INSTALLBIN) $(CSDPCERT) $(FULLCOQLIB)/plugins/micromega
- rm -f $(FULLCOQLIB)/revision
- -$(INSTALLLIB) revision $(FULLCOQLIB)
install-library-light:
$(MKDIR) $(FULLCOQLIB)
$(INSTALLSH) $(FULLCOQLIB) $(LIBFILESLIGHT) $(INITPLUGINS)
$(MKDIR) $(FULLCOQLIB)/states
$(INSTALLLIB) states/*.coq $(FULLCOQLIB)/states
- rm -f $(FULLCOQLIB)/revision
- -$(INSTALLLIB) revision $(FULLCOQLIB)
ifeq ($(BEST),opt)
$(INSTALLSH) $(FULLCOQLIB) $(INITPLUGINSOPT)
endif
1.1 sci-mathematics/coq/files/coq-8.4_p5-hevea.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/files/coq-8.4_p5-hevea.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/files/coq-8.4_p5-hevea.patch?rev=1.1&content-type=text/plain
Index: coq-8.4_p5-hevea.patch
===================================================================
--- coq-8.4pl5-orig/Makefile.doc 2014-10-22 19:30:53.000000000 +1100
+++ coq-8.4pl5/Makefile.doc 2015-02-15 15:28:34.797911303 +1100
@@ -148,7 +148,7 @@
######################################################################
$(INDEXURLS): $(INDEXES)
- cat $< | grep li-indexenv | grep HREF | sed -e 's@.*<TT>\(.*\)</TT>.*,
<A HREF="\(.*\)">.*@\1,\2@' > $@
+ cat $< | grep li-indexenv | grep href | sed -e
's@.*>\([^<]*\)</span>.*, <a href="\([^"]*\)">.*@\1,\2@' > $@
######################################################################
