gentoo resync : 22.01.2021

6 files changed, 167 insertions, 58 deletions

diff --git a/dev-ml/ppx_deriving/Manifest b/dev-ml/ppx_deriving/Manifest
index 30c79d181b67..631cce6b7efd 100644
--- a/dev-ml/ppx_deriving/Manifest
+++ b/dev-ml/ppx_deriving/Manifest
@@ -1,5 +1,6 @@
-DIST ppx_deriving-4.2.tar.gz 48327 BLAKE2B 8ce5ccbfb7992fbd5e9c777ad0b577f8846d92df21926a877fb8f7b6804acc4fa2fd78586fc209c3bd83b8496eb6f8e8ee37c39e0c7462fb55f39389356f3c8f SHA512 084526157d6f4b41f7ad73157c5edb54d5bb9130d706525031670d8495ede8af5545302f442c2d2c506772201b79ccc93bdc7fead9455d3a59977ddfa9c3284d
+AUX ounit2.patch 4792 BLAKE2B 8580b9163dcc86993a9830b015e894fa83b136a1fb4f6c57b7feb0b398821d4ce508a45954ad5027795933dfee26861144169a680a09c65ab9d2e7fc6cc9cdd5 SHA512 00757a492c6137bab95bbedada4632b3279c65512d4035464d66e74629b2b47261f797ade6618175141252da04a14cce941132aa77a2b9922e3b08d9c496a385
 DIST ppx_deriving-4.5.tar.gz 45886 BLAKE2B 257bacda986a3830e3efd55b8e97d8c633b64740a36c7954c7b13ef42578fef8795f268e709a2b7285fa3dda1297afe7cfcc277da8557ed654dda6401a550680 SHA512 f79153c5231ba1e03a3491fde95ca82ecb62fe05b60a649a374d2fbc5ea5dd9242126de7dfbe917c22fd7077c026c940e18c6b36c5ce0ec4bb6e07f11d2b710b
