gentoo resync : 20.03.2021

3 files changed, 2 insertions, 50 deletions

diff --git a/dev-ml/opam-installer/Manifest b/dev-ml/opam-installer/Manifest
index 0f43bdca59d8..964e69169a45 100644
--- a/dev-ml/opam-installer/Manifest
+++ b/dev-ml/opam-installer/Manifest
@@ -1,5 +1,3 @@
-DIST opam-full-2.0.7.tar.gz 7929123 BLAKE2B 100acc2c31e97e47b0b584f3a153283593351d49d5e9cdaca42fdcc025b135d9538bd327927950e7e0972b20f561a0ee3d1d1b5b4b87e1e6af31761e311081e7 SHA512 670af4935bba0679c65f6592b7a52b1d429b604eb261e40b13cf72312aeb0bab0c5a76829a555fc5379a0371c352692cbabc46b460fcd9bf32b3cfebdaeceb81
 DIST opam-full-2.0.8.tar.gz 8006252 BLAKE2B 26348bdbb8bdc2fbf9d736286c1f4134ce065e8c15e34d51c8d2c6e5338fd6db089df38a19b07cde70770724fc4cc3dbd9e7d75628e5435ca8a2f8c0d4d3f2f0 SHA512 f08893ad0c1e124368168f28dcb5c3293e443da712d7b12db432c21ff72f7e1440bcc7156f49661d286360a16dcd166d3d02ecdebf8b1cda7c7df2b22e48f80f
-EBUILD opam-installer-2.0.7-r1.ebuild 1041 BLAKE2B 9c89e154ba44b46b13ee43a359965e8b9a49c89971fc7d255763cb7f7117dda2e5efcc05328ef9535e8656555b6cc8f4f9f824cb66afcdbc81182c085d8a0dcd SHA512 64ea51c7f4c478a44e6d53f1502c0af6d3af1e6e3455f101a18c4004a5076211974da00387456939dc5b893e08faff1db5dce404459f8c86777a3ebd9af524e5
-EBUILD opam-installer-2.0.8-r1.ebuild 1034 BLAKE2B e20659787fde8f5150dafefa51666df44fed411229db2712b1d8b87a1ba31fd55e20fa1fdbc1784b0b3b5bf43f468658923cb64c04b9332691ffaad6096e3a3b SHA512 6b9bcd66462b82528a746feab8bcb8095ae924d141b1bf89d5f3639212107e8daaaa7b7850dfc42cc1d948c497a6b34b3e6b39afb361cb28159186565a53e112
+EBUILD opam-installer-2.0.8-r1.ebuild 1029 BLAKE2B 53066e7d4fe28f77ae2cbc1a1eb3056a60d04ada7eb72c0589498815c8ad3937ef6335b73a675bcf7060c6bf85534b3b497b55ac782c1f7a0d3e32537c1489cd SHA512 df08f41985fd16842021dc0e5c8a361a1d8376d1b716f3fb2aff8bdc007ff311ba51844894325e76657a688a03021fe7360c9522ac6f41231ef499de214d469e
 MISC metadata.xml 412 BLAKE2B 3cd375059a5716aba5f14f8004970adb55bbec02cf911cc5739475a80789c86ab6d27f192e4757191be8e914e61db531b330695eba224e81273e351d507bd57b SHA512 6119e7d8b9cf779ac2070b8cbe9820849fa80542e86b353d0cab9c60bca6e5d122a1e4f57a75f3189058587e9e8c7d8c5f37e5d4a22395506c437f411df1c4e4
diff --git a/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild b/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
deleted file mode 100644
index 87658e669be1..000000000000
--- a/dev-ml/opam-installer/opam-installer-2.0.7-r1.ebuild
+++ /dev/null
@@ -1,46 +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=" "
-OPAM_SKIP_VALIDATION=yes
-
-inherit opam
-
-DESCRIPTION="Core installer for opam packages"
-HOMEPAGE="https://opam.ocaml.org/ https://github.com/ocaml/opam"
-SRC_URI="https://github.com/ocaml/opam/releases/download/${PV}/opam-full-${PV}.tar.gz"
-S="${WORKDIR}/opam-full-${PV/_/-}"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-lang/ocaml-4.02.3
-	dev-ml/cmdliner:=
-	~dev-ml/opam-format-${PV}
-"
-DEPEND="${RDEPEND}
-	dev-ml/findlib"
-
-OPAM_INSTALLER="${S}/opam-installer"
-
-src_configure() {
-	econf \
-		--prefix="${EPREFIX}/usr" \
-		--with-mccs \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--mandir="${EPREFIX}/usr/share/man"
-}
-
-src_compile() {
-	sed -e 's/DUNE = .*$/DUNE = /' -i Makefile.config
-	emake lib-ext
-	#passing -jX to the dune build leads to errors
-	#see: https://github.com/ocaml/opam/issues/3585
-	emake DUNE_PROMOTE_ARG="" -j1
-}
diff --git a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
index 7f1e1eb67e3b..71045308f5b3 100644
--- a/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
+++ b/dev-ml/opam-installer/opam-installer-2.0.8-r1.ebuild
@@ -16,7 +16,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-lang/ocaml-4.02.3