gentoo resync : 28.04.2021

5 files changed, 11 insertions, 18 deletions

diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index e5a1504e5708..4612307713ea 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -3,9 +3,9 @@ DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e828
 DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
 DIST dune-2.8.4.tar.gz 1372925 BLAKE2B 5b6d6738a0dc701d852e6cc59a1998f64c006d233f43a804b0b9b677a6eadda25aa20f52799c90910d361e4bc565636a50d218ad5d0a9927239adc5be36b3889 SHA512 13b36eb6a943f9513987a23dab467b2e449cc3a4de35227f8323c3c724b27f19daac500602141ab22a04579243333c8484ce27a7f73e46a72e796d30fb1c3253
-EBUILD dune-1.11.4.ebuild 688 BLAKE2B cdf2a8f91b21e32ebf3c0f22c05b4f61560c0adfac4e67c17c1729506216919a4013c26ab1556d47e3e4722d9a81c01c84170b5dd914f4a4c70b3a1ec5fd8115 SHA512 5e3dd0d2e81006816ee09005891644f252bfaa2e37d800a0a3d9892ff7fd59ec80cfcbd581ba60e34a202afc940f0c6461bdf0c155a4e42ce54b31614e2881a3
-EBUILD dune-2.1.0.ebuild 693 BLAKE2B f29523daba28750f07a15e6e6acfb47bce3d0793fda6fd95af855f9cfe19b534059f3824bc0f66af3d6bcaa9f728b94ff6e0d1aa6f64989d4957515c9dcaed5b SHA512 453c4ed9686b9e33b237d977cfefe5d920487318f0a29e14bc70ea829cab78508e59c7e876fa9bb7edafffe8b6e4d24b71b0b9c88b6679c845f950e6bdf512d1
-EBUILD dune-2.7.1.ebuild 760 BLAKE2B 78f494098d67c0f08aa9076186b2641bbfaa082c3e14f767f8b6e399c2ba503eaed3d4400b5831b353483ecfb6b1216e64099a0d2dca2108fc68928860fd7476 SHA512 b5cec406cc7f8dd2ef0186f73aee3cd9d4feae1319ef2ff26d2d48b1755c530efa08e356a12c3c52cfedc2685f1482087b443a7825f71891840e76cc9d1ba3e4
+EBUILD dune-1.11.4.ebuild 670 BLAKE2B adc969c1d17b4012bf83eee162f575ac804a97fb73cdfe49479fc6c8c0e63a45b60b21d0e33ef335b58b8576e7efbc8298972da3d8c6d0dd1d7ee0192c77bc07 SHA512 0edaaa2853cabda0a8aae6f67b633262608592e1cbe0fa0043f8bc9a4af80fd2a7f5b10ec2156d8c384ae4cf69fbc63c41e31672c45afadae849f03bc2d01c71
+EBUILD dune-2.1.0.ebuild 675 BLAKE2B 96dd8ec1a6c065919c057a9faf06321f60aec1bf4d14db47b194ddbac137a614898331b02c45b528ded939f94576de2789a1c1b0fb7796f4e37a7b2f196dce5b SHA512 b655265fa0774f42cb9428c2d86f574b311660a88300c8e0bb9c35aa4b5d5750bb6392084614c2cdbfee6766c7a50067b0be9ff0f3e8c4ca1f8bd4e9cb918acb
+EBUILD dune-2.7.1.ebuild 767 BLAKE2B 18b22cc6407814bdef1baedfe7c325224d69fd126c301117df421e063021d16f9d8a5582e2bc6f10dab9f60c27f2fa4901514930fed56c3ec390f00697817d94 SHA512 789838c90fd024367af2cdb5b5f125b0a2d58f5afbac1af09d7b69968503e0256d4974453e1b5c958d3e73c00ec24442f34c448dc2913742ad31bd059c49379c
 EBUILD dune-2.8.2.ebuild 896 BLAKE2B 528ec447be147ccfb4a710413611572d965436af2329ca4d24ca98f8171085890d1578f6bb184a1440b1e4e071ae14b53d095606af7ab6aca322a93aeeae8338 SHA512 30d730b466910f63939417076c699235e00dcad0df4050916626aa08ffbb81cb1521d3fb8fc2234f2ab1d45d4b10b7656719f4bf63ed2d9383d2c6caa2906924
