version bump: close bug 553942, thanks to OGINO Masanori

Package-Manager: portage-2.2.18/cvs/Linux i686
Manifest-Sign-Key: 0xB2EFA1D4

3 files changed, 125 insertions, 15 deletions

diff --git a/sci-mathematics/coq/ChangeLog b/sci-mathematics/coq/ChangeLog
index 85ccaafe0c73..278e67509e83 100644
--- a/sci-mathematics/coq/ChangeLog
+++ b/sci-mathematics/coq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/coq
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.87 2015/06/27 09:48:20 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.88 2015/07/05 20:43:27 jauhien Exp $
+
+*coq-8.4_p6 (05 Jul 2015)
+
+  05 Jul 2015; Jauhien Piatlicki <jauhien@gentoo.org> +coq-8.4_p6.ebuild:
+  version bump: close bug 553942, thanks to  OGINO Masanori
 
   27 Jun 2015; Agostino Sarubbo <ago@gentoo.org> coq-8.4_p5.ebuild:
   Stable for amd64, wrt bug #553322
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index bdfb817d3a41..ab283c2e1247 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -11,27 +11,29 @@ DIST coq-8.4pl1.tar.gz 4139808 SHA256 5d0e4553ab50677a94b4d5ca1650a90718e9362082
 DIST coq-8.4pl2.tar.gz 4145112 SHA256 fb719a38f613b01861e3b251e745a5c8ef395a26ce7029668e85ac75fcbca2d8 SHA512 151291a508c56f9fdc9efd96096852e94c247724030ad13122ad729476f3f7d4885c9202737d9109b6fa7f58029d3b9e8f472a7e587e0b60a49a0224ac399031 WHIRLPOOL ac338571da5f6efc08e9184f1e13b9783bd750627c70af2eee46116d2d949e61a0cbf31745373ccea3b3b862c1188316c2aa3b38e211a398185503c2844a33c5
 DIST coq-8.4pl3.tar.gz 4064579 SHA256 97583d637f981c5554007f4e99ce6420ebc737186b1d021bd71766fd891cfb38 SHA512 e4a385b10b30159545c283e11400f5790a6ca1b91632afe93b73c6a8b523fd408db173b25a1797f69bdfde9a16b37751944041aa9be5a1194b0fe49a9bb56240 WHIRLPOOL c44cc9f55f25dfb37d7b011c3ede3ad47f7191b02a6258bd4bda67854b9cce0e32b412ead826a5ca7a21dc2fe8841774231cb0693da335f5146172463ec57aa2
 DIST coq-8.4pl5.tar.gz 4070062 SHA256 35815ab78a58d72799eacaab155427620ab071677882ca6c98d7bfec97d25245 SHA512 0965ff409933d601a5c96963ea805ce20dd22f1fd9a9473898de1b376403b4e7a9a86b36b58eb1480cfb3a25970626e1dcd225899c089f5a301f4809e7f8f242 WHIRLPOOL 6dea97e7fe655a33757e8f031b28f91f98558e53205890d6b9d928d5641c05814f8d743cb02c39b26dcf93aa4076c5bbd9710a7dfd9f6a3456e38039b0cb8220
+DIST coq-8.4pl6.tar.gz 4099815 SHA256 a540a231a9970a49353ca039f3544616ff86a208966ab1c593779ae13c91ebd6 SHA512 238bc6e28348f40f5619aa28d2e871179d9edeb6eb3f2521af6f407e24a889c8c68fa11c8b12e026f016f0fb7d5006447c3ab7eeae0804fc082d65774aefe0ef WHIRLPOOL 2120dcddce773d90ba024e97fc00df3d563edf398eaf0bbb3dc1df1265b5e657cb4044d334f598898c30a88f0579b35b38f1d6bad4ea5e373a0a30826b245e99
 EBUILD coq-8.3_p1.ebuild 2129 SHA256 111ec6cb5612ecf95164515314840dcf562b606b088cc2a298dc3254cdf9607c SHA512 c5c0f0b7d6ce738c247e5958fc29a686ec500d809b9e175d8a2aec108e36c91858b7cdf9301c0e81754838a8e5e430b50caab16772604ca77f0319a62268102e WHIRLPOOL d64c1def21f03772def04fba7537fb4dbf6035256a4d3eae56be864ae1f0a16325370e960ed79c6719c44ba4c88d030950121684f5af635d63967ccf4e2d3b5a
 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 2485 SHA256 ab47167ae30ef2d67792b16c7c146307ffb10ab923c8079288f957bd6a666bc0 SHA512 e4810ca7a785d06ffbe8fc65348b8e6560319b40885c291dbaad7e4873ae507e3df5e3a6ddfe81eabe9188548645b4d3bda13aaf1efc310fb5047d287a4ae19f WHIRLPOOL e5522f69adb3805ac5cd91e318d63319b5fb453f82b3f932108c390c30d1bd7d78b1ca87f9ded2a87210a0f121adbce667f674d556db8a1cc33e42acd4ef7906
