gentoo resync : 28.04.2021

8 files changed, 58 insertions, 83 deletions

diff --git a/dev-ml/xml-light/Manifest b/dev-ml/xml-light/Manifest
index f26edc7dcab7..0244e3f0b036 100644
--- a/dev-ml/xml-light/Manifest
+++ b/dev-ml/xml-light/Manifest
@@ -1,7 +1,7 @@
-AUX 01_installopt.dpatch 861 BLAKE2B 0adf06c9c8bac79bb3653dba5b6f882ab80ad40dba56ac9242061e177407e33f1f466be55d0ffbac4c4bd832193940cf6b757e8386aefaeaa0bda92901c95a29 SHA512 1413f51f182affc2628799d0f4224033cb305755c31174450873cada394f9ca83fa7afc6452414b1c305f0b39b8f9936b28ca96c4aeef4acc1b0f9957a20865e
-AUX 02_cmi_depends.dpatch 492 BLAKE2B 1b6094d0b024c9381ae15e73ca593835bf1f4d3d2b30f9cf25edc2b42726313505d9a5d070615db54caec2279519836667157cf4c24d036b68109e1ad74730b4 SHA512 47f9e71b14d1df29325d5b9077c93353114566f579fb8d26b9dd5a24ce8dd66a2c56e0508924eb8c3491373bc8870e81039be990290417b559345400e03cab09
-AUX 03_cflags.dpatch 1681 BLAKE2B 7d1195efbce6ffa26bcf6e7bc33faa2e27f20991d08ded7a0a6eebc615e99f42d8c58a1092d9db90ecf047398fcc701419f1ca6959876a462922d8956e2d9f98 SHA512 314d30a73cd6a430a367a38b50c10afaf1d307b8ce63795315b093be8500dfb5ddac98eaf5a60f32b047a62f203fa59d9e6dd5c342e7ec7132b78fcd734de51e
-AUX 04_dtd_trace.dpatch 780 BLAKE2B 358cf04728f0d8e7bbe7e29568ebe55b4e07b51217e7a308437ba2dfc202d76ac7cdd8d3fcf40e201124d625249c1a93d5c496a9834f34f7ffa35f872c0424d1 SHA512 14cb78558afeed100e6f085233b001ea5501ccb3020c2437362870031b1a14ad7227794bc81c3de9567cf0d797c0966c515ce56245e429a149f097895c06f771
+AUX 01_installopt.patch 497 BLAKE2B 87c51b6870d38e935f528aa0b69bcea7a825bca822afdb52238f7c8e6dcc581d73293b8512a2d6ae4dc455415f94fb2a1f447b917788a6879dfa3976dfa81f9b SHA512 98ea3b49cbd29ce1d1cd57c0dab42b96f31064a0acf99280636e2fa342de1717276b7cea886c5131374a6de3900b1b444bd0b4f9331df1f91467fd756f1d1e11
+AUX 02_cmi_depends.patch 127 BLAKE2B 79d3c29e72e3ad47511173dc961afc1bde4e44da83f3faa3a7b82c04134501b22ac54cb8fe633feb6bd1b23cd340cdbe8e4a957c1914a17830c73853faed92f6 SHA512 7d3e9503f07126c32b3ac74e8f5055e409b54e69059fe8fb34d7558892ffae8e2435b86c4de788dfcfbdc606b99c616e8161d1263737d196e1a45930c21beaa4
+AUX 03_cflags.patch 1321 BLAKE2B cc31b252624711dcf3eace32b7ba8169caddf06518c831a9b543b49dba80d6206b873e2abd19599793697a5aceeee4baa28f7ddfb6822566479b935ebc16babb SHA512 86366c45285dd05910c38f1044e73d2a745e6280e4b8b56c40b7adc6f92d65a5836b49af4150c53c06a2a4fa285d91c4f1b1aad4517d6625581560d09598267f
+AUX 04_dtd_trace.patch 421 BLAKE2B 8bb177b2f0a1735628a95d7af07c55a85552f0a16f7be5b10cf5a2bb5165127885b359a4a60da6096fb47d6dca4cd9a737731121ad26199c31711ebff73d0f92 SHA512 7f28fe7b8d19fa81d60789e3082b4636280c2b5159a0ae7356cea34368596c6cd162da2b0df3e34ffd1b377b6aec0a48ebd468932d4dae0b08e14b0ed49ac8ff
 DIST xml-light-2.2.zip 22130 BLAKE2B 95b4bc23be63ef5c6faf529877aaf753e3c9fee99948dff82bab5e3206ea718a71ce1e03a2bdba17ff21c040dc8774312ce752c97450f0420681926524864f58 SHA512 b3be968db1ea8b9f8cc439fc8a685083227a7b07469af17c31993229a506f2ff6b1b0cf2097f4198a71e1d858d166f36c99bb26720136633c233a790764087ed
