gentoo resync : 20.03.2022

4 files changed, 74 insertions, 6 deletions

diff --git a/dev-ml/uutf/Manifest b/dev-ml/uutf/Manifest
index de79a223c69d..6fa67d5dfb8e 100644
--- a/dev-ml/uutf/Manifest
+++ b/dev-ml/uutf/Manifest
@@ -1,5 +1,7 @@
 DIST uutf-1.0.1.tbz 22215 BLAKE2B 58cbb8db94024ddaa02c213df4e5321ad33513370c6d1d54ac09f57821df8ac3b330c2659f9aeb0e78dfd15d2f50be714a5a5d6e6d3dcc3f81539c1a6c8c3771 SHA512 35cbee8c82a566f2fe4fcd549936d4c4dc67f5b71bfd3ea97ff25d7cf21cfb77cb5ee313c95ad26a2a61bb84aa48c300bbb79a1a7128c6161e9abe9c390a7d18
 DIST uutf-1.0.2.tbz 22420 BLAKE2B 8391f6c3cde40db3fa86b9243d8ea8fb52409aa958d1020f302d602bf7c06c44b7d93f7a6a64a1b0964c7bb5856e15178957bba48102dbd36d8efe9581db3787 SHA512 5f2dbe78eaf73a292438d84c7185c839a7ac13cee9616a7b5006990314c6a0d42b212854cc2e89d815d3c45804f94bb40af75ecb60da7092887d8dc21e968bdd
-EBUILD uutf-1.0.1.ebuild 1601 BLAKE2B 68d7fd446277ba74b4551fa1ada1c93415d33fa8a95957035ba3713565f3349537965c7881b5f78445b49ce98f573d8110ecf090a934251710d242700418277b SHA512 24ffd10517018740af3c3c7ac71deee2ea509de1f23bab9e503cb687ba12168f7f5e63a10dd5430aac92faf48938144c46f31d9970a9b84b0dfb346119bd82e1
-EBUILD uutf-1.0.2.ebuild 1601 BLAKE2B 68d7fd446277ba74b4551fa1ada1c93415d33fa8a95957035ba3713565f3349537965c7881b5f78445b49ce98f573d8110ecf090a934251710d242700418277b SHA512 24ffd10517018740af3c3c7ac71deee2ea509de1f23bab9e503cb687ba12168f7f5e63a10dd5430aac92faf48938144c46f31d9970a9b84b0dfb346119bd82e1
+DIST uutf-1.0.3.tbz 23363 BLAKE2B fe35596a3c3590df38f34219ac577d34c0899c006087cb015e971002fff0d193d7fdc281d0bc3abe2fd440e7da11cc27d10b0356f9eb73e1a2c647fd0b672bf6 SHA512 50cc4486021da46fb08156e9daec0d57b4ca469b07309c508d5a9a41e9dbcf1f32dec2ed7be027326544453dcaf9c2534919395fd826dc7768efc6cc4bfcc9f8
+EBUILD uutf-1.0.1.ebuild 1602 BLAKE2B e034bd86656837aef5f35797ab66db8b976da72e0cdfa108d5a7ca3e60e0c081f45cf9b89132f7da8c315045915f704ae240bf712f95ae5fe489df246ddfa932 SHA512 28eb77dfe9180b17995d518d5b9eb7f487692f0f463039340c4137c9ea668603d89f5a404d0f4d4e2c014ec1cec1e0bc19d3992172280df6778737480679cc18
+EBUILD uutf-1.0.2.ebuild 1602 BLAKE2B e034bd86656837aef5f35797ab66db8b976da72e0cdfa108d5a7ca3e60e0c081f45cf9b89132f7da8c315045915f704ae240bf712f95ae5fe489df246ddfa932 SHA512 28eb77dfe9180b17995d518d5b9eb7f487692f0f463039340c4137c9ea668603d89f5a404d0f4d4e2c014ec1cec1e0bc19d3992172280df6778737480679cc18
+EBUILD uutf-1.0.3.ebuild 1625 BLAKE2B 9a90dbd4c7cafe38ef9f132c08137a42b86b8d1468e45629486339f203f05d304fdca5f99aa3426af6cb0f37485842ecce6671e2acae331d8623a533e7c4543a SHA512 165c38b2272696f6437c18c9f1d1547297779db056b03ba88d5cfdb72d7f00c79d9454e4c209081e4164c65745f39b13e7a275f172a4e3a836160134ab16dbb0
 MISC metadata.xml 391 BLAKE2B 0f8f1c945c9a92d261312c24f4f23e50eb2183ab374e7f72f3e2aadd1678b130f230f39821209ac11156a0bbf3383552ff10552a7657da7c7b76abaa916585f2 SHA512 6953d1cde6c4c779d81b451f762f7aedf2f789aecaf87ac874475003b696546918d8f894cec935bf9cfc4ecdfdc1ec816fb3aa117f90e59fceabaf90d66d5157
diff --git a/dev-ml/uutf/uutf-1.0.1.ebuild b/dev-ml/uutf/uutf-1.0.1.ebuild
index d182d94e70ca..4897c4d92bc2 100644
--- a/dev-ml/uutf/uutf-1.0.1.ebuild
+++ b/dev-ml/uutf/uutf-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/uutf/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 IUSE="doc utftrip +ocamlopt test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="utftrip? ( ocamlopt )"
diff --git a/dev-ml/uutf/uutf-1.0.2.ebuild b/dev-ml/uutf/uutf-1.0.2.ebuild
index d182d94e70ca..4897c4d92bc2 100644
--- a/dev-ml/uutf/uutf-1.0.2.ebuild
+++ b/dev-ml/uutf/uutf-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/uutf/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 IUSE="doc utftrip +ocamlopt test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="utftrip? ( ocamlopt )"
diff --git a/dev-ml/uutf/uutf-1.0.3.ebuild b/dev-ml/uutf/uutf-1.0.3.ebuild
new file mode 100644
index 000000000000..6f553e6fb98e
--- /dev/null
+++ b/dev-ml/uutf/uutf-1.0.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="Non-blocking streaming Unicode codec for OCaml"
+HOMEPAGE="https://erratique.ch/software/uutf"
+SRC_URI="https://erratique.ch/software/uutf/releases/${P}.tbz"
+
+LICENSE="ISC"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc utftrip +ocamlopt test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="utftrip? ( ocamlopt )"
+
+RDEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+	dev-ml/uchar:=
+	utftrip? ( dev-ml/cmdliner:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-ml/ocamlbuild
+	dev-ml/topkg
+	test? ( dev-ml/cmdliner )"
+
+DOCS=( CHANGES.md README.md )
+
+src_compile() {
+	ocaml pkg/pkg.ml build \
+		--with-cmdliner "$(usex utftrip true false)" \
+		--tests "$(usex test true false)" \
+		|| die
+}
+
+src_test() {
+	if use ocamlopt ; then
+		pushd _build/test || die
+		./test.native || die
+		# Rebuild to avoid mismatches between installed files, bug #604674
+		popd || die
+		ocaml pkg/pkg.ml build \
+			--with-cmdliner "$(usex utftrip true false)" \
+			|| die
+	else
+		ewarn "Sorry, ${PN} tests require native support (ocamlopt)"
+	fi
+}
+
+src_install() {
+	# Can't use opam-installer here as it is an opam dep...
+	findlib_src_preinst
+	local nativelibs=""
+
+	use ocamlopt &&
+		nativelibs="$(echo _build/src/uutf.cm{x,xa,xs} _build/src/uutf.a)"
+	ocamlfind install uutf _build/pkg/META _build/src/uutf.mli _build/src/uutf.cm{a,i} ${nativelibs} || die
+	use utftrip &&
+		newbin _build/test/utftrip.$(usex ocamlopt native byte) utftrip
+
+	einstalldocs
+	if use doc ; then
+		docinto html
+		dodoc -r doc/*
+	fi
+}