gentoo resync : 25.11.2020

7 files changed, 109 insertions, 20 deletions

diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index 29c78836b890..8226b584a816 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -3,7 +3,11 @@ AUX reload.patch 595 BLAKE2B 61d89b27f1e192d160160f14a3a58a57ea77e9ac6dd214a8fed
 DIST camlp4-4.04_p1.tar.gz 648320 BLAKE2B d383a366facaaa440b24184bb54a8e1c3bb22ae02387a0bc4f9ee4331ecdc60e5bf22715c1022c987041fb081eb448794a74026736df9f70e05c7213e08bfa44 SHA512 7db8eebcf3d230f60650ba62d9cb630c069394237e97b678a40b61d3dcaded752a2b7e089a50ff528f1ea0740d0291b722df123a072f2cee489cadc5201c6776
 DIST camlp4-4.05_p1.tar.gz 647566 BLAKE2B 068c1016a75616811787eb480b61349a32960997f03e0bc99d63e15357a8932a6019d9e7195541fd942ef99fc1d71c067fb5fcb0fd0c2c3efb77aac494589854 SHA512 0ee9720286d0d832fb7d2d21a8877856e0e47c94c86b1b58d28f8e757a18472eecb56a16e3a04ce815f240dd5048f5d597515461d084fd1cf4da1b121f97a3fe
 DIST camlp4-4.08_p1.tar.gz 649830 BLAKE2B 8dff6f82618d0f61a56acfa71ae679d4ba5ed4aea272019da7b19ea64960c80e50c55482ff9782748dad5042aa1bcd8728ff0825f8f900ff27239db0e0db3515 SHA512 1f8d6df42935ecdbed96a7b02d05564665b4bf0cbe4f5fd1800a1f292d8b3864d973df1e9e8c566c0fd00b5a55ba47ecd9bd07f134a9be83601e010b0246e075
-EBUILD camlp4-4.04_p1.ebuild 1080 BLAKE2B a82e0f1ef9b7ad40793b6d084e1bade7a161d5cadc60b2813cacff2e85b4334691297bf4583bdbe9de66a3bf5f9704041b32429e7856eb4ce7374fb835a98472 SHA512 d0bb1de5714a47bce471366a3237d07a292a10a7609e6503a154e71c4a58a900ee023e0089241a5f156ee74525eee434f5d6489677ebd58a59a0ec0d769ac306
-EBUILD camlp4-4.05_p1.ebuild 1086 BLAKE2B f35abade6648a491050fdf6167c24d6e95db7236ecf95cce33ece643fd27c8022b132b290d56d41eb4e6a836f9b92c8974bcee6e4db139f8381574ecbbdf8d7b SHA512 87c5d9df79146013a030411b0adbd0524c7ae6984d42ef5f30e007d8c979f82f1870f18659993ae598064ace7f0b1ea27b87e7b7c60426836a8871349e2a6e4a
-EBUILD camlp4-4.08_p1.ebuild 1150 BLAKE2B 81fd6efe4bdd0fa9ba5a96d166a90f3bf2552c22e7e6a1ecae1bdc1d37c2339d52af5a11c9b6d6494cf30e70a36541c95408750bf9f733cbe51dd063cdd737ac SHA512 fa27787074d84b42f2a16f6468e27414e675a14427223caf39a85bfc473480488aedbba4bb0116642d3f6d3caa9569967d882e3331c0283f40bc10b747bc1ec8
-MISC metadata.xml 250 BLAKE2B 6e80f75f919556451e33d44238de1d3f78f80356deeee40c8ba8ffeae46cd00cf1ffcc9cd5bcc2795f91cd7e2bcdab31dc7cb815a28a48a7b1746cef356395fb SHA512 e4a2f011f87a8a3442fd64fd97e19a6b74f9fc4a5f0da4ad49ac023258461633e6b12fcc8fd68900b57c1ec7db48b29733e264642c6bbe3a8dcc62e51c86a458
+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.04_p1.ebuild 1024 BLAKE2B 20c33c06a5a541454f0b750fc7c23f32bac0e4af3272432c65cbc3967f1d3aefa4b43be226dd0018f6f338cd18d02266a506ac7ddb4cc0fd07bba48091c555aa SHA512 9d927b94f63edd9a12a51abe35d781c8d1260bef08a8dd91d588875d44eaf3202f8971f69036d530393f089dbc8b7b17c5eae6b176aa7a713c8116af9dec2fb2
+EBUILD camlp4-4.05_p1.ebuild 1029 BLAKE2B 2b3e8b2259584cf0a0e3bce97066e088375cad981ba4e4c352748949d26a4c3dcbb4c04cb6435fde8b3c3c25a5a5d882175676e2feb1fd3e29665ac1335326ca SHA512 d09be322a43d576bedd94133903d3841b2d847eabb5bd32e3680a8988bf9c9da82ad60ddada8589ec1effa7da8ed315251217bd9b47c1214e4344fb05029f0f0
+EBUILD camlp4-4.08_p1.ebuild 1091 BLAKE2B 4c0e75a3906c6778050b313cdfd97e87054ef38564a5ccfb0ef7d1993461cd82bf46b692cd6e7bf75530b38b1475a54026bc73d9ea93cff592d31df28206a3e9 SHA512 5061c2c1498b94ee14c78512ddbc8671d50f19031931dfbae61501c88fc6fb43302806a5da815e4a14249525d277586713093cf23257d8f1260eca237f9fb795
+EBUILD camlp4-4.10_p1.ebuild 1070 BLAKE2B 657cb82026e41f73108b3e17b037c5db39940327bab6a0b3c1ce2e21c995d77ceb6679bdb6fc05ee15a18f1daf6a9f0f4f1f15c46a6b718163628ff14a855ecf SHA512 c559a97688601ad409049f0a1a069a8aec654d37ae065f7f4adeb5e997ac4289bd6170c3209c35ec29451f75110c17c9b57751f13d19459145989b55bfbfcb72
+EBUILD camlp4-4.11_p1.ebuild 1070 BLAKE2B ccd8d0e94a8e4cac98cc1065531d92540e5ac51899cc5a27dabb46e84e40618a083c9b56ee3c2c056bed2a6a679a63fa91d253f8b2a1ed51d18857a05e750bc9 SHA512 9a953260137eaa8d1da68b3b9d9a6ab56536d2fce751cf644c39bf362e94f306adbafcc2afadba0262835e6e08774aca707db31431c3a47b96e9566033da3ad0
+MISC metadata.xml 322 BLAKE2B 1b38d06aa74d4aaeebb436d63bfafe60c010fc6b7154cee62854b1d16803da20d0c1396f1be3ea65c72af8314e27b63abf5d7921b923734c9f515786c7674b2f SHA512 e021e98e1c18b7c36d4c890f012ab4b9425cd784acd4ea87e998dcf89d4efa3505413d07f6bf5df6c065e608ee5c1f8a5f7daa45326ae80d0085ecfc04abb2ab
diff --git a/dev-ml/camlp4/camlp4-4.04_p1.ebuild b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
index bb89a08912a8..dd82d7f3b238 100644
--- a/dev-ml/camlp4/camlp4-4.04_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.04_p1.ebuild
@@ -12,13 +12,11 @@ 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 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 DEPEND="=dev-lang/ocaml-4.04*:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	!<dev-lang/ocaml-4.02
-	!<dev-ml/findlib-1.5.5-r1"
+RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
 