-EBUILD ppx_deriving-4.2-r1.ebuild 1222 BLAKE2B 46f7ae25cf2dc8cea15959a6efbd2b3ebaf7c68a70737283046e4fbfdac94cd69f5a956575d5863b47da76e79bd5a4b429dca0f4326adbdc3cb61567c60e703c SHA512 9ffcdecfe0ba84ba5517c2bd9cb401e0bb08431bead6ef85ebdaf0b15d3f3d2a3e92c50cdc028c47543a5a13135843244dcfbfcff6f680329e90dc4cf8199a4b
-EBUILD ppx_deriving-4.5.ebuild 686 BLAKE2B e04594fc0ad2e0aa69fce618c65958ac86e5eb84ce763b4d70775750ac539049fbe7eecb69b8ee5253b7c43d045ed196b5425e095bcacdeee6a66d294c384db9 SHA512 b93e2da7b431cb5daedfb8fb2d61ea819155a1a0164880c8dbced6eb7e1ae9aa9dcfd2763aa4e108e58a4d3b47525722ee7906c6387919f146cfcd1d9ba637ce
-MISC metadata.xml 331 BLAKE2B 6b066536e1294c46f3a701317330ab6af84c74731a79c83a0a706528de457cc5681fa7722f198a899f158d139833ff9d7a005ae03eb4071089067f0880b3efb2 SHA512 eebc80d708fb3baafb41b4a4bd21202b6fe69c59d833d6a5772531ac860683b3a467ad813a5338766ee5796354996230af990ce8e59a5b9dc0386f81555eff71
+DIST ppx_deriving-5.2.tar.gz 45766 BLAKE2B 67d041b69ad675873500844f8ef638797e271c3a3a82467407914a073e6eb9ff84f911d128ccf507be051fb89c7c85991987793067046b0dd1ecdc534b658b05 SHA512 0daf7d0050b8e2b18b441da994e8cf1f05e37f7d88d1f4512204979f19ac4d116a6c72f683c615b091e0340a4d380684f9b2ed1b70d84fae6ca928843ed3f479
+EBUILD ppx_deriving-4.5.ebuild 693 BLAKE2B 4fcdc841312d2de7d44a9f1cbfd9ff397e999f2f123de1d5f09cc161af291e597a11fce9b43c32aa007f2233c3efa27ff73373d610abae67e814835945761e7b SHA512 3e19d8a9e8f348cf56696c4bc5878c074543523cc4bae3d4f47095faae45516c21d67636561aba8f592b7bb9a765956f8a4d462679cfcb7657f41b506471aa54
+EBUILD ppx_deriving-5.2.ebuild 657 BLAKE2B 7a8b29acdb993ea00b23bfa2c44d9ca4f0b4b3b232f73d5bf3c2dcd25e91b1fbadc208cd82ea33eb96399bccfc839ad05a33aec11284d5dc34e7e824077f12aa SHA512 aaaf59686dc348c264e8276a466406487d5c3d59316597d1013bcb49dace07136270aacce6ebe9138269e2dadaec9d408f30cebadb8ba000ce93172f6697db27
+MISC metadata.xml 424 BLAKE2B 1fe2e79c56e42f16e52478d935a44f69e665dc2910bfd0012bd085c94c3d35ce778a78cf6ab28cdc09fc3d6e5da051de6b3199f5e09fd6982dcbb83cfd3c24e2 SHA512 62b95e039b84dec56f36ea733b8bc766f392b7889fbd2604f933f8df9f9e743d42ad2ee670af2479d6836b705495564eb392d8794371934556f819813c2fb7ab
diff --git a/dev-ml/ppx_deriving/files/ounit2.patch b/dev-ml/ppx_deriving/files/ounit2.patch
new file mode 100644
index 000000000000..d81231557c97
--- /dev/null
+++ b/dev-ml/ppx_deriving/files/ounit2.patch
@@ -0,0 +1,128 @@
+Index: ppx_deriving-4.4.1/src_test/create/dune
+===================================================================
+--- ppx_deriving-4.4.1.orig/src_test/create/dune
++++ ppx_deriving-4.4.1/src_test/create/dune
+@@ -1,4 +1,4 @@
+ (test
+  (name test_deriving_create)
+- (libraries oUnit ppx_deriving.runtime)
++ (libraries ounit2 ppx_deriving.runtime)
+  (preprocess (pps ppx_deriving.create ppx_deriving.show)))
+Index: ppx_deriving-4.4.1/src_test/deriving/dune
+===================================================================
+--- ppx_deriving-4.4.1.orig/src_test/deriving/dune
++++ ppx_deriving-4.4.1/src_test/deriving/dune
+@@ -1,4 +1,4 @@
+ (test
+  (name test_ppx_deriving)
+- (libraries oUnit compiler-libs.common ppx_deriving.api)
++ (libraries ounit2 compiler-libs.common ppx_deriving.api)
+  (preprocess (pps ppx_deriving.ord ppx_deriving.show ppx_deriving.eq)))
+Index: ppx_deriving-4.4.1/src_test/enum/dune
+===================================================================
+--- ppx_deriving-4.4.1.orig/src_test/enum/dune
++++ ppx_deriving-4.4.1/src_test/enum/dune
+@@ -1,4 +1,4 @@
+ (test
+  (name test_deriving_enum)
+- (libraries oUnit ppx_deriving.runtime)
++ (libraries ounit2 ppx_deriving.runtime)
+  (preprocess (pps ppx_deriving.enum ppx_deriving.show)))
+Index: ppx_deriving-4.4.1/src_test/eq/dune
+===================================================================
+--- ppx_deriving-4.4.1.orig/src_test/eq/dune
++++ ppx_deriving-4.4.1/src_test/eq/dune
+@@ -5,5 +5,5 @@
+ 
+ (test
+  (name test_deriving_eq)
+- (libraries oUnit ppx_deriving.runtime)
++ (libraries ounit2 ppx_deriving.runtime)
+  (preprocess (pps ppx_deriving.eq ppx_deriving.show)))
+Index: ppx_deriving-4.4.1/src_test/fold/dune
+===================================================================
+--- ppx_deriving-4.4.1.orig/src_test/fold/dune
++++ ppx_deriving-4.4.1/src_test/fold/dune
+@@ -5,5 +5,5 @@
+ 
+ (test
+  (name test_deriving_fold)
+- (libraries oUnit ppx_deriving.runtime)
++ (libraries ounit2 ppx_deriving.runtime)
+  (preprocess (pps ppx_deriving.fold)))
+Index: ppx_deriving-4.4.1/src_test/iter/dune
+===================================================================
+--- ppx_deriving-4.4.1.orig/src_test/iter/dune
++++ ppx_deriving-4.4.1/src_test/iter/dune
+@@ -5,5 +5,5 @@
+ 
+ (test
+  (name test_deriving_iter)
+- (libraries oUnit ppx_deriving.runtime)
++ (libraries ounit2 ppx_deriving.runtime)
+  (preprocess (pps ppx_deriving.iter ppx_deriving.show)))
+Index: ppx_deriving-4.4.1/src_test/make/dune
+===================================================================
+--- ppx_deriving-4.4.1.orig/src_test/make/dune
++++ ppx_deriving-4.4.1/src_test/make/dune
+@@ -1,4 +1,4 @@
+ (test
+  (name test_deriving_make)
+- (libraries oUnit ppx_deriving.runtime)
++ (libraries ounit2 ppx_deriving.runtime)
+  (preprocess (pps ppx_deriving.make ppx_deriving.show)))
+Index: ppx_deriving-4.4.1/src_test/map/dune
+===================================================================
+--- ppx_deriving-4.4.1.orig/src_test/map/dune
++++ ppx_deriving-4.4.1/src_test/map/dune
+@@ -5,5 +5,5 @@
+ 
+ (test
+  (name test_deriving_map)
+- (libraries oUnit ppx_deriving.runtime)
++ (libraries ounit2 ppx_deriving.runtime)
+  (preprocess (pps ppx_deriving.map ppx_deriving.show)))
+Index: ppx_deriving-4.4.1/src_test/ord/dune
+===================================================================
+--- ppx_deriving-4.4.1.orig/src_test/ord/dune
++++ ppx_deriving-4.4.1/src_test/ord/dune
+@@ -5,5 +5,5 @@
+ 
+ (test
+  (name test_deriving_ord)
+- (libraries oUnit ppx_deriving.runtime)
++ (libraries ounit2 ppx_deriving.runtime)
+  (preprocess (pps ppx_deriving.ord)))
+Index: ppx_deriving-4.4.1/src_test/runtime/dune
+===================================================================
+--- ppx_deriving-4.4.1.orig/src_test/runtime/dune
++++ ppx_deriving-4.4.1/src_test/runtime/dune
+@@ -5,5 +5,5 @@
+ 
+ (test
+  (name test_runtime)
+- (libraries oUnit ppx_deriving.runtime)
++ (libraries ounit2 ppx_deriving.runtime)
+  (preprocess (pps ppx_deriving.eq ppx_deriving.show)))
+Index: ppx_deriving-4.4.1/src_test/show/dune
+===================================================================
+--- ppx_deriving-4.4.1.orig/src_test/show/dune
++++ ppx_deriving-4.4.1/src_test/show/dune
+@@ -5,5 +5,5 @@
+ 
+ (test
+  (name test_deriving_show)
+- (libraries oUnit ppx_deriving.runtime)
++ (libraries ounit2 ppx_deriving.runtime)
+  (preprocess (pps ppx_deriving.show)))
+Index: ppx_deriving-4.4.1/src_test/api/dune
+===================================================================
+--- ppx_deriving-4.4.1.orig/src_test/api/dune
++++ ppx_deriving-4.4.1/src_test/api/dune
+@@ -5,5 +5,5 @@
+ 
+ (test
+  (name test_api)
+- (libraries oUnit compiler-libs.common ppx_deriving.api)
++ (libraries ounit2 compiler-libs.common ppx_deriving.api)
+  (preprocess (action (run ppxfind -legacy ppx_tools.metaquot --as-pp %{input-file}))))
diff --git a/dev-ml/ppx_deriving/metadata.xml b/dev-ml/ppx_deriving/metadata.xml
index 0fea406d5fda..196c8d34a1f0 100644
--- a/dev-ml/ppx_deriving/metadata.xml
+++ b/dev-ml/ppx_deriving/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gienah@gentoo.org</email>
 		<name>Mark Wright</name>
