Added ocaml-ppx_jane and the rest of its dependencies

4 files changed, 63 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a8eea0d104d..4a02e9eb494b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
-# Generated by mksrcinfo v8
-# Thu Jun 28 16:58:47 UTC 2018
 pkgbase = ocaml-ppx_optcomp
 	pkgdesc = Optional compilation for OCaml
-	pkgver = 0.11.0
+	pkgver = 0.13.0
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/janestreet/ppx_optcomp
-	arch = i686
 	arch = x86_64
-	license = Apache
-	makedepends = dune
-	depends = ocaml
-	depends = ocaml-base
-	depends = ocaml-stdio
-	depends = ocaml-ppxlib
+	arch = i686
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	arch = aarch64
+	license = MIT
+	makedepends = dune>=1.5.1
+	depends = ocaml>=4.04.2
+	depends = ocaml-base>=0.13.0
+	depends = ocaml-stdio>=0.13.0
+	depends = ocaml-ppxlib>=0.9.0
 	options = !strip
-	source = https://ocaml.janestreet.com/ocaml-core/v0.11/files/ppx_optcomp-v0.11.0.tar.gz
-	md5sums = 396d6bac4ed5652d7be146756613c67e
+	source = ocaml-ppx_optcomp-0.13.0-1.tar.gz::https://github.com/janestreet/ppx_optcomp/archive/v0.13.0.tar.gz
+	sha256sums = 3af35caf56a66c12f9080ff46fe6c5c3b84f1eda3c1c860a20061ab3b57e56e5
 
 pkgname = ocaml-ppx_optcomp
-
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000000..a467ee9a97a6
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,8 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = tab
+tab_width = 4
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..82b3c183d5d4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+# from https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore
+*.tar
+*.tar.*
+*.rpm
+*.jar
+*.exe
+*.msi
+*.zip
+*.tgz
+*.log
+*.log.*
+*.sig
+
+*/
diff --git a/PKGBUILD b/PKGBUILD
index f8bd51348c15..a80d6be3c41f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,35 @@
-# Maintainer: Jakob Gahde <j5lx@fmail.co.uk>
-
-pkgname=ocaml-ppx_optcomp
-pkgver=0.11.0
-pkgrel=1
-epoch=1
-pkgdesc="Optional compilation for OCaml"
-arch=('i686' 'x86_64')
-url="https://github.com/janestreet/ppx_optcomp"
-license=('Apache')
-depends=('ocaml' 'ocaml-base' 'ocaml-stdio' 'ocaml-ppxlib')
-makedepends=('dune')
+# Maintainer: Daniel Peukert <dan.peukert@gmail.com>
+# Contributor: Jakob Gahde <j5lx@fmail.co.uk>
+_projectname='ppx_optcomp'
+pkgname="ocaml-$_projectname"
+pkgver='0.13.0'
+pkgrel='1'
+epoch='1'
+pkgdesc='Optional compilation for OCaml'
+arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
+url="https://github.com/janestreet/$_projectname"
+license=('MIT')
+depends=('ocaml>=4.04.2' 'ocaml-base>=0.13.0' 'ocaml-stdio>=0.13.0' 'ocaml-ppxlib>=0.9.0')
+makedepends=('dune>=1.5.1')
 options=('!strip')
-source=("https://ocaml.janestreet.com/ocaml-core/v$(echo ${pkgver} | grep -Po "^[0-9]+\.[0-9]+")/files/ppx_optcomp-v${pkgver}.tar.gz")
-md5sums=('396d6bac4ed5652d7be146756613c67e')
+source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/v$pkgver.tar.gz")
+sha256sums=('3af35caf56a66c12f9080ff46fe6c5c3b84f1eda3c1c860a20061ab3b57e56e5')
 
-build() {
-  cd "${srcdir}/ppx_optcomp-v${pkgver}"
+_sourcedirectory="$_projectname-$pkgver"
 
-  jbuilder build
+build() {
+	cd "$srcdir/$_sourcedirectory/"
+	dune build -p "$_projectname" --verbose
 }
 
 package() {
-  cd "${srcdir}/ppx_optcomp-v${pkgver}"
+	cd "$srcdir/$_sourcedirectory/"
+	DESTDIR="$pkgdir" dune install --prefix '/usr' --libdir 'lib/ocaml'
+
+	install -dm755 "$pkgdir/usr/share/doc/$pkgname"
+	mv "$pkgdir/usr/doc/$_projectname/"* "$pkgdir/usr/share/doc/$pkgname/"
+	rm -r "$pkgdir/usr/doc/"
 
-  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 -dm755 "$pkgdir/usr/share/licenses/$pkgname"
+	ln -sf "/usr/share/doc/$pkgname/LICENSE.md" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
 }