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

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

6 files changed, 74 insertions, 13 deletions

diff --git a/sci-mathematics/coq/ChangeLog b/sci-mathematics/coq/ChangeLog
index d11c606a8ee9..164c353ec003 100644
--- a/sci-mathematics/coq/ChangeLog
+++ b/sci-mathematics/coq/ChangeLog
@@ -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 <gienah@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 <aballier@gentoo.org> coq-8.4_p5.ebuild:
   update deps for ocaml 4.02
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 48b9fdb55d2b..2e523438cf96 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -2,6 +2,9 @@
 Hash: SHA256
 
 AUX coq-8.4_p1-camlp4.patch 594 SHA256 453e8761bc525de0f96c72e43d777dc6e3bf9fdb6ab79fb602793f290ed30aa0 SHA512 1d6ed0ac8e6b321a4d942969076fef46a07de13c4d3e40776af7740182e87d025cef1ad523ce2b5c0c1fd567ef66eabfdbf727ae5729cd68ce85c936bd42d1dd WHIRLPOOL 6103237e90f19ded2e07fa8e279a368f794607591d5258b5fb41ab9a827c99c0cef058877891dfc888726bbc724185c3d548b1a7c2d0684bf69b30f3601ce4e5
+AUX coq-8.4_p5-do-not-install-revision.patch 695 SHA256 940d926eeb60b40d491ade24ddd03fdadf8ddae0f1d4daeebb69ea458c0638c7 SHA512 bd4d73aa6f8e1471030cac13263df398fe504cc375f68111f099a9f93e68ae0d56e55ac97071a435db3421c3355d92c507bae2c8abb3c92623780428b23bc76a WHIRLPOOL 90f96d4b78547ca361bd6e769e1805ae7ee6ef204c7d11302671298e91bf57fb3d84d9030d4d1aa65c101183db5641f30b070e57ef27365984c9b199b4658343
+AUX coq-8.4_p5-hevea.patch 546 SHA256 574eeafacd44722253eae9ed63e5a217fc4f8264953d6bc4bf4919738de9de1d SHA512 5a29c63b3054070bef1664b928cc5e7403c778acccbf7f395a4c20a21a31b3bf4fdf888114278afd2fee19fdf85acab01819af006abe2c59da79b51bf67815b5 WHIRLPOOL af234a8170ec22a596a4d426d25ce0a812d75ee75889871567e9833b56976b89441b9d829f7cd7a69ab28613b9a98c6dcb332081c6e1f79c41a406d2a1dd279b
+AUX coq-8.4_p5-no-clean-before-test.patch 383 SHA256 ca2a3d32b2203de99fcf5a6d187eece62d34eb9d9a5a883fb3684f62baf870b0 SHA512 e655b47651e645d29ff5002f7f90681aa09c8b087d70c5e94e0ac5d915089097deea9763db203c367e152c0b456646c43b52daf6f6bf0112c6c75eb50881976a WHIRLPOOL 644ebe3f0ded3fb2688cf1c9afdc3fdc6e22523623289cc64acd6095664a24f1d920b17543d16c0074e512a1eaa4bb67f3740815c80b3a5bdbca00fdb2640031
 AUX coqide.desktop 241 SHA256 4d2fd36d987021fe2f5a546d9c80c78700830931512e6970d44cfbba3dad50e4 SHA512 ee74f41a2684b9dcac099ef58d4d9b498382c4d109277fd2efcd984a2c8e38667040c899c91ebb136b735a8edea48a4a746c12034d280ffaf6bae83c61bd854d WHIRLPOOL d38bf0114b0c285fe18e2a799d41cfe01db8f24bc9deaf88b266160fc32c694914faea01143edc749e0bc67ed47f02ee2338a309947e4ff1fc44dba508f99112
 DIST coq-8.3pl1.tar.gz 3756961 SHA256 3a497386bd74f43a5af1d0c53f29a017ce7ed1b1e60c052217fe04b7f40be928
 DIST coq-8.4pl1.tar.gz 4139808 SHA256 5d0e4553ab50677a94b4d5ca1650a90718e9362082a649ba95be4010390a0f80 SHA512 dc0073d2cbce91ac27749d84de1b350ad71632555a682d8af6612768d2c92311eb1fd36b7370e0fb630d540639a1c7e16f26a9de25d03d82c3a6eefb99aa3420 WHIRLPOOL e912b97ba1f91d3398d569a588d7cb420389c88971847e66ddff38c3fc715e45842aab285e343c0c6339da659f324ee7b60f37fd0cdcd5a8ce27ab0e8cce915a
