[arch-commits] Commit in coq/trunk (PKGBUILD)

[Baptiste Jonglez]

    Date: Wednesday, October 18, 2017 @ 10:04:23
  Author: zorun
Revision: 263227

upgpkg: coq 8.7.0-1

Modified:
  coq/trunk/PKGBUILD

----------+
 PKGBUILD |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-18 10:03:25 UTC (rev 263226)
+++ PKGBUILD	2017-10-18 10:04:23 UTC (rev 263227)
@@ -6,7 +6,7 @@
 # Contributor: William J. Bowman <bluephoenix47 at gmail.com>
 
 pkgname=('coq' 'coqide' 'coq-doc')
-pkgver=8.6.1
+pkgver=8.7.0
 pkgrel=1
 pkgdesc='Formal proof management system'
 arch=('i686' 'x86_64')
@@ -14,14 +14,14 @@
 license=('GPL')
 groups=('coq')
 options=('!emptydirs')
-depends=('ocaml' 'camlp4' 'gtk2' 'gtksourceview2')
+depends=('ocaml' 'camlp5' 'gtk2' 'gtksourceview2')
 makedepends=('ocaml-findlib'
              'lablgtk2' 'gendesk' # coqide
              'texlive-bin' 'texlive-latexextra' 'texlive-pictures' # coq-doc
              'texlive-fontsextra' 'texlive-science'
              'fig2dev' 'imagemagick' 'hevea' 'ghostscript')
-source=("https://coq.inria.fr/distrib/V$pkgver/files/coq-$pkgver.tar.gz")
-sha1sums=('5dbaf1230c297d7c11c8715c012300a51ad80f9a')
+source=("https://github.com/coq/coq/archive/V${pkgver}.tar.gz")
+sha512sums=('c806881d1ab823d9c2d748aa2d7fd3faaa0f6395536942ad214c68658b2688e6c57941947a440ddb69bf1436249067eefd866ecb1d9e4c5e774e3218c80a6fc2')
 
 prepare() {
   gendesk -f -n --pkgname "coqide" \
@@ -38,14 +38,13 @@
     -mandir '/usr/share/man' \
     -configdir '/etc/xdg/coq/' \
     -coqide opt \
-    -with-doc yes \
-    -usecamlp4
+    -with-doc yes
 
   make world
 }
 
 package_coq() {
-  depends=('ocaml' 'camlp4')
+  depends=('ocaml' 'camlp5')
   optdepends=('coqide: graphical Coq IDE'
               'coq-doc: offline documentation')
   # coq-nox was the old name for coq without coqide
@@ -62,7 +61,7 @@
 
 package_coqide() {
   pkgdesc="GTK-based graphical interface for the Coq proof assistant"
-  depends=('coq' 'ocaml' 'camlp4' 'gtk2' 'gtksourceview2')
+  depends=('coq' 'ocaml' 'camlp5' 'gtk2' 'gtksourceview2')
 
   cd "$srcdir/coq-$pkgver"
 
@@ -71,6 +70,8 @@
 
   # Remove toploop files installed by "install-ide-toploop" in the main package
   rm -f "${pkgdir}/usr/lib/coq/toploop"/coqidetop.{cma,cmxs}
+  # In coq 8.7 this file is installed both by install-coq and install-coqide, remove the duplicate.
+  rm -f "${pkgdir}/usr/lib/coq/vernac/topfmt.cmi"
 
   # Desktop file generated by gendesk
   install -D -m 644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"