-EBUILD dune-2.8.4.ebuild 902 BLAKE2B 56cfab513a0767ba85a2e8808e8f3a7cc687869a8c60366a42d278ee52774078690b8c4110bdbeac07fc3699cc1fb1dd4f1efd6087c3e086c9ae2da862a691ac SHA512 5c954d7e379db8aaf2eca54cdd084c2146e627bd61b0ce556fabc1d2c4de31738f98df0f07518a15257887f80db92e2cd5c7a587c8d72b9266fabe35093c6cc9
+EBUILD dune-2.8.4.ebuild 896 BLAKE2B 528ec447be147ccfb4a710413611572d965436af2329ca4d24ca98f8171085890d1578f6bb184a1440b1e4e071ae14b53d095606af7ab6aca322a93aeeae8338 SHA512 30d730b466910f63939417076c699235e00dcad0df4050916626aa08ffbb81cb1521d3fb8fc2234f2ab1d45d4b10b7656719f4bf63ed2d9383d2c6caa2906924
 MISC metadata.xml 412 BLAKE2B 1ac46aa4fe2b5f531debe5c283c36db66a98d2120ceaa389bb2fe5c9c989a8185d0c66df879bfcd65f89e6e304359beadd632e445220a633887237bc9159ad8d SHA512 74df6c8368d4283dbda004fba147e5fa5c82165dc6a7553bf61f49d93ef7283160f6c193505d42f4043e2d3ac3227d4d29ee99827845726f146603088a61d76a
diff --git a/dev-ml/dune/dune-1.11.4.ebuild b/dev-ml/dune/dune-1.11.4.ebuild
index e767836ab78c..f6d5ce200b8a 100644
--- a/dev-ml/dune/dune-1.11.4.ebuild
+++ b/dev-ml/dune/dune-1.11.4.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit multiprocessing
-
 DESCRIPTION="A composable build system for OCaml"
 HOMEPAGE="https://github.com/ocaml/dune"
 SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -17,7 +15,6 @@ IUSE="test"
 DEPEND="dev-lang/ocaml"
 RDEPEND="${DEPEND}
 	!dev-ml/jbuilder"
-BDEPEND=""
 
 RESTRICT="test"
 
@@ -27,6 +24,6 @@ src_configure() {
 
 src_install() {
 	default
-	mv "${D}"/usr/doc "${D}"/usr/share/doc/${PF}
-	mv "${D}"/usr/man "${D}"/usr/share/man
+	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
+	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
 }
diff --git a/dev-ml/dune/dune-2.1.0.ebuild b/dev-ml/dune/dune-2.1.0.ebuild
index beec8b498b00..dc4c0613e50b 100644
--- a/dev-ml/dune/dune-2.1.0.ebuild
+++ b/dev-ml/dune/dune-2.1.0.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit multiprocessing
-
 DESCRIPTION="A composable build system for OCaml"
 HOMEPAGE="https://github.com/ocaml/dune"
 SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -17,7 +15,6 @@ IUSE="test"
 DEPEND=">=dev-lang/ocaml-4.07:="
 RDEPEND="${DEPEND}
 	!dev-ml/jbuilder"
-BDEPEND=""
 
 RESTRICT="test"
 
@@ -27,6 +24,6 @@ src_configure() {
 
 src_install() {
 	default
-	mv "${D}"/usr/doc "${D}"/usr/share/doc/${PF}
-	mv "${D}"/usr/man "${D}"/usr/share/man
+	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
+	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
 }
diff --git a/dev-ml/dune/dune-2.7.1.ebuild b/dev-ml/dune/dune-2.7.1.ebuild
index 52a9b1648031..d4ddb517ae0d 100644
--- a/dev-ml/dune/dune-2.7.1.ebuild
+++ b/dev-ml/dune/dune-2.7.1.ebuild
@@ -17,7 +17,6 @@ IUSE="test"
 DEPEND=">=dev-lang/ocaml-4.08:="
 RDEPEND="${DEPEND}
 	!dev-ml/jbuilder"
-BDEPEND=""
 
 RESTRICT="test"
 
@@ -32,6 +31,6 @@ src_compile() {
 
 src_install() {
 	default
-	mv "${D}"/usr/doc "${D}"/usr/share/doc/${PF}
-	mv "${D}"/usr/man "${D}"/usr/share/man
+	mv "${ED}"/usr/doc "${ED}"/usr/share/doc/${PF} || die
+	mv "${ED}"/usr/man "${ED}"/usr/share/man || die
 }
diff --git a/dev-ml/dune/dune-2.8.4.ebuild b/dev-ml/dune/dune-2.8.4.ebuild
index 47084c42bd00..ae0c9474e80e 100644
--- a/dev-ml/dune/dune-2.8.4.ebuild
+++ b/dev-ml/dune/dune-2.8.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"