bump to 8.3, fixes bug 341279

Package-Manager: portage-2.1.9.24/cvs/Linux i686

3 files changed, 85 insertions, 12 deletions

diff --git a/sci-mathematics/coq/ChangeLog b/sci-mathematics/coq/ChangeLog
index b299f47df7e5..c3ae250a5628 100644
--- a/sci-mathematics/coq/ChangeLog
+++ b/sci-mathematics/coq/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/coq
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.56 2010/11/11 20:29:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.57 2010/11/18 22:12:07 tomka Exp $
+
+*coq-8.3 (18 Nov 2010)
+
+  18 Nov 2010; Thomas Kahle <tomka@gentoo.org> +coq-8.3.ebuild:
+  bump to 8.3, fixes bug 341279
 
   11 Nov 2010; Alexis Ballier <aballier@gentoo.org> coq-8.2_p1-r1.ebuild,
   coq-8.2_p2.ebuild:
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 7c7aa2f15497..94f1865f69e3 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX coq-8.2_p2-make-3.82.patch 293 RMD160 4b6d9126c93f9ff882a3aea7518529a09fdd2e69 SHA1 288b77f8ba94791c800a6395260273d96cf582e4 SHA256 9630602f54509704e447c8a306d7153a54937ae523ae7d06aeb3618a53cd1f21
 AUX coqide.desktop 233 RMD160 3f9d112d7f55454f72c42b427005b37971c6e928 SHA1 40571b86c25793e7d4e9bef80f637d7440b03704 SHA256 dba2e81a408ae51e187c2a164794f9505c4abfa0b92f47a44d0e9f96e2b6dfac
 DIST coq-8.2pl1.tar.gz 3600620 RMD160 dd5758a94bb3de49967cec76baa33eb5169659ce SHA1 4aed3302adc2edbaa5d97984512c1c13014bd649 SHA256 7c15acfd369111e51d937cce632d22fc77a6718a5ac9f2dd2dcbdfab4256ae0c
 DIST coq-8.2pl2.tar.gz 3649761 RMD160 7ecd8a63d8c6f43c0f4c18737895d656f2275913 SHA1 97e1f3d458845cb2934fa0573521fa517994295a SHA256 0e66c2576150bf18828bfff94df50e3405acda6c728ad01a4906fdbdc6de0236
+DIST coq-8.3.tar.gz 3736420 RMD160 9e42266001c0a22b39662be86960a05e454fc2fb SHA1 6c6472b6a41429e78d979eacd8ff58bd6f6c9da4 SHA256 bd818e053948e6eed288753fe10fe2b23bdc6f277a8fe50a6233d8f07b263e0a
 EBUILD coq-8.2_p1-r1.ebuild 2082 RMD160 28db3f8eab31f791c998313fb4582f815959b5fc SHA1 0f3586ca49332156095e5e51dfeee722e268a382 SHA256 a0efb6515a0aec8cdc81badaf07f11c2a29248baa478525cd09941043aef2614
 EBUILD coq-8.2_p2.ebuild 2131 RMD160 00f1d0401ca733bc856956af6623aa28e70d4edd SHA1 032e693e3d65e71cc16ba6de7a3953e0df56159a SHA256 28e386072d15925371678bd52049c9b54b2b4bff2d65410699a88b5bc44f5f5f
-MISC ChangeLog 9233 RMD160 21ec705a1ebf7733265ff8118b0d5393a4aae7c7 SHA1 13d9aabfe3466521de81b9a6f7bd13899d4cf601 SHA256 654afaabd6186c4a18f94ee5484b09cde40446f01564143582cb3d5fe5f5fe62
+EBUILD coq-8.3.ebuild 2142 RMD160 4ab675983b03fbd3e10a146c9ff668326d025661 SHA1 6029af3f1184610624f2b75fb6ec41b983eeb57a SHA256 695a16f6e5317d79680f1ea8aa3a91039a4e74944e922fe3adeca24ab83da328
+MISC ChangeLog 9351 RMD160 a0f0133c7347611b6ff740af14f9c5434f4c231e SHA1 9f30675ce10d38d46dcc203695dcad960b039269 SHA256 8512a489042ec9c58683b7885e5f958ada2ed40cb23df1561deb6463052a90a1
 MISC metadata.xml 978 RMD160 87ac5db98680ca1eef0b2d5fbdb2963b182a35cb SHA1 cef1c29019652dbe87c3ba5daeeaec63e0bb5e2d SHA256 dd2767eb316b5bf7c1c66c555f3b54b9d812f22631ab8d27151a1ce13b54d203
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzcUkcACgkQvFcC4BYPU0rS4QCfaueWIgC9V4ra1SNa/u5OEkhx
-4rkAniny5Pk4xHajedY1iZSnDC/O9BsR
-=lOpm
------END PGP SIGNATURE-----
diff --git a/sci-mathematics/coq/coq-8.3.ebuild b/sci-mathematics/coq/coq-8.3.ebuild
new file mode 100644
index 000000000000..9092a70cd431
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.3.ebuild,v 1.1 2010/11/18 22:12:07 tomka Exp $
+
+EAPI="2"
+
+inherit eutils multilib
+
+DESCRIPTION="Coq is a proof assistant written in O'Caml"
+HOMEPAGE="http://coq.inria.fr/"
+SRC_URI="http://${PN}.inria.fr/V${PV}/files/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="gtk debug +ocamlopt doc"
+
+RDEPEND=">=dev-lang/ocaml-3.10[ocamlopt?]
+	>=dev-ml/camlp5-5.09[ocamlopt?]
+	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 app-text/ptex )
+		|| ( dev-texlive/texlive-mathextra app-text/ptex )
+		|| ( dev-texlive/texlive-latexextra app-text/ptex )
+		)"
+
+src_prepare() {
+	# configure has an error at line 640 leading to closing a string
+	# to early in the generated coq_config.ml. Here is a wild sed :)
+	# It replaces \"$LABLGTKLIB\" by $LABLGTKLIB
+	sed -i "s/\\\\\"\\\$LABLGTKLIB\\\\\"/\\\$LABLGTKLIB/" configure
+}
+
+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}
+		--camlp5dir ${ocaml_lib}/camlp5
+		--lablgtkdir ${ocaml_lib}/lablgtk2"
+
+	use debug && myconf="--debug $myconf"
+	use doc || myconf="$myconf --with-doc no"
+
+	if use gtk; then
+		use ocamlopt && myconf="$myconf --coqide opt"
+		use ocamlopt || myconf="$myconf --coqide byte"
+	else
+		myconf="$myconf --coqide no"
+	fi
+	use ocamlopt || myconf="$myconf -byte-only"
+	use ocamlopt && myconf="$myconf --opt"
+
+	export CAML_LD_LIBRARY_PATH="${S}/kernel/byterun/"
+	./configure $myconf || die "configure failed"
+}
+
+src_compile() {
+	emake STRIP="true" -j1 || die "make failed"
+}
+
+src_install() {
+	emake STRIP="true" COQINSTALLPREFIX="${D}" install || die
+	dodoc README CREDITS CHANGES
+
+	use gtk && domenu "${FILESDIR}/coqide.desktop"
+}