gentoo resync : 15.06.2021

6 files changed, 61 insertions, 18 deletions

diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 60290cbaa5e2..20180fa541c3 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -1,11 +1,13 @@
 AUX oc409.patch 615 BLAKE2B 6bda1fa9e8424dd31552756f67569fbe37b4b83fa75566cb9675823ee34cc37cd41be1fd6ba53969a736f08f15e8c9073c9c60997342bbb3c65adb71ffa7313a SHA512 de9b3efe72731152d8c6320e8ce4b5d9bb9c44ed1116dcebefb8dc87d725c1d3feaa81f57bed3eda7bac34d7745811ba373bbfc540bf94761d42a216ce09ab58
 AUX reload.patch 595 BLAKE2B 61d89b27f1e192d160160f14a3a58a57ea77e9ac6dd214a8fedb26b2ec554ed5b0b4ea360e04f52110054840821119a2f4dac6db71318c0edbfbeeca64485db6 SHA512 e39221716cda7a38dc6af4b39b68ce3bba023c625535227c40d01a87c52d4756cc46f9c014a8806b468cd9a01e8a65b848f397203950ef03528393121c2c6537
 DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B 068c1016a75616811787eb480b61349a32960997f03e0bc99d63e15357a8932a6019d9e7195541fd942ef99fc1d71c067fb5fcb0fd0c2c3efb77aac494589854 SHA512 0ee9720286d0d832fb7d2d21a8877856e0e47c94c86b1b58d28f8e757a18472eecb56a16e3a04ce815f240dd5048f5d597515461d084fd1cf4da1b121f97a3fe
-DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B 8dff6f82618d0f61a56acfa71ae679d4ba5ed4aea272019da7b19ea64960c80e50c55482ff9782748dad5042aa1bcd8728ff0825f8f900ff27239db0e0db3515 SHA512 1f8d6df42935ecdbed96a7b02d05564665b4bf0cbe4f5fd1800a1f292d8b3864d973df1e9e8c566c0fd00b5a55ba47ecd9bd07f134a9be83601e010b0246e075
+DIST camlp4-4.09_p1.tar.gz 649702 BLAKE2B 2bf0fd0b4f22d21b9fa7e195a26f4dece56549c56d191480d5c874aac9422d2d4aa41e23e96c078f653f6da6bdbd186583cb02e857741fdb526b53b000b981bb SHA512 71a8eed173013bdea61f7a268c82acaa1f5215aebbf4b638efba137760e849f9fede82f801aa14e5d6cc334d6e67d752988b15a36557b363a8feaf9ba1d1add4
 DIST camlp4-4.10_p1.tar.gz 650092 BLAKE2B d7a6221dba5f6ec6963fe35236c29f39b8ae8f928618b5a58f72e7b1cc1f50d716b110f9684150716b56784cf703c0d8fcbc1aad32aeab638faca9c1bf2d5b9e SHA512 7ae0e20053a43399daa4ee9b93b6f4dbebc3e17c5ee79d069c4903cdfb2bf1cfc7d6badecf92fcf62e97a5f85f3be6ed82a62eb2a311bf6398b2792eacf763d8
 DIST camlp4-4.11_p1.tar.gz 650280 BLAKE2B 6fe46b49c1f2b2e5fc87fbbbdba3ccae795c555737495c298456b84f0dca79c750aa6e4ab2c23bbc7ba4724defdfb739e370f468a78658035474d2f3ad255995 SHA512 8e572602c1c465017a234565efa2249c935ba1ad3d399a6b264bfbec345958130a96311c79e437ac995e3ead9ff7b4f2d3fe6aa4a3a82431ae0cc6257a300f4c
-EBUILD camlp4-4.05_p1.ebuild 1029 BLAKE2B 9c6ded1579caaa21eb8b9ef4a58fcfff773e622ada30606c786948ff48d8188ea291d570cd5aafe420cade8f42c2df04fdfc257393d6abb65cf1a617eab41f93 SHA512 1d11caf10debd97be5b34655f8f0ecd8b167ff86ce0ebe891000bf35fdb2c95c13472dc98bb943332637e3312a3a0fcda1cca6c12220b2415cc6e0f0d08bd2b1
-EBUILD camlp4-4.08_p1.ebuild 1116 BLAKE2B 9290cf09c2a9fc745bfc1be817965d401b09555991600f053f23726c53752dbef5f1bf0b1bf569d448b793bbebb4dd9173861c220e580a482cb8f12974047911 SHA512 6b269562e5401ffc8b8aefb5ea159f803e7cf61215471351302a7822a9cf9c940d304e1f1a7cd517c1c73336174b8584b731adaa9ed9624a96bf5b5cb18e449c
-EBUILD camlp4-4.10_p1.ebuild 1070 BLAKE2B 657cb82026e41f73108b3e17b037c5db39940327bab6a0b3c1ce2e21c995d77ceb6679bdb6fc05ee15a18f1daf6a9f0f4f1f15c46a6b718163628ff14a855ecf SHA512 c559a97688601ad409049f0a1a069a8aec654d37ae065f7f4adeb5e997ac4289bd6170c3209c35ec29451f75110c17c9b57751f13d19459145989b55bfbfcb72
-EBUILD camlp4-4.11_p1.ebuild 1093 BLAKE2B ea53b00b9f901e448470a0e805dc7959f466998eb267150a4cf96f971e5cd903d91e88410ad65ca9c287b8d4604b28bbab6c4d7ccfc1d688ab689797d2329b97 SHA512 e1aa33105784007697f7eae883a55b2388cbb86bb9e38f38ac7876c4e7c4f29ac2d3f11a1257f5d2af485c51e361df68edc3fe88ec2121402e9357289650261c
+DIST camlp4-4.12.tar.gz 650428 BLAKE2B 4957d3db73ec82fbac58dd95fa13c48f9f8480a70cd6bded43a00df0a182f9b9e31a43acef8264f9d940776667d10b0a5c46bded59ebf4a645719264628428fc SHA512 0a19bb596e47076a28a6bea62007f1d3b59c4d688075f6b723abaa205c555707feb4ea0624259994a4ba5251fdea9dc61cdc936dc13611b36937e755a4bc9b7b
+EBUILD camlp4-4.05_p1-r1.ebuild 1037 BLAKE2B a49e1083934cabb0d4948de323dbe6223502d10600e4e2f742b0a56de304935169a7bec9bf1000a9fe5dae28c08cc867bbb9807397614368966a9432a3e5bb67 SHA512 524616fe30a9914294e30727564a2bf49df9ea3825452c808f447154363e0bbd168ef58d209b59f7cbb652f99e311eb48369105be3ed9c6f8fdf7cb2b18d5091
+EBUILD camlp4-4.09_p1.ebuild 1060 BLAKE2B ca2a14432162c8e7e046655fb629fe77b40abcdfc2459ca92e92d2b2f530995f1814f2c7c117d1405bd3b056158113e8c778454cd69ecbd8717acd83234e1514 SHA512 005cd342be9f80aabc2b62717c63eb4bd4ad6a07c5a66424d38f360631ffa848ac2a859cfc31c921256898e26027568b711b362df9c323e213ae2ddc59a66840
+EBUILD camlp4-4.10_p1-r1.ebuild 1076 BLAKE2B d983ef95e6db0dc4656bf72a673632adb05662431ace347890de8eee34f8644389b72b60604f6177349cc6300af77a2cb9a7d38c7332d99e076a686da4da8723 SHA512 b926e7709797514af564017c723972f986e97a20f0c4098572041774263aa8dbd875a7c0f6ba7bacb6564a2a7b2152ad0fe15d77f9298b9fb34e34e00739a07b
+EBUILD camlp4-4.11_p1-r1.ebuild 1099 BLAKE2B 47c299a46a2d0fbc986a73651f5f046ee188fd73ce6f98c71ff3ad5e5abd7bc47f433ebf8131a3dc51eff1749a1ccd4014ec6bb0685c8067f0a526783130e0b3 SHA512 fc012a26288c5aae4cf4bba00e213b331143c4499ff3e158ba1aed3d3706efb6eafabbb2634d04bae634c1aa858a6dabd2d3c864ed48cef24aa6d171b33cb01e
+EBUILD camlp4-4.12.ebuild 1099 BLAKE2B 47c299a46a2d0fbc986a73651f5f046ee188fd73ce6f98c71ff3ad5e5abd7bc47f433ebf8131a3dc51eff1749a1ccd4014ec6bb0685c8067f0a526783130e0b3 SHA512 fc012a26288c5aae4cf4bba00e213b331143c4499ff3e158ba1aed3d3706efb6eafabbb2634d04bae634c1aa858a6dabd2d3c864ed48cef24aa6d171b33cb01e
 MISC metadata.xml 415 BLAKE2B 71ebce898009219ae77c1cd07c0103aaf322a742fa4012fb0bad0c7cd9fe07a15563a594af1c8c31e09459ecdd0af58d2d5f44d6ece7edc0ce53042b5430c326 SHA512 27f7a2c68e7eef2278eaf51e1cea93646c1281726cdacf881e9e3aa3e4ac0b4806294651a00392b62d730264b3bded358b4f25b203bcd9c92055aefb34beb085
diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1-r1.ebuild
index e3f1c78d6c13..8133a505cfb0 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1-r1.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
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
+DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild b/dev-ml/camlp4/camlp4-4.09_p1.ebuild
index 06769da466cf..80481b707c6d 100644
--- a/dev-ml/camlp4/camlp4-4.08_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.09_p1.ebuild
@@ -9,24 +9,19 @@ MY_P=${PN}-${MY_PV}
 DESCRIPTION="System for writing extensible parsers for programming languages"
 HOMEPAGE="https://github.com/camlp4/camlp4"
 SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/_p/-}"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND="~dev-lang/ocaml-4.09.0:=[ocamlopt?]"
+DEPEND="dev-lang/ocaml:0/4.09[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
 
-QA_FLAGS_IGNORED='.*'
-
-PATCHES=(
-	"${FILESDIR}/reload.patch"
-	"${FILESDIR}/oc409.patch"
-)
+S=${WORKDIR}/${P/_p/-}
+PATCHES=( "${FILESDIR}/reload.patch" )
 
 src_configure() {
 	./configure \
diff --git a/dev-ml/camlp4/camlp4-4.10_p1.ebuild b/dev-ml/camlp4/camlp4-4.10_p1-r1.ebuild
index b80025c98baa..d7ad1f1cfbb1 100644
--- a/dev-ml/camlp4/camlp4-4.10_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.10_p1-r1.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
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.10.0:=[ocamlopt?]"
+DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
diff --git a/dev-ml/camlp4/camlp4-4.11_p1.ebuild b/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
index f50ced55ac78..8162ce77f937 100644
--- a/dev-ml/camlp4/camlp4-4.11_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.11_p1-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
-DEPEND=">=dev-lang/ocaml-4.11.0:=[ocamlopt?]"
+DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
diff --git a/dev-ml/camlp4/camlp4-4.12.ebuild b/dev-ml/camlp4/camlp4-4.12.ebuild
new file mode 100644
index 000000000000..8162ce77f937
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_p/+}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="System for writing extensible parsers for programming languages"
+HOMEPAGE="https://github.com/camlp4/camlp4"
+SRC_URI="https://github.com/camlp4/camlp4/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+ocamlopt"
+
+DEPEND="dev-lang/ocaml:0/$(ver_cut 1-2)[ocamlopt?]"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	dev-ml/ocamlbuild"
+
+QA_FLAGS_IGNORED='.*'
+
+S=${WORKDIR}/${P/_p/-}
+PATCHES=( "${FILESDIR}/reload.patch" )
+
+src_configure() {
+	./configure \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="$(ocamlc -where)" \
+		--pkgdir="$(ocamlc -where)" \
+		|| die
+}
+
+src_compile() {
+	# Increase stack limit to 11GiB to avoid stack overflow error.
+	ulimit -s 11530000
+	emake byte
+	use ocamlopt && emake native
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-META
+	dodoc CHANGES.md README.md
+}