sci-mathematics/coq: Version Bump, fixes problems with make-4, #493144

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

6 files changed, 117 insertions, 20 deletions

diff --git a/sci-mathematics/coq/ChangeLog b/sci-mathematics/coq/ChangeLog
index 87ababa7799d..017bfd864091 100644
--- a/sci-mathematics/coq/ChangeLog
+++ b/sci-mathematics/coq/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/coq
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.81 2013/08/19 15:06:15 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/ChangeLog,v 1.82 2014/01/23 08:17:49 jlec Exp $
+
+*coq-8.4_p3 (23 Jan 2014)
+
+  23 Jan 2014; Justin Lecher <jlec@gentoo.org> coq-8.3_p1.ebuild,
+  coq-8.4_p1.ebuild, coq-8.4_p2.ebuild, +coq-8.4_p3.ebuild, metadata.xml:
+  Version Bump, fixes problems with make-4, #493144
 
   19 Aug 2013; Alexis Ballier <aballier@gentoo.org> coq-8.4_p1.ebuild,
   coq-8.4_p2.ebuild:
diff --git a/sci-mathematics/coq/coq-8.3_p1.ebuild b/sci-mathematics/coq/coq-8.3_p1.ebuild
index f5ad7858e4c3..c3516a91d50c 100644
--- a/sci-mathematics/coq/coq-8.3_p1.ebuild
+++ b/sci-mathematics/coq/coq-8.3_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.3_p1.ebuild,v 1.6 2011/10/05 18:54:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.3_p1.ebuild,v 1.7 2014/01/23 08:17:49 jlec Exp $
 
 EAPI="2"
 
@@ -9,7 +9,7 @@ inherit eutils multilib
 MY_PV=${PV/_p/pl}
 MY_P=${PN}-${MY_PV}
 
-DESCRIPTION="Coq is a proof assistant written in O'Caml"
+DESCRIPTION="Proof assistant written in O'Caml"
 HOMEPAGE="http://coq.inria.fr/"
 SRC_URI="http://${PN}.inria.fr/V${MY_PV}/files/${MY_P}.tar.gz"
 
diff --git a/sci-mathematics/coq/coq-8.4_p1.ebuild b/sci-mathematics/coq/coq-8.4_p1.ebuild
index ae6ce0007c9e..9a34f9cf3c06 100644
--- a/sci-mathematics/coq/coq-8.4_p1.ebuild
+++ b/sci-mathematics/coq/coq-8.4_p1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.4_p1.ebuild,v 1.5 2013/08/19 15:06:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.4_p1.ebuild,v 1.6 2014/01/23 08:17:49 jlec Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ inherit eutils multilib
 MY_PV=${PV/_p/pl}
 MY_P=${PN}-${MY_PV}
 
-DESCRIPTION="Coq is a proof assistant written in O'Caml"
+DESCRIPTION="Proof assistant written in O'Caml"
 HOMEPAGE="http://coq.inria.fr/"
 SRC_URI="http://${PN}.inria.fr/V${MY_PV}/files/${MY_P}.tar.gz"
 
diff --git a/sci-mathematics/coq/coq-8.4_p2.ebuild b/sci-mathematics/coq/coq-8.4_p2.ebuild
index d7ec63a2a2c5..58c81e8021a9 100644
--- a/sci-mathematics/coq/coq-8.4_p2.ebuild
+++ b/sci-mathematics/coq/coq-8.4_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.4_p2.ebuild,v 1.2 2013/08/19 15:06:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.4_p2.ebuild,v 1.3 2014/01/23 08:17:49 jlec Exp $
 
 EAPI="5"
 
@@ -9,7 +9,7 @@ inherit eutils multilib
 MY_PV=${PV/_p/pl}
 MY_P=${PN}-${MY_PV}
 
-DESCRIPTION="Coq is a proof assistant written in O'Caml"
+DESCRIPTION="Proof assistant written in O'Caml"
 HOMEPAGE="http://coq.inria.fr/"
 SRC_URI="http://${PN}.inria.fr/V${MY_PV}/files/${MY_P}.tar.gz"
 
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="gtk debug +ocamlopt doc camlp5"
 
-RDEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]
+RDEPEND="
+	>=dev-lang/ocaml-3.11.2:=[ocamlopt?]
 	camlp5? ( >=dev-ml/camlp5-6.02.3:=[ocamlopt?] )
 	gtk? ( >=dev-ml/lablgtk-2.10.1:=[ocamlopt?] )"
 DEPEND="${RDEPEND}
@@ -66,11 +67,11 @@ src_configure() {
 }
 
 src_compile() {
-	emake STRIP="true" -j1 || die "make failed"
+	emake STRIP="true" -j1
 }
 
 src_install() {
-	emake STRIP="true" COQINSTALLPREFIX="${D}" install || die
+	emake STRIP="true" COQINSTALLPREFIX="${D}" install
 	dodoc README CREDITS CHANGES
 
 	use gtk && make_desktop_entry "/usr/bin/coqide" "Coq IDE" "/usr/share/coq/coq.png"
diff --git a/sci-mathematics/coq/coq-8.4_p3.ebuild b/sci-mathematics/coq/coq-8.4_p3.ebuild
new file mode 100644
index 000000000000..389862f06296
--- /dev/null
+++ b/sci-mathematics/coq/coq-8.4_p3.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/coq/coq-8.4_p3.ebuild,v 1.1 2014/01/23 08:17:49 jlec 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/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?] )
+	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_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
+}
+
+src_install() {
+	emake STRIP="true" COQINSTALLPREFIX="${D}" install
+	dodoc README CREDITS CHANGES
+
+	use gtk && make_desktop_entry "coqide" "Coq IDE" "${EPREFIX}/usr/share/coq/coq.png"
+}
diff --git a/sci-mathematics/coq/metadata.xml b/sci-mathematics/coq/metadata.xml
index 9bd447c9ac3d..2fbebc05a0d7 100644
--- a/sci-mathematics/coq/metadata.xml
+++ b/sci-mathematics/coq/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>ml</herd>
-<herd>sci-mathematics</herd>
-<longdescription lang='en'>
+  <herd>ml</herd>
+  <herd>sci-mathematics</herd>
+  <longdescription lang="en">
   Developed in the LogiCal project, the Coq tool is a formal proof
   management system: a proof done with Coq is mechanically checked
   by the machine.
@@ -16,7 +16,7 @@
   Constructions" extended by a modular development system for
   theories.
 </longdescription>
-<use>
-	<flag name='camlp5'>Build using camlp5. This is required for some plugins like Ssreflect.</flag>
-</use>
+  <use>
+    <flag name="camlp5">Build using camlp5. This is required for some plugins like Ssreflect.</flag>
+  </use>
 </pkgmetadata>