gentoo (valentine's day) resync : 14.02.2021

5 files changed, 49 insertions, 10 deletions

diff --git a/dev-ml/ppxlib/Manifest b/dev-ml/ppxlib/Manifest
index dafbe925dcab..bc05f25ddcbf 100644
--- a/dev-ml/ppxlib/Manifest
+++ b/dev-ml/ppxlib/Manifest
@@ -1,7 +1,9 @@
 DIST ppxlib-0.18.0.tar.gz 192929 BLAKE2B db14821aa77eac02038632ee8a9756ffd7a7b561c5852c4a5bb6882da531a6d2833737d4d1d372ff73251c168e2da57c7df0c724b1d9a6c4829632881aa4d2b3 SHA512 73b785eec34ca68451936c750ff68a4799b8c265cd973a587bd77b60cb933409eed4edfd4c9a4b0b1ada8d3a0bae5c5c719e4258d00cb0290a6842c67be1fd3d
 DIST ppxlib-0.20.0.tar.gz 193453 BLAKE2B baf5703737792f274654de489aee31c1d324011cbe7e4f5b73102ea352d10ca513ed1b04ec43324640a01c0e5d168945806f6fd4e3a60c9f70c28392a720ec61 SHA512 e19699cb09c441d0ecbda191df78e8227111f1880be4f2810228cbfbf93c9474ba6d04e0e3b4b14820ea7dbd1388fd4ac86f818a28819e7d8b0dd00200609a7d
 DIST ppxlib-0.21.0.tar.gz 201905 BLAKE2B f7a7b69ab07b2a5dce542877989fb4ca820acdda375371895072b857a44e8e7f437695f43990472dfad88261179ff07bd33f6e39881c2b28ff2650d7e2a53bdf SHA512 5760ecc8a5e0c0f49ad4f0d3ba2546185d36411f4292c4ebfbf0c9520438546a60d8fe0b265cec70793b03cc684e399401ff761cb1c369966add70118f1ecda5
-EBUILD ppxlib-0.18.0.ebuild 764 BLAKE2B dc0bf7be03916c85152c42d30a6aa83a72df8b6e2a0488e03ca59ee5318327753a3d2f930fa823918bf6b672090336bfc9ef5bd55e1989865eb098309ceac969 SHA512 0fa630d3d4573a33aef2dac989772dc1c6db23e3c676a34f8fa12521e4154a88e9c561a152c2e6f485cac3055b174d8588d8ef7bbbe331f145c38013481338e8
-EBUILD ppxlib-0.20.0.ebuild 725 BLAKE2B 62c6907c16427a05ac905ec3614b3d6ac81ed1b7e1e02e64c6659a9099e4659c26d261d9221f1104e8c0990049d0eb042cfb4ef54f957b36da2d30dbe568eafc SHA512 fcd0136e7b6ede244ff89ff53f514f3f718ef922a776f11e89c17232f681c6e913871bc4d18a7075885425b68860964e3c8fe445c9efa07c2f58e11208a71c48
-EBUILD ppxlib-0.21.0.ebuild 743 BLAKE2B 76218084c493f34c3336bfa48dfb44c217ed1e7a3793046a7b71076e841e74e6f424c5674367b99626362c57c357e24fc3aef211b4c2747d96b663783cbcca38 SHA512 d988b63956ec123811f75bca4d4b66ea8c4072b01e52f869a3b8a192a2b302a3af3854e586ae74a80e16464f3d23fba391dd02c822756826fcf7fe4a5cd9dd83
+DIST ppxlib-0.22.0.tar.gz 202241 BLAKE2B 6b18ceb23e248eb2b4faed66ba0ea1cbee36df61cee9458fc0fd7057eff433340cb602a429c3f100ee054da06d9de20eca44e5ecc4ba98c888cfec2c83097151 SHA512 11442120c24bf60d9de90c9a325de9e5d87d87ba08d8e4cd216a3434f422c62427aa4214909b80646db638423ea35dff4280d5a70cf51bdfadc0a97745c32d41
+EBUILD ppxlib-0.18.0.ebuild 761 BLAKE2B 40f8e9ac892537578d8eb96c5429f55154df6309f27a8724c4fbfaa7837066bc0622e814ff4aa476e28d5dff2160d91a50c3ffb77d3657077c775904fd6084ef SHA512 a52e6211ad464a40dd1cfa2487c7c08f6e728882160ea41694298cc9b08fc203aca2e7daa7a33cdd2bad089f3ae3cf41e568396c37630397e8901891c9c2d4af
+EBUILD ppxlib-0.20.0.ebuild 720 BLAKE2B 21a724e49a2261959680c21117fdbf1db1ff1f4efa9fe22f93d05d106e6cf6c6487a7dc39e1022f42df1ff6b85554fee5f256e9fd613d402fb8c0ce4f582e5c8 SHA512 16fa9ca11081147b972344d4db67f54aba9e63aff4e4cd327b2b704661ff31824753119a9a3ed6897145cc61d5cb697430db59b738c1cd98513d8889fdca666d
+EBUILD ppxlib-0.21.0-r1.ebuild 793 BLAKE2B 43d4d93deb4341d9f6a2db4649010f825136452a39a8390070f4d759cddba1645f6ac19712103de9ecddc0d0094126203f83298e5705e337a0cab2c05507f6e4 SHA512 f7664fece24435d4d7257a31fad08fa3355a8c83d04bf3901105a6474442d5064c85cb350a88fa9a1bda1a7a821c5ce758c8bddba803a154239077caeac9a6d3
+EBUILD ppxlib-0.22.0-r1.ebuild 793 BLAKE2B 43d4d93deb4341d9f6a2db4649010f825136452a39a8390070f4d759cddba1645f6ac19712103de9ecddc0d0094126203f83298e5705e337a0cab2c05507f6e4 SHA512 f7664fece24435d4d7257a31fad08fa3355a8c83d04bf3901105a6474442d5064c85cb350a88fa9a1bda1a7a821c5ce758c8bddba803a154239077caeac9a6d3
 MISC metadata.xml 418 BLAKE2B 4e11f61bd5b22b4ce2527e5c9910956df486f3e7d341ba6e0936731f79eb866ada1bb54a4a9113854d65683caa3640a2782a1684cf388068b0800e507eae0bf6 SHA512 e7574d67752a664b5619861e1192cafcdf5fa49fdbdf55404992edf261a48b2771e6d3177e6f70238020a8d253f6916b1971d01780724487c910b0ebe29079ef
diff --git a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
index 5fa6ce7a3233..3cee14a81864 100644
--- a/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.18.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 inherit dune
 
-DESCRIPTION="Base library and tools for ppx rewriters "
+DESCRIPTION="Base library and tools for ppx rewriters"
 HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
 SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -20,7 +20,7 @@ DEPEND="
 	dev-ml/findlib:=
 	>=dev-ml/ocaml-compiler-libs-0.11.0:=
 	>=dev-ml/ocaml-migrate-parsetree-2.0.0:=
-		dev-ml/cinaps:=
+	dev-ml/cinaps:=
 	dev-ml/sexplib0:=
 	dev-ml/stdlib-shims:=
 	>=dev-ml/ppx_derivers-1.2.1:=
@@ -30,4 +30,4 @@ RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	test? (
 		dev-ml/cinaps
-		)"
+	)"
diff --git a/dev-ml/ppxlib/ppxlib-0.20.0.ebuild b/dev-ml/ppxlib/ppxlib-0.20.0.ebuild
index 5fb766c7f1bd..d099b3ee8c7f 100644
--- a/dev-ml/ppxlib/ppxlib-0.20.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.20.0.ebuild
@@ -5,13 +5,13 @@ EAPI=7
 
 inherit dune
 