@@ -12,13 +15,13 @@ EBUILD coq-8.3_p1.ebuild 2129 SHA256 111ec6cb5612ecf95164515314840dcf562b606b088
 EBUILD coq-8.4_p1.ebuild 2096 SHA256 83fc4294a2d5d5f236225e7b403538806bef7642f0f4f7a6ccf25ac7994df361 SHA512 89d23b58d14e914c4019fa6d8a9fe3d019138ad0f0e5b7f40df413d50bd51471f1494d205c4514cd6ad603843d97894c6009f44d6dfe1c73bc090378a70c8c98 WHIRLPOOL d6cd968483b6b491c77154ce77941c541c5f853abaf809a4f8b144cc5408b2fd43e8066f48cc745239f15061144b106d100e5a404570ae22e7bc5df2a0852e21
 EBUILD coq-8.4_p2.ebuild 2013 SHA256 f6b5b1dfbccf4153a0916903f95d67a2b7284ad3746afad6ca3657285beef8bb SHA512 90a6d883dff9c6966a7b50e05d10d924f50f0f8e433f8b33d3d562c68825c14ec22d0c120d13d6d2061fb141fe03ecd480cf2456182b337711864a4156c01d0c WHIRLPOOL 60f8f20d755488ec88d708368f8e6d35a0204d049128716536706ed656aa6ebaef744f7c14cf7c5993a8a8278fda2f884d007e6e1698e0b25bff48229e93a0e0
 EBUILD coq-8.4_p3.ebuild 1996 SHA256 cdb1f77fc542b0c3a3c12d69656af19a32887daa7f66ead2f8215f7d9ade69d7 SHA512 b5facb001306516d9c5df9669977c2c1c2cc3634d370961d035286aab1425d387882dad05815feb05fb24b417495ffa55a86d35b7418dd6e4b5245c9cb71a5d8 WHIRLPOOL 4997f45d55b0ad65d457b24c3ceca658ec4577ce59885452937da1ebe22f88e1ded11dbce0f8690fb13d663ac67baff80eea2a5033cbdb7b7cf4bd8902b0c9cd
