diff --git a/Manifest.files.gz b/Manifest.files.gz
index 4cc92daeeed1..2becbeefc8d1 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 52773c5afa91..d847da2d024d 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/libscrypt/libscrypt-1.21.ebuild b/app-crypt/libscrypt/libscrypt-1.21.ebuild
index efe99521fd08..b883b47b9bcc 100644
--- a/app-crypt/libscrypt/libscrypt-1.21.ebuild
+++ b/app-crypt/libscrypt/libscrypt-1.21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/technion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86"
IUSE=""
DEPEND=""
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 3de184f84c12..b06c2ec871ea 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/apel/Manifest b/app-emacs/apel/Manifest
index 0b70654f9db2..c1bd6d74f583 100644
--- a/app-emacs/apel/Manifest
+++ b/app-emacs/apel/Manifest
@@ -1 +1,2 @@
DIST apel-10.8_p20190407.tar.gz 94808 BLAKE2B 47540e8c3ce96cc91efefe521942a3df4ee8423c7796d7e66b14bed7e9d662469a0767dd4863ae130fb114a1f9335d95abd13d61b6811e039db75e28679ac0f6 SHA512 6c780b0643f248e2a1409f1cea794dc6be515ee2ae766ead0834996bd9c13852492af1b9c343c4efda06fd057fae0c1b8a1ffc6b55b1469afbc7cbf1b579ea68
+DIST apel-10.8_p20201106.tar.gz 69188 BLAKE2B e0107968349fe73325503a61fbc9ada83d657f2ca66a39ae2ea833543277f536d22371e371e17dc4307380e738491e20ec0b7b52a35207f49e37fa65c66f3ab1 SHA512 fb14570d6d4f2346d386ae0012cfb9149ddf9ade8b4dc75507e6cef848d12ef65f80bd7d1dc26815031aee00461d67d4a86fe29e30d5d542756e725425634c77
diff --git a/app-emacs/apel/apel-10.8_p20201106.ebuild b/app-emacs/apel/apel-10.8_p20201106.ebuild
new file mode 100644
index 000000000000..85482a6ff306
--- /dev/null
+++ b/app-emacs/apel/apel-10.8_p20201106.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24.5
+
+inherit elisp
+
+DESCRIPTION="A Portable Emacs Library is a library for making portable Emacs Lisp programs"
+HOMEPAGE="https://github.com/wanderlust/apel"
+GITHUB_SHA1="4e3269b6e702db2dba48cf560563ac883e81e3bf"
+SRC_URI="https://github.com/wanderlust/${PN}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+SITEFILE="50apel-gentoo.el"
+
+src_prepare() {
+ elisp_src_prepare
+ cat <<-EOF >>APEL-CFG || die
+ (setq APEL_PREFIX "apel")
+ (setq EMU_PREFIX "apel")
+ EOF
+}
+
+src_compile() {
+ default
+}
+
+src_install() {
+ emake PREFIX="${ED}/usr" \
+ LISPDIR="${ED}/${SITELISP}" \
+ VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" \
+ install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc ChangeLog* README*
+}
diff --git a/app-emacs/flim/Manifest b/app-emacs/flim/Manifest
index 52355192a186..0b1214f0906b 100644
--- a/app-emacs/flim/Manifest
+++ b/app-emacs/flim/Manifest
@@ -1 +1,2 @@
DIST flim-1.14.9_p20190526.tar.gz 173261 BLAKE2B f28b0d1474d894fd93d9899fe66bc88d6669cc6bdbb2511dcd0b2f13c05abbe42ad4cc06e2de34664204f3ddbb3cb4f09e232394419892b3fd8e71c1ab3aab75 SHA512 8991c460bf9eb411e89edb8fb05088cc09dc354e4c14d7accba26d922b2d1041742e96d8a64407ee8dd2574984c5b3a8fbd66e828c8f8fadc55f8da6428d634e
+DIST flim-1.14.9_p20210529.tar.gz 146081 BLAKE2B b5326cb67f4e1387fe5a9f0cc9360feca81bf61de18ae75b325e072e70a3f4b70a1bda148a2ab8ac9c3b872bc5ed96b53b61d0de427abfb21eb8e3dba1235701 SHA512 47a55606add53da7f399d87befc834dbbe4b52b1f3011d24d3dfd3ec7a7010ffebc2aa666e38f5878735b2ee43dfe46eec548dba3535521440c8bcd1bd08a17d
diff --git a/app-emacs/flim/flim-1.14.9_p20210529.ebuild b/app-emacs/flim/flim-1.14.9_p20210529.ebuild
new file mode 100644
index 000000000000..7dabe9f475b3
--- /dev/null
+++ b/app-emacs/flim/flim-1.14.9_p20210529.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24.5
+
+inherit elisp
+
+DESCRIPTION="A library to provide basic features about message representation or encoding"
+HOMEPAGE="https://github.com/wanderlust/flim"
+GITHUB_SHA1="02735dede6603987e8309a76d0bc7a9ff9a5a227"
+SRC_URI="https://github.com/wanderlust/${PN}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+RDEPEND=">=app-emacs/apel-10.8"
+DEPEND="${RDEPEND}"
+
+SITEFILE="60${PN}-gentoo.el"
+
+src_compile() {
+ default
+}
+
+src_install() {
+ emake PREFIX="${ED}/usr" \
+ LISPDIR="${ED}/${SITELISP}" \
+ VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" install
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+ dodoc FLIM-API.en NEWS VERSION README* ChangeLog*
+}
diff --git a/app-emacs/semi/Manifest b/app-emacs/semi/Manifest
index 46b8adebb9be..035e623e2b32 100644
--- a/app-emacs/semi/Manifest
+++ b/app-emacs/semi/Manifest
@@ -1 +1,2 @@
DIST semi-1.14.7_p20190517.tar.gz 152636 BLAKE2B a22b1f9a5de0a695de2d8e342ca313af05c12a1c0b597890d926496e9ce240e3329365700f91e6268cf399976ec067163ac8197c7a643e499d70851501f63798 SHA512 d25c940fdd0a048d21079d905ae91521a1f1247b8f78145baeba24c994c0d5b30985a76c909a793f82f6253b323fb4699bbf059ea48037bb49ae92505b0c6d18
+DIST semi-1.14.7_p20210613.tar.gz 150809 BLAKE2B 6e91f3c28fbadd3ad0ac7856305d7acb5354df33cfb182924712023e5c7b5dce14176af9a5e5f44e345c60d5ec014e813151ee185a5115d6d4faa8d93d9e63b7 SHA512 aa89900f7f06d76301e109c267e7e3c4d97c7f1e1f075db147fa0a9e91aadef93a58522c7a35f5cca2fb5ba4c05397b98cbb4791f3a8e72242b3dbe7f03c29ad
diff --git a/app-emacs/semi/files/semi-1.14.7_p20210613-info.patch b/app-emacs/semi/files/semi-1.14.7_p20210613-info.patch
new file mode 100644
index 000000000000..4321cc360d2b
--- /dev/null
+++ b/app-emacs/semi/files/semi-1.14.7_p20210613-info.patch
@@ -0,0 +1,28 @@
+--- a/mime-ui-en.texi
++++ b/mime-ui-en.texi
+@@ -14,6 +14,11 @@
+ @author Kazuhiro Ito
+ @subtitle 2020/09/17
+ @end titlepage
++@dircategory GNU Emacs Lisp
++@direntry
++* Semi-en: (mime-ui-en). MIME user interface for GNU Emacs.
++@end direntry
++
+ @node Top, Introduction, (dir), (dir)
+ @top SEMI-EPG 1.14 Manual
+
+--- a/mime-ui-ja.texi
++++ b/mime-ui-ja.texi
+@@ -15,6 +15,11 @@
+ @author 伊藤 和博
+ @subtitle 2020/09/17
+ @end titlepage
++@dircategory GNU Emacs Lisp
++@direntry
++* Semi-ja: (mime-ui-ja). MIME user interface for GNU Emacs.
++@end direntry
++
+ @node Top, Introduction, (dir), (dir)
+ @top SEMI-EPG 1.14 説明書
+
diff --git a/app-emacs/semi/semi-1.14.7_p20210613.ebuild b/app-emacs/semi/semi-1.14.7_p20210613.ebuild
new file mode 100644
index 000000000000..2deaf91f17e8
--- /dev/null
+++ b/app-emacs/semi/semi-1.14.7_p20210613.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24.5
+
+inherit elisp
+
+DESCRIPTION="A library to provide MIME feature for GNU Emacs"
+HOMEPAGE="https://github.com/wanderlust/semi"
+GITHUB_SHA1="509f6f0bc2f5d020c63e47d9ad89410dc20bcb6f"
+SRC_URI="https://github.com/wanderlust/${PN}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="l10n_ja"
+
+RDEPEND=">=app-emacs/apel-10.8
+ >=app-emacs/flim-1.14.9"
+DEPEND="${RDEPEND}"
+
+PATCHES="${FILESDIR}/${PN}-1.14.7_p20210613-info.patch"
+SITEFILE="65${PN}-gentoo.el"
+
+src_compile() {
+ emake
+
+ ${EMACS} ${EMACSFLAGS} --visit mime-ui-en.texi -f texi2info || die
+ if use l10n_ja; then
+ ${EMACS} ${EMACSFLAGS} \
+ --eval "(set-default-coding-systems 'iso-2022-jp)" \
+ --visit mime-ui-ja.texi -f texi2info || die
+ fi
+}
+
+src_install() {
+ emake PREFIX="${ED}/usr" \
+ LISPDIR="${ED}/${SITELISP}" \
+ VERSION_SPECIFIC_LISPDIR="${ED}/${SITELISP}" install
+
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+
+ doinfo mime-ui-en.info
+ dodoc README.en ChangeLog* VERSION NEWS
+ if use l10n_ja; then
+ doinfo mime-ui-ja.info
+ dodoc README.ja
+ fi
+}
diff --git a/app-emacs/wanderlust/Manifest b/app-emacs/wanderlust/Manifest
index bbd2be4925a0..b1e38580dd26 100644
--- a/app-emacs/wanderlust/Manifest
+++ b/app-emacs/wanderlust/Manifest
@@ -1,2 +1,2 @@
-DIST wanderlust-2.15.9_p20180814-git.tar.gz 1207081 BLAKE2B f52259b15040287f0afcf0768b3ae3237415b44960e205e48d4b658f3e522db993b87bac59ee3d9ba94ad26c830beaf26d9cf5f03830fcb1f01e4f5567ee4804 SHA512 67616cc1d35b25af1b56fa800943ad0c7e7d9b35f99c48fac96b77a68a3eb8db02b36525021ff8bba4d181530505face2a58725b7dff33b1bfe4f48a4314949f
DIST wanderlust-2.15.9_p20190623.tar.gz 1210223 BLAKE2B 50416e27062a9837c18660ea9a1a7a3ff596639763965b09925ca16c89617d159b9aa5d08d93d8b5c6a504da2b048df8b4c489d4fc11ff6abc530f741a5d8fb9 SHA512 369f8d93af4d0d98f66c4c8500aa3535e3f772d8a1920c1bdc434f0d9078555f40d0d4278937d97bccf0f417cf1b1fdeb6c8a891d42b2675fb7737382425c91d
+DIST wanderlust-2.15.9_p20210629.tar.gz 1177023 BLAKE2B 7af02d833bfa7a2fdb52adc6ee25e43cb5b9ebd79c32685af033e3f24d3f1f9c758940b9fe7ade1295691a774e0530569b0f0567aae57a54d7da30e70f57eb93 SHA512 60cd4be070fde9f24f42ddc6ca5d5d290eddf2c0fa9b584eace50bc569f2ed3003be8f75f26a5ef8cffad4ed059118163bb4ea289d95ee58b445c4d8f34b487e
diff --git a/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild b/app-emacs/wanderlust/wanderlust-2.15.9_p20210629.ebuild
similarity index 67%
rename from app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild
rename to app-emacs/wanderlust/wanderlust-2.15.9_p20210629.ebuild
index 033aa93c445a..036441e2b356 100644
--- a/app-emacs/wanderlust/wanderlust-2.15.9_p20180814.ebuild
+++ b/app-emacs/wanderlust/wanderlust-2.15.9_p20210629.ebuild
@@ -1,26 +1,27 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
+NEED_EMACS=24.5
inherit elisp
DESCRIPTION="Yet Another Message Interface on Emacsen"
HOMEPAGE="https://github.com/wanderlust/wanderlust"
-GITHUB_SHA1="395826e99b84051396d503392f52462b6cb683a5"
-SRC_URI="https://github.com/wanderlust/wanderlust/archive/${GITHUB_SHA1}.tar.gz -> ${P}-git.tar.gz"
+GITHUB_SHA1="769699d60aa033049804083b459ee562b82db77e"
+SRC_URI="https://github.com/wanderlust/${PN}/archive/${GITHUB_SHA1}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/${PN}-${GITHUB_SHA1}"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="bbdb ssl l10n_ja"
-DEPEND=">=app-emacs/apel-10.6
- app-emacs/flim
- app-emacs/semi
+RDEPEND=">=app-emacs/apel-10.8
+ >=app-emacs/flim-1.14.9
+ >=app-emacs/semi-1.14.7
bbdb? ( app-emacs/bbdb )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
SITEFILE="50${PN}-gentoo.el"
@@ -47,11 +48,11 @@ src_install() {
insinto "${SITEETC}/wl/samples/en"
doins samples/en/*
doinfo doc/wl*.info
- dodoc BUGS ChangeLog INSTALL NEWS README.md
+ dodoc BUGS ChangeLog* INSTALL NEWS README.md
if use l10n_ja; then
insinto "${SITEETC}/wl/samples/ja"
doins samples/ja/*
- dodoc BUGS.ja INSTALL.ja NEWS.ja README.ja
+ dodoc BUGS.ja INSTALL.ja NEWS.ja README.ja.md
fi
}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 48b3aa7d942d..b65af0ef16b8 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libcharon/libcharon-4.9.1.ebuild b/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
similarity index 96%
rename from dev-libs/libcharon/libcharon-4.9.1.ebuild
rename to dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
index 819af575f9c9..8bb7404534a2 100644
--- a/dev-libs/libcharon/libcharon-4.9.1.ebuild
+++ b/dev-libs/libcharon/libcharon-4.9.1-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/Ultimaker/libCharon"
SRC_URI="https://github.com/Ultimaker/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-3"
-SLOT="0/3"
+SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="+client +dbus test"
@@ -61,8 +61,7 @@ src_configure() {
src_install() {
cmake_src_install
-
- python_optimize "${D}/usr/$(get_libdir)"
+ python_optimize
}
pkg_postinst() {
diff --git a/dev-libs/libcharon/metadata.xml b/dev-libs/libcharon/metadata.xml
index f522947e90f4..572a52741db4 100644
--- a/dev-libs/libcharon/metadata.xml
+++ b/dev-libs/libcharon/metadata.xml
@@ -21,9 +21,6 @@
perlovka@gmail.com
Michael Perlov
-
- soname major version number
-
Library to read and write several 3D-printing related file formats including G-Code and Ultimaker File Package (UFP).
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index d46b98983154..9f07339f1535 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1 +1,2 @@
DIST libfido2-1.7.0.tar.gz 517426 BLAKE2B c7ad55d1402808ad12dc999b0ec67161a5fe82dfeaeed362c35f4183144af9bd2771c1e3318a731db46fd8fc21ccd0737024b72c8dd3c754e34625118817742f SHA512 f40d394883d909e9e3ea3308b32f7ca31a882c709e11b3b143ed5734d16b0c244d4932effe06965d566776b03d152b1fc280e73cdfeeb81b65d8414042af19fe
+DIST libfido2-1.8.0.tar.gz 535947 BLAKE2B 48ca29fc1b582b4c915ce3dac2b3c24b1c71b144681f77f13059a599eb5e38b263442abecacad495e28a6fea63fc98c142a32939bb49a521b6a6a8d4ad0f1ff0 SHA512 dbea52a80068323e9945ef7a6e93ab1438bc4347390fc91694a94669900d4ce4abe95e1b6df90fe8b6b2dde6b5d28d9dc0c6b022c24ccb661f28c30c33417999
diff --git a/dev-libs/libfido2/libfido2-1.8.0.ebuild b/dev-libs/libfido2/libfido2-1.8.0.ebuild
new file mode 100644
index 000000000000..21c57df89552
--- /dev/null
+++ b/dev-libs/libfido2/libfido2-1.8.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake udev linux-info
+
+DESCRIPTION="Provides library functionality for FIDO 2.0"
+HOMEPAGE="https://github.com/Yubico/libfido2"
+SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="nfc +static-libs"
+
+DEPEND="
+ dev-libs/libcbor:=
+ dev-libs/openssl:0=
+ sys-libs/zlib:0=
+ virtual/libudev:=
+"
+
+RDEPEND="
+ ${DEPEND}
+ acct-group/plugdev
+"
+
+PATCHES=(
+ "${FILESDIR}/libfido2-1.7.0-cmakelists.patch"
+)
+
+pkg_pretend() {
+ CONFIG_CHECK="
+ ~USB_HID
+ ~HIDRAW
+ "
+
+ check_extra_config
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DNFC_LINUX="$(usex nfc)"
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ if ! use static-libs; then
+ rm -f "${ED}/$(get_libdir)"/*.a || die
+ fi
+
+ udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
+}
diff --git a/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild b/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
index 9914bdd1bd36..3e26b6e714a6 100644
--- a/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
+++ b/dev-perl/Config-AutoConf/Config-AutoConf-0.319.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A module to implement some of AutoConf macros in pure perl"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild b/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
index 9b949edaebb4..716e87975295 100644
--- a/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
+++ b/dev-perl/File-Slurper/File-Slurper-0.12.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A simple, sane and efficient module to slurp a file"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0.ebuild b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0.ebuild
index 7eaa89c8f182..0c7827c4f2f8 100644
--- a/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0.ebuild
+++ b/dev-perl/List-MoreUtils-XS/List-MoreUtils-XS-0.430.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Compiled List::MoreUtils functions"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# See XS.pm/LICENSE
LICENSE="Apache-2.0 || ( Artistic GPL-1+ )"
diff --git a/dev-perl/List-MoreUtils/List-MoreUtils-0.430.0.ebuild b/dev-perl/List-MoreUtils/List-MoreUtils-0.430.0.ebuild
index 686fc9821516..c0a981794e4a 100644
--- a/dev-perl/List-MoreUtils/List-MoreUtils-0.430.0.ebuild
+++ b/dev-perl/List-MoreUtils/List-MoreUtils-0.430.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Provide the missing functionality from List::Util"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="+xs"
# See MoreUtils.pm/LICENSE
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 07e6f171fe86..2d1af7d70523 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
index 509d6300fbe1..2e09f27a3204 100644
--- a/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
+++ b/dev-perl/PerlIO-utf8_strict/PerlIO-utf8_strict-0.7.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="Fast and correct UTF-8 IO"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RESTRICT="!test? ( test )"
# r: strict, warnings -> perl
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f92bb0e16bce..3507506b9c95 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/black/black-21.7_beta0.ebuild b/dev-python/black/black-21.7_beta0.ebuild
index c1bdd3d8f69d..6c1c2cf07008 100644
--- a/dev-python/black/black-21.7_beta0.ebuild
+++ b/dev-python/black/black-21.7_beta0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~riscv ~sparc ~x86"
RDEPEND="
dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
index 6bf5d87e4614..8083f63539bf 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~riscv ~sparc ~x86"
distutils_enable_tests pytest
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
index 6d626dc40a76..cb2a5a717366 100644
--- a/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.4.0.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.4.0-r1.ebuild
similarity index 88%
rename from dev-python/pyls-spyder/pyls-spyder-0.4.0.ebuild
rename to dev-python/pyls-spyder/pyls-spyder-0.4.0-r1.ebuild
index d30877c10e7e..407619370167 100644
--- a/dev-python/pyls-spyder/pyls-spyder-0.4.0.ebuild
+++ b/dev-python/pyls-spyder/pyls-spyder-0.4.0-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 x86"
-RDEPEND="dev-python/python-lsp-server[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-lsp-server[all-plugins,${PYTHON_USEDEP}]"
BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
distutils_enable_tests pytest
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
index 07c233bce68c..fa7829c72396 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit distutils-r1
diff --git a/dev-python/python-lsp-server/metadata.xml b/dev-python/python-lsp-server/metadata.xml
index d18c2963a96b..bad826ef127c 100644
--- a/dev-python/python-lsp-server/metadata.xml
+++ b/dev-python/python-lsp-server/metadata.xml
@@ -13,4 +13,7 @@
python-lsp-server
+
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild
similarity index 80%
rename from dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild
rename to dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild
index 6acffdf397b9..664b3167fc9e 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild
@@ -16,6 +16,8 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ~arm64 x86"
+IUSE="all-plugins"
+
BDEPEND="
test? (
dev-python/autopep8[${PYTHON_USEDEP}]
@@ -41,7 +43,19 @@ RDEPEND="
=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
dev-python/pluggy[${PYTHON_USEDEP}]
- >=dev-python/ujson-3[${PYTHON_USEDEP}]
+ all-plugins? (
+ dev-python/autopep8[${PYTHON_USEDEP}]
+ >=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+ =dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+ >=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+ =dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+ dev-python/yapf[${PYTHON_USEDEP}]
+ )
"
PATCHES=(
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.1.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild
similarity index 80%
rename from dev-python/python-lsp-server/python-lsp-server-1.1.0.ebuild
rename to dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild
index 7bfbc16308b2..a81825d5a49e 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.1.0.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild
@@ -16,6 +16,8 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="all-plugins"
+
BDEPEND="
test? (
dev-python/autopep8[${PYTHON_USEDEP}]
@@ -41,7 +43,19 @@ RDEPEND="
=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
dev-python/pluggy[${PYTHON_USEDEP}]
- >=dev-python/ujson-3[${PYTHON_USEDEP}]
+ all-plugins? (
+ dev-python/autopep8[${PYTHON_USEDEP}]
+ >=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+ >=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+ =dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+ >=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+ =dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+ dev-python/yapf[${PYTHON_USEDEP}]
+ )
"
distutils_enable_tests pytest
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 9320e9b0fe4e..9f732a314f7b 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~riscv ~sparc ~x86"
IUSE="socks5"
RDEPEND="
@@ -29,6 +29,7 @@ BDEPEND="
test? (
dev-python/pytest-httpbin[${PYTHON_USEDEP}]
dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/trustme[${PYTHON_USEDEP}]
>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
)
"
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 83fb9880490b..8fea8366a3a6 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,4 +1,4 @@
DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
DIST spyder-5.0.5.tar.gz 20606379 BLAKE2B 52f05ffcf0b6aabdac23a055af1c674c6aa80a7d4f3608779df1d46e0e51de63a71b4e97db286dc92e071cbb44a0dc827aa750d8ca538e6764b5e780f493d615 SHA512 17654ee76eb51c5f5b9f494d009af3d7813f869f27f22ceb8ad8ca96dcedcbcd6b86c7a3895bb63eba3cc60e4a57ab94128abb8d21f05c4672b8bb8d545fe1ff
-DIST spyder-docs-6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67.tar.gz 78446300 BLAKE2B 4225589581ef47237d7025f506812840c959e589cddfe47d2c4d3a74d7fc876f67eda291ad07e82b054ff2666bed34fa0edca1e1c0e1ff5574efb2db1028a42a SHA512 4d0bd348ec3335e022456c19dc319295948061cea45b0f1e5a05c2640943776b5c3bdc2581fdc0571bd98fe8834af035134084394ce6711d5a69598515bd0e9b
+DIST spyder-docs-5eb83118155a3765de4a0f863b936bcbe73bb7aa.tar.gz 85362596 BLAKE2B 7294dcd0f169958da132b141379b9b1cf497095981a86416fb98d98f98e30a425fe2e628a523785f932bbc06a2ba1ecddb45bae0df009887db928f879e08cdef SHA512 45f45546b83afb3036348e89ee3eded4d8ecee36ce58fe697da14677fbff8fa2dfe170be7385ecf10e1989817780c07b5676d545ee34e87a8f252929ad72882e
DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
diff --git a/dev-python/spyder/spyder-4.2.5-r1.ebuild b/dev-python/spyder/spyder-4.2.5-r2.ebuild
similarity index 82%
rename from dev-python/spyder/spyder-4.2.5-r1.ebuild
rename to dev-python/spyder/spyder-4.2.5-r2.ebuild
index cb91fff8bf7a..04d05d40e107 100644
--- a/dev-python/spyder/spyder-4.2.5-r1.ebuild
+++ b/dev-python/spyder/spyder-4.2.5-r2.ebuild
@@ -26,21 +26,13 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-# The test suite often hangs or does not work.
-# Technically spyder requires pyqt5<13, which
-# we do not have in ::gentoo any more. Likely
-# this is the reason many of the tests fail
-# or hang. RESTRICTing because IMO it is
-# not worth the several hours I spend every
-# single version bump checking which tests
-# do and do not work. Spyder itself works
-# fine with pyqt5>13.
+# The test suite often hangs or does not work. Technically spyder requires
+# pyqt5<13, which we do not have in ::gentoo any more. Likely this is the reason
+# many of the tests fail or hang. RESTRICTing because IMO it is not worth the
+# several hours I spend every single version bump checking which tests do and
+# do not work. Spyder itself works fine with pyqt5>13.
RESTRICT="test"
-# White space separated deps are expansion of python-language-server[all] dep
-# As the pyls ebuild does not add flags for optional runtime dependencies
-# we have to manually specify these desp instead of just depending on the [all]
-# flag. The indentation allows us to distinguish them from spyders direct deps.
RDEPEND="
>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
@@ -48,31 +40,15 @@ RDEPEND="
>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
- ~dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
- ~dev-python/parso-0.7.0[${PYTHON_USEDEP}]
>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
- >=dev-python/python-lsp-server-1.0.1[${PYTHON_USEDEP}]
-
- dev-python/autopep8[${PYTHON_USEDEP}]
- >=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
- =dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
- >=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
- =dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
- dev-python/yapf[${PYTHON_USEDEP}]
-
>=dev-python/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
@@ -145,24 +121,38 @@ python_prepare_all() {
# in making the switch. Because we are running into issues with outdated deps
# and a whole dependency mess as a result, we can no longer wait for upstream.
find . -name "*.py" -exec sed -i \
- -e 's/python-language-server\[all\]>=0.36.2,<1.0.0/python-lsp-server\[all\]>=1.0.0/g' \
- -e 's/python-language-server/python-lsp-server/g' \
- -e 's/python_language_server/python_lsp_server/g' \
- -e 's/python-jsonrpc-server/python-lsp-jsonrpc/g' \
- -e 's/python_jsonrpc_server/python_lsp_jsonrpc/g' \
-e 's/pyls/pylsp/g' \
-e 's/pylsp-spyder/pyls-spyder/g' \
-e 's/pylsp_spyder/pyls_spyder/g' \
- -e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
-e 's/pylsp-black/python-lsp-black/g' \
+ -e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \
- -e 's/>=0.36.2;<1.0.0/>=1.0.0/g' \
{} + || die
- # do not depend on pyqt5<13
- sed -i -e '/pyqt5/d' \
+ # Do not depend on pyqt5<5.13, this dependency is carried by QtPy[pyqt5]
+ # Do not depend on pyqtwebengine<5.13, this dependency is carried by QtPy[webengine]
+ # Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
+ # Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
+ # The explicit version requirements only make things more complicated, if e.g.
+ # pyls-spyder gains compatibility with a newer version of python-lsp-server
+ # in a new release it will take time for this information to propagate into
+ # the next spyder release. So just remove the dependency and let the other
+ # ebuilds handle the version requirements to speed things up and prevent
+ # issues such as Bug 803269.
+ sed -i \
+ -e '/pyqt5/d' \
-e '/pyqtwebengine/d' \
- setup.py || die
+ -e '/python-language-server/d' \
+ -e '/python-lsp-server/d' \
+ -e '/parso/d' \
+ -e '/jedi/d' \
+ {setup.py,requirements/conda.txt} || die
+ sed -i \
+ -e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
+ -e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
+ -e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
+ -e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
+ spyder/dependencies.py || die
# do not check deps, fails because we removed pyqt5 dependency above
sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
diff --git a/dev-python/spyder/spyder-5.0.5.ebuild b/dev-python/spyder/spyder-5.0.5-r1.ebuild
similarity index 83%
rename from dev-python/spyder/spyder-5.0.5.ebuild
rename to dev-python/spyder/spyder-5.0.5-r1.ebuild
index 27d30b0d5a4c..75ea2dbe52d6 100644
--- a/dev-python/spyder/spyder-5.0.5.ebuild
+++ b/dev-python/spyder/spyder-5.0.5-r1.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
inherit optfeature xdg distutils-r1
# Commit of documentation to fetch
-DOCS_PV="6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67"
+DOCS_PV="5eb83118155a3765de4a0f863b936bcbe73bb7aa"
DESCRIPTION="The Scientific Python Development Environment"
HOMEPAGE="
@@ -41,13 +41,10 @@ RDEPEND="
>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
- ~dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
- >=dev-python/parso-0.7.0[${PYTHON_USEDEP}]
- =dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
@@ -55,7 +52,6 @@ RDEPEND="
>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
>=dev-python/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/python-lsp-server-1.0.1[${PYTHON_USEDEP}]
>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
~dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
@@ -72,21 +68,6 @@ RDEPEND="
>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
"
-# python-lsp-server[all] deps
-RDEPEND+="
- dev-python/autopep8[${PYTHON_USEDEP}]
- >=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
- =dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
- >=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
- =dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
- dev-python/yapf[${PYTHON_USEDEP}]
-"
-
BDEPEND="
test? (
dev-python/cython[${PYTHON_USEDEP}]
@@ -146,28 +127,39 @@ python_prepare_all() {
# The original hasn't been update in over 6 months, and spyder upstream is slow
# in making the switch. Because we are running into issues with outdated deps
# and a whole dependency mess as a result, we can no longer wait for upstream.
- # Also relax the parso dependency to allow parso 0.7.1
find . -name "*.py" -exec sed -i \
- -e 's/python-language-server\[all\]>=0.36.2,<1.0.0/python-lsp-server\[all\]>=1.0.0/g' \
- -e 's/python-language-server/python-lsp-server/g' \
- -e 's/python_language_server/python_lsp_server/g' \
- -e 's/python-jsonrpc-server/python-lsp-jsonrpc/g' \
- -e 's/python_jsonrpc_server/python_lsp_jsonrpc/g' \
-e 's/pyls/pylsp/g' \
-e 's/pylsp-spyder/pyls-spyder/g' \
-e 's/pylsp_spyder/pyls_spyder/g' \
- -e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
-e 's/pylsp-black/python-lsp-black/g' \
+ -e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \
- -e 's/>=0.36.2;<1.0.0/>=1.0.0/g' \
- -e "s/'parso==0.7.0'/'parso>=0.7.0,<0.8.0'/g" \
- -e "s/'=0.7.0'/'>=0.7.0;<0.8.0'/g" \
{} + || die
- # do not depend on pyqt5<13
- sed -i -e '/pyqt5/d' \
+ # Do not depend on pyqt5<5.13, this dependency is carried by QtPy[pyqt5]
+ # Do not depend on pyqtwebengine<5.13, this dependency is carried by QtPy[webengine]
+ # Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
+ # Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
+ # The explicit version requirements only make things more complicated, if e.g.
+ # pyls-spyder gains compatibility with a newer version of python-lsp-server
+ # in a new release it will take time for this information to propagate into
+ # the next spyder release. So just remove the dependency and let the other
+ # ebuilds handle the version requirements to speed things up and prevent
+ # issues such as Bug 803269.
+ sed -i \
+ -e '/pyqt5/d' \
-e '/pyqtwebengine/d' \
- setup.py || die
+ -e '/python-language-server/d' \
+ -e '/python-lsp-server/d' \
+ -e '/parso/d' \
+ -e '/jedi/d' \
+ {setup.py,requirements/conda.txt} || die
+ sed -i \
+ -e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
+ -e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
+ -e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
+ -e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
+ spyder/dependencies.py || die
# do not check deps, fails because we removed pyqt5 dependency above
sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
diff --git a/dev-python/tomli/tomli-1.0.4.ebuild b/dev-python/tomli/tomli-1.0.4.ebuild
index 15ed3831aa88..ec5349db21ec 100644
--- a/dev-python/tomli/tomli-1.0.4.ebuild
+++ b/dev-python/tomli/tomli-1.0.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
BDEPEND="
test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )"
diff --git a/dev-python/vncdotool/vncdotool-1.0.0.ebuild b/dev-python/vncdotool/vncdotool-1.0.0.ebuild
index 5a1b894b8cc8..de7a237c2740 100644
--- a/dev-python/vncdotool/vncdotool-1.0.0.ebuild
+++ b/dev-python/vncdotool/vncdotool-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 5e424090c557..44ed7367308b 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/elasticsearch-api/Manifest b/dev-ruby/elasticsearch-api/Manifest
index 6f443599b832..0832a3fe08d6 100644
--- a/dev-ruby/elasticsearch-api/Manifest
+++ b/dev-ruby/elasticsearch-api/Manifest
@@ -1,3 +1,2 @@
-DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
-DIST elasticsearch-ruby-6.8.2.tar.gz 343982 BLAKE2B 84878d08919d5a533943bf8a8b092f0ac74b6e1f160d822a9bbe079cb80d3dbfcc09619c1bcb25e0ad6015acfce383895e41ff9e6300a119c3a7ff53b22f0564 SHA512 c76ea7878726e7145a8c6b8759a916678da0d764620c15b77c3add08ec5d42147d0ff69a0e48ff2f8a4cceb39e7047afcd002862487d00752f84062d9df79874
+DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.0.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.0.ebuild
deleted file mode 100644
index 4dbb938a449e..000000000000
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem eapi7-ver
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-api module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
- dev-ruby/multi_json
-"
-ruby_add_bdepend "
- doc? ( dev-ruby/yard )
- test? (
- dev-ruby/ansi
- dev-ruby/elasticsearch-transport
- dev-ruby/mocha:1.0
- dev-ruby/pry
- dev-ruby/shoulda-context
- )
-"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
- # fix to work without git
- sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
- # remove useless dependencies from Rakefile
- sed -e '/bundler/d' \
- -e '/require.*cane/,/end/d' \
- -i Rakefile || die
-
- sed -i -e '/config.formatter/ s/documentation/progress/' spec/spec_helper.rb || die
-
- # Avoid tests that require unpackaged jbuilder and jsonify
- sed -i -e '/\(pry-nav\|jbuilder\|jsonify\)/ s:^:#:' spec/spec_helper.rb || die
- rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
-
- sed -i -e '/uses the escape_utils gem/askip "unmaintained gem"' spec/elasticsearch/api/utils_spec.rb || die
-}
diff --git a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.2.ebuild b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild
similarity index 92%
rename from dev-ruby/elasticsearch-api/elasticsearch-api-6.8.2.ebuild
rename to dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild
index 8b9a274812c2..95e0821f2261 100644
--- a/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.2.ebuild
+++ b/dev-ruby/elasticsearch-api/elasticsearch-api-6.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
RUBY_FAKEGEM_TASK_DOC=doc
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
+SLOT="$(ver_cut 1-3)"
KEYWORDS="~amd64"
IUSE=""
@@ -51,6 +51,7 @@ all_ruby_prepare() {
# Avoid tests that require unpackaged jbuilder and jsonify
sed -e '/\(pry-nav\|jbuilder\|jsonify\)/ s:^:#:' \
-e '/RspecJunitFormatter/ s:^:#:' \
+ -e '/ansi/arequire "patron"' \
-i spec/spec_helper.rb || die
rm -f spec/elasticsearch/api/actions/json_builders_spec.rb || die
diff --git a/dev-ruby/elasticsearch-extensions/Manifest b/dev-ruby/elasticsearch-extensions/Manifest
new file mode 100644
index 000000000000..1cd27dfa60c1
--- /dev/null
+++ b/dev-ruby/elasticsearch-extensions/Manifest
@@ -0,0 +1 @@
+DIST elasticsearch-ruby-0.0.33.tar.gz 1305021 BLAKE2B 5fce0ba8276451863519aa14bccd619a9ed4ad68220928e2f04a1349aaaefeda1027d28d3b130ab593f5643cf8af82a4bd0aeb19f79a0c9c8419a89dd70ea8a9 SHA512 db39555d418ae06f4bbcb7dd5b2c71e9c5523fa434e5acc9d6761e3d90ed64d0f282ffa3720ee4a702aade00e20bdc33935ed462910178d4cc609296970cd325
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.2.ebuild b/dev-ruby/elasticsearch-extensions/elasticsearch-extensions-0.0.33.ebuild
similarity index 64%
rename from dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.2.ebuild
rename to dev-ruby/elasticsearch-extensions/elasticsearch-extensions-0.0.33.ebuild
index 1d13774e21d5..b6b127aa4e8c 100644
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.2.ebuild
+++ b/dev-ruby/elasticsearch-extensions/elasticsearch-extensions-0.0.33.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
inherit ruby-fakegem
MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
+DESCRIPTION="Ruby integrations for ES, elasticsearch-extensions module"
HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
@@ -21,13 +21,12 @@ KEYWORDS="~amd64"
IUSE=""
ruby_add_rdepend "
- dev-ruby/faraday:1
- dev-ruby/multi_json
+ dev-ruby/ansi
+ dev-ruby/elasticsearch
"
ruby_add_bdepend "
doc? ( dev-ruby/yard )
test? (
- dev-ruby/ansi
dev-ruby/mocha:1.0
dev-ruby/pry
dev-ruby/rspec:3
@@ -41,14 +40,13 @@ RUBY_S=${MY_P}/${PN}
all_ruby_prepare() {
# fix to work without git
- sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
+ sed -i -e 's/git ls-files/find * -type f/' *.gemspec || die
# remove useless dependencies from Rakefile
sed -e '/bundler/d' \
-e '/require.*cane/,/end/d' \
-i Rakefile || die
- # Tweak test setup to only run unit tests since we don't have a live cluster
- sed -i -e "s/RUBY_VERSION > '1.9'/false/" \
- -e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die
+ sed -e '/reporters/I s:^:#:' \
+ -i test/test_helper.rb || die
}
diff --git a/dev-ruby/elasticsearch-extensions/metadata.xml b/dev-ruby/elasticsearch-extensions/metadata.xml
new file mode 100644
index 000000000000..1fa2ebe487b1
--- /dev/null
+++ b/dev-ruby/elasticsearch-extensions/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ ruby@gentoo.org
+
+
diff --git a/dev-ruby/elasticsearch-transport/Manifest b/dev-ruby/elasticsearch-transport/Manifest
index a49e87997117..0832a3fe08d6 100644
--- a/dev-ruby/elasticsearch-transport/Manifest
+++ b/dev-ruby/elasticsearch-transport/Manifest
@@ -1,4 +1,2 @@
-DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
-DIST elasticsearch-ruby-6.8.2.tar.gz 343982 BLAKE2B 84878d08919d5a533943bf8a8b092f0ac74b6e1f160d822a9bbe079cb80d3dbfcc09619c1bcb25e0ad6015acfce383895e41ff9e6300a119c3a7ff53b22f0564 SHA512 c76ea7878726e7145a8c6b8759a916678da0d764620c15b77c3add08ec5d42147d0ff69a0e48ff2f8a4cceb39e7047afcd002862487d00752f84062d9df79874
DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild
deleted file mode 100644
index 792e50aa53ea..000000000000
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_RECIPE_DOC=rdoc
-
-RUBY_FAKEGEM_TASK_TEST="NOTURN=true test"
-
-inherit ruby-fakegem eapi7-ver
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch-transport module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
- dev-ruby/faraday:*
- dev-ruby/multi_json
-"
-ruby_add_bdepend "
- doc? ( dev-ruby/yard )
- test? (
- dev-ruby/ansi
- dev-ruby/mocha:1.0
- dev-ruby/pry
- dev-ruby/shoulda-context
- dev-ruby/curb
- dev-ruby/patron
- )
-"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
- # fix to work without git
- sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
- # remove useless dependencies from Rakefile
- sed -e '/bundler/d' \
- -e '/require.*cane/,/end/d' \
- -i Rakefile || die
-
- # Tweak test setup to only run unit tests since we don't have a live cluster
- sed -i -e "s/RUBY_VERSION > '1.9'/false/" \
- -e '/module Elasticsearch/,$ s:^:#:' test/test_helper.rb || die
-}
diff --git a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
index 9e3d3dfb4e1c..59e8b4b1615a 100644
--- a/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
+++ b/dev-ruby/elasticsearch-transport/elasticsearch-transport-6.8.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
+SLOT="$(ver_cut 1-3)"
KEYWORDS="~amd64"
IUSE=""
diff --git a/dev-ruby/elasticsearch/Manifest b/dev-ruby/elasticsearch/Manifest
index 6f443599b832..0832a3fe08d6 100644
--- a/dev-ruby/elasticsearch/Manifest
+++ b/dev-ruby/elasticsearch/Manifest
@@ -1,3 +1,2 @@
-DIST elasticsearch-ruby-6.8.0.tar.gz 336486 BLAKE2B 5bf9538d3710787939a61b411918f3712a8490ed20df1039613f3828a55758e373e56c6794d597a95c04cf610aba8cea1113982b91cde764c96ee454e59cc7b1 SHA512 d75437b04770cac2ac65fb91f0b18cd3beae0248fa2f148aa820da5272093e5b05d00dc4c82c699d7e31b23d7f06ce7727f74eb5a9b0308264f7139e32774c91
DIST elasticsearch-ruby-6.8.1.tar.gz 336746 BLAKE2B b7e7f039c1605ca808f57ee2ecb5fd346672d89b1b1cc8eb2d30c8bfcab9d7283f082d9852f0f186a36298dadae98f6951cdbd6a0f401568640f7de006976b0c SHA512 01ab96c92ff04818e29dbab34d73865c1f2adc816670e1fbdfe29a545eb224ff2c6368d7e0f90264c71db76a4f369626ed2e0a4ed3401adf749e0cac41d1f41d
-DIST elasticsearch-ruby-6.8.2.tar.gz 343982 BLAKE2B 84878d08919d5a533943bf8a8b092f0ac74b6e1f160d822a9bbe079cb80d3dbfcc09619c1bcb25e0ad6015acfce383895e41ff9e6300a119c3a7ff53b22f0564 SHA512 c76ea7878726e7145a8c6b8759a916678da0d764620c15b77c3add08ec5d42147d0ff69a0e48ff2f8a4cceb39e7047afcd002862487d00752f84062d9df79874
+DIST elasticsearch-ruby-6.8.3.tar.gz 345447 BLAKE2B 6f10b4345d098b36c5b4d8e90e8745b10313de0df1f5bd9285e72f891a871bff8569318d5bd15ab5cca0ada722042affb6bd20ddb68117eb689eadc0c2a16706 SHA512 3001760ff49bf72ba9ac5e11f3338e320c828bfb245d45535325f422e438b693d1ae7a4f73ab766386a76282eca435849c670f3ad98e9431b80b402e97268f83
diff --git a/dev-ruby/elasticsearch/elasticsearch-6.8.0.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.8.0.ebuild
deleted file mode 100644
index a56db80f2fb5..000000000000
--- a/dev-ruby/elasticsearch/elasticsearch-6.8.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_TASK_DOC=doc
-
-inherit ruby-fakegem eapi7-ver
-
-MY_P=elasticsearch-ruby-${PV}
-DESCRIPTION="Ruby integrations for ES, elasticsearch module"
-HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
-SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend "
- ~dev-ruby/elasticsearch-api-${PV}
- ~dev-ruby/elasticsearch-transport-${PV}
-"
-ruby_add_bdepend "
- doc? ( dev-ruby/yard )
- test? (
- dev-ruby/ansi
- dev-ruby/elasticsearch-transport
- dev-ruby/mocha:1.0
- dev-ruby/pry
- dev-ruby/shoulda-context
- )
-"
-
-# Tests need additional modules (at least 'turn') packaged. Then someone
-# should look into running them and so on.
-RESTRICT="test"
-
-RUBY_S=${MY_P}/${PN}
-
-all_ruby_prepare() {
- # fix to work without git
- sed -i -e 's/git ls-files/find -type f/' *.gemspec || die
-
- # remove useless dependencies from Rakefile
- sed -e '/bundler/d' \
- -e '/require.*cane/,/end/d' \
- -i Rakefile || die
-}
diff --git a/dev-ruby/elasticsearch/elasticsearch-6.8.2.ebuild b/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild
similarity index 92%
rename from dev-ruby/elasticsearch/elasticsearch-6.8.2.ebuild
rename to dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild
index be432279d0dc..a5542e7c2894 100644
--- a/dev-ruby/elasticsearch/elasticsearch-6.8.2.ebuild
+++ b/dev-ruby/elasticsearch/elasticsearch-6.8.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby26 ruby27"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
RUBY_FAKEGEM_TASK_DOC=doc
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/elastic/elasticsearch-ruby"
SRC_URI="https://github.com/elastic/elasticsearch-ruby/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Apache-2.0"
-SLOT="$(ver_cut 1)"
+SLOT="$(ver_cut 1-3)"
KEYWORDS="~amd64"
IUSE=""
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index fa36dadaf8e7..8c3fec1bc10f 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 9ee6dadb78ac..3193ea77621f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 23 Jul 2021 09:08:57 +0000
+Fri, 23 Jul 2021 15:08:57 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9ee6dadb78ac..3193ea77621f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 23 Jul 2021 09:08:57 +0000
+Fri, 23 Jul 2021 15:08:57 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 3510671ec6e6..df0420e57a1b 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 594defbd6128..0961535ea267 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/libscrypt-1.21 b/metadata/md5-cache/app-crypt/libscrypt-1.21
index 40342e3f222e..625aa379e308 100644
--- a/metadata/md5-cache/app-crypt/libscrypt-1.21
+++ b/metadata/md5-cache/app-crypt/libscrypt-1.21
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile setup
DESCRIPTION=Shared library to impliment the scrypt algorithm
EAPI=6
HOMEPAGE=https://github.com/technion/libscrypt
-KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 sparc x86
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv sparc x86
LICENSE=BSD-2
SLOT=0
SRC_URI=https://github.com/technion/libscrypt/archive/v1.21.tar.gz -> libscrypt-1.21.tar.gz
_eclasses_=multilib 97566c1a256d07b00848aa767e38a352 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2729a2b007a876f4948fede0c7c4fbd1
+_md5_=fa46025dd482ec9f0e07fce60889cc2b
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 33edc739d190..905c3dfbbd46 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/apel-10.8_p20201106 b/metadata/md5-cache/app-emacs/apel-10.8_p20201106
new file mode 100644
index 000000000000..032b9ad45d8c
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/apel-10.8_p20201106
@@ -0,0 +1,12 @@
+BDEPEND=>=app-editors/emacs-24.5:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=A Portable Emacs Library is a library for making portable Emacs Lisp programs
+EAPI=8
+HOMEPAGE=https://github.com/wanderlust/apel
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/emacs-24.5:*
+SLOT=0
+SRC_URI=https://github.com/wanderlust/apel/archive/4e3269b6e702db2dba48cf560563ac883e81e3bf.tar.gz -> apel-10.8_p20201106.tar.gz
+_eclasses_=elisp b165dc0288d12ab26e86f41c56f03914 elisp-common cf4fd1b0835b9f3e638724840468064a
+_md5_=9295542c92af73815614f84e1d36c8fe
diff --git a/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529 b/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529
new file mode 100644
index 000000000000..3859f1cdf75f
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/flim-1.14.9_p20210529
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-24.5:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=app-emacs/apel-10.8
+DESCRIPTION=A library to provide basic features about message representation or encoding
+EAPI=8
+HOMEPAGE=https://github.com/wanderlust/flim
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+LICENSE=GPL-2+
+RDEPEND=>=app-emacs/apel-10.8 >=app-editors/emacs-24.5:*
+SLOT=0
+SRC_URI=https://github.com/wanderlust/flim/archive/02735dede6603987e8309a76d0bc7a9ff9a5a227.tar.gz -> flim-1.14.9_p20210529.tar.gz
+_eclasses_=elisp b165dc0288d12ab26e86f41c56f03914 elisp-common cf4fd1b0835b9f3e638724840468064a
+_md5_=458f7f0be03bc4c3e153153415ad0f99
diff --git a/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613 b/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613
new file mode 100644
index 000000000000..d500e2163ee2
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/semi-1.14.7_p20210613
@@ -0,0 +1,14 @@
+BDEPEND=>=app-editors/emacs-24.5:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9
+DESCRIPTION=A library to provide MIME feature for GNU Emacs
+EAPI=8
+HOMEPAGE=https://github.com/wanderlust/semi
+IUSE=l10n_ja
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2+
+RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-editors/emacs-24.5:*
+SLOT=0
+SRC_URI=https://github.com/wanderlust/semi/archive/509f6f0bc2f5d020c63e47d9ad89410dc20bcb6f.tar.gz -> semi-1.14.7_p20210613.tar.gz
+_eclasses_=elisp b165dc0288d12ab26e86f41c56f03914 elisp-common cf4fd1b0835b9f3e638724840468064a
+_md5_=ecfd53265c8f733a781321d090b8db8b
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814
deleted file mode 100644
index 1d20021667c5..000000000000
--- a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20180814
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=>=app-emacs/apel-10.6 app-emacs/flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-23.1:*
-DESCRIPTION=Yet Another Message Interface on Emacsen
-EAPI=6
-HOMEPAGE=https://github.com/wanderlust/wanderlust
-IUSE=bbdb ssl l10n_ja
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2+
-RDEPEND=>=app-emacs/apel-10.6 app-emacs/flim app-emacs/semi bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-23.1:*
-SLOT=0
-SRC_URI=https://github.com/wanderlust/wanderlust/archive/395826e99b84051396d503392f52462b6cb683a5.tar.gz -> wanderlust-2.15.9_p20180814-git.tar.gz
-_eclasses_=eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 elisp b165dc0288d12ab26e86f41c56f03914 elisp-common cf4fd1b0835b9f3e638724840468064a
-_md5_=3b273324dfe9f52d5f05814ce7376cf3
diff --git a/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20210629 b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20210629
new file mode 100644
index 000000000000..be6d6316a448
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/wanderlust-2.15.9_p20210629
@@ -0,0 +1,14 @@
+BDEPEND=>=app-editors/emacs-24.5:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-emacs/semi-1.14.7 bbdb? ( app-emacs/bbdb )
+DESCRIPTION=Yet Another Message Interface on Emacsen
+EAPI=8
+HOMEPAGE=https://github.com/wanderlust/wanderlust
+IUSE=bbdb ssl l10n_ja
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=GPL-2+
+RDEPEND=>=app-emacs/apel-10.8 >=app-emacs/flim-1.14.9 >=app-emacs/semi-1.14.7 bbdb? ( app-emacs/bbdb ) >=app-editors/emacs-24.5:*
+SLOT=0
+SRC_URI=https://github.com/wanderlust/wanderlust/archive/769699d60aa033049804083b459ee562b82db77e.tar.gz -> wanderlust-2.15.9_p20210629.tar.gz
+_eclasses_=elisp b165dc0288d12ab26e86f41c56f03914 elisp-common cf4fd1b0835b9f3e638724840468064a
+_md5_=2e23bedb3326db8309d758ee7cd2f0f0
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 3e30acfe7727..b2599c8d49a4 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/libcharon-4.9.1 b/metadata/md5-cache/dev-libs/libcharon-4.9.1-r1
similarity index 97%
rename from metadata/md5-cache/dev-libs/libcharon-4.9.1
rename to metadata/md5-cache/dev-libs/libcharon-4.9.1-r1
index a313a13b764e..97527ecd5eb6 100644
--- a/metadata/md5-cache/dev-libs/libcharon-4.9.1
+++ b/metadata/md5-cache/dev-libs/libcharon-4.9.1-r1
@@ -10,7 +10,7 @@ LICENSE=LGPL-3
RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dbus? ( acct-group/ultimaker acct-user/ultimaker sys-apps/dbus )
REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
RESTRICT=!test? ( test )
-SLOT=0/3
+SLOT=0
SRC_URI=https://github.com/Ultimaker/libCharon/archive/4.9.1.tar.gz -> libcharon-4.9.1.tar.gz
_eclasses_=cmake 518e4c9a6a38dfd7afc54b6a7c5de3da eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils a4dab848a4490e8e48cf0baab3e61bc2 python-single-r1 73f113f91928e0d16bceb65ecbcd8e75 python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils 27f9a2f19502b925ac117bd657aa2979
-_md5_=05dbf7555787fbc87e27921d3387781e
+_md5_=37e9469efcdc7b80441103d609ac9a1f
diff --git a/metadata/md5-cache/dev-libs/libfido2-1.8.0 b/metadata/md5-cache/dev-libs/libfido2-1.8.0
new file mode 100644
index 000000000000..412013731fda
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfido2-1.8.0
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja dev-util/cmake virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-libs/libcbor:= dev-libs/openssl:0= sys-libs/zlib:0= virtual/libudev:=
+DESCRIPTION=Provides library functionality for FIDO 2.0
+EAPI=7
+HOMEPAGE=https://github.com/Yubico/libfido2
+IUSE=nfc +static-libs kernel_linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=dev-libs/libcbor:= dev-libs/openssl:0= sys-libs/zlib:0= virtual/libudev:= acct-group/plugdev
+SLOT=0/1
+SRC_URI=https://github.com/Yubico/libfido2/archive/1.8.0.tar.gz -> libfido2-1.8.0.tar.gz
+_eclasses_=cmake 518e4c9a6a38dfd7afc54b6a7c5de3da edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 linux-info 7e8ed4c6a1d136fb291c52386f996c2c multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils a4dab848a4490e8e48cf0baab3e61bc2 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa udev 26207b5d4f4708920b9fcb7302d94068 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils 27f9a2f19502b925ac117bd657aa2979
+_md5_=61946df38d90acbcac9c27c6a78b0e81
diff --git a/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0 b/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0
index 872404afbb6f..bd768da81e79 100644
--- a/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0
+++ b/metadata/md5-cache/dev-perl/Config-AutoConf-0.319.0
@@ -5,11 +5,11 @@ DESCRIPTION=A module to implement some of AutoConf macros in pure perl
EAPI=7
HOMEPAGE=https://metacpan.org/release/Config-AutoConf
IUSE=test
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-perl/Capture-Tiny virtual/perl-Carp virtual/perl-Exporter >=virtual/perl-ExtUtils-CBuilder-0.280.220 dev-perl/File-Slurper virtual/perl-File-Spec virtual/perl-File-Temp >=virtual/perl-Scalar-List-Utils-1.180.0 virtual/perl-Text-ParseWords dev-lang/perl:=
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Config-AutoConf-0.319.tar.gz
_eclasses_=multiprocessing 61c959fc55c15c00bbb1079d6a71370b perl-functions fea344a91ebf37efadf172c6a3de5a72 perl-module 0ee2b2b92175720c966a5608c62b458d
-_md5_=809bbdae3d939371216c85e9ad65663c
+_md5_=58b22d1c4f209dc68db05532271841aa
diff --git a/metadata/md5-cache/dev-perl/File-Slurper-0.12.0 b/metadata/md5-cache/dev-perl/File-Slurper-0.12.0
index 9ce5d4850e73..8aa28b7ec1fa 100644
--- a/metadata/md5-cache/dev-perl/File-Slurper-0.12.0
+++ b/metadata/md5-cache/dev-perl/File-Slurper-0.12.0
@@ -5,11 +5,11 @@ DESCRIPTION=A simple, sane and efficient module to slurp a file
EAPI=7
HOMEPAGE=https://metacpan.org/release/File-Slurper
IUSE=test examples
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=dev-perl/PerlIO-utf8_strict virtual/perl-Carp >=virtual/perl-Encode-2.110.0 >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/File-Slurper-0.012.tar.gz
_eclasses_=multiprocessing 61c959fc55c15c00bbb1079d6a71370b perl-functions fea344a91ebf37efadf172c6a3de5a72 perl-module 0ee2b2b92175720c966a5608c62b458d
-_md5_=260c6fcc615169d73739b39a33455dab
+_md5_=9d6cd89fea7e57fa53005421ffc789e0
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-0.430.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-0.430.0
index 0716352308cb..18908b65adfe 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-0.430.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-0.430.0
@@ -5,7 +5,7 @@ DESCRIPTION=Provide the missing functionality from List::Util
EAPI=8
HOMEPAGE=https://metacpan.org/release/List-MoreUtils
IUSE=+xs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
PDEPEND=xs? ( >=dev-perl/List-MoreUtils-XS-0.430.0 )
RDEPEND=>=dev-perl/Exporter-Tiny-0.38.0 dev-lang/perl:=
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-0.430.tar.gz
_eclasses_=multiprocessing 61c959fc55c15c00bbb1079d6a71370b perl-functions fea344a91ebf37efadf172c6a3de5a72 perl-module 0ee2b2b92175720c966a5608c62b458d readme.gentoo-r1 e51390d48521eb3d400db57d557b7530
-_md5_=57888b0e71c7b9b5f2280f38fd8eb6e9
+_md5_=261910db57b7b7023604eabbc41291a3
diff --git a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.430.0 b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.430.0
index 20470c78fe16..f213be4d5c3e 100644
--- a/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.430.0
+++ b/metadata/md5-cache/dev-perl/List-MoreUtils-XS-0.430.0
@@ -5,11 +5,11 @@ DESCRIPTION=Compiled List::MoreUtils functions
EAPI=8
HOMEPAGE=https://metacpan.org/release/List-MoreUtils-XS
IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0 || ( Artistic GPL-1+ )
RDEPEND=!=virtual/perl-XSLoader-0.220.0 dev-lang/perl:=
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/List-MoreUtils-XS-0.430.tar.gz
_eclasses_=multiprocessing 61c959fc55c15c00bbb1079d6a71370b perl-functions fea344a91ebf37efadf172c6a3de5a72 perl-module 0ee2b2b92175720c966a5608c62b458d readme.gentoo-r1 e51390d48521eb3d400db57d557b7530
-_md5_=baaaaae5debd02bef515a3d3502957be
+_md5_=c10f540bf2be5576e8de6024c142627b
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 487bf5305fc8..10303b2906d6 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0 b/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0
index 17d09443bb42..4a103ae09f14 100644
--- a/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0
+++ b/metadata/md5-cache/dev-perl/PerlIO-utf8_strict-0.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=Fast and correct UTF-8 IO
EAPI=6
HOMEPAGE=https://metacpan.org/release/PerlIO-utf8_strict
IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=virtual/perl-XSLoader dev-lang/perl:=
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://cpan/authors/id/L/LE/LEONT/PerlIO-utf8_strict-0.007.tar.gz
_eclasses_=multiprocessing 61c959fc55c15c00bbb1079d6a71370b perl-functions fea344a91ebf37efadf172c6a3de5a72 perl-module 0ee2b2b92175720c966a5608c62b458d
-_md5_=b726b4ce74acdb62fefc890fe2fa1960
+_md5_=20f67891d5391dd464d7074c55c334c7
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index c539c1d1ae56..41e87d3a8cca 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/black-21.7_beta0 b/metadata/md5-cache/dev-python/black-21.7_beta0
index e9e991197dfe..7bbd321bdf92 100644
--- a/metadata/md5-cache/dev-python/black-21.7_beta0
+++ b/metadata/md5-cache/dev-python/black-21.7_beta0
@@ -4,7 +4,7 @@ DESCRIPTION=The uncompromising Python code formatter
EAPI=7
HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black
IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~riscv ~sparc ~x86
LICENSE=MIT
RDEPEND=dev-python/appdirs[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/regex[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/psf/black/archive/21.7b0.tar.gz -> black-21.7b0.tar.gz
_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b optfeature cc13a38ea4d26565e83ef21d58bcd4ab python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ffe44975d90b6e2e24a2b2fc83c6740c
+_md5_=b6ac5aeb0ddfe7f4a618ed46f19193f7
diff --git a/metadata/md5-cache/dev-python/charset_normalizer-2.0.3 b/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
index f8fe600b96e1..6c9d928ea316 100644
--- a/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
+++ b/metadata/md5-cache/dev-python/charset_normalizer-2.0.3
@@ -4,7 +4,7 @@ DESCRIPTION=The Real First Universal Charset Detector
EAPI=8
HOMEPAGE=https://pypi.org/project/charset-normalizer/ https://github.com/ousret/charset_normalizer/
IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~riscv ~sparc ~x86
LICENSE=MIT
RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/Ousret/charset_normalizer/archive/2.0.3.tar.gz -> charset_normalizer-2.0.3.gh.tar.gz
_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=c6e6a2840c42bdad460ba8d1e291969c
+_md5_=5e4dbab2b5203e002e2295425d1e994e
diff --git a/metadata/md5-cache/dev-python/nbsphinx-0.8.6 b/metadata/md5-cache/dev-python/nbsphinx-0.8.6
index f11ed693f261..3e635af8463b 100644
--- a/metadata/md5-cache/dev-python/nbsphinx-0.8.6
+++ b/metadata/md5-cache/dev-python/nbsphinx-0.8.6
@@ -1,14 +1,14 @@
-BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Jupyter Notebook Tools for Sphinx
EAPI=7
HOMEPAGE=https://github.com/spatialaudio/nbsphinx/
-IUSE=python_targets_python3_8 python_targets_python3_9
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
KEYWORDS=amd64 ~arm64 x86
LICENSE=MIT
-RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbconvert[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbformat[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sphinx-1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/traitlets[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
SLOT=0
SRC_URI=mirror://pypi/n/nbsphinx/nbsphinx-0.8.6.tar.gz
_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=744fe76a84f02ffee80a34cb3b1e0203
+_md5_=84046f12d5ee12f2137924431170b3c6
diff --git a/metadata/md5-cache/dev-python/pyls-spyder-0.4.0 b/metadata/md5-cache/dev-python/pyls-spyder-0.4.0-r1
similarity index 64%
rename from metadata/md5-cache/dev-python/pyls-spyder-0.4.0
rename to metadata/md5-cache/dev-python/pyls-spyder-0.4.0-r1
index 8cba0daec72d..24869359d4b6 100644
--- a/metadata/md5-cache/dev-python/pyls-spyder-0.4.0
+++ b/metadata/md5-cache/dev-python/pyls-spyder-0.4.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/python-lsp-server[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/python-lsp-server[all-plugins,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Spyder extensions for the python language server
EAPI=7
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/spyder-ide/pyls-spyder https://pypi.org/project/pyls
IUSE=test python_targets_python3_8 python_targets_python3_9
KEYWORDS=amd64 x86
LICENSE=MIT
-RDEPEND=dev-python/python-lsp-server[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+RDEPEND=dev-python/python-lsp-server[all-plugins,python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/spyder-ide/pyls-spyder/archive/v0.4.0.tar.gz -> pyls-spyder-0.4.0-gh.tar.gz
_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=d19dcac6ecdc2909885261f10d72b15c
+_md5_=72803e4e7606afabfa935f05d2869cc1
diff --git a/metadata/md5-cache/dev-python/pytest-regressions-2.2.0 b/metadata/md5-cache/dev-python/pytest-regressions-2.2.0
index c9ba5b224084..636d204c93b1 100644
--- a/metadata/md5-cache/dev-python/pytest-regressions-2.2.0
+++ b/metadata/md5-cache/dev-python/pytest-regressions-2.2.0
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tox[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-datadir[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tox[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-datadir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Easy to use fixtures to write regression tests
EAPI=7
HOMEPAGE=https://github.com/ESSS/pytest-regressions
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
KEYWORDS=amd64 x86
LICENSE=MIT
-RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pytest-datadir[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-datadir[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/p/pytest-regressions/pytest-regressions-2.2.0.tar.gz
_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=8e6940013b0ca725b26fab1068849e43
+_md5_=d9b81764565c069fa20b58ef269ba560
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.0.1 b/metadata/md5-cache/dev-python/python-lsp-server-1.0.1-r1
similarity index 51%
rename from metadata/md5-cache/dev-python/python-lsp-server-1.0.1
rename to metadata/md5-cache/dev-python/python-lsp-server-1.0.1-r1
index 7701121e0402..80b8d7ef243b 100644
--- a/metadata/md5-cache/dev-python/python-lsp-server-1.0.1
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.0.1-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[gui,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[gui,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
DEFINED_PHASES=compile configure install postinst prepare test
DESCRIPTION=Python Language Server for the Language Server Protocol
EAPI=7
HOMEPAGE=https://github.com/python-lsp/python-lsp-server
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=all-plugins test python_targets_python3_8 python_targets_python3_9
KEYWORDS=amd64 ~arm64 x86
LICENSE=MIT
-RDEPEND=>=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+RDEPEND=>=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/p/python-lsp-server/python-lsp-server-1.0.1.tar.gz
_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b optfeature cc13a38ea4d26565e83ef21d58bcd4ab python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=ead8b9a8a87f97eecf137467ecb10e8b
+_md5_=42e5d31742ac0a20c3553ebc4199044c
diff --git a/metadata/md5-cache/dev-python/python-lsp-server-1.1.0 b/metadata/md5-cache/dev-python/python-lsp-server-1.1.0-r1
similarity index 51%
rename from metadata/md5-cache/dev-python/python-lsp-server-1.1.0
rename to metadata/md5-cache/dev-python/python-lsp-server-1.1.0-r1
index 99dae40e6ef1..ef2d9c97c7e8 100644
--- a/metadata/md5-cache/dev-python/python-lsp-server-1.1.0
+++ b/metadata/md5-cache/dev-python/python-lsp-server-1.1.0-r1
@@ -1,15 +1,15 @@
-BDEPEND=test? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[gui,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/QtPy[gui,testlib,python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
DEFINED_PHASES=compile configure install postinst prepare test
DESCRIPTION=Python Language Server for the Language Server Protocol
EAPI=7
HOMEPAGE=https://github.com/python-lsp/python-lsp-server
-IUSE=test python_targets_python3_8 python_targets_python3_9
+IUSE=all-plugins test python_targets_python3_8 python_targets_python3_9
KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=MIT
-RDEPEND=>=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ujson-3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+RDEPEND=>=dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/python-lsp-jsonrpc-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] all-plugins? ( dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/p/python-lsp-server/python-lsp-server-1.1.0.tar.gz
_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b optfeature cc13a38ea4d26565e83ef21d58bcd4ab python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=6f2780a86cc4a5dd683677f0f7dc00bf
+_md5_=c288abefef1096801afac2d3b1a2bf08
diff --git a/metadata/md5-cache/dev-python/requests-2.26.0 b/metadata/md5-cache/dev-python/requests-2.26.0
index b73b4314732f..59e461fa0f34 100644
--- a/metadata/md5-cache/dev-python/requests-2.26.0
+++ b/metadata/md5-cache/dev-python/requests-2.26.0
@@ -1,10 +1,10 @@
-BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/certifi-2017.4.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( dev-python/pytest-httpbin[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/certifi-2017.4.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=HTTP library for human beings
EAPI=8
HOMEPAGE=https://requests.readthedocs.io/
IUSE=socks5 test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~riscv ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-python/certifi-2017.4.17[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/charset_normalizer[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/PySocks-1.5.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) python_targets_python3_10? ( dev-lang/python:3.10[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/r/requests/requests-2.26.0.tar.gz
_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=616eeb7038608aed4faa962508458e3f
+_md5_=c9c8f7abfb056d3e1873594f136625d5
diff --git a/metadata/md5-cache/dev-python/spyder-4.2.5-r1 b/metadata/md5-cache/dev-python/spyder-4.2.5-r1
deleted file mode 100644
index f9a85805a860..000000000000
--- a/metadata/md5-cache/dev-python/spyder-4.2.5-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/parso-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-server-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qdarkstyle-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/qtawesome-0.5.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-1.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-panels[python_targets_python3_9(-)] dev-python/pydata-sphinx-theme[python_targets_python3_9(-)] dev-python/sphinx-multiversion[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-panels[python_targets_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-)] dev-python/sphinx-multiversion[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The Scientific Python Development Environment
-EAPI=7
-HOMEPAGE=https://www.spyder-ide.org/ https://github.com/spyder-ide/spyder/ https://pypi.org/project/spyder/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/parso-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-server-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qdarkstyle-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/qtawesome-0.5.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-1.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spyder-ide/spyder/archive/v4.2.5.tar.gz -> spyder-4.2.5.tar.gz https://github.com/spyder-ide/spyder-docs/archive/78b25754c69a20643258821146e398ad5535c920.tar.gz -> spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz
-_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b optfeature cc13a38ea4d26565e83ef21d58bcd4ab python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 27f9a2f19502b925ac117bd657aa2979
-_md5_=1a59d01868de98cfa42688f0d21c01ae
diff --git a/metadata/md5-cache/dev-python/spyder-4.2.5-r2 b/metadata/md5-cache/dev-python/spyder-4.2.5-r2
new file mode 100644
index 000000000000..8e3e90b52832
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-4.2.5-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qdarkstyle-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/qtawesome-0.5.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-1.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-panels[python_targets_python3_9(-)] dev-python/pydata-sphinx-theme[python_targets_python3_9(-)] dev-python/sphinx-multiversion[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-panels[python_targets_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-)] dev-python/sphinx-multiversion[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Scientific Python Development Environment
+EAPI=7
+HOMEPAGE=https://www.spyder-ide.org/ https://github.com/spyder-ide/spyder/ https://pypi.org/project/spyder/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qdarkstyle-2.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/qtawesome-0.5.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-1.10.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spyder-ide/spyder/archive/v4.2.5.tar.gz -> spyder-4.2.5.tar.gz https://github.com/spyder-ide/spyder-docs/archive/78b25754c69a20643258821146e398ad5535c920.tar.gz -> spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz
+_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b optfeature cc13a38ea4d26565e83ef21d58bcd4ab python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 27f9a2f19502b925ac117bd657aa2979
+_md5_=7db6cdf630f316464e38a29a31d30c9d
diff --git a/metadata/md5-cache/dev-python/spyder-5.0.5 b/metadata/md5-cache/dev-python/spyder-5.0.5
deleted file mode 100644
index 407a584c435c..000000000000
--- a/metadata/md5-cache/dev-python/spyder-5.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/parso-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-server-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-2.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-panels[python_targets_python3_9(-)] dev-python/pydata-sphinx-theme[python_targets_python3_9(-)] dev-python/sphinx-multiversion[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-panels[python_targets_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-)] dev-python/sphinx-multiversion[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=The Scientific Python Development Environment
-EAPI=7
-HOMEPAGE=https://www.spyder-ide.org/ https://github.com/spyder-ide/spyder/ https://pypi.org/project/spyder/
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/jedi-0.17.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/parso-0.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-server-1.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-2.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/autopep8[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/flake8-3.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/mccabe-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pycodestyle-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pydocstyle-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyflakes-2.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/pylint-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/rope-0.10.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/yapf[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spyder-ide/spyder/archive/v5.0.5.tar.gz -> spyder-5.0.5.tar.gz https://github.com/spyder-ide/spyder-docs/archive/6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67.tar.gz -> spyder-docs-6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67.tar.gz
-_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b optfeature cc13a38ea4d26565e83ef21d58bcd4ab python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 27f9a2f19502b925ac117bd657aa2979
-_md5_=d19d56e0c00fca7ed4ffb0936d785ed4
diff --git a/metadata/md5-cache/dev-python/spyder-5.0.5-r1 b/metadata/md5-cache/dev-python/spyder-5.0.5-r1
new file mode 100644
index 000000000000..593c22f88180
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-5.0.5-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/matplotlib[tk,python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-2.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-panels[python_targets_python3_9(-)] dev-python/pydata-sphinx-theme[python_targets_python3_9(-)] dev-python/sphinx-multiversion[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-panels[python_targets_python3_8(-)] dev-python/pydata-sphinx-theme[python_targets_python3_8(-)] dev-python/sphinx-multiversion[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Scientific Python Development Environment
+EAPI=7
+HOMEPAGE=https://www.spyder-ide.org/ https://github.com/spyder-ide/spyder/ https://pypi.org/project/spyder/
+IUSE=test doc python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/chardet-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/cloudpickle-0.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-util/cookiecutter-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/diff-match-patch-20181111[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/intervaltree-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/ipython-7.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/jsonschema-3.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/keyring-17.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/nbconvert-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/numpydoc-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pexpect-4.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pickleshare-0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/psutil-5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pygments-2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pylint-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/python-lsp-black-1.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyls-spyder-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyxdg-0.26[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ~dev-python/qdarkstyle-3.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qstylizer-0.1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtawesome-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/qtconsole-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/QtPy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,pyqt5(+),svg,webengine] >=sci-libs/rtree-0.9.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/sphinx-0.6.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/spyder-kernels-2.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?] =dev-python/textdistance-4.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/three-merge-0.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/watchdog-0.10.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spyder-ide/spyder/archive/v5.0.5.tar.gz -> spyder-5.0.5.tar.gz https://github.com/spyder-ide/spyder-docs/archive/5eb83118155a3765de4a0f863b936bcbe73bb7aa.tar.gz -> spyder-docs-5eb83118155a3765de4a0f863b936bcbe73bb7aa.tar.gz
+_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b optfeature cc13a38ea4d26565e83ef21d58bcd4ab python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 27f9a2f19502b925ac117bd657aa2979
+_md5_=23d75cfb7c283e25b26635827dc21b6f
diff --git a/metadata/md5-cache/dev-python/tomli-1.0.4 b/metadata/md5-cache/dev-python/tomli-1.0.4
index 6ed7816f9936..aa270fe532f5 100644
--- a/metadata/md5-cache/dev-python/tomli-1.0.4
+++ b/metadata/md5-cache/dev-python/tomli-1.0.4
@@ -4,7 +4,7 @@ DESCRIPTION=A lil' TOML parser
EAPI=8
HOMEPAGE=https://pypi.org/project/tomli/ https://github.com/hukkin/tomli/
IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~hppa ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~hppa ~ppc64 ~riscv ~sparc ~x86
LICENSE=MIT
RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/hukkin/tomli/archive/1.0.4.tar.gz -> tomli-1.0.4.gh.tar.gz
_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=de7b1563a7feac48ffc79deb9324ca6b
+_md5_=468bb5cdddc54c0b84891bb5c81623a8
diff --git a/metadata/md5-cache/dev-python/vncdotool-1.0.0 b/metadata/md5-cache/dev-python/vncdotool-1.0.0
index 4dfc3fe4c40b..3fb96eb648ca 100644
--- a/metadata/md5-cache/dev-python/vncdotool-1.0.0
+++ b/metadata/md5-cache/dev-python/vncdotool-1.0.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/py[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/tox[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nose[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pluggy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ptyprocess[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tox[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/virtualenv[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/pytest-4.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) doc? ( || ( ( dev-lang/python:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
+DEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/twisted[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zope-interface[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
DESCRIPTION=Command line VNC client
EAPI=7
HOMEPAGE=https://github.com/sibson/vncdotool
-IUSE=test doc python_targets_python3_8 python_targets_python3_9
+IUSE=test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
KEYWORDS=amd64 x86
LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
+RDEPEND=python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) python_targets_python3_10? ( dev-lang/python:3.10 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=https://github.com/sibson/vncdotool/archive/v1.0.0.tar.gz -> vncdotool-1.0.0.tar.gz
_eclasses_=distutils-r1 943c17c3afd0f811ad36a0b5c8dedba9 eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 multibuild 05a584848db4901c97fcd94ae7cc3a97 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b python-r1 e20b80360497e6215aed0dd4ca7d6bad python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=2fb3f6bde7ce9dcd583c5efb70496a45
+_md5_=21fc876d035c98b18a6ec2b3309ee315
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 9a464ed14908..623b13251e17 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.0 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.0
deleted file mode 100644
index b7b1d1982f76..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/elasticsearch-api-6.8.0[ruby_targets_ruby25(-)] ~dev-ruby/elasticsearch-transport-6.8.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/elasticsearch-api-6.8.0[ruby_targets_ruby26(-)] ~dev-ruby/elasticsearch-transport-6.8.0[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby25(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby25(-)] dev-ruby/mocha:1.0[ruby_targets_ruby25(-)] dev-ruby/pry[ruby_targets_ruby25(-)] dev-ruby/shoulda-context[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby integrations for ES, elasticsearch module
-EAPI=6
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/elasticsearch-api-6.8.0[ruby_targets_ruby25(-)] ~dev-ruby/elasticsearch-transport-6.8.0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/elasticsearch-api-6.8.0[ruby_targets_ruby26(-)] ~dev-ruby/elasticsearch-transport-6.8.0[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=test
-SLOT=6
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.0.tar.gz -> elasticsearch-ruby-6.8.0.tar.gz
-_eclasses_=eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 estack 055c42df72f76a4f45ec92b35e83cd56 multilib 97566c1a256d07b00848aa767e38a352 ruby-fakegem 3e905d374dad540cd5fbc89cefca91c4 ruby-ng ab9b21d1b0a24b6afdd489885350e82e ruby-utils 08ae6f9c60b19aabce3f66a30cce9a2d toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=affd8182ee7aefa4684c12298664a4a8
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.2 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.2
deleted file mode 100644
index 0919e6201f91..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( ~dev-ruby/elasticsearch-api-6.8.2[ruby_targets_ruby25(-)] ~dev-ruby/elasticsearch-transport-6.8.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/elasticsearch-api-6.8.2[ruby_targets_ruby26(-)] ~dev-ruby/elasticsearch-transport-6.8.2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby25(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby25(-)] dev-ruby/mocha:1.0[ruby_targets_ruby25(-)] dev-ruby/pry[ruby_targets_ruby25(-)] dev-ruby/shoulda-context[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=Ruby integrations for ES, elasticsearch module
-EAPI=7
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( ~dev-ruby/elasticsearch-api-6.8.2[ruby_targets_ruby25(-)] ~dev-ruby/elasticsearch-transport-6.8.2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( ~dev-ruby/elasticsearch-api-6.8.2[ruby_targets_ruby26(-)] ~dev-ruby/elasticsearch-transport-6.8.2[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=test
-SLOT=6
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.2.tar.gz -> elasticsearch-ruby-6.8.2.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib 97566c1a256d07b00848aa767e38a352 ruby-fakegem 3e905d374dad540cd5fbc89cefca91c4 ruby-ng ab9b21d1b0a24b6afdd489885350e82e ruby-utils 08ae6f9c60b19aabce3f66a30cce9a2d toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=21a4977bce141e2abbdee5c84cdd913e
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
new file mode 100644
index 000000000000..359cf1abe3f5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-6.8.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( ~dev-ruby/elasticsearch-api-6.8.3[ruby_targets_ruby26(-)] ~dev-ruby/elasticsearch-transport-6.8.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/elasticsearch-api-6.8.3[ruby_targets_ruby27(-)] ~dev-ruby/elasticsearch-transport-6.8.3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby27(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby27(-)] dev-ruby/mocha:1.0[ruby_targets_ruby27(-)] dev-ruby/pry[ruby_targets_ruby27(-)] dev-ruby/shoulda-context[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Ruby integrations for ES, elasticsearch module
+EAPI=7
+HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby26? ( ~dev-ruby/elasticsearch-api-6.8.3[ruby_targets_ruby26(-)] ~dev-ruby/elasticsearch-transport-6.8.3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( ~dev-ruby/elasticsearch-api-6.8.3[ruby_targets_ruby27(-)] ~dev-ruby/elasticsearch-transport-6.8.3[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=test
+SLOT=6.8.3
+SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib 97566c1a256d07b00848aa767e38a352 ruby-fakegem 3e905d374dad540cd5fbc89cefca91c4 ruby-ng ab9b21d1b0a24b6afdd489885350e82e ruby-utils 08ae6f9c60b19aabce3f66a30cce9a2d toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
+_md5_=87c889ac73f63727b92711132344f9b3
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.0 b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.0
deleted file mode 100644
index fb730b8e3b07..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby25(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby25(-)] dev-ruby/mocha:1.0[ruby_targets_ruby25(-)] dev-ruby/pry[ruby_targets_ruby25(-)] dev-ruby/shoulda-context[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby integrations for ES, elasticsearch-api module
-EAPI=6
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.0.tar.gz -> elasticsearch-ruby-6.8.0.tar.gz
-_eclasses_=eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 estack 055c42df72f76a4f45ec92b35e83cd56 multilib 97566c1a256d07b00848aa767e38a352 ruby-fakegem 3e905d374dad540cd5fbc89cefca91c4 ruby-ng ab9b21d1b0a24b6afdd489885350e82e ruby-utils 08ae6f9c60b19aabce3f66a30cce9a2d toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=4abc425e6b6e34b474d6046a1f3c5e0a
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.2 b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.2
deleted file mode 100644
index 848a1364795a..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby25(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby25(-)] dev-ruby/mocha:1.0[ruby_targets_ruby25(-)] dev-ruby/pry[ruby_targets_ruby25(-)] dev-ruby/shoulda-context[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=Ruby integrations for ES, elasticsearch-api module
-EAPI=7
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.2.tar.gz -> elasticsearch-ruby-6.8.2.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib 97566c1a256d07b00848aa767e38a352 ruby-fakegem 3e905d374dad540cd5fbc89cefca91c4 ruby-ng ab9b21d1b0a24b6afdd489885350e82e ruby-utils 08ae6f9c60b19aabce3f66a30cce9a2d toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=38c33ebec7eb0cbad17f73b0388d7af2
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
new file mode 100644
index 000000000000..2529f206895b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-api-6.8.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/multi_json[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby27(-)] dev-ruby/elasticsearch-transport[ruby_targets_ruby27(-)] dev-ruby/mocha:1.0[ruby_targets_ruby27(-)] dev-ruby/pry[ruby_targets_ruby27(-)] dev-ruby/shoulda-context[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Ruby integrations for ES, elasticsearch-api module
+EAPI=7
+HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/multi_json[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=6.8.3
+SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib 97566c1a256d07b00848aa767e38a352 ruby-fakegem 3e905d374dad540cd5fbc89cefca91c4 ruby-ng ab9b21d1b0a24b6afdd489885350e82e ruby-utils 08ae6f9c60b19aabce3f66a30cce9a2d toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
+_md5_=4b2a4d01afcd155931d5c7803b9d05e4
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33 b/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
new file mode 100644
index 000000000000..e3152d0ad1b7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-extensions-0.0.33
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby26? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/ansi[ruby_targets_ruby27(-)] dev-ruby/elasticsearch[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[ruby_targets_ruby26(-)] dev-ruby/curb[ruby_targets_ruby26(-)] dev-ruby/patron[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha:1.0[ruby_targets_ruby27(-)] dev-ruby/pry[ruby_targets_ruby27(-)] dev-ruby/rspec:3[ruby_targets_ruby27(-)] dev-ruby/shoulda-context[ruby_targets_ruby27(-)] dev-ruby/curb[ruby_targets_ruby27(-)] dev-ruby/patron[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Ruby integrations for ES, elasticsearch-extensions module
+EAPI=8
+HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
+IUSE=test ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby26? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/elasticsearch[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/ansi[ruby_targets_ruby27(-)] dev-ruby/elasticsearch[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v0.0.33.tar.gz -> elasticsearch-ruby-0.0.33.tar.gz
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib 97566c1a256d07b00848aa767e38a352 ruby-fakegem 3e905d374dad540cd5fbc89cefca91c4 ruby-ng ab9b21d1b0a24b6afdd489885350e82e ruby-utils 08ae6f9c60b19aabce3f66a30cce9a2d toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
+_md5_=74566196413f25b46e728574bc3d60e1
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.0 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.0
deleted file mode 100644
index 05c0bc1a04fc..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/faraday:*[ruby_targets_ruby25(-)] dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/faraday:*[ruby_targets_ruby26(-)] dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby25(-)] dev-ruby/mocha:1.0[ruby_targets_ruby25(-)] dev-ruby/pry[ruby_targets_ruby25(-)] dev-ruby/shoulda-context[ruby_targets_ruby25(-)] dev-ruby/curb[ruby_targets_ruby25(-)] dev-ruby/patron[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[ruby_targets_ruby26(-)] dev-ruby/curb[ruby_targets_ruby26(-)] dev-ruby/patron[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DESCRIPTION=Ruby integrations for ES, elasticsearch-transport module
-EAPI=6
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/faraday:*[ruby_targets_ruby25(-)] dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/faraday:*[ruby_targets_ruby26(-)] dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.0.tar.gz -> elasticsearch-ruby-6.8.0.tar.gz
-_eclasses_=eapi7-ver 1a0a60ad07c8b32d2faba2d085dc0f24 estack 055c42df72f76a4f45ec92b35e83cd56 multilib 97566c1a256d07b00848aa767e38a352 ruby-fakegem 3e905d374dad540cd5fbc89cefca91c4 ruby-ng ab9b21d1b0a24b6afdd489885350e82e ruby-utils 08ae6f9c60b19aabce3f66a30cce9a2d toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=631ee35c9fbb1c0850194259797df689
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.2 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.2
deleted file mode 100644
index e7c7cd421df2..000000000000
--- a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/faraday:1[ruby_targets_ruby25(-)] dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/faraday:1[ruby_targets_ruby26(-)] dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/yard[ruby_targets_ruby25(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby25(-)] dev-ruby/mocha:1.0[ruby_targets_ruby25(-)] dev-ruby/pry[ruby_targets_ruby25(-)] dev-ruby/rspec:3[ruby_targets_ruby25(-)] dev-ruby/shoulda-context[ruby_targets_ruby25(-)] dev-ruby/curb[ruby_targets_ruby25(-)] dev-ruby/patron[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/yard[ruby_targets_ruby26(-)] ) test? ( dev-ruby/ansi[ruby_targets_ruby26(-)] dev-ruby/mocha:1.0[ruby_targets_ruby26(-)] dev-ruby/pry[ruby_targets_ruby26(-)] dev-ruby/rspec:3[ruby_targets_ruby26(-)] dev-ruby/shoulda-context[ruby_targets_ruby26(-)] dev-ruby/curb[ruby_targets_ruby26(-)] dev-ruby/patron[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] !!dev-ruby/psych[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] !!dev-ruby/psych[ruby_targets_ruby26(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-DESCRIPTION=Ruby integrations for ES, elasticsearch-transport module
-EAPI=7
-HOMEPAGE=https://github.com/elastic/elasticsearch-ruby
-IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/faraday:1[ruby_targets_ruby25(-)] dev-ruby/multi_json[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/faraday:1[ruby_targets_ruby26(-)] dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 )
-RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6
-SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.2.tar.gz -> elasticsearch-ruby-6.8.2.tar.gz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib 97566c1a256d07b00848aa767e38a352 ruby-fakegem 3e905d374dad540cd5fbc89cefca91c4 ruby-ng ab9b21d1b0a24b6afdd489885350e82e ruby-utils 08ae6f9c60b19aabce3f66a30cce9a2d toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=576c9d49e2eb5310115e39bd94da7798
diff --git a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3 b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
index 8dfd39585620..1b6517d11b5b 100644
--- a/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
+++ b/metadata/md5-cache/dev-ruby/elasticsearch-transport-6.8.3
@@ -10,7 +10,7 @@ LICENSE=Apache-2.0
RDEPEND=ruby_targets_ruby26? ( dev-ruby/faraday:1[ruby_targets_ruby26(-)] dev-ruby/multi_json[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/faraday:1[ruby_targets_ruby27(-)] dev-ruby/multi_json[ruby_targets_ruby27(-)] ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
REQUIRED_USE=|| ( ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
-SLOT=6
+SLOT=6.8.3
SRC_URI=https://github.com/elastic/elasticsearch-ruby/archive/v6.8.3.tar.gz -> elasticsearch-ruby-6.8.3.tar.gz
_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib 97566c1a256d07b00848aa767e38a352 ruby-fakegem 3e905d374dad540cd5fbc89cefca91c4 ruby-ng ab9b21d1b0a24b6afdd489885350e82e ruby-utils 08ae6f9c60b19aabce3f66a30cce9a2d toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=e587174e6155801a107c489c10e9ef10
+_md5_=af5fe2c4434c1f03d49c2f0d8f28d8c6
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index d2215e1b3a62..bd40c36b5b6f 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.99.1 b/metadata/md5-cache/net-analyzer/tcpdump-4.99.1
index 88ca3d25317d..0c2621482f71 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.99.1
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.99.1
@@ -5,7 +5,7 @@ DESCRIPTION=A tool for network monitoring and data acquisition
EAPI=7
HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump
IUSE=+drop-root +smi +ssl +samba suid test verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=net-libs/libpcap drop-root? ( acct-group/pcap acct-user/pcap sys-libs/libcap-ng ) smi? ( net-libs/libsmi ) ssl? ( >=dev-libs/openssl-0.9.6m:0= ) suid? ( acct-group/pcap acct-user/pcap )
REQUIRED_USE=test? ( samba )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://www.tcpdump.org/release/tcpdump-4.99.1.tar.gz -> tcpdump-4.99.1-upstream.tar.gz verify-sig? ( https://www.tcpdump.org/release/tcpdump-4.99.1.tar.gz.sig -> tcpdump-4.99.1-upstream.tar.gz.sig )
_eclasses_=autotools 2a36908d5f63f41614b450a2459567da gnuconfig 262062cef0ba4f22b397193da514a350 libtool 241a8f577b9781a42a7421e53448a44e multilib 97566c1a256d07b00848aa767e38a352 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa verify-sig 10c122d0f49c54100ad5e279db0cb43c
-_md5_=415c2d21b4fce5482f9a0be255d69a43
+_md5_=fbecdff09867f6c0e920b8003f0862e3
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 70e85643772e..efd78042b936 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/linuxptp-2.0-r1 b/metadata/md5-cache/net-misc/linuxptp-2.0-r1
index 9d50b260e1cc..d82b6841ad72 100644
--- a/metadata/md5-cache/net-misc/linuxptp-2.0-r1
+++ b/metadata/md5-cache/net-misc/linuxptp-2.0-r1
@@ -4,9 +4,9 @@ DESCRIPTION=The Linux Precision Time Protocol (PTP) implementation
EAPI=7
HOMEPAGE=http://linuxptp.sourceforge.net/
IUSE=kernel_linux
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/linuxptp/v2.0/linuxptp-2.0.tgz
_eclasses_=linux-info 7e8ed4c6a1d136fb291c52386f996c2c multilib 97566c1a256d07b00848aa767e38a352 systemd c846b9e02ac8293bfc9ca38a195c2a18 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa
-_md5_=a399cea3384607bb7c25ccbe73570864
+_md5_=2f33b78945ce03740e9cbdb913178164
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index c5a04cbfb33f..2c3d4a67437b 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/tor-0.4.6.6 b/metadata/md5-cache/net-vpn/tor-0.4.6.6
index 849250869287..7da81f4e3cb7 100644
--- a/metadata/md5-cache/net-vpn/tor-0.4.6.6
+++ b/metadata/md5-cache/net-vpn/tor-0.4.6.6
@@ -3,13 +3,13 @@ DEFINED_PHASES=configure install setup unpack
DEPEND=dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) test? ( dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) || ( dev-lang/python:3.9 dev-lang/python:3.8 ) )
DESCRIPTION=Anonymizing overlay network for TCP
EAPI=7
-HOMEPAGE=http://www.torproject.org/
+HOMEPAGE=https://www.torproject.org/
IUSE=caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos
LICENSE=BSD GPL-2
RDEPEND=acct-user/tor acct-group/tor dev-libs/libevent:=[ssl] sys-libs/zlib caps? ( sys-libs/libcap ) man? ( app-text/asciidoc ) dev-libs/openssl:0=[-bindist(-)] lzma? ( app-arch/xz-utils ) scrypt? ( app-crypt/libscrypt ) seccomp? ( >=sys-libs/libseccomp-2.4.1 ) systemd? ( sys-apps/systemd ) zstd? ( app-arch/zstd ) selinux? ( sec-policy/selinux-tor )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://www.torproject.org/dist/tor-0.4.6.6.tar.gz https://archive.torproject.org/tor-package-archive/tor-0.4.6.6.tar.gz verify-sig? ( https://dist.torproject.org/tor-0.4.6.6.tar.gz.asc )
_eclasses_=eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 multilib 97566c1a256d07b00848aa767e38a352 python-any-r1 901d9e22c7a848a1196502edf060f330 python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a readme.gentoo-r1 e51390d48521eb3d400db57d557b7530 strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 systemd c846b9e02ac8293bfc9ca38a195c2a18 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa verify-sig 10c122d0f49c54100ad5e279db0cb43c wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=b308993511cf8f95d79983a86d2ae5c5
+_md5_=410271a18f45a43259236ef55b337f89
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 53344ed99990..88f8229ea1c2 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.6.0 b/metadata/md5-cache/sys-cluster/hpx-1.6.0
deleted file mode 100644
index 6ab3c0e6b8d9..000000000000
--- a/metadata/md5-cache/sys-cluster/hpx-1.6.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] dev-python/breathe[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] dev-python/breathe[python_targets_python3_9(-)] ) ) test? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/boost:= sys-apps/hwloc sys-libs/zlib mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
-DESCRIPTION=C++ runtime system for parallel and distributed applications
-EAPI=7
-HOMEPAGE=https://stellar.cct.lsu.edu/tag/hpx/
-IUSE=doc examples jemalloc mpi papi +perftools tbb test python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Boost-1.0
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/boost:= sys-apps/hwloc sys-libs/zlib mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ?? ( jemalloc perftools tbb )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/STEllAR-GROUP/hpx/archive/1.6.0.tar.gz -> hpx-1.6.0.tar.gz
-_eclasses_=check-reqs 97b90bd8fb799993925e6b3a683184e5 cmake 518e4c9a6a38dfd7afc54b6a7c5de3da eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils a4dab848a4490e8e48cf0baab3e61bc2 python-single-r1 73f113f91928e0d16bceb65ecbcd8e75 python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils 27f9a2f19502b925ac117bd657aa2979
-_md5_=5678518efdb078cd308e78c7a7ad8248
diff --git a/metadata/md5-cache/sys-cluster/hpx-1.7.0 b/metadata/md5-cache/sys-cluster/hpx-1.7.0
new file mode 100644
index 000000000000..6f4917e853e9
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/hpx-1.7.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-cpp/asio dev-libs/boost:= sys-apps/hwloc sys-libs/zlib jemalloc? ( dev-libs/jemalloc ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
+DESCRIPTION=C++ runtime system for parallel and distributed applications
+EAPI=7
+HOMEPAGE=https://stellar.cct.lsu.edu/tag/hpx/
+IUSE=examples jemalloc mpi papi +perftools tbb python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Boost-1.0
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-cpp/asio dev-libs/boost:= sys-apps/hwloc sys-libs/zlib jemalloc? ( dev-libs/jemalloc ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ?? ( jemalloc perftools tbb )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/STEllAR-GROUP/hpx/archive/1.7.0.tar.gz -> hpx-1.7.0.tar.gz
+_eclasses_=check-reqs 97b90bd8fb799993925e6b3a683184e5 cmake 518e4c9a6a38dfd7afc54b6a7c5de3da eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils a4dab848a4490e8e48cf0baab3e61bc2 python-single-r1 73f113f91928e0d16bceb65ecbcd8e75 python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils 27f9a2f19502b925ac117bd657aa2979
+_md5_=b8f67e4cc103e10b74fb666cf13aa647
diff --git a/metadata/md5-cache/sys-cluster/hpx-9999 b/metadata/md5-cache/sys-cluster/hpx-9999
index 085815b1c7db..52ecc7a01cb0 100644
--- a/metadata/md5-cache/sys-cluster/hpx-9999
+++ b/metadata/md5-cache/sys-cluster/hpx-9999
@@ -1,15 +1,15 @@
-BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) app-doc/doxygen python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] >=dev-python/breathe-4.22[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] >=dev-python/breathe-4.22[python_targets_python3_9(-)] ) ) test? ( python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) ) >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/boost:= sys-apps/hwloc sys-libs/zlib mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
+DEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-cpp/asio dev-libs/boost:= sys-apps/hwloc sys-libs/zlib jemalloc? ( dev-libs/jemalloc ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
DESCRIPTION=C++ runtime system for parallel and distributed applications
EAPI=7
HOMEPAGE=https://stellar.cct.lsu.edu/tag/hpx/
-IUSE=doc examples jemalloc mpi papi +perftools tbb test python_single_target_python3_8 python_single_target_python3_9
+IUSE=examples jemalloc mpi papi +perftools tbb python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
LICENSE=Boost-1.0
PROPERTIES=live
-RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) dev-libs/boost:= sys-apps/hwloc sys-libs/zlib mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 ) ?? ( jemalloc perftools tbb )
-RESTRICT=!test? ( test )
+RDEPEND=python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_9? ( dev-lang/python:3.9 >=dev-lang/python-exec-2:=[python_targets_python3_9] ) python_single_target_python3_10? ( dev-lang/python:3.10 >=dev-lang/python-exec-2:=[python_targets_python3_10] ) dev-cpp/asio dev-libs/boost:= sys-apps/hwloc sys-libs/zlib jemalloc? ( dev-libs/jemalloc ) mpi? ( virtual/mpi ) papi? ( dev-libs/papi ) perftools? ( dev-util/google-perftools ) tbb? ( dev-cpp/tbb )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ?? ( jemalloc perftools tbb )
+RESTRICT=test
SLOT=0
_eclasses_=check-reqs 97b90bd8fb799993925e6b3a683184e5 cmake 518e4c9a6a38dfd7afc54b6a7c5de3da eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 git-r3 cc875b0c1e9b3bdac1af0f82f3ba29da multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b ninja-utils a4dab848a4490e8e48cf0baab3e61bc2 python-single-r1 73f113f91928e0d16bceb65ecbcd8e75 python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils 27f9a2f19502b925ac117bd657aa2979
-_md5_=43345b0455ccc774664404db9073023e
+_md5_=f22f4b3b5d7d7d9209a09881e34d5269
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 950881229fcb..cf780028e0d1 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index db7f42f23b9d..405c7769ce0d 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -1,6 +1,6 @@
-BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=app-misc/pax-utils-0.1.10 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=|| ( dev-lang/python:3.10 dev-lang/python:3.9 dev-lang/python:3.8 ) >=app-misc/pax-utils-1.3.3 sys-devel/bison doc? ( sys-apps/texinfo ) !compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) >=sys-devel/binutils-2.27 >=sys-devel/gcc-6 sys-devel/gnuconfig virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup test unpack
-DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !=net-dns/libidn2-2.3.0 ) virtual/os-headers
+DEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) compile-locales? ( app-arch/gzip sys-apps/grep virtual/awk ) test? ( >=net-dns/libidn2-2.3.0 ) virtual/os-headers
DESCRIPTION=GNU libc C library
EAPI=7
HOMEPAGE=https://www.gnu.org/software/libc/
@@ -8,9 +8,9 @@ IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd headers-only +mu
LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
PDEPEND=!vanilla? ( sys-libs/timezone-data )
PROPERTIES=live
-RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
+RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
RESTRICT=!test? ( test )
SLOT=2.2
SRC_URI=https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.10.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz )
_eclasses_=eapi8-dosym cd7d420bb5be5ee079f27239ce76b8f5 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils dab5d8ec471d025b79c9e6906bcf3bff flag-o-matic 4134b5c0fb719b9161d10bdaba9e09e5 git-r3 cc875b0c1e9b3bdac1af0f82f3ba29da gnuconfig 262062cef0ba4f22b397193da514a350 multilib 97566c1a256d07b00848aa767e38a352 multiprocessing 61c959fc55c15c00bbb1079d6a71370b prefix d04f14b297013ad1410550c0757f14f8 preserve-libs dbc9f8d2d49c66467bc327fddd8317bd python-any-r1 901d9e22c7a848a1196502edf060f330 python-utils-r1 2f5967e7ced9abfa71ff7b0ea8d61b3a strip-linguas ac3ee41ee2d31d8c41a77c0838320cc7 systemd c846b9e02ac8293bfc9ca38a195c2a18 tmpfiles 5cd6e8cf3288d5b19ff8b5c78c7e3e31 toolchain-funcs 9ea1c67b6f8315fdc2568abb674519aa wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=39a476ca3c8c7f01f2e9c8695d5c64ac
+_md5_=1890b0a62b1b6ca277df74914012d843
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9ee6dadb78ac..3193ea77621f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 23 Jul 2021 09:08:57 +0000
+Fri, 23 Jul 2021 15:08:57 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 7d8c3198a5fb..db2186d3c89e 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jul 23 09:08:57 AM UTC 2021
+Fri Jul 23 03:08:57 PM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b566bdd9f98b..0b45279b388b 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 23 Jul 2021 09:30:01 +0000
+Fri, 23 Jul 2021 15:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 9084b2e9b6bc..9a6a413b8340 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-0905548eebcd16b69d9a2bf60750d992bef7cd1a 1627028007 2021-07-23T08:13:27+00:00
+e48ee3989f782cd7d47e104d35c6fd773605b26d 1627052169 2021-07-23T14:56:09+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 63391236f12e..2e864d6842ed 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1627031101 Fri 23 Jul 2021 09:05:01 AM UTC
+1627052701 Fri 23 Jul 2021 03:05:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 9ee6dadb78ac..3193ea77621f 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 23 Jul 2021 09:08:57 +0000
+Fri, 23 Jul 2021 15:08:57 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 21037017710d..85c0079e0a98 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
index d23c0f647d4e..722dbc5dde2e 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
@@ -21,7 +21,7 @@ else
SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
fi
LICENSE="BSD"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index bb2e09ba2b17..eb18f7a6652e 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild b/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
index 6594c946478c..0739195533e5 100644
--- a/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
+++ b/net-misc/linuxptp/linuxptp-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/v${PV}/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
IUSE=""
DEPEND=""
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index 0be0ce9c613f..b467f86a7a6a 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/tor/tor-0.4.6.6.ebuild b/net-vpn/tor/tor-0.4.6.6.ebuild
index 5b9be817185e..a02b230e9c79 100644
--- a/net-vpn/tor/tor-0.4.6.6.ebuild
+++ b/net-vpn/tor/tor-0.4.6.6.ebuild
@@ -3,13 +3,13 @@
EAPI="7"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
inherit flag-o-matic python-any-r1 readme.gentoo-r1 systemd verify-sig
MY_PV="$(ver_rs 4 -)"
MY_PF="${PN}-${MY_PV}"
DESCRIPTION="Anonymizing overlay network for TCP"
-HOMEPAGE="http://www.torproject.org/"
+HOMEPAGE="https://www.torproject.org/"
SRC_URI="https://www.torproject.org/dist/${MY_PF}.tar.gz
https://archive.torproject.org/tor-package-archive/${MY_PF}.tar.gz
verify-sig? ( https://dist.torproject.org/${MY_PF}.tar.gz.asc )"
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PF}"
LICENSE="BSD GPL-2"
SLOT="0"
if [[ ${PV} != *_alpha* && ${PV} != *_beta* && ${PV} != *_rc* ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~ppc-macos"
+ KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86 ~ppc-macos"
fi
IUSE="caps doc lzma +man scrypt seccomp selinux +server systemd tor-hardening test zstd"
VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/torproject.org.asc
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 2bb9a7bfa6d8..f5b9fd99641f 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/updates/3Q-2021 b/profiles/updates/3Q-2021
index 63985611d0fe..d256eeddfc0f 100644
--- a/profiles/updates/3Q-2021
+++ b/profiles/updates/3Q-2021
@@ -1 +1,2 @@
move media-sound/zam-plugins media-plugins/zam-plugins
+slotmove =dev-ruby/elasticsearch-transport-6.8.3 6 6.8.3
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index ac3f6ba3a2b6..1da43c595bc1 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2484,6 +2484,7 @@ dev-python/pyside2:widgets - Build QtWidgets module
dev-python/pyside2:x11extras - Build QtX11Extras module
dev-python/pyside2:xml - Build QtXml module
dev-python/pyside2:xmlpatterns - Build QtXmlPatterns module
+dev-python/python-lsp-server:all-plugins - Pull in all optional plugins
dev-python/python-mpd:twisted - Enable twisted support
dev-python/python-stdnum:vies - Enable VIES
dev-python/pyudev:qt5 - Install PyQt5 bindings
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 457cf410dca6..ad0a4c24b6fe 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/hpx/Manifest b/sys-cluster/hpx/Manifest
index 3cdb83c4d054..e89c5667bf2e 100644
--- a/sys-cluster/hpx/Manifest
+++ b/sys-cluster/hpx/Manifest
@@ -1 +1 @@
-DIST hpx-1.6.0.tar.gz 4596486 BLAKE2B e19d88d70d3dec45536b4f174bc1bae49285bde3db37517381071bec318748913ff239c66f02acb15451dc2f38a7799e9424fc5269851478b33da81654bd6c16 SHA512 cd717db3812fc26117d72c8afa654972b16f7059d8e6965484edd938788f3369fcd5ca791eee80e803703d6f3c39b3a3cd0525ab9f58ff1312e1b49f06ce67bc
+DIST hpx-1.7.0.tar.gz 4729879 BLAKE2B 05be1461eb0867b690a8f34a7ddf46d4fa19e05b5666df6cf5a3dfd28fa6a6ecacf6305bf2eaa42a669f18264b61c9690988695b8748ba09a27011001b543952 SHA512 052b3278710d8047c8e0e0979a668aa5161c495fcd12b089dd5039c64bd414b4ec0b96dfcd414d68e0db5b31c360dffb84374413c53794f37ce77d9cabc89518
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch b/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch
deleted file mode 100644
index 646084e77294..000000000000
--- a/sys-cluster/hpx/files/hpx-1.6.0-cmake.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 240f55e4bc57215e26fc0b0ae0ac0eca2eb93d65 Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach
-Date: Sat, 19 Sep 2020 13:19:42 +0200
-Subject: [PATCH 2/3] tests: Remove unused cmake options
-
-This fixes the following warnings:
-
-| * One or more CMake variables were not used by the project:
-| * BOOST_ROOT
-| * SETUP_TYPE
-
-Signed-off-by: Kurt Kanzenbach
----
- tests/unit/build/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/unit/build/CMakeLists.txt b/tests/unit/build/CMakeLists.txt
-index 3798549da0a8..7d3bfea1044e 100644
---- a/tests/unit/build/CMakeLists.txt
-+++ b/tests/unit/build/CMakeLists.txt
-@@ -54,7 +54,7 @@ function(create_cmake_test name using_install_dir hpx_dir setup_type test_dir)
- ${name}.make_configure
- COMMAND
- "${CMAKE_COMMAND}" -E chdir "${build_dir}" "${CMAKE_COMMAND}" ${test_dir}
-- -DHPX_DIR=${hpx_dir} -DBOOST_ROOT=${BOOST_ROOT}
-+ -DHPX_DIR=${hpx_dir}
- ${ADDITIONAL_CMAKE_OPTIONS} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS_SAFE}
- -DCMAKE_BUILD_TYPE=$
- VERBATIM
---
-2.30.1
-
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-docs.patch b/sys-cluster/hpx/files/hpx-1.6.0-docs.patch
deleted file mode 100644
index 3823bab918bd..000000000000
--- a/sys-cluster/hpx/files/hpx-1.6.0-docs.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 1de9f65fac6c4b65ff280501d60b9b6dd46c6a8c Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach
-Date: Mon, 22 Feb 2021 20:36:14 +0100
-Subject: [PATCH 3/3] static_reinit: Remove export macro
-
-This macro leads to doc generation fail:
-
-|/home/kurt/git/hpx/build/docs/sphinx/libs/static_reinit/api.rst:29: WARNING:cpp:identifier reference target not found: HPX_EXPORT_REINITIALIZABLE_STATIC
-
-... and it results in an exception in sphinx:
-
-|Traceback (most recent call last):
-| File "/usr/lib/python3.7/site-packages/sphinx/cmd/build.py", line 280, in build_main
-| app.build(args.force_all, filenames)
-| File "/usr/lib/python3.7/site-packages/sphinx/application.py", line 348, in build
-| self.builder.build_update()
-| File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 299, in build_update
-| len(to_build))
-| File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 361, in build
-| self.write(docnames, list(updated_docnames), method)
-| File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 535, in write
-| self._write_serial(sorted(docnames))
-| File "/usr/lib/python3.7/site-packages/sphinx/builders/__init__.py", line 542, in _write_serial
-| doctree = self.env.get_and_resolve_doctree(docname, self)
-| File "/usr/lib/python3.7/site-packages/sphinx/environment/__init__.py", line 539, in get_and_resolve_doctree
-| self.apply_post_transforms(doctree, docname)
-| File "/usr/lib/python3.7/site-packages/sphinx/environment/__init__.py", line 585, in apply_post_transforms
-| transformer.apply_transforms()
-| File "/usr/lib/python3.7/site-packages/sphinx/transforms/__init__.py", line 87, in apply_transforms
-| super().apply_transforms()
-| File "/usr/lib/python3.7/site-packages/docutils/transforms/__init__.py", line 171, in apply_transforms
-| transform.apply(**kwargs)
-| File "/usr/lib/python3.7/site-packages/sphinx/transforms/post_transforms/__init__.py", line 44, in apply
-| self.run(**kwargs)
-| File "/usr/lib/python3.7/site-packages/sphinx/transforms/post_transforms/__init__.py", line 88, in run
-| typ, target, node, contnode)
-| File "/usr/lib/python3.7/site-packages/sphinx/domains/cpp.py", line 7502, in resolve_xref
-| target, node, contnode)[0]
-| File "/usr/lib/python3.7/site-packages/sphinx/domains/cpp.py", line 7375, in _resolve_xref_inner
-| assert parentSymbol # should be there
-|AssertionError
-
-Actually the macro is not needed. So, just remove it until sphinx is fixed.
-
-Signed-off-by: Kurt Kanzenbach
----
- .../hpx/static_reinit/reinitializable_static.hpp | 14 ++------------
- 1 file changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp b/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
-index 51ccbf2481b2..b8661d1c84cb 100644
---- a/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
-+++ b/libs/core/static_reinit/include/hpx/static_reinit/reinitializable_static.hpp
-@@ -18,14 +18,6 @@
- #include
- #include
-
--// clang-format off
--#if !defined(HPX_WINDOWS)
--# define HPX_EXPORT_REINITIALIZABLE_STATIC HPX_CORE_EXPORT
--#else
--# define HPX_EXPORT_REINITIALIZABLE_STATIC
--#endif
--// clang-format on
--
- namespace hpx { namespace util {
- ///////////////////////////////////////////////////////////////////////////
- // Provides thread-safe initialization of a single static instance of T.
-@@ -40,11 +32,11 @@ namespace hpx { namespace util {
- // functions used by the HPX runtime system to reinitialize the held data
- // structures.
- template
-- struct HPX_EXPORT_REINITIALIZABLE_STATIC reinitializable_static;
-+ struct HPX_EXPORT reinitializable_static;
-
- //////////////////////////////////////////////////////////////////////////
- template
-- struct HPX_EXPORT_REINITIALIZABLE_STATIC reinitializable_static
-+ struct HPX_EXPORT reinitializable_static
- {
- public:
- HPX_NON_COPYABLE(reinitializable_static);
-@@ -160,5 +152,3 @@ namespace hpx { namespace util {
- template
- std::once_flag reinitializable_static::constructed_;
- }} // namespace hpx::util
--
--#undef HPX_EXPORT_REINITIALIZABLE_STATIC
---
-2.30.1
-
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-tests.patch b/sys-cluster/hpx/files/hpx-1.6.0-tests.patch
deleted file mode 100644
index 8a6884a57a1b..000000000000
--- a/sys-cluster/hpx/files/hpx-1.6.0-tests.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From e350546da5caee062684548b6727f4cb67981b7e Mon Sep 17 00:00:00 2001
-From: Kurt Kanzenbach
-Date: Fri, 26 Feb 2021 18:28:14 +0100
-Subject: [PATCH] test: Disable failing tests
-
-The following tests fail within portage:
-
-|199 - tests.unit.modules.async_mpi.mpi_ring_async_executor (Timeout)
-|250 - tests.unit.modules.compute.numa_allocator (Failed)
-|268 - tests.regressions.modules.performance_counters.dynamic_counters_loaded_1508 (Failed)
-|318 - tests.unit.modules.segmented_algorithms.distributed.tcp.partitioned_vector_adjacent_find2
-|967 - tests.unit.parcelset.distributed.mpi.put_parcels_with_coalescing (Timeout)
-|968 - tests.unit.parcelset.distributed.tcp.put_parcels_with_coalescing (Failed)
-
-Disable them.
-
-Signed-off-by: Kurt Kanzenbach
----
- libs/full/async_mpi/tests/unit/CMakeLists.txt | 2 +-
- libs/full/compute/tests/unit/CMakeLists.txt | 6 +++---
- .../tests/regressions/CMakeLists.txt | 8 ++++----
- .../segmented_algorithms/tests/unit/CMakeLists.txt | 2 +-
- tests/unit/parcelset/CMakeLists.txt | 14 +++++++-------
- 5 files changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/libs/full/async_mpi/tests/unit/CMakeLists.txt b/libs/full/async_mpi/tests/unit/CMakeLists.txt
-index 8f2d77fc3567..9cd7d39597b3 100644
---- a/libs/full/async_mpi/tests/unit/CMakeLists.txt
-+++ b/libs/full/async_mpi/tests/unit/CMakeLists.txt
-@@ -4,7 +4,7 @@
- # Distributed under the Boost Software License, Version 1.0. (See accompanying
- # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-
--set(tests mpi_ring_async_executor)
-+# set(tests mpi_ring_async_executor)
-
- set(mpi_ring_async_executor_PARAMETERS THREADS_PER_LOCALITY 4 LOCALITIES 2
- RUNWRAPPER mpi
-diff --git a/libs/full/compute/tests/unit/CMakeLists.txt b/libs/full/compute/tests/unit/CMakeLists.txt
-index 7c700d5ae639..c655772234b8 100644
---- a/libs/full/compute/tests/unit/CMakeLists.txt
-+++ b/libs/full/compute/tests/unit/CMakeLists.txt
-@@ -7,9 +7,9 @@
-
- set(tests block_allocator)
-
--if(HPX_WITH_DISTRIBUTED_RUNTIME AND HPX_WITH_SHARED_PRIORITY_SCHEDULER)
-- set(tests ${tests} numa_allocator)
--endif()
-+# if(HPX_WITH_DISTRIBUTED_RUNTIME AND HPX_WITH_SHARED_PRIORITY_SCHEDULER)
-+# set(tests ${tests} numa_allocator)
-+# endif()
-
- # NB. threads = -2 = threads = 'cores' NB. threads = -1 = threads = 'all'
- set(numa_allocator_PARAMETERS
-diff --git a/libs/full/performance_counters/tests/regressions/CMakeLists.txt b/libs/full/performance_counters/tests/regressions/CMakeLists.txt
-index 9939ef701e3b..f0647b27a2dc 100644
---- a/libs/full/performance_counters/tests/regressions/CMakeLists.txt
-+++ b/libs/full/performance_counters/tests/regressions/CMakeLists.txt
-@@ -7,10 +7,10 @@
-
- set(tests discover_counters_1787 statistics_2666 uptime_1737)
-
--if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-- set(tests ${tests} dynamic_counters_loaded_1508)
-- set(dynamic_counters_loaded_1508_FLAGS DEPENDENCIES memory_component)
--endif()
-+# if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+# set(tests ${tests} dynamic_counters_loaded_1508)
-+# set(dynamic_counters_loaded_1508_FLAGS DEPENDENCIES memory_component)
-+# endif()
-
- foreach(test ${tests})
- set(sources ${test}.cpp)
-diff --git a/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt b/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt
-index 7cfd7e596de5..b35c1de7ac94 100644
---- a/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt
-+++ b/libs/full/segmented_algorithms/tests/unit/CMakeLists.txt
-@@ -8,7 +8,7 @@ set(tests
- partitioned_vector_adjacent_difference1
- partitioned_vector_adjacent_difference2
- partitioned_vector_adjacent_find1
-- partitioned_vector_adjacent_find2
-+ # partitioned_vector_adjacent_find2
- partitioned_vector_all_of1
- partitioned_vector_all_of2
- partitioned_vector_any_of1
-diff --git a/tests/unit/parcelset/CMakeLists.txt b/tests/unit/parcelset/CMakeLists.txt
-index 1981e2baf8cd..b374292ceee7 100644
---- a/tests/unit/parcelset/CMakeLists.txt
-+++ b/tests/unit/parcelset/CMakeLists.txt
-@@ -12,13 +12,13 @@ set(put_parcels_PARAMETERS LOCALITIES 2)
- set(put_parcels_FLAGS DEPENDENCIES iostreams_component)
- set(set_parcel_write_handler_PARAMETERS LOCALITIES 2)
-
--if(HPX_WITH_PARCEL_COALESCING)
-- set(tests ${tests} put_parcels_with_coalescing)
-- set(put_parcels_with_coalescing_PARAMETERS LOCALITIES 2)
-- set(put_parcels_with_coalescing_FLAGS DEPENDENCIES iostreams_component
-- parcel_coalescing
-- )
--endif()
-+# if(HPX_WITH_PARCEL_COALESCING)
-+# set(tests ${tests} put_parcels_with_coalescing)
-+# set(put_parcels_with_coalescing_PARAMETERS LOCALITIES 2)
-+# set(put_parcels_with_coalescing_FLAGS DEPENDENCIES iostreams_component
-+# parcel_coalescing
-+# )
-+# endif()
-
- if(HPX_WITH_COMPRESSION_BZIP2
- OR HPX_WITH_COMPRESSION_ZLIB
---
-2.30.1
-
diff --git a/sys-cluster/hpx/files/hpx-1.6.0-python.patch b/sys-cluster/hpx/files/hpx-1.7.0-python.patch
similarity index 66%
rename from sys-cluster/hpx/files/hpx-1.6.0-python.patch
rename to sys-cluster/hpx/files/hpx-1.7.0-python.patch
index 412e7289bc5b..21b7ce3ceeff 100644
--- a/sys-cluster/hpx/files/hpx-1.6.0-python.patch
+++ b/sys-cluster/hpx/files/hpx-1.7.0-python.patch
@@ -1,19 +1,17 @@
From 3d8d3acf0daad9cec8b092d67f7187265f7704e3 Mon Sep 17 00:00:00 2001
From: Kurt Kanzenbach
Date: Tue, 17 Mar 2020 16:20:35 +0100
-Subject: [PATCH 1/3] cmake: python: Use standard python interpreter
+Subject: [PATCH 1/4] cmake: python: Use standard python interpreter
These scripts are needed during build and run time. So, use a python interpreter
which works for both cases.
Signed-off-by: Kurt Kanzenbach
---
- cmake/templates/hpxcxx.in | 2 +-
- cmake/templates/hpxrun.py.in | 2 +-
+ cmake/templates/hpxcxx.in | 2 +-
+ cmake/templates/hpxrun.py.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-diff --git a/cmake/templates/hpxcxx.in b/cmake/templates/hpxcxx.in
-index 81f38f89367d..a0fd7837b066 100755
--- a/cmake/templates/hpxcxx.in
+++ b/cmake/templates/hpxcxx.in
@@ -1,4 +1,4 @@
@@ -22,8 +20,6 @@ index 81f38f89367d..a0fd7837b066 100755
#
# Copyright (c) 2014 Steven R. Brandt
#
-diff --git a/cmake/templates/hpxrun.py.in b/cmake/templates/hpxrun.py.in
-index 60e59cc118d9..0c32bba98917 100755
--- a/cmake/templates/hpxrun.py.in
+++ b/cmake/templates/hpxrun.py.in
@@ -1,4 +1,4 @@
@@ -32,6 +28,3 @@ index 60e59cc118d9..0c32bba98917 100755
#
# Copyright (c) 2014 Thomas Heller
#
---
-2.30.1
-
diff --git a/sys-cluster/hpx/hpx-1.6.0.ebuild b/sys-cluster/hpx/hpx-1.7.0.ebuild
similarity index 76%
rename from sys-cluster/hpx/hpx-1.6.0.ebuild
rename to sys-cluster/hpx/hpx-1.7.0.ebuild
index 6f139b5d3842..2ab8ea741f30 100644
--- a/sys-cluster/hpx/hpx-1.6.0.ebuild
+++ b/sys-cluster/hpx/hpx-1.7.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
if [[ ${PV} == 9999 ]] ; then
inherit git-r3
@@ -19,8 +19,9 @@ HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
SLOT="0"
LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc mpi papi +perftools tbb test"
-RESTRICT="!test? ( test )"
+IUSE="examples jemalloc mpi papi +perftools tbb"
+# tests fail to compile
+RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -29,22 +30,14 @@ REQUIRED_USE="
BDEPEND="
virtual/pkgconfig
- doc? (
- ${PYTHON_DEPS}
- app-doc/doxygen
- $(python_gen_cond_dep '
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
- dev-python/breathe[${PYTHON_USEDEP}]
- ')
- )
- test? ( ${PYTHON_DEPS} )
"
RDEPEND="
${PYTHON_DEPS}
+ dev-cpp/asio
dev-libs/boost:=
sys-apps/hwloc
sys-libs/zlib
+ jemalloc? ( dev-libs/jemalloc )
mpi? ( virtual/mpi )
papi? ( dev-libs/papi )
perftools? ( dev-util/google-perftools )
@@ -53,10 +46,7 @@ RDEPEND="
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-docs.patch"
"${FILESDIR}/${P}-python.patch"
- "${FILESDIR}/${P}-tests.patch"
)
hpx_memory_requirement() {
@@ -84,11 +74,11 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
-DHPX_WITH_EXAMPLES=OFF
- -DHPX_WITH_DOCUMENTATION=$(usex doc)
+ -DHPX_WITH_DOCUMENTATION=OFF
-DHPX_WITH_PARCELPORT_MPI=$(usex mpi)
-DHPX_WITH_PAPI=$(usex papi)
-DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
- -DBUILD_TESTING=$(usex test)
+ -DBUILD_TESTING=OFF
)
if use jemalloc; then
mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc )
@@ -105,12 +95,6 @@ src_configure() {
src_compile() {
cmake_src_compile
- use test && cmake_build tests
-}
-
-src_test() {
- # avoid over-suscribing
- cmake_src_test -j1
}
src_install() {
diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild
index 32de06bd0843..7f80474d33a5 100644
--- a/sys-cluster/hpx/hpx-9999.ebuild
+++ b/sys-cluster/hpx/hpx-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
if [[ ${PV} == 9999 ]] ; then
inherit git-r3
@@ -19,8 +19,9 @@ HOMEPAGE="https://stellar.cct.lsu.edu/tag/hpx/"
SLOT="0"
LICENSE="Boost-1.0"
-IUSE="doc examples jemalloc mpi papi +perftools tbb test"
-RESTRICT="!test? ( test )"
+IUSE="examples jemalloc mpi papi +perftools tbb"
+# tests fail to compile
+RESTRICT="test"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -29,22 +30,14 @@ REQUIRED_USE="
BDEPEND="
virtual/pkgconfig
- doc? (
- ${PYTHON_DEPS}
- app-doc/doxygen
- $(python_gen_cond_dep '
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
- >=dev-python/breathe-4.22[${PYTHON_USEDEP}]
- ')
- )
- test? ( ${PYTHON_DEPS} )
"
RDEPEND="
${PYTHON_DEPS}
+ dev-cpp/asio
dev-libs/boost:=
sys-apps/hwloc
sys-libs/zlib
+ jemalloc? ( dev-libs/jemalloc )
mpi? ( virtual/mpi )
papi? ( dev-libs/papi )
perftools? ( dev-util/google-perftools )
@@ -77,11 +70,11 @@ pkg_setup() {
src_configure() {
local mycmakeargs=(
-DHPX_WITH_EXAMPLES=OFF
- -DHPX_WITH_DOCUMENTATION=$(usex doc)
+ -DHPX_WITH_DOCUMENTATION=OFF
-DHPX_WITH_PARCELPORT_MPI=$(usex mpi)
-DHPX_WITH_PAPI=$(usex papi)
-DHPX_WITH_GOOGLE_PERFTOOLS=$(usex perftools)
- -DBUILD_TESTING=$(usex test)
+ -DBUILD_TESTING=OFF
)
if use jemalloc; then
mycmakeargs+=( -DHPX_WITH_MALLOC=jemalloc )
@@ -98,12 +91,6 @@ src_configure() {
src_compile() {
cmake_src_compile
- use test && cmake_build tests
-}
-
-src_test() {
- # avoid over-suscribing
- cmake_src_test -j1
}
src_install() {
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 9d743290913f..130ed301bfef 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index f4d9edbe46d2..5e67473853cd 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -95,7 +95,7 @@ fi
BDEPEND="
${PYTHON_DEPS}
- >=app-misc/pax-utils-0.1.10
+ >=app-misc/pax-utils-1.3.3
sys-devel/bison
doc? ( sys-apps/texinfo )
!compile-locales? (
@@ -113,7 +113,6 @@ COMMON_DEPEND="
suid? ( caps? ( sys-libs/libcap ) )
selinux? ( sys-libs/libselinux )
systemtap? ( dev-util/systemtap )
- !