[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-expat/, dev-ml/ocaml-expat/files/

[Mark Wright]

commit:     01eca61dc9047c1892a8988f2dd4cc4672c96107
Author:     Mark Wright <gienah <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 12:03:00 2020 +0000
Commit:     Mark Wright <gienah <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 12:53:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01eca61d

dev-ml/ocaml-expat: EAPI=7, KEYWORDS from ml-overlay.

Co-Author: Alexis Ballier <aballier <AT> gentoo.org>
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Mark Wright <gienah <AT> gentoo.org>

 dev-ml/ocaml-expat/files/ounit2.patch          | 17 +++++++++
 dev-ml/ocaml-expat/metadata.xml                | 11 ++++--
 dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild | 51 ++++++++++++++++++++++++++
 3 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/dev-ml/ocaml-expat/files/ounit2.patch b/dev-ml/ocaml-expat/files/ounit2.patch
new file mode 100644
index 00000000000..5cbcc4e12b9
--- /dev/null
+++ b/dev-ml/ocaml-expat/files/ounit2.patch
@@ -0,0 +1,17 @@
+Index: ocaml-expat-1.1.0/Makefile
+===================================================================
+--- ocaml-expat-1.1.0.orig/Makefile
++++ ocaml-expat-1.1.0/Makefile
+@@ -85,10 +85,10 @@ test: unittest
+ testopt: unittest.opt
+ 	./unittest.opt
+ unittest: all unittest.ml
+-	$(OCAMLFIND) ocamlc -o unittest -package oUnit -ccopt -L. -linkpkg \
++	$(OCAMLFIND) ocamlc -o unittest -package ounit2 -ccopt -L. -linkpkg \
+ 	$(ARCHIVE) unittest.ml
+ unittest.opt: allopt unittest.ml
+-	$(OCAMLFIND) ocamlopt -o unittest.opt -package oUnit -ccopt -L. -linkpkg \
++	$(OCAMLFIND) ocamlopt -o unittest.opt -package ounit2 -ccopt -L. -linkpkg \
+ 	$(XARCHIVE) unittest.ml
+ 
+ ## Cleaning up

diff --git a/dev-ml/ocaml-expat/metadata.xml b/dev-ml/ocaml-expat/metadata.xml
index b6a93442203..f91d68f6062 100644
--- a/dev-ml/ocaml-expat/metadata.xml
+++ b/dev-ml/ocaml-expat/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">whitequark/ocaml-expat</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gienah@g.o</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">whitequark/ocaml-expat</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild b/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild
new file mode 100644
index 00000000000..152a3ca7fbf
--- /dev/null
+++ b/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+IUSE="doc +ocamlopt test"
+
+DESCRIPTION="OCaml bindings for expat"
+SRC_URI="https://github.com/whitequark/ocaml-expat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/whitequark/ocaml-expat"
+
+RDEPEND="dev-libs/expat
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
+
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit2 )"
+
+SLOT="0/${PV}"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+PATCHES=( "${FILESDIR}/ounit2.patch" )
+
+src_compile() {
+	emake depend
+	emake all
+	if use ocamlopt; then
+		emake allopt
+	fi
+	if use doc; then
+		emake doc
+	fi
+}
+
+src_test() {
+	emake test
+	if use ocamlopt; then
+		emake testopt
+	fi
+}
+src_install() {
+	findlib_src_preinst
+	emake install
+
+	if use doc ; then
+		docinto html
+		dodoc -r doc/*
+	fi
+	dodoc README
+}