-DESCRIPTION="Base library and tools for ppx rewriters "
+DESCRIPTION="Base library and tools for ppx rewriters"
 HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
 SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/ppxlib/ppxlib-0.21.0.ebuild b/dev-ml/ppxlib/ppxlib-0.21.0-r1.ebuild
index 0fdd44c7b65c..4e0bb08cb7f4 100644
--- a/dev-ml/ppxlib/ppxlib-0.21.0.ebuild
+++ b/dev-ml/ppxlib/ppxlib-0.21.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit dune
 
-DESCRIPTION="Base library and tools for ppx rewriters "
+DESCRIPTION="Base library and tools for ppx rewriters"
 HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
 SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -15,6 +15,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
+# nss[utils] has /usr/bin/pp
 RDEPEND="
 	>=dev-ml/base-0.11.0:=
 	dev-ml/findlib:=
@@ -24,6 +25,7 @@ RDEPEND="
 	dev-ml/stdlib-shims:=
 	>=dev-ml/ppx_derivers-1.2.1:=
 	>=dev-ml/stdio-0.11.0:=
+	!dev-libs/nss[utils]
 "
 DEPEND="${DEPEND}
 	test? (
diff --git a/dev-ml/ppxlib/ppxlib-0.22.0-r1.ebuild b/dev-ml/ppxlib/ppxlib-0.22.0-r1.ebuild
new file mode 100644
index 000000000000..4e0bb08cb7f4
--- /dev/null
+++ b/dev-ml/ppxlib/ppxlib-0.22.0-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Base library and tools for ppx rewriters"
+HOMEPAGE="https://github.com/ocaml-ppx/ppxlib"
+SRC_URI="https://github.com/ocaml-ppx/ppxlib/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+# nss[utils] has /usr/bin/pp
+RDEPEND="
+	>=dev-ml/base-0.11.0:=
+	dev-ml/findlib:=
+	>=dev-ml/ocaml-compiler-libs-0.11.0:=
+	>=dev-ml/ocaml-migrate-parsetree-2.1.0:=
+	dev-ml/sexplib0:=
+	dev-ml/stdlib-shims:=
+	>=dev-ml/ppx_derivers-1.2.1:=
+	>=dev-ml/stdio-0.11.0:=
+	!dev-libs/nss[utils]
+"
+DEPEND="${DEPEND}
+	test? (
+		dev-ml/cinaps:=
+		dev-ml/re:=
+	)
+"