-EBUILD coq-8.4_p5.ebuild 2245 SHA256 6248717b6cea855c11e8c823b0f90b68e5878697de2da473428f1a2e42c105ff SHA512 3c9a996f8cef2e214f7aca2fb14d845b0bd52dafbd4c242a9365b085b96380a1f23588f0c78547f3914081fbf2773b551071377e5f1bae017754f18e55fa5c1e WHIRLPOOL 345a6f9d77d2b80ccf8e89c16a724a801105c6c0593851bcfec4d24b182346e02b184eadb7f5629216ac1bf02f667fb343f92e74110ee0db1640dd7be33921cb
-MISC ChangeLog 13679 SHA256 cdaaa3bfba2279e2c35f0db45afa0e1594fa48babfa055f65ea94a54a3b9fa9f SHA512 f6afd31042c9e3e82b21c863ecd07bcec07702878c7bade13ef024168279abe46bbd63711f9ca4aecfbe6538fbad04bab749cc761fdf2e329754bfcbf1b389d0 WHIRLPOOL bf590b73a1a45b6378362d2d8a6d7959d9ecc04165c81e553308295dbd083c98bfab0a69ebe41fcba424a492d67e93bf4ae5dfb157ddff0c885ac38a774c1d62
+EBUILD coq-8.4_p5.ebuild 2489 SHA256 11e7d8e570856d015c22e83706f649e66ae8eeb7d6ecc44ff5946e114829f055 SHA512 22fe08367d9374ae7b28e21505b211bbe0f9255bd16a9b01d945d0546791313f2859bf208b01b73fd43260a139f5723e3746b6a3cbfbb7d7a94ff214778be0d7 WHIRLPOOL fb689ab56673cf268f02447f9140606d99e57a485bc73771e510bb65a56be063240117b4b82413999fa46752f39d0894e795c72730705130c06acdb980e2889f
+MISC ChangeLog 14253 SHA256 a87a11dae968b2b19ea53179d2febdac322570325b0a9c5e662bef53146ca941 SHA512 c9b6bee51c0bb57127bd5a9a327b7e09883728071789f46b677d1c372ef24cb3ffb05471105823c7ad5c5948cb890cf25d633f24db2928ec07590bc2cb791875 WHIRLPOOL 70f7e2e09a340c282e633aad588bc160c1c0bffc70e5627c3b79f9740ae03f303bf68cefdcb23a6369f9b8e800051a9732ae8a91587d263bb92aef7b87473ca3
 MISC metadata.xml 912 SHA256 004efe7e4a2a780d79f709c74ceb3477407b1f0120218eaf7b11e3d82cb67b65 SHA512 b0720691e44431b8060bd2fd5870147f68c9d4d887b46e667661c034f4efdecb638cd80ea6efd474c231ab342d9e708a522075a38c0de5f1a49040af2865ff2a WHIRLPOOL 05fce40010254b116541116a9851984382accbf5b9660696887857224aa45265d51ac64f8780a6224fa071eebc15efd04f85c2008b856741b291483d5a8c5666
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlR4yNAACgkQvFcC4BYPU0rcGQCgwc8bfxm5vxXtYq7Fy8I7OQT/
-AToAoM19wyvmMOzACR+mSkLl/46AuMTK
-=ceVM
+iF4EAREIAAYFAlTgQNwACgkQoBEVQmGOlx+9nQD/cEpXOOr4jH7ceJJVFpErkUAG
+mn/QBdACOJmIAHr6UgQA/RZCC8kKjAtrd7i/B1eh384xuNDwKcstxNthASwdbWLy
+=yI91
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/coq/coq-8.4_p5.ebuild b/sci-mathematics/coq/coq-8.4_p5.ebuild
index e3ace8057f3b..cdae7204a41b 100644
--- a/sci-mathematics/coq/coq-8.4_p5.ebuild
+++ b/sci-mathematics/coq/coq-8.4_p5.ebuild
@@ -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 @@ DEPEND="${RDEPEND}
 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 @@ src_compile() {
 	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"
diff --git a/sci-mathematics/coq/files/coq-8.4_p5-do-not-install-revision.patch b/sci-mathematics/coq/files/coq-8.4_p5-do-not-install-revision.patch
new file mode 100644
index 000000000000..e97f4a165f87
--- /dev/null
+++ b/sci-mathematics/coq/files/coq-8.4_p5-do-not-install-revision.patch
@@ -0,0 +1,19 @@
+--- 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
diff --git a/sci-mathematics/coq/files/coq-8.4_p5-hevea.patch b/sci-mathematics/coq/files/coq-8.4_p5-hevea.patch
new file mode 100644
index 000000000000..c76f1dea8e11
--- /dev/null
+++ b/sci-mathematics/coq/files/coq-8.4_p5-hevea.patch
@@ -0,0 +1,11 @@
+--- 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@' > $@
+ 
+ 
+ ######################################################################
diff --git a/sci-mathematics/coq/files/coq-8.4_p5-no-clean-before-test.patch b/sci-mathematics/coq/files/coq-8.4_p5-no-clean-before-test.patch
new file mode 100644
index 000000000000..ef4b6cf3e824
--- /dev/null
+++ b/sci-mathematics/coq/files/coq-8.4_p5-no-clean-before-test.patch
@@ -0,0 +1,12 @@
+--- 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
+