gentoo resync : 20.03.2021

3 files changed, 2 insertions, 49 deletions

diff --git a/dev-ml/opam-format/Manifest b/dev-ml/opam-format/Manifest
index 70755b14af4a..7df558dad308 100644
--- a/dev-ml/opam-format/Manifest
+++ b/dev-ml/opam-format/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-format-2.0.7-r2.ebuild 872 BLAKE2B eb0d4ee65c91aeb7529051f31d5fba9ca7408a6fddc38d75f1f132ad659671acf1d6952f639ffd616cc1614031c4117fd94c353141a1c7d5c3794e26646fc9bd SHA512 a65ca56ee293ac341c4f20e7e32884ac45440a78f1a59f16eefc2e1352895664febc53bf21075fafc6e94a23c5bac49262eced5554f69536632d3befa3a37fb0
-EBUILD opam-format-2.0.8-r2.ebuild 820 BLAKE2B 72a52d608deb00984c8adfd5acc6dcfbeb35f897e30f26faa644f2eee02b16ea8b04a3dbb6d994710114fb0fea6ddcf70c313ddab93568435e54ea9656212a6f SHA512 18c70937a5113d5e09c08c59f55ebc62c64992164432f1614e57a2c74066d9764ed0e353b4e5f29a69b92d4a17d793cd46ea6018cc9444cd5b93780f8413c512
+EBUILD opam-format-2.0.8-r2.ebuild 817 BLAKE2B ad9a97d3d0439fa4fc6382c423be2d9202e322426c4d58e8bcad567aea6569862365f24dd21275efd4b74ee5e6f9a97dc564e0ff564a39a8a666d69d72adecdd SHA512 973f9bc28a2fa479bb84f5fc9ef8a5852fd606a1d936d15bf8c3f225ee8fd08004d7daa4b834fe69724686db7767771a2938fde776b320eef76396776ab82e76
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild
deleted file mode 100644
index 0b5aefeaae86..000000000000
--- a/dev-ml/opam-format/opam-format-2.0.7-r2.ebuild
+++ /dev/null
@@ -1,45 +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"
-
-RDEPEND="
-	~dev-ml/opam-core-${PV}:=
-	dev-ml/re:=
-	dev-ml/opam-file-format:=
-	dev-ml/dose3:=
-"
-DEPEND="${RDEPEND}
-	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-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
index a7654582b1e2..54b3b0ce46df 100644
--- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.8-r2.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"
 IUSE="+ocamlopt"
 
 RDEPEND="