gentoo resync : 20.03.2021

3 files changed, 2 insertions, 51 deletions

diff --git a/dev-ml/opam-core/Manifest b/dev-ml/opam-core/Manifest
index d3f1ab4abb4e..ef9a9b42a888 100644
--- a/dev-ml/opam-core/Manifest
+++ b/dev-ml/opam-core/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-core-2.0.7.ebuild 890 BLAKE2B 312e56553597b8005158f10861b5699434446ecb3514721971e703091f89fcc0a5bb06738eb8c180a0214241f167e4e3e9f42ae954eddd00bd468d10dcd67162 SHA512 145500984defb5c6b47587d63dc984e104e81dd509f3c93b210d59cd4269ac3ab1fc1771239f0ec873c2195a60c20bd82a6d6b0a3f6e857473c84af65eeecaff
-EBUILD opam-core-2.0.8-r1.ebuild 864 BLAKE2B 16093a4773a30bcea01d036cccbdbca8c3fc2092345c400f7c16d206e0476348eed0084597424b409440f7693e2d16cbd7b93d4a6578cbf334ef786b5de71be6 SHA512 4b04dff73c9f9b0f5bc7898ec91ec0808e62069d5a1e66a822d4c8f4f9fc458e62ec7d384811ac9244d99371d862f5debe5eaea018f4f1b0fd259f0ab326a491
+EBUILD opam-core-2.0.8-r1.ebuild 861 BLAKE2B 8f17334d7dd341661ad70190957edbf51fee7d6d68147caf41a2b9f162ef4974fabca85c6624d7ac5b5767ccf449035280dd71f39c12d7fe626e4f37bb1a994b SHA512 a2f4e1e6b3c20dfc609feb768fc00c30437e9a0e038f8d3e09355037d471431f3f587e448341524f0c62cb186b892fd74e4f3d5ed2de9a570fb755fe8c59d567
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-core/opam-core-2.0.7.ebuild b/dev-ml/opam-core/opam-core-2.0.7.ebuild
deleted file mode 100644
index 8f9c7e998d66..000000000000
--- a/dev-ml/opam-core/opam-core-2.0.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# We are opam
-OPAM_INSTALLER_DEP=" "
-
-inherit opam
-
-DESCRIPTION="Core libraries for opam"
-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=""
-
-RDEPEND="
-	dev-ml/ocamlgraph:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	dev-ml/cmdliner:=
-"
-DEPEND="${RDEPEND}
-	dev-ml/dune
-	dev-ml/cppo"
-
-S="${WORKDIR}/opam-${PV/_/-}"
-OPAM_INSTALLER="${S}/opam-installer"
-
-src_prepare() {
-	default
-	cat <<- EOF >> "${S}/dune"
-		(env
-		 (dev
-		  (flags (:standard -warn-error -3-9)))
-		 (release
-		  (flags (:standard -warn-error -3-9))))
-	EOF
-}
-
-src_compile() {
-	emake -j1 opam-installer
-	emake -j1 ${PN}.install
-}
diff --git a/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild b/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
index 1482b3c1ddaa..b32234835a9e 100644
--- a/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
+++ b/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
@@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 RDEPEND="
 	dev-ml/ocamlgraph:=