ocaml-lwt 4.0.1-1: New version

2 files changed, 20 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 051c05586c3b..2661068bc0b4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,25 @@
 # Generated by mksrcinfo v8
-# Sun Mar 19 15:40:02 UTC 2017
+# Thu May 17 22:28:27 UTC 2018
 pkgbase = ocaml-lwt
 	pkgdesc = A library for cooperative threads in OCaml
-	pkgver = 2.7.0
+	pkgver = 4.0.1
 	pkgrel = 1
 	url = http://ocsigen.org/lwt/
 	arch = i686
 	arch = x86_64
 	license = custom:LGPL with OpenSSL linking exception
-	makedepends = ocamlbuild
-	makedepends = ocaml-findlib
-	depends = ocaml
-	depends = camlp4
-	depends = ocaml-ppx_tools
+	makedepends = dune
+	makedepends = cppo
+	depends = libev
+	depends = ocaml-migrate-parsetree
+	depends = ocaml-ppx_tools_versioned
 	depends = ocaml-react
 	depends = ocaml-result
-	depends = ocaml-ssl
-	depends = libev
-	depends = glib2
 	options = !strip
 	options = !makeflags
 	options = staticlibs
-	source = https://github.com/ocsigen/lwt/archive/2.7.0.tar.gz
-	sha256sums = 00419834e0c5601b3fee6ca9efb0e10ab797a9ff8f695bf2434d89395b7252ec
+	source = https://github.com/ocsigen/lwt/archive/4.0.1.tar.gz
+	sha256sums = 97ff4892eea38b2cc3cb9bc764afa31948d7c345a2caf6c60848d5ce60b2de25
 
 pkgname = ocaml-lwt
 
diff --git a/PKGBUILD b/PKGBUILD
index 0b4ba3917f98..b47aa5e9e268 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,42 +5,31 @@
 
 _pkgname=lwt
 pkgname=ocaml-${_pkgname}
-pkgver=2.7.0
+pkgver=4.0.1
 pkgrel=1
 pkgdesc="A library for cooperative threads in OCaml"
 arch=('i686' 'x86_64')
-url="http://ocsigen.org/${_pkgname}/"
+url="http://ocsigen.org/lwt/"
 license=('custom:LGPL with OpenSSL linking exception')
-depends=('ocaml' 'camlp4' 'ocaml-ppx_tools' 'ocaml-react' 'ocaml-result' 'ocaml-ssl' 'libev' 'glib2')
-makedepends=('ocamlbuild' 'ocaml-findlib')
+depends=('libev' 'ocaml-migrate-parsetree' 'ocaml-ppx_tools_versioned' 'ocaml-react' 'ocaml-result')
+makedepends=('dune' 'cppo')
 source=("https://github.com/ocsigen/${_pkgname}/archive/${pkgver}.tar.gz")
-sha256sums=('00419834e0c5601b3fee6ca9efb0e10ab797a9ff8f695bf2434d89395b7252ec')
+sha256sums=('97ff4892eea38b2cc3cb9bc764afa31948d7c345a2caf6c60848d5ce60b2de25')
 options=('!strip' '!makeflags' 'staticlibs')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
-  echo '<src/top/*.*>: use_compiler_libs' >> _tags
-  # What requires what?
-  # --enable-glib      glib2
-  # --enable-react     ocaml-react
-  # --enable-ssl       ocaml-ssl
-  ocaml setup.ml -configure --enable-react \
-                            --enable-glib \
-                            --enable-ssl \
-                            --enable-camlp4 \
-                            --enable-ppx \
-                            --disable-debug \
-                            --prefix "${pkgdir}/usr"
-  make
+  ocaml src/util/configure.ml -use-libev true
+  jbuilder build
 }
 
 
 package() {
   cd "${srcdir}/${_pkgname}-${pkgver}"
 
-  export OCAMLFIND_DESTDIR="${pkgdir}$(ocamlfind printconf destdir)"
-  install -dm755 "${OCAMLFIND_DESTDIR}/stublibs"
-  make install
-  install -Dm 644 "doc/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
+  install -dm755 "${pkgdir}$(ocamlfind printconf destdir)" "${pkgdir}/usr/share"
+  jbuilder install --prefix "${pkgdir}/usr" --libdir "${pkgdir}$(ocamlfind printconf destdir)"
+  mv "${pkgdir}/usr/doc" "${pkgdir}/usr/share/"
+  install -Dm644 "doc/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }