community/ocamlbuild: split to subpkgs and update depending aports

community/ocaml-camlp4/APKBUILD

@@ -7,14 +7,15 @@ _pkgname=camlp4
 pkgver=4.06.1
 _pkgver="${pkgver%.*}+${pkgver##*.}"
 _ocamlver=${pkgver%.*}
-pkgrel=0
+pkgrel=1
 pkgdesc="Caml preprocessor and pretty-printer"
 url="https://github.com/ocaml/camlp4/releases"
 arch="all !x86 !armhf !s390x"  # ocaml not avail on excluded platforms
 license="LGPL-2.0-or-later-WITH-linking-exception"
-depends="ocaml-runtime=~$_ocamlver"
+depends="ocaml-runtime=~$_ocamlver ocaml-ocamlbuild"
 depends_dev="$pkgname=$pkgver-r$pkgrel"
-makedepends="ocaml=~$_ocamlver ocaml-compiler-libs=~$_ocamlver ocamlbuild"
+makedepends="ocaml=~$_ocamlver ocaml-compiler-libs=~$_ocamlver
+	ocaml-ocamlbuild-dev ocamlbuild"
 replaces="camlp4"  # for backward compatibility
 provides="camlp4=$pkgver-r$pkgrel"  # for backward compatibility
 subpackages="$pkgname-dev"

community/ocamlbuild/APKBUILD

@@ -1,23 +1,25 @@
 # Contributor: Jon Ong <jonongjs@rottenmage.com>
+# Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Anil Madhavapeddy <anil@recoil.org>
 pkgname=ocamlbuild
 pkgver=0.12.0
 pkgrel=2
-pkgdesc="Generic build tool with built-in rules for building OCaml library and programs."
+pkgdesc="Generic build tool with built-in rules for building OCaml library and programs"
 url="https://github.com/ocaml/ocamlbuild"
-arch="all !x86 !armhf !s390x" #ocaml not avail on excluded platforms
+arch="all !x86 !armhf !s390x"  # limited by ocaml aport
 license="LGPL-2.0-or-later-WITH-linking-exception"
 checkdepends="ocaml-compiler-libs ocaml-findlib"
-depends="cmd:tput"
+depends="ocaml-$pkgname=$pkgver-r$pkgrel cmd:tput"
 makedepends="ocaml"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc ocaml-$pkgname-dev:_libdev ocaml-$pkgname:_lib"
 source="$pkgname-$pkgver.tar.gz::https://github.com/ocaml/$pkgname/archive/$pkgver.tar.gz"
 builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
 	cd "$builddir"
 
-	make configure OCAML_NATIVE=true \
+	make configure \
+		OCAML_NATIVE=true \
 		OCAMLBUILD_BINDIR="/usr/bin" \
 		OCAMLBUILD_LIBDIR="/usr/lib/ocaml"
 	make
@@ -33,10 +35,35 @@ package() {
 
 	make DESTDIR="$pkgdir" install
 
+	# Remove annotation files.
+	rm -f "$pkgdir"/usr/lib/ocaml/$pkgname/*.cmt*
+
 	# Keep only native binary.
 	cd "$pkgdir"/usr/bin
 	rm ocamlbuild.byte
 	mv ocamlbuild.native ocamlbuild
 }
 
+_libdev() {
+	pkgdesc="$pkgdesc (development files)"
+	depends="ocaml-$pkgname=$pkgver-r$pkgrel"
+
+	local file; for file in '*.a' '*.cmx' '*.cmxa' '*.mli' '*.o'; do
+		_submv "usr/lib/ocaml/$pkgname/$file"
+	done
+}
+
+_lib() {
+	pkgdesc="$pkgdesc (library)"
+
+	_submv usr/lib/ocaml
+}
+
+_submv() {
+	local path="$1"
+	mkdir -p "$subpkgdir"/${path%/*}
+	mv "$pkgdir"/$path "$subpkgdir"/${path%/*}/
+	rmdir -p "$pkgdir"/${path%/*} 2>/dev/null || true
+}
+
 sha512sums="0755a8410a1e083d344e2389bbff06ae2ad5daaf9b186147fd0d2fa094bdc3a2e8e94e2a1e666a63276d10899274b905535300f47d50e747e86f17cf562abe08  ocamlbuild-0.12.0.tar.gz"

testing/ocaml-cppo/APKBUILD

@@ -3,12 +3,12 @@
 pkgname=ocaml-cppo
 _pkgname=cppo
 pkgver=1.6.4
-pkgrel=3
+pkgrel=4
 pkgdesc="C-style preprocessor for OCaml"
 url="https://github.com/mjambon/cppo"
 arch="all !x86 !armhf !s390x"  # limited by ocaml
 license="BSD-3-Clause"
-makedepends="dune ocaml ocamlbuild ocaml-findlib opam"
+makedepends="dune ocaml ocaml-ocamlbuild-dev ocaml-findlib opam"
 options="textrels"  # needed for ppc64le
 subpackages="$pkgname-dev $pkgname-ocamlbuild"
 source="$pkgname-$pkgver.tar.gz::https://github.com/mjambon/$_pkgname/archive/v$pkgver.tar.gz
@@ -46,7 +46,7 @@ package() {
 
 ocamlbuild() {
 	pkgdesc="$pkgdesc (Ocamlbuild plugin)"
-	depends="ocaml-runtime ocamlbuild"
+	depends="ocaml-runtime ocaml-ocamlbuild"
 
 	mkdir -p "$subpkgdir"/usr/lib/ocaml
 	mv "$pkgdir"/usr/lib/ocaml/${_pkgname}_ocamlbuild \

testing/ocaml-menhir/APKBUILD

@@ -9,7 +9,7 @@ pkgdesc="LR(1) parser generator for OCaml"
 url="http://gallium.inria.fr/~fpottier/menhir/"
 arch="all !x86 !armhf !s390x"  # limited by ocaml aport
 license="GPL-2.0-only"
-makedepends="ocaml ocamlbuild ocaml-findlib"
+makedepends="ocaml ocaml-findlib ocaml-ocamlbuild-dev ocamlbuild"
 options="!check"  # no tests provided
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://gallium.inria.fr/~fpottier/menhir/$_pkgname-$pkgver.tar.gz"

testing/ocaml-migrate-parsetree/APKBUILD

@@ -2,14 +2,14 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=ocaml-migrate-parsetree
 pkgver=1.0.7
-pkgrel=2
+pkgrel=3
 pkgdesc="Convert OCaml parsetrees between different major versions"
 url="https://github.com/ocaml-ppx/ocaml-migrate-parsetree"
 arch="all !x86 !armhf !s390x"  # limited by ocaml
 license="LGPL-2.1-only-WITH-linking-exception"
 depends="ocaml-result ocaml-runtime"
 makedepends="dune ocaml ocaml-compiler-libs ocaml-findlib ocaml-result-dev
-	ocamlbuild opam"
+	ocaml-ocamlbuild-dev opam"
 options="textrels"  # ppc64le (?!)
 subpackages="$pkgname-dev $pkgname-doc $pkgname-ocamlbuild"
 source="$pkgname-$pkgver.tar.gz::https://github.com/ocaml-ppx/$pkgname/archive/v$pkgver.tar.gz"
@@ -53,7 +53,7 @@ package() {
 
 ocamlbuild() {
 	pkgdesc="$pkgdesc (ocamlbuild plugin)"
-	depends="$pkgname=$pkgver-r$pkgrel ocamlbuild"
+	depends="$pkgname=$pkgver-r$pkgrel ocaml-ocamlbuild"
 
 	mkdir -p "$subpkgdir"/usr/lib/ocaml
 	mv "$pkgdir"/usr/lib/ocaml/$pkgname-ocamlbuild "$subpkgdir"/usr/lib/ocaml/

testing/reason/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=reason
 pkgver=3.0.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple, fast & type safe code that leverages the JavaScript & OCaml ecosystems"
 url="http://reasonml.github.io/"
 # x86, armhf, s390x: limited by ocaml aport
@@ -20,6 +20,7 @@ makedepends="
 	ocaml-menhir-dev=~$_menhirver
 	ocaml-merlin-extend-dev
 	ocaml-migrate-parsetree-dev
+	ocaml-ocamlbuild-dev
 	ocaml-result-dev
 	ocaml-utop-dev
 	ocamlbuild
@@ -115,7 +116,7 @@ reactjs() {
 
 rebuild() {
 	pkgdesc="Simple build system for Reason based on OCamlbuild"
-	depends="$pkgname ocamlbuild"
+	depends="$pkgname ocaml-ocamlbuild"
 
 	_submv usr/bin/rebuild
 }