diff --git a/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild b/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild
deleted file mode 100644
index 5b315e69bee2..000000000000
--- a/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit findlib eutils opam
-
-DESCRIPTION="Type-driven code generation for OCaml"
-HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving"
-SRC_URI="https://github.com/ocaml-ppx/ppx_deriving/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc +ocamlopt test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-ml/ppx_tools:=
-	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/ppx_derivers:=
-	dev-ml/result:=
-"
-RDEPEND="${DEPEND}"
-DEPEND="${RDEPEND}
-	dev-ml/cppo
-	test? ( dev-ml/ounit )"
-
-src_compile() {
-	cp pkg/META.in pkg/META || die
-	ocaml pkg/build.ml \
-		native=$(usex ocamlopt true false) \
-		native-dynlink=$(usex ocamlopt true false) \
-		|| die
-	use doc && emake doc
-}
-
-src_test() {
-	ocamlbuild -j 0 -use-ocamlfind -classic-display \
-			src_test/test_ppx_deriving.byte -- || die
-	if use ocamlopt;  then
-		ocamlbuild -j 0 -use-ocamlfind -classic-display \
-			src_test/test_ppx_deriving.native -- || die
-	fi
-}
-
-src_install() {
-	opam_src_install
-	mv "${ED}/usr/lib/ppx_deriving/ppx_deriving" "${D}/$(ocamlc -where)/ppx_deriving/" || die
-
-	use doc && dohtml api.docdir/*
-}
diff --git a/dev-ml/ppx_deriving/ppx_deriving-4.5.ebuild b/dev-ml/ppx_deriving/ppx_deriving-4.5.ebuild
index 648dc3f3f471..47ccd56be1af 100644
--- a/dev-ml/ppx_deriving/ppx_deriving-4.5.ebuild
+++ b/dev-ml/ppx_deriving/ppx_deriving-4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-ml/ppx_tools:=
-	dev-ml/ocaml-migrate-parsetree:=
+	<dev-ml/ocaml-migrate-parsetree-2.0.0:=
 	dev-ml/ppx_derivers:=
 	dev-ml/result:=
 "
diff --git a/dev-ml/ppx_deriving/ppx_deriving-5.2.ebuild b/dev-ml/ppx_deriving/ppx_deriving-5.2.ebuild
new file mode 100644
index 000000000000..73a1495d16a7
--- /dev/null
+++ b/dev-ml/ppx_deriving/ppx_deriving-5.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="Type-driven code generation for OCaml"
+HOMEPAGE="https://github.com/ocaml-ppx/ppx_deriving"
+SRC_URI="https://github.com/ocaml-ppx/ppx_deriving/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-ml/ppx_tools:=
+	dev-ml/ocaml-migrate-parsetree:=
+	dev-ml/ppx_derivers:=
+	>=dev-ml/ppxlib-0.20.0:=
+	dev-ml/result:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	dev-ml/cppo
+	test? ( dev-ml/ounit2 )"