gentoo resync : 20.03.2021

3 files changed, 2 insertions, 44 deletions

diff --git a/dev-ml/opam-solver/Manifest b/dev-ml/opam-solver/Manifest
index 1d9166ffc825..a8e194775eff 100644
--- a/dev-ml/opam-solver/Manifest
+++ b/dev-ml/opam-solver/Manifest
@@ -1,5 +1,3 @@
-DIST opam-2.0.7.tar.gz 636708 BLAKE2B 2824a5c53f4103c267f99ae10f55df740b3afcc033321e888133817c0e53c4a8fc31738338df3d6d9ff8755987e85ade4a4726be98f77b06b81ffc1476d02c3d SHA512 2ade3998a94333a5a838b55e229ab0c707e678481cae892980b986fb86f39163070a9b7d3e0e87879cd57b91a33bf6a3e15f3786c3510a635e59383782218f1d
 DIST opam-2.0.8.tar.gz 643221 BLAKE2B 66510a18285f315fe95665e8ba2f334dd44211c716543cdc25f2951a7dfe537f115981046e5963fd08deea4c76f5672fa7cf8e7af2274a713a3165bdd0bac8c2 SHA512 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
-EBUILD opam-solver-2.0.7-r1.ebuild 831 BLAKE2B 7ce493c866aecd1a0897021c057ed094f04a5b6feebb9faaed89a8d7d63aa6bc5e531a35f28071d5439e26caa3bf5bbf7d0602e9d1837c448d1aef9d4feaa654 SHA512 3dfc47038307c97775b4c409f7b18e70cc796c55db40ca7137bf02951695d53f171a76744eaa1906e0074de1ddfe0fc68c475623864e5d9d719b11e3681dc947
-EBUILD opam-solver-2.0.8.ebuild 827 BLAKE2B 62ebae47bdb9b5b390daa2158caeeca1650126249743a5cf445a2302021f86fb82aaf2f60f5924044bc3c61118c41160cf431df2a0a49852b2e6a34b0c6c5695 SHA512 a06fcbefb7c40bab923c523b9adf8c33c6039493e294e6599f71c64ea86001f6136f2c8424a63fc0b96d488fa78a42375af62e847c0f2aa1c50cdf9fa4343c53
+EBUILD opam-solver-2.0.8.ebuild 824 BLAKE2B 9a7a5ebb741dec25ff0a3d3c6e0e1c74f7574b70ff352b7c4e602e085a5a1f3f1ca03d1e9c7f062722529b9b49e1fad83960b8d33223354430ea4d072c4fc19d SHA512 6fb412d1581e2f1ad34d988e4bb6e3e427cc8963924a0ac6b1a235287b4c3e2fa3d4a55e99f7bb7c6bde7a130b919b5cf1191c61e576a5d79e70d3813276f732
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild b/dev-ml/opam-solver/opam-solver-2.0.7-r1.ebuild
deleted file mode 100644
index 3613f874ac62..000000000000
--- a/dev-ml/opam-solver/opam-solver-2.0.7-r1.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
-
-inherit dune
-
-DESCRIPTION="opam solver"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/archive/${PV/_/-}.tar.gz -> opam-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="+ocamlopt test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~dev-ml/opam-format-${PV}:=
-	dev-ml/opam-file-format:=
-	dev-ml/re:=
-	>=dev-ml/mccs-1.1.4:=
-	dev-ml/dose3:=
-	dev-ml/cudf:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ml/opam-client )"
-
-S="${WORKDIR}/opam-${PV/_/-}"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9-33)))
-		 (release
-		  (flags (:standard -warn-error -3-9-33))))
-	EOF
-}
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
index f1e3fb60b9ff..65a72574eb59 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"