gentoo (valentine's day) resync : 14.02.2021

5 files changed, 34 insertions, 45 deletions

diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index 824e42cd4f02..8e79b0101580 100644
--- a/dev-ml/ocamlbuild/Manifest
+++ b/dev-ml/ocamlbuild/Manifest
@@ -2,8 +2,7 @@ AUX ocamlbuild-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch 1259 BLAKE2B
 DIST ocamlbuild-0.10.1.tar.gz 193263 BLAKE2B cee82997a6b691b3df9b92055b74f05af57d7663f5dbb84701e66dffefcfe6ec00c9721e1872d546f2aea9237068e37ba7d94463d0002a8356dd4d84bc1865c0 SHA512 6d74bdce7fe147bf1a5fd570b569925b36b5f443c7251d1c13a0525e3086417b393a768722bf7d4b23a7e3178b0b3c2511499725c5a755d69783b8d555663e3b
 DIST ocamlbuild-0.11.0.tar.gz 195297 BLAKE2B 2d653c402edf58035fa6efb65c99c956fe78efc4759f29c8ddab8263310a5d243d25d37d4c1a4f0699f151afb6d4c6df4c1550f95d6e915963b3d86923877225 SHA512 14bc44cc63b6c99e711658a1145247bad8263632fbb4550238cef15e226a76b83e51b83575a7a96f16b96ec321dedd0ef23f36166c354838aec1922f58179efd
 DIST ocamlbuild-0.14.0.tar.gz 198267 BLAKE2B 355d61ba68e61b9ee18a9fc0fbb9062405f44707b180ca7ad4bfec727ca3d3d2cc08f17be118ca3a4161c7789d975e7f431812e9139d4fde85a1a27ab68c8ac3 SHA512 ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07
-EBUILD ocamlbuild-0.10.1.ebuild 1031 BLAKE2B 36594f0b3fee9734ed55c8edab76b01fb8528283327a5756d266527814426090bfbd60d03ad5d3ab9a77054072aa3b414db32f8c7c771392ebe4439dd7805497 SHA512 9580877317e0bbc3a7eef88d30da6300c4d8674596da616941eb50973fcdcb8b4090c45aed060e8b44e433076aab280716970307fc9178b4d763915f83fb1747
-EBUILD ocamlbuild-0.11.0.ebuild 1120 BLAKE2B 0de8d511569993f8deffdafbdc45ef9f576e8fe8f5264e5778b4193d168fd0a08e1030699f1ea34b4c909b5c389f461e8a8e42457cce7968497a49d3705c4cf5 SHA512 fe109d7283802395837a2caf657f6a4b62afac50735b1782e1a92fa3ad57389bab20ba821bf8ea36e984c10d3b891911225f66f7f14ba18221581ee0d8e3ccb7
-EBUILD ocamlbuild-0.14.0-r1.ebuild 1172 BLAKE2B 19a1888d0c026c89ac028362d43fac01af74b6aa7b3c4da3014d53a8ecc2eaaaa2e63f5b550c2713ecc9385051044e7dbc19af89772cf7722064d2a7f0e3458b SHA512 35634a854926737192ab9697ed5de3f8e02c39e3e1f20eb62ae95c931f7c0e10c2bf5ea04979e6c93ff59451118b321ab58a93f815ae96242ea9f16b59f2e3d8
-EBUILD ocamlbuild-0.14.0.ebuild 1148 BLAKE2B c0a1747ce827fe7a63c62f84b3882719b2cdae53bb470d7af6b2a4ab7e0e7686055b580d6beea02cca9dd0a801fbe78cc426f853e36e0ca5f82f96aa5ca877d5 SHA512 8270b1fe39dbcd97c45e862b8f6356b8dd8d9b1b7e721e2a574c6c5ad26cbedc1e0642b14fc89b4300aa0a10c5d8895a0942a36b237e356064c0b219ff3eb67f
+EBUILD ocamlbuild-0.10.1.ebuild 1092 BLAKE2B 326772dde788214cc42e1415a59fd99faccd0d78ee03b9cbfb231ecbbb954568f72f1f4b7064470e5d26f5bd72784243f86d2179d351d5f7c6610441bce248ad SHA512 f892cdb7488c90367df93c16fb11b2eb38f67f210fa67fb479f09962e7bf4a3715ae0f1f7d5810c9be1e7bd05bd625357ee49615c0bdb1652a1e7a1a56c2562c
+EBUILD ocamlbuild-0.11.0.ebuild 1343 BLAKE2B 18c9d7f585b6baa9d6a2a49608a9157f34a303317dc463f0f42cb9f432a144a0438d8d733c54ba10a06619447bbd0d0a2822dc2cb556fc66ac57e53d7119ede6 SHA512 bc5dbb630165db82392e937b6d7385c82c842317dabb5e03c4dc665d5213d4d44607d97d027bdb53a4777b9642a374fcb9c7c27ffccb74e920a8e67a4834a61d
+EBUILD ocamlbuild-0.14.0-r1.ebuild 1390 BLAKE2B c223c696ec9a0d976ad4873736acd7f11772f9171f73d31a285344c8780a1d868ae6bc69f8f73365dd29d740f10da159672c7140dd6d71a84206e72fabc18c95 SHA512 fe2adb9b6651587137bb88a176f10138a1df6a02fe3892f7c9907695609de9982e538a120e258bac9632f10a3995aa0bf3bcfa86ac16852ce51cdd20ff331319
 MISC metadata.xml 418 BLAKE2B 7bffb3d1c5610c17816194ee3d07de5e3e1bebec3a22f065ce26e6746a1f55cc4564a3d5d6a75173eb68ba6c68715dc19fa6c888633d4886ef9e394870ec9195 SHA512 1f1cff72f8c7feb066b6946ffa15c291ead5c662d427af156e454c701d5aa13d7510b5811649882595b280b04fe5b9c2c643832cacac79360642fed0b1656d02
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
index ea2d235bcc93..d7ee6e34cb09 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
@@ -28,6 +28,11 @@ src_configure() {
 		NATDYNLINK=$(usex ocamlopt true false)
 }
 
+src_compile() {
+	emake src/ocamlbuild_config.cmo
+	default
+}
+
 src_install() {
 	emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
 	dodoc Changes
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
index 524c937beda6..13bf43e48525 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.11.0.ebuild
@@ -21,6 +21,14 @@ RDEPEND="${DEPEND}
 DEPEND="${DEPEND}
 	test? ( dev-ml/findlib )"
 
+src_prepare() {
+	sed -i \
+		-e "/package_exists/s:camlp4.macro:xxxxxx:" \
+		-e "/package_exists/s:menhirLib:xxxxxx:" \
+		testsuite/external.ml || die
+	default
+}
+
 src_configure() {
 	emake -f configure.make Makefile.config \
 		PREFIX="${EPREFIX}/usr" \
@@ -31,6 +39,11 @@ src_configure() {
 		NATDYNLINK=$(usex ocamlopt true false)
 }
 
+src_compile() {
+	emake src/ocamlbuild_config.cmo
+	default
+}
+
 src_install() {
 	emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
 	dodoc Changes
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
index bf4f3bb4acf3..47ec79c0341e 100644
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
+++ b/dev-ml/ocamlbuild/ocamlbuild-0.14.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
@@ -25,6 +25,13 @@ PATCHES=(
 )
 
 QA_FLAGS_IGNORED='.*'
+src_prepare() {
+	sed -i \
+		-e "/package_exists/s:camlp4.macro:xxxxxx:" \
+		-e "/package_exists/s:menhirLib:xxxxxx:" \
+		testsuite/external.ml || die
+	default
+}
 
 src_configure() {
 	emake -f configure.make Makefile.config \
@@ -36,6 +43,11 @@ src_configure() {
 		NATDYNLINK=$(usex ocamlopt true false)
 }
 
+src_compile() {
+	emake src/ocamlbuild_config.cmo
+	default
+}
+
 src_install() {
 	emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
 	dodoc Changes
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
deleted file mode 100644
index fc4760420dd5..000000000000
--- a/dev-ml/ocamlbuild/ocamlbuild-0.14.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs"
-HOMEPAGE="https://github.com/ocaml/ocamlbuild"
-SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-DEPEND=">=dev-lang/ocaml-4.02.3-r1:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	!<dev-ml/findlib-1.6.1-r1
-"
-DEPEND="${DEPEND}
-	test? ( dev-ml/findlib )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.14.0-Disable-tests-failing-with-OCaml-4.08.0.patch
-)
-
-src_configure() {
-	emake -f configure.make Makefile.config \
-		PREFIX="${EPREFIX}/usr" \
-		BINDIR="${EPREFIX}/usr/bin" \
-		LIBDIR="$(ocamlc -where)" \
-		OCAML_NATIVE=$(usex ocamlopt true false) \
-		OCAML_NATIVE_TOOLS=$(usex ocamlopt true false) \
-		NATDYNLINK=$(usex ocamlopt true false)
-}
-
-src_install() {
-	emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
-	dodoc Changes
-}