diff --git a/dev-ml/camlp4/camlp4-4.05_p1.ebuild b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
index 232dd749ff9a..d59f89100ed6 100644
--- a/dev-ml/camlp4/camlp4-4.05_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.05_p1.ebuild
@@ -12,13 +12,11 @@ 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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt"
 
 DEPEND="=dev-lang/ocaml-4.05*:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	!<dev-lang/ocaml-4.02
-	!<dev-ml/findlib-1.5.5-r1"
+RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
 
diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
index aee3b5ec2ecb..001a6776ec7a 100644
--- a/dev-ml/camlp4/camlp4-4.08_p1.ebuild
+++ b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
@@ -12,13 +12,11 @@ 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 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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?]"
-RDEPEND="${DEPEND}
-	!<dev-lang/ocaml-4.02
-	!<dev-ml/findlib-1.5.5-r1"
+RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	dev-ml/ocamlbuild"
 
diff --git a/dev-ml/camlp4/camlp4-4.10_p1.ebuild b/dev-ml/camlp4/camlp4-4.10_p1.ebuild
new file mode 100644
index 000000000000..b80025c98baa
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.10_p1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 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-4.10.0:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	dev-ml/ocamlbuild"
+
+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
+}
diff --git a/dev-ml/camlp4/camlp4-4.11_p1.ebuild b/dev-ml/camlp4/camlp4-4.11_p1.ebuild
new file mode 100644
index 000000000000..dea97b226afc
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.11_p1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 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-4.11.0:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND}
+	dev-ml/ocamlbuild"
+
+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
+}
diff --git a/dev-ml/camlp4/metadata.xml b/dev-ml/camlp4/metadata.xml
index 33d51779cb3d..2578754c2469 100644
--- a/dev-ml/camlp4/metadata.xml
+++ b/dev-ml/camlp4/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">camlp4/camlp4</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>gienah@gentoo.org</email>
+		<name>Mark Wright</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">camlp4/camlp4</remote-id>
+	</upstream>
 </pkgmetadata>