gentoo resync : 15.01.2020

4 files changed, 74 insertions, 0 deletions

diff --git a/dev-ml/camlp4/Manifest b/dev-ml/camlp4/Manifest
index bf08870f78f0..88bf4564bbd5 100644
--- a/dev-ml/camlp4/Manifest
+++ b/dev-ml/camlp4/Manifest
@@ -1,5 +1,9 @@
+AUX oc409.patch 615 BLAKE2B 6bda1fa9e8424dd31552756f67569fbe37b4b83fa75566cb9675823ee34cc37cd41be1fd6ba53969a736f08f15e8c9073c9c60997342bbb3c65adb71ffa7313a SHA512 de9b3efe72731152d8c6320e8ce4b5d9bb9c44ed1116dcebefb8dc87d725c1d3feaa81f57bed3eda7bac34d7745811ba373bbfc540bf94761d42a216ce09ab58
+AUX reload.patch 595 BLAKE2B 61d89b27f1e192d160160f14a3a58a57ea77e9ac6dd214a8fedb26b2ec554ed5b0b4ea360e04f52110054840821119a2f4dac6db71318c0edbfbeeca64485db6 SHA512 e39221716cda7a38dc6af4b39b68ce3bba023c625535227c40d01a87c52d4756cc46f9c014a8806b468cd9a01e8a65b848f397203950ef03528393121c2c6537
 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 999 BLAKE2B 38be80f4cb516af862b23520a7d2517a57773014d75beaada0aa39a2a7a53a6a08e993844b5132a922a740b2d0094d955499ecaa8dd844d8d19a77d27ec7e9d0 SHA512 562a728a200be45b866bc6087dca57263327ceb8b7f39528a66916039163dc6b14bb213a0987a7c6891d22026c0abe21cdb8fc80c03bcaf48923118d00d681e0
 EBUILD camlp4-4.05_p1.ebuild 1008 BLAKE2B 530cdc2283fdce7c532e5fc3a9580ab3e30087cfc32d7cf93b8712dc5589fa3ff7c6c3f68544298b1f51ccab5967470212eb1b0ea406d0f3c3730b9bc011a5fa SHA512 da1caacafe852a6fd93a0c351acb961e525af1f02b77e16b6ff66ffe5dc6310116d8251eb358d7a08ed22eab7c1826eee10a78e853cea34b3d341e06cbf78ce6
+EBUILD camlp4-4.08_p1.ebuild 1067 BLAKE2B 56e9c5db487fd3f5b8595ad47bcf5430858598aa63b4941ca51483a338070cf23cb730791cab2a5c314276635fe7b0e9509c90634945d9643742f4bd6550d8b4 SHA512 39b6c74489265a611e8a4ca743b6e4405c10bde4480e0c34ad1129a85010778260a5f9a688c41b5faf603c69a032469d20d6bffe7e2e978b4008025e64a98429
 MISC metadata.xml 249 BLAKE2B 45b57687d81fa0ecbd307726eb7c570094d29952c8467b0ffe429870019fd852caa725924d6f2ee457b04a194d61c902f6abf948776fbb812a786e1058a031a2 SHA512 46286ee2dd275a5b7c8f941214c71f89396fd0d012564a368a205381ae2ffd28857245ffcae06b2416d73d071857005f3c7756fbcf546ebe0fadfc90a85db1e6
diff --git a/dev-ml/camlp4/camlp4-4.08_p1.ebuild b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
new file mode 100644
index 000000000000..0c86d665428c
--- /dev/null
+++ b/dev-ml/camlp4/camlp4-4.08_p1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 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/ocaml/camlp4"
+SRC_URI="https://github.com/ocaml/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"
+IUSE="+ocamlopt"
+
+DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt?]"
+RDEPEND="${DEPEND}
+	!<dev-lang/ocaml-4.02
+	!<dev-ml/findlib-1.5.5-r1"
+DEPEND="${DEPEND}
+	dev-ml/ocamlbuild"
+
+S=${WORKDIR}/${P/_p/-}
+PATCHES=( "${FILESDIR}/reload.patch" "${FILESDIR}/oc409.patch" )
+
+src_configure() {
+	./configure \
+		--bindir="${EPREFIX}/usr/bin" \
+		--libdir="$(ocamlc -where)" \
+		--pkgdir="$(ocamlc -where)" \
+		|| die
+}
+
+src_compile() {
+	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/files/oc409.patch b/dev-ml/camlp4/files/oc409.patch
new file mode 100644
index 000000000000..727762a64a2a
--- /dev/null
+++ b/dev-ml/camlp4/files/oc409.patch
@@ -0,0 +1,13 @@
+Index: camlp4-4.08-1/configure
+===================================================================
+--- camlp4-4.08-1.orig/configure
++++ camlp4-4.08-1/configure
+@@ -39,7 +39,7 @@ if [ $major -lt 4 -o \( $major -eq 4 -a
+     echo "The standalone Camlp4 requires OCaml >= 4.02."
+     echo "For previous versions of OCaml use the Camlp4 distributed with OCaml."
+     exit 2
+-elif [ $major -ne 4 -o $minor -ne 8 ]; then
++elif [ $major -lt 4 -o $minor -lt 8 ]; then
+     echo "This version of Camlp4 is for OCaml 4.07 but you are using OCaml $ocaml_version."
+     if [ -d .git ] ; then
+       if [ $PINNED -eq 1 ] ; then
diff --git a/dev-ml/camlp4/files/reload.patch b/dev-ml/camlp4/files/reload.patch
new file mode 100644
index 000000000000..8fbc1c05532c
--- /dev/null
+++ b/dev-ml/camlp4/files/reload.patch
@@ -0,0 +1,13 @@
+Index: camlp4-4.08-1/camlp4/Camlp4/Struct/DynLoader.ml
+===================================================================
+--- camlp4-4.08-1.orig/camlp4/Camlp4/Struct/DynLoader.ml
++++ camlp4-4.08-1/camlp4/Camlp4/Struct/DynLoader.ml
+@@ -76,7 +76,7 @@ value load =
+         [ Not_found -> raise (Error file "file not found in path") ]
+       in
+       try Dynlink.loadfile fname with
+-      [ Dynlink.Error e -> raise (Error fname (Dynlink.error_message e)) ]
++      [ Dynlink.Error (Module_already_loaded _ ) -> () | Dynlink.Error e -> raise (Error fname (Dynlink.error_message e)) ]
+     };
+ 
+