-MISC ChangeLog 14444 SHA256 268093a8c95b8f571fa3853287b913a60631d4a341757df93a4ce06509d50dd2 SHA512 14a7f2d85c11b54a57d05fee98b79f09331ee0edf5d6201e63c95ef15b7f6283a0fb4875b2223f4e6fbce6505646e532479986b77e2f5351a467696870ab3fdd WHIRLPOOL faa9aae36a1fadc42f9b5df8858a7b584ec57d25b258352e24920a11fc0d4daa186aa16a019b8e18fc49225c23db1e548931dcdb578754bcc91aa35dfa98e990
+EBUILD coq-8.4_p6.ebuild 2498 SHA256 75fcb21d26c148bbf70b0abeffdf50816508390bd0368cb2922955d9b7c4cc80 SHA512 33afd1c0bb838b3b3344d8feac978e378e8b9c43f76e7c43d4201e75882aeffab4fae25a98847620cdd20105760e5a601006a773a040ce174b95bb8dbf7b1268 WHIRLPOOL 09626b196444732c73ef2a3efb4be9d2891f572c25cba75e8a7811ce5932dd9b6cf7fe96a5f60f823a4715b556f1e08ebf00a0e85077b2d57f52c9c117c82ccf
+MISC ChangeLog 14610 SHA256 29ea672165f7b1d0c386175e219d9685d07fa53ed4a8a8d02278fd8390fa1190 SHA512 5530975ef086bc4ad2fc579f07b1718d451df04ff13b350f080630972f4b9da6560d61f5f6c9dd61881a79beca58f71aa356dbf84cdc47022037f638516a6b27 WHIRLPOOL 2fa629c380ee9ec61e0ccf8aa26d3025545d5a702eb89bd5c944170f0f1fe13af8d1cf065a368927bdc5c88cae63a251ea7daff72aa8cf38c30a10e3e2d4ebad
 MISC metadata.xml 912 SHA256 004efe7e4a2a780d79f709c74ceb3477407b1f0120218eaf7b11e3d82cb67b65 SHA512 b0720691e44431b8060bd2fd5870147f68c9d4d887b46e667661c034f4efdecb638cd80ea6efd474c231ab342d9e708a522075a38c0de5f1a49040af2865ff2a WHIRLPOOL 05fce40010254b116541116a9851984382accbf5b9660696887857224aa45265d51ac64f8780a6224fa071eebc15efd04f85c2008b856741b291483d5a8c5666
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVjnFlAAoJELp701BxlEWfkEwQAJUuJ0OhKLrgkowurAT4lUob
-jKsyyVHq9o/j6Hf6OnyUsR6EzEFopRBipsipwpNdFlYPS4d/Vsb+Ytn4EqxPp37u
-I8db5eCDLoM7i1nNbikmOUC45jAia0dzL/1AZhpbd/ffnXS3y2x9adFAcW5GyWp0
-htUJ289+Up394xXyO6TK4vFXbAJlVTUY/4O/Z70mua9NqPLD6VYx4npGRFCpoqz6
-IQ9i01ybrU788bVNLXKNC/58OmJj4nbGu9b+qtFXceMiuJyF82PwLRvIXWAMaf2S
-0SqOzLVGVDooK4MzGKz38P53tfg0fW/zIuCR1ZCESOVDmJyXvFHPwupINVEUsSKP
-aUmrRebp0PPNZNXMJhC+xHLXWwIuCL8BkX+4DFd8s77/3mgN3TubkLwEtoyZ1T0O
-ETTmzEs17in4I26PCcmBd40NTke97Vl2L6Pim4qzR4cr+a4EZOU3S9jCdr3HNb8O
-8JmWYzcPHqqK892PEfFieOzRIU5eJEgc3gV0OEPEWW8IVenUCjm/9ojJRk0a62/t
-Csd1W8/+QbHX2gngfZI5Ej162hy0hvZVsgTQ0b3piB8xwNSkuE9qvMOW7jLAi8/m
-dYrTe082xCVhuAxaBswO/bvRZ+a+bFquZbbA0Mhq9/G/7Sci9cLCjV4ZH+nBGfm+
-degQlwvPmAsg4b0m1s+D
-=8b29
+iQIcBAEBCAAGBQJVmZdnAAoJELvuk32y76HUf0IP/RiwTWSKkmDZoWigVgJKXxLh
+X7hJXVFezgu/PhoBjjLNvWB2mWlh6pHKby0PXLM7yLpQ61DK68UMA/Nk0UHihWJY
+8WUjUClUOxJpQ9xLJAXLAWyOiI0dvf1VPGJD9j7z3RZGedTbs4cR72ov8Fp4uHak
+/JugNtK4CAAEFsLrQov9vsRDhL/dXndkvZ8El6rAm3gsSokLZt0k+2pSx4LoRVgX
+tZAFxwHndcnfMUOxZ8UlWIB9addNnY84vxXCdmb4C2ycvHQnxaPrcKp2orTJ2o5s
+OnhyHsxW0cji+iTFjDVdodOtIrRipvN3nfFhslokVuDzc/9/G0AlTY8Fzq8wkriV
+ctEZSjflqullshQvNPX6+SzPIrrv21vixmCViUE8amIFOiezluZei7MomIQfdg9A
+D/u6TGJg4uOcC0Y1LLkoQVi+01QcSC9AKZmOgyOdq60LKZH6kEcC3v/hYM+pvWhK
+DI0Ydlgpn++X62Lb4r70qevJegTUzT+RDP0mJp8cA9/BHQnjgcFRzya//sxqkDTN
+4dmAP5WKIyMipyMtdtPeOV4rBNltAvZMXx1qYrEJdoIV+1L0syrIcnpwJvMV91eV
+fl8F1qQcPkgzXtxkLaq2FX5WIhqFYyBL94XSPCiNuKgScXyo6QXQspInCi07YVtT
+A3MiprDYxcxMqlVU6p24
+=+hNW
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/coq/coq-8.4_p6.ebuild b/sci-mathematics/coq/coq-8.4_p6.ebuild
new file mode 100644
index 000000000000..d29bd46f5261
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.4_p6.ebuild
@@ -0,0 +1,103 @@
+# 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_p6.ebuild,v 1.1 2015/07/05 20:43:27 jauhien Exp $
+
+EAPI="5"
+
+inherit eutils multilib
+
+MY_PV=${PV/_p/pl}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Proof assistant written in O'Caml"
+HOMEPAGE="http://coq.inria.fr/"
+SRC_URI="http://${PN}.inria.fr/distrib/V${MY_PV}/files/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk debug +ocamlopt doc camlp5"
+
+RDEPEND="
+	>=dev-lang/ocaml-3.11.2:=[ocamlopt?]
+	camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] )
+	!camlp5? ( || ( dev-ml/camlp4:= <dev-lang/ocaml-4.02.0 ) )
+	gtk? ( >=dev-ml/lablgtk-2.10.1:=[ocamlopt?] )"
+DEPEND="${RDEPEND}
+	doc? (
+		media-libs/netpbm[png,zlib]
+		virtual/latex-base
+		dev-tex/hevea
+		dev-tex/xcolor
+		dev-texlive/texlive-pictures
+		dev-texlive/texlive-mathextra
+		dev-texlive/texlive-latexextra
+		)"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	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}/${PN}-8.4_p5-hevea.patch"
+	epatch "${FILESDIR}/${PN}-8.4_p5-no-clean-before-test.patch"
+}
+
+src_configure() {
+	ocaml_lib=$(ocamlc -where)
+	local myconf=(
+		--prefix /usr
+		--bindir /usr/bin
+		--libdir /usr/$(get_libdir)/coq
+		--mandir /usr/share/man
+		--emacslib /usr/share/emacs/site-lisp
+		--coqdocdir /usr/$(get_libdir)/coq/coqdoc
+		--docdir /usr/share/doc/${PF}
+		--configdir /etc/xdg/${PN}
+		--lablgtkdir ${ocaml_lib}/lablgtk2
+		)
+
+	use debug && myconf+=( --debug )
+	use doc || myconf+=( --with-doc no )
+
+	if use gtk; then
+		if use ocamlopt; then
+			myconf+=( --coqide opt )
+		else
+			myconf+=( --coqide byte )
+		fi
+	else
+		myconf+=( --coqide no )
+	fi
+
+	if use ocamlopt; then
+		myconf+=( --opt )
+	else
+		myconf+=( -byte-only )
+	fi
+
+	if use camlp5; then
+		myconf+=( --camlp5dir ${ocaml_lib}/camlp5 )
+	else
+		myconf+=( --usecamlp4 )
+	fi
+
+	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
+	./configure ${myconf[@]} || die "configure failed"
+}
+
+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 VERBOSE=1
+	dodoc README CREDITS CHANGES
+
+	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
+}