-EBUILD xml-light-2.2-r3.ebuild 1261 BLAKE2B 0d990de3a6c4f19042b2bade2d123e5d60d2ca5febd65f37ef714a0d977852e8a9fe6fc265d4590890217ce63abc30f3a53f10ac427976bd558b0e88ce6b1299 SHA512 0645c8c3065ff24bbf74c8e0ef8e7e66a402817767508765faa81e77718cb2c033d9b452d26982849b148e4b6c4750d3cf8cab15d5892a8486d3ecf0841f8e39
+EBUILD xml-light-2.2-r3.ebuild 1334 BLAKE2B a108deaae9830f90a6aef5f3af47e471e71972ca8299c2d68a53eba713d5502af3f8dda57b33e346b81abe5bc1e6b07153d44250b9321dbf481c0640ab63cd5c SHA512 799bfc48ce770e2acd04305acbe818b954a046b4df653bc5dd28086a0450c6ed03f5e44997142ed18f09b6e0892be73c3c54d25eb64cadb03a729730ad58d9dd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-ml/xml-light/files/01_installopt.dpatch b/dev-ml/xml-light/files/01_installopt.patch
index 1dfb50c9e271..d3a3d8457431 100644
--- a/dev-ml/xml-light/files/01_installopt.dpatch
+++ b/dev-ml/xml-light/files/01_installopt.patch
@@ -1,13 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_installopt.dpatch by Sylvain Le Gall <gildor@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
---- xml-light-2.2~/Makefile	2005-10-11 23:26:41.000000000 +0200
-+++ xml-light-2.2/Makefile	2005-10-11 23:28:00.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -11,8 +11,11 @@
  

  opt: xml-light.cmxa test_opt.exe

diff --git a/dev-ml/xml-light/files/02_cmi_depends.dpatch b/dev-ml/xml-light/files/02_cmi_depends.dpatch
deleted file mode 100644
index 1fcf17048407..000000000000
--- a/dev-ml/xml-light/files/02_cmi_depends.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_cmi_depends.dpatch by Sylvain Le Gall <gildor@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
---- xml-light-2.2~/Makefile	2006-01-03 17:34:23.000000000 +0100
-+++ xml-light-2.2/Makefile	2006-01-03 17:35:04.000000000 +0100
-@@ -82,6 +82,6 @@
- .mll.ml:

- 	ocamllex $<

- 

--.mly.ml:

-+%.mli %.ml: %.mly

- 	ocamlyacc $<

- 

diff --git a/dev-ml/xml-light/files/02_cmi_depends.patch b/dev-ml/xml-light/files/02_cmi_depends.patch
new file mode 100644
index 000000000000..c1f4ce31d159
--- /dev/null
+++ b/dev-ml/xml-light/files/02_cmi_depends.patch
@@ -0,0 +1,10 @@
+--- a/Makefile
++++ b/Makefile
+@@ -82,6 +82,6 @@
+ .mll.ml:

+ 	ocamllex $<

+ 

+-.mly.ml:

++%.mli %.ml: %.mly

+ 	ocamlyacc $<

+ 

diff --git a/dev-ml/xml-light/files/03_cflags.dpatch b/dev-ml/xml-light/files/03_cflags.patch
index 5dfbffe5da1f..3895b2ad6872 100644
--- a/dev-ml/xml-light/files/03_cflags.dpatch
+++ b/dev-ml/xml-light/files/03_cflags.patch
@@ -1,13 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_cflags.dpatch by Sylvain Le Gall <gildor@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad xml-light-2.2~/Makefile xml-light-2.2/Makefile
---- xml-light-2.2~/Makefile	2006-10-26 00:22:41.000000000 +0200
-+++ xml-light-2.2/Makefile	2006-10-26 00:24:45.000000000 +0200
+--- a/Makefile
++++ b/Makefile
 @@ -3,8 +3,8 @@
  .SUFFIXES : .ml .mli .cmo .cmx .cmi .mll .mly

  

