Added ocaml-lwt_log

4 files changed, 61 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d028fc1fb88..c289a069dbd2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,21 @@
 pkgbase = ocaml-lwt_log
 	pkgdesc = Lwt-friendly logger
 	pkgver = 1.1.1
-	pkgrel = 1
-	url = https://github.com/aantron/lwt_log
+	pkgrel = 2
+	url = https://github.com/ocsigen/lwt_log
 	arch = x86_64
+	arch = i686
+	arch = arm
+	arch = armv6h
+	arch = armv7h
+	arch = aarch64
 	license = custom:LGPL2.1 with linking exception
 	makedepends = dune
+	makedepends = ocaml-findlib
 	depends = ocaml
-	depends = ocaml-lwt
+	depends = ocaml-lwt>=4.0.0
 	options = !strip
-	source = https://github.com/aantron/lwt_log/archive/1.1.1.tar.gz
-	sha512sums = df3d171a7c72f37e96b756d252ab586767df9c13e01500faf13d4b2cee936b0602fd7c725c03db488d3737d8d92300af103d395a926dc654a2c44a5d6068f24a
+	source = ocaml-lwt_log-1.1.1-2.tar.gz::https://github.com/ocsigen/lwt_log/archive/1.1.1.tar.gz
+	sha256sums = 14fb19ec61e555e32c8bb026a591c0ce5b0a153663d17b0876178ab92d625f3f
 
 pkgname = ocaml-lwt_log
-
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 6cd89f77022f..930afd0d967c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,37 @@
-# Maintainer: Jakob Gahde <j5lx@fmail.co.uk>
-
-pkgname=ocaml-lwt_log
-pkgver=1.1.1
-pkgrel=1
-pkgdesc="Lwt-friendly logger"
-arch=('x86_64')
-url='https://github.com/aantron/lwt_log'
+# Maintainer: Daniel Peukert <dan.peukert@gmail.com>
+# Contributor: Jakob Gahde <j5lx@fmail.co.uk>
+_projectname='lwt_log'
+pkgname="ocaml-$_projectname"
+pkgver='1.1.1'
+pkgrel='2'
+pkgdesc='Lwt-friendly logger'
+arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
+url="https://github.com/ocsigen/$_projectname"
 license=('custom:LGPL2.1 with linking exception')
-depends=('ocaml' 'ocaml-lwt')
-makedepends=('dune')
+depends=('ocaml' 'ocaml-lwt>=4.0.0')
+makedepends=('dune' 'ocaml-findlib')
 options=('!strip')
-source=("https://github.com/aantron/lwt_log/archive/${pkgver}.tar.gz")
-sha512sums=('df3d171a7c72f37e96b756d252ab586767df9c13e01500faf13d4b2cee936b0602fd7c725c03db488d3737d8d92300af103d395a926dc654a2c44a5d6068f24a')
+source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz")
+sha256sums=('14fb19ec61e555e32c8bb026a591c0ce5b0a153663d17b0876178ab92d625f3f')
 
-build() {
-  cd "${srcdir}/lwt_log-${pkgver}"
+_sourcedirectory="$_projectname-$pkgver"
 
-  dune build --profile release
+build() {
+	cd "$srcdir/$_sourcedirectory/"
+	dune build -p "$_projectname" --verbose
 }
 
-
 package() {
-  cd "${srcdir}/lwt_log-${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/"
+
+	# COPYING is not included in /usr/doc/$_projectname/ for some reason
+	install -Dm644 'COPYING' "$pkgdir/usr/share/doc/$pkgname/COPYING"
 
-  dune install --destdir "${pkgdir}"
-  install -Dm644 "COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
-  mv "${pkgdir}/usr/doc" "${pkgdir}/usr/share/"
+	install -dm755 "$pkgdir/usr/share/licenses/$pkgname"
+	ln -sf "/usr/share/doc/$pkgname/COPYING" "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }