gentoo resync : 25.11.2020

4 files changed, 79 insertions, 5 deletions

diff --git a/dev-ml/ocaml-expat/Manifest b/dev-ml/ocaml-expat/Manifest
index b0fa8c0a6dc0..a5f87e393f78 100644
--- a/dev-ml/ocaml-expat/Manifest
+++ b/dev-ml/ocaml-expat/Manifest
@@ -1,5 +1,7 @@
+AUX ounit2.patch 672 BLAKE2B a47afbc8d7c33483a8a732252f7a7a624f60364d2c055097a0af8f97b7022b09b297a4022a02317fd6e4843bd3f66a875feb8389750cd3f332560cbc38834e5b SHA512 5298115ef79f2d59cafd1c0d09e7dde8649dc16a7a84f77965078a62f76ee2d9348e10d0e2230efdd89c3ecf4cc59ba3fc7b3d5de4f2a428641e8a67a47dc220
 DIST ocaml-expat-1.0.0.tar.gz 58149 BLAKE2B 0bd99a8a5eb8f4fe1a04d1d53edc5dc662a51ae880c5297de9dbc93561896e5c3acf3db4b7edc5122a328be4c17fd924a66a2e0e08c9bd74aac704257f5dc569 SHA512 217d602ac8fabf7713dcd8fd274206b81ff467402a9bca5b15b13f3b1d68e8e5f2c2970adeafb2378c0993b39c7d98a420dee07f30ad9eb88fd40665a2f98897
 DIST ocaml-expat-1.1.0.tar.gz 58318 BLAKE2B 137bc65c5c867180ba547de17041bd0f588da395928e92eabef45cdbb76a1d139d7cd0d80d33337e1fbff92c9fa3cab2339c0f340f50f467b8fe7d64cba10b1e SHA512 9407f91f5007d6835643719294d4e4907bfc40464d054911591ce80c31d173ddcc7b06157a19c0d3ddd78775806242dc68aea7847e588ca9fd1909def1df4d23
 EBUILD ocaml-expat-1.0.0.ebuild 823 BLAKE2B e79e689a1a2629aca38ffedaeba67a24aa45981e797648a50e0a9ef10249637a7c857820b4a3979529dce3b8820c5d85b64c9d4ed8b92a412b59f7c6421c5a59 SHA512 94bdbf2e30b52b0782b3f89a58514058c2d46049cf6045d431382b1d4c79d7672f1c9b0febd73a7e8c7fd9a19eca2166c073749767c069529e171e3e05a50150
+EBUILD ocaml-expat-1.1.0-r1.ebuild 906 BLAKE2B 0dae8b0ebabef5a8c84d85e1151e80fb271254f530f0939e6ebf988db9ca05b6605786fade5e50fe8c136dad436879f28e370d8b5d4eea79ef706262d1de94f0 SHA512 8a8cad1130b20d3467aacf86c53011c37e5710bb52dcf18a4721989b6a98c382b5c9b53722b2e2a08126329f7385b3fa10645da3162c5a28f8bfeef834e32016
 EBUILD ocaml-expat-1.1.0.ebuild 823 BLAKE2B e79e689a1a2629aca38ffedaeba67a24aa45981e797648a50e0a9ef10249637a7c857820b4a3979529dce3b8820c5d85b64c9d4ed8b92a412b59f7c6421c5a59 SHA512 94bdbf2e30b52b0782b3f89a58514058c2d46049cf6045d431382b1d4c79d7672f1c9b0febd73a7e8c7fd9a19eca2166c073749767c069529e171e3e05a50150
-MISC metadata.xml 259 BLAKE2B 15d9dd0c2e0cf8df518c1b724362cd6b14648823e1837e19fe055aad4874cf9331e20b9416b73bcfed3141bbe41e8a7dbeb9f20a829872d3ca1ee721890104df SHA512 57f116015a1724a5cfba8c3f77ad0eefbcc51d8380a43856ee5ec8cee8767d96c3461cf48ad4ccdbe1842ead186c71092630ea5df967a4f2c646ef531eb8f32b
+MISC metadata.xml 331 BLAKE2B bab5b5dec6ca651b9ca68b86fbc7512bfeeb15946248234814bad8acf17aabb785e6bd23a645e205adb1c97907da43ea4dc052233c0f5b699551cae30eb77fb4 SHA512 da512352ddbdf8c8a274706656b4611e918089d0c970dc68d6ebc95200ba0900c5bfe3f7d5454d87ef7ddd5ec0e45b2da2aad531c2c22998ac0d5798fbd62d64
diff --git a/dev-ml/ocaml-expat/files/ounit2.patch b/dev-ml/ocaml-expat/files/ounit2.patch
new file mode 100644
index 000000000000..5cbcc4e12b98
--- /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 b6a93442203a..f91d68f6062b 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@gentoo.org</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 000000000000..dbb092201584
--- /dev/null
+++ b/dev-ml/ocaml-expat/ocaml-expat-1.1.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+IUSE="doc +ocamlopt test"
+RESTRICT="!test? ( 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 ~ppc ~ppc64 ~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
+}