diff --git a/dev-ml/xml-light/files/04_dtd_trace.dpatch b/dev-ml/xml-light/files/04_dtd_trace.dpatch
deleted file mode 100644
index 9dbea4bdf0c8..000000000000
--- a/dev-ml/xml-light/files/04_dtd_trace.dpatch
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_dtd_trace.dpatch by Sylvain Le Gall <gildor@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad xml-light-2.2~/dtd.ml xml-light-2.2/dtd.ml
---- xml-light-2.2~/dtd.ml	2005-02-18 10:01:54.000000000 +0100
-+++ xml-light-2.2/dtd.ml	2006-10-26 23:22:25.000000000 +0200
-@@ -267,7 +267,7 @@
- exception TmpResult of dtd_result

- 

- let prove_child dtd tag = 

--	trace dtd tag;

-+	(*trace dtd tag;*)

- 	match dtd.current with

- 	| DTDEmpty -> raise (Prove_error EmptyExpected)

- 	| DTDAny -> ()

-@@ -505,4 +505,4 @@
- 		sprintf "<!ELEMENT %s %s>" tag (etype_to_string etype)

- 

- ;;

--to_string_ref := to_string
-\ No newline at end of file
-+to_string_ref := to_string

diff --git a/dev-ml/xml-light/files/04_dtd_trace.patch b/dev-ml/xml-light/files/04_dtd_trace.patch
new file mode 100644
index 000000000000..ac0da3cb5b86
--- /dev/null
+++ b/dev-ml/xml-light/files/04_dtd_trace.patch
@@ -0,0 +1,18 @@
+--- a/dtd.ml
++++ b/dtd.ml
+@@ -267,7 +267,7 @@
+ exception TmpResult of dtd_result

+ 

+ let prove_child dtd tag = 

+-	trace dtd tag;

++	(*trace dtd tag;*)

+ 	match dtd.current with

+ 	| DTDEmpty -> raise (Prove_error EmptyExpected)

+ 	| DTDAny -> ()

+@@ -505,4 +505,4 @@
+ 		sprintf "<!ELEMENT %s %s>" tag (etype_to_string etype)

+ 

+ ;;

+-to_string_ref := to_string
+\ No newline at end of file
++to_string_ref := to_string

diff --git a/dev-ml/xml-light/xml-light-2.2-r3.ebuild b/dev-ml/xml-light/xml-light-2.2-r3.ebuild
index acc3930daa92..7976f46e976d 100644
--- a/dev-ml/xml-light/xml-light-2.2-r3.ebuild
+++ b/dev-ml/xml-light/xml-light-2.2-r3.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils multilib
+EAPI=7
 
 DESCRIPTION="Minimal Xml parser and printer for OCaml"
 HOMEPAGE="http://tech.motion-twin.com/xmllight.html"
 SRC_URI="http://tech.motion-twin.com/zip/${P}.zip"
+S="${WORKDIR}/${PN}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
@@ -15,21 +14,23 @@ KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="doc +ocamlopt"
 
 RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
-DEPEND="app-arch/unzip
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
 
-src_prepare() {
-	EPATCH_FORCE=yes EPATCH_SUFFIX=dpatch EPATCH_SOURCE="${FILESDIR}" \
-	epatch
-}
+PATCHES=(
+	"${FILESDIR}"/01_installopt.patch
+	"${FILESDIR}"/02_cmi_depends.patch
+	"${FILESDIR}"/03_cflags.patch
+	"${FILESDIR}"/04_dtd_trace.patch
+)
 
 src_compile() {
 	emake -j1
+
 	if use ocamlopt; then
 		emake -j1 opt
 	fi
+
 	if use doc;then
 		emake doc
 	fi
@@ -43,20 +44,26 @@ src_test() {
 src_install() {
 	dodir /usr/$(get_libdir)/ocaml/${PN}
 	emake INSTALLDIR="${D}"/usr/$(get_libdir)/ocaml/${PN} install
-	cat > "${D}"/usr/$(get_libdir)/ocaml/${PN}/META << EOF
+
+	cat > "${ED}"/usr/$(get_libdir)/ocaml/${PN}/META || die << EOF
 name="${PN}"
 version="${PV}"
 description="${DESCRIPTION}"
 requires=""
 archive(byte)="xml-light.cma"
 EOF
+
 	if use ocamlopt; then
 		emake INSTALLDIR="${D}"/usr/$(get_libdir)/ocaml/${PN} installopt
-		echo 'archive(native)="xml-light.cmxa"' >> "${D}"/usr/$(get_libdir)/ocaml/${PN}/META
+		echo 'archive(native)="xml-light.cmxa"' >> "${ED}"/usr/$(get_libdir)/ocaml/${PN}/META || die
 	fi
+
 	dodoc README
+
 	if use doc; then
 		emake doc
-		dohtml doc/*
+
+		docinto html
+		dodoc doc/*
 	fi
 }