EAPI-2 revision; force ocaml 3.10 and camlp5 support now that it's stable everywhere needed so that it can build with ocaml 3.11

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.6 x86_64

3 files changed, 90 insertions, 6 deletions

diff --git a/sci-mathematics/coq/ChangeLog b/sci-mathematics/coq/ChangeLog
index ff650e7805d3..d26c0f352712 100644
--- a/sci-mathematics/coq/ChangeLog
+++ b/sci-mathematics/coq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/coq
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.33 2008/08/06 20:21:14 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.34 2008/10/17 15:23:12 aballier Exp $
+
+*coq-8.1_p3-r1 (17 Oct 2008)
+
+  17 Oct 2008; Alexis Ballier <aballier@gentoo.org> +coq-8.1_p3-r1.ebuild:
+  EAPI-2 revision; force ocaml 3.10 and camlp5 support now that it's stable
+  everywhere needed so that it can build with ocaml 3.11
 
   06 Aug 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml:
   Add USE flag description to metadata wrt GLEP 56.
diff --git a/sci-mathematics/coq/Manifest b/sci-mathematics/coq/Manifest
index 61cfb6a2b779..7b76a0023f83 100644
--- a/sci-mathematics/coq/Manifest
+++ b/sci-mathematics/coq/Manifest
@@ -5,13 +5,14 @@ AUX coq-8.1_p3-cmxa-install.dpatch 782 RMD160 b3977ef5ba2acad230973cb0bfd350f644
 AUX coq-8.1_p3-noocamlopt.patch 640 RMD160 dce43c53544a7c4d3437841a89b53e4349627ceb SHA1 a149f74e58999a594b7119c9daab3931ab468920 SHA256 c831fa7ecd2eac30964b61e8f3fddc8f34020833eabeca665984776ccbceb8e6
 AUX coqide.desktop 233 RMD160 3f9d112d7f55454f72c42b427005b37971c6e928 SHA1 40571b86c25793e7d4e9bef80f637d7440b03704 SHA256 dba2e81a408ae51e187c2a164794f9505c4abfa0b92f47a44d0e9f96e2b6dfac
 DIST coq-8.1pl3.tar.gz 3003593 RMD160 f8f4749e1014cb47a83915550713cf9ce1992e34 SHA1 c06141891c2a793ff6b4bc1f106d9477b3a9a52e SHA256 7f8f45594adff2625312c5ecb144cb00d39c99201dac309c9286b34d01a36bb6
+EBUILD coq-8.1_p3-r1.ebuild 1960 RMD160 dae04a0fc96608b26ad2a0d4a0af943e79f48f64 SHA1 cf7653dc6bd9cd8abf8f7303b5b7e1d7440d2848 SHA256 f6421a3afdd07ba9c2f36725d56fdd203e4f10a1774b6f1a5a5fd06b69e76fa0
 EBUILD coq-8.1_p3.ebuild 2494 RMD160 ea77aa4df5023b2c81b142859f63d307f49a1329 SHA1 58927b93385fcecc9a7021087a477eb0cade8d57 SHA256 b86fc7707fcd2afe90beb698ba3af2e16146cf92af3416c7da3d6ad8835e558c
-MISC ChangeLog 6068 RMD160 26b5829b22711d2cebac4bcd86ba78b94c433ac9 SHA1 c08c8962e1e711e0d980ad2c51a4f0dcae30ea32 SHA256 b7d836037424e088907c877a6d5e9eaa4575e9b5354449163c35f02e792a637b
+MISC ChangeLog 6312 RMD160 23ef2895bf3a9b0bba210ead9f8849083f032fe5 SHA1 c53fd7cabfd6495b79bc9f3c680b6b735d6dc54f SHA256 7195ae6cbe6ab57ed20da2c47955c7973b03e0d4eb65ad545ba01ac263bd09fc
 MISC metadata.xml 388 RMD160 ab4766c430a05a02a5b6b2776da289640aec3ad4 SHA1 8194acf3d1e76190ce0ed7579894988d6bdfafd5 SHA256 c4c3a9775a3b5fdb1135006150128687ed692901aea3a0e8be5ba7042fa9802c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiaB8sACgkQOeoy/oIi7uwbfwCgsx+7n9YScYqHJM+ZrpWPHZXG
-aIsAmQG1tC5meG/3FL1AXC+e4aBzZvPH
-=tIXj
+iEYEARECAAYFAkj4regACgkQvFcC4BYPU0oLeACgkd5pWfO1icY4ncDWA5RksMN1
+oFAAoK/uxjdefkoat5O7RY2TBPIDNueZ
+=+zTR
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/coq/coq-8.1_p3-r1.ebuild b/sci-mathematics/coq/coq-8.1_p3-r1.ebuild
new file mode 100644
index 000000000000..8cac9707d9c1
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.1_p3-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.1_p3-r1.ebuild,v 1.1 2008/10/17 15:23:12 aballier Exp $
+
+EAPI="2"
+
+inherit eutils multilib
+
+
+RESTRICT="strip installsources"
+
+MY_PV="${PV/_p/pl}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Coq is a proof assistant written in O'Caml"
+HOMEPAGE="http://coq.inria.fr/"
+SRC_URI="ftp://ftp.inria.fr/INRIA/${PN}/V${MY_PV}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="norealanalysis ide debug +ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-3.10[ocamlopt?]
+		>=dev-ml/camlp5-5.09[ocamlopt?]
+		ide? ( >=dev-ml/lablgtk-2.10.1[ocamlopt?] )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-noocamlopt.patch"
+	epatch "${FILESDIR}/${P}-cmxa-install.dpatch"
+}
+
+src_configure() {
+	local myconf="--prefix /usr \
+		--bindir /usr/bin \
+		--libdir /usr/$(get_libdir)/coq \
+		--mandir /usr/man \
+		--emacslib /usr/share/emacs/site-lisp \
+		--coqdocdir /usr/$(get_libdir)/coq/coqdoc
+		--camlp5dir +camlp5"
+
+	use debug && myconf="--debug $myconf"
+	use norealanalysis && myconf="$myconf --reals no"
+	use norealanalysis || myconf="$myconf --reals all"
+
+	if use ide; 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"
+
+	./configure $myconf || die "configure failed"
+
+	if use ide; then
+		labldir=/usr/$(get_libdir)/ocaml/lablgtk2
+		sed -i -e "s|BYTEFLAGS=|BYTEFLAGS=-I ${labldir} |" Makefile
+		sed -i -e "s|OPTFLAGS=|OPTFLAGS=-I ${labldir} |" Makefile
+		sed -i -e "s|COQIDEFLAGS=.*|COQIDEFLAGS=-thread -I ${labldir}|" Makefile
+	fi
+}
+
+src_compile() {
+	emake -j1 || die "make failed"
+}
+
+src_install() {
+	emake COQINSTALLPREFIX="${D}" install || die
+	dodoc README CREDITS CHANGES
+
+	if use ide; then
+		domenu "${FILESDIR}/coqide.desktop"
+	fi
+}