diff --git a/Manifest.files.gz b/Manifest.files.gz
index 21c7c1fcb557..84eec25e809d 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 4e5052c2824f..fdd5875f0d9a 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/crontab/Manifest b/acct-group/crontab/Manifest
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/acct-group/crontab/crontab-0.ebuild b/acct-group/crontab/crontab-0.ebuild
new file mode 100644
index 000000000000..d8765962fb79
--- /dev/null
+++ b/acct-group/crontab/crontab-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=460
diff --git a/acct-group/crontab/metadata.xml b/acct-group/crontab/metadata.xml
new file mode 100644
index 000000000000..95aa13f6c5ef
--- /dev/null
+++ b/acct-group/crontab/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ polynomial-c@gentoo.org
+ Lars Wendler
+
+
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index dad9783e875c..4e1b4ff054f5 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index 4b4e219b2b7e..a41b0c7681fe 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,2 +1,3 @@
DIST ansible-base-2.10.4.tar.gz 5708083 BLAKE2B dcae17dd84dd1985703bf55bffd4a7907ecf072fcc52c76633fd2fc1d3461901b284002f69ce542ab8447f7aa6a2f65ff4c9abca1a7c1c8df3ad69a4179b1c33 SHA512 50dcccc0b40f47590d3ea56907f987bddbb858952b0d6a999db0b706232a571037dc31e66a773370be57ca14d11a7091c53a480d7f3cecf4a5e7f91895661100
DIST ansible-base-2.10.5.tar.gz 5714628 BLAKE2B 28860023f652866b82fff6441cb5ec928de8a19f04c0d354107882854ada3d3637573e3a933d39aa64b5d3f743dec2adf759aa4fd2e9c051a0f4096a8807c338 SHA512 2449a36bdea7242a3f4e248e42388339299340cd6c377d6a20b02803db527895912e49040f3931a1aa2ebf04e3d4d5594cfc08aec28da44b73c8206dc81ddb89
+DIST ansible-base-2.10.7.tar.gz 5737915 BLAKE2B f86e7ec00c73b8f644e261d89bb5b665a0c94cba6cb5dd983b7493715f5d5843812a49684f998f92c1b70879c4d134ef803b43a5c129e443fcea3b9b0fa35a18 SHA512 170a159956b577e122421d016ed81fbeda34de8036a6294e70999a8f0c1eebb2406e6f5766b7f2e00fbf06e01d45ee343c98dd74d667f9bedfa8a88c84c805a0
diff --git a/app-admin/ansible-base/ansible-base-2.10.7.ebuild b/app-admin/ansible-base/ansible-base-2.10.7.ebuild
new file mode 100644
index 000000000000..276ffa50f036
--- /dev/null
+++ b/app-admin/ansible-base/ansible-base-2.10.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="test"
+# doc removed due to https://github.com/ansible/ansible/issues/71395
+
+RDEPEND="
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+ !=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+python_compile() {
+ # disable version checks on upgrade
+ export ANSIBLE_SKIP_CONFLICT_CHECK=1
+ distutils-r1_python_compile
+}
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ dodoc -r examples
+}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index f5e925c89408..018826c81f5a 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,2 +1,3 @@
DIST ansible-2.10.5.tar.gz 29123326 BLAKE2B a63ba7d26d2bf49f8367c48962ad77461994601b073986342ce090f7ec16a2c4d23e9176f9463adb558996ad33a5b6e27bf829983e648f2b9b3d9992b7678f01 SHA512 9eca87e0a98e2641112ac3c4fff07d624afa3db9655ba88d3ac5faa76464f7e89f6a64fe0613582c6e5528c2c0408fe1ee237f4c69353bdfcd73b264444fe3dc
DIST ansible-2.10.6.tar.gz 29620960 BLAKE2B 4a894eb100b7351e5b9c24e163333fde37fd2f5a0ab34e248e59a0196d81393165796b1b76993c883a08fe378ce12dbbeb289c6146a9b135b42afa831d4d83f7 SHA512 d5d2af728f3f6ff281e078fd4791c7278819d79d6c734f8e9d01fa549f0db25241045456d6aa6e8ccbceab4905039e7431c9db3aaaa89acb01ca599186963e24
+DIST ansible-2.10.7.tar.gz 29862966 BLAKE2B fa86deaac034adc8e02f91cbf4b63ca718d50376cab19e156c85f8372c1787275e2ce24840fc3cbad2b9191146c785feafcf024a0c14052ee39a839390cc1319 SHA512 7a6522bcc57c178c9c6e87e313f6f175d5c74ac0d1b9dd0cad5506c7fa0efb16d4a627dc2d9c73f988177544bd9ccfdbec162d0feacc757edeb20280d7414191
diff --git a/app-admin/ansible/ansible-2.10.7.ebuild b/app-admin/ansible/ansible-2.10.7.ebuild
new file mode 100644
index 000000000000..c736d9e59be5
--- /dev/null
+++ b/app-admin/ansible/ansible-2.10.7.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/ansible/ansible.git"
+ EGIT_BRANCH="devel"
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-python/paramiko[${PYTHON_USEDEP}]
+ dev-python/jinja[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/httplib2[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/netaddr[${PYTHON_USEDEP}]
+ dev-python/pexpect[${PYTHON_USEDEP}]
+ net-misc/sshpass
+ virtual/ssh
+ app-admin/ansible-base
+"
+DEPEND="
+ >=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+ app-admin/ansible-base
+ test? (
+ ${RDEPEND}
+ dev-python/nose[${PYTHON_USEDEP}]
+ >=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+ dev-python/passlib[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ dev-vcs/git
+ )"
+
+python_compile() {
+ export ANSIBLE_SKIP_CONFLICT_CHECK=1
+ distutils-r1_python_compile
+}
+
+python_test() {
+ nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
diff --git a/app-admin/checksec/checksec-2.4.0.ebuild b/app-admin/checksec/checksec-2.4.0.ebuild
index 7f19bc67a02d..a879fc2571e9 100644
--- a/app-admin/checksec/checksec-2.4.0.ebuild
+++ b/app-admin/checksec/checksec-2.4.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/slimm609/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~sparc x86"
IUSE=""
S="${WORKDIR}"/${MY_PN}-${PV}
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 9bc84cfd37a3..12a24622e6d3 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,2 +1,2 @@
-DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
+DIST conky-1.12.1.tar.gz 2404597 BLAKE2B 9e751844db9d1c90990b1e7dd5d9731330244f6ee772a7403e3520636f2ac930ccf3219e65da970d63396512cf843d4f8137854781fdf3c797fe910a8edb872d SHA512 897c6b83528809aa2e33e15b9ad6644d8cf36f4cff93f014811754f982c13180001b972b2b145b607de8d865c2af9a425ab50246065f537e14be75da5631593a
diff --git a/app-admin/conky/conky-1.10.8-r9.ebuild b/app-admin/conky/conky-1.10.8-r9.ebuild
deleted file mode 100644
index 3a8ea98b8989..000000000000
--- a/app-admin/conky/conky-1.10.8-r9.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info readme.gentoo-r1
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky"
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86"
-IUSE="apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
- lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
- nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
- weather-metar webserver wifi X xmms2"
-
-COMMON_DEPEND="
- X? (
- imlib? ( media-libs/imlib2[X] )
- lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
- lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] )
- lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg )
- nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
- truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXinerama
- x11-libs/libXfixes
- x11-libs/libXext
- xmms2? ( media-sound/xmms2 )
- )
- cmus? ( media-sound/cmus )
- curl? ( net-misc/curl )
- eve? ( net-misc/curl dev-libs/libxml2 )
- ical? ( dev-libs/libical:= )
- iconv? ( virtual/libiconv )
- irc? ( net-libs/libircclient )
- mysql? ( dev-db/mysql-connector-c )
- ncurses? ( sys-libs/ncurses:= )
- pulseaudio? ( media-sound/pulseaudio )
- rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
- systemd? ( sys-apps/systemd )
- wifi? ( net-wireless/wireless-tools )
- weather-metar? ( net-misc/curl )
- webserver? ( net-libs/libmicrohttpd )
- || ( dev-lang/lua:0 dev-lang/lua:5.1 )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- apcupsd? ( sys-power/apcupsd )
- hddtemp? ( app-admin/hddtemp )
- moc? ( media-sound/moc )
- nano-syntax? ( app-editors/nano )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-DEPEND="
- ${COMMON_DEPEND}
- app-text/docbook2X
-"
-
-CONFIG_CHECK="~IPV6"
-
-DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
-
-PATCHES=(
- "${FILESDIR}"/${P}-use-pkgconfig.patch
- "${FILESDIR}"/${P}-libical-3.patch
- "${FILESDIR}"/${P}-portmon.patch
- "${FILESDIR}"/${P}-clang.patch
-)
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
-To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
-and edit it to your liking.
-
-There are pretty html docs available at the conky homepage
-or in ${ROOT}/usr/share/doc/${PF}/html.
-
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
-
-pkg_setup() {
- use ipv6 && linux-info_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
- cmake/ConkyPlatformChecks.cmake || die
-}
-
-src_configure() {
- local mycmakeargs
-
- if use X; then
- mycmakeargs=(
- -DBUILD_X11=ON
- -DOWN_WINDOW=ON
- -DBUILD_XDAMAGE=ON
- -DBUILD_XINERAMA=ON
- -DBUILD_XDBE=ON
- -DBUILD_XFT=$(usex truetype)
- -DBUILD_IMLIB2=$(usex imlib)
- -DBUILD_XSHAPE=ON
- -DBUILD_ARGB=ON
- -DBUILD_LUA_CAIRO=$(usex lua-cairo)
- -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
- -DBUILD_LUA_RSVG=$(usex lua-rsvg)
- -DBUILD_NVIDIA=$(usex nvidia)
- -DBUILD_XMMS2=$(usex xmms2)
- )
- else
- mycmakeargs=(
- -DBUILD_X11=OFF
- -DBUILD_NVIDIA=OFF
- -DBUILD_LUA_CAIRO=OFF
- -DBUILD_LUA_IMLIB2=OFF
- -DBUILD_LUA_RSVG=OFF
- -DBUILD_XMMS2=OFF
- )
- fi
-
- mycmakeargs+=(
- -DBUILD_APCUPSD=$(usex apcupsd)
- -DBUILD_CMUS=$(usex cmus)
- -DBUILD_CURL=$(usex curl)
- -DBUILD_EVE=$(usex eve)
- -DBUILD_HDDTEMP=$(usex hddtemp)
- -DBUILD_IOSTATS=$(usex iostats)
- -DBUILD_ICAL=$(usex ical)
- -DBUILD_ICONV=$(usex iconv)
- -DBUILD_IPV6=$(usex ipv6)
- -DBUILD_IRC=$(usex irc)
- -DBUILD_MATH=$(usex math)
- -DBUILD_MOC=$(usex moc)
- -DBUILD_MPD=$(usex mpd)
- -DBUILD_MYSQL=$(usex mysql)
- -DBUILD_NCURSES=$(usex ncurses)
- -DBUILD_PORT_MONITORS=$(usex portmon)
- -DBUILD_PULSEAUDIO=$(usex pulseaudio)
- -DBUILD_RSS=$(usex rss)
- -DBUILD_JOURNAL=$(usex systemd)
- -DBUILD_IBM=$(usex thinkpad)
- -DBUILD_HTTP=$(usex webserver)
- -DBUILD_WEATHER_METAR=$(usex weather-metar)
- -DBUILD_WLAN=$(usex wifi)
- -DBUILD_BUILTIN_CONFIG=ON
- -DBUILD_OLD_CONFIG=ON
- -DBUILD_I18N=ON
- -DMAINTAINER_MODE=ON
- -DRELEASE=ON
- -DBUILD_AUDACIOUS=OFF
- -DBUILD_BMPX=OFF
- -DDOC_PATH=/usr/share/doc/${PF}
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
- insinto /usr/share/vim/vimfiles/syntax
- doins "${S}"/extras/vim/syntax/conkyrc.vim
- fi
-
- if use nano-syntax; then
- insinto /usr/share/nano/
- doins "${S}"/extras/nano/conky.nanorc
- fi
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
diff --git a/app-admin/conky/conky-1.10.8-r10.ebuild b/app-admin/conky/conky-1.12.1.ebuild
similarity index 61%
rename from app-admin/conky/conky-1.10.8-r10.ebuild
rename to app-admin/conky/conky-1.12.1.ebuild
index 66c0ffbf31c9..4534b4f27330 100644
--- a/app-admin/conky/conky-1.10.8-r10.ebuild
+++ b/app-admin/conky/conky-1.12.1.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake linux-info readme.gentoo-r1
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake linux-info lua-single readme.gentoo-r1 xdg
DESCRIPTION="An advanced, highly configurable system monitor for X"
HOMEPAGE="https://github.com/brndnmtthws/conky"
@@ -12,41 +14,40 @@ SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3 BSD LGPL-2.1 MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc
- lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses
- nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax
- weather-metar webserver wifi X xmms2"
+IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats
+ ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
+ ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
+ vim-syntax weather-metar webserver wifi X xinerama xmms2"
COMMON_DEPEND="
- X? (
- imlib? ( media-libs/imlib2[X] )
- lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] )
- lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] )
- lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg )
- nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
- truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXinerama
- x11-libs/libXfixes
- x11-libs/libXext
- xmms2? ( media-sound/xmms2 )
- )
cmus? ( media-sound/cmus )
curl? ( net-misc/curl )
- eve? ( net-misc/curl dev-libs/libxml2 )
ical? ( dev-libs/libical:= )
iconv? ( virtual/libiconv )
+ imlib? ( media-libs/imlib2[X] )
irc? ( net-libs/libircclient )
+ lua-cairo? ( x11-libs/cairo[X] )
+ lua-imlib? ( media-libs/imlib2[X] )
+ lua-rsvg? ( gnome-base/librsvg )
mysql? ( dev-db/mysql-connector-c )
ncurses? ( sys-libs/ncurses:= )
+ nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
pulseaudio? ( media-sound/pulseaudio )
rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
systemd? ( sys-apps/systemd )
+ truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
wifi? ( net-wireless/wireless-tools )
weather-metar? ( net-misc/curl )
webserver? ( net-libs/libmicrohttpd )
- || ( dev-lang/lua:0 dev-lang/lua:5.1 )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXext
+ )
+ xinerama? ( x11-libs/libXinerama )
+ xmms2? ( media-sound/xmms2 )
+ ${LUA_DEPS}
"
RDEPEND="
${COMMON_DEPEND}
@@ -58,39 +59,44 @@ RDEPEND="
"
DEPEND="
${COMMON_DEPEND}
- app-text/docbook2X
+ doc? ( app-text/docbook2X dev-libs/libxslt )
"
-CONFIG_CHECK="~IPV6"
+REQUIRED_USE="
+ imlib? ( X )
+ lua-cairo? ( X bundled-toluapp )
+ lua-imlib? ( X bundled-toluapp )
+ lua-rsvg? ( X bundled-toluapp )
+ nvidia? ( X )
+ truetype? ( X )
+ xinerama? ( X )
+"
-DOCS=( README.md TODO ChangeLog NEWS AUTHORS )
+CONFIG_CHECK="~IPV6"
-PATCHES=(
- "${FILESDIR}"/${P}-use-pkgconfig.patch
- "${FILESDIR}"/${P}-libical-3.patch
- "${FILESDIR}"/${P}-portmon.patch
- "${FILESDIR}"/${P}-clang.patch
- "${FILESDIR}"/${P}-virtual-sinks.patch
- "${FILESDIR}"/${P}-fpermissive.patch
-)
+DOCS=( README.md AUTHORS )
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
-To customize, copy to ${XDG_CONFIG_HOME}/conky/conky.conf
+To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf
and edit it to your liking.
There are pretty html docs available at the conky homepage
-or in ${ROOT}/usr/share/doc/${PF}/html.
+or in ${ROOT}/usr/share/doc/${PF}/html when built with USE=doc.
Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
pkg_setup() {
use ipv6 && linux-info_pkg_setup
+
+ lua-single_pkg_setup
}
src_prepare() {
cmake_src_prepare
+ xdg_environment_reset
+
sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
cmake/ConkyPlatformChecks.cmake || die
}
@@ -100,64 +106,58 @@ src_configure() {
if use X; then
mycmakeargs=(
- -DBUILD_X11=ON
- -DOWN_WINDOW=ON
- -DBUILD_XDAMAGE=ON
- -DBUILD_XINERAMA=ON
- -DBUILD_XDBE=ON
- -DBUILD_XFT=$(usex truetype)
- -DBUILD_IMLIB2=$(usex imlib)
- -DBUILD_XSHAPE=ON
- -DBUILD_ARGB=ON
- -DBUILD_LUA_CAIRO=$(usex lua-cairo)
- -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
- -DBUILD_LUA_RSVG=$(usex lua-rsvg)
- -DBUILD_NVIDIA=$(usex nvidia)
- -DBUILD_XMMS2=$(usex xmms2)
+ -DBUILD_ARGB=yes
+ -DBUILD_X11=yes
+ -DBUILD_XDAMAGE=yes
+ -DBUILD_XDBE=yes
+ -DBUILD_XSHAPE=yes
+ -DOWN_WINDOW=yes
)
else
mycmakeargs=(
- -DBUILD_X11=OFF
- -DBUILD_NVIDIA=OFF
- -DBUILD_LUA_CAIRO=OFF
- -DBUILD_LUA_IMLIB2=OFF
- -DBUILD_LUA_RSVG=OFF
- -DBUILD_XMMS2=OFF
+ -DBUILD_X11=no
)
fi
mycmakeargs+=(
-DBUILD_APCUPSD=$(usex apcupsd)
+ -DBUILD_AUDACIOUS=no
+ -DBUILD_BUILTIN_CONFIG=yes
-DBUILD_CMUS=$(usex cmus)
-DBUILD_CURL=$(usex curl)
- -DBUILD_EVE=$(usex eve)
+ -DBUILD_DOCS=$(usex doc)
-DBUILD_HDDTEMP=$(usex hddtemp)
- -DBUILD_IOSTATS=$(usex iostats)
+ -DBUILD_HTTP=$(usex webserver)
+ -DBUILD_I18N=yes
+ -DBUILD_IBM=$(usex thinkpad)
-DBUILD_ICAL=$(usex ical)
-DBUILD_ICONV=$(usex iconv)
+ -DBUILD_IMLIB2=$(usex imlib)
+ -DBUILD_IOSTATS=$(usex iostats)
-DBUILD_IPV6=$(usex ipv6)
-DBUILD_IRC=$(usex irc)
+ -DBUILD_JOURNAL=$(usex systemd)
+ -DBUILD_LUA_CAIRO=$(usex lua-cairo)
+ -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
+ -DBUILD_LUA_RSVG=$(usex lua-rsvg)
-DBUILD_MATH=$(usex math)
-DBUILD_MOC=$(usex moc)
-DBUILD_MPD=$(usex mpd)
-DBUILD_MYSQL=$(usex mysql)
-DBUILD_NCURSES=$(usex ncurses)
+ -DBUILD_NVIDIA=$(usex nvidia)
+ -DBUILD_OLD_CONFIG=yes
-DBUILD_PORT_MONITORS=$(usex portmon)
-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-DBUILD_RSS=$(usex rss)
- -DBUILD_JOURNAL=$(usex systemd)
- -DBUILD_IBM=$(usex thinkpad)
- -DBUILD_HTTP=$(usex webserver)
-DBUILD_WEATHER_METAR=$(usex weather-metar)
-DBUILD_WLAN=$(usex wifi)
- -DBUILD_BUILTIN_CONFIG=ON
- -DBUILD_OLD_CONFIG=ON
- -DBUILD_I18N=ON
- -DMAINTAINER_MODE=ON
- -DRELEASE=ON
- -DBUILD_AUDACIOUS=OFF
- -DBUILD_BMPX=OFF
+ -DBUILD_XFT=$(usex truetype)
+ -DBUILD_XINERAMA=$(usex xinerama)
+ -DBUILD_XMMS2=$(usex xmms2)
-DDOC_PATH=/usr/share/doc/${PF}
+ -DMAINTAINER_MODE=no
+ -DRELEASE=yes
)
cmake_src_configure
@@ -184,4 +184,6 @@ src_install() {
pkg_postinst() {
readme.gentoo_print_elog
+
+ xdg_pkg_postinst
}
diff --git a/app-admin/conky/files/conky-1.10.8-clang.patch b/app-admin/conky/files/conky-1.10.8-clang.patch
deleted file mode 100644
index 2fc49fa9cf25..000000000000
--- a/app-admin/conky/files/conky-1.10.8-clang.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- conky-1.10.8/src/linux.cc 2018-02-07 17:16:39.000000000 +0300
-+++ conky-1.10.8.new/src/linux.cc 2020-02-22 00:43:52.336620654 +0300
-@@ -37,6 +37,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
---- conky-1.10.8/src/luamm.cc 2020-02-22 00:57:25.847867585 +0300
-+++ conky-1.10.8.new/src/luamm.cc 2020-02-22 00:59:29.820510124 +0300
-@@ -23,6 +23,8 @@
-
- #include "luamm.hh"
-
-+#include
-+
- namespace lua {
- namespace {
-
-@@ -57,7 +59,7 @@
- lua_pushstring(l, e.what());
- }
- catch(...) {
-- lua_pushstring(l, ptr->__cxa_exception_type()->name());
-+ lua_pushstring(l, abi::__cxa_current_exception_type()->name());
- }
- return 1;
- }
diff --git a/app-admin/conky/files/conky-1.10.8-fpermissive.patch b/app-admin/conky/files/conky-1.10.8-fpermissive.patch
deleted file mode 100644
index 42abeb831cd6..000000000000
--- a/app-admin/conky/files/conky-1.10.8-fpermissive.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- conky-1.10.8/src/conky.cc.orig 2020-08-28 13:17:22.330113596 -0400
-+++ conky-1.10.8/src/conky.cc 2020-08-28 13:19:48.564891015 -0400
-@@ -478,9 +478,9 @@
- struct MHD_Daemon *httpd;
- static conky::simple_config_setting http_refresh("http_refresh", false, true);
-
--int sendanswer(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) {
-+MHD_Result sendanswer(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls) {
- struct MHD_Response *response = MHD_create_response_from_data(webpage.length(), (void*) webpage.c_str(), MHD_NO, MHD_NO);
-- int ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
-+ MHD_Result ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
- MHD_destroy_response(response);
- if(cls || url || method || version || upload_data || upload_data_size || con_cls) {} //make compiler happy
- return ret;
diff --git a/app-admin/conky/files/conky-1.10.8-libical-3.patch b/app-admin/conky/files/conky-1.10.8-libical-3.patch
deleted file mode 100644
index 032a6d2ef263..000000000000
--- a/app-admin/conky/files/conky-1.10.8-libical-3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 128c8cce3415839a3d19a5cb877fd77af2538d35 Mon Sep 17 00:00:00 2001
-From: Adam Majer
-Date: Tue, 6 Mar 2018 13:46:31 +0100
-Subject: [PATCH] Add support for libical 3.x (#465)
-
-In libical3, deprecated icaltime_from_timet is removed
-Use icaltime_from_timet_with_zone instead. This function
-exists in libical 2.x so no need to change requirements
----
- src/ical.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ical.cc b/src/ical.cc
-index e4b48511..ef069124 100644
---- a/src/ical.cc
-+++ b/src/ical.cc
-@@ -49,13 +49,13 @@ struct ical_event *add_event(struct ical_event *listend, icalcomponent *new_ev)
- icaltimetype start;
-
- start = icalcomponent_get_dtstart(new_ev);
-- if(icaltime_compare(start, icaltime_from_timet(time(NULL), 0)) <= 0) {
-+ if(icaltime_compare(start, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) <= 0) {
- icalproperty *rrule = icalcomponent_get_first_property(new_ev, ICAL_RRULE_PROPERTY);
- if(rrule) {
- icalrecur_iterator* ritr = icalrecur_iterator_new(icalproperty_get_rrule(rrule), start);
- icaltimetype nexttime = icalrecur_iterator_next(ritr);
- while (!icaltime_is_null_time(nexttime)) {
-- if(icaltime_compare(nexttime, icaltime_from_timet(time(NULL), 0)) > 0) {
-+ if(icaltime_compare(nexttime, icaltime_from_timet_with_zone(time(NULL), 0, NULL)) > 0) {
- start = nexttime;
- break;
- }
diff --git a/app-admin/conky/files/conky-1.10.8-portmon.patch b/app-admin/conky/files/conky-1.10.8-portmon.patch
deleted file mode 100644
index e7b17dd1119a..000000000000
--- a/app-admin/conky/files/conky-1.10.8-portmon.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- conky-1.10.8/src/CMakeLists.txt 2019-03-09 08:24:26.315879386 +0100
-+++ conky-1.10.8/src/CMakeLists.txt 2019-03-09 08:24:38.555878656 +0100
-@@ -220,6 +220,15 @@
- install(TARGETS
- conky
- RUNTIME DESTINATION bin
-- LIBRARY DESTINATION lib
-- ARCHIVE DESTINATION lib
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
- )
-+
-+if(BUILD_PORT_MONITORS)
-+ install(TARGETS
-+ tcp-portmon
-+ RUNTIME DESTINATION bin
-+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-+)
-+endif(BUILD_PORT_MONITORS)
diff --git a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch b/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
deleted file mode 100644
index 97e6bd02323f..000000000000
--- a/app-admin/conky/files/conky-1.10.8-use-pkgconfig.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Reversed patch
-
-From abd0be51a00444d3be6b213e0926675e5a4e5ed3 Mon Sep 17 00:00:00 2001
-From: Brenden Matthews
-Date: Tue, 23 Jan 2018 12:56:06 -0500
-Subject: [PATCH] Use FindCurses instead of pkg_check_modules.
-
-This should resolve #217.
----
- cmake/ConkyPlatformChecks.cmake | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/ConkyPlatformChecks.cmake b/cmake/ConkyPlatformChecks.cmake
-index c5b39b2f..19ec7b9b 100644
---- a/cmake/ConkyPlatformChecks.cmake
-+++ b/cmake/ConkyPlatformChecks.cmake
-@@ -129,12 +129,12 @@ if(BUILD_HTTP)
- endif(BUILD_HTTP)
-
- if(BUILD_NCURSES)
-+ pkg_check_modules(NCURSES ncurses)
-+ if(NOT NCURSES_FOUND)
-- include(FindCurses)
-- if(NOT CURSES_FOUND)
- message(FATAL_ERROR "Unable to find ncurses library")
-+ endif(NOT NCURSES_FOUND)
-+ set(conky_libs ${conky_libs} ${NCURSES_LIBRARIES})
-+ set(conky_includes ${conky_includes} ${NCURSES_INCLUDE_DIRS})
-- endif(NOT CURSES_FOUND)
-- set(conky_libs ${conky_libs} ${CURSES_LIBRARIES})
-- set(conky_includes ${conky_includes} ${CURSES_INCLUDE_DIR})
- endif(BUILD_NCURSES)
-
- if(BUILD_MYSQL)
diff --git a/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch b/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch
deleted file mode 100644
index c0198ccc4ecf..000000000000
--- a/app-admin/conky/files/conky-1.10.8-virtual-sinks.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 8221ba62045012abf8a4443de20f17a0a8fc1288 Mon Sep 17 00:00:00 2001
-From: Jan Seeger
-Date: Wed, 5 Aug 2020 15:39:20 +0200
-Subject: Fixed crash on virtual sinks.
-
-Taken from upstream commits
-https://github.com/brndnmtthws/conky/commit/ddf8a0f58f3110e31ec4c44ecff838d2b231f6f3 and
-https://github.com/brndnmtthws/conky/commit/2a7226d89331f7d5d0abf0b9aff6d75435dd3a2d.
-
-Signed-off-by: Jan Seeger
----
- src/pulseaudio.cc | 12 +++++++++---
- 1 file changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/pulseaudio.cc b/src/pulseaudio.cc
-index 93226c1b..af814bd6 100644
---- a/src/pulseaudio.cc
-+++ b/src/pulseaudio.cc
-@@ -53,8 +53,13 @@ void pa_sink_info_callback(pa_context *c, const pa_sink_info *i, int eol, void *
- pdr->sink_mute = i->mute;
- pdr->sink_card = i->card;
- pdr->sink_index = i->index;
-- pdr->sink_active_port_name.assign(i->active_port->name);
-- pdr->sink_active_port_description.assign(i->active_port->description);
-+ if (i->active_port != nullptr) {
-+ pdr->sink_active_port_name.assign(i->active_port->name);
-+ pdr->sink_active_port_description.assign(i->active_port->description);
-+ } else {
-+ pdr->sink_active_port_name.erase();
-+ pdr->sink_active_port_name.erase();
-+ }
- pdr->sink_volume = round_to_int(100.0f * (float)pa_cvolume_avg(&(i->volume)) / (float)PA_VOLUME_NORM);
- pa_threaded_mainloop_signal(pulseaudio->mainloop, 0);
- }
-@@ -224,9 +229,10 @@ void init_pulseaudio(struct text_object *obj) {
- return;
- }
-
-- if(pulseaudio->result.sink_card!=(uint32_t)-1)
-+ if(pulseaudio->result.sink_card!=(uint32_t)-1) {
- PULSEAUDIO_WAIT(pa_context_get_card_info_by_index(pulseaudio->context, pulseaudio->result.sink_card,
- pa_card_info_callback, &pulseaudio->result));
-+ }
-
- // get notification when something changes in PA
- pa_context_set_subscribe_callback(pulseaudio->context, subscribe_cb, &pulseaudio->result);
---
-2.26.2
-
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index b3835daf4041..1fe89fc39f12 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -18,7 +18,6 @@
Enable support for sys-power/apcupsd
Enable support for bundled toluapp. This only makes sense in combination with the lua-* flags
Enable monitoring of music played by media-sound/cmus
- Enable support for the eve-online skill monitor
Enable support for events from iCalendar (RFC 5545) files using dev-libs/libical
Enable support for per-task I/O statistics
Enable support for displaying everything from an irc channel using net-libs/libircclient
diff --git a/app-admin/needrestart/needrestart-3.5.ebuild b/app-admin/needrestart/needrestart-3.5.ebuild
index ab1223abcf65..8856888b4ad1 100644
--- a/app-admin/needrestart/needrestart-3.5.ebuild
+++ b/app-admin/needrestart/needrestart-3.5.ebuild
@@ -28,7 +28,8 @@ RDEPEND="
dev-perl/Sort-Naturally
dev-perl/TermReadKey
sys-apps/init-system-helpers
- sys-apps/iucode_tool
+ amd64? ( sys-apps/iucode_tool )
+ x86? ( sys-apps/iucode_tool )
"
DEPEND="${RDEPEND}
sys-devel/gettext
diff --git a/app-admin/needrestart/needrestart-9999.ebuild b/app-admin/needrestart/needrestart-9999.ebuild
index a90d4adcab9e..5fc3e7529915 100644
--- a/app-admin/needrestart/needrestart-9999.ebuild
+++ b/app-admin/needrestart/needrestart-9999.ebuild
@@ -28,7 +28,8 @@ RDEPEND="
dev-perl/Sort-Naturally
dev-perl/TermReadKey
sys-apps/init-system-helpers
- sys-apps/iucode_tool
+ amd64? ( sys-apps/iucode_tool )
+ x86? ( sys-apps/iucode_tool )
"
DEPEND="${RDEPEND}
sys-devel/gettext
diff --git a/app-admin/verynice/metadata.xml b/app-admin/verynice/metadata.xml
index 7a38bb900964..979bcc7aec93 100644
--- a/app-admin/verynice/metadata.xml
+++ b/app-admin/verynice/metadata.xml
@@ -1,5 +1,8 @@
-
+
+ sam@gentoo.org
+ Sam James
+
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 2397f10ca5b8..1ab8f6439245 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
index b361f7bbe64a..49d36f93d65a 100644
--- a/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.8-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://sourceware.org/pub/${PN}/${P}.tar.gz"
LICENSE="BZIP2"
SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="static static-libs"
PATCHES=(
diff --git a/app-arch/lzma/lzma-19.00.ebuild b/app-arch/lzma/lzma-19.00.ebuild
index 54de13c0ae0e..dfc53ece7bcd 100644
--- a/app-arch/lzma/lzma-19.00.ebuild
+++ b/app-arch/lzma/lzma-19.00.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/sevenzip/${MY_P}.7z -> ${P}.7z"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc"
BDEPEND="app-arch/p7zip"
diff --git a/app-arch/rpm2targz/Manifest b/app-arch/rpm2targz/Manifest
index 718d9bb3a4e2..182c3d08374d 100644
--- a/app-arch/rpm2targz/Manifest
+++ b/app-arch/rpm2targz/Manifest
@@ -1 +1,2 @@
+DIST rpm2targz-2021.03.16.tar.xz 6500 BLAKE2B fac1122fbfcab2b982ea6f5369b95b30814d438d0f853d846ef62a33ceaaf81d44b2a743bc20a3ef46defb63331bff06f9a268a5a805ecd899b11f86ec414bc2 SHA512 efd677642fbf73d4b8c90f338eea20452052f2bdc2b7a3a61c0e9215676575b5063aad733ec3ea4840baf281eb332db8f6fdeef600cc8a8aa7e208f2fa8ee599
DIST rpm2targz-9.0.0.5g.tar.xz 5740 BLAKE2B 88c903119fc19bd1d2eec1ccc7616e05594465a0595b75be8ab8095b5404420a8a09ba8fb176ee21efa5df3b12d4436b60119a637f70910cc020bcb3dcc3833b SHA512 a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549
diff --git a/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
new file mode 100644
index 000000000000..ee07654a10f6
--- /dev/null
+++ b/app-arch/rpm2targz/rpm2targz-2021.03.16.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
+HOMEPAGE="http://www.slackware.com/config/packages.php"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+ https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="BSD-1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-arch/cpio"
+
+src_configure() {
+ tc-export CC
+}
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 0e6fd13e12c7..1ca02813d9ed 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/dar/dar-2.6.13.ebuild b/app-backup/dar/dar-2.6.13.ebuild
index 3df005301c1f..ec82d1c077b4 100644
--- a/app-backup/dar/dar-2.6.13.ebuild
+++ b/app-backup/dar/dar-2.6.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux"
IUSE="curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr"
RESTRICT="test" # need to be run as root
diff --git a/app-backup/duply/files/README.gentoo b/app-backup/duply/files/README.gentoo
deleted file mode 100644
index 99d9a1320473..000000000000
--- a/app-backup/duply/files/README.gentoo
+++ /dev/null
@@ -1,4 +0,0 @@
-If you use duply at the first time please have a
-look at the the usage help text "duply usage"
-for further information."
-
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3f591eb9f7fb..9ead58369e7f 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/monkeysphere/Manifest b/app-crypt/monkeysphere/Manifest
index e1759b113748..25bcb7d3b9ee 100644
--- a/app-crypt/monkeysphere/Manifest
+++ b/app-crypt/monkeysphere/Manifest
@@ -1,2 +1 @@
-DIST monkeysphere_0.41.orig.tar.gz 109040 BLAKE2B dadbd65c879bc8e73e7dd1360ebe7f7242aef125af3907d4487f8d0711afda6d87736ab82938867201eead5c1008d192dbd90602eff5a4843d990b3c87ee2949 SHA512 fcc3dd6c191635ed7ef27a8219d4c9d7043629dc8a02de947fcc4dfc8e612ec767f68d4e4c41252a0c0fc80e4184018e53991d85fcde50cb5def75b925341962
DIST monkeysphere_0.44.orig.tar.gz 110289 BLAKE2B 8a067035d3a40436fd5c27291ab25f15d475d9a0f17b51259c0431c77841807af93cb04d045b77c5f5dda3cd0061ab52561fdb62a704715d0d8cbbf96cb43259 SHA512 cb3c655a08b1c0a382502f8609f57d0c870fe4491b1b967e9931bdfd146b3926470496577949630452e073f04442b91a1ef679254c0f3091a834f3429e0f8e93
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch
deleted file mode 100644
index f979114181d1..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_default_shell.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -r d0c02fe6a949 src/share/common
---- a/src/share/common Sun Oct 06 19:21:18 2013 +0200
-+++ b/src/share/common Sun Oct 06 19:21:49 2013 +0200
-@@ -108,7 +108,7 @@
- # if root, su command as monkeysphere user
- 'root')
- # requote arguments using bash builtin feature (see "help printf"):
-- su "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
-+ su -s /bin/bash "$MONKEYSPHERE_USER" -c "$(printf "%q " "$@")"
- ;;
-
- # otherwise, fail
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch
deleted file mode 100644
index 7cdaa74b5735..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_hd_od.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 6150774ec7f4 tests/keytrans
---- a/tests/keytrans Sun Feb 16 20:11:02 2014 +0100
-+++ b/tests/keytrans Sun Feb 16 20:11:40 2014 +0100
-@@ -104,8 +104,8 @@
- <(gpg --list-packets < "$TEMPDIR"/converted.secret.key)
-
- diff -u \
-- <(hd "$TEMPDIR"/secret.key) \
-- <(hd "$TEMPDIR"/converted.secret.key)
-+ <(od -xc "$TEMPDIR"/secret.key) \
-+ <(od -xc "$TEMPDIR"/converted.secret.key)
-
- KEYFPR=$(gpg --fingerprint --with-colons --list-keys | grep ^fpr | cut -f10 -d:)
- KEYID=$(printf "%s" "$KEYFPR" | cut -b25-40)
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch
deleted file mode 100644
index f14550280fcf..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_non_default_port.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -r 5f7ee764ec1f src/share/common
---- a/src/share/common Mon Oct 07 19:22:36 2013 +0200
-+++ b/src/share/common Mon Oct 07 19:22:58 2013 +0200
-@@ -863,6 +863,10 @@
- ;;
- ('known_hosts')
- host=${userID#ssh://}
-+ if [[ "${host}" == *:* ]]; then
-+ IFS=':' read -a ARR <<< "${host}"
-+ host="[${ARR[0]}]:${ARR[1]}"
-+ fi
- remove_line "$keyFile" "$host" "$sshKey"
- ;;
- esac
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch
deleted file mode 100644
index aec90eb07661..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_openpgp2ssh_sanity_check.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
-index edc7995..2711ff2 100755
---- a/src/monkeysphere-authentication
-+++ b/src/monkeysphere-authentication
-@@ -84,6 +84,13 @@ gpg_sphere() {
- su_monkeysphere_user gpg --fixed-list-mode --no-greeting --quiet --no-tty "$@"
- }
-
-+check_openpgp2ssh_sanity() {
-+ if [[ `su_monkeysphere_user openpgp2ssh ABC &>/dev/null || echo $?` != "255" ]]; then
-+ echo "openpgp2ssh command gives unexpected return code. This can lead to a scenario where no authorized keys are populated, even though they are otherwise valid. Aborting!"
-+ exit 1
-+ fi;
-+}
-+
- # output to stdout the core fingerprint from the gpg core secret
- # keyring
- core_fingerprint() {
-@@ -163,6 +170,7 @@ case $COMMAND in
- 'update-users'|'update-user'|'update'|'u')
- source "${MASHAREDIR}/setup"
- setup
-+ check_openpgp2ssh_sanity
- source "${MASHAREDIR}/update_users"
- OUTPUT_STDOUT= update_users "$@"
- ;;
-@@ -171,6 +179,7 @@ case $COMMAND in
- (( $# > 0 )) || failure "Must specify user."
- source "${MASHAREDIR}/setup"
- setup
-+ check_openpgp2ssh_sanity
- source "${MASHAREDIR}/update_users"
- OUTPUT_STDOUT=true update_users "$1"
- ;;
diff --git a/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch b/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch
deleted file mode 100644
index 712734459054..000000000000
--- a/app-crypt/monkeysphere/files/monkeysphere-0.36_tests_gnupg2.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -r c13f4b11061e tests/keytrans
---- a/tests/keytrans Sun Feb 16 19:24:08 2014 +0100
-+++ b/tests/keytrans Sun Feb 16 19:27:42 2014 +0100
-@@ -131,9 +131,9 @@
- cat >"$TEMPDIR"/expectedout <"$TEMPDIR"/expectedout <"$TEMPDIR"/expectedout <
-
-
+
+
+ vigna/ne
+
diff --git a/app-editors/ne/ne-3.1.1.ebuild b/app-editors/ne/ne-3.3.0.ebuild
similarity index 66%
rename from app-editors/ne/ne-3.1.1.ebuild
rename to app-editors/ne/ne-3.3.0.ebuild
index 37edf3c0de09..87aaff065bf8 100644
--- a/app-editors/ne/ne-3.1.1.ebuild
+++ b/app-editors/ne/ne-3.3.0.ebuild
@@ -1,21 +1,20 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
-DESCRIPTION="the nice editor, easy to use for the beginner and powerful for the wizard"
-HOMEPAGE="http://ne.di.unimi.it/"
-SRC_URI="http://ne.di.unimi.it/${P}.tar.gz"
+DESCRIPTION="The nice editor, easy to use for the beginner and powerful for the wizard"
+HOMEPAGE="https://ne.di.unimi.it/"
+SRC_URI="https://ne.di.unimi.it/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="tinfo"
-
-DEPEND="sys-libs/ncurses:0=[tinfo?]"
+BDEPEND="virtual/pkgconfig"
+DEPEND="sys-libs/ncurses:="
RDEPEND="
${DEPEND}
dev-lang/perl
@@ -25,13 +24,13 @@ HTML_DOCS=( doc/html/. )
src_prepare() {
default
+
sed -i -e 's/-O3//' src/makefile || die
}
src_configure() {
- local sedflags="s|-lcurses|-lncurses|g"
- use tinfo && sedflags="s|-lcurses|-ltinfo|g"
- sed -i -e "${sedflags}" src/makefile || die
+ # bug #776799
+ sed -i -e "s/-lcurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" src/makefile || die
}
src_compile() {
diff --git a/app-editors/wxhexeditor/files/wxhexeditor-0.24-desktop.patch b/app-editors/wxhexeditor/files/wxhexeditor-0.24-desktop.patch
new file mode 100644
index 000000000000..7d3d54da09ab
--- /dev/null
+++ b/app-editors/wxhexeditor/files/wxhexeditor-0.24-desktop.patch
@@ -0,0 +1,13 @@
+Index: resources/wxHexEditor.desktop
+===================================================================
+--- a/resources/wxHexEditor.desktop 2017-03-16 05:50:42.000000000 +0200
++++ b/resources/wxHexEditor.desktop 2017-03-24 12:16:39.931400635 +0200
+@@ -8,6 +8,7 @@ Exec=wxHexEditor
+ Icon=wxHexEditor
+ Terminal=false
+ Type=Application
+-Categories=Utility;TextEditor;Utility;
++Categories=Utility;TextEditor;
++Keywords=disk;drive;volume;harddisk;hdd;disc;cdrom;dvd;partition;iso;image;backup;restore;editor;
+ Keywords[en_GB]=disk;drive;volume;harddisk;hdd;disc;cdrom;dvd;partition;iso;image;backup;restore;editor;
+
diff --git a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild b/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
similarity index 84%
rename from app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
rename to app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
index 517f24a35eb8..a31c4b0aa439 100644
--- a/app-editors/wxhexeditor/wxhexeditor-0.24.ebuild
+++ b/app-editors/wxhexeditor/wxhexeditor-0.24-r1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-WX_GTK_VER=3.0-gtk3
-
-inherit toolchain-funcs wxwidgets
+EAPI=7
MY_PN="wxHexEditor"
+WX_GTK_VER=3.0-gtk3
+inherit toolchain-funcs wxwidgets
DESCRIPTION="A cross-platform hex editor designed specially for large files"
-HOMEPAGE="http://www.wxhexeditor.org/"
+HOMEPAGE="https://github.com/EUA/wxHexEditor"
SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-v${PV}-src.tar.xz"
LICENSE="GPL-2"
@@ -27,6 +26,7 @@ S="${WORKDIR}/${MY_PN}"
PATCHES=(
"${FILESDIR}"/${P}-syslibs.patch
+ "${FILESDIR}"/${P}-desktop.patch
)
pkg_pretend() {
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 1b7cb1bc043f..5cda4cb95a4f 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/conmon/Manifest b/app-emulation/conmon/Manifest
index a64b4fce7cda..f8329538e44f 100644
--- a/app-emulation/conmon/Manifest
+++ b/app-emulation/conmon/Manifest
@@ -1,2 +1,3 @@
DIST conmon-2.0.22.tar.gz 103371 BLAKE2B f509ba800c847886ec2350e141d2b965ff1cc09822467718fb0d94acdabdc86c6f40dff9428679e4c4171ac6a522b3ba7622d66ebd8108be1a68cbf7418d5c09 SHA512 819e1d9279c1a22388220d710b975cdeb3c0b56413afb177afe1c96b649e2dce496d5f51fe4094f572111f771102ccd0ae86f1776e99fedb2e76e6e9130c2d5c
DIST conmon-2.0.26.tar.gz 104681 BLAKE2B fc8369258a414d3a169b64019199c604d1d8bded70d5a38230f243053dcf09c6f9aee931b328913e6cbbe3c495aab4894647897f40f537a79eb587ecee58517a SHA512 5cbb66053fb48b514f93b3be4d4ac428f9eea8a3e1452b4df232250e9cd01202ecb7477c05e1e4dfb21595f2d1881be35cdea9b23f43c02bb7c0e67a3161396e
+DIST conmon-2.0.27.tar.gz 106647 BLAKE2B f242b1be4f86b18ca94dade3d1f5522d1ae1951f4b7abf7e563e1a93472c2a673cd48a136fdff12b410ebaa46694b70ffbf173fc37a3bbefb03891452c22dfae SHA512 2bc389fa3963cbb612669ec1d288adc888d7ac1de2b9bf483f18e0f62220775327ebcb771bfa7236815ef7247adb8fc6b8ae38748f7a383ec9590e3ee5769b65
diff --git a/app-emulation/conmon/conmon-2.0.27.ebuild b/app-emulation/conmon/conmon-2.0.27.ebuild
new file mode 100644
index 000000000000..8922d84fc488
--- /dev/null
+++ b/app-emulation/conmon/conmon-2.0.27.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="An OCI container runtime monitor"
+HOMEPAGE="https://github.com/containers/conmon"
+SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="systemd"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:=
+ systemd? ( sys-apps/systemd:= )"
+DEPEND="${RDEPEND}
+ dev-go/go-md2man"
+
+src_prepare() {
+ default
+
+ if ! use systemd; then
+ sed -e 's| $(PKG_CONFIG) --exists libsystemd-journal | false |' \
+ -e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
+ -i Makefile || die
+ fi
+ sed -e 's|make -C tools|$(MAKE) -C tools|' -i Makefile || die
+ sed -e 's|^GOMD2MAN = .*|GOMD2MAN = go-md2man|' -i docs/Makefile || die
+}
+
+src_compile() {
+ tc-export CC
+ emake GIT_COMMIT="v${PV}" \
+ all
+}
+
+src_install() {
+ emake DESTDIR="${D}" \
+ PREFIX="/usr" \
+ install
+ dodir /usr/libexec/podman
+ ln "${ED}/usr/"{bin,libexec/podman}/conmon || die
+ dodoc README.md
+}
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 9f9ae7a74ea9..645bf5ea9b18 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/lynis/lynis-3.0.3-r1.ebuild b/app-forensics/lynis/lynis-3.0.3-r2.ebuild
similarity index 86%
rename from app-forensics/lynis/lynis-3.0.3-r1.ebuild
rename to app-forensics/lynis/lynis-3.0.3-r2.ebuild
index 98be2c958313..b7d94d5ae33c 100644
--- a/app-forensics/lynis/lynis-3.0.3-r1.ebuild
+++ b/app-forensics/lynis/lynis-3.0.3-r2.ebuild
@@ -41,7 +41,8 @@ src_install() {
insinto /etc/${PN}
doins default.prf
- systemd_dounit "${S}/extras/systemd/${PN}.service"
+ sed -i -e 's/\/path\/to\///' "${S}/extras/systemd/${PN}.service" || die "Sed Failed!"
+ systemd_dounit "${S}/extras/systemd/${PN}.service" || die "Sed Failed!"
systemd_dounit "${S}/extras/systemd/${PN}.timer"
}
diff --git a/app-laptop/Manifest.gz b/app-laptop/Manifest.gz
index d033dfbdaa80..c71b78caf93c 100644
Binary files a/app-laptop/Manifest.gz and b/app-laptop/Manifest.gz differ
diff --git a/app-laptop/tuxedo-keyboard/Manifest b/app-laptop/tuxedo-keyboard/Manifest
index 6f792af44007..7813aa7db01a 100644
--- a/app-laptop/tuxedo-keyboard/Manifest
+++ b/app-laptop/tuxedo-keyboard/Manifest
@@ -1 +1,2 @@
DIST tuxedo-keyboard-2.0.5.tar.gz 31001 BLAKE2B 931d011e2ac521cef1670a8952886c1ac9b2476c6227c2b3cfce28d52622d3869f3c55773279eea3cbcc94d7c5b12d5d5653a8e2f9c142d0c044fa23fddd958c SHA512 3b7a9331d04e2918f3452f9561b05f39ea458960c2ade299a368899638987178cfd33fa066a0835f88b14c240d7937692d7994ccf978749ea7fdc428e587e06a
+DIST tuxedo-keyboard-3.0.3.tar.gz 48275 BLAKE2B be4fd4a52cd578ec7db2d0f94c64ba842c2b28ecabbca10331024e104cf4dbaa655e0686f412141ac3ad6bc0430398797f628139a396e5a41ac73c33943230cf SHA512 6ebbde6ea9351f9fd7167d38d8b5f836d1fda2fbbcf80755e86c2b76c49cf263ad2e9cfc47bea3449387626d88d8c1725335c2861ec2ff5a76e64ef87e27d9fb
diff --git a/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.3.ebuild b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.3.ebuild
new file mode 100644
index 000000000000..209f68c72490
--- /dev/null
+++ b/app-laptop/tuxedo-keyboard/tuxedo-keyboard-3.0.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod toolchain-funcs
+
+DESCRIPTION="Kernel Module for Tuxedo Keyboard"
+HOMEPAGE="https://github.com/tuxedocomputers/tuxedo-keyboard"
+SRC_URI="https://github.com/tuxedocomputers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BUILD_TARGETS="all"
+MODULE_NAMES="clevo_acpi(tuxedo:${S}:src) clevo_wmi(tuxedo:${S}:src) tuxedo_keyboard(tuxedo:${S}:src) tuxedo_io(tuxedo:${S}:src/tuxedo_io)"
+
+pkg_setup() {
+ linux-mod_pkg_setup
+ BUILD_PARAMS="CC=$(tc-getBUILD_CC) KDIR=${KV_DIR} V=1 KBUILD_VERBOSE=1"
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index e1946de87c2f..e3f798f9c6e8 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/banner/Manifest b/app-misc/banner/Manifest
index 6cf25185a5cd..6d878827c406 100644
--- a/app-misc/banner/Manifest
+++ b/app-misc/banner/Manifest
@@ -1,3 +1 @@
DIST BANNER_V1.3.5.tar.gz 135190 BLAKE2B 4accf00ad92f0351a1df49d3cb6451a71ee7f929fc6f2b25aee7fc6898780944b71cecf8070dc186888a9fb7580213ef2111a5086fc396f3c7e242e678cf8270 SHA512 6f2d79f1d76533fac920aa2984258e3f5278c40692d2b2dcae560734dcd5b06fcc8c99f266abdc91fb272eb291906bcea747f5ee53a67a4a5cb99179941897c3
-DIST banner-1.3.3.tar.gz 114237 BLAKE2B ea9773ce8b65ed7deb5ec377b53ab974bbb4760627788b461f5715b15f99bcde25e2f58f7fb69d937ede30de8f87be7eabb662a05c7d8c574df298446ba21649 SHA512 38f16f2a25bd7fb270056ebe43691c989a808891ecc75e4f794456d1752a07002efb7ba7b90a2000a40704e6b6f11760b47a3fe59deeb05ff3578f0d982f7d96
-DIST banner-1.3.4.tar.gz 120537 BLAKE2B c50952b7e4f73b896ef204914479ffe7c2ac2ec7a0d979f076a0134c3cc6280d01be448f08fe3914cca4b144798c1d9a68042826ec81f55353596be1c3420aa8 SHA512 c98b4b690e73d04fd9731a291e80e89b234f1af47541fbb2eb9edcb987a7c029485dedc1eef6a479fe4f876cfd4d41b090bf6c3685a8c54e4c658b76cc9cec20
diff --git a/app-misc/banner/banner-1.3.3.ebuild b/app-misc/banner/banner-1.3.3.ebuild
deleted file mode 100644
index cf588c0fb915..000000000000
--- a/app-misc/banner/banner-1.3.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="The well known banner program for Linux"
-HOMEPAGE="http://cedar-solutions.com"
-SRC_URI="http://cedar-solutions.com/ftp/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="!games-misc/bsd-games"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-ctype.h.patch
-}
diff --git a/app-misc/banner/banner-1.3.4.ebuild b/app-misc/banner/banner-1.3.4.ebuild
deleted file mode 100644
index 608ba7901d21..000000000000
--- a/app-misc/banner/banner-1.3.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="The well known banner program for Linux"
-HOMEPAGE="http://cedar-solutions.com/"
-SRC_URI="http://cedar-solutions.com/ftp/software/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="!games-misc/bsd-games"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.3.3-ctype.h.patch
-)
diff --git a/app-misc/banner/banner-1.3.5.ebuild b/app-misc/banner/banner-1.3.5.ebuild
index 04ec4557b924..b3e96bed5c2c 100644
--- a/app-misc/banner/banner-1.3.5.ebuild
+++ b/app-misc/banner/banner-1.3.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/pronovic/${PN}/archive/BANNER_V${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${PN}-${PN^^}_V${PV}"
diff --git a/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild b/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild
index 2f777c592fc7..f49a7923491d 100644
--- a/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild
@@ -50,7 +50,7 @@ fi
LICENSE="MPL-1.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
${PRECOMPILED} || IUSE+=" cacert"
diff --git a/app-misc/rlwrap/rlwrap-0.43.ebuild b/app-misc/rlwrap/rlwrap-0.43.ebuild
index 8347953f5c82..e339f0280bb0 100644
--- a/app-misc/rlwrap/rlwrap-0.43.ebuild
+++ b/app-misc/rlwrap/rlwrap-0.43.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/hanslub42/${PN}/releases/download/v${PV}/${P}.tar.gz
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~mips ppc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="debug"
RDEPEND="sys-libs/readline:0="
diff --git a/app-misc/wipe/files/wipe-2.3.1-musl-stdint.patch b/app-misc/wipe/files/wipe-2.3.1-musl-stdint.patch
new file mode 100644
index 000000000000..f14c77e09766
--- /dev/null
+++ b/app-misc/wipe/files/wipe-2.3.1-musl-stdint.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/713622
+--- a/rand.h
++++ b/rand.h
+@@ -20,15 +20,9 @@
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+-#ifdef HAVE_STDINT_H
+-# include "stdint.h"
+-#else
+-# ifndef LINUX
+-# define u_int32_t uint32_t
+-# endif
+-#endif
++#include
+
+-typedef u_int32_t u_rand_t;
++typedef uint32_t u_rand_t;
+
+ #ifndef UINT32_MAX
+ # define UINT32_MAX ULONG_MAX
diff --git a/app-misc/wipe/wipe-2.3.1.ebuild b/app-misc/wipe/wipe-2.3.1.ebuild
index 8775ae458c90..2fd02b71399c 100644
--- a/app-misc/wipe/wipe-2.3.1.ebuild
+++ b/app-misc/wipe/wipe-2.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools
@@ -12,12 +12,11 @@ SRC_URI="mirror://sourceforge/wipe/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-LDFLAGS.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-LDFLAGS.patch
+ "${FILESDIR}"/${PN}-2.3.1-musl-stdint.patch
+)
src_prepare() {
default
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index c6ced0b9bdca..0a0608fb5f53 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/pdsh/Manifest b/app-shells/pdsh/Manifest
index b3c5c819b87e..4e2aae205eb1 100644
--- a/app-shells/pdsh/Manifest
+++ b/app-shells/pdsh/Manifest
@@ -1 +1,2 @@
DIST pdsh-2.26.tar.bz2 490732 BLAKE2B 809a7ee0a1026e0cdaea8bf97c046a3a6e2994199dbbdb2cebe56de0393e8422a07e86f1ff60d6e750bf7279ccb43c03ea3aa4529b6fa6a34e3d77d90f0c3597 SHA512 3f15b3bb4fc2cff27a3b5d68de3e6cb74bb4001288a787763358a0641d0cc77c840b2c6641213ef31bc9d9d69cfe9531b25d7a9375630a5b008b1bcffbe95c0a
+DIST pdsh-2.34.tar.gz 215708 BLAKE2B dba626c66b9a17536fc02d8482b776d539ee680354326c821dc916735d1fc115226fcf22868407830245067cf45ddf9c997cd8c382b0dde0168d9ed6cb4fcc4d SHA512 2d4e090d97f6bad97ee1dbdf2ee29e4d9603edfd5c92a6935131ef7f7bbff797cceb8ad3a72e3d5995d3d5302eac985d129f4968e3fa6744785a3df2d0fda33c
diff --git a/app-shells/pdsh/files/pdsh-2.34-slibtool.patch b/app-shells/pdsh/files/pdsh-2.34-slibtool.patch
new file mode 100644
index 000000000000..1be0485b9c6a
--- /dev/null
+++ b/app-shells/pdsh/files/pdsh-2.34-slibtool.patch
@@ -0,0 +1,20 @@
+https://github.com/chaos/pdsh/pull/130
+https://bugs.gentoo.org/775593
+From 258de95760a46c6d4c84e904823425aa1a180211 Mon Sep 17 00:00:00 2001
+From: orbea
+Date: Tue, 16 Mar 2021 13:25:52 -0700
+Subject: [PATCH] build: Use LDADD instead of LDFLAGS for libcommon.la.
+--- a/src/pdsh/Makefile.am
++++ b/src/pdsh/Makefile.am
+@@ -16,9 +16,9 @@ else
+ MODULE_FLAGS = -export-dynamic $(AIX_PDSH_LDFLAGS) -ldl
+ endif
+
+-pdsh_LDADD = $(READLINE_LIBS)
+-pdsh_LDFLAGS = $(MODULE_LIBS) $(MODULE_FLAGS) \
++pdsh_LDADD = $(READLINE_LIBS) \
+ $(top_builddir)/src/common/libcommon.la
++pdsh_LDFLAGS = $(MODULE_LIBS) $(MODULE_FLAGS)
+
+ pdsh_inst_LDADD = $(pdsh_LDADD)
+ pdsh_inst_LDFLAGS = $(pdsh_LDFLAGS)
diff --git a/app-shells/pdsh/metadata.xml b/app-shells/pdsh/metadata.xml
index 2c51800069f5..46fe03a5e32b 100644
--- a/app-shells/pdsh/metadata.xml
+++ b/app-shells/pdsh/metadata.xml
@@ -24,6 +24,7 @@
+ chaos/pdsh
pdsh
diff --git a/app-shells/pdsh/pdsh-2.34.ebuild b/app-shells/pdsh/pdsh-2.34.ebuild
new file mode 100644
index 000000000000..6fd3cd631503
--- /dev/null
+++ b/app-shells/pdsh/pdsh-2.34.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A high-performance, parallel remote shell utility"
+HOMEPAGE="https://github.com/chaos/pdsh"
+SRC_URI="https://github.com/chaos/pdsh/archive/${P}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crypt readline rsh test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ crypt? ( net-misc/openssh )
+ rsh? ( net-misc/netkit-rsh )
+ readline? ( sys-libs/readline:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-util/dejagnu )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.34-slibtool.patch"
+)
+
+pkg_setup() {
+ PDSH_MODULE_LIST="${PDSH_MODULE_LIST:-netgroup}"
+ MODULE_CONFIG=""
+
+ local m
+ local valid_modules=":xcpu:ssh:exec:qshell:genders:nodeupdown:mrsh:mqshell:dshgroups:netgroup:"
+
+ for m in ${PDSH_MODULE_LIST}; do
+ if [[ "${valid_modules}" == *:${m}:* ]]; then
+ MODULE_CONFIG="${MODULE_CONFIG} --with-${m}"
+ fi
+ done
+
+ elog "Building ${PF} with the following modules:"
+ elog " ${PDSH_MODULE_LIST}"
+ elog "This list can be changed in /etc/portage/make.conf by setting"
+ elog "PDSH_MODULE_LIST=\"module1 module2...\""
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ econf ${MODULE_CONFIG} \
+ --with-machines \
+ --enable-shared \
+ --disable-static \
+ $(use_with crypt ssh) \
+ $(use_with rsh) \
+ $(use_with readline)
+}
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 55150abfe726..e5f047a7e3c8 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/reed/reed-5.4.ebuild b/app-text/reed/reed-5.4.ebuild
index 10999a62f908..6e417c037980 100644
--- a/app-text/reed/reed-5.4.ebuild
+++ b/app-text/reed/reed-5.4.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
DESCRIPTION="This is a text pager (text file viewer), used to display etexts"
# Homepage http://www.sacredchao.net/software/reed/index.shtml does not exist.
@@ -13,19 +14,25 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 x86"
+BDEPEND="virtual/pkgconfig"
DEPEND="sys-libs/ncurses"
RDEPEND="${DEPEND}"
DOCS=( AUTHORS BUGS NEWS README )
src_prepare() {
- sed -e 's:-O2:$(CFLAGS) $(LDFLAGS):' \
+ default
+
+ sed -e 's;-O2;$(CFLAGS) $(LDFLAGS);' \
-e 's: wrap::' \
-e 's:-s reed:reed:' \
- -e 's:-lcurses:$(shell ${PKG_CONFIG} --libs ncurses):g' \
+ -e "s:-lcurses:$($(tc-getPKG_CONFIG) --libs ncurses):g" \
-i Makefile.in || die
- rm wrap.1 #Collision with talkfilters, bug #247396
- tc-export CC PKG_CONFIG
+
+ # Collision with talkfilters, bug #247396
+ rm wrap.1 || die
+
+ tc-export CC
}
src_configure() {
diff --git a/app-text/scdoc/scdoc-9999.ebuild b/app-text/scdoc/scdoc-9999.ebuild
index 15ecbe1b112a..d162fe258aaf 100644
--- a/app-text/scdoc/scdoc-9999.ebuild
+++ b/app-text/scdoc/scdoc-9999.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
@@ -40,5 +40,5 @@ src_compile() {
src_install() {
emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
- PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install
+ PCDIR="${EPREFIX}/usr/$(get_libdir)/pkgconfig" install
}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 65f8ea1f44a9..565af7df0d6d 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/lmdb/lmdb-0.9.28.ebuild b/dev-db/lmdb/lmdb-0.9.28.ebuild
index 8e41dc907e6d..270b26e5bf16 100644
--- a/dev-db/lmdb/lmdb-0.9.28.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.28.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://git.openldap.org/openldap/openldap/-/archive/${MY_P}/openldap-$
LICENSE="OPENLDAP"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
DEPEND=""
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
index ebffdbbcada1..4923fe57f0c3 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-8.0.23-r1.ebuild
@@ -11,11 +11,20 @@ MULTILIB_CHOST_TOOLS=( /usr/bin/mysql_config )
DESCRIPTION="C client library for MariaDB/MySQL"
HOMEPAGE="https://dev.mysql.com/downloads/"
-SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-${PV}.tar.gz"
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/mysql/mysql-server.git"
+
+ inherit git-r3
+else
+ SRC_URI="https://dev.mysql.com/get/Downloads/MySQL-$(ver_cut 1-2)/mysql-boost-${PV}.tar.gz"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+
+ S="${WORKDIR}/mysql-${PV}"
+fi
LICENSE="GPL-2"
SLOT="0/21"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
IUSE="ldap libressl static-libs"
RDEPEND="
@@ -39,8 +48,6 @@ RDEPEND+=" !=virtual/jdk-1.8:*
+DEPEND=">=virtual/jdk-1.8:*
test? ( dev-java/junit:4 )
${CDEPEND}"
@@ -34,8 +33,10 @@ S="${WORKDIR}/${P}"
JAVA_SRC_DIR="src/main/java"
src_prepare() {
+ eapply_user
+
# See below for details.
- eapply_user "${FILESDIR}/icedtea-arm.patch"
+ eapply "${FILESDIR}/icedtea-arm.patch"
# We need the bundled jflex.jar.
rm -rv ${JAVA_SRC_DIR}/java_cup examples/pom.xml || die
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index c628ee987b0b..ff989ac693e7 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/mujs/mujs-1.0.9.ebuild b/dev-lang/mujs/mujs-1.0.9.ebuild
index 0761367df73f..5d2b197be958 100644
--- a/dev-lang/mujs/mujs-1.0.9.ebuild
+++ b/dev-lang/mujs/mujs-1.0.9.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit flag-o-matic toolchain-funcs
-DESCRIPTION="An embeddable Javascript interpreter in C."
+DESCRIPTION="An embeddable JavaScript interpreter in C"
HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
SRC_URI="https://github.com/ccxvii/mujs/archive/${PV}.tar.gz -> ${P}.tar.gz"
# Not available right now.
diff --git a/dev-lang/mujs/mujs-1.1.0.ebuild b/dev-lang/mujs/mujs-1.1.0.ebuild
index af61b9b01bf5..6488566e188c 100644
--- a/dev-lang/mujs/mujs-1.1.0.ebuild
+++ b/dev-lang/mujs/mujs-1.1.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit flag-o-matic toolchain-funcs
-DESCRIPTION="An embeddable Javascript interpreter in C."
+DESCRIPTION="An embeddable JavaScript interpreter in C"
HOMEPAGE="https://mujs.com/ https://github.com/ccxvii/mujs"
SRC_URI="https://github.com/ccxvii/mujs/archive/${PV}.tar.gz -> ${P}.tar.gz"
# Not available right now.
diff --git a/dev-lang/python/python-2.7.18_p7.ebuild b/dev-lang/python/python-2.7.18_p7.ebuild
index 1f7f426a4b16..527113ad67ca 100644
--- a/dev-lang/python/python-2.7.18_p7.ebuild
+++ b/dev-lang/python/python-2.7.18_p7.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+IUSE="-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.
# If you need to apply a patch which requires python for bootstrapping, please
diff --git a/dev-lang/python/python-3.10.0_alpha6-r2.ebuild b/dev-lang/python/python-3.10.0_alpha6-r2.ebuild
index adedfd6f3388..7d2e54b48f91 100644
--- a/dev-lang/python/python-3.10.0_alpha6-r2.ebuild
+++ b/dev-lang/python/python-3.10.0_alpha6-r2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.6.13.ebuild b/dev-lang/python/python-3.6.13.ebuild
index 571d4f1ad6ed..9895dab7479a 100644
--- a/dev-lang/python/python-3.6.13.ebuild
+++ b/dev-lang/python/python-3.6.13.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test +threads tk wininst +xml"
RESTRICT="!test? ( test )"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.7.10.ebuild b/dev-lang/python/python-3.7.10.ebuild
index 3096dbae0b40..b0f877ad04f8 100644
--- a/dev-lang/python/python-3.7.10.ebuild
+++ b/dev-lang/python/python-3.7.10.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}/${PYVER}m"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.8.8.ebuild b/dev-lang/python/python-3.8.8.ebuild
index d22161e4b805..4806f5ff97e2 100644
--- a/dev-lang/python/python-3.8.8.ebuild
+++ b/dev-lang/python/python-3.8.8.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-lang/python/python-3.9.2.ebuild b/dev-lang/python/python-3.9.2.ebuild
index 6c06b799495c..defe44939ba6 100644
--- a/dev-lang/python/python-3.9.2.ebuild
+++ b/dev-lang/python/python-3.9.2.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="PSF-2"
SLOT="${PYVER}"
KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
+IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
RESTRICT="!test? ( test )"
# Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index f4de183bc8d2..b7485bafcb00 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
index 500aa56870b3..32fdde1ac701 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r4.ebuild
@@ -57,6 +57,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch"
"${FILESDIR}/${PN}-2.1.27-memmem.patch"
"${FILESDIR}/${PN}-2.1.27-CVE-2019-19906.patch"
+ "${FILESDIR}/${PN}-2.1.27-slibtool.patch"
)
pkg_setup() {
diff --git a/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-slibtool.patch b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-slibtool.patch
new file mode 100644
index 000000000000..81198cb87f0d
--- /dev/null
+++ b/dev-libs/cyrus-sasl/files/cyrus-sasl-2.1.27-slibtool.patch
@@ -0,0 +1,18 @@
+https://github.com/cyrusimap/cyrus-sasl/pull/623
+https://bugs.gentoo.org/775875
+
+From 5b8075eeba8d0334573689450b07610c176a2618 Mon Sep 17 00:00:00 2001
+From: orbea
+Date: Wed, 9 Sep 2020 07:29:38 -0700
+Subject: [PATCH] common: Define the missing crypto_compat_version version.
+
+--- a/common/Makefile.am
++++ b/common/Makefile.am
+@@ -46,6 +46,7 @@
+ # See
+ # CURRENT:REVISION:AGE
+ plugin_common_version = 3:0:0
++crypto_compat_version = 0:0:0
+
+ AM_CPPFLAGS=-fPIC -I$(top_srcdir)/include -I$(top_builddir)/include
+
diff --git a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild b/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
index 3284a42cf6a1..c56b63111a4f 100644
--- a/dev-libs/hyphen/hyphen-2.8.8-r1.ebuild
+++ b/dev-libs/hyphen/hyphen-2.8.8-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
@@ -29,5 +29,6 @@ src_install() {
dodoc doc/*.pdf
rm -r "${ED}"/usr/share/hyphen || die
- rm "${ED}"/usr/lib*/libhyphen.la || die
+ # bug #775587
+ rm -f "${ED}/usr/$(get_libdir)/libhyphen.la" || die
}
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index 575e7819b21a..cd2bb8188659 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -1 +1,2 @@
DIST liblinear-242.tar.gz 561806 BLAKE2B 49c8f87909083addaf62666f34c008e6cf44240f28fdf2fbeca89862e9e19d451cc7ff51ce5b5da589cc701f70ce408c3eefb249f8585a8598e5ff3976177fe2 SHA512 fbcb219f7313b15898e55bd17c6b280007dd4feb913fafd2c3e10375b5a63b8bd274c9d52fd7b265a7575d4657cf4797b734e5793b18c758dfd9ab731fc0e904
+DIST liblinear-243.tar.gz 565437 BLAKE2B 6367cfbdc040b9183c4993f5340a4d74a8dde48da04ef07f725dc5735073e1b9a7440bad325e9f7527ad76d675dbf3bb47d1d43fc323e1e42ef360d679e816ff SHA512 a0cfa9803285cdfda54752e7addfb210a9ba8f7056cfc8aca13987db7f0bef5fe02d6179eadc829cb243670414da061e6c4cf3d50d682ce392778a0e8cb9e753
diff --git a/dev-libs/liblinear/liblinear-243.ebuild b/dev-libs/liblinear/liblinear-243.ebuild
new file mode 100644
index 000000000000..bc03e36ab2dd
--- /dev/null
+++ b/dev-libs/liblinear/liblinear-243.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Library for Large Linear Classification"
+HOMEPAGE="https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear"
+SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+src_prepare() {
+ default
+
+ sed -i \
+ -e '/^AR/s|=|?=|g' \
+ -e '/^RANLIB/s|=|?=|g' \
+ -e '/^CFLAGS/d;/^CXXFLAGS/d' \
+ blas/Makefile || die
+ sed -i \
+ -e 's|make|$(MAKE)|g' \
+ -e '/$(LIBS)/s|$(CFLAGS)|& $(LDFLAGS)|g' \
+ -e '/^CFLAGS/d;/^CXXFLAGS/d' \
+ -e 's|$${SHARED_LIB_FLAG}|& $(LDFLAGS)|g' \
+ Makefile || die
+
+ # fix install_name on Darwin
+ sed -i \
+ -e '/install_name/s:liblinear.so.$(SHVER):'"${EPREFIX}"'/usr/lib/liblinear.$(SHVER).dylib:' \
+ -e '/LDFLAGS/s:liblinear.so.$(SHVER):liblinear'"$(get_libname '$(SHVER)')"':' \
+ Makefile || die
+}
+
+src_compile() {
+ emake \
+ CC="$(tc-getCC)" \
+ CXX="$(tc-getCXX)" \
+ CFLAGS="${CFLAGS} -fPIC" \
+ CXXFLAGS="${CXXFLAGS} -fPIC" \
+ AR="$(tc-getAR) rcv" \
+ RANLIB="$(tc-getRANLIB)" \
+ lib all
+}
+
+src_install() {
+ dolib.so ${PN}$(get_libname 4)
+ dosym ${PN}$(get_libname 4) /usr/$(get_libdir)/${PN}$(get_libname)
+
+ newbin predict ${PN}-predict
+ newbin train ${PN}-train
+
+ doheader linear.h
+
+ dodoc README
+}
diff --git a/dev-libs/libmix/metadata.xml b/dev-libs/libmix/metadata.xml
index 6f49eba8f496..979bcc7aec93 100644
--- a/dev-libs/libmix/metadata.xml
+++ b/dev-libs/libmix/metadata.xml
@@ -1,5 +1,8 @@
-
+
+ sam@gentoo.org
+ Sam James
+
diff --git a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild b/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
index 9cab84c8f96e..6fad562646f2 100644
--- a/dev-libs/libparserutils/libparserutils-0.2.4-r3.ebuild
+++ b/dev-libs/libparserutils/libparserutils-0.2.4-r3.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="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
IUSE="iconv test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 586225f4fc1f..7bdf1085dee6 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -2,3 +2,4 @@ DIST nspr-4.26.tar.gz 1079778 BLAKE2B db83afa5e3ab2e0ef92aa236db6d9f25e963b77df7
DIST nspr-4.27.tar.gz 1080036 BLAKE2B 2d7a24259ff6b04e7a71e705d54612f27957824969b94eab251d6a53d91c7630d59cd107a6b9f5c6c0a308bac1db1ebc286602d672d4828d2322288456a5ce78 SHA512 2be539e6fd5ed8987874147a2bacc3f0b7177cdfddbb1a4f9e5f93575de871584b05fb56ca4e1ba5f7e53074cd4069310658f1559de0f38def208b087b6e6dca
DIST nspr-4.28.tar.gz 1080086 BLAKE2B 7b4bfd8e05f6303d9d41c3c2686447cd1f16b029d8219b9fc2c83f4a16a8ccf214ad6374e0caf9816aaced1e14650cb43acb92b89d7e9d0886acc59292b53d1e SHA512 5badee7bc4b43270b384e2f6ee0654be88b2fb4a5db1dfc46e441520bf66496105db80bced2234b73c18150eb6a6fe00f93cea1e2cfe809404bfd3e02de109c4
DIST nspr-4.29.tar.gz 1078192 BLAKE2B 748456a0d31a33b1b32ed66b15658df3541304855941887d873a672124e77326fda42e9895ac65e237c6e4f09d4c7af9615a3c6fe65f85845a6caf23cc99caf4 SHA512 ba5ac275fe0beb69d7a7674c9ee9e4429bd5761daed285edd975ccc829af30d062bf4a0f5e44361e3bd191f21b1905f96ab146d53b55324020f13ecb3c05609b
+DIST nspr-4.30.tar.gz 1078175 BLAKE2B dcd55c9e267602e74a8e640f6a5f4bc47160f887fa528f409be33e78b21f0ab7e19df46fb6e729907a41c587b3d79f560da52463632660ef26c85b60e3cdc011 SHA512 b0d22e915f0533aa38e30e3cfd949d966d44d4c107d5f1a9d35b49cbbe759fda70f5d70f01d79fcf6b229128619f778a220df63ef7d07c21b616f9c44914a33e
diff --git a/dev-libs/nspr/nspr-4.30.ebuild b/dev-libs/nspr/nspr-4.30.ebuild
new file mode 100644
index 000000000000..e6c6b0dfafd2
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.30.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs multilib-minimal
+
+MIN_PV="$(ver_cut 2)"
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="https://www.mozilla.org/projects/nspr/"
+SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="debug elibc_musl"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/nspr-config
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.23-prtime.patch
+ "${FILESDIR}"/${PN}-4.7.1-solaris.patch
+ "${FILESDIR}"/${PN}-4.10.6-solaris.patch
+ "${FILESDIR}"/${PN}-4.8.4-darwin-install_name.patch
+ "${FILESDIR}"/${PN}-4.8.9-link-flags.patch
+ # We do not need to pass -L$libdir via nspr-config --libs
+ "${FILESDIR}"/${PN}-4.9.5_nspr_config.patch
+)
+
+src_prepare() {
+ cd "${S}"/nspr || die
+
+ default
+
+ use elibc_musl && eapply "${FILESDIR}"/${PN}-4.21-ipv6-musl-support.patch
+
+ # rename configure.in to configure.ac for new autotools compatibility
+ if [[ -e "${S}"/nspr/configure.in ]] ; then
+ einfo "Renaming configure.in to configure.ac"
+ mv "${S}"/nspr/configure.{in,ac} || die
+ else
+ elog "configure.in rename logic can be removed from ebuild."
+ fi
+
+ # We must run eautoconf to regenerate configure
+ eautoconf
+
+ # make sure it won't find Perl out of Prefix
+ sed -i -e "s/perl5//g" "${S}"/nspr/configure || die
+
+ # Respect LDFLAGS
+ sed -i -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
+ "${S}"/nspr/config/rules.mk || die
+}
+
+multilib_src_configure() {
+ # We use the standard BUILD_xxx but nspr uses HOST_xxx
+ tc-export_build_env BUILD_CC
+ export HOST_CC=${BUILD_CC} HOST_CFLAGS=${BUILD_CFLAGS} HOST_LDFLAGS=${BUILD_LDFLAGS}
+ tc-export AR CC CXX RANLIB
+ [[ ${CBUILD} != ${CHOST} ]] \
+ && export CROSS_COMPILE=1 \
+ || unset CROSS_COMPILE
+
+ local myconf=(
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ $(use_enable debug)
+ $(use_enable !debug optimize)
+ )
+
+ # The configure has some fancy --enable-{{n,x}32,64bit} switches
+ # that trigger some code conditional to platform & arch. This really
+ # matters for the few common arches (x86, ppc) but we pass a little
+ # more of them to be future-proof.
+
+ # use ABI first, this will work for most cases
+ case "${ABI}" in
+ alpha|arm|hppa|m68k|o32|ppc|s390|sh|sparc|x86) ;;
+ n32) myconf+=( --enable-n32 );;
+ x32) myconf+=( --enable-x32 );;
+ s390x|*64) myconf+=( --enable-64bit );;
+ default) # no abi actually set, fall back to old check
+ einfo "Running a short build test to determine 64bit'ness"
+ echo > "${T}"/test.c || die
+ ${CC} ${CFLAGS} ${CPPFLAGS} -c "${T}"/test.c -o "${T}"/test.o || die
+ case $(file "${T}"/test.o) in
+ *32-bit*x86-64*) myconf+=( --enable-x32 );;
+ *64-bit*|*ppc64*|*x86_64*) myconf+=( --enable-64bit );;
+ *32-bit*|*ppc*|*i386*) ;;
+ *) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+ esac ;;
+ *) ;;
+ esac
+
+ # Ancient autoconf needs help finding the right tools.
+ LC_ALL="C" ECONF_SOURCE="${S}/nspr" \
+ ac_cv_path_AR="${AR}" \
+ econf "${myconf[@]}"
+}
+
+multilib_src_install() {
+ # Their build system is royally confusing, as usual
+ MINOR_VERSION=${MIN_PV} # Used for .so version
+ emake DESTDIR="${D}" install
+
+ einfo "removing static libraries as upstream has requested!"
+ rm "${ED}"/usr/$(get_libdir)/*.a || die "failed to remove static libraries."
+
+ # install nspr-config
+ dobin config/nspr-config
+
+ # Remove stupid files in /usr/bin
+ rm "${ED}"/usr/bin/prerr.properties || die
+
+ # This is used only to generate prerr.c and prerr.h at build time.
+ # No other projects use it, and we don't want to depend on perl.
+ # Talked to upstream and they agreed w/punting.
+ rm "${ED}"/usr/bin/compile-et.pl || die
+}
diff --git a/dev-libs/ntl/ntl-11.4.4.ebuild b/dev-libs/ntl/ntl-11.4.4.ebuild
index 0a9584119e17..18f21afb1eb0 100644
--- a/dev-libs/ntl/ntl-11.4.4.ebuild
+++ b/dev-libs/ntl/ntl-11.4.4.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit toolchain-funcs
DESCRIPTION="High-performance and portable C++ number theory library"
@@ -54,8 +55,11 @@ src_configure() {
src_install() {
default
+
if ! use static-libs; then
- rm "${ED}/usr/$(get_libdir)"/libntl.{la,a} || die
+ # bug #775884
+ find "${ED}" -name '*.la' -delete || die
+ rm "${ED}/usr/$(get_libdir)"/libntl.a || die
fi
rm -r "${ED}"/usr/share/doc/NTL || die
diff --git a/dev-libs/simdjson/Manifest b/dev-libs/simdjson/Manifest
index f033f83a335a..2654789c3b29 100644
--- a/dev-libs/simdjson/Manifest
+++ b/dev-libs/simdjson/Manifest
@@ -1,3 +1,4 @@
DIST simdjson-0.7.1.tar.gz 7972319 BLAKE2B c06b1db95b5d826babf7c673b8ef390c2169d975bbec585f6ea98a53455643b4ec462683d312fabbf8a1155309ba9fdd20977ba813e0fbfad5cbe45363ef7189 SHA512 f2ed21db24a8c80c48194e875680ee27dcb87ce1ee52d7f7466e3096661ccee179986bdc15d93e2a3d8d9f2f659f3bd678c908cfbde4905afd95e5e767f84e1c
DIST simdjson-0.8.1.tar.gz 7994048 BLAKE2B 800fbec2b8d20394a894407dea09e3b61302cf6c772dc459b73a97f5ec1e29feb082366d202f5bd835fd54802435e8f437dddbe3ec6db449812b849cd02639b2 SHA512 c4861901595b574e5f1a17abb58f30072bc16e90dc245304019890cd59f172a56c2661410653ff3e4472670541ef2291b3661765f6d64b5f8f70c562b90a3bd0
DIST simdjson-0.8.2.tar.gz 7994750 BLAKE2B 5d2d69ea4829147efc703677384b95d39d8a97013ba22cbf73721a873683fda8033a52540582f4b7ba060cf46e59898cd743f6e281fb7e61a7cabd4fe3c23701 SHA512 d732b95696b9dcaf648de8536cec181161c846f1e97fa99af6015e39331fbcab39fb6c02378dba810cc75f905cb1c3c6f434fea2fd6f7e11d775aba4ec9b4127
+DIST simdjson-0.9.0.tar.gz 7952791 BLAKE2B 3229cc3cece573c9aa0fe21ba807e7698a038317dd17f7551d2afb79a1104efc0535e8af9b2f504cf00ce0f04a90bb7802507cf3d4188ff5d2dd057b7512d83f SHA512 800ae478e6f47d4e0cf1eb941b1a9f6a5098b2d6027f329ea50b449798798395d4ccab0c84271edcb7fbd2adca125ede3ad6fac3f2508e0af7aade85350af1aa
diff --git a/dev-libs/simdjson/files/simdjson-0.9.0-tests.patch b/dev-libs/simdjson/files/simdjson-0.9.0-tests.patch
new file mode 100644
index 000000000000..49594ca291c0
--- /dev/null
+++ b/dev-libs/simdjson/files/simdjson-0.9.0-tests.patch
@@ -0,0 +1,12 @@
+diff --git a/tests/ondemand/compilation_failure_tests/CMakeLists.txt b/tests/ondemand/compilation_failure_tests/CMakeLists.txt
+index 2d0959be..324edf80 100644
+--- a/tests/ondemand/compilation_failure_tests/CMakeLists.txt
++++ b/tests/ondemand/compilation_failure_tests/CMakeLists.txt
+@@ -14,6 +14,7 @@ function(add_dual_compile_test TEST_NAME)
+ endfunction(add_dual_compile_test)
+
+
++target_compile_options(simdjson-internal-flags INTERFACE -Werror=uninitialized)
+ add_dual_compile_test(iterate_char_star)
+ add_dual_compile_test(iterate_string_view)
+ add_dual_compile_test(iterate_temporary_buffer)
diff --git a/dev-libs/simdjson/simdjson-0.9.0.ebuild b/dev-libs/simdjson/simdjson-0.9.0.ebuild
new file mode 100644
index 000000000000..b13f61e541de
--- /dev/null
+++ b/dev-libs/simdjson/simdjson-0.9.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs cmake
+
+DESCRIPTION="SIMD accelerated C++ JSON library"
+HOMEPAGE="
+ https://simdjson.org/
+ https://github.com/simdjson/simdjson
+"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 Boost-1.0"
+SLOT="0/8"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test tools"
+
+BDEPEND="
+ sys-apps/file
+ sys-apps/findutils
+ sys-apps/grep
+"
+DEPEND="
+ tools? ( dev-libs/cxxopts:= )
+"
+
+REQUIRED_USE="test? ( tools )"
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/simdjson-0.8.0-dont-bundle-cxxopts.patch"
+ "${FILESDIR}/simdjson-0.9.0-tests.patch"
+)
+
+DOCS=(
+ AUTHORS
+ CONTRIBUTING.md
+ CONTRIBUTORS
+ HACKING.md
+ README.md
+)
+
+src_prepare() {
+ sed -e 's:-Werror ::' -i cmake/simdjson-flags.cmake || die
+ cmake_src_prepare
+}
+
+src_configure() {
+ local -a mycmakeargs=(
+ -DSIMDJSON_ENABLE_THREADS=ON
+ )
+
+ if use tools; then
+ mycmakeargs+=(
+ -DSIMDJSON_JUST_LIBRARY=OFF
+ -DSIMDJSON_GOOGLE_BENCHMARKS=OFF
+ -DSIMDJSON_COMPETITION=OFF
+ )
+ else
+ mycmakeargs+=(
+ -DSIMDJSON_JUST_LIBRARY=ON
+ )
+ fi
+
+ cmake_src_configure
+}
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 7bd71334b896..c6f4ab54a859 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,2 +1 @@
-DIST tree-sitter-0.19.0.tar.gz 2861471 BLAKE2B acb1ff34c2ce4bc3995f59569f1ffa153c76013701eb04b834ac041efe6a533397bf2d540b55c27182194a0dbe285698927f29a2be001add8235ae4357e15e2a SHA512 c5315b1b452303d0a2ef2e710cb282c303649464c0d0ca41380fef2a26f551a6b6166991f6fcf48a5a9c046871d368c062d1354fd0e1f327509c4b554ac8731e
-DIST tree-sitter-0.19.2.tar.gz 2864890 BLAKE2B b3c8a79ed5fa5749b5b824c03a7ae451c08d28c6f2f23a17e0b4b77d7c7c834a067025e3f8da7af75ee54773c186e394fb5cfac37d370e4a9f9489eb9ad7df19 SHA512 f021b44ca78f6855d0362eca122c01d0134ce376f6123547201abc86490276134b650f33a600dc72dc12916bb14e3b5c3814c480d4e789dec7f39bbd3175bd65
+DIST tree-sitter-0.19.3.tar.gz 2865501 BLAKE2B 0a2480457e7b82dcbd3217ef7f36f10db9dd07f277bd8318642867135d7f54a8fed6207f2017b125c7a8f9155040518e58cdb2a70504928896f0be9da3bf89a9 SHA512 49997fc69249a7fa935cf8a66d44bf4ba8dc8f19e56d3e0ea3ff08ed4bf2334b274b1d119989bdc7d693b284148cf7537e5f2acf5708661232bcb03f8a52c552
diff --git a/dev-libs/tree-sitter/tree-sitter-0.19.2.ebuild b/dev-libs/tree-sitter/tree-sitter-0.19.2.ebuild
deleted file mode 100644
index 62e7c8355b29..000000000000
--- a/dev-libs/tree-sitter/tree-sitter-0.19.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tree-sitter is a parser generator tool and an incremental parsing library."
-HOMEPAGE="https://github.com/tree-sitter/tree-sitter"
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-PATCHES=(
- "${FILESDIR}/${PN}-No-static-libs-gentoo.patch"
-)
-
-src_install() {
- emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
-}
diff --git a/dev-libs/tree-sitter/tree-sitter-0.19.0.ebuild b/dev-libs/tree-sitter/tree-sitter-0.19.3.ebuild
similarity index 100%
rename from dev-libs/tree-sitter/tree-sitter-0.19.0.ebuild
rename to dev-libs/tree-sitter/tree-sitter-0.19.3.ebuild
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index adf71c98adba..668cecaa25ae 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
index c0ee784e835e..8976098b07bc 100644
--- a/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="ZLIB GPL-2+"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
IUSE="kerberos tk httpd +ocamlopt +pcre ssl zip"
RESTRICT="installsources strip"
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild
deleted file mode 100644
index 88008b436c7c..000000000000
--- a/dev-ml/ocamlnet/ocamlnet-4.1.8.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit findlib
-
-MY_P=${P/_beta/test}
-DESCRIPTION="Modules for OCaml application-level Internet protocols"
-HOMEPAGE="http://projects.camlcity.org/projects/ocamlnet.html"
-SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="ZLIB GPL-2+"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk kerberos tk httpd +ocamlopt +pcre ssl zip"
-RESTRICT="installsources strip"
-
-# the auth-dh compile flag has been disabled as well, since it depends on
-# ocaml-cryptgps, which is not available.
-
-BDEPEND="
- dev-ml/cppo
- virtual/pkgconfig
-"
-RDEPEND="
- >=dev-ml/findlib-1.0
- >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
- pcre? ( >=dev-ml/pcre-ocaml-5:= )
- tk? ( dev-ml/labltk:= )
- ssl? ( net-libs/gnutls:= )
- gtk? ( dev-ml/lablgtk:2= )
- kerberos? ( virtual/krb5 )
- zip? ( dev-ml/camlzip:= )
-"
-DEPEND="${RDEPEND}"
-
-ocamlnet_use_with() {
- if use $1; then
- echo "-with-$2"
- else
- echo "-without-$2"
- fi
-}
-
-ocamlnet_use_enable() {
- if use $1; then
- echo "-enable-$2"
- else
- echo "-disable-$2"
- fi
-}
-
-src_configure() {
- ./configure \
- -bindir /usr/bin \
- -datadir /usr/share/${PN} \
- $(ocamlnet_use_enable ssl gnutls) \
- $(ocamlnet_use_enable gtk gtk2) \
- $(ocamlnet_use_enable kerberos gssapi) \
- $(ocamlnet_use_enable pcre pcre) \
- $(ocamlnet_use_enable tk tcl) \
- $(ocamlnet_use_enable zip zip) \
- $(ocamlnet_use_with httpd nethttpd) \
- || die "Error: econf failed!"
-}
-
-src_compile() {
- emake -j1 all
- if use ocamlopt; then
- emake -j1 opt
- fi
-}
-
-src_install() {
- findlib_src_install
-}
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 1e1c0d937714..32fa17cc4bc5 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/PEAR-Crypt_GPG/metadata.xml b/dev-php/PEAR-Crypt_GPG/metadata.xml
index a023f1bf4874..6d24d2bc5e13 100644
--- a/dev-php/PEAR-Crypt_GPG/metadata.xml
+++ b/dev-php/PEAR-Crypt_GPG/metadata.xml
@@ -13,4 +13,5 @@
pear/Crypt_GPG
Crypt_GPG
+
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6e96ebe07918..a0a7f14e3cc6 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index fb71d79d652f..21d19cee472c 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1 +1,2 @@
DIST autopep8-1.5.5.tar.gz 117991 BLAKE2B 74e9bfed663d68f4a73088fccd879c538d40c564e7527b067d549a15361dfba2adcb853a8895fc61da50972f947ce23900f8067f5b8e715f73d6a80c6c27ef5b SHA512 9982271805131a7330d4a2a46eda65c05f079925393686f2df7eb92dc9e172003f9d788663cb8c0c8849dbae4f64c518c310eb65c3df308a12700abab084c39c
+DIST autopep8-1.5.6.tar.gz 121134 BLAKE2B aefeb4cc53ac66fb6eaef4d7af286d6249e7139e5409fe6f6b3568f0c6216d758dd73a950d043e36b6f19cf5de83f62e28ca318c45a7e40ffdeac0f7a9e06cdf SHA512 d283c3e2021025097c6b2f95faf7db12664b7d1f69f82acf9fe94e20fbd49cfcb28ad47437aa3148503c59cf5c2690a842fd795f869731290c80dc9feb86637b
diff --git a/dev-python/autopep8/autopep8-1.5.6.ebuild b/dev-python/autopep8/autopep8-1.5.6.ebuild
new file mode 100644
index 000000000000..d3ff82ca62d1
--- /dev/null
+++ b/dev-python/autopep8/autopep8-1.5.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automatically formats Python code to conform to the PEP 8 style guide"
+HOMEPAGE="https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/"
+if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://github.com/hhatto/${PN}.git"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+ >=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+ dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/pydiff[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index ddc6da7ea77d..82e5db1be1a9 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -12,4 +12,5 @@ DIST boto3-1.17.25.tar.gz 349475 BLAKE2B 272c5bebed211d015638a652109f2b56475e0d6
DIST boto3-1.17.26.tar.gz 349529 BLAKE2B 8510b229aea7b725c6286772dff6d54a9df684eac7e455929c059fd02919238335c88af5c655e89bfb5821ac4b70415c8dbd2c549563d008823104d6d54088be SHA512 5ceb9dc557796471f4d582bdf47614a078285a83f9463acb92e5e59e9f82dbca379bf02c2288cf38cb5741f7860d6c8b23872305209d8a4ece697943cd06932d
DIST boto3-1.17.27.tar.gz 349887 BLAKE2B 1fde4af489c98b8c4f77660ad278abf6641f70da3a0f84ff33d29d082cd283cd8a9faa17a3d9675ca26453f8928c57bb2e3966c607ab677ed814e544c6c928bb SHA512 9c3e45d17a179edf6ff75c9392a3e16323029e4bcefec757a6dd94ccfad5afe718bf91ca6a72ea59fa2791d5a87e9c4b84d147d35b7f584d2df0f73a623c13fb
DIST boto3-1.17.28.tar.gz 350316 BLAKE2B a6fab50a064fd81337c013bb2516ba2baaa520aa8e7f08418ddaf9b6f0d99a1c8b8eb29b8fee6ab48620430153a0caf4bd296448e1de35a26a972d2e4bbf6df8 SHA512 c26800e18bb254707f0c7e7005b22b1270eae8bf0b8c13f6bcbbe46105ff7439b36c9c80863aefd1037df314abc687bf9b00045d12fb0d3b7337b02605810876
+DIST boto3-1.17.29.tar.gz 350960 BLAKE2B 8192d2ea8165b7d10ffdd56b30ba3fadf6f2373c61fc3a9b61713bd299f246ec1b00dce897254f954a93b3b7c150e1cbe8ddf4f0a5894a071e656963d3a06299 SHA512 f662a39aa66ffead103f1d8153ba4175a4905a96b152c1c23030ead3b731cdd008a50dea5f7192d719df2240f35e0290d9b4b3c00e87e77b5d396be7e707be8f
DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993
diff --git a/dev-python/boto3/boto3-1.17.29.ebuild b/dev-python/boto3/boto3-1.17.29.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.29.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/boto3"
+ inherit git-r3
+ BOTOCORE_PV=${PV}
+else
+ SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+ # botocore is x.(y+3).z
+ BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+ >=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+ >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+ >=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+ # don't lock versions to narrow ranges
+ sed -e '/botocore/ d' \
+ -e '/jmespath/ d' \
+ -e '/s3transfer/ d' \
+ -i setup.py || die
+
+ # prevent an infinite loop
+ rm tests/functional/docs/test_smoke.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 5c5b3019d50d..1b3b6c8414f6 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -12,4 +12,5 @@ DIST botocore-1.20.25.tar.gz 7508526 BLAKE2B 244b578cc0596e4fc6b225cd29d0b5ca2e4
DIST botocore-1.20.26.tar.gz 7510615 BLAKE2B bc8716642c09ec74f7d057bcd9608cbbad98fcb4caf09e0684a03744fda81c0483aebaa4c85e416dac7d54d0f2804aba59f15e714211b59edd824cd3067ed412 SHA512 30ce061c1b7e1830caaf7382352180f9316f8d1d806269726ef3bc00eeb7a3fc7689e43eb4666fe700ca2de564b427c4916289a555aca0138a630059462216c9
DIST botocore-1.20.27.tar.gz 7518860 BLAKE2B 73a5a5302a0adfe9c72ec40f0edec8fc97f9dcec0428f5785f2546d50e4b8eb8a9c287b29218ebd8ebe091ef0fd022a5b0ba459aae435c363511484a936d2ffb SHA512 1b63295a2f6cdf2c06cc10cd35c350a07eb5326bbd42f2dc2084bb54cac3ebb40f0635180e227632184a6bbff3b58b67bd90878acbfa4cc61879b7b8e77f3fbc
DIST botocore-1.20.28.tar.gz 7526082 BLAKE2B 523db8ca7ff9ae87ad30fe539f20b34f4627b3a60f58635778d81b7ab055ac7cfbe04b4c4ca6508284dd37f2e6b953210ed2def9608026490332d200f306f7a9 SHA512 f3af2bd784b96a2778361a83d0ad61e5108b0a90b3756575bc4b93aaddb13a0a07e6589f582f03ca95252b272e1f84c350c5a2e1f342f98627f70e8f42350c18
+DIST botocore-1.20.29.tar.gz 7533728 BLAKE2B 75ca3262805177118d0f1a6060d98badf54b07f3b607c4c1c0d057045f671474b11493819030a9e65080af0cdd48c8ea686836b7c9ef7bfe6098babf260f221d SHA512 92d3887929b34e5e6a80b1330e00e6a72d8cfd96b81cc36eed969361db4756607c7c447af73b05f5ff0c27699e32636df12627693c667dea0a9955d2553ea35e
DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df
diff --git a/dev-python/botocore/botocore-1.20.29.ebuild b/dev-python/botocore/botocore-1.20.29.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.29.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/boto/botocore"
+ inherit git-r3
+else
+ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/jmespath[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ >=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/jsonschema[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+ 'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+ # unpin deps
+ sed -i -e "s:>=.*':':" setup.py || die
+ # very unstable
+ sed -i -e 's:test_stress_test_token_bucket:_&:' \
+ tests/functional/retries/test_bucket.py || die
+ distutils-r1_src_prepare
+}
+
+python_test() {
+ # note: suites need to be run separately as one of the unit tests
+ # seems to be leaking mocks and breaking a few functional tests
+ nosetests -v tests/unit ||
+ die "unit tests failed under ${EPYTHON}"
+ nosetests -v tests/functional ||
+ die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 81d5e5529c9c..cead1bbdaf35 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,3 +1,4 @@
DIST google-auth-1.26.1.tar.gz 121927 BLAKE2B a24a9c5bca8de234213e75673ba49ef6b82eb3c165f9c3af276b3c4cd47750c6d8a53e46084ae71c8eadf474ec8f53c6a2469fd91e7bdcc87f61bd46bbf9704d SHA512 632cdada9975311ab079022da79334f69ae703183bef395c3b04fc86192c23032b9925259ade7c115883659b10a403661f2d9a39f3b5262b964d0b9f2947567f
DIST google-auth-1.27.0.tar.gz 157225 BLAKE2B d3bf40dac2f72d5bafa318c4ec07588a250d4d778b2313c22ef5f43742939b023c864f465f543bf9e8ef6fd0251ba4642f78151df2534e82f2f2a60f5894e63c SHA512 adadea669ddd18a345011602e9fd575fa7783aee0f786d6a42e97278e14a0acf721451d7171765c8aea4bfa5eaa63762f9f826a2d1d5f2c4ea6abbb7d7186ebb
DIST google-auth-1.27.1.tar.gz 157876 BLAKE2B 0a06451e8a800231972b5b167d45410791b38a1616043912befb5554eff217bd1af70bf34aaf455fe68f9f515ea143cb2446800231006c369005de6981f7f466 SHA512 d640bb5395f956fd3442ea31145af2d72855108bff6b11dfeecfd4b48ad4fa50efba838e423bace310e78bbae74860d6c031d4ee873a7ab6dd522eb49e3fbdab
+DIST google-auth-1.28.0.tar.gz 158266 BLAKE2B 7e1fcdd0a6d155c0170012d43062fa5df2c9dd731105990af6d055c0dc8f9c36917776876a25caedd4b804acf24cdebd93a0953a9f7642563a5abc05cc946156 SHA512 a02db23132950c99e032d8318451cd67127f1e9fc57731a8a76505a360d77484aef1859e54d8e4efa1bcde3f6f5379c3324d54cf57c0a95fb1fa7765f43e9581
diff --git a/dev-python/google-auth/google-auth-1.28.0.ebuild b/dev-python/google-auth/google-auth-1.28.0.ebuild
new file mode 100644
index 000000000000..400d08da8e38
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.28.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+ https://github.com/googleapis/google-auth-library-python/
+ https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+ dev-python/namespace-google[${PYTHON_USEDEP}]
+ >=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+ >=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+ >=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+ "
+BDEPEND="
+ test? (
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/flask[${PYTHON_USEDEP}]
+ dev-python/freezegun[${PYTHON_USEDEP}]
+ dev-python/grpcio[${PYTHON_USEDEP}]
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/moto[${PYTHON_USEDEP}]
+ dev-python/oauth2client[${PYTHON_USEDEP}]
+ dev-python/pyopenssl[${PYTHON_USEDEP}]
+ dev-python/pytest-localserver[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ dev-python/responses[${PYTHON_USEDEP}]
+ dev-python/urllib3[${PYTHON_USEDEP}]
+ )"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+ distutils-r1_python_install_all
+ find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 4d0ed801b7ce..e3699d6f0989 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,3 +1 @@
-DIST jsonpickle-1.5.0.tar.gz 106088 BLAKE2B dcd35979a428180f10611638c831b083d9b8307729a0b19fe89b283c30ecac58477bd6a66e89c31e214dd2f100385d9933dc00d506e1f9bbb4b6ea9c3a0eaed3 SHA512 7828ded98173cb10908a9d60fa6b3f358add360d738cd85a90f012ca24b15c6bbb19c611027bdb0a4d25fe0649978ae59ff08fb7b717ef503a9916152aa6f849
-DIST jsonpickle-1.5.2.tar.gz 110239 BLAKE2B 3d4ee457a3f45dd1a6d1004d3fce66c95057958ec172227a7590631e479bd3a63dafe2ece04f5a0a78b9e283f61d949f5c359e4dd9270e162a3060e1032fc562 SHA512 609effeb5553c7c273aa621a8e86b4e630754eab1a948c505a08c98ff13e7f2622a0eb71374c03b69cf8e07c9a3b06fc9d282efba299a720b342424d642cfc6e
DIST jsonpickle-2.0.0.tar.gz 110336 BLAKE2B 574dab58418c5225a9364836d04eaabf3384e9dab404d191846a4bb41e9c8bbb51243a6a231ec8baf05ff9be337e12b5c96c46b74a327e9f05653ca81bf6ccf2 SHA512 acba11e5dfce116b27edfe0fdccdd74755e299aa43f873dd1ce547d947b58f14c1059c21d04007b5be0857f7ce69fe5355fb2edc47a99cc2217fe00297ca78d3
diff --git a/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild b/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
deleted file mode 100644
index 6e5f3a477d2a..000000000000
--- a/dev-python/jsonpickle/jsonpickle-1.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-# There are optional json backends serializer/deserializers in addition to those selected here
-# jsonlib, yajl.
-RDEPEND="
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/feedparser[${PYTHON_USEDEP}]
- dev-python/ujson[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/importlib_metadata[${PYTHON_USEDEP}]
- ' python3_{6,7})
-"
-# toml via setuptools_scm[toml]
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx "docs/source"
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # too many dependencies
- rm tests/pandas_test.py || die
- sed -e '/pandas/ d' -i tests/runtests.py || die
- # broken with gmpy
- rm tests/ecdsa_test.py || die
-
- sed -i -e 's:--flake8 --black --cov --cov-append::' pytest.ini || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- pytest -vv tests || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpickle/jsonpickle-1.5.2.ebuild b/dev-python/jsonpickle/jsonpickle-1.5.2.ebuild
deleted file mode 100644
index cfb3bc401537..000000000000
--- a/dev-python/jsonpickle/jsonpickle-1.5.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-# There are optional json backends serializer/deserializers in addition to those selected here
-# jsonlib, yajl.
-RDEPEND="
- dev-python/feedparser[${PYTHON_USEDEP}]
- dev-python/simplejson[${PYTHON_USEDEP}]
- dev-python/ujson[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '
- dev-python/importlib_metadata[${PYTHON_USEDEP}]
- ' python3_7)
-"
-# toml via setuptools_scm[toml]
-BDEPEND="
- dev-python/setuptools_scm[${PYTHON_USEDEP}]
- dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx "docs/source"
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # too many dependencies
- rm tests/pandas_test.py || die
- # broken with gmpy
- rm tests/ecdsa_test.py || die
-
- sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- pytest -vv tests || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
index cfb3bc401537..629cee7b6893 100644
--- a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
# There are optional json backends serializer/deserializers in addition to those selected here
# jsonlib, yajl.
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index c8e174ee38f5..a2d89343127d 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1 +1,2 @@
DIST jupyter_console-6.1.0.tar.gz 28468 BLAKE2B 08ef158de6a0eb8fe741dac00b74e11f7e577b5097f54aa16c47ae9e39607231e19a1fcd0a96cbae41d41fad891fefdb532d0f66bc03aa66ff99a8d3ff3cb28c SHA512 abb5457a90d109457e91071cd8b592a14bec7ead75fd667d656f9180a457e39bf470877b2e17c81ff512d1cc69b62a8f700996492f6164eb05a1581db82abbf7
+DIST jupyter_console-6.3.0.tar.gz 35313 BLAKE2B 980eac57de949654bf99d99eb74d8600d73d0699ab394e0ad4c5e937fdc278477442e0e95887c95f631ba1bc2b2469c36cc6e4bca8d5f11f97c4943c2f312c4f SHA512 777d9cf8b842eccea108a1857c421fec1bcdf8c226a6947d7ff4ee5d5da4bdbb50096e9e63638053d8eb200e55c093c753010ffb1460dae5579de16aad4e64a6
diff --git a/dev-python/jupyter_console/jupyter_console-6.3.0.ebuild b/dev-python/jupyter_console/jupyter_console-6.3.0.ebuild
new file mode 100644
index 000000000000..7a54103742fa
--- /dev/null
+++ b/dev-python/jupyter_console/jupyter_console-6.3.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A terminal-based console frontend for Jupyter kernels"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/ipython[${PYTHON_USEDEP}]
+ dev-python/ipykernel[${PYTHON_USEDEP}]
+ dev-python/jupyter_client[${PYTHON_USEDEP}]
+ =dev-libs/mathjax-2.4
- dev-python/argon2-cffi[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- >=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
- >=www-servers/tornado-5.0[${PYTHON_USEDEP}]
- dev-python/ipython_genutils[${PYTHON_USEDEP}]
- >=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
- >=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
- >=dev-python/pyzmq-17[${PYTHON_USEDEP}]
- >=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
- dev-python/nbformat[${PYTHON_USEDEP}]
- >=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
- dev-python/ipykernel[${PYTHON_USEDEP}]
- dev-python/send2trash[${PYTHON_USEDEP}]
- dev-python/prometheus_client[${PYTHON_USEDEP}]"
-
-# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
-# a version constraint.
-BDEPEND="
- test? (
- dev-python/requests[${PYTHON_USEDEP}]
- dev-python/requests-unixsocket[${PYTHON_USEDEP}]
- )
- "
-
-PATCHES=(
- "${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
-)
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
- # disable bundled mathjax
- sed -i 's/^.*MathJax.*$//' bower.json || die
-
- # require geckodriver
- rm -r notebook/tests/selenium || die
- # trash doesn't seem to work for us
- sed -e 's:test_delete:_&:' \
- -i notebook/services/contents/tests/test_manager.py || die
- sed -e 's:test_checkpoints_follow_file:_&:' \
- -e 's:test_delete:_&:' \
- -i notebook/services/contents/tests/test_contents_api.py || die
- # network-sandbox?
- sed -e 's:test_connections:_&:' \
- -e 's:test_culling:_&:' \
- -i notebook/services/kernels/tests/test_kernels_api.py || die
-
- sed -i -e "/'bdist_egg':/d" setup.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install() {
- distutils-r1_python_install
-
- ln -sf \
- "${EPREFIX}/usr/share/mathjax" \
- "${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
-}
-
-pkg_preinst() {
- # remove old mathjax folder if present
- rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
-}
diff --git a/dev-python/notebook/notebook-6.2.0.ebuild b/dev-python/notebook/notebook-6.2.0.ebuild
index 095c5d5f72c3..2308c2a8f0d6 100644
--- a/dev-python/notebook/notebook-6.2.0.ebuild
+++ b/dev-python/notebook/notebook-6.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
RDEPEND="
>=dev-libs/mathjax-2.4
diff --git a/dev-python/pandas/pandas-1.2.1-r2.ebuild b/dev-python/pandas/pandas-1.2.1-r1.ebuild
similarity index 97%
rename from dev-python/pandas/pandas-1.2.1-r2.ebuild
rename to dev-python/pandas/pandas-1.2.1-r1.ebuild
index 67cd25aff9d1..e8005c2752e4 100644
--- a/dev-python/pandas/pandas-1.2.1-r2.ebuild
+++ b/dev-python/pandas/pandas-1.2.1-r1.ebuild
@@ -122,12 +122,6 @@ python_prepare_all() {
}
python_compile() {
- if use amd64 || use x86; then
- # FMA apparently breaks rolling var/stdev
- # https://github.com/pandas-dev/pandas/issues/38921
- append-flags -mno-fma
- fi
-
distutils-r1_python_compile -j1
}
@@ -147,6 +141,11 @@ src_test() {
python_test() {
local deselect=(
+ # test for rounding errors, fails if we have better precision
+ # e.g. on amd64 with FMA or on arm64
+ # https://github.com/pandas-dev/pandas/issues/38921
+ pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
# weird issue, doesn't seem very important
'pandas/tests/base/test_misc.py::test_memory_usage[series-with-empty-index]'
)
diff --git a/dev-python/pandas/pandas-1.2.2-r1.ebuild b/dev-python/pandas/pandas-1.2.2-r1.ebuild
index a79b5b1c18ca..5ff9e82c2133 100644
--- a/dev-python/pandas/pandas-1.2.2-r1.ebuild
+++ b/dev-python/pandas/pandas-1.2.2-r1.ebuild
@@ -141,8 +141,8 @@ src_test() {
python_test() {
local deselect=(
- # broken on practically any hardware/CFLAGS but the one
- # the patch author was using
+ # test for rounding errors, fails if we have better precision
+ # e.g. on amd64 with FMA or on arm64
# https://github.com/pandas-dev/pandas/issues/38921
pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
diff --git a/dev-python/pandas/pandas-1.2.3-r2.ebuild b/dev-python/pandas/pandas-1.2.3-r1.ebuild
similarity index 97%
rename from dev-python/pandas/pandas-1.2.3-r2.ebuild
rename to dev-python/pandas/pandas-1.2.3-r1.ebuild
index 34c943b38155..5ff9e82c2133 100644
--- a/dev-python/pandas/pandas-1.2.3-r2.ebuild
+++ b/dev-python/pandas/pandas-1.2.3-r1.ebuild
@@ -122,12 +122,6 @@ python_prepare_all() {
}
python_compile() {
- if use amd64 || use x86; then
- # FMA apparently breaks rolling var/stdev
- # https://github.com/pandas-dev/pandas/issues/38921
- append-flags -mno-fma
- fi
-
distutils-r1_python_compile -j1
}
@@ -147,6 +141,11 @@ src_test() {
python_test() {
local deselect=(
+ # test for rounding errors, fails if we have better precision
+ # e.g. on amd64 with FMA or on arm64
+ # https://github.com/pandas-dev/pandas/issues/38921
+ pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
# weird issue, doesn't seem very important
'pandas/tests/base/test_misc.py::test_memory_usage[series-with-empty-index]'
)
diff --git a/dev-python/phply/phply-1.2.5.ebuild b/dev-python/phply/phply-1.2.5.ebuild
index ac2a2fcfc582..19867796c40e 100644
--- a/dev-python/phply/phply-1.2.5.ebuild
+++ b/dev-python/phply/phply-1.2.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
RDEPEND="dev-python/ply[${PYTHON_USEDEP}]"
BDEPEND="${RDEPEND}"
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 352066aeddbf..c900a22251c0 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1 +1,2 @@
DIST qtconsole-5.0.2.tar.gz 428499 BLAKE2B 42d71e1a1909f8e07705fd5e7e64194d865b70cc67377ba631bb75fb8678faea4d8dddce90a2e84c0898fa074a88b655290bcf9ee1f9aebb39f91d2370908dbf SHA512 b74711c0444b74efc2fc31c631e6a87cfc05045d8ae9eb8253a9fcd1c82a1ecb688cbe50dc2f3dd4dc5d47c6e2b4fa027ac22e77b7ac37e1ed3fa0a9d2b677bb
+DIST qtconsole-5.0.3.tar.gz 428599 BLAKE2B 3110d597fe8692d46ac64c8f058f96356be62b95e74ebba8476eae148a9aa51193da0fe67fecf8a2de90d280121367802866bf17f68c7ad5b52ce3f84914af82 SHA512 efe88c66a508eac4ed14efb698b99d80b1a292e4b90fb04f76be829e95cf12b36e3afd968a6c7203bdd077a8bedbf7207c3a717809aaa3a514dfd99f7d4d5dcb
diff --git a/dev-python/qtconsole/qtconsole-5.0.3.ebuild b/dev-python/qtconsole/qtconsole-5.0.3.ebuild
new file mode 100644
index 000000000000..9fea2d480c04
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-5.0.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+ dev-python/ipykernel[${PYTHON_USEDEP}]
+ dev-python/ipython_genutils[${PYTHON_USEDEP}]
+ dev-python/jupyter_core[${PYTHON_USEDEP}]
+ >=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/traitlets[${PYTHON_USEDEP}]
+ dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
+"
+BDEPEND="
+ test? (
+ dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
+ )
+"
+# required by the tests that are removed:
+# dev-python/flaky[${PYTHON_USEDEP}]
+# dev-python/pytest-qt[${PYTHON_USEDEP}]
+
+PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+src_prepare() {
+ # TODO: these tests require virtx; however, running under virtx
+ # causes pytest to segv on exit (even though tests pass)
+ rm qtconsole/tests/test_00_console_widget.py || die
+ distutils-r1_src_prepare
+}
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 259ec90dd8d5..d8d15070131d 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1 +1,3 @@
DIST responses-0.12.1.tar.gz 27123 BLAKE2B 2c77e3ac48e7430e2c91321a946c09746953b3aa2a93aff1ad277f849bc57fe8033d405cd0c391111ba31e523ecb2dfa5bc475519fb1224dff5247925eb54616 SHA512 cc840920895c5ab02b546d6441636197e93c4dc7346a801a14d663a30a761d78a0be73e820cdd5963e52d882958d9ea7873df6fcd6c032d99a230109b5c0ddb8
+DIST responses-0.13.0.tar.gz 30265 BLAKE2B fdf111b143fb47cb9d175a3718dabe1d23199e02719ece741a6416d25dc8ecf5fc67243c9f8d982b758524db45145d494131aa3f3659f04ff60c147da0fd9947 SHA512 84a542a4d1faccb3d530357db6e1edcf666c82a2eb3bfd86a5478fa96878bd42f82ffdec358f68e954838f5dd7dfa4aa6acf3dad7e0d1881fb8816a422b0e755
+DIST responses-0.13.1.tar.gz 30290 BLAKE2B 823ef6e9e6d760d4516770255c96a8ccd326be8a1b864eb176497b613f9ec97bc0916e8f80e32275859f91129cd1b7a90ee9c8620721ea6ee03440bc4e7500cd SHA512 b6628c5890a9034c003fe1e7ea656474fa553c56fe29e025645f28d524368d4f4e65268ccb384fd514f620fc5f5d008937697161868efefb0760d56a9174e1d6
diff --git a/dev-python/responses/responses-0.13.0.ebuild b/dev-python/responses/responses-0.13.0.ebuild
new file mode 100644
index 000000000000..d3c967c158e0
--- /dev/null
+++ b/dev-python/responses/responses-0.13.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-python/requests-2.0[${PYTHON_USEDEP}]
+ >=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+ dev-python/cookies[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+ test? (
+ dev-python/pytest-localserver[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/responses/responses-0.13.1.ebuild b/dev-python/responses/responses-0.13.1.ebuild
new file mode 100644
index 000000000000..d3c967c158e0
--- /dev/null
+++ b/dev-python/responses/responses-0.13.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+ >=dev-python/requests-2.0[${PYTHON_USEDEP}]
+ >=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+ dev-python/cookies[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+ test? (
+ dev-python/pytest-localserver[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 00476fe566a0..6f3ebe084fa9 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,2 +1,3 @@
DIST setuptools_scm-5.0.1.tar.gz 51679 BLAKE2B 33f43b437b675291ded4408dd5e68ffbf4615938f963516c0047ead023b2f2a50b28a0d91c7c72a8bdff678d9b8b292aeec36bf418b43f8d039f13560b1fbeb6 SHA512 055403539a26caeb119f3d6623e7b32ef52ccc11a39757fdd9b265ba191265346be5a062a5926a381ba47bbd1a666ffa632653ee6055050689cc38fe0f90cd0f
DIST setuptools_scm-5.0.2.tar.gz 52273 BLAKE2B a4166b293f26161be8748f0c4b819dba0c03186a95d0c06b6fd6fdee7910de60e034ab81f6f1d89f7a1b47381441deb8a38d05421aef3287b35705bbddee33ee SHA512 1e92d03e2d8473425c146a885eb641e98895c43afebcd3c66c1455ace2d81f187b87681072f8aacc5e8be166577f00138cc7c53e4b7d77cb1b598f835b72b010
+DIST setuptools_scm-6.0.1.tar.gz 51433 BLAKE2B 7045eec0c1a43d6c93c94e0b2799f0d000cda509fa0df9ee9a638b95383f07fe430b07c3bf72fdc4809563ac289521976956f728a4b2984921fa31532bb7ed8b SHA512 db27653c57f674ec62689247680adace3779216249f1b09a35e8a0233a1ec1acb9ae89b52acd439f7062da2ba1a45b8c0d6d81333ddda0764447c30698ddb314
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild
new file mode 100644
index 000000000000..07d1b0659787
--- /dev/null
+++ b/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage versions by scm tags via setuptools"
+HOMEPAGE="
+ https://github.com/pypa/setuptools_scm/
+ https://pypi.org/project/setuptools-scm/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+ !!=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
- dev-python/patsy[${PYTHON_USEDEP}]
- dev-python/scipy[${PYTHON_USEDEP}]
-"
-BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- doc? (
- dev-python/ipykernel[${PYTHON_USEDEP}]
- dev-python/jupyter_client[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- dev-python/nbconvert[${PYTHON_USEDEP}]
- dev-python/nbformat[${PYTHON_USEDEP}]
- dev-python/numpydoc[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- )
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/pandas[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/statsmodels-0.11.1-tests.patch"
-)
-
-distutils_enable_sphinx docs \
- 'dev-python/ipykernel' \
- 'dev-python/jupyter_client' \
- 'dev-python/matplotlib' \
- 'dev-python/nbconvert' \
- 'dev-python/numpydoc'
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # Prevent un-needed d'loading
- export VARTEXFONTS="${T}"/fonts
- export MPLCONFIGDIR="${T}"
- printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die
-
- # these tests require internet
- sed -i -e 's:test_results_on_the:_&:' \
- statsmodels/stats/tests/test_dist_dependant_measures.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- pushd "${BUILD_DIR}" >/dev/null || die
- "${EPYTHON}" -c '
-import statsmodels
-statsmodels.test(extra_args=["-vv"], exit=True)' \
- || die "tests fail with ${EPYTHON}"
- popd >/dev/null || die
-}
-
-python_install_all() {
- if use examples; then
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r examples
- fi
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Plotting functionality" "dev-python/matplotlib"
-}
diff --git a/dev-python/statsmodels/statsmodels-0.12.0.ebuild b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
deleted file mode 100644
index 54a47e5b4697..000000000000
--- a/dev-python/statsmodels/statsmodels-0.12.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Statistical computations and models for use with SciPy"
-HOMEPAGE="https://www.statsmodels.org/stable/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
- >=dev-python/numpy-1.15[${PYTHON_USEDEP}]
- >=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
- dev-python/patsy[${PYTHON_USEDEP}]
- >=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.15[${PYTHON_USEDEP}]
- >=dev-python/scipy-1.1[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/statsmodels-0.11.1-tests.patch"
-)
-
-distutils_enable_sphinx docs \
- 'dev-python/ipykernel' \
- 'dev-python/jupyter_client' \
- 'dev-python/matplotlib' \
- 'dev-python/nbconvert' \
- 'dev-python/numpydoc'
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # Prevent un-needed d'loading
- export VARTEXFONTS="${T}"/fonts
- export MPLCONFIGDIR="${T}"
- printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die
-
- # these tests require internet
- sed -i -e 's:test_results_on_the:_&:' \
- statsmodels/stats/tests/test_dist_dependant_measures.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- local -x MKL_NUM_THREADS=1
- local -x OMP_NUM_THREADS=1
- local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
- pushd "${BUILD_DIR}" >/dev/null || die
- "${EPYTHON}" -c "
-import statsmodels
-statsmodels.test(extra_args=['-vv', '-n', '${jobs}'], exit=True)" \
- || die "tests fail with ${EPYTHON}"
- popd >/dev/null || die
-}
-
-python_install_all() {
- if use examples; then
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r examples
- fi
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Plotting functionality" "dev-python/matplotlib"
-}
diff --git a/dev-python/statsmodels/statsmodels-0.12.1.ebuild b/dev-python/statsmodels/statsmodels-0.12.1.ebuild
deleted file mode 100644
index 54a47e5b4697..000000000000
--- a/dev-python/statsmodels/statsmodels-0.12.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Statistical computations and models for use with SciPy"
-HOMEPAGE="https://www.statsmodels.org/stable/index.html"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="
- >=dev-python/numpy-1.15[${PYTHON_USEDEP}]
- >=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
- dev-python/patsy[${PYTHON_USEDEP}]
- >=dev-python/scipy-1.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
- dev-python/cython[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.15[${PYTHON_USEDEP}]
- >=dev-python/scipy-1.1[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest-xdist[${PYTHON_USEDEP}]
- )
-"
-
-PATCHES=(
- "${FILESDIR}/statsmodels-0.11.1-tests.patch"
-)
-
-distutils_enable_sphinx docs \
- 'dev-python/ipykernel' \
- 'dev-python/jupyter_client' \
- 'dev-python/matplotlib' \
- 'dev-python/nbconvert' \
- 'dev-python/numpydoc'
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
- # Prevent un-needed d'loading
- export VARTEXFONTS="${T}"/fonts
- export MPLCONFIGDIR="${T}"
- printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die
-
- # these tests require internet
- sed -i -e 's:test_results_on_the:_&:' \
- statsmodels/stats/tests/test_dist_dependant_measures.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- local -x MKL_NUM_THREADS=1
- local -x OMP_NUM_THREADS=1
- local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
-
- pushd "${BUILD_DIR}" >/dev/null || die
- "${EPYTHON}" -c "
-import statsmodels
-statsmodels.test(extra_args=['-vv', '-n', '${jobs}'], exit=True)" \
- || die "tests fail with ${EPYTHON}"
- popd >/dev/null || die
-}
-
-python_install_all() {
- if use examples; then
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r examples
- fi
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Plotting functionality" "dev-python/matplotlib"
-}
diff --git a/dev-python/statsmodels/statsmodels-0.12.2.ebuild b/dev-python/statsmodels/statsmodels-0.12.2.ebuild
index 1f96e8caebb7..d67ff026af47 100644
--- a/dev-python/statsmodels/statsmodels-0.12.2.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.12.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
IUSE="examples"
RDEPEND="
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index 7faa912d52c8..3e0cdf4eadf4 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,3 +1,2 @@
-DIST translate-toolkit-3.3.1.tar.gz 5969914 BLAKE2B 2ede440a341be0bd0206400d01bab881e6070820f362c53f47b5f88e192bcb7a18d2bf667a678378110046f70a035d42b67a77e2dc70829da323d69f675d21cc SHA512 1578fb8f96fa83ad97051a20f02d6570f96f2346d99fc86172718c995468c318f318f27f2ef259bd5dc10521bda4ac7da17385f72b726d7ea3c0fe65af8f313e
DIST translate-toolkit-3.3.2.tar.gz 6123347 BLAKE2B 9bf5f2c84d15043d25744b3bb63526177748c7c38425bd73ad34dcf3b4051c11a3ce28ccaf5c907b6ced27d1fe9ecb06cfde46481a609df64adfedec83b91680 SHA512 53baf7c1203c27335201fbf339e2747d7b22696c219e6911c191b3c89cf6d1c0d84624ffa8c4c687e45fad229d3cb09f52d15d1d80dd914ccc8e2fff34a601be
DIST translate-toolkit-3.3.3.tar.gz 5903525 BLAKE2B a21c5d89c808615ff2f3f718e732ce5d5591a9d8a997950ae1066655cc3e4382065f75e7a86f8e37bdd0e146283f9bd941ff20479cb1af635f393e0e7f8fc196 SHA512 41964dc26dfbb983b1c2e4cbb0e9d8eb2a035369a94ef872f7703080b5ca0280a9364916a1e1256cd358b263bc72198e767462cc9065b54556fc481d1b85a836
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.1.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.1.ebuild
deleted file mode 100644
index 34d7b5c496f9..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="https://github.com/translate/translate"
-SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
- !dev-python/pydiff
- app-text/iso-codes
- >=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
- dev-python/cheroot[${PYTHON_USEDEP}]
- >=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
- >=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
- >=dev-python/python-levenshtein-0.12.0[${PYTHON_USEDEP}]
- dev-python/ruamel-yaml[${PYTHON_USEDEP}]
- sys-devel/gettext
- html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
- ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
- ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
- subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
- yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs \
- dev-python/sphinx-bootstrap-theme
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/translate-toolkit-3.3.0-no-install-docs.patch
-)
-
-python_test() {
- local deselect=(
- # Not packaging optional phply for now.
- # Seems inactive upstream.
- --ignore translate/convert/test_php2po.py
- --ignore translate/convert/test_po2php.py
- --ignore translate/storage/test_php.py
- --deselect 'translate/storage/test_cpo.py::TestCPOUnit::test_buildfromunit'
- --deselect 'translate/storage/test_po.py::TestPOUnit::test_buildfromunit'
- --deselect 'translate/storage/test_pypo.py::TestPYPOUnit::test_buildfromunit'
-
- # Fails with network-sandbox (and even with it off but w/ softer fail)
- --deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
- --deselect 'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
- )
-
- if ! use ini; then
- deselect+=(
- --ignore translate/convert/test_ini2po.py
- --ignore translate/convert/test_po2ini.py
- )
- fi
-
- if ! use subtitles; then
- deselect+=(
- --ignore translate/storage/test_subtitles.py
- )
- fi
-
- # translate/storage/test_mo.py needs 'pocompile'
- distutils_install_for_testing --via-root
-
- pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- if ! use html; then
- rm "${ED}"/usr/bin/{html2po,po2html} || die
- fi
- if ! use ical; then
- rm "${ED}"/usr/bin/{ical2po,po2ical} || die
- fi
- if ! use ini; then
- rm "${ED}"/usr/bin/{ini2po,po2ini} || die
- fi
- if ! use subtitles; then
- rm "${ED}"/usr/bin/{sub2po,po2sub} || die
- fi
-
- python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild
index db64c6cc4c27..894d0ead037f 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.3.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/translate/translate/releases/download/${PV}/${P}.tar
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
IUSE="+html +ical +ini +subtitles +yaml"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
index 8d7c9ce7d6ba..3abfc8316950 100644
--- a/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0.ebuild
@@ -15,6 +15,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz -> py-${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index a91b4e931df5..01d4ea27fc40 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,2 +1,3 @@
DIST twine-3.3.0.tar.gz 148996 BLAKE2B 60668acd0481534631ca0ecf3c755df7e9e46c6d183d0f1c73ed7467cfecc144878d6ccf7ef2ee62efa17eb5629f5ed74c77c8ae4d57ef16530fad31afe40d97 SHA512 94fc7a9b3f2b5fc7c06baf55debf4fd55f6a2b4c4321c9bff46b844166769ce8bdcab10355c4967998149b62e13b26e11a30ff66042bfdd5af24d448321fd291
DIST twine-3.4.0.tar.gz 211582 BLAKE2B 6b309880e96142a666f0113343f6a7a604ec6058f58429befa4709366d8dd8b6ddd0d2cd69d74653d12a74a615e6e3ad6b7d96892aa5beab00c934be2fc4b8d6 SHA512 6ce4757048fe7b5ada8a384fa185e80cee8412ef7f0561f55a5cbec39c0069522b57e403f148b9b55c55330a577873a5e9597ca0a6b0fb0cce6b377c8df07e4e
+DIST twine-3.4.1.tar.gz 211775 BLAKE2B 0fdc6a8f5a37ee9695c8db2080987b631dfe6f8ed718e3912c94d77b46d35682d27bef07715c1fe7c0d8b6ab1449a771e18d8ffa5c6044dde1536b56b3e7885e SHA512 eca2a7b6b1386868f67dec1182599a8331981585e1cc0b7eef762aa0e99b87b0c6725a2c776330a8b392254501880a68e01ed8569a169857e8079abb8da43b79
diff --git a/dev-python/twine/twine-3.4.1.ebuild b/dev-python/twine/twine-3.4.1.ebuild
new file mode 100644
index 000000000000..58a2549a393e
--- /dev/null
+++ b/dev-python/twine/twine-3.4.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
+SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+ >=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+ >=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+ >=dev-python/keyring-15.1[${PYTHON_USEDEP}]
+ >=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
+ >=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+ >=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
+ >=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
+"
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ dev-python/jaraco-envs[${PYTHON_USEDEP}]
+ dev-python/jaraco-functools[${PYTHON_USEDEP}]
+ dev-python/munch[${PYTHON_USEDEP}]
+ dev-python/portend[${PYTHON_USEDEP}]
+ dev-python/pretend[${PYTHON_USEDEP}]
+ dev-python/pypiserver[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+ # requires internet
+ rm -f tests/test_integration.py || die
+ # pytest-socket dep relevant only to test_integration, and upstream
+ # disables it anyway
+ sed -i -e '/--disable-socket/d' pytest.ini || die
+ sed -i -e '/--cov/d' pytest.ini || die
+
+ distutils-r1_python_prepare_all
+ export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 8d87297f6e0b..f74c42ec0925 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,3 +1,4 @@
DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
DIST virtualenv-20.4.0.tar.gz 9079287 BLAKE2B a3c97537b9c35b463a0077e6020fd087a1cf7c22302ab9f57a7df951bd68d3b0e1bc323cdf12a71ca0fdba938364dbd970467d4f9f768ee688a5d9709949b08a SHA512 4dcc141441626ca2a565c1b51453ef0b7a05016037c44ae1017269e5b2ea98fb7fb29fb9cf3f8909a377824b5e52c5b40d2592e40931d8ad63ad850b8e5f23ac
DIST virtualenv-20.4.2.tar.gz 10578406 BLAKE2B e9b50a40407954c411076244c09a57601553c16b750231ee451e1954a91f1c18740804246e3e4ba2ff55da021e976cab80da86a1b9d01e3cd3d494aa95f07129 SHA512 3ae13f0ca2af8be1cd95affdbfe58d43f930cf616a38963252219d4efc2523b1c3e8d922b3ab2200ac4cadc76c1237ddb4828ac15b5122771e96f7401a852d4e
+DIST virtualenv-20.4.3.tar.gz 10579193 BLAKE2B 02102579eb72b7e4ea8fa182b3c7ef5d8b9d95992b5f73b0f24737522dfae988a91953c49df5aa17541f3f0b1c54557ece7feba173a9cce3bb65964bddbd6edb SHA512 d79479d73fc87f34462e775629306bd20ff5d25eb1829c6719f08c800df6a5db03254b04773766a703d903d577cf74b8409a026196ba98d0f5f94f70604ed576
diff --git a/dev-python/virtualenv/virtualenv-20.4.3.ebuild b/dev-python/virtualenv/virtualenv-20.4.3.ebuild
new file mode 100644
index 000000000000..6c1427f47b1f
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.4.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+ https://virtualenv.pypa.io/en/stable/
+ https://pypi.org/project/virtualenv/
+ https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+SLOT="0"
+
+RDEPEND="
+ >=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+ >=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+ >=dev-python/filelock-3[${PYTHON_USEDEP}]
+ >=dev-python/setuptools-41[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+ ' python3_{6,7} pypy3)
+ $(python_gen_cond_dep '
+ >=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+ ' python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ test? (
+ $(python_gen_cond_dep '
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/flaky[${PYTHON_USEDEP}]
+ >=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+ >=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ >=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+ ' 'python3*')
+ )"
+
+distutils_enable_sphinx docs \
+ dev-python/sphinx_rtd_theme \
+ dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+ export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+ local deselect=(
+ tests/unit/activation/test_xonsh.py
+ tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+ tests/unit/create/test_creator.py::test_cross_major
+ )
+ [[ ${EPYTHON} == pypy3 ]] && deselect+=(
+ 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+ 'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+ 'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+ 'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+ )
+
+ distutils_install_for_testing
+ epytest ${deselect[@]/#/--deselect }
+}
+
+pkg_postinst() {
+ elog "Please note that while virtualenv package no longer supports"
+ elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+ elog " $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index 2771a9e0040a..8ab51716c963 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1 +1,2 @@
DIST xlrd-1.2.0.tar.gz 554079 BLAKE2B 57c956139a3e2239c9caeae66b36e384458f1f2060422575dcb63fb09b7f9050f669154d1479303640cc45fb5716e027d3b5d07282b08bd866c4e5366861ecef SHA512 eea14845701b86a2679f140c9730e8ee2722b4f859cdd870f86bf54df522d54fc3c78dc4354aeb958c72596a6349995e9d79935efc734de096f6e007945fc1b3
+DIST xlrd-2.0.1.gh.tar.gz 368304 BLAKE2B eaf6dbefde00954452a96214c6a48e5d35526168445d15d721851da690bd99e53bd765a73495b00c8ee7ce243c487da0afbc6d6217abd7a5956820357dc97104 SHA512 b3e2efa216fc73bf55bb0b165ef63e797d16a00c62f0f2f2a2114d2db7204208f2623835697a045abe185f52c426ed5e9ef38a4f5f8e1880f0cfdf642af3c57e
diff --git a/dev-python/xlrd/xlrd-2.0.1.ebuild b/dev-python/xlrd/xlrd-2.0.1.ebuild
new file mode 100644
index 000000000000..af980a3294ce
--- /dev/null
+++ b/dev-python/xlrd/xlrd-2.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library to extract data from Microsoft Excel spreadsheets"
+HOMEPAGE="
+ https://www.python-excel.org/
+ https://github.com/python-excel/xlrd/"
+SRC_URI="
+ https://github.com/python-excel/xlrd/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+
+distutils_enable_tests pytest
diff --git a/dev-python/zope-testrunner/Manifest b/dev-python/zope-testrunner/Manifest
index 91f586a6202d..d752ff513c12 100644
--- a/dev-python/zope-testrunner/Manifest
+++ b/dev-python/zope-testrunner/Manifest
@@ -1 +1,2 @@
DIST zope.testrunner-5.2.tar.gz 141836 BLAKE2B 4a29a2377ece929658afbcf279f51cee445db46432d3ff15be43cb4c1d58b4b809b9077905aeeb5c970cda98bd867258091afe58b525a1716faa2c83e6502ea8 SHA512 8b5bb942f3ca42b6fa4de7db5b7149562aa1047128bbd3498a385f8537335cb0cab1a10934faedcd0a1492a14d57accdeefcb95a57d827ad80fff4e20ffd26ef
+DIST zope.testrunner-5.3.0.tar.gz 141406 BLAKE2B f3434e9f22514fffe912385f61d163e42ba1dcd9e9d3f2b3f1d504b608c73804fa38b14a5ed1bf288b75b98ef106024a27de925c404ad67be6acc6c1d6c8f06d SHA512 6fd9375c7b58847868aaf04e85722fcc2b1fe7a8e4ae2ec9103dcb091e6f837d649557ba014146876f814345240b20863bf1584f32212b0b1b28c38ed343b87a
diff --git a/dev-python/zope-testrunner/zope-testrunner-5.3.0.ebuild b/dev-python/zope-testrunner/zope-testrunner-5.3.0.ebuild
new file mode 100644
index 000000000000..07f992c4b75a
--- /dev/null
+++ b/dev-python/zope-testrunner/zope-testrunner-5.3.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Zope testrunner script"
+HOMEPAGE="https://pypi.org/project/zope.testrunner/ https://github.com/zopefoundation/zope.testrunner"
+SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+BDEPEND="
+ test? ( dev-python/zope-testing[${PYTHON_USEDEP}] )"
+RDEPEND="
+ dev-python/namespace-zope[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/zope-exceptions[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ # remove .pth files since dev-python/namespace-zope handles the ns
+ find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index fbdb5c633910..8f6774028049 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild b/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild
new file mode 100644
index 000000000000..77e55da88704
--- /dev/null
+++ b/dev-ruby/blankslate/blankslate-3.1.3-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Base class with almost all of the methods from Object and Kernel being removed"
+HOMEPAGE="https://rubygems.org/gems/blankslate"
+
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+all_ruby_prepare() {
+ # Avoid test failing with rspec 2.x.
+ sed -i -e '/cleanliness/,/^ end/ s:^:#:' spec/blankslate_spec.rb || die
+}
diff --git a/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild b/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild
index e61c91a277aa..e6a1202264c5 100644
--- a/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild
+++ b/dev-ruby/chunky_png/chunky_png-1.4.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/hiera/Manifest b/dev-ruby/hiera/Manifest
index cceea5e6588f..69b11f40e398 100644
--- a/dev-ruby/hiera/Manifest
+++ b/dev-ruby/hiera/Manifest
@@ -1 +1,2 @@
DIST hiera-3.6.0.gem 40960 BLAKE2B 1e49499ac5841d5fae884ffaf7ba7c72c55e3c04ee3023b2bee3e68e29d4827825e23ed4bb4a929d6337a1ff1d19dd1fbcad329495604c3171c3ab900e21b607 SHA512 6d76845e23732875c461d5b2df8599953f067ec84ea6648044e91822fea762118a108136e43ea9b7112511939978052f846d94e895b2b8f669df607fc90afbd0
+DIST hiera-3.7.0.gem 40960 BLAKE2B 2cec1e8df126da1ca3e46015192cdd428b595084461d5bca92ad561ba7e3b2be5d6837b3565031f174b5ce7fc32f80e288ed12dd3d3cd5d9f3a369b7f2cc6dae SHA512 583da6eb8fb30f9b1029861c7e539fa0e766bd3c4de06715225975d24e46f18cfea9b80f7e4f65535d22ae9bed70c29f999c160fe131aa0897dd70e61681d1b8
diff --git a/dev-ruby/hiera/hiera-3.7.0.ebuild b/dev-ruby/hiera/hiera-3.7.0.ebuild
new file mode 100644
index 000000000000..88f665044ed7
--- /dev/null
+++ b/dev-ruby/hiera/hiera-3.7.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple pluggable Hierarchical Database"
+HOMEPAGE="https://docs.puppet.com/hiera/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+ruby_add_bdepend "test? ( dev-ruby/mocha )"
+
+ruby_add_rdepend "dev-ruby/deep_merge"
diff --git a/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild b/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild
index 2b46555973d8..6e2514be9de3 100644
--- a/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild
+++ b/dev-ruby/kramdown-parser-gfm/kramdown-parser-gfm-1.1.0.ebuild
@@ -1,8 +1,8 @@
-# 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="ruby25 ruby26 ruby27"
inherit ruby-fakegem
diff --git a/dev-ruby/logue/logue-1.0.18.ebuild b/dev-ruby/logue/logue-1.0.18.ebuild
index 17e7498dc659..4a84bec6ae19 100644
--- a/dev-ruby/logue/logue-1.0.18.ebuild
+++ b/dev-ruby/logue/logue-1.0.18.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jpace/logue/archive/v${PV}.tar.gz -> ${PN}-git-${PV}
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
IUSE=""
ruby_add_rdepend "dev-ruby/rainbow:3"
diff --git a/dev-ruby/paramesan/paramesan-1.0.1.ebuild b/dev-ruby/paramesan/paramesan-1.0.1.ebuild
index 70970ed52494..f0490b557b7e 100644
--- a/dev-ruby/paramesan/paramesan-1.0.1.ebuild
+++ b/dev-ruby/paramesan/paramesan-1.0.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jpace/paramesan/archive/v${PV}.tar.gz -> ${P}.tgz"
LICENSE="MIT"
SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
IUSE=""
all_ruby_prepare() {
diff --git a/dev-ruby/rqrcode/Manifest b/dev-ruby/rqrcode/Manifest
index 1b9c8f91f83d..873b1aa79a29 100644
--- a/dev-ruby/rqrcode/Manifest
+++ b/dev-ruby/rqrcode/Manifest
@@ -1,2 +1,3 @@
DIST rqrcode-0.10.1.gem 27136 BLAKE2B 7fea719d6e76d340dd6db386994bffc5e7002afbc61e0b476dc639003757f5932598b81274a5ab74bc6dd25d10c61bc023668c8271e9387f7bcc02c6f4dc879b SHA512 5b2d6e63bc069a1cf436d2df159bef673ef621a73d72c52bbdec1c2d820f4553172d5c3499b9347e0939d422bffa8f39ecaae123ce0be360d25ab6c08a6eb583
DIST rqrcode-1.1.1.tar.gz 101325 BLAKE2B 0ba4a7cf50a45387ebf96e29e1bcc9042ac091582fa0859b95d85a5f112213cdde1f6df8f954219e22501a01729916cc8d4ab7a7ae6562cc770e63515a9a0d75 SHA512 b7d746780bc20c8b3fc59a74f00aab17b5d4a5db458c8f79a8e85146ec2d1b4bd16873792bf7970dede083afd0bc0c54ef4f5d58736b4c9847b644cbe470d0f2
+DIST rqrcode-1.2.0.tar.gz 101432 BLAKE2B 98e7c6d98436d759e5d08575ca98fa292320545e69b63a06422bdeff9a64f5514d0d74c85c7c10941d334ea6168c3b392ac68c8aee19f0c58b6f7d3c125e13b2 SHA512 8a434c72fc43f04dfc92cd7cb6e0423cae94aa24d83a1a6015a170136f1aa3b010b652546b349f15f18e48c85b06a7260ae4babf19907955e0d1b4c2207e6ebc
diff --git a/dev-ruby/rqrcode/rqrcode-1.2.0.ebuild b/dev-ruby/rqrcode/rqrcode-1.2.0.ebuild
new file mode 100644
index 000000000000..291fc43e388a
--- /dev/null
+++ b/dev-ruby/rqrcode/rqrcode-1.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="rqrcode.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library for encoding QR Codes"
+HOMEPAGE="https://whomwah.github.com/rqrcode/"
+SRC_URI="https://github.com/whomwah/rqrcode/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+ dev-ruby/chunky_png:0
+ >=dev-ruby/rqrcode_core-0.2:0
+"
+
+all_ruby_prepare() {
+ sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9300d100ba2b..8eab81e483a4 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/bats/Manifest b/dev-util/bats/Manifest
index ee8dbe8c016f..644c9fbe3fc6 100644
--- a/dev-util/bats/Manifest
+++ b/dev-util/bats/Manifest
@@ -1,3 +1,4 @@
DIST bats-0.4.0.tar.gz 17258 BLAKE2B e43b29a413194e697c25a3f1dd3dc72a23ab9444e48bbe04434f8d6d48ff754ef1c12a1e1ab936bed8389b8fe970799cca13be932f1852c643a529babdb43420 SHA512 83c6c0e3ceec149708a8db5d33e95cc84852d8189498c22131c00f4288a6c870f9d522bae9230157f442338dc101e1468451d78dfa274afb83a6f0dd614c8bdb
DIST bats-0.4.0_p20170219.tar.gz 18776 BLAKE2B 994649547424ee2e0859e7a82f9d46266645c6fc5cc3f47313d8780c3f81755b77d0109ad397c77381d04ba30708536acdacd0f158dc000cca9df23e25558653 SHA512 dc0e185b09dab5cc026ec39a2b15485751f038a6bab2e1089e55ea7e2913c0b99262edb54014300a25e0e3b6cad7ca61b4068f6ab328adaa61878dbb8efdf450
DIST bats-1.2.1.tar.gz 62685 BLAKE2B 7ac54c8955375571edf7b303dfe9228a384ca5ec06986b9ac3c368e5b855456b2a3291cb3231f963dcd9c1bd5178f06fcbc8c81bdeee82b659561de072cccba9 SHA512 632345e6d83ed930dab23abc03e4797769063bb049ae1bb99e3102dc1e93e5111144ddc61615d05962f7b5bbf72d90ce19a324faf670a3d6e4ce7ab508b0db29
+DIST bats-1.3.0.tar.gz 78392 BLAKE2B 5dbc87ee87aba0b001d25f1304939604b1682603fb0d2fae19f852171e8bd76f1a6c262b661a373aeeb9b79818eae3387b3e4d6bcf4f0f95b87dc2430caf029f SHA512 47f67681b380a70863805691eca39532af76670b7bba2406293c58f95cbbe3dade4f792177ee00d8ca72684731efb6db2c1ca8eeabe2fa48359e81c257f95b2c
diff --git a/dev-util/bats/bats-1.3.0.ebuild b/dev-util/bats/bats-1.3.0.ebuild
new file mode 100644
index 000000000000..0cc0631f5528
--- /dev/null
+++ b/dev-util/bats/bats-1.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit optfeature
+
+MY_PN="bats-core"
+DESCRIPTION="Bats-core: Bash Automated Testing System"
+HOMEPAGE="https://github.com/bats-core/bats-core/"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+DEPEND="app-shells/bash:*"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_test() {
+ bin/bats --tap test || die "Tests failed"
+}
+
+src_install() {
+ exeinto /usr/libexec/${MY_PN}
+ doexe libexec/${MY_PN}/*
+ exeinto /usr/lib/${MY_PN}
+ doexe lib/${MY_PN}/*
+ dobin bin/${PN}
+
+ dodoc README.md
+ doman man/${PN}.1 man/${PN}.7
+}
+
+pkg_postinst() {
+ optfeature "Parallel Execution" sys-process/parallel
+}
diff --git a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
index cf1336f6f606..9e4061b5925f 100644
--- a/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
+++ b/dev-util/codeblocks/codeblocks-20.03-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The open source, cross platform, free C, C++ and Fortran IDE"
HOMEPAGE="https://codeblocks.org/"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
https://dev.gentoo.org/~leio/distfiles/${P}-fortran.tar.xz
https://dev.gentoo.org/~leio/distfiles/${P}-fortran-update-v1.7.tar.xz"
diff --git a/dev-util/pkgcheck/pkgcheck-0.9.2.ebuild b/dev-util/pkgcheck/pkgcheck-0.9.2.ebuild
index 18f0ea5c49f8..698f5bbcc188 100644
--- a/dev-util/pkgcheck/pkgcheck-0.9.2.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.9.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
inherit git-r3
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x64-macos"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
fi
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index b3e88397ec4a..13dcb2e19289 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/maitretarot/files/maitretarot-0.1.98-format.patch b/games-board/maitretarot/files/maitretarot-0.1.98-format.patch
index d7b5ca55b093..f01f4917553f 100644
--- a/games-board/maitretarot/files/maitretarot-0.1.98-format.patch
+++ b/games-board/maitretarot/files/maitretarot-0.1.98-format.patch
@@ -1,5 +1,5 @@
---- a/src/game.c 2015-12-16 21:59:49.400430743 +0100
-+++ b/src/game.c 2015-12-16 21:59:11.085058332 +0100
+--- a/src/game.c
++++ b/src/game.c
@@ -642,7 +642,7 @@
(game, prev_winner, c, ((i + prev_winner) % 4),
game->players[((i + prev_winner) % 4)]->turn, &err))
diff --git a/games-board/maitretarot/maitretarot-0.1.98-r1.ebuild b/games-board/maitretarot/maitretarot-0.1.98-r1.ebuild
deleted file mode 100644
index ab3167b6fe21..000000000000
--- a/games-board/maitretarot/maitretarot-0.1.98-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="server for the french tarot game maitretarot"
-HOMEPAGE="http://www.nongnu.org/maitretarot/"
-SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-libs/glib:2
- dev-libs/libxml2
- dev-games/libmaitretarot"
-RDEPEND=${DEPEND}
-
-PATCHES=(
- "${FILESDIR}"/${P}-format.patch
-)
-
-src_configure() {
- econf --with-default-config-file="/etc/maitretarotrc.xml"
-}
diff --git a/games-board/maitretarot/maitretarot-0.1.98-r2.ebuild b/games-board/maitretarot/maitretarot-0.1.98-r2.ebuild
new file mode 100644
index 000000000000..a53f75ae021d
--- /dev/null
+++ b/games-board/maitretarot/maitretarot-0.1.98-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Server for the french tarot game maitretarot"
+HOMEPAGE="http://www.nongnu.org/maitretarot/"
+SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="dev-libs/glib:2
+ dev-libs/libxml2
+ dev-games/libmaitretarot"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-format.patch
+)
+
+src_prepare() {
+ default
+
+ mv configure.{in,ac} || die
+
+ # Remove bundled macros (avoid patching same file multiple times)
+ rm -rf m4/{libmaitretarot,libmt_client}.m4 || die
+
+ # Ensure we generate auto* with the fixed macros in tree
+ # (not bundled)
+ # bug #739142
+ eautoreconf
+}
+
+src_configure() {
+ econf --with-default-config-file="/etc/maitretarotrc.xml"
+}
diff --git a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r1.ebuild b/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r2.ebuild
similarity index 53%
rename from games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r1.ebuild
rename to games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r2.ebuild
index c548718e2f1d..c6858bfa1ff3 100644
--- a/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r1.ebuild
+++ b/games-board/mt_dolphin_ia/mt_dolphin_ia-0.1.98-r2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
+
+inherit autotools
DESCRIPTION="client for the french tarot game maitretarot"
HOMEPAGE="http://www.nongnu.org/maitretarot/"
@@ -10,14 +12,28 @@ SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.t
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+BDEPEND="virtual/pkgconfig"
DEPEND="dev-libs/glib:2
dev-libs/libxml2
dev-games/libmaitretarot
dev-games/libmt_client"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-formatsecurity.patch
)
+
+src_prepare() {
+ default
+
+ mv configure.{in,ac} || die
+
+ # Remove bundled macros (avoid patching same file multiple times)
+ rm -rf m4/{libmaitretarot,libmt_client}.m4 || die
+
+ # Ensure we generate auto* with the fixed macros in tree
+ # (not bundled)
+ # bug #715582
+ eautoreconf
+}
diff --git a/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild b/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild
index f2228134f6dd..b9aba21f1406 100644
--- a/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild
+++ b/games-board/mt_ncurses_client/mt_ncurses_client-0.1.98-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
DESCRIPTION="client for the french tarot game maitretarot"
HOMEPAGE="http://www.nongnu.org/maitretarot/"
@@ -12,19 +12,33 @@ SRC_URI="https://savannah.nongnu.org/download/maitretarot/${PN}.pkg/${PV}/${P}.t
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
+BDEPEND="virtual/pkgconfig"
DEPEND="dev-libs/glib:2
dev-libs/libxml2
dev-games/libmaitretarot
dev-games/libmt_client
sys-libs/ncurses:0"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-format.patch
)
+src_prepare() {
+ default
+
+ mv configure.{in,ac} || die
+
+ # Remove bundled macros (avoid patching same file multiple times)
+ rm -rf m4/{libmaitretarot,libmt_client}.m4 || die
+
+ # Ensure we generate auto* with the fixed macros in tree
+ # (not bundled)
+ # bug #716102
+ eautoreconf
+}
+
src_configure() {
export LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
default
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 20a94c62b50f..ac6810dc5600 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/box2d/box2d-2.4.1.ebuild b/games-engines/box2d/box2d-2.4.1.ebuild
index e75f1f087678..63093288e008 100644
--- a/games-engines/box2d/box2d-2.4.1.ebuild
+++ b/games-engines/box2d/box2d-2.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/erincatto/Box2D/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="doc"
BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 5fc4200cb80b..8ab8eaa01624 100644
Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ
diff --git a/games-roguelike/nethack/nethack-3.6.6.ebuild b/games-roguelike/nethack/nethack-3.6.6.ebuild
index 1dc2a67dd6cc..2106af647a72 100644
--- a/games-roguelike/nethack/nethack-3.6.6.ebuild
+++ b/games-roguelike/nethack/nethack-3.6.6.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit desktop flag-o-matic toolchain-funcs
DESCRIPTION="The ultimate old-school single player dungeon exploration game"
@@ -13,21 +14,27 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
IUSE="X"
-RDEPEND="acct-group/gamestat
+RDEPEND="
+ acct-group/gamestat
sys-libs/ncurses:0=
X? (
x11-libs/libXaw
x11-libs/libXpm
x11-libs/libXt
- )"
-DEPEND="${RDEPEND}
+ )
+"
+DEPEND="
+ ${RDEPEND}
X? ( x11-base/xorg-proto )
- "
-BDEPEND="virtual/pkgconfig
+"
+BDEPEND="
+ virtual/pkgconfig
+ virtual/yacc
X? (
x11-apps/bdftopcf
x11-apps/mkfontscale
- )"
+ )
+"
S="${WORKDIR}/NetHack-NetHack-${PV}_Released"
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 62a2a52b9101..9e4303eda9bf 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/qpsmtpd/Manifest b/mail-mta/qpsmtpd/Manifest
index 5a8e524a3434..5b703283ad0e 100644
--- a/mail-mta/qpsmtpd/Manifest
+++ b/mail-mta/qpsmtpd/Manifest
@@ -1,2 +1 @@
-DIST qpsmtpd-0.84.tar.gz 178260 BLAKE2B 6a92d6a70f3abb84fb3a59ac68c61ecc36067f72bd6c86986bc9069f220d86352bce3ca674f19430fc1f1e724e98b7112df19e7f0c19a504b4204578f10fadf3 SHA512 a12491c123d21b4e3965105bbe88ad7e7e61551a3ff4e96eee78c83dcb2afae62239fa24d710092a7ccf60097699901c42d70df8183de6454bef4fb26843358d
DIST qpsmtpd-0.95.tar.gz 367400 BLAKE2B bd77d8f203f1adf5ad6671fcd958bd97c5321317b51ceb9b9320cd2bc2fb82687b0d367618ad74905b3c4d44f0e83291d6330abbf4f8d01cd1d29ba7588f2df5 SHA512 4265606ecde68eda92091e2c3c27645baa131db4197f3d135932dc2ad8d76c1fb6c25ce267ab421cab3a4a9902aa682e4be87a1228e41b226705a64e440ffe87
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.40-badrcptto_allowrelay.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.40-badrcptto_allowrelay.patch
deleted file mode 100644
index 1f9f33f9a148..000000000000
--- a/mail-mta/qpsmtpd/files/qpsmtpd-0.40-badrcptto_allowrelay.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- qpsmtpd-0.40/plugins/check_badrcptto.badrcptto_allowrelay 2007-06-14 11:57:24.000000000 -0600
-+++ qpsmtpd-0.40/plugins/check_badrcptto 2007-06-14 13:26:42.000000000 -0600
-@@ -3,6 +3,7 @@
-
- sub hook_rcpt {
- my ($self, $transaction, $recipient, %param) = @_;
-+ return (DECLINED) if $self->qp->connection->relay_client;
- my @badrcptto = $self->qp->config("badrcptto") or return (DECLINED);
- return (DECLINED) unless $recipient->host && $recipient->user;
- my $host = lc $recipient->host;
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.83-accept-empty-email.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.83-accept-empty-email.patch
deleted file mode 100644
index 2e1dcacc46c3..000000000000
--- a/mail-mta/qpsmtpd/files/qpsmtpd-0.83-accept-empty-email.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Accept messages with no body.
-
-If a message has no body, there is nothing in the RFC spec that says it
-needs to have a trailing \n for a blank line after the headers.
-
-Thumderbird 10 generates some emails like this, which will always cause
-plugin errors when $transaction->header is accessed otherwise, as there
-is almost no checking that $transaction->header is defined before usage.
-
-Signed-off-by: Robin H. Johnson
-Thanks-To: Jack Bates
-
---- qpsmtpd-0.83.orig/lib/Qpsmtpd/SMTP.pm 2009-04-03 06:24:21.000000000 +0000
-+++ qpsmtpd-0.83/lib/Qpsmtpd/SMTP.pm 2012-02-25 05:52:14.000000000 +0000
-@@ -632,7 +632,7 @@
-
- my $timeout = $self->config('timeout');
- while (defined($_ = $self->getline($timeout))) {
-- $complete++, last if $_ eq ".\r\n";
-+ $complete++, $_ = '' if $_ eq ".\r\n";
- $i++;
-
- # should probably use \012 and \015 in these checks instead of \r and \n ...
-@@ -648,7 +648,7 @@
- unless (($max_size and $size > $max_size)) {
- s/\r\n$/\n/;
- s/^\.\./\./;
-- if ($in_header and m/^$/) {
-+ if ($in_header and (m/^$/ or $complete > 0)) {
- $in_header = 0;
- my @headers = split /^/m, $buffer;
-
-@@ -691,9 +691,10 @@
-
- # copy all lines into the spool file, including the headers
- # we will create a new header later before sending onwards
-- $self->transaction->body_write($_);
-+ $self->transaction->body_write($_) unless $complete;
- $size += length $_;
- }
-+ last if $complete > 0;
- #$self->log(LOGDEBUG, "size is at $size\n") unless ($i % 300);
- }
-
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.83-clamd_conf.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.83-clamd_conf.patch
deleted file mode 100644
index 801dc477df9f..000000000000
--- a/mail-mta/qpsmtpd/files/qpsmtpd-0.83-clamd_conf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar --exclude '*.orig' --exclude '*.rej' qpsmtpd-0.83.orig/plugins/virus/clamav qpsmtpd-0.83/plugins/virus/clamav
---- qpsmtpd-0.83.orig/plugins/virus/clamav 2009-07-20 15:36:17.000000000 +0000
-+++ qpsmtpd-0.83/plugins/virus/clamav 2009-09-16 01:14:22.903329780 +0000
-@@ -151,7 +151,7 @@
- $self->{_max_size} ||= 512 * 1024;
- $self->{_spool_dir} ||= $self->spool_dir();
- $self->{_back_compat} ||= ''; # make sure something is set
-- $self->{_clamd_conf} ||= '/etc/clamd/conf'; # make sure something is set
-+ $self->{_clamd_conf} ||= '/etc/clamd.conf'; # make sure something is set
- $self->{_declined_on_fail} ||= 0; # decline the message on clamav failure
-
- unless ($self->{_spool_dir}) {
diff --git a/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch b/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch
deleted file mode 100644
index 6331e98cb48b..000000000000
--- a/mail-mta/qpsmtpd/files/qpsmtpd-0.84-Net-DNS-id.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Net::DNS function nextid() changed to id().
-
-Signed-off-by: Robin H. Johnson
-
-diff -Nuar qpsmtpd-0.84.orig/qpsmtpd-async qpsmtpd-0.84/qpsmtpd-async
---- qpsmtpd-0.84.orig/qpsmtpd-async 2009-04-03 05:48:34.000000000 +0000
-+++ qpsmtpd-0.84/qpsmtpd-async 2013-04-15 23:01:49.952857659 +0000
-@@ -145,7 +145,7 @@
- # print "Next DNS ID: $Net::DNS::Resolver::global{id}\n";
- };
- if ($@) {
-- # print "Next DNS ID: " . Net::DNS::Header::nextid() . "\n";
-+ # print "Next DNS ID: " . Net::DNS::Header::id() . "\n";
- }
-
- # Fixup lost kqueue after fork
-diff -Nuar qpsmtpd-0.84.orig/qpsmtpd-forkserver qpsmtpd-0.84/qpsmtpd-forkserver
---- qpsmtpd-0.84.orig/qpsmtpd-forkserver 2010-04-08 05:29:52.000000000 +0000
-+++ qpsmtpd-0.84/qpsmtpd-forkserver 2013-04-15 23:01:49.952857659 +0000
-@@ -285,7 +285,7 @@
- # all children should have different seeds, to prevent conflicts
- srand();
- for (0 .. rand(65536)) {
-- Net::DNS::Header::nextid();
-+ Net::DNS::Header::id();
- }
-
- close $_ for $select->handles;
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild
deleted file mode 100644
index 2b65df3df8fb..000000000000
--- a/mail-mta/qpsmtpd/qpsmtpd-0.84-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils perl-module user
-
-DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
-HOMEPAGE="http://smtpd.develooper.com"
-SRC_URI="http://smtpd.develooper.com/files/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="postfix ipv6 syslog"
-
-RDEPEND=">=dev-lang/perl-5.8.0
- >=dev-perl/Net-DNS-0.690.0
- virtual/perl-MIME-Base64
- dev-perl/MailTools
- dev-perl/IPC-Shareable
- dev-perl/Socket6
- dev-perl/Danga-Socket
- dev-perl/ParaDNS
- ipv6? ( dev-perl/IO-Socket-INET6 )
- syslog? ( virtual/perl-Sys-Syslog )
- virtual/inetd"
-
-pkg_setup() {
- enewgroup smtpd
- local additional_groups
- if use postfix; then
- additional_groups="${additional_groups},postdrop"
- fi
- enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.40-badrcptto_allowrelay.patch
- #epatch "${FILESDIR}"/${PN}-0.83-clamd_conf.patch
- epatch "${FILESDIR}"/${PN}-0.83-accept-empty-email.patch
- epatch "${FILESDIR}"/${PN}-0.84-Net-DNS-id.patch
-}
-
-src_install() {
- perl-module_src_install
-
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
-
- dodir /usr/share/qpsmtpd
- cp -Rf plugins "${D}"/usr/share/qpsmtpd/
-
- insinto /etc/qpsmtpd
- doins config.sample/*
-
- echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
- echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
- cat >"${D}"/etc/qpsmtpd/logging <<-EOF
- #logging/syslog loglevel LOGINFO priority LOG_NOTICE
- #logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d
- EOF
- if use syslog; then
- sed -i -e '/^#logging\/syslog/s,^#,,g' "${D}"/etc/qpsmtpd/logging || die
- else
- sed -i -e '/^#logging\/file/s,^#,,g' "${D}"/etc/qpsmtpd/logging || die
- fi
-
- newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
-
- newconfd "${FILESDIR}"/qpsmtpd.confd qpsmtpd
- newinitd "${FILESDIR}"/qpsmtpd.initd-r1 qpsmtpd
-
- dodoc CREDITS Changes README README.plugins STATUS
-
- diropts -m 0755 -o smtpd -g smtpd
- dodir /var/spool/qpsmtpd /var/log/qpsmtpd
- keepdir /var/spool/qpsmtpd /var/log/qpsmtpd
-
-}
diff --git a/mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild b/mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild
index c49137a61108..2964681181e3 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-0.95.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-[[ ${PV} == *9999 ]] && SCM="git-2"
-inherit eutils perl-module user ${SCM}
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit perl-module user ${SCM}
DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
HOMEPAGE="https://smtpd.github.io/qpsmtpd/"
@@ -47,7 +47,7 @@ src_unpack() {
unpack ${A}
cd "${S}"
else
- git-2_src_unpack
+ git-r3_src_unpack
cd "${S}"
fi
}
@@ -59,25 +59,23 @@ src_install() {
newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
dodir /usr/share/qpsmtpd
- cp -Rf plugins "${D}"/usr/share/qpsmtpd/
+ cp -Rf plugins "${ED}"/usr/share/qpsmtpd/ || die
diropts -m 0755 -o smtpd -g smtpd
- dodir /var/spool/qpsmtpd
keepdir /var/spool/qpsmtpd
- dodir /etc/qpsmtpd
insinto /etc/qpsmtpd
doins config.sample/*
- echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
- echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
+ echo "/usr/share/qpsmtpd/plugins" > "${ED}"/etc/qpsmtpd/plugin_dirs || die
+ echo "/var/spool/qpsmtpd" > "${ED}"/etc/qpsmtpd/spool_dir || die
if use syslog; then
- echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${D}"/etc/qpsmtpd/logging
+ echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${ED}"/etc/qpsmtpd/logging
else
diropts -m 0755 -o smtpd -g smtpd
dodir /var/log/qpsmtpd
keepdir /var/log/qpsmtpd
- echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${D}"/etc/qpsmtpd/logging
+ echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${ED}"/etc/qpsmtpd/logging
fi
newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
diff --git a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
index 801cfb710759..2964681181e3 100644
--- a/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
+++ b/mail-mta/qpsmtpd/qpsmtpd-9999.ebuild
@@ -1,18 +1,23 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit eutils perl-module user git-r3
+[[ ${PV} == *9999 ]] && SCM="git-r3"
+inherit perl-module user ${SCM}
DESCRIPTION="qpsmtpd is a flexible smtpd daemon written in Perl"
HOMEPAGE="https://smtpd.github.io/qpsmtpd/"
-# This is a spotted development fork with many improvements
-EGIT_REPO_URI="https://github.com/smtpd/${PN}.git"
+if [[ ${PV} != *9999 ]]; then
+ SRC_URI="https://github.com/smtpd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+else
+ # This is a spotted development fork with many improvements
+ EGIT_REPO_URI="https://github.com/smtpd/${PN}.git"
+fi
LICENSE="MIT"
SLOT="0"
-KEYWORDS=""
IUSE="postfix ipv6 syslog"
RDEPEND=">=dev-lang/perl-5.8.0
@@ -37,6 +42,16 @@ pkg_setup() {
enewuser smtpd -1 -1 /var/spool/qpsmtpd smtpd${additional_groups}
}
+src_unpack() {
+ if [[ ${PV} != *9999 ]]; then
+ unpack ${A}
+ cd "${S}"
+ else
+ git-r3_src_unpack
+ cd "${S}"
+ fi
+}
+
src_install() {
perl-module_src_install
@@ -44,25 +59,23 @@ src_install() {
newins "${FILESDIR}"/qpsmtpd.xinetd qpsmtpd
dodir /usr/share/qpsmtpd
- cp -Rf plugins "${D}"/usr/share/qpsmtpd/
+ cp -Rf plugins "${ED}"/usr/share/qpsmtpd/ || die
diropts -m 0755 -o smtpd -g smtpd
- dodir /var/spool/qpsmtpd
keepdir /var/spool/qpsmtpd
- dodir /etc/qpsmtpd
insinto /etc/qpsmtpd
doins config.sample/*
- echo "/usr/share/qpsmtpd/plugins" > "${D}"/etc/qpsmtpd/plugin_dirs
- echo "/var/spool/qpsmtpd" > "${D}"/etc/qpsmtpd/spool_dir
+ echo "/usr/share/qpsmtpd/plugins" > "${ED}"/etc/qpsmtpd/plugin_dirs || die
+ echo "/var/spool/qpsmtpd" > "${ED}"/etc/qpsmtpd/spool_dir || die
if use syslog; then
- echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${D}"/etc/qpsmtpd/logging
+ echo "logging/syslog loglevel LOGINFO priority LOG_NOTICE" > "${ED}"/etc/qpsmtpd/logging
else
diropts -m 0755 -o smtpd -g smtpd
dodir /var/log/qpsmtpd
keepdir /var/log/qpsmtpd
- echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${D}"/etc/qpsmtpd/logging
+ echo "logging/file loglevel LOGINFO /var/log/qpsmtpd/%Y-%m-%d" > "${ED}"/etc/qpsmtpd/logging
fi
newenvd "${FILESDIR}"/qpsmtpd.envd 99qpsmtpd
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index c0590c2f8469..1daeb6cb1942 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/comic-neue/comic-neue-2.3.ebuild b/media-fonts/comic-neue/comic-neue-2.3.ebuild
index 07fbb94be27e..6932b1f00995 100644
--- a/media-fonts/comic-neue/comic-neue-2.3.ebuild
+++ b/media-fonts/comic-neue/comic-neue-2.3.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="http://comicneue.com"
SRC_URI="http://comicneue.com/${P}.zip"
LICENSE="OFL-1.1"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
SLOT="0"
DEPEND="app-arch/unzip"
diff --git a/media-fonts/fira-sans/fira-sans-4.202.ebuild b/media-fonts/fira-sans/fira-sans-4.202.ebuild
index 90dc65ee232e..bc843c1d54d4 100644
--- a/media-fonts/fira-sans/fira-sans-4.202.ebuild
+++ b/media-fonts/fira-sans/fira-sans-4.202.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mozilla/Fira/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="+otf ttf"
REQUIRED_USE="|| ( otf ttf )"
diff --git a/media-fonts/intlfonts/intlfonts-1.4.1.ebuild b/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
index 8cab818529f0..57905969451a 100644
--- a/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
+++ b/media-fonts/intlfonts/intlfonts-1.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="public-domain HPND GPL-3+-with-font-exception"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
IUSE="bdf"
BDEPEND="x11-apps/bdftopcf
diff --git a/media-fonts/open-sans/open-sans-1-r1.ebuild b/media-fonts/open-sans/open-sans-1-r1.ebuild
index c4e5872d1e1c..925c27bcd92d 100644
--- a/media-fonts/open-sans/open-sans-1-r1.ebuild
+++ b/media-fonts/open-sans/open-sans-1-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=6
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~jstein/dist/${P}.zip"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
IUSE=""
DEPEND="app-arch/unzip"
diff --git a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
index adedb33342a8..c1f73d605bbd 100644
--- a/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
+++ b/media-fonts/opendesktop-fonts/opendesktop-fonts-1.4.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="Arphic"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 sparc x86"
IUSE=""
FONT_CONF=(
diff --git a/media-fonts/powerline-symbols/Manifest b/media-fonts/powerline-symbols/Manifest
index fdb2f1316668..18f01fd4238e 100644
--- a/media-fonts/powerline-symbols/Manifest
+++ b/media-fonts/powerline-symbols/Manifest
@@ -1,2 +1 @@
-DIST powerline-symbols-20150224.tar.xz 3972 BLAKE2B 94ce0e0f8ccd8e8be451c1e85f7b0ecc06a1b9d4513e40e7b80e0ef584109de96922d9211f2adf04fcc3c87ca9e450d5d2764787c762c19bd78c67fdded11f3e SHA512 85a4edefa692a7e28fd91c8d34c33b70424bee105f807aa1dcc182f64df3a66a29dd400892313b0d8ead59f9883e14f47c1a1afbf18af317b93f6aefb977c031
DIST powerline-symbols-20170508.tar.xz 4028 BLAKE2B f0ad0360fb1bfe2c160c531a8ce473bdc746800c4540e56c8a1c27500883922c67354d9d7d8478a9111d56bace51a730ac9683e6e21be112df7d0df288f7cf0b SHA512 6908cb029b28002021530ea330c9ce5626f6bc5ed2336750cd2678f4b314d043289e29ebea61003836bb0cbca9bbb91a1b748f1cf24e4f07932eaf18bf28eac5
diff --git a/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild b/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild
deleted file mode 100644
index f03cb115598e..000000000000
--- a/media-fonts/powerline-symbols/powerline-symbols-20150224.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="OpenType Unicode font with symbols for Powerline/Airline"
-HOMEPAGE="https://github.com/powerline/powerline"
-SRC_URI="https://dev.gentoo.org/~yngwin/distfiles/${P}.tar.xz"
-# We're redistributing just the (unversioned) font from the upstream repo here
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-FONT_S="${S}"
-FONT_SUFFIX="otf"
-FONT_CONF=( 10-powerline-symbols.conf )
-DOCS="README.rst"
diff --git a/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild b/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
index edcc228cf761..e48ce54b5a1d 100644
--- a/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
+++ b/media-fonts/powerline-symbols/powerline-symbols-20170508.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# 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://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
LICENSE="MIT-with-advertising"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE=""
FONT_S="${S}"
diff --git a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild b/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
index 44b627b242ae..462971468a8a 100644
--- a/media-fonts/source-han-sans/source-han-sans-1.004.ebuild
+++ b/media-fonts/source-han-sans/source-han-sans-1.004.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
@@ -18,7 +18,7 @@ SRC_URI="
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
IUSE="l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW"
REQUIRED_USE="|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )"
diff --git a/media-fonts/tex-gyre/Manifest b/media-fonts/tex-gyre/Manifest
index 9e2d025a263b..1e4e0f58959a 100644
--- a/media-fonts/tex-gyre/Manifest
+++ b/media-fonts/tex-gyre/Manifest
@@ -1,2 +1 @@
-DIST tg-2.005otf.zip 2284184 BLAKE2B bf19224b480f1bd4829331bac373882b3cb6687740d1977fd07bd8cf8fd93d0cdeaa290834286dc4b96641a43e0307200993beeb6748c6902eaa7d24523bf3bc SHA512 881886115604a7ec2634f621693177278bf3f6842dd42f64460e3afd26f302c2f8847e03b7bd83b354ae0366dcdfa057f16b1cbf64e8c5172d27d2bda7b98db9
DIST tg2_501otf.zip 2559336 BLAKE2B 8a4872f1a694765e56ef6e41fab523ee80a9b69de255add3160068131a10f226cb237572b1184f6411afd49936606af6b6809f3a5aebd502122d062a4dc23f55 SHA512 a335e0bfaf16a157c290fcd40fcf8786e8677f14189a8b6fe56ff112f008aed198600248d8eb1334bbb689b9979996e013f61bf5bfa6f0549b6a910d03cb2929
diff --git a/media-fonts/tex-gyre/tex-gyre-2.005.ebuild b/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
deleted file mode 100644
index 2e47c60fea52..000000000000
--- a/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit font
-
-DESCRIPTION="Extensive remake of freely available URW fonts"
-HOMEPAGE="http://www.gust.org.pl/projects/e-foundry/tex-gyre"
-SRC_URI="http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-${PV}otf.zip"
-
-LICENSE="|| ( GFL LPPL-1.3c )" # legally equivalent
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa x86"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-FONT_SUFFIX="otf"
diff --git a/media-fonts/tex-gyre/tex-gyre-2.501.ebuild b/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
index ad498a6c96f6..7d0f6ccdc7c7 100644
--- a/media-fonts/tex-gyre/tex-gyre-2.501.ebuild
+++ b/media-fonts/tex-gyre/tex-gyre-2.501.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="http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/${MY_P}.zip"
LICENSE="|| ( GFL LPPL-1.3c )" # legally equivalent
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa x86"
BDEPEND="app-arch/unzip"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index ac238f122688..9888c84b64ab 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/gif2png/Manifest b/media-gfx/gif2png/Manifest
index 09c12d183863..7213c7b7334a 100644
--- a/media-gfx/gif2png/Manifest
+++ b/media-gfx/gif2png/Manifest
@@ -1,3 +1 @@
-DIST gif2png-2.5.12.tar.gz 31613 BLAKE2B 8614d3e0435bab334465d3f43d8676a80f1041e6cd5572fb525295c00d9027b505741331bd3df452d55e8f49893ab611832f2d4d150794d268a436a04f5f20b2 SHA512 481775d0efc65e0606a60546ed2a1e4a976587ca1a406620f8ea9126b32dc810d3b549cc99ba33ff9f88379de2ce47a799840b92978ee621bd18d3ae08b2c6a8
DIST gif2png-2.5.14.tar.gz 221609 BLAKE2B de1e66a0880579a2d4d3681ec8cbbe3ef37da1cd05e40336b398266f386d629645f9d45738098c9e3f9528cb5dbdd5c37ed00f5d5c8bcd85e0a31fd375f38a76 SHA512 a1ea3b64da64274a3363089beee748605eb24d3e05bcace29d26618a9ab3580f5ac85da893af16975c91d571866625e0883f0a4b375e82c468754f84f8982f03
-DIST gif2png-2.5.9.tar.gz 137750 BLAKE2B a5fb0570f6263c1911a4cad52f1b974f8010a02cf882f2e1e40ed7dbbce4be8b75290e4b0a78b5dde74cc244c9a848dd429a937e696746d3d39b8cec9dd469fd SHA512 0632f1b4b96a1e4b5567101fbac36db55e658503977c8c875d75d9c1db5b374deba5afbda5507585b6b79242781fd70afc477e686458cc124adb8e1b29860c1e
diff --git a/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch b/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch
deleted file mode 100644
index e99180f8686e..000000000000
--- a/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Respect CFLAGS/LDFLAGS/DESTDIR and don't try to run missing tests.
-
---- gif2png-2.5.12/Makefile
-+++ gif2png-2.5.12/Makefile
-@@ -2,8 +2,7 @@
-
- VERSION = $(shell sed -n =media-libs/libpng-1.2:0=
- sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.5.12-makefile.patch
-)
-
-src_prepare() {
- default
-
- # this release lacks the NEWS file that is being used to
- # query the release version
- # https://gitlab.com/esr/gif2png/issues/4
- sed "s@^VERSION.*@VERSION = ${PV}@" -i Makefile || die
-
- tc-export CC
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-}
diff --git a/media-gfx/gif2png/gif2png-2.5.9.ebuild b/media-gfx/gif2png/gif2png-2.5.9.ebuild
deleted file mode 100644
index d0cd0123f513..000000000000
--- a/media-gfx/gif2png/gif2png-2.5.9.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Converts images from gif format to png format"
-HOMEPAGE="http://catb.org/~esr/gif2png/"
-SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=media-libs/libpng-1.2:0
- sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-DOCS="AUTHORS NEWS README"
diff --git a/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild b/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
index b66ae5194f7f..5b657769e158 100644
--- a/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
+++ b/media-gfx/gpicview/gpicview-0.2.5-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit xdg-utils
+inherit xdg
DESCRIPTION="A Simple and Fast Image Viewer for X"
HOMEPAGE="http://lxde.sourceforge.net/gpicview"
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index 8e4554b3141f..c298b7684be2 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -1,7 +1,14 @@
-
+
+ sam@gentoo.org
+ Sam James
+
+
+ codec@gentoo.org
+ Gentoo Codec Project
+
This is a port of GraphicsMagick(TM), the "swiss army knife" of
image processing. It provides a robust collection of tools and libraries
diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest
index 8bd330c0508c..c4ebfd216cef 100644
--- a/media-gfx/libimagequant/Manifest
+++ b/media-gfx/libimagequant/Manifest
@@ -1,3 +1,2 @@
-DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8
DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257
DIST libimagequant-2.14.0.tar.gz 97471 BLAKE2B df6403aea0b0e3cbaf05c6c60726ac3de85195779e4829dd04acec28ba93ea8d629846fa71d765949e721f592300da1d35227ec7bb28e00c600c575ba3fdc4fe SHA512 d34aa2ac9f08eebd80fb9e3e7fe22a3f10ce840152c4192735d57ae37c223350af09eeff6870ee2634b3fc51b03d1663cd6afd17daeab923af3b5f60fbef57d4
diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
deleted file mode 100644
index 5ecbf05fe927..000000000000
--- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs
-
-DESCRIPTION="Palette quantization library that powers pngquant and other PNG optimizers"
-HOMEPAGE="https://pngquant.org/lib/"
-SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cpu_flags_x86_sse2 debug openmp static-libs"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/libimagequant-2.12.2-respect-CFLAGS.patch
- "${FILESDIR}"/libimagequant-2.12.2-fix-pkgconfig.patch
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
- tc-export AR CC
- # Hand rolled configure script, so not all flags are supported.
- ./configure \
- --prefix="${EPREFIX}/usr" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- $(use debug && echo --enable-debug) \
- $(use_enable cpu_flags_x86_sse2 sse) \
- $(use_with openmp) \
- CFLAGS="${CFLAGS} ${CPPFLAGS}" \
- LDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
- emake shared imagequant.pc
- use static-libs && emake static
-}
-
-src_install() {
- dolib.so libimagequant.so
- dolib.so libimagequant.so.*
- use static-libs && dolib.a libimagequant.a
- doheader libimagequant.h
- einstalldocs
- insinto /usr/$(get_libdir)/pkgconfig
- doins imagequant.pc
-}
diff --git a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
index d8a28a87886b..3e2a0e585181 100644
--- a/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.31.ebuild
@@ -131,7 +131,7 @@ SRC_URI="https://gitlab.com/sane-project/backends/-/archive/${PV}/${MY_P}.tar.gz
LICENSE="GPL-2 public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
# For pixma: see https://gitlab.com/sane-project/backends/-/releases/1.0.28#build
RDEPEND="
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 97bc4b03c544..9a3f246ba0d6 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,2 +1 @@
-DIST tuxpaint-0.9.21.tar.gz 9543034 BLAKE2B 196a743542d72e3dc5cea69b9e66a3baecdde7e3b288cb6759632d2b472f69db8d70ad404737416afe7f2ef4d0c0d21c7b2caadb64ca8d21a909e275ee6fcc46 SHA512 fafd80fe7a5a4d65236c8b5a4f15c644c76180e0e4ed7e774795572b70cc38ddb3273be2a93f041d74a1e536a5a9386c18e51987425ea1a3ff910661e4b0afb3
DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4 SHA512 a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch
deleted file mode 100644
index 00af3cb2a867..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.20-gentoo.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-diff -ru tuxpaint-0.9.20.orig/Makefile tuxpaint-0.9.20/Makefile
---- tuxpaint-0.9.20.orig/Makefile 2008-12-21 15:04:36.000000000 +0100
-+++ tuxpaint-0.9.20/Makefile 2008-12-21 15:42:24.000000000 +0100
-@@ -137,9 +137,12 @@
- # Icons and launchers:
- ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps
- X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps
--GNOME_PREFIX:=$(shell gnome-config --prefix 2> /dev/null)
--KDE_PREFIX:=$(shell kde-config --install apps --expandvars 2> /dev/null)
--KDE_ICON_PREFIX:=$(shell kde-config --install icon --expandvars 2> /dev/null)
-+GNOME_PREFIX:=
-+KDE_PREFIX:=
-+KDE_ICON_PREFIX:=
-+DESKTOP_ICON_PREFIX:=$(PREFIX)/share/icons
-+
-+ENABLE_GETTEXT:=0
-
- # Maemo flag
- MAEMOFLAG:=
-@@ -200,7 +203,7 @@
-
- #-ffast-math
- OPTFLAGS:=-O2
--CFLAGS:=$(CPPFLAGS) $(OPTFLAGS) -W -Wall -fno-common -ffloat-store \
-+CFLAGS:=$(CPPFLAGS) -W -Wall -fno-common -ffloat-store \
- $(call comptest,-fvisibility=hidden,) \
- -Wcast-align -Wredundant-decls \
- -Wbad-function-cast -Wwrite-strings \
-@@ -232,7 +235,10 @@
- # "make" with no arguments builds the program and man page from sources:
- #
- .PHONY: all
--all: tuxpaint translations magic-plugins tp-magic-config
-+all: tuxpaint magic-plugins tp-magic-config
-+ @if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
-+ make translations; \
-+ fi
- @echo
- @echo "--------------------------------------------------------------"
- @echo
-@@ -390,7 +396,7 @@
- windows_ARCH_INSTALL:=
- osx_ARCH_INSTALL:=
- beos_ARCH_INSTALL:=
--linux_ARCH_INSTALL:=install-gnome install-kde install-kde-icons
-+linux_ARCH_INSTALL:=install-desktop-data
- ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
-
- # "make install" installs all of the various parts
-@@ -400,10 +406,13 @@
- install: install-bin install-data install-man install-doc \
- install-magic-plugins \
- install-magic-plugin-dev \
-- install-icon install-gettext install-im install-importscript \
-+ install-icon install-im install-importscript \
- install-default-config install-example-stamps \
- install-example-starters \
- $(ARCH_INSTALL)
-+ @if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
-+ make install-gettext ; \
-+ fi
- @echo
- @echo "--------------------------------------------------------------"
- @echo
-@@ -581,17 +590,50 @@
-
- # Install a launcher icon in the Gnome menu
- .PHONY: install-gnome
--install-gnome:
-+install-desktop-data:
- @echo
-- @echo "...Installing launcher icon into GNOME..."
-- @if [ "x$(GNOME_PREFIX)" != "x" ]; then \
-- install -d $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps; \
-- cp data/images/icon.png $(DESTDIR)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
-- chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
-- install -d $(DESTDIR)$(GNOME_PREFIX)/share/applications; \
-- cp src/tuxpaint.desktop $(DESTDIR)$(GNOME_PREFIX)/share/applications/; \
-- chmod 644 $(DESTDIR)$(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
-- fi
-+ @echo "...Installing launcher entry..."
-+ @if [ "x$(PREFIX)" != "x" ]; then \
-+ install -d $(PKG_ROOT)$(PREFIX)/share/applications; \
-+ cp src/tuxpaint.desktop $(PKG_ROOT)$(PREFIX)/share/applications/; \
-+ chmod 644 $(PKG_ROOT)$(PREFIX)/share/applications/tuxpaint.desktop; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/; \
-+ install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/; \
-+ cp data/images/tuxpaint-icon.svg \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \
-+ cp data/images/icon192x192.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \
-+ cp data/images/icon128x128.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \
-+ cp data/images/icon96x96.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \
-+ cp data/images/icon64x64.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \
-+ cp data/images/icon48x48.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \
-+ cp data/images/icon32x32.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \
-+ cp data/images/icon22x22.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \
-+ cp data/images/icon16x16.png \
-+ $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \
-+ chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \
-+ fi
-
-
- # Install a launcher icon for the Nokia 770.
-@@ -684,9 +726,6 @@
- @install -d $(ICON_PREFIX)
- @cp data/images/icon.png $(ICON_PREFIX)/tuxpaint.png
- @chmod 644 $(ICON_PREFIX)/tuxpaint.png
-- @install -d $(X11_ICON_PREFIX)
-- @cp data/images/icon32x32.xpm $(X11_ICON_PREFIX)/tuxpaint.xpm
-- @chmod 644 $(X11_ICON_PREFIX)/tuxpaint.xpm
-
-
- # Install the program:
-Only in tuxpaint-0.9.20: Makefile.bak
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
deleted file mode 100644
index f864a8382f09..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-=== modified file 'Makefile'
---- a/Makefile 2011-08-09 15:19:01 +0000
-+++ b/Makefile 2011-08-09 15:19:43 +0000
-@@ -871,7 +871,7 @@
- $(ARCH_LIBS)
- @echo
- @echo "...Linking Tux Paint..."
-- $(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
- -o tuxpaint $^ \
- $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS)
- @$(RSRC_CMD)
-@@ -1043,7 +1043,7 @@
- MAGIC_SO:=$(patsubst magic/src/%.c,magic/%.$(SO_TYPE),$(MAGIC_C))
-
- $(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c
-- $(CC) $(MAGIC_CFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
-+ $(CC) $(MAGIC_CFLAGS) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
- # Probably should separate the various flags like the following:
- # $(CC) $(PLUG_CPPFLAGS) $(PLUG_CFLAGS) $(PLUG_LDFLAGS) -o $@ $< $(PLUG_LIBS)
-
-
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
deleted file mode 100644
index 2970eac15516..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829
-No longer directly accessing PNG structure members directly, now using png_set_IHDR(). (Patch from SF.net Bug #3386433)
-
---- a/src/tuxpaint.c 2011/07/29 21:27:39 1.828
-+++ b/src/tuxpaint.c 2011/08/08 17:59:12 1.829
-@@ -13425,12 +13425,7 @@
- {
- png_init_io(png_ptr, fi);
-
-- info_ptr->width = surf->w;
-- info_ptr->height = surf->h;
-- info_ptr->bit_depth = 8;
-- info_ptr->color_type = PNG_COLOR_TYPE_RGB;
-- info_ptr->interlace_type = 1;
-- info_ptr->valid = 0; /* will be updated by various png_set_FOO() functions */
-+ png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
-
- png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
- PNG_sRGB_INTENT_PERCEPTUAL);
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch
deleted file mode 100644
index 295684918f50..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-underlinking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-From: Julian Ospald
-Date: Sat Oct 26 19:16:54 UTC 2013
-Subject: fix underlinking
-
-https://bugs.gentoo.org/show_bug.cgi?id=484434
-
---- tuxpaint-0.9.21/Makefile
-+++ tuxpaint-0.9.21/Makefile
-@@ -80,7 +80,7 @@
- windows_ARCH_LINKS:=-lintl $(PNG) -lwinspool -lshlwapi $(FRIBIDI_LIB)
- osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
- beos_ARCH_LINKS:="-lintl $(PNG) -lz -lbe -liconv $(FRIBIDI_LIB)"
--linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
-+linux_ARCH_LINKS:=$(PAPER_LIB) $(PNG) $(FRIBIDI_LIB)
- ARCH_LINKS:=$($(OS)_ARCH_LINKS)
-
- # Install a launcher icon for the Nokia 770.
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
deleted file mode 100644
index 6c8458138345..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs xdg-utils
-
-DESCRIPTION="Drawing program designed for young children"
-HOMEPAGE="http://www.tuxpaint.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-RDEPEND="
- app-text/libpaper
- dev-libs/fribidi
- gnome-base/librsvg:2
- >=media-libs/libpng-1.2:0=
- >=media-libs/freetype-2:2
- media-libs/libsdl
- media-libs/sdl-image[png]
- media-libs/sdl-mixer
- media-libs/sdl-pango
- media-libs/sdl-ttf
- x11-libs/cairo
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- nls? ( sys-devel/gettext )
-"
-
-DOCS=(
- docs/{ADVANCED-STAMPS-HOWTO,AUTHORS,CHANGES,default_colors,dejavu}.txt
- docs/{EXTENDING,FAQ,OPTIONS,PNG,README,SVG}.txt
-)
-
-PATCHES=(
- # Sanitize the Makefile and correct a few other issues
- "${FILESDIR}/${PN}-0.9.20-gentoo.patch"
- "${FILESDIR}/${P}-libpng1.5.patch" #378199
- "${FILESDIR}/${P}-LDFLAGS.patch" #334571
- "${FILESDIR}/${P}-underlinking.patch" #484434
-)
-
-src_prepare() {
- default
- sed -i \
- -e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \
- -e "s:/lib/:/$(get_libdir)/:" \
- -e "s:/share/doc/tuxpaint.*:/share/doc/${PF}:g" \
- Makefile || die
-}
-
-src_compile() {
- # parallel build may break things
- emake -j1 CC="$(tc-getCC)" \
- $(use nls && echo ENABLE_GETTEXT=1)
-}
-
-src_install() {
- emake -j1 PKG_ROOT="${D}" \
- $(usex nls ENABLE_GETTEXT=1 '') install
-
- einstalldocs
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-
- if ! has_version "${CATEGORY}/${PN}"; then
- elog "For additional graphic stamps, you can emerge the"
- elog "media-gfx/tuxpaint-stamps package."
- fi
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/media-gfx/wings/Manifest b/media-gfx/wings/Manifest
index 9baf9304dcb2..3dca7377222e 100644
--- a/media-gfx/wings/Manifest
+++ b/media-gfx/wings/Manifest
@@ -1,5 +1 @@
-DIST wings-2.1.5.tar.bz2 2653117 BLAKE2B 10b14e8dd29daf74fd6af9229341296fa457df405542274533df85198d932188c53094afffbc4b09342c29086df02a7e19d4983f1fc912623ea79ae85e9d4067 SHA512 37f363f39d0618550d7814733a4e52c18b52c7d8ee357c76dcf97ae1b530f5b941bddecfba18d63538792dda3ca3013055759595157832e11e017bfe18b34df0
-DIST wings-2.1.6.tar.bz2 2688154 BLAKE2B 9183ac21f3ae58e5c4d248f3ab9e8af89c3838b312aa51f6d625c21cde05b9326156737e449876aa2a0ea8047a9ce75ad433fe1430ff5add2c5b516144ba7244 SHA512 db17ae58f57233a65f9cec43cca41e9d259eb6499229e6ffc1f1acb8e86e18deda7a1ab1075f0948885cc4ca3c075871150efb007bf3e8e8e5a2e77b5b924af7
-DIST wings-2.1.7.tar.bz2 2720764 BLAKE2B b0ba4a1acaee6ea0bcd21cab1eca1a37a0fd3549c2d5551969e71084eb2596a9c7574f0ddc3a86230fccbaf58c3ac87d7061ccfa17047d10e1b8bff096198235 SHA512 6cd2816e22b2326af43f539831d36b32015828c5261c0503ea36cd171dfd8a54eba65165395fbb3f173224d6bb2d3a3015f8f58225c6237c2d5bf56604e72d10
-DIST wings-2.2.5.tar.bz2 3211359 BLAKE2B d5aa7ea337894f18d6b45ff7e68bb35d587da47bf173045d80eb643d748fc64a511db305d1dc164789b06aa34ea47549a04a05564fa615bf01532da294768cd3 SHA512 343fd601a68cccff0151748f151c85635bf57acc01c25fd2ba770f255d65e73a49671c3a84c4433576c1ba3f9e98a2d098a47e3674d4617a07817973bee0136a
DIST wings-2.2.6.1.tar.bz2 3266532 BLAKE2B a3ec86925632df7d231d620a47841781f8b2e66a50d13857c57fa6389890e7a03fed8bf5e0d09b03de00d6360ee0e4129a4178aec34270367879890f9430c208 SHA512 dba4b189c80180533b7a6c10be5c236a4a9fdacaa7dc491a0d1892149f7a75e636778acc11e38ef82a06718ae705e640da2e1618ec655828d2056e6b3864aba4
diff --git a/media-gfx/wings/files/wings.sh b/media-gfx/wings/files/wings.sh
deleted file mode 100644
index 3fcebe4b1252..000000000000
--- a/media-gfx/wings/files/wings.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-ESDL_ROOT="/usr/lib/erlang/lib/esdl"
-WINGS_ROOT="/usr/lib/erlang/lib/wings"
-exec erl -smp disable -noshell -pa $ESDL_ROOT/ebin $WINGS_ROOT/ebin -run wings_start start_halt
diff --git a/media-gfx/wings/wings-2.1.5.ebuild b/media-gfx/wings/wings-2.1.5.ebuild
deleted file mode 100644
index be3e01a0d82e..000000000000
--- a/media-gfx/wings/wings-2.1.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/"
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
- >dev-lang/erlang-21[wxwidgets]
- dev-libs/cl
- media-libs/glu
- media-libs/libsdl[opengl]
- virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
-
- sed -i \
- -e '/include_lib/s|"wings/|"../|' \
- $(find . -name '*'.erl) \
- || die
-
- sed -i \
- -e 's|-O3||g' \
- -e 's|-Werror||g' \
- -e 's|CFLAGS = |CFLAGS += |g' \
- $(find . -name Makefile) \
- || die
-}
-
-src_configure() {
- export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-}
-
-src_compile() {
- # Work around parallel make issues
- emake vsn.mk
- for subdir in intl_tools src e3d icons plugins_src; do
- emake -C ${subdir}
- done
-}
-
-src_install() {
- WINGS_PATH=${ERL_PATH}/${P}
- dodir ${WINGS_PATH}
-
- find -name 'Makefile*' -exec rm -f '{}' \;
-
- insinto ${WINGS_PATH}
- doins -r e3d ebin icons plugins psd shaders src textures tools
-
- newbin "${FILESDIR}"/wings.sh-r1 wings
- dodoc AUTHORS README
-}
diff --git a/media-gfx/wings/wings-2.1.6.ebuild b/media-gfx/wings/wings-2.1.6.ebuild
deleted file mode 100644
index 9f5e9713d19b..000000000000
--- a/media-gfx/wings/wings-2.1.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/"
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- >dev-lang/erlang-21[wxwidgets]
- dev-libs/cl
- media-libs/glu
- media-libs/libsdl[opengl]
- virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
-
- sed -i \
- -e '/include_lib/s|"wings/|"../|' \
- $(find . -name '*'.erl) \
- || die
-
- sed -i \
- -e 's|-O3||g' \
- -e 's|-Werror||g' \
- -e 's|CFLAGS = |CFLAGS += |g' \
- $(find . -name Makefile) \
- || die
-}
-
-src_configure() {
- export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-}
-
-src_compile() {
- # Work around parallel make issues
- emake vsn.mk
- for subdir in intl_tools src e3d icons plugins_src; do
- emake -C ${subdir}
- done
-}
-
-src_install() {
- WINGS_PATH=${ERL_PATH}/${P}
- dodir ${WINGS_PATH}
-
- find -name 'Makefile*' -exec rm -f '{}' \;
-
- insinto ${WINGS_PATH}
- doins -r e3d ebin icons plugins psd shaders src textures tools
-
- newbin "${FILESDIR}"/wings.sh-r1 wings
- dodoc AUTHORS README
-}
diff --git a/media-gfx/wings/wings-2.1.7.ebuild b/media-gfx/wings/wings-2.1.7.ebuild
deleted file mode 100644
index 9f5e9713d19b..000000000000
--- a/media-gfx/wings/wings-2.1.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/"
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- >dev-lang/erlang-21[wxwidgets]
- dev-libs/cl
- media-libs/glu
- media-libs/libsdl[opengl]
- virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- default
-
- sed -i \
- -e '/include_lib/s|"wings/|"../|' \
- $(find . -name '*'.erl) \
- || die
-
- sed -i \
- -e 's|-O3||g' \
- -e 's|-Werror||g' \
- -e 's|CFLAGS = |CFLAGS += |g' \
- $(find . -name Makefile) \
- || die
-}
-
-src_configure() {
- export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
-}
-
-src_compile() {
- # Work around parallel make issues
- emake vsn.mk
- for subdir in intl_tools src e3d icons plugins_src; do
- emake -C ${subdir}
- done
-}
-
-src_install() {
- WINGS_PATH=${ERL_PATH}/${P}
- dodir ${WINGS_PATH}
-
- find -name 'Makefile*' -exec rm -f '{}' \;
-
- insinto ${WINGS_PATH}
- doins -r e3d ebin icons plugins psd shaders src textures tools
-
- newbin "${FILESDIR}"/wings.sh-r1 wings
- dodoc AUTHORS README
-}
diff --git a/media-gfx/wings/wings-2.2.5.ebuild b/media-gfx/wings/wings-2.2.5.ebuild
deleted file mode 100644
index b6561579ab68..000000000000
--- a/media-gfx/wings/wings-2.2.5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Wings 3D is an advanced subdivision modeler"
-HOMEPAGE="http://www.wings3d.com/"
-SRC_URI="mirror://sourceforge/wings/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
- >dev-lang/erlang-21[wxwidgets]
- dev-libs/cl
- media-libs/glu
- media-libs/libsdl[opengl]
- virtual/opengl
-"
-DEPEND="
- ${RDEPEND}
-"
-
-src_compile() {
- export ERL_PATH="/usr/$(get_libdir)/erlang/lib/"
- # Work around parallel make issues
- # Set ER_LIBS to the top source directory
- emake vsn.mk
- for subdir in intl_tools e3d src plugins_src icons; do
- emake -C ${subdir} opt ERL_LIBS="${S}"
- done
- default
-}
-
-src_install() {
- WINGS_PATH=${ERL_PATH}/${P}
- dodir ${WINGS_PATH}
-
- find -name 'Makefile*' -exec rm -f '{}' \;
-
- insinto ${WINGS_PATH}
- doins -r e3d ebin icons plugins priv psd shaders src textures tools
-
- newbin "${FILESDIR}"/wings.sh-r1 wings
- dodoc AUTHORS README
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7a30dc2b7197..f9bc7c24f0a3 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/bcg729/bcg729-1.1.1.ebuild b/media-libs/bcg729/bcg729-1.1.1.ebuild
index cf638a772cfc..b0918c6a824f 100644
--- a/media-libs/bcg729/bcg729-1.1.1.ebuild
+++ b/media-libs/bcg729/bcg729-1.1.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit cmake
TEST_SUFFIX="tests-20210101"
-DESCRIPTION="encoder and decoder of the ITU G729 Annex A/B speech codec"
+DESCRIPTION="Encoder and decoder of the ITU G729 Annex A/B speech codec"
HOMEPAGE="https://github.com/BelledonneCommunications/bcg729"
SRC_URI="https://github.com/BelledonneCommunications/${PN}/archive/${PV/_/-}.tar.gz -> ${P}.tar.gz"
SRC_URI+=" test? ( http://www.belledonne-communications.com/bc-downloads/${PN}-patterns.zip -> ${PN}-${TEST_SUFFIX}.zip )"
@@ -16,6 +16,7 @@ LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 x86"
IUSE="test"
+
RESTRICT="test"
# Not all passing yet
# TODO: Report upstream
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index 562165dfa7da..359a1cb6a1ba 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -1,4 +1,3 @@
DIST glew-1.10.0.tgz 567605 BLAKE2B 18e2b3a4d60b69def1e68778554b43b85c69914daa20b8a64adb2e807df391a2eaff9c6cb2a3c46e5bbbf004655561ae4d2cd8a2fb883a2754f23564993a61b2 SHA512 0c998fda9fe01c9296a3453966c0449c9968f4f5f989065ca65f0da3830ae8d805699d0ee0362c3b18765420222ba18842b9db20986212afceb36c971ae1bdca
DIST glew-1.6.0.tgz 494713 BLAKE2B 17e47092e2eefcad79220232b3aeaf856541f5024bdaa65be866dd7d63ef19ad88b389dd13c2ccf9bafd175d00d18ae94185f890a3d12d61b2445f7fa9d6ba58 SHA512 5b8ca9e97d01d49fde591b0c55683620e0a6ddfaf5e93e03536e6217bbb548adfcd4e945a39ed3cfddac3f239b3272be1b3491f4071689d02c4bfb7e0ec44904
-DIST glew-2.1.0.tgz 764073 BLAKE2B 081fb49ef286681657409f950fa03b97210dac3f90197b792d9128a2b9fa271181c9e64422a867b531683ab23010cfeb2f519adc32355839b67bf41934578fb3 SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab
DIST glew-2.2.0.tgz 835861 BLAKE2B f403f3ebd5a78d21cf5744e8e6714a0558c7cda57930751afeced966a54bc9634c070eee4d791f5948bfc60b5c03ca5f488559c6372c0953c0ffe1711a3913f3 SHA512 57453646635609d54f62fb32a080b82b601fd471fcfd26e109f479b3fef6dfbc24b83f4ba62916d07d62cd06d1409ad7aa19bc1cd7cf3639c103c815b8be31d1
diff --git a/media-libs/glew/files/glew-2.1.0-mesa-compat.patch b/media-libs/glew/files/glew-2.1.0-mesa-compat.patch
deleted file mode 100644
index 391420e8138a..000000000000
--- a/media-libs/glew/files/glew-2.1.0-mesa-compat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/include/GL/glew.h b/include/GL/glew.h
-index b5b6987..a9f9e4b 100644
---- a/include/GL/glew.h
-+++ b/include/GL/glew.h
-@@ -93,7 +93,7 @@
- #if defined(__REGAL_H__)
- #error Regal.h included before glew.h
- #endif
--#if defined(__glext_h_) || defined(__GLEXT_H_)
-+#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_)
- #error glext.h included before glew.h
- #endif
- #if defined(__gl_ATI_h_)
-@@ -109,6 +109,7 @@
- #define __X_GL_H
- #define __glext_h_
- #define __GLEXT_H_
-+#define __gl_glext_h_
- #define __gl_ATI_h_
-
- #if defined(_WIN32)
diff --git a/media-libs/glew/glew-2.1.0-r1.ebuild b/media-libs/glew/glew-2.1.0-r1.ebuild
deleted file mode 100644
index 8688c0b15c13..000000000000
--- a/media-libs/glew/glew-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs
-
-DESCRIPTION="The OpenGL Extension Wrangler Library"
-HOMEPAGE="http://glew.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="BSD MIT"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc static-libs"
-
-DEPEND="
- >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
- >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- local PATCHES=(
- "${FILESDIR}"/${PN}-2.0.0-install-headers.patch
- "${FILESDIR}"/${P}-mesa-compat.patch
- )
-
- sed -i \
- -e '/INSTALL/s:-s::' \
- -e '/$(CC) $(CFLAGS) -o/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
- -e '/^.PHONY: .*\.pc$/d' \
- Makefile || die
-
- if ! use static-libs ; then
- sed -i \
- -e '/glew.lib:/s|lib/$(LIB.STATIC) ||' \
- -e '/glew.lib.mx:/s|lib/$(LIB.STATIC.MX) ||' \
- -e '/INSTALL.*LIB.STATIC/d' \
- Makefile || die
- fi
-
- # don't do stupid Solaris specific stuff that won't work in Prefix
- cp config/Makefile.linux config/Makefile.solaris || die
- # and let freebsd be built as on linux too
- cp config/Makefile.linux config/Makefile.freebsd || die
-
- default
- multilib_copy_sources
-}
-
-glew_system() {
- # Set the SYSTEM variable instead of probing. #523444 #595280
- case ${CHOST} in
- *linux*) echo "linux" ;;
- *-freebsd*) echo "freebsd" ;;
- *-darwin*) echo "darwin" ;;
- *-solaris*) echo "solaris" ;;
- mingw*|*-mingw*) echo "mingw" ;;
- *) die "Unknown system ${CHOST}" ;;
- esac
-}
-
-set_opts() {
- myglewopts=(
- AR="$(tc-getAR)"
- STRIP=true
- CC="$(tc-getCC)"
- LD="$(tc-getCC) ${LDFLAGS}"
- SYSTEM="$(glew_system)"
- M_ARCH=""
- LDFLAGS.EXTRA=""
- POPT="${CFLAGS}"
- )
-}
-
-multilib_src_compile() {
- set_opts
- emake \
- GLEW_PREFIX="${EPREFIX}/usr" \
- GLEW_DEST="${EPREFIX}/usr" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- "${myglewopts[@]}"
-}
-
-multilib_src_install() {
- set_opts
- emake \
- GLEW_DEST="${ED}/usr" \
- LIBDIR="${ED}/usr/$(get_libdir)" \
- PKGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
- "${myglewopts[@]}" \
- install.all
-
- dodoc README.md
- if use doc; then
- docinto html
- dodoc -r doc
- fi
-}
diff --git a/media-libs/glew/metadata.xml b/media-libs/glew/metadata.xml
index e77314e79280..a123c0ed805d 100644
--- a/media-libs/glew/metadata.xml
+++ b/media-libs/glew/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ games@gentoo.org
+ Games
+
nigels-com/glew
glew
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 93e8ac487f61..75b1a55f86a1 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,3 +1,2 @@
-DIST harfbuzz-2.7.2.tar.gz 16605557 BLAKE2B 246ab64e29afcadc692b57bad84acdea1f9200a63f6f8b1519d12b8515ec65dc45e2edf3abdde473b71364427a689d92ce2ee25c514edf4b1e680dd423d774ee SHA512 2eeb198dab1ed1cc7d10c3890293ff40e9f37372413877a5bd44d66e88d8460a81f51cbe71c328b1300f542ca8de3269749d1d01d0c324c8b95a9c038fbe1521
-DIST harfbuzz-2.7.3.tar.gz 16696840 BLAKE2B 95eb0fc86caf51f512520ba599e9be08b4a9f6565a3e52280f9454043b524e7b04194e506b5122db066966125fa4583b7be856005b53726a0192d3f08fb5cdcb SHA512 1fa1cfd7b55446309413deb6c139ff9015a013b480da422482e75fa11b130b7dcfaeabfffc513a2027732d0b58fbd39dede2f3eb516214d5efd901a2d1e6af8f
DIST harfbuzz-2.7.4.tar.gz 16703694 BLAKE2B 9932c039bb27ee53179e500c80ae8bd24d4cb77d4fcd01c10b8b5f0fd55de6af3c265196aa80653835f464c5431f89a870a7112eaf2c715f05e1e084011fa240 SHA512 5b412e0f6d1c9142a0ef2713826cb8d6ebf348c5b64054a0676d3ce084bcff1de375dadf90e87dbbf6d0ec8e4a99339cb64b514d5464efb7e27037551e494099
+DIST harfbuzz-2.8.0.tar.gz 17000989 BLAKE2B a2b29bccf394ad8836fb534af42aaa193addc02745ffe8a82294e571483b2eb1f7ece300dbae60a0c1b9e70235109e764ded16518ab2b17e4d3d319b43404faa SHA512 736e6829fd470d1647df2c7116b4e9e6186676bc33140b3913130a9f1818f7bef2415958cab8c6bf9c5b660f43e4924d3ca220970a5c48c0c1525f601e26fd48
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
deleted file mode 100644
index 95ab9eb8acd3..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.7.2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
- EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
- cairo? ( x11-libs/cairo:= )
- glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
- graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
- icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.34:= )
- truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=dev-libs/gobject-introspection-common-1.34
- test? ( ${PYTHON_DEPS} )
-"
-BDEPEND="
- virtual/pkgconfig
- doc? ( dev-util/gtk-doc )
- introspection? ( dev-util/glib-utils )
-"
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
- if ! use debug ; then
- append-cppflags -DHB_NDEBUG
- fi
-}
-
-src_prepare() {
- default
-
- xdg_environment_reset
-
- sed -i \
- -e 's:tests/macos.tests::' \
- test/shaping/data/in-house/Makefile.sources \
- || die # bug 726120
-
- # bug 618772
- append-cxxflags -std=c++14
-}
-
-meson_multilib_native_feature() {
- if multilib_is_native_abi && use "$1" ; then
- echo "enabled"
- else
- echo "disabled"
- fi
-}
-
-multilib_src_configure() {
- # harfbuzz-gobject only used for instrospection, bug #535852
- local emesonargs=(
- -Dcairo="$(meson_multilib_native_feature cairo)"
- -Dcoretext="disabled"
- -Ddocs="$(meson_multilib_native_feature doc)"
- -Dfontconfig="disabled" #609300
- -Dintrospection="$(meson_multilib_native_feature introspection)"
- -Dstatic="$(usex static-libs true false)"
- $(meson_feature glib)
- $(meson_feature graphite)
- $(meson_feature icu)
- $(meson_feature introspection gobject)
- $(meson_feature test tests)
- $(meson_feature truetype freetype)
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
similarity index 92%
rename from media-libs/harfbuzz/harfbuzz-2.7.3.ebuild
rename to media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
index aa205f2fc508..dd5ebd99dc19 100644
--- a/media-libs/harfbuzz/harfbuzz-2.7.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
@@ -35,16 +35,16 @@ RDEPEND="
"
DEPEND="${RDEPEND}
>=dev-libs/gobject-introspection-common-1.34
- test? ( ${PYTHON_DEPS} )
"
BDEPEND="
+ ${PYTHON_DEPS}
virtual/pkgconfig
doc? ( dev-util/gtk-doc )
introspection? ( dev-util/glib-utils )
"
pkg_setup() {
- use test && python-any-r1_pkg_setup
+ python-any-r1_pkg_setup
if ! use debug ; then
append-cppflags -DHB_NDEBUG
fi
@@ -62,6 +62,12 @@ src_prepare() {
# bug 618772
append-cxxflags -std=c++14
+
+ # bug 762415
+ local pyscript
+ for pyscript in $(find -type f -name "*.py") ; do
+ python_fix_shebang -q "${pyscript}"
+ done
}
meson_multilib_native_feature() {
diff --git a/media-libs/libnspsl/Manifest b/media-libs/libnspsl/Manifest
index ef87d943d0d1..b1f08e914cf0 100644
--- a/media-libs/libnspsl/Manifest
+++ b/media-libs/libnspsl/Manifest
@@ -1,3 +1 @@
-DIST libnspsl-0.1.3-src.tar.gz 311065 BLAKE2B ef846482c677e98a9eae646597e893f4e94161a60482127a88440a3786d2f9e3c4458a823ac878c64bc7d1b00080653facc28f408d2a44b571835958966297af SHA512 da4069dee152d126d53e442c8ced1438707db1ccee779bd2abe752a8d1dc30e40036037674e220bb24adad49fe406633e0d07e5d29d209b9fb223107c0e89415
-DIST libnspsl-0.1.5-src.tar.gz 316104 BLAKE2B e20d2ef94758943b848b6785bf462d5bab706c8396b10e22d3fa6d3718a78ee26aa1bb361e084dc28fcec3cc7498ed5774eea5fc086ca620c3c135e101a71300 SHA512 a46cc8eda6f22936e8d2477b16c094b1e7f9668071823aaf07d2a3c6cc0af645ea4d4cb3ae9fdafcc8dd77602bed736a8ae82f588ba7d56f5c774736da7e1baa
DIST libnspsl-0.1.6-src.tar.gz 320130 BLAKE2B 8485054d1431f57ff71440120fd28610d62687527927dcc2f3bf7869075e08c05d2583567a90a28a2690aa78721c81949019cc353b570def1aa47e37bbbaa437 SHA512 928ce45bbc75215db5f1238a1cc879b3e91511950fc870c0232d84b1270882ec8c6470ce1a8d5cfbe7b6f24bf9e25745f2053ad2f1f4933f3d648d67d3ba2754
diff --git a/media-libs/libnspsl/libnspsl-0.1.3-r2.ebuild b/media-libs/libnspsl/libnspsl-0.1.3-r2.ebuild
deleted file mode 100644
index cc0ffae7908f..000000000000
--- a/media-libs/libnspsl/libnspsl-0.1.3-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-DEPEND="
- dev-util/netsurf-buildsystem
- virtual/pkgconfig"
-
-_emake() {
- netsurf_define_makeconf
- emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
- _emake
-}
-
-src_install() {
- _emake DESTDIR="${D}" install
-}
diff --git a/media-libs/libnspsl/libnspsl-0.1.5-r1.ebuild b/media-libs/libnspsl/libnspsl-0.1.5-r1.ebuild
deleted file mode 100644
index 79f812a2e741..000000000000
--- a/media-libs/libnspsl/libnspsl-0.1.5-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="decoding library for BMP and ICO image file formats, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE=""
-
-BDEPEND="
- dev-util/netsurf-buildsystem
- virtual/pkgconfig"
-
-_emake() {
- netsurf_define_makeconf
- emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
- _emake
-}
-
-src_install() {
- _emake DESTDIR="${D}" install
-}
diff --git a/media-libs/libopenaptx/Manifest b/media-libs/libopenaptx/Manifest
new file mode 100644
index 000000000000..7271834f99f6
--- /dev/null
+++ b/media-libs/libopenaptx/Manifest
@@ -0,0 +1 @@
+DIST libopenaptx-0.2.0.tar.gz 27797 BLAKE2B b178a9aaf78796c9219d9e7066ff985ce9f5dd86a6926ae22e373f2822090ad313efe04d5cf607940f1042bd27ddf5484d7e8298dfff91a8ae5596cec7ad5fa9 SHA512 d57e5084b398eec2ad49c9893baa496651c139abfb95692c834a4691bc4bb951d0b1afdd499a8b67c84b873407b584965d3a045d8ef3d9e62b3ccf45de22809a
diff --git a/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild b/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
new file mode 100644
index 000000000000..bac055db1328
--- /dev/null
+++ b/media-libs/libopenaptx/libopenaptx-0.2.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Reverse-engineered aptX and aptX HD library"
+HOMEPAGE="https://github.com/pali/libopenaptx"
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/pali/${PN}"
+else
+ SRC_URI="https://github.com/pali/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+IUSE="cpu_flags_x86_avx2"
+
+src_compile() {
+ tc-export CC AR
+
+ use cpu_flags_x86_avx2 && append-cflags "-mavx2"
+
+ emake \
+ PREFIX="${EPREFIX}"/usr \
+ LIBDIR=$(get_libdir) \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ ARFLAGS="${ARFLAGS} -rcs" \
+ all
+}
+
+src_install() {
+ emake \
+ PREFIX="${EPREFIX}"/usr \
+ DESTDIR="${D}" \
+ LIBDIR="$(get_libdir)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ ARFLAGS="${ARFLAGS} -rcs" \
+ install
+
+ rm -f "${ED}/usr/$(get_libdir)"/libopenaptx.a || die "Failed to remove static lib"
+}
diff --git a/media-libs/libopenaptx/libopenaptx-9999.ebuild b/media-libs/libopenaptx/libopenaptx-9999.ebuild
new file mode 100644
index 000000000000..bac055db1328
--- /dev/null
+++ b/media-libs/libopenaptx/libopenaptx-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Reverse-engineered aptX and aptX HD library"
+HOMEPAGE="https://github.com/pali/libopenaptx"
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/pali/${PN}"
+else
+ SRC_URI="https://github.com/pali/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+IUSE="cpu_flags_x86_avx2"
+
+src_compile() {
+ tc-export CC AR
+
+ use cpu_flags_x86_avx2 && append-cflags "-mavx2"
+
+ emake \
+ PREFIX="${EPREFIX}"/usr \
+ LIBDIR=$(get_libdir) \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ ARFLAGS="${ARFLAGS} -rcs" \
+ all
+}
+
+src_install() {
+ emake \
+ PREFIX="${EPREFIX}"/usr \
+ DESTDIR="${D}" \
+ LIBDIR="$(get_libdir)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}" \
+ ARFLAGS="${ARFLAGS} -rcs" \
+ install
+
+ rm -f "${ED}/usr/$(get_libdir)"/libopenaptx.a || die "Failed to remove static lib"
+}
diff --git a/media-libs/libopenaptx/metadata.xml b/media-libs/libopenaptx/metadata.xml
new file mode 100644
index 000000000000..5e724bf54f34
--- /dev/null
+++ b/media-libs/libopenaptx/metadata.xml
@@ -0,0 +1,16 @@
+
+
+
+
+ sam@gentoo.org
+ Sam James
+
+
+ joakim.tjernlund@infinera.com
+ Joakim Tjernlund
+
+
+ codec@gentoo.org
+ Gentoo Codec Project
+
+
diff --git a/media-libs/suil/suil-0.10.10.ebuild b/media-libs/suil/suil-0.10.10.ebuild
index 3c4d5660b5aa..eed4bf740f4c 100644
--- a/media-libs/suil/suil-0.10.10.ebuild
+++ b/media-libs/suil/suil-0.10.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
LICENSE="ISC"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 ~x86"
IUSE="doc gtk qt5"
BDEPEND="
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index e704005eb6b5..7aa045107bd9 100644
Binary files a/media-radio/Manifest.gz and b/media-radio/Manifest.gz differ
diff --git a/media-radio/cqrlog/Manifest b/media-radio/cqrlog/Manifest
index 71d7189177bf..c9c0e486e36b 100644
--- a/media-radio/cqrlog/Manifest
+++ b/media-radio/cqrlog/Manifest
@@ -1,3 +1 @@
-DIST cqrlog-2.1.0.tar.gz 8732858 BLAKE2B 926934b70dcd53d48ed6443994a295efdee7e34d968337f409988f269fe01faeace5dbfa02307d04ba41fb72205925b9a56fa1f75472f018cd85a408edf1265a SHA512 df5f9a197600762ef0fc60e25f67cf7968829cf0241e7e63849faa1152a0d002e0f373d33528ba7285764c19460f572090f57ac7bd5f2dc2d178862003cb812e
-DIST cqrlog-2.3.0.tar.gz 10407716 BLAKE2B d932bb47601b42c940461343df69e82d8e7b8902a7cf959b72ab9a667cbaea1f8a829bfb6b3abfb2a9112f4aeed2adcbed825b1f347ceba640f1ad3903b0c246 SHA512 1e045d194a05248711e6ec43ec65e8f3f24e4fedab887cc89dc1ef6aa6e53ece4d923c9142a6ef89d8e1c46de678a16d108d344f005fa255d008cb9c5e482000
DIST cqrlog-2.4.0.tar.gz 12361259 BLAKE2B 1779abd8983b66e966b73c157e322b489c3b4005cbc84952af1d708f7d9623efa7f6abc0515ab09f13765523fa373a2829a41da43b4b0f2edaea05e1b182b5a1 SHA512 aec7b43a0d4d1cd5b1af140db149058b4cff4893e6d8ed8d1ced729bedf27baa36b71d9fa7e5312ab94dd692953346d20f7f5a55a05ba91e4eccb17919d6d49a
diff --git a/media-radio/cqrlog/cqrlog-2.1.0-r2.ebuild b/media-radio/cqrlog/cqrlog-2.1.0-r2.ebuild
deleted file mode 100644
index 6e07afef90a5..000000000000
--- a/media-radio/cqrlog/cqrlog-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database."
-HOMEPAGE="https://www.cqrlog.com/"
-SRC_URI="https://github.com/ok2cqr/cqrlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-#RESTRICT="strip"
-
-DEPEND=">=dev-lang/lazarus-1.6.4
- >=dev-lang/fpc-3.0.2"
-
-RDEPEND="${DEPEND}
- virtual/mysql[server]
- dev-libs/atk
- dev-libs/glib
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+
- x11-libs/libX11
- x11-libs/pango"
-
-#S=${WORKDIR}/${P}
-
-LazarusDir=/usr/share/lazarus/
-
-src_prepare() {
-# add --lazarusdir=/usr/share/lazarus to command line
-# fix tmpdir
- eapply_user
- epatch "${FILESDIR}/${PV}-makefile.patch"
-}
-
-pkg_postist() {
- elog "This package optionally supports media-libs/hablib"
- elog "for monitoring radio settings."
-}
diff --git a/media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild b/media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild
deleted file mode 100644
index 43d58b5490bd..000000000000
--- a/media-radio/cqrlog/cqrlog-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database."
-HOMEPAGE="https://www.cqrlog.com/"
-SRC_URI="https://github.com/ok2cqr/cqrlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/lazarus-1.8.0
- >=dev-lang/fpc-3.0.2"
-
-RDEPEND="${DEPEND}
- virtual/mysql[server]
- dev-libs/atk
- dev-libs/glib
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+
- x11-libs/libX11
- x11-libs/pango"
-
-LazarusDir=/usr/share/lazarus/
-
-src_prepare() {
- eapply_user
- epatch "${FILESDIR}/${PV}-makefile.patch"
- epatch "${FILESDIR}/${PV}-database-connection-refactoring.patch"
-}
-
-pkg_postist() {
- elog "This package optionally supports media-libs/hablib"
- elog "for monitoring radio settings."
-}
diff --git a/media-radio/cqrlog/cqrlog-2.3.0.ebuild b/media-radio/cqrlog/cqrlog-2.3.0.ebuild
deleted file mode 100644
index 3b72a623578a..000000000000
--- a/media-radio/cqrlog/cqrlog-2.3.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-DESCRIPTION="CQRLOG is an advanced ham radio logger based on MySQL database."
-HOMEPAGE="https://www.cqrlog.com/"
-SRC_URI="https://github.com/ok2cqr/cqrlog/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-#RESTRICT="strip"
-
-DEPEND=">=dev-lang/lazarus-1.8.0
- >=dev-lang/fpc-3.0.2"
-
-RDEPEND="${DEPEND}
- virtual/mysql[server]
- dev-libs/atk
- dev-libs/glib
- x11-libs/cairo
- x11-libs/gdk-pixbuf
- x11-libs/gtk+
- x11-libs/libX11
- x11-libs/pango"
-
-#S=${WORKDIR}/${P}
-
-LazarusDir=/usr/share/lazarus/
-
-src_prepare() {
-# add --lazarusdir=/usr/share/lazarus to command line
-# fix tmpdir
-# remove strip call
- eapply_user
- epatch "${FILESDIR}/${PV}-makefile.patch"
-}
-
-pkg_postist() {
- elog "This package optionally supports media-libs/hablib"
- elog "for monitoring radio settings."
-}
diff --git a/media-radio/cqrlog/files/2.1.0-makefile.patch b/media-radio/cqrlog/files/2.1.0-makefile.patch
deleted file mode 100644
index 8499213fbd53..000000000000
--- a/media-radio/cqrlog/files/2.1.0-makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/Makefile.orig b/Makefile
-index 4edf8cf..1ec6262 100644
---- a/Makefile.orig
-+++ b/Makefile
-@@ -3,10 +3,10 @@ ST=strip
- datadir = $(DESTDIR)/usr/share/cqrlog
- bindir = $(DESTDIR)/usr/bin
- sharedir = $(DESTDIR)/usr/share
--tmpdir = /tmp
-+tmpdir := $(shell mktemp -d)
-
- cqrlog: src/cqrlog.lpi
-- $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
-+ $(CC) --ws=gtk2 --lazarusdir=/usr/share/lazarus --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
- $(ST) src/cqrlog
- gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
-
diff --git a/media-radio/cqrlog/files/2.3.0-database-connection-refactoring.patch b/media-radio/cqrlog/files/2.3.0-database-connection-refactoring.patch
deleted file mode 100644
index 810bc5b5ba97..000000000000
--- a/media-radio/cqrlog/files/2.3.0-database-connection-refactoring.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-From b26102b097ef6353a20d18ccdaf7a3a6a30185c7 Mon Sep 17 00:00:00 2001
-From: ok2cqr
-Date: Sat, 15 Sep 2018 07:12:30 +0200
-Subject: [PATCH] database connection refactoring
-
----
- src/dData.pas | 126 +++++++-------------------------------------------
- 1 file changed, 17 insertions(+), 109 deletions(-)
-
-diff --git a/src/dData.pas b/src/dData.pas
-index 9d72d27..bb56598 100644
---- a/src/dData.pas
-+++ b/src/dData.pas
-@@ -162,7 +162,6 @@ type
- function FindLib(const Path,LibName : String) : String;
- function GetMysqldPath : String;
- function TableExists(TableName : String) : Boolean;
-- function GetMySQLLib : String;
- function GetDebugLevel : Integer;
-
- procedure CreateDBConnections;
-@@ -267,6 +266,7 @@ type
- function RbnCallExistsInLog(callsign,band,mode,LastDate,LastTime : String) : Boolean;
- function CallNoteExists(Callsign : String) : Boolean;
- function GetNewLogNumber : Integer;
-+ function getNewMySQLConnectionObject : TMySQL57Connection;
-
- procedure SaveQSO(date : TDateTime; time_on,time_off,call : String; freq : Currency;mode,rst_s,
- rst_r, stn_name,qth,qsl_s,qsl_r,qsl_via,iota,pwr : String; itu,waz : Integer;
-@@ -1092,49 +1092,6 @@ begin
- Writeln(' ',DLLUtilName)
- end;
-
-- lib := GetMySQLLib;
-- if fDebugLevel>=1 then Writeln('Loading libmysqlclient: ',lib);
-- if lib <> '' then
-- InitialiseMySQL(lib);
--
-- try try
-- c := TConnectionName.Create(nil);
-- MySQLVer := copy(c.ClientInfo,1,3);
--
-- if fDebugLevel>=1 then
-- begin
-- Writeln('**************************');
-- Writeln('MySQL version: ',MySQLVer);
-- Writeln('**************************')
-- end;
--
-- if MySQLVer = '10.' then
-- MySQLVer := '5.6';
-- if MySQLVer = '10.1' then
-- MySQLVer := '5.7'
--
-- except
-- on E : Exception do
-- begin
-- Writeln('FATAL ERROR: Can not get MySQL client library version version!',LineEnding,
-- 'Setting to default version (5.1)');
-- MySQLVer := '5.1'
-- end
-- end
-- finally
-- FreeAndNil(c)
-- end;
--
-- if not TryStrToCurr(MySQLVer,fMySQLVersion) then
-- fMySQLVersion := 5.6;
--
-- if fDebugLevel>=1 then
-- begin
-- Writeln('**********************************');
-- Writeln('MySQL version assigned: ',FloatToStr(fMySQLVersion));
-- Writeln('**********************************')
-- end;
--
- CreateDBConnections;
-
- MainCon.KeepConnection := True;
-@@ -1148,13 +1105,11 @@ begin
- end;
-
- //special connection for band map thread
-- BandMapCon.KeepConnection := True;
- BandMapCon.Transaction := trBandMapFil;
- qBandMapFil.Transaction := trBandMapFil;
- qBandMapFil.DataBase := BandMapCon;
- trBandMapFil.DataBase := BandMapCon;
-
-- RbnMonCon.KeepConnection := True;
- RbnMonCon.Transaction := trRbnMon;
- qRbnMon.Transaction := trRbnMon;
- qRbnMon.DataBase := RbnMonCon;
-@@ -1194,7 +1149,6 @@ begin
- Writeln('ZIP code directory: ',fZipCodeDir);
- Writeln('Binary dir: ',ExtractFilePath(Paramstr(0)));
- Writeln('Share dir: ',fShareDir);
-- Writeln('TConnection to MySQL: ',FloatToStr(fMySQLVersion));
- Writeln('*')
- end;
-
-@@ -4166,70 +4120,13 @@ end;
-
- procedure TdmData.CreateDBConnections;
- begin
-- if fMySQLVersion < 5.5 then
-- begin
-- MainCon := TMySQL51Connection.Create(self);
-- BandMapCon := TMySQL51Connection.Create(self);
-- RbnMonCon := TMySQL51Connection.Create(self);
-- LogUploadCon := TMySQL51Connection.Create(self);
-- dbDXC := TMySQL51Connection.Create(self)
-- end
-- else if fMySQLVersion < 5.6 then
-- begin
-- MainCon := TMySQL55Connection.Create(self);
-- BandMapCon := TMySQL55Connection.Create(self);
-- RbnMonCon := TMySQL55Connection.Create(self);
-- LogUploadCon := TMySQL55Connection.Create(self);
-- dbDXC := TMySQL55Connection.Create(self)
-- end
-- else begin
-- if fMySQLVersion < 5.7 then
-- begin
-- MainCon := TMySQL56Connection.Create(self);
-- BandMapCon := TMySQL56Connection.Create(self);
-- RbnMonCon := TMySQL56Connection.Create(self);
-- LogUploadCon := TMySQL56Connection.Create(self);
-- dbDXC := TMySQL56Connection.Create(self)
-- end
-- else begin
-- MainCon := TMySQL57Connection.Create(self);
-- BandMapCon := TMySQL57Connection.Create(self);
-- RbnMonCon := TMySQL57Connection.Create(self);
-- LogUploadCon := TMySQL57Connection.Create(self);
-- dbDXC := TMySQL57Connection.Create(self)
-- end
-- end
-+ MainCon := getNewMySQLConnectionObject();
-+ BandMapCon := getNewMySQLConnectionObject();
-+ RbnMonCon := getNewMySQLConnectionObject();
-+ LogUploadCon := getNewMySQLConnectionObject();
-+ dbDXC := getNewMySQLConnectionObject();
- end;
-
--function TdmData.GetMySQLLib : String;
--var
-- lib : String;
-- Paths : TStringList;
--begin
-- Result := '';
-- Paths := TStringList.Create;
-- try
-- Paths.Add('/usr/lib64/');
-- Paths.Add('/lib64/');
-- Paths.Add('/usr/lib/x86_64-linux-gnu/');
-- Paths.Add('/usr/lib64/mysql/');
-- Paths.Add('/lib/x86_64-linux-gnu/');
--
-- Paths.Add('/usr/lib/i386-linux-gnu/');
-- Paths.Add('/lib/i386-linux-gnu/');
-- Paths.Add('/usr/lib/');
-- Paths.Add('/lib/');
-- Paths.Add('/usr/lib/mysql/');
--
-- Result := MyFindFile('libmariadbclient.so*', Paths);
-- if (Result='') then
-- begin
-- Result := MyFindFile('libmysqlclient.so*', Paths)
-- end
-- finally
-- FreeAndNil(Paths)
-- end
--end;
-
- function TdmData.GetDebugLevel : Integer;
- var
-@@ -4315,5 +4212,16 @@ begin
- QSOColorDate := now
- end;
-
-+function TdmData.getNewMySQLConnectionObject : TMySQL57Connection;
-+var
-+ Connection : TMySQL57Connection;
-+begin
-+ Connection := TMySQL57Connection.Create(self);
-+ Connection.SkipLibraryVersionCheck := True;
-+ Connection.KeepConnection := True;
-+
-+ result := Connection
-+end;
-+
- end.
-
---
-2.18.1
-
diff --git a/media-radio/cqrlog/files/2.3.0-makefile.patch b/media-radio/cqrlog/files/2.3.0-makefile.patch
deleted file mode 100644
index da6ac782c488..000000000000
--- a/media-radio/cqrlog/files/2.3.0-makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/Makefile.orig b/Makefile
-index 0b1d1ef..8d6eb2f 100644
---- a/Makefile.orig
-+++ b/Makefile
-@@ -3,11 +3,10 @@ ST=strip
- datadir = $(DESTDIR)/usr/share/cqrlog
- bindir = $(DESTDIR)/usr/bin
- sharedir = $(DESTDIR)/usr/share
--tmpdir = /tmp
-+tmpdir := $(shell mktemp -d)
-
- cqrlog: src/cqrlog.lpi
-- $(CC) --ws=gtk2 --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
-- $(ST) src/cqrlog
-+ $(CC) --ws=gtk2 --lazarusdir=/usr/share/lazarus --pcp=$(tmpdir)/.lazarus src/cqrlog.lpi
- gzip tools/cqrlog.1 -c > tools/cqrlog.1.gz
-
- clean:
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 7334cf976820..f37a6190d408 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/aqualung/Manifest b/media-sound/aqualung/Manifest
index e2cdd8f4efc8..6ddcfae8db39 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,2 +1 @@
-DIST aqualung-1.0.tar.gz 2014854 BLAKE2B bee5f8424f8a7f657e2adaacacd2b95f6d08153e2be54e3dd79e9097e7042bc9dfaae88df337c14e4bb8d0c2b2a0a5eef34aedf3c5756eb826dddff4b6cac9ad SHA512 d18fbc26c2f1445a0ef570216f54f1d00b05b25467b6ad857437e4ac628ac07c21435ce073cf92b3f147de4f1ada45a8a84770783d1c58e67451f94ac3de483a
DIST aqualung-1.1.tar.gz 1986368 BLAKE2B 2dd367aefe55c1b9243bd5faee2e2d082825f1077326ad05cfe4c2b088ba2f055f5d9af7d14a032bac3603c8e333cffb53357a73e29f22f417e89ad91548eece SHA512 77f6350c1c6c9160da4c6280273812964d58e01227495a87e03e0bee0a2aaf5589d309b9ce7e08421845a357b35dbd08c5de5ecd495ae5ba7877a67d01e4ad01
diff --git a/media-sound/aqualung/aqualung-1.0-r5.ebuild b/media-sound/aqualung/aqualung-1.0-r5.ebuild
deleted file mode 100644
index 442799d70ce8..000000000000
--- a/media-sound/aqualung/aqualung-1.0-r5.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-MY_PV=${PV/_/-}
-
-DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
-SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
- lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
- vorbis wavpack"
-
-BDEPEND="
- virtual/pkgconfig
- sys-devel/gettext
-"
-RDEPEND="
- app-arch/bzip2
- dev-libs/libxml2
- sys-libs/zlib
- x11-libs/gtk+:2
- alsa? ( media-libs/alsa-lib )
- cdda? ( dev-libs/libcdio-paranoia )
- cddb? ( media-libs/libcddb )
- ffmpeg? ( media-video/ffmpeg:0= )
- flac? ( media-libs/flac )
- ifp? ( media-libs/libifp )
- jack? ( virtual/jack )
- ladspa? ( media-libs/liblrdf )
- lame? ( media-sound/lame )
- libsamplerate? ( media-libs/libsamplerate )
- lua? ( dev-lang/lua:0= )
- mac? ( media-sound/mac )
- modplug? ( media-libs/libmodplug )
- mp3? ( media-libs/libmad )
- musepack? ( >=media-sound/musepack-tools-444 )
- pulseaudio? ( media-sound/pulseaudio )
- sndfile? ( media-libs/libsndfile )
- speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
- vorbis? ( media-libs/libvorbis media-libs/libogg )
- wavpack? ( media-sound/wavpack )
-"
-DEPEND="
- ${RDEPEND}
-"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-PATCHES=(
- "${FILESDIR}/${P}-ffmpeg3.patch"
- "${FILESDIR}/${P}-gcc10.patch"
- "${FILESDIR}/${P}-ar.patch"
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-rpath \
- --enable-loop \
- --enable-nls \
- --enable-transcoding \
- $(use_enable debug) \
- $(use_enable podcast) \
- $(use_enable systray) \
- $(use_enable jack jack-mgmt) \
- $(use_with alsa) \
- $(use_with cdda) \
- $(use_with cddb) \
- $(use_with ffmpeg lavc) \
- $(use_with flac) \
- $(use_with ifp) \
- $(use_with jack) \
- $(use_with ladspa) \
- $(use_with lame) \
- $(use_with libsamplerate src) \
- $(use_with lua) \
- $(use_with mac) \
- $(use_with modplug mod) \
- $(use_with mp3 mpeg) \
- $(use_with musepack mpc) \
- $(use_with oss) \
- $(use_with pulseaudio pulse) \
- $(use_with sndfile) \
- $(use_with speex) \
- $(use_with vorbis vorbis) \
- $(use_with vorbis vorbisenc) \
- $(use_with wavpack)
-}
-
-src_install() {
- default
-
- newicon src/img/icon_64.png aqualung.png
- make_desktop_entry aqualung Aqualung
-}
diff --git a/media-sound/aqualung/aqualung-1.1-r1.ebuild b/media-sound/aqualung/aqualung-1.1-r1.ebuild
deleted file mode 100644
index 0e4f24b9cf57..000000000000
--- a/media-sound/aqualung/aqualung-1.1-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop xdg
-
-DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
-HOMEPAGE="http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
-SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
- lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
- vorbis wavpack"
-
-BDEPEND="
- virtual/pkgconfig
- sys-devel/gettext
-"
-RDEPEND="
- app-arch/bzip2
- dev-libs/libxml2
- sys-libs/zlib
- x11-libs/gtk+:2
- alsa? ( media-libs/alsa-lib )
- cdda? ( dev-libs/libcdio-paranoia )
- cddb? ( media-libs/libcddb )
- ffmpeg? ( media-video/ffmpeg:0= )
- flac? ( media-libs/flac )
- ifp? ( media-libs/libifp )
- jack? ( virtual/jack )
- ladspa? ( media-libs/liblrdf )
- lame? ( media-sound/lame )
- libsamplerate? ( media-libs/libsamplerate )
- lua? ( dev-lang/lua:0= )
- mac? ( media-sound/mac )
- modplug? ( media-libs/libmodplug )
- mp3? ( media-libs/libmad )
- musepack? ( >=media-sound/musepack-tools-444 )
- pulseaudio? ( media-sound/pulseaudio )
- sndfile? ( media-libs/libsndfile )
- speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
- vorbis? ( media-libs/libvorbis media-libs/libogg )
- wavpack? ( media-sound/wavpack )
-"
-DEPEND="
- ${RDEPEND}
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-ifp.patch"
- "${FILESDIR}/${P}-var-collision.patch"
-)
-
-src_configure() {
- econf \
- --disable-rpath \
- --enable-loop \
- --enable-nls \
- --enable-transcoding \
- $(use_enable debug) \
- $(use_enable podcast) \
- $(use_enable systray) \
- $(use_enable jack jack-mgmt) \
- $(use_with alsa) \
- $(use_with cdda) \
- $(use_with cddb) \
- $(use_with ffmpeg lavc) \
- $(use_with flac) \
- $(use_with ifp) \
- $(use_with jack) \
- $(use_with ladspa) \
- $(use_with lame) \
- $(use_with libsamplerate src) \
- $(use_with lua) \
- $(use_with mac) \
- $(use_with modplug mod) \
- $(use_with mp3 mpeg) \
- $(use_with musepack mpc) \
- $(use_with oss) \
- $(use_with pulseaudio pulse) \
- $(use_with sndfile) \
- $(use_with speex) \
- $(use_with vorbis vorbis) \
- $(use_with vorbis vorbisenc) \
- $(use_with wavpack)
-}
-
-src_install() {
- default
-
- newicon src/img/icon_64.png aqualung.png
- make_desktop_entry aqualung Aqualung
-}
diff --git a/media-sound/aqualung/files/aqualung-1.0-ar.patch b/media-sound/aqualung/files/aqualung-1.0-ar.patch
deleted file mode 100644
index 3df4d75eaf1b..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-ar.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur aqualung-1.0_orig/configure.ac aqualung-1.0/configure.ac
---- aqualung-1.0_orig/configure.ac 2020-08-05 20:00:50.758797358 +0200
-+++ aqualung-1.0/configure.ac 2020-08-05 20:01:33.198796503 +0200
-@@ -25,11 +25,12 @@
-
-
- # Checks for programs.
-+AC_USE_SYSTEM_EXTENSIONS
- AC_PROG_CC
- AC_PROG_RANLIB
- AC_PROG_CXX
- AM_PROG_CC_C_O
--AC_USE_SYSTEM_EXTENSIONS
-+AM_PROG_AR
- m4_ifndef([AM_GNU_GETTEXT],
- [m4_fatal([GNU gettext is required to prepare the Aqualung build])])
- AM_GNU_GETTEXT([external])
diff --git a/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch b/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
deleted file mode 100644
index 111ee70c8774..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001
-From: Jamie Heilman
-Date: Sun, 8 May 2016 19:34:36 +0000
-Subject: [PATCH] ffmpeg/libav: support libavcodec API 55 and later
-
-With FFmpeg 1.0 and libav 10, AVCodecContext.{get,release}_buffer()
-were deprecated; the new default AVCodecContext.get_buffer2()
-implementation works fine for us.
----
- src/decoder/dec_lavc.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/decoder/dec_lavc.c b/src/decoder/dec_lavc.c
-index e2c81c6..5268a64 100644
---- a/src/decoder/dec_lavc.c
-+++ b/src/decoder/dec_lavc.c
-@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char * filename) {
- return DECODER_OPEN_BADLIB;
-
- pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- #if LIBAVCODEC_VERSION_MAJOR >= 53
- pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
- pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
- #endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
-+#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
-
- pd->time_base = pd->avFormatCtx->streams[pd->audioStream]->time_base;
-
diff --git a/media-sound/aqualung/files/aqualung-1.0-gcc10.patch b/media-sound/aqualung/files/aqualung-1.0-gcc10.patch
deleted file mode 100644
index 620bcb873d95..000000000000
--- a/media-sound/aqualung/files/aqualung-1.0-gcc10.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From de448507343a86ee97949eb4be0092d1659092da Mon Sep 17 00:00:00 2001
-From: Adam Sampson
-Date: Sat, 18 Jul 2020 17:02:32 +0100
-Subject: [PATCH 1/2] Remove unused variable.
-
-This causes a duplicate symbol error with GCC 10 (-fno-common by
-default), but it's not used anyway.
----
- src/playlist.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/playlist.c b/src/playlist.c
-index 35483d1..96fac75 100644
---- a/src/playlist.c
-+++ b/src/playlist.c
-@@ -134,8 +134,6 @@ GtkWidget * plist__send_songs_to_iriver;
- GtkWidget * plist__export;
- #endif /* HAVE_TRANSCODING */
-
--gchar command[RB_CONTROL_SIZE];
--
- GtkTreeIter * fileinfo_iter = NULL;
-
- int playlist_dirty;
-
-From 7f5d1f266957b3fa73799d3edef6b19ff9716d02 Mon Sep 17 00:00:00 2001
-From: Adam Sampson
-Date: Sat, 18 Jul 2020 17:06:41 +0100
-Subject: [PATCH 2/2] Rename timeout_tag to ports_timeout_tag.
-
-This causes a duplicate symbol error with GCC 10 (-fno-common by
-default), because there's also a global timeout_tag in main.c.
-
-Also correct the type to guint rather than gint.
----
- src/ports.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/ports.c b/src/ports.c
-index f17a5ab..f4de59d 100644
---- a/src/ports.c
-+++ b/src/ports.c
-@@ -63,7 +63,7 @@ GtkTreeViewColumn * column_out_R;
- int n_clients;
- GtkListStore * store_out_nb[MAX_JACK_CLIENTS];
-
--gint timeout_tag;
-+guint ports_timeout_tag;
-
- int out_selector = 0;
-
-@@ -242,7 +242,7 @@ tree_out_L_selection_changed(GtkTreeSelection * selection, gpointer * data) {
- fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res);
- }
- g_free(str);
-- timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1));
-+ ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, GINT_TO_POINTER(1));
- }
- }
-
-@@ -262,7 +262,7 @@ tree_out_R_selection_changed(GtkTreeSelection *selection, gpointer * data) {
- fprintf(stderr, "ERROR: jack_disconnect() returned %d\n", res);
- }
- g_free(str);
-- timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2);
-+ ports_timeout_tag = aqualung_timeout_add(100, ports_timeout_callback, (gpointer)2);
- }
- }
-
diff --git a/media-sound/puddletag/Manifest b/media-sound/puddletag/Manifest
new file mode 100644
index 000000000000..e4833b3a44f9
--- /dev/null
+++ b/media-sound/puddletag/Manifest
@@ -0,0 +1 @@
+DIST puddletag-2.0.1.tar.gz 1227152 BLAKE2B 804e9ca9629a9d78114d6f4b6afbe9032cb414678ea6325679c21ac18867bafed8f1b16aae5fbea18995ecc800d35594c478a5164b377f3b4e5dd75148fd3246 SHA512 d84ba360a6cd8c3ddb6628e30276df58d059d9e8cbb2d1255320ca273436c69f05584059c2e768a15871d3f56dc08d7ac96fef9a9c7c077811bb9fdfde444610
diff --git a/media-sound/puddletag/metadata.xml b/media-sound/puddletag/metadata.xml
new file mode 100644
index 000000000000..805e3cbf7030
--- /dev/null
+++ b/media-sound/puddletag/metadata.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ billie@gentoo.org
+ Daniel Pielmeier
+
+
+
+
+ puddletag
+ keithgg/puddletag
+
+
diff --git a/media-sound/puddletag/puddletag-2.0.1.ebuild b/media-sound/puddletag/puddletag-2.0.1.ebuild
new file mode 100644
index 000000000000..51eb70028ff7
--- /dev/null
+++ b/media-sound/puddletag/puddletag-2.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1 xdg
+
+DESCRIPTION="Audio tag editor"
+HOMEPAGE="http://docs.puddletag.net/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid quodlibet"
+
+DEPEND=""
+RDEPEND="
+ >=dev-python/configobj-5.0[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.4.7[${PYTHON_USEDEP}]
+ >=dev-python/PyQt5-5.15.2[${PYTHON_USEDEP},svg]
+ >=media-libs/mutagen-1.45.1[${PYTHON_USEDEP}]
+ acoustid? ( >=media-libs/chromaprint-1.4.3 )
+ quodlibet? ( >=media-sound/quodlibet-4.3.0[${PYTHON_USEDEP}] )
+ >=dev-python/sip-4.19.22:0[${PYTHON_USEDEP}]
+ >=dev-python/lxml-4.5.2[${PYTHON_USEDEP}]
+"
+# docs
+# >=dev-python/wheel-0.35.1[${PYTHON_USEDEP}]
+# >=dev-python/markdown-3.1.1[${PYTHON_USEDEP}]
+# >=dev-python/sphinx-1.4.8[${PYTHON_USEDEP}]
+# >=dev-python/sphinx-bootstrap-theme-0.4.13[${PYTHON_USEDEP}]
+# >=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+
+DOCS=(changelog NEWS THANKS TODO)
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 23ba9e1079e3..1e05ea6af0ca 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,4 +1,4 @@
DIST pulseeffects-4.7.2.tar.gz 1998420 BLAKE2B 6ac9d4b416ffac73f874fafcfd07b990ead7a2645832fd35eae23b3c9e9acb8663718b9cbb5fd0c1066c1f75272d0473257e711602d2646742785fe2c6ca5ea9 SHA512 f235504ca6edddf7a18f2c909ba58578a3d70e6fdab5ad0882f831c9d148f4fd35d0e55617305d787feefdba7a7544e1a72dac3dbc0e03bb9183e0937cdeaef2
DIST pulseeffects-4.8.4.tar.gz 2029971 BLAKE2B 6be45e748bd8df238391107531f46ac706fc9eb535c78c06f32526d910dffb82bec36af4130490645c95b200562c51f59f19de8905c3c54bda5d8a4b68b5297a SHA512 4d68f5bd678c75f5b13519cddb2f46bd0a827516f1cc7431a8952204f51bd2691f701df869258092a93843bcdb4c61bac916291bade8c4428ed9a4d68b70c757
-DIST pulseeffects-5.0.0.tar.gz 2030440 BLAKE2B 3d68f48ea6beeee308cc82dd3aa10a242587d2c5fdacdb89cf2618ae6ea537966e33e0c9454fab0258c64d05fa71ad196d462097d2abeae1e57a1bf1e7d89ef4 SHA512 f43e1ad22d243689b94d840dd71046079ff806a42606184918e2a28bc6a287d40e709a43abc51e4ea5ea36e99963db43486206a122cc89fe533afe1f9ee54e2f
DIST pulseeffects-5.0.1.tar.gz 2032470 BLAKE2B 8422d4a9dc3f0b6218921389824eda9aa0de902903edcd382bb1d2a4cbb0e539333ddc43c632b1653b410c68018a97cea18cb1a2e1f20ef72e9930fc28ae6442 SHA512 5cd8fe334766e3f939998c37651444da516e3eaf83841c34504d77dacee7f2e00653abb427e7ef7d909755b468689bc419697d97245ba906589df4b9d3cc5b83
+DIST pulseeffects-5.0.2.tar.gz 2051616 BLAKE2B 13df099b5f49c1a7be89fe9b684c68c03c750fb89854dc4a5c94cb8dfa04bfbb5e7ce0f70529db0c3b2706cca3918be1a93f70d558494316a2d577b3c68c53b5 SHA512 3cbfcc82c4ed052301d3f700e897a99bacc1a1c66000d2c837ebdb0516c914071fed9334bba917956aeb2b37784ea06054461aef5da95688ea74247311d09300
diff --git a/media-sound/pulseeffects/pulseeffects-5.0.0-r1.ebuild b/media-sound/pulseeffects/pulseeffects-5.0.2.ebuild
similarity index 97%
rename from media-sound/pulseeffects/pulseeffects-5.0.0-r1.ebuild
rename to media-sound/pulseeffects/pulseeffects-5.0.2.ebuild
index 8915be106aa2..2e8da24b5479 100644
--- a/media-sound/pulseeffects/pulseeffects-5.0.0-r1.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-5.0.2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
else
SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
fi
LICENSE="GPL-3"
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 75ca1fed0dda..e46e9c9a5c9b 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,2 +1 @@
-DIST sonic-visualiser-4.2.tar.gz 6532519 BLAKE2B 8cc92b2cd932d3c9f014161635cd767aa6ffa671217fca7c63ec6b882ae46cc1ed790e108e9be59d536aab0cbead726057987c2920c501d451fd353b2bf83018 SHA512 186d723c74d3b2865588370d9ff3afaf9f5356957e670483ea52303477c6acd17bb99b44c05db0fe4c0dc9757ba17c5e25b7b2fda5a15e85d9e193322ce8f2c3
DIST sonic-visualiser-4.3.tar.gz 6467269 BLAKE2B 4c9bbfc751f94dfc0e8c93a8ba791b0a4bf949fe1f528a081da583ad720dcb25b3e6f84e31104f11ab5003b338b62a1ca1a9572bc9ec820d0a4269d25cbe0e04 SHA512 cbe0edee9f346545222e05156e4536710db932d6ec335687e91f2f4b24582e7f47703a3ecade87574ead8fa78dca821fd9ff2eb0d6e44c2b9c33c8d053fd738d
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch
deleted file mode 100644
index ec70849915ec..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/test-svcore-base.pro b/test-svcore-base.pro
-index 275cb58..636129c 100644
---- a/test-svcore-base.pro
-+++ b/test-svcore-base.pro
-@@ -27,8 +27,3 @@ include(svcore/base/test/files.pri)
-
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) }
--
--!win32* {
-- POST_TARGETDEPS += $$PWD/libbase.a
-- QMAKE_POST_LINK = ./$${TARGET}
--}
-diff --git a/test-svcore-data-fileio.pro b/test-svcore-data-fileio.pro
-index 7b53ca1..a2aa3ce 100644
---- a/test-svcore-data-fileio.pro
-+++ b/test-svcore-data-fileio.pro
-@@ -27,8 +27,3 @@ include(svcore/data/fileio/test/files.pri)
-
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) }
--
--!win32* {
-- POST_TARGETDEPS += $$PWD/libbase.a
-- QMAKE_POST_LINK = ./$${TARGET}
--}
-diff --git a/test-svcore-data-model.pro b/test-svcore-data-model.pro
-index 3b45ac0..d08b14e 100644
---- a/test-svcore-data-model.pro
-+++ b/test-svcore-data-model.pro
-@@ -27,8 +27,3 @@ include(svcore/data/model/test/files.pri)
-
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) }
--
--!win32* {
-- POST_TARGETDEPS += $$PWD/libbase.a
-- QMAKE_POST_LINK = ./$${TARGET}
--}
-diff --git a/test-svcore-system.pro b/test-svcore-system.pro
-index 6ef7db7..685c1ba 100644
---- a/test-svcore-system.pro
-+++ b/test-svcore-system.pro
-@@ -27,8 +27,3 @@ include(svcore/system/test/files.pri)
-
- for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/system/test/%1", $$file) }
- for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/system/test/%1", $$file) }
--
--!win32* {
-- POST_TARGETDEPS += $$PWD/libbase.a
-- QMAKE_POST_LINK = ./$${TARGET}
--}
diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser.xml b/media-sound/sonic-visualiser/files/sonic-visualiser.xml
deleted file mode 100644
index 6daac7430022..000000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- Sonic Visualiser session file
-
-
-
-
-
- Sonic Visualiser layer file
-
-
-
-
-
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild
deleted file mode 100644
index f76d06d4e8a5..000000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop qmake-utils xdg
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="https://www.sonicvisualiser.org/"
-SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2755/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
-
-BDEPEND="
- dev-qt/qttest:5
- sys-devel/autoconf-archive
- virtual/pkgconfig
-"
-RDEPEND="
- app-arch/bzip2
- >=dev-libs/capnproto-0.6:=
- dev-libs/serd
- dev-libs/sord
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-libs/alsa-lib
- media-libs/dssi
- media-libs/ladspa-sdk
- media-libs/liblrdf
- media-libs/libsamplerate
- media-libs/libsndfile
- media-libs/rubberband
- media-libs/speex
- media-libs/vamp-plugin-sdk
- sci-libs/fftw:3.0=
- id3tag? ( media-libs/libid3tag )
- jack? ( virtual/jack )
- mad? ( media-libs/libmad )
- ogg? (
- media-libs/libfishsound
- media-libs/liboggz
- )
- opus? ( media-libs/opusfile )
- osc? ( media-libs/liblo )
- portaudio? ( >=media-libs/portaudio-19 )
- pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-
-# tests fail without mp3 support
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
- || ( jack pulseaudio portaudio )
- test? ( id3tag mad )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.0.1-notest.patch"
-)
-
-sv_disable_opt() {
- einfo "Disabling $1"
- for i in . svapp svcore svgui ; do
- sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
- done
-}
-
-src_prepare() {
- default
-
- use id3tag || sv_disable_opt id3tag
- use jack || sv_disable_opt jack
- use mad || sv_disable_opt mad
- use ogg || sv_disable_opt fishsound
- use ogg || sv_disable_opt oggz
- use opus || sv_disable_opt opus
- use osc || sv_disable_opt liblo
- use portaudio || sv_disable_opt portaudio
- use pulseaudio || sv_disable_opt libpulse
-
- # capnproto 0.7 requires c++14 now
- sed -e 's/AX_CXX_COMPILE_STDCXX_11/AX_CXX_COMPILE_STDCXX_14/g' \
- -i configure.ac \
- -i */configure.ac \
- || die
-
- eautoreconf
-}
-
-src_configure() {
- export QMAKE="$(qt5_get_bindir)"/qmake
- econf
- eqmake5 -r sonic-visualiser.pro
- sed -e 's/std=gnu++11/std=gnu++14/g' \
- -i Makefile.* \
- -i checker/Makefile.* \
- || die
-}
-
-src_test() {
- for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model test-svcore-system ; do
- einfo "Running ${i}"
- HOME="${T}" ./${i} || die
- done
-}
-
-src_install() {
- dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker
- dodoc README*
-
- #install samples
- insinto /usr/share/${PN}/samples
- doins samples/*
-
- # desktop entry
- mv icons/sv-icon.svg icons/${PN}.svg
- doicon -s scalable icons/${PN}.svg
- domenu sonic-visualiser.desktop
-
- # mime types
- insinto /usr/share/mime/packages
- doins "${FILESDIR}/${PN}.xml"
-}
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
index 743413b051ab..e1d71cfe2f6c 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
BDEPEND="
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 542b57393113..0ad3a8f60735 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index 4c58d5c4dda2..27ec35868cfd 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1 +1,2 @@
DIST mjpegtools-2.1.0.tar.gz 1844336 BLAKE2B 90ae51c81e18708132f26c1fb002128193168366542cadc15060ad52f664a5f90770b3039ada2a1777eab5fec9743fb24c65083de913ebd72b23dd55f6b25741 SHA512 10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
+DIST mjpegtools-2.2.0.tar.bz2 1542088 BLAKE2B 61736ea0782ef098110370ab75feac2d344709a849326acc366cc1dedfabe0aaec797292f09de9d0da8a2ce94506dc2c8749212b49f99ffa8775f347eae94b46 SHA512 d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f
diff --git a/media-video/mjpegtools/mjpegtools-2.2.0.ebuild b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
new file mode 100644
index 000000000000..9dd316d8a9c1
--- /dev/null
+++ b/media-video/mjpegtools/mjpegtools-2.2.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="Tools for MJPEG video"
+HOMEPAGE="http://mjpeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs"
+REQUIRED_USE="sdlgfx? ( sdl )"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="
+ virtual/jpeg:0=[${MULTILIB_USEDEP}]
+ dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
+ gtk? ( x11-libs/gtk+:2 )
+ png? ( media-libs/libpng:0= )
+ quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] )
+ sdl? (
+ >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ sdlgfx? ( media-libs/sdl-gfx )
+ )
+"
+DEPEND="
+ ${RDEPEND}
+ >=sys-apps/sed-4
+ virtual/awk
+ cpu_flags_x86_mmx? ( dev-lang/nasm )
+"
+
+src_prepare() {
+ default
+
+ eautoreconf
+ sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure
+}
+
+multilib_src_configure() {
+ [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2
+
+ local myconf=(
+ --enable-compile-warnings
+ $(use_enable cpu_flags_x86_mmx simd-accel)
+ $(use_enable static-libs static)
+ --enable-largefile
+
+ $(use_with quicktime libquicktime)
+ $(use_with dv libdv)
+ $(use_with sdl libsdl)
+ --without-v4l
+ $(use_with sdl x)
+
+ # used by tools only
+ $(multilib_native_use_with gtk)
+ $(multilib_native_use_with png libpng)
+ $(multilib_native_use_with sdlgfx)
+ )
+
+ ECONF_SOURCE=${S} \
+ econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ default
+ else
+ # avoid building programs
+ emake bin_PROGRAMS=
+ fi
+}
+
+multilib_src_test() {
+ # there are no tests at the moment, so it would just build
+ # all programs in non-native ABIs...
+ multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ default
+ else
+ emake DESTDIR="${D}" install \
+ bin_PROGRAMS=
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt
+
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ if [[ -z "${REPLACING_VERSIONS}" ]]; then
+ elog "mjpegtools installs user contributed scripts which require additional"
+ elog "dependencies not pulled in by the installation."
+ elog "These have to be installed manually."
+ elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer,"
+ elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python."
+ fi
+}
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index 409db0ee23ca..62ef3db5d154 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,4 +1,2 @@
DIST pipewire-0.3.18.tar.gz 1277055 BLAKE2B 4a18bd668afaf144d6e83590293a744b6d2c2a7d8e9fc6ab581f22d294fac5a4841098875f8569f36b794c083e4ec9f0b7d4e29a10dc79286a4843996f7fb64e SHA512 933b15908e30c389555dd9f82f87c2e571b4cb078bfbe5ed1858440166093cdee2b1c15da50bc5ab36087b62e216786b95c2aad9403e5047ae33e4fe8a6f4cc5
-DIST pipewire-0.3.20.tar.gz 1228482 BLAKE2B d5c51a7da984b075d4fd2504ecc2082527807a6319a42c44b09a687112c2ba10746a2554997e8f6fa36a06cdf5b94b4099adb1f8ee986673855db6e8e0356468 SHA512 7838cafe413e5082146e39a8d2cd29ec5193da68fa76c4d2b9390cbdf06d388c5a8b76f90fadf5f7ece4a8b1b86c3765b3fa968479f3bb9e11e84be006276c1c
-DIST pipewire-0.3.21.tar.gz 1243935 BLAKE2B b736a0253e8c0af96f7bdc47684d52bc8e70d4b2310b80a1b036ae3ef30fd042e1ad641aae342f9727b3191a38cfd36794879bf54954124b99984e2841aa7373 SHA512 cd1e7696c5712dfbd0f5ebffbb74f23ce5f6752744b062741546d55d524a4dca43776e1862fdc55faf5220c23f7ef9e0c5f9c3b1892a6b43ad50dfb99b9a66cc
DIST pipewire-0.3.22.tar.gz 1263844 BLAKE2B 3fb90c0b1c17ed108e8c390873f5c4527e1ff9241d1c5964ad5b7c01fbfefda901ef1228f178cf3c9899e6e8e75969a470f8fba63473ff203cba612c6c0553ca SHA512 a6587e0afd5c90be1733ecf62c6fc68e735ab3b84f2cbbf844bbe1be93e7a23dee07b041ed6b273cab6ab207d2388ae6f2027d0380928555a0155a7cc9ca4a7e
diff --git a/media-video/pipewire/pipewire-0.3.20.ebuild b/media-video/pipewire/pipewire-0.3.20.ebuild
deleted file mode 100644
index c5f8c1bd95ad..000000000000
--- a/media-video/pipewire/pipewire-0.3.20.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
- EGIT_BRANCH="work"
- inherit git-r3
-else
- SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0.3"
-IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
-
-BDEPEND="
- app-doc/xmltoman
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
-"
-RDEPEND="
- >=media-libs/alsa-lib-1.1.7
- media-libs/libsdl2
- >=media-libs/libsndfile-1.0.20
- sys-apps/dbus
- virtual/libudev
- bluetooth? (
- media-libs/sbc
- net-wireless/bluez:=
- )
- ffmpeg? ( media-video/ffmpeg:= )
- gstreamer? (
- >=dev-libs/glib-2.32.0:2
- >=media-libs/gstreamer-1.10.0:1.0
- media-libs/gst-plugins-base:1.0
- )
- jack? ( >=media-sound/jack2-1.9.10:2 )
- pulseaudio? (
- dev-libs/glib:2
- >=media-sound/pulseaudio-11.1
- )
- systemd? ( sys-apps/systemd )
- vulkan? ( media-libs/vulkan-loader )
- X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
- vulkan? ( dev-util/vulkan-headers )
-"
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- spa_use() {
- if ! in_iuse ${1} || ! use ${1}; then
- sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
- -e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
- -i src/daemon/pipewire.conf.in || die
- fi
- }
-
- default
- spa_use libcamera
- spa_use rtkit
- spa_use bluetooth bluez5
- spa_use jack
- spa_use vulkan
-}
-
-src_configure() {
- local emesonargs=(
- -Dexamples=true # contains required pipewire-media-session
- -Dman=true
- -Dspa-plugins=true
- --buildtype=$(usex debug debugoptimized plain)
- # alsa plugin and jack/pulseaudio emulation
- -Dpipewire-alsa=true
- $(meson_use jack pipewire-jack)
- $(meson_use pulseaudio pipewire-pulseaudio)
- # spa-plugins
- # we install alsa support unconditionally
- $(meson_use bluetooth bluez5)
- $(meson_use ffmpeg)
- $(meson_use jack)
- $(meson_use vulkan)
- # libcamera is not packaged
- # misc
- $(meson_use doc docs)
- $(meson_use gstreamer)
- $(meson_use gstreamer gstreamer-device-provider)
- $(meson_use systemd)
- $(meson_use test test)
- $(meson_use test tests)
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-
-# # TODO: this breaks alsa users
-# if use alsa; then
-# dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-# fi
-}
-
-pkg_postinst() {
- elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
- elog "by setting DISABLE_RTKIT env var."
- elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
- elog
- if use jack; then
- elog "Please note that even though the libraries for JACK emulation have"
- elog "been installed, this ebuild is not yet wired up to replace a JACK server."
- elog
- fi
- if use pulseaudio; then
- elog "Please note that even though the libraries for PulseAudio emulation have"
- elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
- elog
- fi
- elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
-}
diff --git a/media-video/pipewire/pipewire-0.3.21.ebuild b/media-video/pipewire/pipewire-0.3.21.ebuild
deleted file mode 100644
index c5f8c1bd95ad..000000000000
--- a/media-video/pipewire/pipewire-0.3.21.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://github.com/PipeWire/pipewire.git"
- EGIT_BRANCH="work"
- inherit git-r3
-else
- SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0.3"
-IUSE="bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X"
-
-BDEPEND="
- app-doc/xmltoman
- doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )
-"
-RDEPEND="
- >=media-libs/alsa-lib-1.1.7
- media-libs/libsdl2
- >=media-libs/libsndfile-1.0.20
- sys-apps/dbus
- virtual/libudev
- bluetooth? (
- media-libs/sbc
- net-wireless/bluez:=
- )
- ffmpeg? ( media-video/ffmpeg:= )
- gstreamer? (
- >=dev-libs/glib-2.32.0:2
- >=media-libs/gstreamer-1.10.0:1.0
- media-libs/gst-plugins-base:1.0
- )
- jack? ( >=media-sound/jack2-1.9.10:2 )
- pulseaudio? (
- dev-libs/glib:2
- >=media-sound/pulseaudio-11.1
- )
- systemd? ( sys-apps/systemd )
- vulkan? ( media-libs/vulkan-loader )
- X? ( x11-libs/libX11 )
-"
-DEPEND="${RDEPEND}
- vulkan? ( dev-util/vulkan-headers )
-"
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
- spa_use() {
- if ! in_iuse ${1} || ! use ${1}; then
- sed -e "/^add-spa-lib.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
- -e "/^load-module.*${1}/s/^/#${2-$1}-disabled-by-USE-no-${1}\:/" \
- -i src/daemon/pipewire.conf.in || die
- fi
- }
-
- default
- spa_use libcamera
- spa_use rtkit
- spa_use bluetooth bluez5
- spa_use jack
- spa_use vulkan
-}
-
-src_configure() {
- local emesonargs=(
- -Dexamples=true # contains required pipewire-media-session
- -Dman=true
- -Dspa-plugins=true
- --buildtype=$(usex debug debugoptimized plain)
- # alsa plugin and jack/pulseaudio emulation
- -Dpipewire-alsa=true
- $(meson_use jack pipewire-jack)
- $(meson_use pulseaudio pipewire-pulseaudio)
- # spa-plugins
- # we install alsa support unconditionally
- $(meson_use bluetooth bluez5)
- $(meson_use ffmpeg)
- $(meson_use jack)
- $(meson_use vulkan)
- # libcamera is not packaged
- # misc
- $(meson_use doc docs)
- $(meson_use gstreamer)
- $(meson_use gstreamer gstreamer-device-provider)
- $(meson_use systemd)
- $(meson_use test test)
- $(meson_use test tests)
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-
-# # TODO: this breaks alsa users
-# if use alsa; then
-# dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf
-# fi
-}
-
-pkg_postinst() {
- elog "Package has optional sys-auth/rtkit RUNTIME support that may be disabled"
- elog "by setting DISABLE_RTKIT env var."
- elog "To enable rtkit, uncomment the load-module line in /etc/pipewire/pipewire.conf"
- elog
- if use jack; then
- elog "Please note that even though the libraries for JACK emulation have"
- elog "been installed, this ebuild is not yet wired up to replace a JACK server."
- elog
- fi
- if use pulseaudio; then
- elog "Please note that even though the libraries for PulseAudio emulation have"
- elog "been installed, this ebuild is not yet wired up to replace PulseAudio."
- elog
- fi
- elog "Read INSTALL.md for information about ALSA plugin or JACK/PulseAudio emulation."
-}
diff --git a/media-video/pipewire/pipewire-0.3.22.ebuild b/media-video/pipewire/pipewire-0.3.22.ebuild
index fdf60d2768fe..ca830f18aed3 100644
--- a/media-video/pipewire/pipewire-0.3.22.ebuild
+++ b/media-video/pipewire/pipewire-0.3.22.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="https://github.com/PipeWire/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~x86"
fi
DESCRIPTION="Multimedia processing graphs"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index ed63e4ed9046..21ccde864d38 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 61caaf25b566..541785b3fdb2 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Mar 2021 19:38:44 +0000
+Thu, 18 Mar 2021 05:08:26 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 61caaf25b566..a9b7e7ce5dd7 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Mar 2021 19:38:44 +0000
+Thu, 18 Mar 2021 05:08:27 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e519af3e4a7e..9f5374f4a378 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/Manifest.gz b/metadata/md5-cache/acct-group/Manifest.gz
index 96ed506070c0..da143502b38f 100644
Binary files a/metadata/md5-cache/acct-group/Manifest.gz and b/metadata/md5-cache/acct-group/Manifest.gz differ
diff --git a/metadata/md5-cache/acct-group/crontab-0 b/metadata/md5-cache/acct-group/crontab-0
new file mode 100644
index 000000000000..1ae2a90c9ed4
--- /dev/null
+++ b/metadata/md5-cache/acct-group/crontab-0
@@ -0,0 +1,7 @@
+DEFINED_PHASES=install preinst pretend
+DESCRIPTION=System group: crontab
+EAPI=7
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+SLOT=0
+_eclasses_=acct-group 207adc497ea35d11dcf8959e7546a459 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=1ef5b4bc73f94bf6a0164e8d5de6a482
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index a0266bdb5f7c..462e7f6c96e5 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/ansible-2.10.7 b/metadata/md5-cache/app-admin/ansible-2.10.7
new file mode 100644
index 000000000000..4958deecdc0a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-2.10.7
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/packaging-16.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] app-admin/ansible-base test? ( dev-python/paramiko[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base dev-python/nose[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/mock-1.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://ansible.com/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh app-admin/ansible-base python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible/ansible-2.10.7.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=474a0a83914b6dc6991c92b7ac1f36a3
diff --git a/metadata/md5-cache/app-admin/ansible-base-2.10.7 b/metadata/md5-cache/app-admin/ansible-base-2.10.7
new file mode 100644
index 000000000000..fcb5e453ae43
--- /dev/null
+++ b/metadata/md5-cache/app-admin/ansible-base-2.10.7
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!=dev-python/packaging-16.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/paramiko[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !=dev-python/mock-1.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/passlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/unittest2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git )
+DESCRIPTION=Model-driven deployment, config management, and command execution framework
+EAPI=7
+HOMEPAGE=https://ansible.com/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+LICENSE=GPL-3
+RDEPEND=dev-python/paramiko[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/httplib2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/netaddr[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] net-misc/sshpass virtual/ssh !=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://releases.ansible.com/ansible-base/ansible-base-2.10.7.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=57a5a2fcf28c94f8186062199a9ee3bd
diff --git a/metadata/md5-cache/app-admin/checksec-2.4.0 b/metadata/md5-cache/app-admin/checksec-2.4.0
index 28eb6a767c44..e5e5d6be1b0a 100644
--- a/metadata/md5-cache/app-admin/checksec-2.4.0
+++ b/metadata/md5-cache/app-admin/checksec-2.4.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Tool to check properties of executables (e.g. ASLR/PIE, RELRO, PaX, Canaries)
EAPI=7
HOMEPAGE=https://github.com/slimm609/checksec.sh
-KEYWORDS=amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm arm64 ~mips ~ppc ~ppc64 ~sparc x86
LICENSE=BSD
SLOT=0
SRC_URI=https://github.com/slimm609/checksec.sh/archive/2.4.0.tar.gz -> checksec-2.4.0.tar.gz
-_md5_=f53255074c5c2f3d4e27de05c1446e0e
+_md5_=bed317540a19a5eef5bd341dfeea06f9
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8-r10 b/metadata/md5-cache/app-admin/conky-1.10.8-r10
deleted file mode 100644
index 4f2cf782f9fa..000000000000
--- a/metadata/md5-cache/app-admin/conky-1.10.8-r10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) || ( dev-lang/lua:0 dev-lang/lua:5.1 ) app-text/docbook2X
-DESCRIPTION=An advanced, highly configurable system monitor for X
-EAPI=7
-HOMEPAGE=https://github.com/brndnmtthws/conky
-IUSE=apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar webserver wifi X xmms2 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3 BSD LGPL-2.1 MIT
-RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) || ( dev-lang/lua:0 dev-lang/lua:5.1 ) apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
-_eclasses_=cmake 314a813be2f09820e8978cdee941e501 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=0fcf2e069449d6eb613f3abe0320e734
diff --git a/metadata/md5-cache/app-admin/conky-1.10.8-r9 b/metadata/md5-cache/app-admin/conky-1.10.8-r9
deleted file mode 100644
index 83f2adf77cba..000000000000
--- a/metadata/md5-cache/app-admin/conky-1.10.8-r9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) || ( dev-lang/lua:0 dev-lang/lua:5.1 ) app-text/docbook2X
-DESCRIPTION=An advanced, highly configurable system monitor for X
-EAPI=7
-HOMEPAGE=https://github.com/brndnmtthws/conky
-IUSE=apcupsd cmus curl eve hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar webserver wifi X xmms2 kernel_linux
-KEYWORDS=~alpha amd64 ~arm ppc ppc64 sparc x86
-LICENSE=GPL-3 BSD LGPL-2.1 MIT
-RDEPEND=X? ( imlib? ( media-libs/imlib2[X] ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2[X] ) lua-rsvg? ( >=dev-lua/toluapp-1.0.93 gnome-base/librsvg ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXext xmms2? ( media-sound/xmms2 ) ) cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) irc? ( net-libs/libircclient ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) || ( dev-lang/lua:0 dev-lang/lua:5.1 ) apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.10.8.tar.gz -> conky-1.10.8.tar.gz
-_eclasses_=cmake 314a813be2f09820e8978cdee941e501 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=47525780410b9aacaa368bedc903c3d7
diff --git a/metadata/md5-cache/app-admin/conky-1.12.1 b/metadata/md5-cache/app-admin/conky-1.12.1
new file mode 100644
index 000000000000..9d7368ecd439
--- /dev/null
+++ b/metadata/md5-cache/app-admin/conky-1.12.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) doc? ( app-text/docbook2X dev-libs/libxslt ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=An advanced, highly configurable system monitor for X
+EAPI=7
+HOMEPAGE=https://github.com/brndnmtthws/conky
+IUSE=apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype vim-syntax weather-metar webserver wifi X xinerama xmms2 kernel_linux +lua_single_target_lua5-3
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-3 BSD LGPL-2.1 MIT
+RDEPEND=cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-sound/pulseaudio ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
+REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundled-toluapp ) lua-rsvg? ( X bundled-toluapp ) nvidia? ( X ) truetype? ( X ) xinerama? ( X )
+SLOT=0
+SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.12.1.tar.gz -> conky-1.12.1.tar.gz
+_eclasses_=cmake 314a813be2f09820e8978cdee941e501 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa44567353349d6ecf1b40cfa32bd9d0
diff --git a/metadata/md5-cache/app-admin/needrestart-3.5 b/metadata/md5-cache/app-admin/needrestart-3.5
index 2f639d357388..f201a04d5f5b 100644
--- a/metadata/md5-cache/app-admin/needrestart-3.5
+++ b/metadata/md5-cache/app-admin/needrestart-3.5
@@ -1,11 +1,11 @@
DEFINED_PHASES=install
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-apps/iucode_tool sys-devel/gettext
+DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool ) sys-devel/gettext
DESCRIPTION=Restart daemons after library updates
EAPI=7
HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
KEYWORDS=amd64 x86
LICENSE=GPL-2+
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-apps/iucode_tool
+RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool )
SLOT=0
SRC_URI=https://github.com/liske/needrestart/archive/v3.5.tar.gz -> needrestart-3.5.tar.gz
-_md5_=cf5a26243a96eff74a6f20c6d7d157e8
+_md5_=ad555d71f7fe2ecacb8b45ff8cb9e807
diff --git a/metadata/md5-cache/app-admin/needrestart-9999 b/metadata/md5-cache/app-admin/needrestart-9999
index 7b5b50e4b482..9d5a6e987099 100644
--- a/metadata/md5-cache/app-admin/needrestart-9999
+++ b/metadata/md5-cache/app-admin/needrestart-9999
@@ -1,12 +1,12 @@
BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=install unpack
-DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-apps/iucode_tool sys-devel/gettext
+DEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool ) sys-devel/gettext
DESCRIPTION=Restart daemons after library updates
EAPI=7
HOMEPAGE=https://fiasko-nw.net/~thomas/tag/needrestart.html https://github.com/liske/needrestart
LICENSE=GPL-2+
PROPERTIES=live
-RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers sys-apps/iucode_tool
+RDEPEND=>=sys-apps/sed-4.2.2 dev-lang/perl:= dev-perl/libintl-perl dev-perl/Module-Find dev-perl/Module-ScanDeps dev-perl/Proc-ProcessTable dev-perl/Sort-Naturally dev-perl/TermReadKey sys-apps/init-system-helpers amd64? ( sys-apps/iucode_tool ) x86? ( sys-apps/iucode_tool )
SLOT=0
_eclasses_=git-r3 3e7ec3d6619213460c85e2aa48398441
-_md5_=c61e296655eda0604c945d251227c84d
+_md5_=a3a910503e7f32446f8494976eb8013b
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 7264145b2743..f7526ceac17f 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.8-r1 b/metadata/md5-cache/app-arch/bzip2-1.0.8-r1
index 1fc35024d6d6..8cf55106ad2a 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.8-r1
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.8-r1
@@ -3,9 +3,9 @@ DESCRIPTION=A high-quality data compressor used extensively by Gentoo Linux
EAPI=7
HOMEPAGE=https://sourceware.org/bzip2/
IUSE=static static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
LICENSE=BZIP2
SLOT=0/1
SRC_URI=https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz
_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 usr-ldscript 7c918d239d0f9098867d0c8e33348fc9
-_md5_=0858a421bc1c406c5df567da54f63871
+_md5_=01202ca9a26aa5dbe95adf2aa4374c56
diff --git a/metadata/md5-cache/app-arch/lzma-19.00 b/metadata/md5-cache/app-arch/lzma-19.00
index b9178a8e0c9e..8f71d4b11f47 100644
--- a/metadata/md5-cache/app-arch/lzma-19.00
+++ b/metadata/md5-cache/app-arch/lzma-19.00
@@ -4,9 +4,9 @@ DESCRIPTION=LZMA Stream Compressor from the SDK
EAPI=7
HOMEPAGE=https://www.7-zip.org/sdk.html
IUSE=doc
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=public-domain
SLOT=0
SRC_URI=mirror://sourceforge/sevenzip/lzma1900.7z -> lzma-19.00.7z
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=2bb6a71775d715d5c3a58d1d0d0a4e5a
+_md5_=15b949d549aa4423423a1c612379bb9a
diff --git a/metadata/md5-cache/app-arch/rpm2targz-2021.03.16 b/metadata/md5-cache/app-arch/rpm2targz-2021.03.16
new file mode 100644
index 000000000000..6b745953e851
--- /dev/null
+++ b/metadata/md5-cache/app-arch/rpm2targz-2021.03.16
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure
+DESCRIPTION=Convert a .rpm file to a .tar.gz archive
+EAPI=7
+HOMEPAGE=http://www.slackware.com/config/packages.php
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-1
+RDEPEND=app-arch/cpio
+SLOT=0
+SRC_URI=mirror://gentoo/rpm2targz-2021.03.16.tar.xz https://dev.gentoo.org/~vapier/dist/rpm2targz-2021.03.16.tar.xz
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=f95b6b2c0cd4f5c5fe3b2a51ae381509
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 8b77e4e70c66..bf7953900929 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/dar-2.6.13 b/metadata/md5-cache/app-backup/dar-2.6.13
index 0a16d305f784..26461faed5b7 100644
--- a/metadata/md5-cache/app-backup/dar-2.6.13
+++ b/metadata/md5-cache/app-backup/dar-2.6.13
@@ -5,7 +5,7 @@ DESCRIPTION=A full featured backup tool, aimed for disks
EAPI=7
HOMEPAGE=http://dar.linux.free.fr/
IUSE=curl dar32 dar64 doc gcrypt gpg lzo nls static static-libs xattr
-KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux
+KEYWORDS=amd64 ppc sparc x86 ~amd64-linux
LICENSE=GPL-2
RDEPEND=>=sys-libs/zlib-1.2.3:= !static? ( app-arch/bzip2:= app-arch/xz-utils:= sys-libs/libcap curl? ( net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) gpg? ( app-crypt/gpgme ) lzo? ( dev-libs/lzo:= ) xattr? ( sys-apps/attr:= ) )
REQUIRED_USE=?? ( dar32 dar64 ) gpg? ( gcrypt )
@@ -13,4 +13,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/dar/dar-2.6.13.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=4b5dd6e87659d28c1a3557b68af8ccca
+_md5_=80afb883dcc0f7e65f1ebbf51556642c
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 475b5a6abd1a..8aecc51437ea 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/monkeysphere-0.41 b/metadata/md5-cache/app-crypt/monkeysphere-0.41
deleted file mode 100644
index 0a1c0347e27d..000000000000
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.41
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
-EAPI=5
-HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-3
-RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
-RESTRICT=test
-SLOT=0/0
-SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.41.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.41.orig.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=6f89b34157cd55d6e07eeea2ee2ab409
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.44 b/metadata/md5-cache/app-crypt/monkeysphere-0.44
index 91ec06853499..4069eba4bf26 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.44
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.44
@@ -3,10 +3,10 @@ DEPEND=acct-group/monkeysphere acct-user/monkeysphere >=app-crypt/gnupg-2.1.17:0
DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
EAPI=7
HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
LICENSE=GPL-3
RDEPEND=acct-group/monkeysphere acct-user/monkeysphere >=app-crypt/gnupg-2.1.17:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0= net-misc/openssh
RESTRICT=test
SLOT=0/0
SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.44.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.44.orig.tar.gz
-_md5_=79ca1cc9286f8f3bfa851280c725ad86
+_md5_=8e4a1204861fbe475350f2e08d2f559a
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 0a16f5ade667..aeff9941b339 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/ne-3.1.1 b/metadata/md5-cache/app-editors/ne-3.1.1
deleted file mode 100644
index 593ef5c946ed..000000000000
--- a/metadata/md5-cache/app-editors/ne-3.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses:0=[tinfo?]
-DESCRIPTION=the nice editor, easy to use for the beginner and powerful for the wizard
-EAPI=6
-HOMEPAGE=http://ne.di.unimi.it/
-IUSE=tinfo
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=sys-libs/ncurses:0=[tinfo?] dev-lang/perl
-SLOT=0
-SRC_URI=http://ne.di.unimi.it/ne-3.1.1.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=77e5d4f6ab980d0ddd1460567d185d50
diff --git a/metadata/md5-cache/app-editors/ne-3.3.0 b/metadata/md5-cache/app-editors/ne-3.3.0
new file mode 100644
index 000000000000..e8273b4f313a
--- /dev/null
+++ b/metadata/md5-cache/app-editors/ne-3.3.0
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/ncurses:=
+DESCRIPTION=The nice editor, easy to use for the beginner and powerful for the wizard
+EAPI=7
+HOMEPAGE=https://ne.di.unimi.it/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=sys-libs/ncurses:= dev-lang/perl
+SLOT=0
+SRC_URI=https://ne.di.unimi.it/ne-3.3.0.tar.gz
+_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=ce45116e13664833b4df4a41280a936c
diff --git a/metadata/md5-cache/app-editors/wxhexeditor-0.24 b/metadata/md5-cache/app-editors/wxhexeditor-0.24
deleted file mode 100644
index a72425648ff8..000000000000
--- a/metadata/md5-cache/app-editors/wxhexeditor-0.24
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare pretend setup
-DEPEND=app-crypt/mhash dev-libs/udis86 x11-libs/wxGTK:3.0-gtk3[X]
-DESCRIPTION=A cross-platform hex editor designed specially for large files
-EAPI=6
-HOMEPAGE=http://www.wxhexeditor.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-crypt/mhash dev-libs/udis86 x11-libs/wxGTK:3.0-gtk3[X]
-SLOT=0
-SRC_URI=mirror://sourceforge/wxhexeditor/wxHexEditor-v0.24-src.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 wxwidgets e1e6e1eb5b3d911b3abd712f611e2312
-_md5_=3d1fef9e2df4e80637eef72398a9a0da
diff --git a/metadata/md5-cache/app-editors/wxhexeditor-0.24-r1 b/metadata/md5-cache/app-editors/wxhexeditor-0.24-r1
new file mode 100644
index 000000000000..e3bd4247d6af
--- /dev/null
+++ b/metadata/md5-cache/app-editors/wxhexeditor-0.24-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare pretend setup
+DEPEND=app-crypt/mhash dev-libs/udis86 x11-libs/wxGTK:3.0-gtk3[X]
+DESCRIPTION=A cross-platform hex editor designed specially for large files
+EAPI=7
+HOMEPAGE=https://github.com/EUA/wxHexEditor
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-crypt/mhash dev-libs/udis86 x11-libs/wxGTK:3.0-gtk3[X]
+SLOT=0
+SRC_URI=mirror://sourceforge/wxhexeditor/wxHexEditor-v0.24-src.tar.xz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 wxwidgets e1e6e1eb5b3d911b3abd712f611e2312
+_md5_=edcecd06d5f4faf926f70d195c5d39b0
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index d0f924d460ee..acc3b62dbb3e 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/conmon-2.0.27 b/metadata/md5-cache/app-emulation/conmon-2.0.27
new file mode 100644
index 000000000000..7b245ad15206
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/conmon-2.0.27
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= ) dev-go/go-md2man
+DESCRIPTION=An OCI container runtime monitor
+EAPI=7
+HOMEPAGE=https://github.com/containers/conmon
+IUSE=systemd
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=dev-libs/glib:= systemd? ( sys-apps/systemd:= )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/containers/conmon/archive/v2.0.27.tar.gz -> conmon-2.0.27.tar.gz
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=12ec421bd3d312a56936162cc34290e8
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 7348828fbdd5..eb2e544c8688 100644
Binary files a/metadata/md5-cache/app-forensics/Manifest.gz and b/metadata/md5-cache/app-forensics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-forensics/lynis-3.0.3-r1 b/metadata/md5-cache/app-forensics/lynis-3.0.3-r2
similarity index 94%
rename from metadata/md5-cache/app-forensics/lynis-3.0.3-r1
rename to metadata/md5-cache/app-forensics/lynis-3.0.3-r2
index 42db8a7cb80c..5d3f24a5ef2a 100644
--- a/metadata/md5-cache/app-forensics/lynis-3.0.3-r1
+++ b/metadata/md5-cache/app-forensics/lynis-3.0.3-r2
@@ -9,4 +9,4 @@ RDEPEND=app-shells/bash
SLOT=0
SRC_URI=https://cisofy.com/files/lynis-3.0.3.tar.gz
_eclasses_=bash-completion-r1 be99724bde4274de21e581204e9d164a edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=a48336e996f87bbdcccf5ff0c04f050c
+_md5_=87e0057eee888bbf1da4102a40683a3a
diff --git a/metadata/md5-cache/app-laptop/Manifest.gz b/metadata/md5-cache/app-laptop/Manifest.gz
index 80de5d3244cf..87090e89f356 100644
Binary files a/metadata/md5-cache/app-laptop/Manifest.gz and b/metadata/md5-cache/app-laptop/Manifest.gz differ
diff --git a/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.3 b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.3
new file mode 100644
index 000000000000..bcc6c4c1722c
--- /dev/null
+++ b/metadata/md5-cache/app-laptop/tuxedo-keyboard-3.0.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf )
+DESCRIPTION=Kernel Module for Tuxedo Keyboard
+EAPI=7
+HOMEPAGE=https://github.com/tuxedocomputers/tuxedo-keyboard
+IUSE=kernel_linux kernel_linux dist-kernel
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
+SLOT=0
+SRC_URI=https://github.com/tuxedocomputers/tuxedo-keyboard/archive/v3.0.3.tar.gz -> tuxedo-keyboard-3.0.3.tar.gz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 linux-mod 6eea2d40e8514773bec08ae1be26800b multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=10db22c86bdb1afadccc50ffc6429212
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index a1859ff227ee..99edc7610c1f 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/banner-1.3.3 b/metadata/md5-cache/app-misc/banner-1.3.3
deleted file mode 100644
index f5223d31de53..000000000000
--- a/metadata/md5-cache/app-misc/banner-1.3.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=!games-misc/bsd-games
-DESCRIPTION=The well known banner program for Linux
-EAPI=5
-HOMEPAGE=http://cedar-solutions.com
-KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://cedar-solutions.com/ftp/software/banner-1.3.3.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=9cc1e6b121784dbabb02973c0b732ffd
diff --git a/metadata/md5-cache/app-misc/banner-1.3.4 b/metadata/md5-cache/app-misc/banner-1.3.4
deleted file mode 100644
index bd44988c3d4d..000000000000
--- a/metadata/md5-cache/app-misc/banner-1.3.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=The well known banner program for Linux
-EAPI=7
-HOMEPAGE=http://cedar-solutions.com/
-KEYWORDS=~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!games-misc/bsd-games
-SLOT=0
-SRC_URI=http://cedar-solutions.com/ftp/software/banner-1.3.4.tar.gz
-_md5_=2d94fdc785b021533296ce272927893b
diff --git a/metadata/md5-cache/app-misc/banner-1.3.5 b/metadata/md5-cache/app-misc/banner-1.3.5
index db35403f3691..8acb796aca02 100644
--- a/metadata/md5-cache/app-misc/banner-1.3.5
+++ b/metadata/md5-cache/app-misc/banner-1.3.5
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
DESCRIPTION=The well known banner program for Linux
EAPI=7
HOMEPAGE=https://github.com/pronovic/banner
-KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=!games-misc/bsd-games
SLOT=0
SRC_URI=https://github.com/pronovic/banner/archive/BANNER_V1.3.5.tar.gz
-_md5_=ce6cc27c9bed8cb6c6c87baaae4b2b3a
+_md5_=7120d8c037259470d98701f7f87c59f1
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20210119.3.62 b/metadata/md5-cache/app-misc/ca-certificates-20210119.3.62
index 2a2f96ae6fc8..79928935212a 100644
--- a/metadata/md5-cache/app-misc/ca-certificates-20210119.3.62
+++ b/metadata/md5-cache/app-misc/ca-certificates-20210119.3.62
@@ -4,10 +4,10 @@ DESCRIPTION=Common CA Certificates PEM files
EAPI=7
HOMEPAGE=https://packages.debian.org/sid/ca-certificates
IUSE=cacert
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MPL-1.1
RDEPEND=app-misc/c_rehash sys-apps/debianutils
SLOT=0
SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20210119.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_62_RTM/src/nss-3.62.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch )
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=b50b9ff882d6009e48bd71ccde9e0f63
+_md5_=56d80241b466e1befa89c018e016aaac
diff --git a/metadata/md5-cache/app-misc/rlwrap-0.43 b/metadata/md5-cache/app-misc/rlwrap-0.43
index 5e5e46baa77d..fcbbc10d06eb 100644
--- a/metadata/md5-cache/app-misc/rlwrap-0.43
+++ b/metadata/md5-cache/app-misc/rlwrap-0.43
@@ -4,9 +4,9 @@ DESCRIPTION=GNU readline wrapper
EAPI=6
HOMEPAGE=https://github.com/hanslub42/rlwrap
IUSE=debug
-KEYWORDS=~amd64 ~mips ~ppc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=amd64 ~mips ppc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=GPL-2+
RDEPEND=sys-libs/readline:0=
SLOT=0
SRC_URI=https://github.com/hanslub42/rlwrap/releases/download/v0.43/rlwrap-0.43.tar.gz
-_md5_=2b71363c1d9025b4255d058126584d4e
+_md5_=98c0d6b8c226ba274355cb4ba722c7bf
diff --git a/metadata/md5-cache/app-misc/wipe-2.3.1 b/metadata/md5-cache/app-misc/wipe-2.3.1
index b3961d1f7f5d..ccdf7bc8fecd 100644
--- a/metadata/md5-cache/app-misc/wipe-2.3.1
+++ b/metadata/md5-cache/app-misc/wipe-2.3.1
@@ -1,11 +1,11 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Secure file wiping utility based on Peter Gutman's patterns
-EAPI=6
+EAPI=7
HOMEPAGE=http://wipe.sourceforge.net/
KEYWORDS=amd64 ppc ~ppc64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://sourceforge/wipe/wipe-2.3.1.tar.bz2
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=34c0801827d2f7a48aa15dc4eec83b9d
+_md5_=499770f2ee07c2afb7f44869643e5260
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 7d1f0e64263b..a42be4da3a0d 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/pdsh-2.34 b/metadata/md5-cache/app-shells/pdsh-2.34
new file mode 100644
index 000000000000..98f2996ec2d0
--- /dev/null
+++ b/metadata/md5-cache/app-shells/pdsh-2.34
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-util/dejagnu ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare setup
+DEPEND=crypt? ( net-misc/openssh ) rsh? ( net-misc/netkit-rsh ) readline? ( sys-libs/readline:0= )
+DESCRIPTION=A high-performance, parallel remote shell utility
+EAPI=7
+HOMEPAGE=https://github.com/chaos/pdsh
+IUSE=crypt readline rsh test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=crypt? ( net-misc/openssh ) rsh? ( net-misc/netkit-rsh ) readline? ( sys-libs/readline:0= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/chaos/pdsh/archive/pdsh-2.34.tar.gz
+_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=61ce41dc5bf6a38bbe63ad32dced5267
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 84a6b9746399..2cd207a4afe6 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/reed-5.4 b/metadata/md5-cache/app-text/reed-5.4
index 02599f047680..65a1c6ff9187 100644
--- a/metadata/md5-cache/app-text/reed-5.4
+++ b/metadata/md5-cache/app-text/reed-5.4
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=configure prepare
DEPEND=sys-libs/ncurses
DESCRIPTION=This is a text pager (text file viewer), used to display etexts
-EAPI=5
+EAPI=7
HOMEPAGE=http://web.archive.org/web/20040217010815/www.sacredchao.net/software/reed/
KEYWORDS=~amd64 x86
LICENSE=GPL-2
RDEPEND=sys-libs/ncurses
SLOT=0
SRC_URI=http://www.sacredchao.net/software/reed/reed-5.4.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=6913eaa429c5e991d4b7ae6c01b719bc
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=4ffaa7726192f672768bd7fb3bf24680
diff --git a/metadata/md5-cache/app-text/scdoc-9999 b/metadata/md5-cache/app-text/scdoc-9999
index a8867e59d85b..2282b95e2011 100644
--- a/metadata/md5-cache/app-text/scdoc-9999
+++ b/metadata/md5-cache/app-text/scdoc-9999
@@ -7,4 +7,4 @@ LICENSE=MIT
PROPERTIES=live
SLOT=0
_eclasses_=git-r3 3e7ec3d6619213460c85e2aa48398441 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=1c00dfaffd0bc0acd5e32a7248ea62ab
+_md5_=80df616ed00d31cf8f7cdcd9531a132f
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index c5f8bfc3b6de..d106cd48d877 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/lmdb-0.9.28 b/metadata/md5-cache/dev-db/lmdb-0.9.28
index 35b4cc5eaee6..22230c93d1b2 100644
--- a/metadata/md5-cache/dev-db/lmdb-0.9.28
+++ b/metadata/md5-cache/dev-db/lmdb-0.9.28
@@ -3,9 +3,9 @@ DESCRIPTION=An ultra-fast, ultra-compact key-value embedded data store
EAPI=7
HOMEPAGE=https://symas.com/lmdb/technical/
IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~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 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=OPENLDAP
SLOT=0/0.9.28
SRC_URI=https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.28/openldap-LMDB_0.9.28.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=979ba3bba2bde821346454fe228e766b
+_md5_=798841ccb2862a75ccd6c3c32371dd8a
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.23-r1 b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.23-r1
index b44208af3393..278681ed696f 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c-8.0.23-r1
+++ b/metadata/md5-cache/dev-db/mysql-connector-c-8.0.23-r1
@@ -11,4 +11,4 @@ RDEPEND=>=app-arch/lz4-0_p131:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
SLOT=0/21
SRC_URI=https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-boost-8.0.23.tar.gz
_eclasses_=cmake 314a813be2f09820e8978cdee941e501 cmake-multilib a5c3801ef28d6532f611ba480516d0ac edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=ad860cf0b0a52295af36dcb50480b61d
+_md5_=be55ba1b90d0f9d5d2ea0e8a3f744da7
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index af7949ae338c..95ea2c85712a 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/flatzebra-0.1.7 b/metadata/md5-cache/dev-games/flatzebra-0.1.7
index 81d96b512bba..ecbeeed8ec10 100644
--- a/metadata/md5-cache/dev-games/flatzebra-0.1.7
+++ b/metadata/md5-cache/dev-games/flatzebra-0.1.7
@@ -5,9 +5,9 @@ DESCRIPTION=Generic game engine for 2D double-buffering animation
EAPI=7
HOMEPAGE=http://perso.b2b2c.ca/~sarrazip/dev/batrachians.html
IUSE=static-libs
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2+
RDEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer
SLOT=0
SRC_URI=http://perso.b2b2c.ca/~sarrazip/dev/flatzebra-0.1.7.tar.gz
-_md5_=618d280abd69ce1c2f7570f192c4c161
+_md5_=9468236520350b6ed9c7d0cf291bbf7d
diff --git a/metadata/md5-cache/dev-games/libmaitretarot-0.1.98 b/metadata/md5-cache/dev-games/libmaitretarot-0.1.98-r2
similarity index 74%
rename from metadata/md5-cache/dev-games/libmaitretarot-0.1.98
rename to metadata/md5-cache/dev-games/libmaitretarot-0.1.98-r2
index 6d0a2e366d88..a69414ce4820 100644
--- a/metadata/md5-cache/dev-games/libmaitretarot-0.1.98
+++ b/metadata/md5-cache/dev-games/libmaitretarot-0.1.98-r2
@@ -1,11 +1,12 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=configure install
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 virtual/pkgconfig
+DEPEND=dev-libs/glib:2 dev-libs/libxml2
DESCRIPTION=backend library for the maitretarot games
-EAPI=5
+EAPI=7
HOMEPAGE=http://www.nongnu.org/maitretarot/
KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 dev-libs/libxml2
SLOT=0
SRC_URI=https://savannah.nongnu.org/download/maitretarot/libmaitretarot.pkg/0.1.98/libmaitretarot-0.1.98.tar.bz2
-_md5_=9c4bf4a9d647119fae1b2ae18060e277
+_md5_=6645c3296a5418e76bfce85c37f66a20
diff --git a/metadata/md5-cache/dev-games/libmt_client-0.1.98 b/metadata/md5-cache/dev-games/libmt_client-0.1.98
deleted file mode 100644
index e71764e88838..000000000000
--- a/metadata/md5-cache/dev-games/libmt_client-0.1.98
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
-DESCRIPTION=backend library for the maitretarot clients
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/maitretarot/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/maitretarot/libmt_client.pkg/0.1.98/libmt_client-0.1.98.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=f33e627242e9152305df26e272e9b3a7
diff --git a/metadata/md5-cache/dev-games/libmt_client-0.1.98-r1 b/metadata/md5-cache/dev-games/libmt_client-0.1.98-r1
new file mode 100644
index 000000000000..558f40af69b0
--- /dev/null
+++ b/metadata/md5-cache/dev-games/libmt_client-0.1.98-r1
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
+DESCRIPTION=backend library for the maitretarot clients
+EAPI=7
+HOMEPAGE=http://www.nongnu.org/maitretarot/
+KEYWORDS=amd64 x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/maitretarot/libmt_client.pkg/0.1.98/libmt_client-0.1.98.tar.bz2
+_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=b406dca8fb5a1f1f108edbf2e24b76ac
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 69c31409d8c1..9a112df5c1dd 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/jflex-1.6.1-r1 b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
index 40a845c3e47b..9b6388c7f743 100644
--- a/metadata/md5-cache/dev-java/jflex-1.6.1-r1
+++ b/metadata/md5-cache/dev-java/jflex-1.6.1-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/javacup:0 >=virtual/jdk-1.8:* test? ( dev-java/junit:4 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DEPEND=>=virtual/jdk-1.8:* test? ( dev-java/junit:4 ) dev-java/ant-core:0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
DESCRIPTION=JFlex is a lexical analyzer generator for Java
EAPI=7
HOMEPAGE=https://www.jflex.de/
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://jflex.de/jflex-1.6.1.tar.gz
_eclasses_=java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-pkg-simple a814c0c1adac3d7902bc7023902a2e1a java-utils-2 378e4cda228ea0231a0ac283cb2ad25c
-_md5_=15f8d0db980743c9fc9d4dc68b4e60ad
+_md5_=47eab6c7641c63c18fcb34ccbf080a20
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index a51c5cf24284..91355df08f03 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/mujs-1.0.9 b/metadata/md5-cache/dev-lang/mujs-1.0.9
index e64aaaad6d66..c61b00d7caea 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.0.9
+++ b/metadata/md5-cache/dev-lang/mujs-1.0.9
@@ -1,6 +1,6 @@
DEFINED_PHASES=compile install prepare
DEPEND=sys-libs/readline:0=
-DESCRIPTION=An embeddable Javascript interpreter in C.
+DESCRIPTION=An embeddable JavaScript interpreter in C
EAPI=7
HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs
IUSE=static-libs
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/readline:0=
SLOT=0/1.0.9
SRC_URI=https://github.com/ccxvii/mujs/archive/1.0.9.tar.gz -> mujs-1.0.9.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=1e1257380fd428388a3ceb91bd712bd0
+_md5_=bc923b85ad89b62c434477c4384b1a08
diff --git a/metadata/md5-cache/dev-lang/mujs-1.1.0 b/metadata/md5-cache/dev-lang/mujs-1.1.0
index 4caa81c78bf1..935a4d998114 100644
--- a/metadata/md5-cache/dev-lang/mujs-1.1.0
+++ b/metadata/md5-cache/dev-lang/mujs-1.1.0
@@ -1,6 +1,6 @@
DEFINED_PHASES=compile install prepare
DEPEND=sys-libs/readline:0=
-DESCRIPTION=An embeddable Javascript interpreter in C.
+DESCRIPTION=An embeddable JavaScript interpreter in C
EAPI=7
HOMEPAGE=https://mujs.com/ https://github.com/ccxvii/mujs
IUSE=static-libs
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/readline:0=
SLOT=0/1.1.0
SRC_URI=https://github.com/ccxvii/mujs/archive/1.1.0.tar.gz -> mujs-1.1.0.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=d8c58d3d465797510926b37100c83cf9
+_md5_=9370071f1cd2b3aef9f2891910e31183
diff --git a/metadata/md5-cache/dev-lang/python-2.7.18_p7 b/metadata/md5-cache/dev-lang/python-2.7.18_p7
index 0482e0f86d2c..13922b3ec904 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.18_p7
+++ b/metadata/md5-cache/dev-lang/python-2.7.18_p7
@@ -4,7 +4,7 @@ DEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcry
DESCRIPTION=An interpreted, interactive, object-oriented programming language
EAPI=7
HOMEPAGE=https://www.python.org/
-IUSE=-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml verify-sig
+IUSE=-berkdb bluetooth build elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl +threads tk +wide-unicode wininst +xml verify-sig
KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86
LICENSE=PSF-2
PDEPEND=app-eselect/eselect-python
@@ -12,4 +12,4 @@ RDEPEND=app-arch/bzip2:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcr
SLOT=2.7
SRC_URI=https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18_p7.tar.xz verify-sig? ( https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz.asc )
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 verify-sig 40b4f4f782cf67118f594ce604cc4c0a wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=3fc227165c581aaf4d7ca8bea85e6082
+_md5_=ee53f57aea5a4b3ca379b979e6fca02c
diff --git a/metadata/md5-cache/dev-lang/python-3.10.0_alpha6-r2 b/metadata/md5-cache/dev-lang/python-3.10.0_alpha6-r2
index a53ffea3dcf6..9c7fa884aa15 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.0_alpha6-r2
+++ b/metadata/md5-cache/dev-lang/python-3.10.0_alpha6-r2
@@ -4,7 +4,7 @@ DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linu
DESCRIPTION=An interpreted, interactive, object-oriented programming language
EAPI=7
HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml verify-sig
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
LICENSE=PSF-2
PDEPEND=app-eselect/eselect-python
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=3.10
SRC_URI=https://www.python.org/ftp/python/3.10.0/Python-3.10.0a6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.0a6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.0/Python-3.10.0a6.tar.xz.asc )
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 check-reqs 7e3fd1855a5e1b50bb9e80827b3f672d edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 verify-sig 40b4f4f782cf67118f594ce604cc4c0a wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=d76a926c3dc1aa2d38f780f777897390
+_md5_=904a4a6ca34cfc6cdd6707aa3afab066
diff --git a/metadata/md5-cache/dev-lang/python-3.6.13 b/metadata/md5-cache/dev-lang/python-3.6.13
index bfb995911eb5..a37b829cf0b8 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.13
+++ b/metadata/md5-cache/dev-lang/python-3.6.13
@@ -4,7 +4,7 @@ DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.
DESCRIPTION=An interpreted, interactive, object-oriented programming language
EAPI=7
HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml verify-sig
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test +threads tk wininst +xml verify-sig
KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86
LICENSE=PSF-2
PDEPEND=app-eselect/eselect-python
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=3.6/3.6m
SRC_URI=https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.13.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.6.13/Python-3.6.13.tar.xz.asc )
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 verify-sig 40b4f4f782cf67118f594ce604cc4c0a wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=60a9e7c3c872850beee56a2c2da2dd22
+_md5_=a2f330e71b8d28826968a5a9cddc74ab
diff --git a/metadata/md5-cache/dev-lang/python-3.7.10 b/metadata/md5-cache/dev-lang/python-3.7.10
index 1a73b49e03a9..691eadb25f2f 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.10
+++ b/metadata/md5-cache/dev-lang/python-3.7.10
@@ -4,7 +4,7 @@ DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linu
DESCRIPTION=An interpreted, interactive, object-oriented programming language
EAPI=7
HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml verify-sig
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
LICENSE=PSF-2
PDEPEND=app-eselect/eselect-python
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=3.7/3.7m
SRC_URI=https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.10.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.10/Python-3.7.10.tar.xz.asc )
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 verify-sig 40b4f4f782cf67118f594ce604cc4c0a wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=d9615bb11b0e7d419c437f77840b79d6
+_md5_=f35b3ed16a46f55e214ff9609d2631f4
diff --git a/metadata/md5-cache/dev-lang/python-3.8.8 b/metadata/md5-cache/dev-lang/python-3.8.8
index e47344dca743..1fcbd84435bf 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.8
+++ b/metadata/md5-cache/dev-lang/python-3.8.8
@@ -4,7 +4,7 @@ DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linu
DESCRIPTION=An interpreted, interactive, object-oriented programming language
EAPI=7
HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml verify-sig
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
LICENSE=PSF-2
PDEPEND=app-eselect/eselect-python
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=3.8
SRC_URI=https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.8.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.8/Python-3.8.8.tar.xz.asc )
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 verify-sig 40b4f4f782cf67118f594ce604cc4c0a wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=1824d4252301a8faf4e32082ce172af2
+_md5_=2b2deeab3a8c88eb1cf7778745ad8e4f
diff --git a/metadata/md5-cache/dev-lang/python-3.9.2 b/metadata/md5-cache/dev-lang/python-3.9.2
index 6897569bf103..63b138c2d416 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.2
+++ b/metadata/md5-cache/dev-lang/python-3.9.2
@@ -4,7 +4,7 @@ DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linu
DESCRIPTION=An interpreted, interactive, object-oriented programming language
EAPI=7
HOMEPAGE=https://www.python.org/
-IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml verify-sig
+IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml verify-sig
KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
LICENSE=PSF-2
PDEPEND=app-eselect/eselect-python
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=3.9
SRC_URI=https://www.python.org/ftp/python/3.9.2/Python-3.9.2.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.2/Python-3.9.2.tar.xz.asc )
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 check-reqs 7e3fd1855a5e1b50bb9e80827b3f672d edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 verify-sig 40b4f4f782cf67118f594ce604cc4c0a wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=1fd57500576541bb68896c399e27a0b0
+_md5_=35b8d5b279a7be50d718b00ddc59d57f
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 13985662ccd6..e1bfddeead3f 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/cyrus-sasl-2.1.27-r4 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
index 727d8ba2316e..1b48644e772a 100644
--- a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r4
@@ -12,4 +12,4 @@ REQUIRED_USE=ldapdb? ( openldap )
SLOT=2
SRC_URI=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 db-use 5b886219e6035ca01d8b1c58eba91679 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 378e4cda228ea0231a0ac283cb2ad25c l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 pam b097695df28f3974e3af860d6704d4f2 systemd 74b223e42834adf09a2d21fe5fe13741 tmpfiles dc8e4917d734a019caa04ad3b8db560b toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=0ba8e8f8fd7a60acb79e3b246c9cfd3e
+_md5_=c02fa6168bdc7fc63af07e1561f4f743
diff --git a/metadata/md5-cache/dev-libs/hyphen-2.8.8-r1 b/metadata/md5-cache/dev-libs/hyphen-2.8.8-r1
index bdf97f72ec95..020eee4a25ca 100644
--- a/metadata/md5-cache/dev-libs/hyphen-2.8.8-r1
+++ b/metadata/md5-cache/dev-libs/hyphen-2.8.8-r1
@@ -10,4 +10,4 @@ LICENSE=GPL-2 LGPL-2.1 MPL-1.1
RDEPEND=app-text/hunspell
SLOT=0
SRC_URI=mirror://sourceforge/hunspell/hyphen-2.8.8.tar.gz
-_md5_=657aec0a67c560f443bd18456e4d6738
+_md5_=9dba6f783d32ae9185669b8cfa10fd06
diff --git a/metadata/md5-cache/dev-libs/liblinear-243 b/metadata/md5-cache/dev-libs/liblinear-243
new file mode 100644
index 000000000000..1573f9c6456e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/liblinear-243
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=A Library for Large Linear Classification
+EAPI=7
+HOMEPAGE=https://www.csie.ntu.edu.tw/~cjlin/liblinear/ https://github.com/cjlin1/liblinear
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD
+SLOT=0/4
+SRC_URI=https://github.com/cjlin1/liblinear/archive/v243.tar.gz -> liblinear-243.tar.gz
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=666b7426ad4c1456fc5ecb54b208c7d7
diff --git a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3 b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3
index 4014c4b600bf..6341964a5fd5 100644
--- a/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3
+++ b/metadata/md5-cache/dev-libs/libparserutils-0.2.4-r3
@@ -4,10 +4,10 @@ DESCRIPTION=C library for building efficient parsers
EAPI=7
HOMEPAGE=http://www.netsurf-browser.org/projects/libparserutils/
IUSE=iconv test
-KEYWORDS=~amd64 ~arm ~arm64 ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ~ppc64 x86
LICENSE=MIT
RESTRICT=!test? ( test )
SLOT=0/0.2.4
SRC_URI=https://download.netsurf-browser.org/libs/releases/libparserutils-0.2.4-src.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e netsurf 8d6ce5a28a5af61bfb3a264ac8d46867 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=cdd953494a28607821197d0267c6e385
+_md5_=145d0747968f8bf72cb7c64eae389fe2
diff --git a/metadata/md5-cache/dev-libs/nspr-4.30 b/metadata/md5-cache/dev-libs/nspr-4.30
new file mode 100644
index 000000000000..364509a71047
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nspr-4.30
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Netscape Portable Runtime
+EAPI=7
+HOMEPAGE=https://www.mozilla.org/projects/nspr/
+IUSE=debug elibc_musl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.30/src/nspr-4.30.tar.gz
+_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=e31a0647481cf26e9ea25f880db15693
diff --git a/metadata/md5-cache/dev-libs/ntl-11.4.4 b/metadata/md5-cache/dev-libs/ntl-11.4.4
index 9e9eec3b5d3b..7fcc24ee5755 100644
--- a/metadata/md5-cache/dev-libs/ntl-11.4.4
+++ b/metadata/md5-cache/dev-libs/ntl-11.4.4
@@ -12,4 +12,4 @@ REQUIRED_USE=bindist? ( !cpu_flags_x86_avx2 )
SLOT=0/43
SRC_URI=https://www.shoup.net/ntl/ntl-11.4.4.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=fa45d6785f37abcfe7774749103b5084
+_md5_=24be3c5fcffb3aac0a75c525be9397cf
diff --git a/metadata/md5-cache/dev-libs/simdjson-0.9.0 b/metadata/md5-cache/dev-libs/simdjson-0.9.0
new file mode 100644
index 000000000000..69b113581f14
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/simdjson-0.9.0
@@ -0,0 +1,15 @@
+BDEPEND=sys-apps/file sys-apps/findutils sys-apps/grep dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=tools? ( dev-libs/cxxopts:= )
+DESCRIPTION=SIMD accelerated C++ JSON library
+EAPI=7
+HOMEPAGE=https://simdjson.org/ https://github.com/simdjson/simdjson
+IUSE=test tools
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=Apache-2.0 Boost-1.0
+REQUIRED_USE=test? ( tools )
+RESTRICT=!test? ( test )
+SLOT=0/8
+SRC_URI=https://github.com/simdjson/simdjson/archive/v0.9.0.tar.gz -> simdjson-0.9.0.tar.gz
+_eclasses_=cmake 314a813be2f09820e8978cdee941e501 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=5b9095615d090e75bdd10f40c864f199
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.19.2 b/metadata/md5-cache/dev-libs/tree-sitter-0.19.2
deleted file mode 100644
index 62fd49c72767..000000000000
--- a/metadata/md5-cache/dev-libs/tree-sitter-0.19.2
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tree-sitter is a parser generator tool and an incremental parsing library.
-EAPI=7
-HOMEPAGE=https://github.com/tree-sitter/tree-sitter
-KEYWORDS=~amd64
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/v0.19.2.tar.gz -> tree-sitter-0.19.2.tar.gz
-_md5_=b45e4e8dbf77ac54e52dbb3ba8cc6afb
diff --git a/metadata/md5-cache/dev-libs/tree-sitter-0.19.0 b/metadata/md5-cache/dev-libs/tree-sitter-0.19.3
similarity index 88%
rename from metadata/md5-cache/dev-libs/tree-sitter-0.19.0
rename to metadata/md5-cache/dev-libs/tree-sitter-0.19.3
index b381e539bbbe..71a6cdc7f4bd 100644
--- a/metadata/md5-cache/dev-libs/tree-sitter-0.19.0
+++ b/metadata/md5-cache/dev-libs/tree-sitter-0.19.3
@@ -5,5 +5,5 @@ HOMEPAGE=https://github.com/tree-sitter/tree-sitter
KEYWORDS=~amd64
LICENSE=MIT
SLOT=0
-SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/v0.19.0.tar.gz -> tree-sitter-0.19.0.tar.gz
+SRC_URI=https://github.com/tree-sitter/tree-sitter/archive/v0.19.3.tar.gz -> tree-sitter-0.19.3.tar.gz
_md5_=b45e4e8dbf77ac54e52dbb3ba8cc6afb
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 9933f3d00696..1f857a230aad 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.8
deleted file mode 100644
index c808d37128da..000000000000
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-ml/cppo virtual/pkgconfig
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-ml/pcre-ocaml-5:= ) tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) gtk? ( dev-ml/lablgtk:2= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= ) >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Modules for OCaml application-level Internet protocols
-EAPI=7
-HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
-IUSE=gtk kerberos tk httpd +ocamlopt +pcre ssl zip
-KEYWORDS=amd64 ppc x86
-LICENSE=ZLIB GPL-2+
-RDEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-ml/pcre-ocaml-5:= ) tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) gtk? ( dev-ml/lablgtk:2= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= )
-RESTRICT=installsources strip
-SLOT=0/4.1.8
-SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.8.tar.gz
-_eclasses_=findlib 3d3de4bef686774baeeabfa2b916631c
-_md5_=6e9c85d20ca0e9e4493d73dc7e37a541
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
index f83a79a22368..79ce49798b8d 100644
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Modules for OCaml application-level Internet protocols
EAPI=7
HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
IUSE=kerberos tk httpd +ocamlopt +pcre ssl zip
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
LICENSE=ZLIB GPL-2+
RDEPEND=>=dev-ml/findlib-1.0 >=dev-lang/ocaml-3.10.2:=[ocamlopt?] pcre? ( >=dev-ml/pcre-ocaml-5:= ) tk? ( dev-ml/labltk:= ) ssl? ( net-libs/gnutls:= ) kerberos? ( virtual/krb5 ) zip? ( dev-ml/camlzip:= )
RESTRICT=installsources strip
SLOT=0/4.1.8
SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.8.tar.gz
_eclasses_=findlib 3d3de4bef686774baeeabfa2b916631c
-_md5_=933316bc7f0b62c4cf18d59291a2f0fe
+_md5_=51d153b2607f6787161eac7bba3d3ee2
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index f500d9413e0a..7e3701232651 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/autopep8-1.5.6 b/metadata/md5-cache/dev-python/autopep8-1.5.6
new file mode 100644
index 000000000000..83082c5de439
--- /dev/null
+++ b/metadata/md5-cache/dev-python/autopep8-1.5.6
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pydiff[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pycodestyle-2.7.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Automatically formats Python code to conform to the PEP 8 style guide
+EAPI=7
+HOMEPAGE=https://github.com/hhatto/autopep8 https://pypi.org/project/autopep8/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/pycodestyle-2.7.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/autopep8/autopep8-1.5.6.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=b0a3a9b107b3ceca42bc13617e998f76
diff --git a/metadata/md5-cache/dev-python/boto3-1.17.29 b/metadata/md5-cache/dev-python/boto3-1.17.29
new file mode 100644
index 000000000000..ab3586fb0339
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.17.29
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/botocore-1.20.29[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=7
+HOMEPAGE=https://github.com/boto/boto3
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.20.29[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jmespath-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/s3transfer-0.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.17.29.tar.gz -> boto3-1.17.29.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=632f3a5a79935d84378ababb9d4c165a
diff --git a/metadata/md5-cache/dev-python/botocore-1.20.29 b/metadata/md5-cache/dev-python/botocore-1.20.29
new file mode 100644
index 000000000000..f90bced47fcc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.20.29
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=7
+HOMEPAGE=https://github.com/boto/botocore
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jmespath[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/botocore/botocore-1.20.29.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=0cb391ae0ef3fed1bf28148d755b5f6f
diff --git a/metadata/md5-cache/dev-python/google-auth-1.28.0 b/metadata/md5-cache/dev-python/google-auth-1.28.0
new file mode 100644
index 000000000000..2f1fc3cc0cd3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-1.28.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/freezegun[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/grpcio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/moto[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/oauth2client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyopenssl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-localserver[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/responses[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/namespace-google[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rsa-3.1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google Authentication Library
+EAPI=7
+HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/namespace-google[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-0.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rsa-3.1.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cachetools-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/google-auth/google-auth-1.28.0.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=91455c758c31c52bc7e56571fe8a3a89
diff --git a/metadata/md5-cache/dev-python/jsonpickle-1.5.0 b/metadata/md5-cache/dev-python/jsonpickle-1.5.0
deleted file mode 100644
index f04606224599..000000000000
--- a/metadata/md5-cache/dev-python/jsonpickle-1.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/simplejson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/feedparser[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ujson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for serializing any arbitrary object graph into JSON
-EAPI=7
-HOMEPAGE=https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/
-IUSE=doc test doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/simplejson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/feedparser[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ujson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-1.5.0.tar.gz
-_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=135e2a2f1f60207f3d03a65a247939d6
diff --git a/metadata/md5-cache/dev-python/jsonpickle-1.5.2 b/metadata/md5-cache/dev-python/jsonpickle-1.5.2
deleted file mode 100644
index 8d74112f725e..000000000000
--- a/metadata/md5-cache/dev-python/jsonpickle-1.5.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/feedparser[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/simplejson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ujson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library for serializing any arbitrary object graph into JSON
-EAPI=7
-HOMEPAGE=https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/
-IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/feedparser[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/simplejson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ujson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-1.5.2.tar.gz
-_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=85d4b3cbd30cbae2dfd0059b7115bf41
diff --git a/metadata/md5-cache/dev-python/jsonpickle-2.0.0 b/metadata/md5-cache/dev-python/jsonpickle-2.0.0
index d5521a316ebc..2f073007995a 100644
--- a/metadata/md5-cache/dev-python/jsonpickle-2.0.0
+++ b/metadata/md5-cache/dev-python/jsonpickle-2.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python library for serializing any arbitrary object graph into JSON
EAPI=7
HOMEPAGE=https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/
IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-python/feedparser[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/simplejson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ujson[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/j/jsonpickle/jsonpickle-2.0.0.tar.gz
_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=85d4b3cbd30cbae2dfd0059b7115bf41
+_md5_=de221a224245cd42cf06c3ff6b6bdd80
diff --git a/metadata/md5-cache/dev-python/jupyter_console-6.3.0 b/metadata/md5-cache/dev-python/jupyter_console-6.3.0
new file mode 100644
index 000000000000..28e3cf62a290
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jupyter_console-6.3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pexpect[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-apps/util-linux ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinxcontrib-github-alt[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/ipython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] =dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A terminal-based console frontend for Jupyter kernels
+EAPI=7
+HOMEPAGE=https://jupyter.org
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/ipython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] =dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/j/jupyter_console/jupyter_console-6.3.0.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=c4738fb2a7f21ceebcb0f38c27afbf3c
diff --git a/metadata/md5-cache/dev-python/notebook-6.1.6 b/metadata/md5-cache/dev-python/notebook-6.1.6
deleted file mode 100644
index 33b7d1beea57..000000000000
--- a/metadata/md5-cache/dev-python/notebook-6.1.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests-unixsocket[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/terminado-0.8.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=www-servers/tornado-5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_core-4.6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-5.3.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/send2trash[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/prometheus_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install preinst prepare test
-DESCRIPTION=Jupyter Interactive Notebook
-EAPI=7
-HOMEPAGE=https://jupyter.org
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=BSD
-RDEPEND=>=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/terminado-0.8.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=www-servers/tornado-5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_core-4.6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-5.3.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/send2trash[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/prometheus_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/n/notebook/notebook-6.1.6.tar.gz
-_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=d7a03d56103cf97d39a32dae4196b952
diff --git a/metadata/md5-cache/dev-python/notebook-6.2.0 b/metadata/md5-cache/dev-python/notebook-6.2.0
index bb12c2643cdc..6fdcae7f1c30 100644
--- a/metadata/md5-cache/dev-python/notebook-6.2.0
+++ b/metadata/md5-cache/dev-python/notebook-6.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=Jupyter Interactive Notebook
EAPI=7
HOMEPAGE=https://jupyter.org
IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
LICENSE=BSD
RDEPEND=>=dev-libs/mathjax-2.4 dev-python/argon2-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/terminado-0.8.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=www-servers/tornado-6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/traitlets-4.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_core-4.6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyzmq-17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-5.3.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nbconvert-4.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/send2trash[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/prometheus_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/n/notebook/notebook-6.2.0.tar.gz
_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=d88c8578c3ff28bdbaed0d9fa6cb20de
+_md5_=0b80e482a21b864d1b000f873b3d8368
diff --git a/metadata/md5-cache/dev-python/pandas-1.2.1-r2 b/metadata/md5-cache/dev-python/pandas-1.2.1-r1
similarity index 99%
rename from metadata/md5-cache/dev-python/pandas-1.2.1-r2
rename to metadata/md5-cache/dev-python/pandas-1.2.1-r1
index c0f235a22dfc..4a7ce05724b2 100644
--- a/metadata/md5-cache/dev-python/pandas-1.2.1-r2
+++ b/metadata/md5-cache/dev-python/pandas-1.2.1-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/p/pandas/pandas-1.2.1.tar.gz
_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 optfeature 6a2add34e06e5a05d88471a33ccdd73e python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 virtualx 7e60d3b10c791ab996f717bc1f30072f wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=5cdb5bde17787cbee24314325f6a99d9
+_md5_=1f832ec627d7ba732abef9e41fc273eb
diff --git a/metadata/md5-cache/dev-python/pandas-1.2.2-r1 b/metadata/md5-cache/dev-python/pandas-1.2.2-r1
index 5314b5a00f9f..6aef77a149c2 100644
--- a/metadata/md5-cache/dev-python/pandas-1.2.2-r1
+++ b/metadata/md5-cache/dev-python/pandas-1.2.2-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/p/pandas/pandas-1.2.2.tar.gz
_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 optfeature 6a2add34e06e5a05d88471a33ccdd73e python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 virtualx 7e60d3b10c791ab996f717bc1f30072f wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=477a83a7e2475f23576322c839cbe507
+_md5_=dae7362496f5e043192defe9b07a0c12
diff --git a/metadata/md5-cache/dev-python/pandas-1.2.3-r2 b/metadata/md5-cache/dev-python/pandas-1.2.3-r1
similarity index 99%
rename from metadata/md5-cache/dev-python/pandas-1.2.3-r2
rename to metadata/md5-cache/dev-python/pandas-1.2.3-r1
index 55e6e9f0c152..b7e54811722b 100644
--- a/metadata/md5-cache/dev-python/pandas-1.2.3-r2
+++ b/metadata/md5-cache/dev-python/pandas-1.2.3-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/p/pandas/pandas-1.2.3.tar.gz
_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 optfeature 6a2add34e06e5a05d88471a33ccdd73e python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 virtualx 7e60d3b10c791ab996f717bc1f30072f wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=2119a932a1b9b68123ea52609d934617
+_md5_=dae7362496f5e043192defe9b07a0c12
diff --git a/metadata/md5-cache/dev-python/phply-1.2.5 b/metadata/md5-cache/dev-python/phply-1.2.5
index 89be0b348a50..7a4ec7212a8f 100644
--- a/metadata/md5-cache/dev-python/phply-1.2.5
+++ b/metadata/md5-cache/dev-python/phply-1.2.5
@@ -4,7 +4,7 @@ DESCRIPTION=Lexer and parser for PHP source implemented using PLY
EAPI=7
HOMEPAGE=https://github.com/viraptor/phply/ https://pypi.org/project/phply/
IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
LICENSE=BSD
RDEPEND=dev-python/ply[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/viraptor/phply/archive/1.2.5.tar.gz -> phply-1.2.5.gh.tar.gz
_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=1efcc6c61ee9666dff6ff323b4572ace
+_md5_=525e0f55d0083b7a46b0e7631d0ec524
diff --git a/metadata/md5-cache/dev-python/qtconsole-5.0.3 b/metadata/md5-cache/dev-python/qtconsole-5.0.3
new file mode 100644
index 000000000000..5e74f986d033
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qtconsole-5.0.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/QtPy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),svg,testlib] ) doc? ( || ( ( dev-lang/python:3.9[threads(+)] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[threads(+)] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[threads(+)] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/QtPy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),gui,printsupport,svg] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Qt-based console for Jupyter with support for rich media output
+EAPI=7
+HOMEPAGE=https://jupyter.org
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+PDEPEND=dev-python/ipython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ipython_genutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_core[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jupyter_client-4.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/traitlets[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/QtPy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-),gui,printsupport,svg] python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/q/qtconsole/qtconsole-5.0.3.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=f79f50f38e9ea411c20942021a3835f1
diff --git a/metadata/md5-cache/dev-python/responses-0.13.0 b/metadata/md5-cache/dev-python/responses-0.13.0
new file mode 100644
index 000000000000..bd5e4ce87360
--- /dev/null
+++ b/metadata/md5-cache/dev-python/responses-0.13.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-localserver[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utility for mocking out the Python Requests library
+EAPI=7
+HOMEPAGE=https://github.com/getsentry/responses
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/responses/responses-0.13.0.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=3a94b0b8f0e5fa93cdf3676380abd75b
diff --git a/metadata/md5-cache/dev-python/responses-0.13.1 b/metadata/md5-cache/dev-python/responses-0.13.1
new file mode 100644
index 000000000000..05106b58f1b5
--- /dev/null
+++ b/metadata/md5-cache/dev-python/responses-0.13.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pytest-localserver[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utility for mocking out the Python Requests library
+EAPI=7
+HOMEPAGE=https://github.com/getsentry/responses
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/requests-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cookies[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/responses/responses-0.13.1.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=3a94b0b8f0e5fa93cdf3676380abd75b
diff --git a/metadata/md5-cache/dev-python/setuptools_scm-6.0.1 b/metadata/md5-cache/dev-python/setuptools_scm-6.0.1
new file mode 100644
index 000000000000..b4fc8481039c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools_scm-6.0.1
@@ -0,0 +1,15 @@
+BDEPEND=!!=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Manage versions by scm tags via setuptools
+EAPI=7
+HOMEPAGE=https://github.com/pypa/setuptools_scm/ https://pypi.org/project/setuptools-scm/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/setuptools_scm/setuptools_scm-6.0.1.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=1404225fec1dce0f7f22c4cb927bd9a1
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.9.3 b/metadata/md5-cache/dev-python/snakeoil-0.9.3
index a7749104a8a1..f0f48502e348 100644
--- a/metadata/md5-cache/dev-python/snakeoil-0.9.3
+++ b/metadata/md5-cache/dev-python/snakeoil-0.9.3
@@ -4,7 +4,7 @@ DESCRIPTION=misc common functionality and useful optimizations
EAPI=7
HOMEPAGE=https://github.com/pkgcore/snakeoil
IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
LICENSE=BSD BSD-2 MIT
RDEPEND=dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.9.3.tar.gz
_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=2e26eaba525438ed929828b0b40a2b70
+_md5_=23de41323e7fa6c2cea99c869d013556
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.11.1 b/metadata/md5-cache/dev-python/statsmodels-0.11.1
deleted file mode 100644
index d4dbcf8d7b57..000000000000
--- a/metadata/md5-cache/dev-python/statsmodels-0.11.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jupyter_client[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/nbconvert[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/numpydoc[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/ipykernel[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/jupyter_client[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/nbconvert[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/numpydoc[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/nbconvert[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/numpydoc[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] doc? ( dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jupyter_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbconvert[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/numpydoc[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/nose[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pandas[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
-DESCRIPTION=Statistical computations and models for use with SciPy
-EAPI=7
-HOMEPAGE=https://www.statsmodels.org/stable/index.html
-IUSE=doc examples test doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/scipy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.11.1.tar.gz
-_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 optfeature 6a2add34e06e5a05d88471a33ccdd73e python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=37f13c16105ba1b5c86ca5aff3844f75
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.12.0 b/metadata/md5-cache/dev-python/statsmodels-0.12.0
deleted file mode 100644
index 16820ec397b1..000000000000
--- a/metadata/md5-cache/dev-python/statsmodels-0.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest-xdist[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jupyter_client[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/nbconvert[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/numpydoc[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/ipykernel[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/jupyter_client[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/nbconvert[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/numpydoc[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/nbconvert[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/numpydoc[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/numpy-1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Statistical computations and models for use with SciPy
-EAPI=7
-HOMEPAGE=https://www.statsmodels.org/stable/index.html
-IUSE=examples doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/numpy-1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.12.0.tar.gz
-_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 optfeature 6a2add34e06e5a05d88471a33ccdd73e python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=4e368dc5ebfbc6b5524c57f4d84c293b
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.12.1 b/metadata/md5-cache/dev-python/statsmodels-0.12.1
deleted file mode 100644
index bf130929d664..000000000000
--- a/metadata/md5-cache/dev-python/statsmodels-0.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-python/cython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/numpy-1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest-xdist[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/ipykernel[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/jupyter_client[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/matplotlib[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/nbconvert[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/numpydoc[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/ipykernel[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/jupyter_client[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/matplotlib[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/nbconvert[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/numpydoc[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/ipykernel[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/jupyter_client[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/nbconvert[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/numpydoc[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/numpy-1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=Statistical computations and models for use with SciPy
-EAPI=7
-HOMEPAGE=https://www.statsmodels.org/stable/index.html
-IUSE=examples doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/numpy-1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.12.1.tar.gz
-_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 optfeature 6a2add34e06e5a05d88471a33ccdd73e python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=4e368dc5ebfbc6b5524c57f4d84c293b
diff --git a/metadata/md5-cache/dev-python/statsmodels-0.12.2 b/metadata/md5-cache/dev-python/statsmodels-0.12.2
index a94b69a9889a..d85fcb925d83 100644
--- a/metadata/md5-cache/dev-python/statsmodels-0.12.2
+++ b/metadata/md5-cache/dev-python/statsmodels-0.12.2
@@ -4,7 +4,7 @@ DESCRIPTION=Statistical computations and models for use with SciPy
EAPI=7
HOMEPAGE=https://www.statsmodels.org/stable/index.html
IUSE=examples doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=>=dev-python/numpy-1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pandas-0.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/patsy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/scipy-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/s/statsmodels/statsmodels-0.12.2.tar.gz
_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 optfeature 6a2add34e06e5a05d88471a33ccdd73e python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=6e4188480f5f6cb851c280874343f58a
+_md5_=0848b067a2e6cc47cfc4357d6251ffab
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.3.1 b/metadata/md5-cache/dev-python/translate-toolkit-3.3.1
deleted file mode 100644
index fae0984cf049..000000000000
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9[sqlite] dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8[sqlite] dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7[sqlite] dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) test? ( >=dev-python/six-1.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cheroot[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-4.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycountry-19.8.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ical? ( dev-python/vobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) subtitles? ( media-video/gaupol[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) yaml? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/six-1.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-DESCRIPTION=Toolkit to convert between many translation formats
-EAPI=7
-HOMEPAGE=https://github.com/translate/translate
-IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cheroot[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-4.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycountry-19.8.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ical? ( dev-python/vobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) subtitles? ( media-video/gaupol[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) yaml? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/translate/translate/releases/download/3.3.1/translate-toolkit-3.3.1.tar.gz
-_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=09479ad968a226d3aae0c20d9629fc5d
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.3.2 b/metadata/md5-cache/dev-python/translate-toolkit-3.3.2
index b5b46c6a4d52..ef4f4483ce2a 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.3.2
+++ b/metadata/md5-cache/dev-python/translate-toolkit-3.3.2
@@ -4,7 +4,7 @@ DESCRIPTION=Toolkit to convert between many translation formats
EAPI=7
HOMEPAGE=https://github.com/translate/translate
IUSE=+html +ical +ini +subtitles +yaml doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 arm64 x86
LICENSE=GPL-2
RDEPEND=>=dev-python/six-1.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !dev-python/pydiff app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cheroot[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/lxml-4.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pycountry-19.8.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-levenshtein-0.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ical? ( dev-python/vobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) subtitles? ( media-video/gaupol[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) yaml? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/translate/translate/releases/download/3.3.2/translate-toolkit-3.3.2.tar.gz
_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=af12c0cd50b0a2055d3bfb1cd68667d7
+_md5_=8178c314352a6630e05c10b4ee35fa62
diff --git a/metadata/md5-cache/dev-python/tree-sitter-0.19.0 b/metadata/md5-cache/dev-python/tree-sitter-0.19.0
index 74e57ca4cbec..74f33710808c 100644
--- a/metadata/md5-cache/dev-python/tree-sitter-0.19.0
+++ b/metadata/md5-cache/dev-python/tree-sitter-0.19.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings to the Tree-sitter parsing library
EAPI=7
HOMEPAGE=https://github.com/tree-sitter/py-tree-sitter
IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
LICENSE=MIT
RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
SLOT=0
SRC_URI=mirror://pypi/t/tree_sitter/tree_sitter-0.19.0.tar.gz -> py-tree-sitter-0.19.0.tar.gz
_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=cdff593f527056bfd6a698b7adb2cb54
+_md5_=2cf52138a0cea8f6233bf66c163c5fb4
diff --git a/metadata/md5-cache/dev-python/twine-3.4.1 b/metadata/md5-cache/dev-python/twine-3.4.1
new file mode 100644
index 000000000000..4cb682f53fc3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/twine-3.4.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/jaraco-envs[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jaraco-functools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/munch[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/portend[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pretend[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pypiserver[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pkginfo-1.4.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/readme_renderer-21.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tqdm-4.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Collection of utilities for publishing packages on PyPI
+EAPI=7
+HOMEPAGE=https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/colorama-0.4.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/keyring-15.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pkginfo-1.4.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/readme_renderer-21.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.20.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-toolbelt-0.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/rfc3986-1.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tqdm-4.14[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pypa/twine/archive/3.4.1.tar.gz -> twine-3.4.1.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=af57da8eb0aaaaed3edf3f2039693cda
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.4.3 b/metadata/md5-cache/dev-python/virtualenv-20.4.3
new file mode 100644
index 000000000000..b3fad1a78c4a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-20.4.3
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( python_targets_python3_7? ( dev-python/coverage[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/coverage[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/coverage[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/towncrier[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/towncrier[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/towncrier[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),-python_single_target_pypy3(-)] dev-python/towncrier[python_targets_pypy3(-),-python_single_target_pypy3(-)] ) ) ) test? ( >=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Virtual Python Environment builder
+EAPI=7
+HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
+IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.4.3.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=b121019ea24b191588c2ea6d0b27fe09
diff --git a/metadata/md5-cache/dev-python/xlrd-2.0.1 b/metadata/md5-cache/dev-python/xlrd-2.0.1
new file mode 100644
index 000000000000..9b8a6f5a4436
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xlrd-2.0.1
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Library to extract data from Microsoft Excel spreadsheets
+EAPI=7
+HOMEPAGE=https://www.python-excel.org/ https://github.com/python-excel/xlrd/
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-excel/xlrd/archive/2.0.1.tar.gz -> xlrd-2.0.1.gh.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=e889aa31d1a6b79f0d05db4a53009aef
diff --git a/metadata/md5-cache/dev-python/zope-testrunner-5.3.0 b/metadata/md5-cache/dev-python/zope-testrunner-5.3.0
new file mode 100644
index 000000000000..ec84e823cc27
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zope-testrunner-5.3.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/zope-testing[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-exceptions[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Zope testrunner script
+EAPI=7
+HOMEPAGE=https://pypi.org/project/zope.testrunner/ https://github.com/zopefoundation/zope.testrunner
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=ZPL
+RDEPEND=dev-python/namespace-zope[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-exceptions[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/zope-interface[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) 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_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/z/zope.testrunner/zope.testrunner-5.3.0.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=b9f0448919f6de584e34cb0802210cb0
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 3240135f4b11..de12efa99449 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/blankslate-3.1.3-r1 b/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
new file mode 100644
index 000000000000..0be128cff351
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/blankslate-3.1.3-r1
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) 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(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) 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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Base class with almost all of the methods from Object and Kernel being removed
+EAPI=7
+HOMEPAGE=https://rubygems.org/gems/blankslate
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/blankslate-3.1.3.gem
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e ruby-fakegem ec7b495f660dc38b1da9b6a19c75ecdd ruby-ng 676004cfb6cdf3dedf1c778d56346624 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=1b81230bd5d76622837d0b0069b82cdf
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.4.0 b/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
index 3f90a50ab611..ce320c40fb1a 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.4.0
@@ -1,16 +1,16 @@
-BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) 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(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) 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(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] !!dev-ruby/psych[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
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_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
DESCRIPTION=Pure Ruby library that can read and write PNG images
EAPI=7
HOMEPAGE=https://wiki.github.com/wvanbergen/chunky_png
-IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 test test
+IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 test test
KEYWORDS=~amd64 ~x86
LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://rubygems.org/gems/chunky_png-1.4.0.gem
_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e ruby-fakegem ec7b495f660dc38b1da9b6a19c75ecdd ruby-ng 676004cfb6cdf3dedf1c778d56346624 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=c6cfd242c4a76075f2da9433013ddea4
+_md5_=d1e0ca7ab7fcd96eb88ebed32cddd37a
diff --git a/metadata/md5-cache/dev-ruby/hiera-3.7.0 b/metadata/md5-cache/dev-ruby/hiera-3.7.0
new file mode 100644
index 000000000000..544908c83996
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/hiera-3.7.0
@@ -0,0 +1,16 @@
+BDEPEND=ruby_targets_ruby25? ( test? ( dev-ruby/mocha[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/mocha[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby25? ( dev-ruby/deep_merge[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/deep_merge[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/deep_merge[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) 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(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) 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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=A simple pluggable Hierarchical Database
+EAPI=7
+HOMEPAGE=https://docs.puppet.com/hiera/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/deep_merge[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/deep_merge[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/deep_merge[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/hiera-3.7.0.gem
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e ruby-fakegem ec7b495f660dc38b1da9b6a19c75ecdd ruby-ng 676004cfb6cdf3dedf1c778d56346624 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=eea2fb6120185f18622b6a37167d81b8
diff --git a/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0 b/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
index faf69f82dcdd..b49fd7761387 100644
--- a/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
+++ b/metadata/md5-cache/dev-ruby/kramdown-parser-gfm-1.1.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/kramdown:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/kramdown:2[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/kramdown[ruby_targets_ruby25(-),latex] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/kramdown[ruby_targets_ruby26(-),latex] ) ) 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(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/kramdown:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/kramdown:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/kramdown:2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/kramdown[ruby_targets_ruby25(-),latex] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/kramdown[ruby_targets_ruby26(-),latex] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/kramdown[ruby_targets_ruby27(-),latex] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rake[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) 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(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) 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_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(-)] )
+DEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
DESCRIPTION=A kramdown parser for the GFM dialect of Markdown
EAPI=7
HOMEPAGE=https://github.com/kramdown/parser-gfm
-IUSE=doc test ruby_targets_ruby25 ruby_targets_ruby26 doc test test
+IUSE=doc test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
KEYWORDS=~amd64 ~arm64
LICENSE=MIT
-RDEPEND=ruby_targets_ruby25? ( dev-ruby/kramdown:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/kramdown: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 )
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/kramdown:2[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/kramdown:2[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/kramdown:2[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=1
SRC_URI=https://rubygems.org/gems/kramdown-parser-gfm-1.1.0.gem
_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e ruby-fakegem ec7b495f660dc38b1da9b6a19c75ecdd ruby-ng 676004cfb6cdf3dedf1c778d56346624 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=207677e50874b43eb9292cb0858a73a3
+_md5_=207e8284c07618b166a0b03f673b4461
diff --git a/metadata/md5-cache/dev-ruby/logue-1.0.18 b/metadata/md5-cache/dev-ruby/logue-1.0.18
index 19985404f4a6..49278e5c49d2 100644
--- a/metadata/md5-cache/dev-ruby/logue-1.0.18
+++ b/metadata/md5-cache/dev-ruby/logue-1.0.18
@@ -4,7 +4,7 @@ DESCRIPTION=A module that adds logging/trace functionality
EAPI=6
HOMEPAGE=https://github.com/jpace/logue
IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
LICENSE=MIT
RDEPEND=ruby_targets_ruby25? ( dev-ruby/rainbow:3[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/rainbow:3[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/rainbow:3[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
SLOT=0
SRC_URI=https://github.com/jpace/logue/archive/v1.0.18.tar.gz -> logue-git-1.0.18.tgz
_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e ruby-fakegem ec7b495f660dc38b1da9b6a19c75ecdd ruby-ng 676004cfb6cdf3dedf1c778d56346624 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=875a0ce10a6e2ca804b8054b2a3b1650
+_md5_=ab8bba23e27ba825f943545b32815084
diff --git a/metadata/md5-cache/dev-ruby/paramesan-1.0.1 b/metadata/md5-cache/dev-ruby/paramesan-1.0.1
index bd20eab31cc3..2a6c1dfc3d2b 100644
--- a/metadata/md5-cache/dev-ruby/paramesan-1.0.1
+++ b/metadata/md5-cache/dev-ruby/paramesan-1.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Parameterized tests in Ruby
EAPI=7
HOMEPAGE=https://github.com/jpace/paramesan
IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 doc test test
-KEYWORDS=amd64 ~hppa ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
LICENSE=MIT
RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 ruby_targets_ruby30 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
SLOT=1
SRC_URI=https://github.com/jpace/paramesan/archive/v1.0.1.tar.gz -> paramesan-1.0.1.tgz
_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e ruby-fakegem ec7b495f660dc38b1da9b6a19c75ecdd ruby-ng 676004cfb6cdf3dedf1c778d56346624 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=7f3c6e8007e8056776d0fad70fbf6057
+_md5_=eb1c3b74530dc318685479a20bfceba5
diff --git a/metadata/md5-cache/dev-ruby/rqrcode-1.2.0 b/metadata/md5-cache/dev-ruby/rqrcode-1.2.0
new file mode 100644
index 000000000000..c05411953187
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/rqrcode-1.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( ruby_targets_ruby25? ( dev-ruby/chunky_png:0[ruby_targets_ruby25(-)] >=dev-ruby/rqrcode_core-0.2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/chunky_png:0[ruby_targets_ruby26(-)] >=dev-ruby/rqrcode_core-0.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/chunky_png:0[ruby_targets_ruby27(-)] >=dev-ruby/rqrcode_core-0.2:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25(-)] ) ) ruby_targets_ruby26? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby26(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) 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(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] !!dev-ruby/psych[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) 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_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DESCRIPTION=Library for encoding QR Codes
+EAPI=7
+HOMEPAGE=https://whomwah.github.com/rqrcode/
+IUSE=test ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby25? ( dev-ruby/chunky_png:0[ruby_targets_ruby25(-)] >=dev-ruby/rqrcode_core-0.2:0[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( dev-ruby/chunky_png:0[ruby_targets_ruby26(-)] >=dev-ruby/rqrcode_core-0.2:0[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( dev-ruby/chunky_png:0[ruby_targets_ruby27(-)] >=dev-ruby/rqrcode_core-0.2:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/whomwah/rqrcode/archive/v1.2.0.tar.gz -> rqrcode-1.2.0.tar.gz
+_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e ruby-fakegem ec7b495f660dc38b1da9b6a19c75ecdd ruby-ng 676004cfb6cdf3dedf1c778d56346624 ruby-utils 03dfa7f54d59d740c2964dc7256d2820 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=91dfdeb973b5c476274fd7e1254759ca
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 9fe877998bc9..3ef36526ad10 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/bats-1.3.0 b/metadata/md5-cache/dev-util/bats-1.3.0
new file mode 100644
index 000000000000..fc8246bba851
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bats-1.3.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst test
+DEPEND=app-shells/bash:*
+DESCRIPTION=Bats-core: Bash Automated Testing System
+EAPI=7
+HOMEPAGE=https://github.com/bats-core/bats-core/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=app-shells/bash:*
+SLOT=0
+SRC_URI=https://github.com/bats-core/bats-core/archive/v1.3.0.tar.gz -> bats-1.3.0.tar.gz
+_eclasses_=optfeature 6a2add34e06e5a05d88471a33ccdd73e
+_md5_=6ea0f198c7a59645783ca389be2c6f89
diff --git a/metadata/md5-cache/dev-util/codeblocks-20.03-r2 b/metadata/md5-cache/dev-util/codeblocks-20.03-r2
index 4eaca6059f75..f892f90e994f 100644
--- a/metadata/md5-cache/dev-util/codeblocks-20.03-r2
+++ b/metadata/md5-cache/dev-util/codeblocks-20.03-r2
@@ -5,10 +5,10 @@ DESCRIPTION=The open source, cross platform, free C, C++ and Fortran IDE
EAPI=7
HOMEPAGE=https://codeblocks.org/
IUSE=contrib debug fortran pch
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-3
RDEPEND=app-arch/zip >=dev-libs/tinyxml-2.6.2-r3 >=dev-util/astyle-3.1-r2:0/3.1 x11-libs/wxGTK:3.0-gtk3[X] contrib? ( app-admin/gamin app-text/hunspell dev-libs/boost:= )
SLOT=0
SRC_URI=mirror://sourceforge/codeblocks/codeblocks-20.03.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-fortran.tar.xz https://dev.gentoo.org/~leio/distfiles/codeblocks-20.03-fortran-update-v1.7.tar.xz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 wxwidgets e1e6e1eb5b3d911b3abd712f611e2312 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=03c978bc4fd18b88d452798f9c04a253
+_md5_=b8f846678c35444775d75088b3f185bf
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.9.2 b/metadata/md5-cache/dev-util/pkgcheck-0.9.2
index c5ff036efdd6..ca586145f3fc 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.9.2
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.9.2
@@ -4,7 +4,7 @@ DESCRIPTION=pkgcore-based QA utility for ebuild repos
EAPI=7
HOMEPAGE=https://github.com/pkgcore/pkgcheck
IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~sparc ~x86 ~x64-macos
LICENSE=BSD MIT
RDEPEND=>=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.11.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.9.2.tar.gz
_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 optfeature 6a2add34e06e5a05d88471a33ccdd73e python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=e8a7b3f22c85a793b38b76d9b7430267
+_md5_=f10d29a1fe31505789cb5d92317574bd
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 170faafbb9a4..aa3d26be8553 100644
Binary files a/metadata/md5-cache/games-board/Manifest.gz and b/metadata/md5-cache/games-board/Manifest.gz differ
diff --git a/metadata/md5-cache/games-board/maitretarot-0.1.98-r1 b/metadata/md5-cache/games-board/maitretarot-0.1.98-r1
deleted file mode 100644
index 4c0f92dfe7a9..000000000000
--- a/metadata/md5-cache/games-board/maitretarot-0.1.98-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
-DESCRIPTION=server for the french tarot game maitretarot
-EAPI=6
-HOMEPAGE=http://www.nongnu.org/maitretarot/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/maitretarot/maitretarot.pkg/0.1.98/maitretarot-0.1.98.tar.bz2
-_md5_=c48407f3a21de4864087e4b88e656f00
diff --git a/metadata/md5-cache/games-board/maitretarot-0.1.98-r2 b/metadata/md5-cache/games-board/maitretarot-0.1.98-r2
new file mode 100644
index 000000000000..b5889867213f
--- /dev/null
+++ b/metadata/md5-cache/games-board/maitretarot-0.1.98-r2
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
+DESCRIPTION=Server for the french tarot game maitretarot
+EAPI=7
+HOMEPAGE=http://www.nongnu.org/maitretarot/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/maitretarot/maitretarot.pkg/0.1.98/maitretarot-0.1.98.tar.bz2
+_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=9c21397f37aedfe1bd6e816c082ad8c4
diff --git a/metadata/md5-cache/games-board/mt_dolphin_ia-0.1.98-r1 b/metadata/md5-cache/games-board/mt_dolphin_ia-0.1.98-r2
similarity index 51%
rename from metadata/md5-cache/games-board/mt_dolphin_ia-0.1.98-r1
rename to metadata/md5-cache/games-board/mt_dolphin_ia-0.1.98-r2
index a792520ce5fb..b0c39906ac24 100644
--- a/metadata/md5-cache/games-board/mt_dolphin_ia-0.1.98-r1
+++ b/metadata/md5-cache/games-board/mt_dolphin_ia-0.1.98-r2
@@ -1,11 +1,13 @@
-DEFINED_PHASES=-
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client
DESCRIPTION=client for the french tarot game maitretarot
-EAPI=6
+EAPI=7
HOMEPAGE=http://www.nongnu.org/maitretarot/
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client
SLOT=0
SRC_URI=https://savannah.nongnu.org/download/maitretarot/mt_dolphin_ia.pkg/0.1.98/mt_dolphin_ia-0.1.98.tar.bz2
-_md5_=12bc2a97f1d4a964add1e48fbcb8a1b0
+_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=79a860436e1a0d625d66921c8fde56a7
diff --git a/metadata/md5-cache/games-board/mt_ncurses_client-0.1.98-r1 b/metadata/md5-cache/games-board/mt_ncurses_client-0.1.98-r1
index 8bbd747c1019..6402f2acc41f 100644
--- a/metadata/md5-cache/games-board/mt_ncurses_client-0.1.98-r1
+++ b/metadata/md5-cache/games-board/mt_ncurses_client-0.1.98-r1
@@ -1,12 +1,13 @@
-DEFINED_PHASES=configure
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
DEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client sys-libs/ncurses:0
DESCRIPTION=client for the french tarot game maitretarot
-EAPI=6
+EAPI=7
HOMEPAGE=http://www.nongnu.org/maitretarot/
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 dev-libs/libxml2 dev-games/libmaitretarot dev-games/libmt_client sys-libs/ncurses:0
SLOT=0
SRC_URI=https://savannah.nongnu.org/download/maitretarot/mt_ncurses_client.pkg/0.1.98/mt_ncurses_client-0.1.98.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=d6651f28ed7c9b1757390e1cbfab0f49
+_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=f9e1a53713392ad247fe17feb66b411b
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 14441c0a3b6f..52edc9ccad5d 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/box2d-2.4.1 b/metadata/md5-cache/games-engines/box2d-2.4.1
index ddb1e303210e..d7bcf3d35b65 100644
--- a/metadata/md5-cache/games-engines/box2d-2.4.1
+++ b/metadata/md5-cache/games-engines/box2d-2.4.1
@@ -4,9 +4,9 @@ DESCRIPTION=C++ engine for simulating rigid bodies in 2D games
EAPI=7
HOMEPAGE=https://box2d.org/
IUSE=doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc64 ~x86
LICENSE=ZLIB
SLOT=0
SRC_URI=https://github.com/erincatto/Box2D/archive/v2.4.1.tar.gz -> box2d-2.4.1.tar.gz
_eclasses_=cmake 314a813be2f09820e8978cdee941e501 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=33bc99304920d930a60d83cca84c8907
+_md5_=e76e06e0c2f1f473358bd2c2c438639e
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 4164ce2a0937..775bca9e5a37 100644
Binary files a/metadata/md5-cache/games-roguelike/Manifest.gz and b/metadata/md5-cache/games-roguelike/Manifest.gz differ
diff --git a/metadata/md5-cache/games-roguelike/nethack-3.6.6 b/metadata/md5-cache/games-roguelike/nethack-3.6.6
index d4f6ae4f56a5..1469bbe60396 100644
--- a/metadata/md5-cache/games-roguelike/nethack-3.6.6
+++ b/metadata/md5-cache/games-roguelike/nethack-3.6.6
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig X? ( x11-apps/bdftopcf x11-apps/mkfontscale )
+BDEPEND=virtual/pkgconfig virtual/yacc X? ( x11-apps/bdftopcf x11-apps/mkfontscale )
DEFINED_PHASES=compile install postinst preinst prepare
DEPEND=acct-group/gamestat sys-libs/ncurses:0= X? ( x11-libs/libXaw x11-libs/libXpm x11-libs/libXt ) X? ( x11-base/xorg-proto )
DESCRIPTION=The ultimate old-school single player dungeon exploration game
@@ -11,4 +11,4 @@ RDEPEND=acct-group/gamestat sys-libs/ncurses:0= X? ( x11-libs/libXaw x11-libs/li
SLOT=0
SRC_URI=https://nethack.org/download/3.6.6/nethack-366-src.tgz -> nethack-3.6.6.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=0b44d75e1ff61a0ac26d8b2859b08646
+_md5_=e255945d50cd5cfb2fba83099c28a3e0
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 530f29c971e7..55ea4dc139d2 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2 b/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
deleted file mode 100644
index 343de14be0b7..000000000000
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.84-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=qpsmtpd is a flexible smtpd daemon written in Perl
-EAPI=5
-HOMEPAGE=http://smtpd.develooper.com
-IUSE=postfix ipv6 syslog
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://smtpd.develooper.com/files/qpsmtpd-0.84.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 unpacker 45b49db67094fdafbb6a16a2299e894b user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=3477be92730bd08ae9cea64f3c6f8fb0
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-0.95 b/metadata/md5-cache/mail-mta/qpsmtpd-0.95
index fd6756d6e68c..0c193a072414 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-0.95
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-0.95
@@ -1,13 +1,14 @@
+BDEPEND=dev-lang/perl
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
+DEPEND=dev-lang/perl
DESCRIPTION=qpsmtpd is a flexible smtpd daemon written in Perl
-EAPI=5
+EAPI=7
HOMEPAGE=https://smtpd.github.io/qpsmtpd/
IUSE=postfix ipv6 syslog
KEYWORDS=~amd64 ~x86
LICENSE=MIT
-RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=[-build(-)]
+RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=
SLOT=0
SRC_URI=https://github.com/smtpd/qpsmtpd/archive/v0.95.tar.gz -> qpsmtpd-0.95.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 unpacker 45b49db67094fdafbb6a16a2299e894b user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=24a680801f8e220f6256e29ba8717c9e
+_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=5e209fe64a3337a2549f1e87c2a852ab
diff --git a/metadata/md5-cache/mail-mta/qpsmtpd-9999 b/metadata/md5-cache/mail-mta/qpsmtpd-9999
index 670fb1754fe1..bbdba51378b3 100644
--- a/metadata/md5-cache/mail-mta/qpsmtpd-9999
+++ b/metadata/md5-cache/mail-mta/qpsmtpd-9999
@@ -1,12 +1,13 @@
+BDEPEND=dev-lang/perl >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-lang/perl:=[-build(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-lang/perl
DESCRIPTION=qpsmtpd is a flexible smtpd daemon written in Perl
-EAPI=5
+EAPI=7
HOMEPAGE=https://smtpd.github.io/qpsmtpd/
IUSE=postfix ipv6 syslog
LICENSE=MIT
PROPERTIES=live
-RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=[-build(-)]
+RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/Net-DNS-0.690.0 virtual/perl-MIME-Base64 dev-perl/MailTools dev-perl/IPC-Shareable dev-perl/Socket6 dev-perl/Danga-Socket dev-perl/ParaDNS dev-perl/UNIVERSAL-isa ipv6? ( dev-perl/IO-Socket-INET6 ) syslog? ( virtual/perl-Sys-Syslog ) virtual/inetd dev-lang/perl:=
SLOT=0
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e git-r3 3e7ec3d6619213460c85e2aa48398441 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 unpacker 45b49db67094fdafbb6a16a2299e894b user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=eeabca5b63ade4cfffa14292f4c6fc2a
+_eclasses_=git-r3 3e7ec3d6619213460c85e2aa48398441 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 6ec4c4d8fc8324200f1c14e8d158c59b perl-module 97206c028d9bdc9f248e022ac5c9fc83 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=5e209fe64a3337a2549f1e87c2a852ab
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index e750aa70780c..bc6d2ca11a87 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/comic-neue-2.3 b/metadata/md5-cache/media-fonts/comic-neue-2.3
index a60403aab487..d9157730f0fe 100644
--- a/metadata/md5-cache/media-fonts/comic-neue-2.3
+++ b/metadata/md5-cache/media-fonts/comic-neue-2.3
@@ -4,9 +4,9 @@ DESCRIPTION=Typographically savvy casual script typeface
EAPI=6
HOMEPAGE=http://comicneue.com
IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=OFL-1.1
SLOT=0
SRC_URI=http://comicneue.com/comic-neue-2.3.zip
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e font dd073b36fe3fd8b868c23bc23209db45 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=df8e0e6f946310d7e6017be1fa546cfa
+_md5_=93671429966c653688e96c587975ab38
diff --git a/metadata/md5-cache/media-fonts/fira-sans-4.202 b/metadata/md5-cache/media-fonts/fira-sans-4.202
index 2aa640de0df5..9f0299735a5e 100644
--- a/metadata/md5-cache/media-fonts/fira-sans-4.202
+++ b/metadata/md5-cache/media-fonts/fira-sans-4.202
@@ -4,10 +4,10 @@ DESCRIPTION=Default monospaced typeface for FirefoxOS, designed for legibility
EAPI=7
HOMEPAGE=https://mozilla.github.io/Fira
IUSE=+otf ttf X
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=OFL-1.1
REQUIRED_USE=|| ( otf ttf )
SLOT=0
SRC_URI=https://github.com/mozilla/Fira/archive/4.202.tar.gz -> Fira-4.202.tar.gz
_eclasses_=font dd073b36fe3fd8b868c23bc23209db45
-_md5_=e0cd00a8bb24d70efdd7193b6cad1744
+_md5_=152c4bd1f4bd0cf29facb4d155b09bdb
diff --git a/metadata/md5-cache/media-fonts/intlfonts-1.4.1 b/metadata/md5-cache/media-fonts/intlfonts-1.4.1
index 7d74bfd093d2..5f280d5cb577 100644
--- a/metadata/md5-cache/media-fonts/intlfonts-1.4.1
+++ b/metadata/md5-cache/media-fonts/intlfonts-1.4.1
@@ -5,9 +5,9 @@ DESCRIPTION=International X11 fixed fonts
EAPI=7
HOMEPAGE=https://www.gnu.org/directory/intlfonts.html
IUSE=bdf X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
LICENSE=public-domain HPND GPL-3+-with-font-exception
SLOT=0
SRC_URI=mirror://gnu/intlfonts/intlfonts-1.4.1.tar.gz
_eclasses_=font dd073b36fe3fd8b868c23bc23209db45
-_md5_=39a8a80b98b604bbdb8682f4e089a8fd
+_md5_=7ae777e8ebff450cd02db2b5888e13fc
diff --git a/metadata/md5-cache/media-fonts/open-sans-1-r1 b/metadata/md5-cache/media-fonts/open-sans-1-r1
index 5db3205a2f7b..ae130d5c0731 100644
--- a/metadata/md5-cache/media-fonts/open-sans-1-r1
+++ b/metadata/md5-cache/media-fonts/open-sans-1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Clean and modern sans-serif typeface designed for legibility across
EAPI=6
HOMEPAGE=https://www.opensans.com/
IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86
LICENSE=Apache-2.0
SLOT=0
SRC_URI=https://dev.gentoo.org/~jstein/dist/open-sans-1.zip
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e font dd073b36fe3fd8b868c23bc23209db45 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=3e3b52c907199e01572890a80c8ab2dc
+_md5_=445640f6fb2a0e66830b4ff681770d00
diff --git a/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2-r1 b/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2-r1
index 72ec4cc1bc81..bfb756b328ae 100644
--- a/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2-r1
+++ b/metadata/md5-cache/media-fonts/opendesktop-fonts-1.4.2-r1
@@ -4,9 +4,9 @@ DESCRIPTION=Chinese TrueType Fonts
EAPI=7
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 sparc x86
LICENSE=Arphic
SLOT=0
SRC_URI=mirror://gentoo/opendesktop-fonts-1.4.2.tar.gz
_eclasses_=font dd073b36fe3fd8b868c23bc23209db45
-_md5_=9a9af6fd1606ea40538991f3dee178df
+_md5_=969e7d82c26c32de6d9d433b6ee6d5e4
diff --git a/metadata/md5-cache/media-fonts/powerline-symbols-20150224 b/metadata/md5-cache/media-fonts/powerline-symbols-20150224
deleted file mode 100644
index bbd6a2cf2a9a..000000000000
--- a/metadata/md5-cache/media-fonts/powerline-symbols-20150224
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=OpenType Unicode font with symbols for Powerline/Airline
-EAPI=5
-HOMEPAGE=https://github.com/powerline/powerline
-IUSE=X
-KEYWORDS=amd64 ~arm x86
-LICENSE=MIT-with-advertising
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~yngwin/distfiles/powerline-symbols-20150224.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e font dd073b36fe3fd8b868c23bc23209db45 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=6db824a7730f22443c7f639794c66d1d
diff --git a/metadata/md5-cache/media-fonts/powerline-symbols-20170508 b/metadata/md5-cache/media-fonts/powerline-symbols-20170508
index e75101640f41..1ca97f66cee9 100644
--- a/metadata/md5-cache/media-fonts/powerline-symbols-20170508
+++ b/metadata/md5-cache/media-fonts/powerline-symbols-20170508
@@ -4,9 +4,9 @@ DESCRIPTION=OpenType Unicode font with symbols for Powerline/Airline
EAPI=6
HOMEPAGE=https://github.com/powerline/powerline
IUSE=X
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
LICENSE=MIT-with-advertising
SLOT=0
SRC_URI=https://dev.gentoo.org/~johu/distfiles/powerline-symbols-20170508.tar.xz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e font dd073b36fe3fd8b868c23bc23209db45 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=bbdce3809b5958dfb74cdb47ccecb578
+_md5_=7ab0db8c59db3f5840febb62b7347f48
diff --git a/metadata/md5-cache/media-fonts/source-han-sans-1.004 b/metadata/md5-cache/media-fonts/source-han-sans-1.004
index 28a1c871289f..a4e8c60e28b8 100644
--- a/metadata/md5-cache/media-fonts/source-han-sans-1.004
+++ b/metadata/md5-cache/media-fonts/source-han-sans-1.004
@@ -4,11 +4,11 @@ DESCRIPTION=Pan-CJK OpenType/CFF font family
EAPI=6
HOMEPAGE=https://github.com/adobe-fonts/source-han-sans/
IUSE=l10n_ja l10n_ko +l10n_zh-CN l10n_zh-TW X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos
LICENSE=Apache-2.0
REQUIRED_USE=|| ( l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW )
RESTRICT=binchecks strip
SLOT=0
SRC_URI=l10n_ja? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansJP.zip -> source-han-sans-ja-1.004.zip ) l10n_ko? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansKR.zip -> source-han-sans-ko-1.004.zip ) l10n_zh-CN? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansCN.zip -> source-han-sans-zh_CN-1.004.zip ) l10n_zh-TW? ( https://github.com/adobe-fonts/source-han-sans/raw/1.004R/SubsetOTF/SourceHanSansTW.zip -> source-han-sans-zh_TW-1.004.zip )
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e font dd073b36fe3fd8b868c23bc23209db45 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=eda47bbf799703d8e6d12c5f6d5a0e75
+_md5_=a4a4136460c3187d9d69fcda8df6e6d1
diff --git a/metadata/md5-cache/media-fonts/tex-gyre-2.005 b/metadata/md5-cache/media-fonts/tex-gyre-2.005
deleted file mode 100644
index ee507fe87827..000000000000
--- a/metadata/md5-cache/media-fonts/tex-gyre-2.005
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm setup
-DEPEND=app-arch/unzip X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DESCRIPTION=Extensive remake of freely available URW fonts
-EAPI=5
-HOMEPAGE=http://www.gust.org.pl/projects/e-foundry/tex-gyre
-IUSE=X
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa x86
-LICENSE=|| ( GFL LPPL-1.3c )
-SLOT=0
-SRC_URI=http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-2.005otf.zip
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e font dd073b36fe3fd8b868c23bc23209db45 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=95de3c152f553ca097177671f9160015
diff --git a/metadata/md5-cache/media-fonts/tex-gyre-2.501 b/metadata/md5-cache/media-fonts/tex-gyre-2.501
index 80b1f88fd835..144d37c9dac7 100644
--- a/metadata/md5-cache/media-fonts/tex-gyre-2.501
+++ b/metadata/md5-cache/media-fonts/tex-gyre-2.501
@@ -5,9 +5,9 @@ DESCRIPTION=Extensive remake of freely available URW fonts
EAPI=7
HOMEPAGE=http://www.gust.org.pl/projects/e-foundry/tex-gyre
IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa x86
LICENSE=|| ( GFL LPPL-1.3c )
SLOT=0
SRC_URI=http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg2_501otf.zip
_eclasses_=font dd073b36fe3fd8b868c23bc23209db45
-_md5_=8ff49c0ac051b88eac2017d237ae47cc
+_md5_=9f9e629fe543e88b4ed4864937bb16b3
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 110c3a491e1d..e298a720e02e 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/gif2png-2.5.12 b/metadata/md5-cache/media-gfx/gif2png-2.5.12
deleted file mode 100644
index b7e49df92043..000000000000
--- a/metadata/md5-cache/media-gfx/gif2png-2.5.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/libpng-1.2:0= sys-libs/zlib:=
-DESCRIPTION=Converts images from gif format to png format
-EAPI=7
-HOMEPAGE=http://catb.org/~esr/gif2png/
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=ZLIB
-RDEPEND=>=media-libs/libpng-1.2:0= sys-libs/zlib:=
-SLOT=0
-SRC_URI=http://catb.org/~esr/gif2png/gif2png-2.5.12.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=69de5fea0ac4f27dfc58f600c5bd0f96
diff --git a/metadata/md5-cache/media-gfx/gif2png-2.5.9 b/metadata/md5-cache/media-gfx/gif2png-2.5.9
deleted file mode 100644
index 8ade87363f4d..000000000000
--- a/metadata/md5-cache/media-gfx/gif2png-2.5.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=media-libs/libpng-1.2:0 sys-libs/zlib
-DESCRIPTION=Converts images from gif format to png format
-EAPI=5
-HOMEPAGE=http://catb.org/~esr/gif2png/
-KEYWORDS=amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=ZLIB
-RDEPEND=>=media-libs/libpng-1.2:0 sys-libs/zlib
-SLOT=0
-SRC_URI=http://catb.org/~esr/gif2png/gif2png-2.5.9.tar.gz
-_md5_=aaa5a9c947a2e07abe0fa274a5c99e64
diff --git a/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2 b/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2
index 009ee803428d..97d5e0b1da3b 100644
--- a/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2
+++ b/metadata/md5-cache/media-gfx/gpicview-0.2.5-r2
@@ -1,5 +1,5 @@
-DEFINED_PHASES=configure
-DEPEND=virtual/jpeg:0 x11-libs/gtk+:3 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig
+DEFINED_PHASES=configure postinst postrm preinst prepare
+DEPEND=virtual/jpeg:0 x11-libs/gtk+:3 >=dev-util/intltool-0.40 sys-devel/gettext virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=A Simple and Fast Image Viewer for X
EAPI=7
HOMEPAGE=http://lxde.sourceforge.net/gpicview
@@ -8,5 +8,5 @@ LICENSE=GPL-2
RDEPEND=virtual/jpeg:0 x11-libs/gtk+:3
SLOT=0
SRC_URI=mirror://sourceforge/lxde/gpicview-0.2.5.tar.xz
-_eclasses_=xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=f755beb3622154bbcb6f6d9e81d349b6
+_eclasses_=xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=73daad87d5fb06ad163c0962feb11f91
diff --git a/metadata/md5-cache/media-gfx/libimagequant-2.12.2 b/metadata/md5-cache/media-gfx/libimagequant-2.12.2
deleted file mode 100644
index 18cb04066177..000000000000
--- a/metadata/md5-cache/media-gfx/libimagequant-2.12.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install pretend
-DESCRIPTION=Palette quantization library that powers pngquant and other PNG optimizers
-EAPI=7
-HOMEPAGE=https://pngquant.org/lib/
-IUSE=cpu_flags_x86_sse2 debug openmp static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-SLOT=0/0
-SRC_URI=https://github.com/ImageOptim/libimagequant/archive/2.12.2.tar.gz -> libimagequant-2.12.2.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=db118cde9ea818e3e83677c8940fbfcd
diff --git a/metadata/md5-cache/media-gfx/sane-backends-1.0.31 b/metadata/md5-cache/media-gfx/sane-backends-1.0.31
index 34bf18bfb936..66f7d1c76797 100644
--- a/metadata/md5-cache/media-gfx/sane-backends-1.0.31
+++ b/metadata/md5-cache/media-gfx/sane-backends-1.0.31
@@ -5,11 +5,11 @@ DESCRIPTION=Scanner Access Now Easy - Backends
EAPI=7
HOMEPAGE=http://www.sane-project.org/
IUSE=gphoto2 ipv6 snmp systemd threads usb v4l xinetd +zeroconf +sane_backends_abaton +sane_backends_agfafocus +sane_backends_apple +sane_backends_artec +sane_backends_artec_eplus48u +sane_backends_as6e +sane_backends_avision +sane_backends_bh +sane_backends_canon +sane_backends_canon630u +sane_backends_canon_dr +sane_backends_canon_lide70 sane_backends_canon_pp +sane_backends_cardscan +sane_backends_coolscan +sane_backends_coolscan2 +sane_backends_coolscan3 +sane_backends_dc210 +sane_backends_dc240 +sane_backends_dc25 +sane_backends_dell1600n_net +sane_backends_dmc +sane_backends_epjitsu +sane_backends_epson +sane_backends_epson2 +sane_backends_escl +sane_backends_fujitsu +sane_backends_genesys +sane_backends_gt68xx +sane_backends_hp +sane_backends_hp3500 +sane_backends_hp3900 +sane_backends_hp4200 +sane_backends_hp5400 +sane_backends_hp5590 +sane_backends_hpljm1005 sane_backends_hpsj5s +sane_backends_hs2p +sane_backends_ibm +sane_backends_kodak +sane_backends_kodakaio +sane_backends_kvs1025 +sane_backends_kvs20xx sane_backends_kvs40xx +sane_backends_leo +sane_backends_lexmark +sane_backends_ma1509 +sane_backends_magicolor +sane_backends_matsushita +sane_backends_microtek +sane_backends_microtek2 +sane_backends_mustek sane_backends_mustek_pp +sane_backends_mustek_usb sane_backends_mustek_usb2 +sane_backends_nec +sane_backends_net +sane_backends_niash +sane_backends_p5 +sane_backends_pie +sane_backends_pieusb +sane_backends_pixma +sane_backends_plustek +sane_backends_plustek_pp sane_backends_pnm +sane_backends_qcam +sane_backends_ricoh +sane_backends_ricoh2 +sane_backends_rts8891 +sane_backends_s9036 +sane_backends_sceptre +sane_backends_sharp +sane_backends_sm3600 +sane_backends_sm3840 +sane_backends_snapscan +sane_backends_sp15c +sane_backends_st400 +sane_backends_stv680 +sane_backends_tamarack +sane_backends_teco1 +sane_backends_teco2 +sane_backends_teco3 +sane_backends_test +sane_backends_u12 +sane_backends_umax +sane_backends_umax1220u +sane_backends_umax_pp +sane_backends_xerox_mfp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2 public-domain
RDEPEND=gphoto2? ( >=media-libs/libgphoto2-2.5.3.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_canon_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc210? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dc240? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_dell1600n_net? ( >=media-libs/tiff-3.9.7-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_escl? ( app-text/poppler[cairo] || ( net-dns/avahi[dbus] net-dns/avahi[gtk] net-dns/avahi[gtk2] ) net-dns/avahi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-misc/curl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_hpsj5s? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_mustek_pp? ( >=sys-libs/libieee1284-0.2.11-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sane_backends_pixma? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snmp? ( net-analyzer/net-snmp:0= ) systemd? ( sys-apps/systemd:0= ) usb? ( >=virtual/libusb-1-r1:1=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinetd? ( sys-apps/xinetd ) zeroconf? ( >=net-dns/avahi-0.6.31-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
REQUIRED_USE=sane_backends_escl? ( zeroconf ) sane_backends_kvs40xx? ( threads ) sane_backends_mustek_usb2? ( threads )
SLOT=0
SRC_URI=https://gitlab.com/sane-project/backends/-/archive/1.0.31/backends-1.0.31.tar.gz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 optfeature 6a2add34e06e5a05d88471a33ccdd73e python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=349b07fe5ff74f99ca4dcc07c40ff814
+_md5_=23e31941fe7ec01063fd44bfbb483264
diff --git a/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2 b/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2
deleted file mode 100644
index 46211a761d12..000000000000
--- a/metadata/md5-cache/media-gfx/tuxpaint-0.9.21-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext )
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=app-text/libpaper dev-libs/fribidi gnome-base/librsvg:2 >=media-libs/libpng-1.2:0= >=media-libs/freetype-2:2 media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf x11-libs/cairo
-DESCRIPTION=Drawing program designed for young children
-EAPI=7
-HOMEPAGE=http://www.tuxpaint.org/
-IUSE=nls
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=app-text/libpaper dev-libs/fribidi gnome-base/librsvg:2 >=media-libs/libpng-1.2:0= >=media-libs/freetype-2:2 media-libs/libsdl media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-pango media-libs/sdl-ttf x11-libs/cairo
-SLOT=0
-SRC_URI=mirror://sourceforge/tuxpaint/tuxpaint-0.9.21.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=8bab7c015fe8f7b640eabd2f25f24e2d
diff --git a/metadata/md5-cache/media-gfx/wings-2.1.5 b/metadata/md5-cache/media-gfx/wings-2.1.5
deleted file mode 100644
index 800a2e072150..000000000000
--- a/metadata/md5-cache/media-gfx/wings-2.1.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-DESCRIPTION=Wings 3D is an advanced subdivision modeler
-EAPI=6
-HOMEPAGE=http://www.wings3d.com/
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/wings/wings-2.1.5.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=c30cee58ba2be6930e7b7e21acb85d30
diff --git a/metadata/md5-cache/media-gfx/wings-2.1.6 b/metadata/md5-cache/media-gfx/wings-2.1.6
deleted file mode 100644
index 6691151ca9eb..000000000000
--- a/metadata/md5-cache/media-gfx/wings-2.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-DESCRIPTION=Wings 3D is an advanced subdivision modeler
-EAPI=6
-HOMEPAGE=http://www.wings3d.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/wings/wings-2.1.6.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=5736734a832793a1c30a88b412f047af
diff --git a/metadata/md5-cache/media-gfx/wings-2.1.7 b/metadata/md5-cache/media-gfx/wings-2.1.7
deleted file mode 100644
index cc2650eaaac3..000000000000
--- a/metadata/md5-cache/media-gfx/wings-2.1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-DESCRIPTION=Wings 3D is an advanced subdivision modeler
-EAPI=6
-HOMEPAGE=http://www.wings3d.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/wings/wings-2.1.7.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=5736734a832793a1c30a88b412f047af
diff --git a/metadata/md5-cache/media-gfx/wings-2.2.5 b/metadata/md5-cache/media-gfx/wings-2.2.5
deleted file mode 100644
index bb97efd0aa0c..000000000000
--- a/metadata/md5-cache/media-gfx/wings-2.2.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-DESCRIPTION=Wings 3D is an advanced subdivision modeler
-EAPI=7
-HOMEPAGE=http://www.wings3d.com/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>dev-lang/erlang-21[wxwidgets] dev-libs/cl media-libs/glu media-libs/libsdl[opengl] virtual/opengl
-SLOT=0
-SRC_URI=mirror://sourceforge/wings/wings-2.2.5.tar.bz2
-_md5_=31fd38c19e96774fbfe5f8453808118c
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 29079ef6af83..fd69a97740ce 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/bcg729-1.1.1 b/metadata/md5-cache/media-libs/bcg729-1.1.1
index 272137a2ec97..e9e9ed1d43a7 100644
--- a/metadata/md5-cache/media-libs/bcg729-1.1.1
+++ b/metadata/md5-cache/media-libs/bcg729-1.1.1
@@ -1,6 +1,6 @@
BDEPEND=test? ( app-arch/unzip ) dev-util/ninja dev-util/cmake
DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=encoder and decoder of the ITU G729 Annex A/B speech codec
+DESCRIPTION=Encoder and decoder of the ITU G729 Annex A/B speech codec
EAPI=7
HOMEPAGE=https://github.com/BelledonneCommunications/bcg729
IUSE=test
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/BelledonneCommunications/bcg729/archive/1.1.1.tar.gz -> bcg729-1.1.1.tar.gz test? ( http://www.belledonne-communications.com/bc-downloads/bcg729-patterns.zip -> bcg729-tests-20210101.zip )
_eclasses_=cmake 314a813be2f09820e8978cdee941e501 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9972ce8cfbc357bf73a86934c1131a9
+_md5_=61591454680bca2bf4bc83032f015b00
diff --git a/metadata/md5-cache/media-libs/glew-2.1.0-r1 b/metadata/md5-cache/media-libs/glew-2.1.0-r1
deleted file mode 100644
index a69a732621f9..000000000000
--- a/metadata/md5-cache/media-libs/glew-2.1.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=The OpenGL Extension Wrangler Library
-EAPI=7
-HOMEPAGE=http://glew.sourceforge.net/
-IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD MIT
-RDEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/2.1
-SRC_URI=mirror://sourceforge/glew/glew-2.1.0.tgz
-_eclasses_=multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=9c20bd90771599bda20430304ed9c657
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.7.2 b/metadata/md5-cache/media-libs/harfbuzz-2.7.2
deleted file mode 100644
index 83f9daf429c4..000000000000
--- a/metadata/md5-cache/media-libs/harfbuzz-2.7.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34 test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) )
-DESCRIPTION=An OpenType text shaping engine
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
-IUSE=+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Old-MIT ISC icu
-RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=introspection? ( glib )
-RESTRICT=!test? ( test )
-SLOT=0/0.9.18
-SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/2.7.2.tar.gz -> harfbuzz-2.7.2.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e meson e43eef9331f54965a573ed380854ff47 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=47aeff17c669aefff29b78d01c55e67c
diff --git a/metadata/md5-cache/media-libs/harfbuzz-2.7.3 b/metadata/md5-cache/media-libs/harfbuzz-2.8.0
similarity index 87%
rename from metadata/md5-cache/media-libs/harfbuzz-2.7.3
rename to metadata/md5-cache/media-libs/harfbuzz-2.8.0
index 11d61980c240..420a8bb8e250 100644
--- a/metadata/md5-cache/media-libs/harfbuzz-2.7.3
+++ b/metadata/md5-cache/media-libs/harfbuzz-2.8.0
@@ -1,6 +1,6 @@
-BDEPEND=virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+BDEPEND=|| ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) virtual/pkgconfig doc? ( dev-util/gtk-doc ) introspection? ( dev-util/glib-utils ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34 test? ( || ( dev-lang/python:3.8 dev-lang/python:3.7 ) )
+DEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) graphite? ( >=media-gfx/graphite2-1.2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-51.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.34:= ) truetype? ( >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-libs/gobject-introspection-common-1.34
DESCRIPTION=An OpenType text shaping engine
EAPI=7
HOMEPAGE=https://www.freedesktop.org/wiki/Software/HarfBuzz
@@ -11,6 +11,6 @@ RDEPEND=cairo? ( x11-libs/cairo:= ) glib? ( >=dev-libs/glib-2.38:2[abi_x86_32(-)
REQUIRED_USE=introspection? ( glib )
RESTRICT=!test? ( test )
SLOT=0/0.9.18
-SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/2.7.3.tar.gz -> harfbuzz-2.7.3.tar.gz
+SRC_URI=https://github.com/harfbuzz/harfbuzz/archive/2.8.0.tar.gz -> harfbuzz-2.8.0.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e meson e43eef9331f54965a573ed380854ff47 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=238756bbeb423d935ccb2a251fe9624a
+_md5_=7bafdf157bd8dbe9eb7a2ae9497b4e69
diff --git a/metadata/md5-cache/media-libs/libnspsl-0.1.3-r2 b/metadata/md5-cache/media-libs/libnspsl-0.1.3-r2
deleted file mode 100644
index 8ce1b35d7cb2..000000000000
--- a/metadata/md5-cache/media-libs/libnspsl-0.1.3-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-util/netsurf-buildsystem virtual/pkgconfig
-DESCRIPTION=decoding library for BMP and ICO image file formats, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-SLOT=0/0.1.3
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libnspsl-0.1.3-src.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e netsurf 8d6ce5a28a5af61bfb3a264ac8d46867 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=ac3d62ff8eb44a2eba00fa8fcf33fcf9
diff --git a/metadata/md5-cache/media-libs/libnspsl-0.1.5-r1 b/metadata/md5-cache/media-libs/libnspsl-0.1.5-r1
deleted file mode 100644
index cb69678d45d3..000000000000
--- a/metadata/md5-cache/media-libs/libnspsl-0.1.5-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=dev-util/netsurf-buildsystem virtual/pkgconfig
-DEFINED_PHASES=compile install
-DESCRIPTION=decoding library for BMP and ICO image file formats, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-SLOT=0/0.1.5
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libnspsl-0.1.5-src.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e netsurf 8d6ce5a28a5af61bfb3a264ac8d46867 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=155fb2ad06b9cd8c5710b1dfae2dd1c2
diff --git a/metadata/md5-cache/media-libs/libopenaptx-0.2.0 b/metadata/md5-cache/media-libs/libopenaptx-0.2.0
new file mode 100644
index 000000000000..384a03127b9e
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libopenaptx-0.2.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Reverse-engineered aptX and aptX HD library
+EAPI=7
+HOMEPAGE=https://github.com/pali/libopenaptx
+IUSE=cpu_flags_x86_avx2
+KEYWORDS=~amd64
+LICENSE=LGPL-2.1+
+SLOT=0
+SRC_URI=https://github.com/pali/libopenaptx/archive/0.2.0.tar.gz -> libopenaptx-0.2.0.tar.gz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=ee53332191fadf36108aef394ed3764f
diff --git a/metadata/md5-cache/media-libs/libopenaptx-9999 b/metadata/md5-cache/media-libs/libopenaptx-9999
new file mode 100644
index 000000000000..4c8f0817d1e7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libopenaptx-9999
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Reverse-engineered aptX and aptX HD library
+EAPI=7
+HOMEPAGE=https://github.com/pali/libopenaptx
+IUSE=cpu_flags_x86_avx2
+LICENSE=LGPL-2.1+
+PROPERTIES=live
+SLOT=0
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 git-r3 3e7ec3d6619213460c85e2aa48398441 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=ee53332191fadf36108aef394ed3764f
diff --git a/metadata/md5-cache/media-libs/suil-0.10.10 b/metadata/md5-cache/media-libs/suil-0.10.10
index fe830dd825e7..538c6e32aee5 100644
--- a/metadata/md5-cache/media-libs/suil-0.10.10
+++ b/metadata/md5-cache/media-libs/suil-0.10.10
@@ -5,10 +5,10 @@ DESCRIPTION=Lightweight C library for loading and wrapping LV2 plugin UIs
EAPI=7
HOMEPAGE=http://drobilla.net/software/suil/
IUSE=doc gtk qt5
-KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm64 ppc ppc64 ~x86
LICENSE=ISC
RDEPEND=media-libs/lv2 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 )
SLOT=0
SRC_URI=http://download.drobilla.net/suil-0.10.10.tar.bz2
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 waf-utils 0a6e492cdcbd52b1304cfcd9eba5abc6 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=ede93b607bf20390d5d80ce75dbdcb6d
+_md5_=91f8e657cf53bed2c601fbbeda673d57
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index 40a8ed6dd5ac..d5fe2df4b8c6 100644
Binary files a/metadata/md5-cache/media-radio/Manifest.gz and b/metadata/md5-cache/media-radio/Manifest.gz differ
diff --git a/metadata/md5-cache/media-radio/cqrlog-2.1.0-r2 b/metadata/md5-cache/media-radio/cqrlog-2.1.0-r2
deleted file mode 100644
index 3ab4a647432d..000000000000
--- a/metadata/md5-cache/media-radio/cqrlog-2.1.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-lang/lazarus-1.6.4 >=dev-lang/fpc-3.0.2
-DESCRIPTION=CQRLOG is an advanced ham radio logger based on MySQL database.
-EAPI=6
-HOMEPAGE=https://www.cqrlog.com/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lazarus-1.6.4 >=dev-lang/fpc-3.0.2 virtual/mysql[server] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ x11-libs/libX11 x11-libs/pango
-SLOT=0
-SRC_URI=https://github.com/ok2cqr/cqrlog/archive/v2.1.0.tar.gz -> cqrlog-2.1.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=7dca9cfde3eed7062ea95cd295634921
diff --git a/metadata/md5-cache/media-radio/cqrlog-2.3.0 b/metadata/md5-cache/media-radio/cqrlog-2.3.0
deleted file mode 100644
index a6690f10ebbb..000000000000
--- a/metadata/md5-cache/media-radio/cqrlog-2.3.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-lang/lazarus-1.8.0 >=dev-lang/fpc-3.0.2
-DESCRIPTION=CQRLOG is an advanced ham radio logger based on MySQL database.
-EAPI=6
-HOMEPAGE=https://www.cqrlog.com/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lazarus-1.8.0 >=dev-lang/fpc-3.0.2 virtual/mysql[server] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ x11-libs/libX11 x11-libs/pango
-SLOT=0
-SRC_URI=https://github.com/ok2cqr/cqrlog/archive/v2.3.0.tar.gz -> cqrlog-2.3.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=a30e08538f3ec26371531153032d52ad
diff --git a/metadata/md5-cache/media-radio/cqrlog-2.3.0-r1 b/metadata/md5-cache/media-radio/cqrlog-2.3.0-r1
deleted file mode 100644
index e5262e2f385e..000000000000
--- a/metadata/md5-cache/media-radio/cqrlog-2.3.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=dev-lang/lazarus-1.8.0 >=dev-lang/fpc-3.0.2
-DESCRIPTION=CQRLOG is an advanced ham radio logger based on MySQL database.
-EAPI=6
-HOMEPAGE=https://www.cqrlog.com/
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/lazarus-1.8.0 >=dev-lang/fpc-3.0.2 virtual/mysql[server] dev-libs/atk dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+ x11-libs/libX11 x11-libs/pango
-SLOT=0
-SRC_URI=https://github.com/ok2cqr/cqrlog/archive/v2.3.0.tar.gz -> cqrlog-2.3.0.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=c56dfffbb55e8d82ef81a9cba3f31046
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 5446c6f07973..b93e507d852e 100644
Binary files a/metadata/md5-cache/media-sound/Manifest.gz and b/metadata/md5-cache/media-sound/Manifest.gz differ
diff --git a/metadata/md5-cache/media-sound/aqualung-1.0-r5 b/metadata/md5-cache/media-sound/aqualung-1.0-r5
deleted file mode 100644
index fb0d9c9a7a8d..000000000000
--- a/metadata/md5-cache/media-sound/aqualung-1.0-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( dev-lang/lua:0= ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Music player for a wide range of formats designed for gapless playback
-EAPI=7
-HOMEPAGE=http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung
-IUSE=alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( dev-lang/lua:0= ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack )
-SLOT=0
-SRC_URI=mirror://sourceforge/aqualung/aqualung-1.0.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=b8f23437e3f0323a9f98459c7f0bb93c
diff --git a/metadata/md5-cache/media-sound/aqualung-1.1-r1 b/metadata/md5-cache/media-sound/aqualung-1.1-r1
deleted file mode 100644
index 5eedd09c42d7..000000000000
--- a/metadata/md5-cache/media-sound/aqualung-1.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare
-DEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( dev-lang/lua:0= ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Music player for a wide range of formats designed for gapless playback
-EAPI=7
-HOMEPAGE=http://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung
-IUSE=alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 dev-libs/libxml2 sys-libs/zlib x11-libs/gtk+:2 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( virtual/jack ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( dev-lang/lua:0= ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) wavpack? ( media-sound/wavpack )
-SLOT=0
-SRC_URI=https://github.com/jeremyevans/aqualung/releases/download/1.1/aqualung-1.1.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=523b162983eacc0cddd59814f2b0c744
diff --git a/metadata/md5-cache/media-sound/puddletag-2.0.1 b/metadata/md5-cache/media-sound/puddletag-2.0.1
new file mode 100644
index 000000000000..3cfeb65b186d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/puddletag-2.0.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Audio tag editor
+EAPI=7
+HOMEPAGE=http://docs.puddletag.net/
+IUSE=acoustid quodlibet python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-3
+RDEPEND=>=dev-python/configobj-5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-2.4.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/PyQt5-5.15.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),svg] >=media-libs/mutagen-1.45.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] acoustid? ( >=media-libs/chromaprint-1.4.3 ) quodlibet? ( >=media-sound/quodlibet-4.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/sip-4.19.22:0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/lxml-4.5.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/puddletag/puddletag/releases/download/2.0.1/puddletag-2.0.1.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=d146ead5574c75d70956c5b1f5dbede5
diff --git a/metadata/md5-cache/media-sound/pulseeffects-5.0.0-r1 b/metadata/md5-cache/media-sound/pulseeffects-5.0.2
similarity index 92%
rename from metadata/md5-cache/media-sound/pulseeffects-5.0.0-r1
rename to metadata/md5-cache/media-sound/pulseeffects-5.0.2
index dad5dd6a3e7c..e68b54da417c 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-5.0.0-r1
+++ b/metadata/md5-cache/media-sound/pulseeffects-5.0.2
@@ -5,10 +5,10 @@ DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects fo
EAPI=7
HOMEPAGE=https://github.com/wwmm/pulseeffects
IUSE=bs2b calf rubberband
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
LICENSE=GPL-3
RDEPEND=>=dev-libs/boost-1.41:= >=dev-cpp/glibmm-2.56.0:2 >=dev-cpp/gtkmm-3.24:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.24[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-video/pipewire[gstreamer] sys-apps/dbus
SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v5.0.0.tar.gz -> pulseeffects-5.0.0.tar.gz
+SRC_URI=https://github.com/wwmm/pulseeffects/archive/v5.0.2.tar.gz -> pulseeffects-5.0.2.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e meson e43eef9331f54965a573ed380854ff47 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=43ce058728f07c1bc1d7029b13a43154
+_md5_=15152a1ccf174f39b7ba8a6ae904551f
diff --git a/metadata/md5-cache/media-sound/sonic-visualiser-4.2 b/metadata/md5-cache/media-sound/sonic-visualiser-4.2
deleted file mode 100644
index 7dffd18c3c62..000000000000
--- a/metadata/md5-cache/media-sound/sonic-visualiser-4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-qt/qttest:5 sys-devel/autoconf-archive virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst postrm preinst prepare test
-DEPEND=app-arch/bzip2 >=dev-libs/capnproto-0.6:= dev-libs/serd dev-libs/sord dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib media-libs/dssi media-libs/ladspa-sdk media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/rubberband media-libs/speex media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) ogg? ( media-libs/libfishsound media-libs/liboggz ) opus? ( media-libs/opusfile ) osc? ( media-libs/liblo ) portaudio? ( >=media-libs/portaudio-19 ) pulseaudio? ( media-sound/pulseaudio ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Music audio files viewer and analiser
-EAPI=7
-HOMEPAGE=https://www.sonicvisualiser.org/
-IUSE=id3tag jack mad ogg opus osc +portaudio pulseaudio test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 >=dev-libs/capnproto-0.6:= dev-libs/serd dev-libs/sord dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib media-libs/dssi media-libs/ladspa-sdk media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/rubberband media-libs/speex media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) ogg? ( media-libs/libfishsound media-libs/liboggz ) opus? ( media-libs/opusfile ) osc? ( media-libs/liblo ) portaudio? ( >=media-libs/portaudio-19 ) pulseaudio? ( media-sound/pulseaudio )
-REQUIRED_USE=|| ( jack pulseaudio portaudio ) test? ( id3tag mad )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://code.soundsoftware.ac.uk/attachments/download/2755/sonic-visualiser-4.2.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=b11ac6ecda4f6c3763c91530d77e929d
diff --git a/metadata/md5-cache/media-sound/sonic-visualiser-4.3 b/metadata/md5-cache/media-sound/sonic-visualiser-4.3
index d1b7b86a0c52..234bbd77f790 100644
--- a/metadata/md5-cache/media-sound/sonic-visualiser-4.3
+++ b/metadata/md5-cache/media-sound/sonic-visualiser-4.3
@@ -5,7 +5,7 @@ DESCRIPTION=Music audio files viewer and analiser
EAPI=7
HOMEPAGE=https://www.sonicvisualiser.org/ https://github.com/sonic-visualiser/sonic-visualiser
IUSE=id3tag jack mad ogg opus osc +portaudio pulseaudio test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=app-arch/bzip2 dev-libs/capnproto:= dev-libs/serd dev-libs/sord dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/alsa-lib media-libs/dssi media-libs/ladspa-sdk media-libs/liblrdf media-libs/libsamplerate media-libs/libsndfile media-libs/rubberband media-libs/speex media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= id3tag? ( media-libs/libid3tag ) jack? ( virtual/jack ) mad? ( media-libs/libmad ) ogg? ( media-libs/libfishsound media-libs/liboggz ) opus? ( media-libs/opusfile ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio )
REQUIRED_USE=|| ( jack pulseaudio portaudio ) test? ( id3tag mad )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://dev.gentoo.org/~fordfrog/distfiles/sonic-visualiser-4.3.tar.gz
_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 meson e43eef9331f54965a573ed380854ff47 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=4435e5b9efd9b56d0d07028b8c7b2007
+_md5_=8604ffdb134c633a03a8268b8c03ea60
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index ef866652136c..0ad4e2f43aaa 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/mjpegtools-2.2.0 b/metadata/md5-cache/media-video/mjpegtools-2.2.0
new file mode 100644
index 000000000000..153e59746b85
--- /dev/null
+++ b/metadata/md5-cache/media-video/mjpegtools-2.2.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dv? ( >=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) quicktime? ( >=media-libs/libquicktime-1.2.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdlgfx? ( media-libs/sdl-gfx ) ) >=sys-apps/sed-4 virtual/awk cpu_flags_x86_mmx? ( dev-lang/nasm )
+DESCRIPTION=Tools for MJPEG video
+EAPI=7
+HOMEPAGE=http://mjpeg.sourceforge.net/
+IUSE=cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dv? ( >=media-libs/libdv-1.0.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0= ) quicktime? ( >=media-libs/libquicktime-1.2.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( >=media-libs/libsdl-1.2.15-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sdlgfx? ( media-libs/sdl-gfx ) )
+REQUIRED_USE=sdlgfx? ( sdl )
+SLOT=1
+SRC_URI=mirror://sourceforge/mjpeg/mjpegtools-2.2.0.tar.bz2
+_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=335903e5cffd0f464c6d300f5b0d9b57
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.20 b/metadata/md5-cache/media-video/pipewire-0.3.20
deleted file mode 100644
index 7613b1ba9cca..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.20
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 ) vulkan? ( dev-util/vulkan-headers )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://github.com/PipeWire/pipewire/archive/0.3.20.tar.gz -> pipewire-0.3.20.tar.gz
-_eclasses_=meson e43eef9331f54965a573ed380854ff47 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=5062bd8db3bdc89ca651d78370b8ea08
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.21 b/metadata/md5-cache/media-video/pipewire-0.3.21
deleted file mode 100644
index 53c4ae36bb40..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.21
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-doc/xmltoman doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 ) vulkan? ( dev-util/vulkan-headers )
-DESCRIPTION=Multimedia processing graphs
-EAPI=7
-HOMEPAGE=https://pipewire.org/
-IUSE=bluetooth debug doc ffmpeg gstreamer jack pulseaudio systemd test vulkan X
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=media-libs/alsa-lib-1.1.7 media-libs/libsdl2 >=media-libs/libsndfile-1.0.20 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-11.1 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 )
-RESTRICT=!test? ( test )
-SLOT=0/0.3
-SRC_URI=https://github.com/PipeWire/pipewire/archive/0.3.21.tar.gz -> pipewire-0.3.21.tar.gz
-_eclasses_=meson e43eef9331f54965a573ed380854ff47 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=5062bd8db3bdc89ca651d78370b8ea08
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.22 b/metadata/md5-cache/media-video/pipewire-0.3.22
index d68475b04551..370a8b343e3b 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.22
+++ b/metadata/md5-cache/media-video/pipewire-0.3.22
@@ -5,11 +5,11 @@ DESCRIPTION=Multimedia processing graphs
EAPI=7
HOMEPAGE=https://pipewire.org/
IUSE=bluetooth debug doc ffmpeg gstreamer jack sdl sndfile systemd test vulkan X
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ~ppc64 ~x86
LICENSE=LGPL-2.1+
RDEPEND=>=media-libs/alsa-lib-1.1.7 sys-apps/dbus virtual/libudev bluetooth? ( media-libs/sbc net-wireless/bluez:= ) ffmpeg? ( media-video/ffmpeg:= ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack? ( >=media-sound/jack2-1.9.10:2 ) sdl? ( media-libs/libsdl2 ) sndfile? ( >=media-libs/libsndfile-1.0.20 ) systemd? ( sys-apps/systemd ) vulkan? ( media-libs/vulkan-loader ) X? ( x11-libs/libX11 )
RESTRICT=!test? ( test )
SLOT=0/0.3
SRC_URI=https://github.com/PipeWire/pipewire/archive/0.3.22.tar.gz -> pipewire-0.3.22.tar.gz
_eclasses_=meson e43eef9331f54965a573ed380854ff47 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=8a4ed156acfbefbcdbb007a58e0c1dfa
+_md5_=fed524e4f84b11f61fbbf829e7ab15e0
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index ef6d7f91f2c5..4e3658c2d30f 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/arpwatch-3.1-r2 b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r2
index b46876e94dd7..d21ff9a6a398 100644
--- a/metadata/md5-cache/net-analyzer/arpwatch-3.1-r2
+++ b/metadata/md5-cache/net-analyzer/arpwatch-3.1-r2
@@ -5,10 +5,10 @@ DESCRIPTION=An ethernet monitor program that keeps track of ethernet/IP address
EAPI=7
HOMEPAGE=https://ee.lbl.gov/
IUSE=selinux
-KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
+KEYWORDS=amd64 ~hppa ~ppc sparc x86
LICENSE=BSD GPL-2
RDEPEND=net-libs/libpcap sys-libs/ncurses:* selinux? ( sec-policy/selinux-arpwatch ) virtual/mta
SLOT=0
SRC_URI=https://ee.lbl.gov/downloads/arpwatch/arpwatch-3.1.tar.gz https://dev.gentoo.org/~jer/ethercodes.dat-20200628.xz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=ec987726bc930208bb33455d57843133
+_md5_=3ea4df0ae8e593a68c877b3d07ba6b4f
diff --git a/metadata/md5-cache/net-analyzer/check_mk_agent-1.2.8_p27 b/metadata/md5-cache/net-analyzer/check_mk_agent-1.2.8_p27
deleted file mode 100644
index 0122bd4cf86d..000000000000
--- a/metadata/md5-cache/net-analyzer/check_mk_agent-1.2.8_p27
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=!!net-analyzer/check_mk app-shells/bash:* xinetd? ( || ( sys-apps/xinetd sys-apps/systemd ) ) virtual/pkgconfig
-DESCRIPTION=Agent to report data to Check_MK for monitoring
-EAPI=6
-HOMEPAGE=http://mathias-kettner.de/check_mk.html
-IUSE=apache_status inventory logwatch mysql nfsexports oracle postgres smart +xinetd zypper
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!!net-analyzer/check_mk app-shells/bash:* xinetd? ( || ( sys-apps/xinetd sys-apps/systemd ) )
-SLOT=0
-SRC_URI=http://mathias-kettner.de/support/1.2.8p27/check-mk-raw-1.2.8p27.cre.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=218393481f1a414bf5117dc6416c52f0
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.11.2 b/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
index 72630b9fa4e6..64920b2ce95b 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.11.2
@@ -1,6 +1,6 @@
BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) virtual/pkgconfig
DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DESCRIPTION=scans log files and bans IPs that show malicious signs
+DESCRIPTION=Scans log files and bans IPs that show malicious signs
EAPI=7
HOMEPAGE=https://www.fail2ban.org/
IUSE=selinux systemd python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/fail2ban/fail2ban/archive/0.11.2.tar.gz -> fail2ban-0.11.2.tar.gz
_eclasses_=bash-completion-r1 be99724bde4274de21e581204e9d164a distutils-r1 16579e06f8839831bd5c03455bb87e3f multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 systemd 74b223e42834adf09a2d21fe5fe13741 tmpfiles dc8e4917d734a019caa04ad3b8db560b toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=3bbb81c3ce1ddab0b5fa977dc47cde1b
+_md5_=f0ca5f73664bf10222f8d203cb36caf1
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-9999 b/metadata/md5-cache/net-analyzer/fail2ban-9999
index c20717e8b6fe..974ccf8cc8a3 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-9999
+++ b/metadata/md5-cache/net-analyzer/fail2ban-9999
@@ -1,6 +1,6 @@
BDEPEND=python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) 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_7? ( >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-42.0.2[python_targets_python3_9(-)] ) >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DESCRIPTION=scans log files and bans IPs that show malicious signs
+DESCRIPTION=Scans log files and bans IPs that show malicious signs
EAPI=7
HOMEPAGE=https://www.fail2ban.org/
IUSE=selinux systemd python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
RESTRICT=test
SLOT=0
_eclasses_=bash-completion-r1 be99724bde4274de21e581204e9d164a distutils-r1 16579e06f8839831bd5c03455bb87e3f git-r3 3e7ec3d6619213460c85e2aa48398441 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 systemd 74b223e42834adf09a2d21fe5fe13741 tmpfiles dc8e4917d734a019caa04ad3b8db560b toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=9169f6915a308243d48306c81a6bdf13
+_md5_=eec151b8c7dd0239a9bf2eb6a2b97393
diff --git a/metadata/md5-cache/net-analyzer/fwlogwatch-1.4 b/metadata/md5-cache/net-analyzer/fwlogwatch-1.4
deleted file mode 100644
index 842c055fe02a..000000000000
--- a/metadata/md5-cache/net-analyzer/fwlogwatch-1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=zlib? ( sys-libs/zlib ) sys-devel/flex nls? ( sys-devel/gettext )
-DESCRIPTION=A packet filter and firewall log analyzer
-EAPI=5
-HOMEPAGE=http://fwlogwatch.inside-security.de/
-IUSE=nls zlib
-KEYWORDS=amd64 ~ppc sparc x86
-LICENSE=GPL-1
-RDEPEND=zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://fwlogwatch.inside-security.de/sw/fwlogwatch-1.4.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=5378db8b3e1aac06aa6ea02f06d6a16a
diff --git a/metadata/md5-cache/net-analyzer/fwlogwatch-1.5 b/metadata/md5-cache/net-analyzer/fwlogwatch-1.5
index 0571a87360b5..bb44406d7693 100644
--- a/metadata/md5-cache/net-analyzer/fwlogwatch-1.5
+++ b/metadata/md5-cache/net-analyzer/fwlogwatch-1.5
@@ -5,10 +5,10 @@ DESCRIPTION=A packet filter and firewall log analyzer
EAPI=7
HOMEPAGE=http://fwlogwatch.inside-security.de/
IUSE=geoip nls zlib
-KEYWORDS=amd64 ~ppc ~sparc x86
+KEYWORDS=amd64 ~ppc sparc x86
LICENSE=GPL-1
RDEPEND=geoip? ( dev-libs/geoip ) zlib? ( sys-libs/zlib )
SLOT=0
SRC_URI=http://fwlogwatch.inside-security.de/sw/fwlogwatch-1.5.tar.bz2
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=f6f2875699683f3b44c473d0e24e6baf
+_md5_=f937e0c4381b55d49d52b7f597dbe808
diff --git a/metadata/md5-cache/net-analyzer/netcat-110-r9 b/metadata/md5-cache/net-analyzer/netcat-110-r9
index 992bea35cd07..1ff20dcb8a59 100644
--- a/metadata/md5-cache/net-analyzer/netcat-110-r9
+++ b/metadata/md5-cache/net-analyzer/netcat-110-r9
@@ -1,7 +1,7 @@
DEFINED_PHASES=compile install prepare
DEPEND=!static? ( crypt? ( dev-libs/libmix ) ) static? ( crypt? ( dev-libs/libmix[static-libs(+)] ) )
-DESCRIPTION=the network swiss army knife
-EAPI=5
+DESCRIPTION=The network swiss army knife
+EAPI=7
HOMEPAGE=https://nc110.sourceforge.io
IUSE=crypt ipv6 static
KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc64-solaris ~x64-solaris
@@ -9,5 +9,5 @@ LICENSE=netcat
RDEPEND=!static? ( crypt? ( dev-libs/libmix ) )
SLOT=0
SRC_URI=mirror://sourceforge/nc110/nc110.tgz ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz mirror://gentoo/netcat-110-patches-1.0.tar.bz2
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=6a0fcbfb4af9271b116f9f3f995fa4fc
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=05cb4624fba751f4447ebee4820c94d1
diff --git a/metadata/md5-cache/net-analyzer/netcat-110.20180111-r1 b/metadata/md5-cache/net-analyzer/netcat-110.20180111-r1
index 0fd0b396de9f..dccc73d5cdd2 100644
--- a/metadata/md5-cache/net-analyzer/netcat-110.20180111-r1
+++ b/metadata/md5-cache/net-analyzer/netcat-110.20180111-r1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=the network swiss army knife
+DESCRIPTION=The network swiss army knife
EAPI=7
HOMEPAGE=https://nc110.sourceforge.io
IUSE=ipv6 static
@@ -8,4 +8,4 @@ LICENSE=netcat
SLOT=0
SRC_URI=mirror://sourceforge/nc110/nc110.20180111.tar.xz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=22fc12a5eef1e4188983fa769895e898
+_md5_=d8c0f8cd509b04f5f62ef95353bb0cb2
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.15.1 b/metadata/md5-cache/net-analyzer/snort-2.9.15.1
index 838ac845823c..2d5521bd1c48 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.15.1
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.15.1
@@ -12,4 +12,4 @@ REQUIRED_USE=!kernel_linux? ( !shared-rep )
SLOT=0
SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.15.1.tar.gz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 tmpfiles dc8e4917d734a019caa04ad3b8db560b toolchain-funcs 24921b57d6561d87cbef4916a296ada4 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=89ef2b06add892f1def8349103f06186
+_md5_=9c970c5f82397581502e5b4713e6993f
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.16 b/metadata/md5-cache/net-analyzer/snort-2.9.16
index 29e806c87683..d0259f502f6f 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.16
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.16
@@ -12,4 +12,4 @@ REQUIRED_USE=!kernel_linux? ( !shared-rep )
SLOT=0
SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.16.tar.gz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 tmpfiles dc8e4917d734a019caa04ad3b8db560b toolchain-funcs 24921b57d6561d87cbef4916a296ada4 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=e7d3fb851960bff8cbafca27285fad38
+_md5_=c1a7e087d2c7066b4de72971827e6c05
diff --git a/metadata/md5-cache/net-analyzer/snort-2.9.16-r100 b/metadata/md5-cache/net-analyzer/snort-2.9.16-r100
index a920c2be85d8..07fa75d55f4d 100644
--- a/metadata/md5-cache/net-analyzer/snort-2.9.16-r100
+++ b/metadata/md5-cache/net-analyzer/snort-2.9.16-r100
@@ -12,4 +12,4 @@ REQUIRED_USE=!kernel_linux? ( !shared-rep ) open-appid? ( ^^ ( lua_single_target
SLOT=0
SRC_URI=https://www.snort.org/downloads/archive/snort/snort-2.9.16.tar.gz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 lua-single f91b5656f00869c220a6e35ae0521c54 lua-utils 736947973cfbc9de01fdb8548f942f82 multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 tmpfiles dc8e4917d734a019caa04ad3b8db560b toolchain-funcs 24921b57d6561d87cbef4916a296ada4 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=2ae0667770150d21c182b27b3a649c9a
+_md5_=c583de071b276f009aec9789e822e270
diff --git a/metadata/md5-cache/net-analyzer/ssldump-1.1 b/metadata/md5-cache/net-analyzer/ssldump-1.1
index b0360a83e0ab..c6b11db652ad 100644
--- a/metadata/md5-cache/net-analyzer/ssldump-1.1
+++ b/metadata/md5-cache/net-analyzer/ssldump-1.1
@@ -4,10 +4,10 @@ DESCRIPTION=An SSLv3/TLS network protocol analyzer
EAPI=7
HOMEPAGE=https://github.com/adulau/ssldump/
IUSE=ssl
-KEYWORDS=~amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ~arm ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=openssl
RDEPEND=net-libs/libpcap ssl? ( >=dev-libs/openssl-1:0= )
SLOT=0
SRC_URI=https://github.com/adulau/ssldump/archive/v1.1.tar.gz -> ssldump-1.1.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=b67bcef54cebe3cede3b15e0c9e6c311
+_md5_=5fe5b9c41225b77f04ad602b5cd3d7a2
diff --git a/metadata/md5-cache/net-analyzer/ssldump-1.3 b/metadata/md5-cache/net-analyzer/ssldump-1.3-r1
similarity index 72%
rename from metadata/md5-cache/net-analyzer/ssldump-1.3
rename to metadata/md5-cache/net-analyzer/ssldump-1.3-r1
index d8aa603f3fdc..24812489840e 100644
--- a/metadata/md5-cache/net-analyzer/ssldump-1.3
+++ b/metadata/md5-cache/net-analyzer/ssldump-1.3-r1
@@ -1,14 +1,13 @@
BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=install prepare
-DEPEND=dev-libs/json-c:= net-libs/libnet:1.1 net-libs/libpcap ssl? ( >=dev-libs/openssl-1:0= )
+DEPEND=dev-libs/json-c:= net-libs/libnet:1.1 net-libs/libpcap >=dev-libs/openssl-1:0=
DESCRIPTION=An SSLv3/TLS network protocol analyzer
EAPI=7
HOMEPAGE=https://github.com/adulau/ssldump/
-IUSE=ssl
KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=openssl
-RDEPEND=dev-libs/json-c:= net-libs/libnet:1.1 net-libs/libpcap ssl? ( >=dev-libs/openssl-1:0= )
+RDEPEND=dev-libs/json-c:= net-libs/libnet:1.1 net-libs/libpcap >=dev-libs/openssl-1:0=
SLOT=0
SRC_URI=https://github.com/adulau/ssldump/archive/v1.3.tar.gz -> ssldump-1.3.tar.gz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=87565cd832b4b24afe4c891912d01d07
+_md5_=1ab3d8b4d67a547f7b8bd5fddd143538
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.9.3-r4 b/metadata/md5-cache/net-analyzer/tcpdump-4.9.3-r4
index eec166c97155..6c33b5c4cf8d 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.9.3-r4
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.9.3-r4
@@ -1,7 +1,7 @@
BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=configure install postinst prepare test
DEPEND=net-libs/libpcap drop-root? ( acct-group/pcap acct-user/pcap sys-libs/libcap-ng ) smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) ) suid? ( acct-group/pcap acct-user/pcap ) test? ( >=net-libs/libpcap-1.9.1 dev-lang/perl )
-DESCRIPTION=A Tool for network monitoring and data acquisition
+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 libressl smi ssl samba suid test
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://www.tcpdump.org/release/tcpdump-4.9.3.tar.gz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=acff6f46c26e7cddce71e9a53648ccd5
+_md5_=ec54a090dd1204b793f5443547b9c42f
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.99.0 b/metadata/md5-cache/net-analyzer/tcpdump-4.99.0
index d1a79051a85f..408fcf9a12c5 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.99.0
+++ b/metadata/md5-cache/net-analyzer/tcpdump-4.99.0
@@ -1,7 +1,7 @@
BDEPEND=drop-root? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=configure install postinst prepare test
DEPEND=net-libs/libpcap drop-root? ( acct-group/pcap acct-user/pcap sys-libs/libcap-ng ) smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) ) suid? ( acct-group/pcap acct-user/pcap ) test? ( >=net-libs/libpcap-1.9.1 dev-lang/perl )
-DESCRIPTION=A Tool for network monitoring and data acquisition
+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 libressl +smi +ssl +samba suid test
@@ -13,4 +13,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/the-tcpdump-group/tcpdump/archive/tcpdump-4.99.0.tar.gz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=4806c72987e1df9b8b1426d41859b18f
+_md5_=f51d8d6c16c250bce38d8dffd4192fb3
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-9999 b/metadata/md5-cache/net-analyzer/tcpdump-9999
index f1545467e433..d949fc233424 100644
--- a/metadata/md5-cache/net-analyzer/tcpdump-9999
+++ b/metadata/md5-cache/net-analyzer/tcpdump-9999
@@ -1,7 +1,7 @@
BDEPEND=drop-root? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=configure install postinst prepare test unpack
DEPEND=net-libs/libpcap drop-root? ( acct-group/pcap acct-user/pcap sys-libs/libcap-ng ) smi? ( net-libs/libsmi ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6m:0= ) libressl? ( dev-libs/libressl:= ) ) suid? ( acct-group/pcap acct-user/pcap ) test? ( >=net-libs/libpcap-1.9.1 dev-lang/perl )
-DESCRIPTION=A Tool for network monitoring and data acquisition
+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 libressl +smi +ssl +samba suid test
@@ -12,4 +12,4 @@ REQUIRED_USE=test? ( samba )
RESTRICT=!test? ( test )
SLOT=0
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 git-r3 3e7ec3d6619213460c85e2aa48398441 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=e7992ad53c9e58966e8d663ff668e31c
+_md5_=f939fd2226b91ca57dd5c09338be59e6
diff --git a/metadata/md5-cache/net-analyzer/tcpstat-1.5-r3 b/metadata/md5-cache/net-analyzer/tcpstat-1.5-r3
deleted file mode 100644
index 39db62e64382..000000000000
--- a/metadata/md5-cache/net-analyzer/tcpstat-1.5-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=net-libs/libpcap
-DESCRIPTION=Reports network interface statistics
-EAPI=7
-HOMEPAGE=https://www.frenchfries.net/paul/tcpstat/
-IUSE=ipv6
-KEYWORDS=amd64 ~ppc ppc64 sparc x86
-LICENSE=BSD-2
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=https://www.frenchfries.net/paul/tcpstat/tcpstat-1.5.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=18593b7632bf5c4d4a2cdd8a4e7d34f8
diff --git a/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8 b/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8
index 37463bd755f4..b0870c2c8d46 100644
--- a/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8
+++ b/metadata/md5-cache/net-analyzer/tcpstat-1.5_p8
@@ -5,10 +5,10 @@ DESCRIPTION=Reports network interface statistics
EAPI=7
HOMEPAGE=https://www.frenchfries.net/paul/tcpstat/
IUSE=ipv6
-KEYWORDS=amd64 ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 ~ppc ppc64 sparc x86
LICENSE=BSD-2
RDEPEND=net-libs/libpcap sys-libs/db:*
SLOT=0
SRC_URI=https://www.frenchfries.net/paul/tcpstat/tcpstat-1.5.tar.gz mirror://debian/pool/main/t/tcpstat/tcpstat_1.5-8.debian.tar.xz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=697cca7189b11563a859a89463601e29
+_md5_=447aa6d91b35b6cba7ba376f1b51f476
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 366a2996e056..1fab8596e45e 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.10 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.10
deleted file mode 100644
index 9f104eb34748..000000000000
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap >sys-kernel/linux-headers-2.6 virtual/pkgconfig
-DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
-EAPI=6
-HOMEPAGE=http://www.xelerance.com/services/software/xl2tpd/
-IUSE=dnsretry
-KEYWORDS=amd64 ~arm arm64 ~mips ~ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap >sys-kernel/linux-headers-2.6 net-dialup/ppp virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.10.tar.gz -> xl2tpd-1.3.10.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 tmpfiles dc8e4917d734a019caa04ad3b8db560b toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=5f21336d5e01f3b5c026d408e0b0abef
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.11 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.11
deleted file mode 100644
index 1334135f84f4..000000000000
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=net-libs/libpcap >sys-kernel/linux-headers-2.6 virtual/pkgconfig
-DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
-EAPI=6
-HOMEPAGE=http://www.xelerance.com/services/software/xl2tpd/
-IUSE=dnsretry
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap >sys-kernel/linux-headers-2.6 net-dialup/ppp virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.11.tar.gz -> xl2tpd-1.3.11.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 tmpfiles dc8e4917d734a019caa04ad3b8db560b toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=3d3797e64ddfc4325e4a78e32473fbca
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.12 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.12
deleted file mode 100644
index a31e50a1563e..000000000000
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.12
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 virtual/pkgconfig
-DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
-EAPI=6
-HOMEPAGE=https://github.com/xelerance/xl2tpd
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
-LICENSE=GPL-2+
-RDEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 net-dialup/ppp virtual/tmpfiles
-SLOT=0
-SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.12.tar.gz -> xl2tpd-1.3.12.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 tmpfiles dc8e4917d734a019caa04ad3b8db560b toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=74f4ec5c295f9f7e2a224f67eba40553
diff --git a/metadata/md5-cache/net-dialup/xl2tpd-1.3.13 b/metadata/md5-cache/net-dialup/xl2tpd-1.3.16
similarity index 70%
rename from metadata/md5-cache/net-dialup/xl2tpd-1.3.13
rename to metadata/md5-cache/net-dialup/xl2tpd-1.3.16
index 8ed182083479..4e53a69e33f8 100644
--- a/metadata/md5-cache/net-dialup/xl2tpd-1.3.13
+++ b/metadata/md5-cache/net-dialup/xl2tpd-1.3.16
@@ -1,13 +1,14 @@
+BDEPEND=virtual/pkgconfig
DEFINED_PHASES=compile install
-DEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 virtual/pkgconfig
+DEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6
DESCRIPTION=A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon
-EAPI=6
+EAPI=7
HOMEPAGE=https://github.com/xelerance/xl2tpd
IUSE=+kernel
KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
LICENSE=GPL-2+
RDEPEND=net-libs/libpcap >=sys-kernel/linux-headers-2.6 net-dialup/ppp virtual/tmpfiles
SLOT=0
-SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.13.tar.gz -> xl2tpd-1.3.13.tar.gz
+SRC_URI=https://github.com/xelerance/xl2tpd/archive/v1.3.16.tar.gz -> xl2tpd-1.3.16.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 tmpfiles dc8e4917d734a019caa04ad3b8db560b toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=527fc8508135d2800c5db5fd1e58d4f9
+_md5_=2dafc00f9318065cc37cfa615365d6b0
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 9638ce92d61e..f00924fe585d 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/dnscap-1.10.2 b/metadata/md5-cache/net-dns/dnscap-1.10.2
deleted file mode 100644
index 93022b809bc4..000000000000
--- a/metadata/md5-cache/net-dns/dnscap-1.10.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=postinst
-DEPEND=net-libs/libpcap net-libs/ldns sys-libs/zlib dev-libs/openssl:= dev-perl/YAML
-DESCRIPTION=Network capture utility designed specifically for DNS traffic
-EAPI=7
-HOMEPAGE=https://dnscap.dns-oarc.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=net-libs/libpcap net-libs/ldns sys-libs/zlib dev-libs/openssl:= dev-perl/YAML
-SLOT=0
-SRC_URI=https://www.dns-oarc.net/files/dnscap/dnscap-1.10.2.tar.gz
-_md5_=716e83c9a2c25e2ba79d95229ad094f5
diff --git a/metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r1 b/metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r1
deleted file mode 100644
index 67fe8aa6c0f6..000000000000
--- a/metadata/md5-cache/net-dns/dnssec-tools-2.2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl:= dev-perl/CGI dev-perl/Crypt-OpenSSL-Random dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/Net-DNS-SEC dev-perl/XML-Simple
-DESCRIPTION=Tools to ease the deployment of DNSSEC related technologies
-EAPI=7
-HOMEPAGE=https://dnssec-tools.org/
-IUSE=static-libs
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=BSD GPL-2
-RDEPEND=dev-lang/perl:= dev-perl/CGI dev-perl/Crypt-OpenSSL-Random dev-perl/Getopt-GUI-Long dev-perl/GraphViz dev-perl/MailTools dev-perl/Net-DNS dev-perl/Net-DNS-SEC dev-perl/XML-Simple
-SLOT=0
-SRC_URI=https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/dnssec-tools-2.2.3.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=2eb86fb1dcde8c1e0e91bfb2f9c1042e
diff --git a/metadata/md5-cache/net-dns/resolv_wrapper-1.1.7 b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.7
new file mode 100644
index 000000000000..1288008e4aaa
--- /dev/null
+++ b/metadata/md5-cache/net-dns/resolv_wrapper-1.1.7
@@ -0,0 +1,13 @@
+BDEPEND=test? ( dev-util/cmocka net-libs/socket_wrapper ) dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Wrapper for DNS name resolving or DNS faking
+EAPI=7
+HOMEPAGE=https://cwrap.org/resolv_wrapper.html
+IUSE=test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://ftp.samba.org/pub/cwrap/resolv_wrapper-1.1.7.tar.gz
+_eclasses_=cmake 314a813be2f09820e8978cdee941e501 cmake-multilib a5c3801ef28d6532f611ba480516d0ac edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=953fbba094ed9c4d286b09329d79e163
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 098b8f8bbb1e..e7d82f7f0ac0 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1 b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1
index 0ef2f03ca1ce..89b03eb76c4f 100644
--- a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.6-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Connection tracking userspace tools
EAPI=7
HOMEPAGE=http://conntrack-tools.netfilter.org
IUSE=doc +cthelper +cttimeout systemd kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_conntrack-1.0.8 >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1 net-libs/libtirpc cthelper? ( >=net-libs/libnetfilter_cthelper-1.0.0 ) cttimeout? ( >=net-libs/libnetfilter_cttimeout-1.0.0 ) systemd? ( >=sys-apps/systemd-227 )
SLOT=0
SRC_URI=http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.6.tar.bz2
_eclasses_=linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=c017638a0422a9688be57cfe43fa0067
+_md5_=81e2b8010483a9cbc1b89dd545cefa62
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 5c0aec626f2b..bee6ca0daef1 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/mattermost-desktop-bin-4.6.2 b/metadata/md5-cache/net-im/mattermost-desktop-bin-4.6.2
new file mode 100644
index 000000000000..02df3b349d27
--- /dev/null
+++ b/metadata/md5-cache/net-im/mattermost-desktop-bin-4.6.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=Mattermost Desktop application
+EAPI=7
+HOMEPAGE=https://about.mattermost.com/
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0 GPL-2+ LGPL-2.1+ MIT
+RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2[X] dev-libs/expat dev-libs/nss media-libs/alsa-lib net-print/cups sys-apps/dbus x11-libs/gtk+:3[X] x11-libs/libXScrnSaver
+SLOT=0
+SRC_URI=amd64? ( https://releases.mattermost.com/desktop/4.6.2/mattermost-desktop-4.6.2-linux-x64.tar.gz ) x86? ( https://releases.mattermost.com/desktop/4.6.2/mattermost-desktop-4.6.2-linux-ia32.tar.gz )
+_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28
+_md5_=c84563fb02b7b856bd6c26945cb57c7d
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index ed7601409cab..3f49b583a7c5 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/cvm-0.96-r1 b/metadata/md5-cache/net-libs/cvm-0.96-r1
deleted file mode 100644
index 0ea9375b3561..000000000000
--- a/metadata/md5-cache/net-libs/cvm-0.96-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-db/cdb:= >=dev-libs/bglibs-1.041:= mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql[server] ) vpopmail? ( net-mail/vpopmail ) test? ( app-editors/vim dev-db/sqlite )
-DESCRIPTION=Credential Validation Modules by Bruce Guenter
-EAPI=7
-HOMEPAGE=http://untroubled.org/cvm/
-IUSE=mysql postgres test vpopmail
-KEYWORDS=~amd64 ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-db/cdb:= >=dev-libs/bglibs-1.041:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=http://untroubled.org/cvm/archive/cvm-0.96.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=4e08939b23c1581ea459062daaa0ce8f
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.22 b/metadata/md5-cache/net-libs/gloox-1.0.22
deleted file mode 100644
index 30404ca75a50..000000000000
--- a/metadata/md5-cache/net-libs/gloox-1.0.22
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib )
-DESCRIPTION=A portable high-level Jabber/XMPP library for C++
-EAPI=7
-HOMEPAGE=https://camaya.net/gloox/
-IUSE=debug gnutls idn libressl ssl static-libs test zlib
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( sys-libs/zlib )
-RESTRICT=test
-SLOT=0/17
-SRC_URI=https://camaya.net/download/gloox-1.0.22.tar.bz2
-_md5_=587b5c2996a46b526912a144a6a8ed53
diff --git a/metadata/md5-cache/net-libs/libdom-0.3.3-r2 b/metadata/md5-cache/net-libs/libdom-0.3.3-r2
deleted file mode 100644
index dc541c60b697..000000000000
--- a/metadata/md5-cache/net-libs/libdom-0.3.3-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install test
-DEPEND=>=dev-libs/libparserutils-0.2.1-r1 >=dev-libs/libwapcaplet-0.3.0 >=net-libs/libhubbub-0.3.1-r1 xml? ( expat? ( >=dev-libs/expat-2.1.0-r3 ) !expat? ( >=dev-libs/libxml2-2.9.1-r4 ) ) dev-util/netsurf-buildsystem virtual/pkgconfig test? ( dev-perl/XML-XPath dev-perl/libxml-perl dev-perl/Switch )
-DESCRIPTION=implementation of the W3C DOM, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/libdom/
-IUSE=expat test xml
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-RDEPEND=>=dev-libs/libparserutils-0.2.1-r1 >=dev-libs/libwapcaplet-0.3.0 >=net-libs/libhubbub-0.3.1-r1 xml? ( expat? ( >=dev-libs/expat-2.1.0-r3 ) !expat? ( >=dev-libs/libxml2-2.9.1-r4 ) )
-REQUIRED_USE=test? ( xml )
-RESTRICT=!test? ( test )
-SLOT=0/0.3.3
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libdom-0.3.3-src.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e netsurf 8d6ce5a28a5af61bfb3a264ac8d46867 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=c412f0b104e53f4aae6cc260d8219e94
diff --git a/metadata/md5-cache/net-libs/libdom-0.4.0-r1 b/metadata/md5-cache/net-libs/libdom-0.4.0-r1
deleted file mode 100644
index 408aaf9d6dbc..000000000000
--- a/metadata/md5-cache/net-libs/libdom-0.4.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/netsurf-buildsystem virtual/pkgconfig
-DEFINED_PHASES=compile install test
-DEPEND=dev-libs/libparserutils dev-libs/libwapcaplet net-libs/libhubbub xml? ( expat? ( >=dev-libs/expat-2.1.0-r3 ) !expat? ( >=dev-libs/libxml2-2.9.1-r4 ) ) test? ( dev-perl/XML-XPath dev-perl/libxml-perl dev-perl/Switch )
-DESCRIPTION=implementation of the W3C DOM, written in C
-EAPI=7
-HOMEPAGE=http://www.netsurf-browser.org/projects/libdom/
-IUSE=expat test xml
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64
-LICENSE=MIT
-RDEPEND=dev-libs/libparserutils dev-libs/libwapcaplet net-libs/libhubbub xml? ( expat? ( >=dev-libs/expat-2.1.0-r3 ) !expat? ( >=dev-libs/libxml2-2.9.1-r4 ) )
-REQUIRED_USE=test? ( xml )
-RESTRICT=!test? ( test )
-SLOT=0/0.4.0
-SRC_URI=https://download.netsurf-browser.org/libs/releases/libdom-0.4.0-src.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e netsurf 8d6ce5a28a5af61bfb3a264ac8d46867 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=f8ea31beb2259b8946e187369ba34321
diff --git a/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1 b/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
deleted file mode 100644
index dfeb00d48836..000000000000
--- a/metadata/md5-cache/net-libs/libgsasl-1.8.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
-DESCRIPTION=The GNU SASL library
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/gsasl/
-IUSE=idn gcrypt kerberos nls ntlm static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-3 LGPL-3
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm ) !net-misc/gsasl
-SLOT=0
-SRC_URI=mirror://gnu/gsasl/libgsasl-1.8.0.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=a9754d30f1b0f79360f559f2580d56b5
diff --git a/metadata/md5-cache/net-libs/libgsasl-1.8.1 b/metadata/md5-cache/net-libs/libgsasl-1.8.1
deleted file mode 100644
index 2657fe25dddf..000000000000
--- a/metadata/md5-cache/net-libs/libgsasl-1.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
-DESCRIPTION=The GNU SASL library
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/gsasl/
-IUSE=idn gcrypt kerberos nls ntlm static-libs
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-3 LGPL-3
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm ) !net-misc/gsasl
-SLOT=0
-SRC_URI=mirror://gnu/gsasl/libgsasl-1.8.1.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=6458fd6bc3d385e9012446c314241b4b
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8
index dc454bc9ad79..12610c583008 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.8
@@ -4,10 +4,10 @@ DESCRIPTION=programming interface (API) to the in-kernel connection tracking sta
EAPI=6
HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_conntrack/
IUSE=static-libs kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
LICENSE=GPL-2
RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
SLOT=0
SRC_URI=https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.8.tar.bz2
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 eapi7-ver f9ec87e93172b25ce65a85303dc06964 libtool f143db5a74ccd9ca28c1234deffede96 linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=4a2a33dc5185492b5720c52ee9278360
+_md5_=2bb1d3c99ca23965c558b41eceb9e2a3
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1 b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
index 83693c82dde8..f6aad935e34a 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Userspace library for interface to user-space helper for conntrack
EAPI=7
HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_cthelper/
IUSE=kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=net-libs/libmnl:=
SLOT=0
SRC_URI=https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.0.tar.bz2
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=a8df158eb17d6d342e794c0762dda388
+_md5_=cdc4314f59cbaea4d8993bd00c882817
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1 b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
index 6da024e12175..888c79ada973 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=netlink interface for conntrack timeout infrastructure in kernel's p
EAPI=7
HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_cttimeout/
IUSE=kernel_linux
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
LICENSE=GPL-2
RDEPEND=net-libs/libmnl:=
SLOT=0
SRC_URI=https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.0.tar.bz2
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=7cca144389ab87c5f9f39c683a90654b
+_md5_=7e72f6096c14ac72793fc4b7b8ac21f4
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
index 97e6171fe8f5..7d71b100f9dc 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.3
@@ -4,10 +4,10 @@ DESCRIPTION=API to packets that have been queued by the kernel packet filter
EAPI=6
HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_queue/
IUSE=static-libs kernel_linux
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
SLOT=0
SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.3.tar.bz2
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=7e2492fe49b25fde189c2aafd4992b27
+_md5_=7a48e2da763b6730c4fc560e279ef2ad
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
index a66be621bb7c..122fd514befe 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
@@ -5,10 +5,10 @@ DESCRIPTION=API to packets that have been queued by the kernel packet filter
EAPI=7
HOMEPAGE=https://www.netfilter.org/projects/libnetfilter_queue/
IUSE=doc static-libs kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
SLOT=0
SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.5.tar.bz2
_eclasses_=linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=d1870fd5a0368b214da4fdef308856d8
+_md5_=16c1c5689892066b5978eda49bdacff6
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index ce2239dc5cc0..5a134cc6e142 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/imapsync-1.882 b/metadata/md5-cache/net-mail/imapsync-1.882
deleted file mode 100644
index 6ebc1d707f32..000000000000
--- a/metadata/md5-cache/net-mail/imapsync-1.882
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile prepare
-DEPEND=dev-perl/App-cpanminus dev-perl/Authen-NTLM dev-perl/CGI dev-perl/Crypt-OpenSSL-RSA dev-perl/Data-Uniqid dev-perl/Digest-HMAC dev-perl/Dist-CheckConflicts dev-perl/File-Copy-Recursive dev-perl/IO-Socket-INET6 dev-perl/IO-Socket-SSL dev-perl/IO-Tee dev-perl/JSON dev-perl/libwww-perl dev-perl/Mail-IMAPClient dev-perl/Module-Implementation dev-perl/Module-Runtime dev-perl/Module-ScanDeps dev-perl/Net-SSLeay dev-perl/Package-Stash dev-perl/Package-Stash-XS dev-perl/PAR dev-perl/Parse-RecDescent dev-perl/Readonly dev-perl/Readonly-XS dev-perl/Regexp-Common dev-perl/Sys-MemInfo dev-perl/TermReadKey dev-perl/Try-Tiny dev-perl/Unicode-String dev-perl/URI virtual/perl-Compress-Raw-Zlib virtual/perl-Data-Dumper virtual/perl-Digest virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Encode virtual/perl-MIME-Base64 test? ( virtual/perl-Test dev-perl/Test-Deep dev-perl/Test-Fatal dev-perl/Test-MockObject dev-perl/Test-Pod dev-perl/Test-Requires dev-perl/Test-Warn dev-perl/Test-NoWarnings )
-DESCRIPTION=Tool for incremental and recursive IMAP transfers between mailboxes
-EAPI=6
-HOMEPAGE=http://ks.lamiral.info/imapsync/ https://github.com/imapsync/imapsync
-IUSE=test
-KEYWORDS=amd64 ppc x86
-LICENSE=WTFPL-2
-RDEPEND=dev-perl/App-cpanminus dev-perl/Authen-NTLM dev-perl/CGI dev-perl/Crypt-OpenSSL-RSA dev-perl/Data-Uniqid dev-perl/Digest-HMAC dev-perl/Dist-CheckConflicts dev-perl/File-Copy-Recursive dev-perl/IO-Socket-INET6 dev-perl/IO-Socket-SSL dev-perl/IO-Tee dev-perl/JSON dev-perl/libwww-perl dev-perl/Mail-IMAPClient dev-perl/Module-Implementation dev-perl/Module-Runtime dev-perl/Module-ScanDeps dev-perl/Net-SSLeay dev-perl/Package-Stash dev-perl/Package-Stash-XS dev-perl/PAR dev-perl/Parse-RecDescent dev-perl/Readonly dev-perl/Readonly-XS dev-perl/Regexp-Common dev-perl/Sys-MemInfo dev-perl/TermReadKey dev-perl/Try-Tiny dev-perl/Unicode-String dev-perl/URI virtual/perl-Compress-Raw-Zlib virtual/perl-Data-Dumper virtual/perl-Digest virtual/perl-Digest-MD5 virtual/perl-Digest-SHA virtual/perl-Encode virtual/perl-MIME-Base64
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/imapsync/imapsync/archive/imapsync-1.882.tar.gz
-_md5_=bde52b495f1761e3a5233f30154b3a73
diff --git a/metadata/md5-cache/net-mail/mpop-1.4.4 b/metadata/md5-cache/net-mail/mpop-1.4.4
deleted file mode 100644
index 216da201bf28..000000000000
--- a/metadata/md5-cache/net-mail/mpop-1.4.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=idn? ( net-dns/libidn2 ) gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls:0=[idn?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=A small, fast, and portable POP3 client
-EAPI=7
-HOMEPAGE=https://marlam.de/mpop/
-IUSE=gnutls idn libressl gnome-keyring nls sasl ssl vim-syntax
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=idn? ( net-dns/libidn2 ) gnome-keyring? ( app-crypt/libsecret ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) ssl? ( gnutls? ( net-libs/gnutls:0=[idn?] ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
-REQUIRED_USE=gnutls? ( ssl )
-SLOT=0
-SRC_URI=https://marlam.de/mpop/releases/mpop-1.4.4.tar.xz
-_md5_=9ff30c47118b12ab329d41d4024d3bdc
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 4bd78f176277..343b4465b4c0 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/dhcpcd-9.3.4 b/metadata/md5-cache/net-misc/dhcpcd-9.3.4
index 59650aec5daa..a8f0e7b98c71 100644
--- a/metadata/md5-cache/net-misc/dhcpcd-9.3.4
+++ b/metadata/md5-cache/net-misc/dhcpcd-9.3.4
@@ -11,4 +11,4 @@ RDEPEND=udev? ( virtual/udev ) privsep? ( acct-group/dhcpcd acct-user/dhcpcd )
SLOT=0
SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-9.3.4.tar.xz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=28b569a586d63ba3130d74a69d8131fa
+_md5_=1bd25101be55f4ae4187bb172f465251
diff --git a/metadata/md5-cache/net-misc/dhcpcd-9.4.0-r1 b/metadata/md5-cache/net-misc/dhcpcd-9.4.0-r1
new file mode 100644
index 000000000000..2e11d6a66963
--- /dev/null
+++ b/metadata/md5-cache/net-misc/dhcpcd-9.4.0-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=udev? ( virtual/udev )
+DESCRIPTION=A fully featured, yet light weight RFC2131 compliant DHCP client
+EAPI=7
+HOMEPAGE=https://roy.marples.name/projects/dhcpcd
+IUSE=debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD-2
+RDEPEND=udev? ( virtual/udev ) privsep? ( acct-group/dhcpcd acct-user/dhcpcd )
+SLOT=0
+SRC_URI=https://roy.marples.name/downloads/dhcpcd/dhcpcd-9.4.0.tar.xz
+_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=a622b980e13016a820c4bf67a39117c5
diff --git a/metadata/md5-cache/net-misc/gsasl-1.8.0-r1 b/metadata/md5-cache/net-misc/gsasl-1.8.0-r1
deleted file mode 100644
index e9879c54a9d2..000000000000
--- a/metadata/md5-cache/net-misc/gsasl-1.8.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
-DESCRIPTION=The GNU SASL client, server, and library
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/gsasl/
-IUSE=doc gcrypt idn kerberos nls ntlm static-libs +threads
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
-SLOT=0
-SRC_URI=mirror://gnu/gsasl/gsasl-1.8.0.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=05f2c94f4f1a67f786e5513f9d9ca0a9
diff --git a/metadata/md5-cache/net-misc/gsasl-1.8.1 b/metadata/md5-cache/net-misc/gsasl-1.8.1
deleted file mode 100644
index a54aad27d400..000000000000
--- a/metadata/md5-cache/net-misc/gsasl-1.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
-DESCRIPTION=The GNU SASL client, server, and library
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/gsasl/
-IUSE=doc gcrypt idn kerberos nls ntlm static-libs +threads
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:0= ) idn? ( net-dns/libidn:= ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
-SLOT=0
-SRC_URI=mirror://gnu/gsasl/gsasl-1.8.1.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=e0829f3e5c9100aeedd413d4b24086a5
diff --git a/metadata/md5-cache/net-misc/mrouted-3.9.8 b/metadata/md5-cache/net-misc/mrouted-3.9.8
deleted file mode 100644
index 2df6e4319cae..000000000000
--- a/metadata/md5-cache/net-misc/mrouted-3.9.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=|| ( dev-util/yacc sys-devel/bison )
-DESCRIPTION=IP multicast routing daemon
-EAPI=7
-HOMEPAGE=https://troglobit.com/projects/mrouted/
-IUSE=rsrr
-KEYWORDS=amd64 ppc x86
-LICENSE=Stanford GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/troglobit/mrouted/releases/download/3.9.8/mrouted-3.9.8.tar.bz2
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=e390e7abfd758e4d7066bb307fc99174
diff --git a/metadata/md5-cache/net-misc/networkmanager-1.30.2 b/metadata/md5-cache/net-misc/networkmanager-1.30.2
new file mode 100644
index 000000000000..9b7ddaf85305
--- /dev/null
+++ b/metadata/md5-cache/net-misc/networkmanager-1.30.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/gdbus-codegen dev-util/glib-utils dev-util/gtk-doc-am >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig introspection? ( || ( ( dev-lang/python:3.9 dev-python/pygobject:3[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/pygobject:3[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/pygobject:3[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) dev-lang/perl dev-libs/libxslt ) vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) test? ( || ( ( dev-lang/python:3.9 dev-python/dbus-python[python_targets_python3_9(-),-python_single_target_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-),-python_single_target_python3_9(-)] ) ( dev-lang/python:3.8 dev-python/dbus-python[python_targets_python3_8(-),-python_single_target_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-),-python_single_target_python3_8(-)] ) ( dev-lang/python:3.7 dev-python/dbus-python[python_targets_python3_7(-),-python_single_target_python3_7(-)] dev-python/pygobject:3[python_targets_python3_7(-),-python_single_target_python3_7(-)] ) ) ) >=app-portage/elt-patches-20170815 app-arch/xz-utils virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
+DEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) >=sys-kernel/linux-headers-3.18 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A set of co-operative tools that make networking simple and straightforward
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/NetworkManager
+IUSE=audit bluetooth connection-sharing dhclient dhcpcd elogind gnutls +introspection iwd kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi kernel_linux test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.40:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] policykit? ( >=sys-auth/polkit-0.106 ) net-libs/libndp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-misc/curl-7.24 net-misc/iputils sys-apps/util-linux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=virtual/libudev-175:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] audit? ( sys-process/audit ) bluetooth? ( >=net-wireless/bluez-5 ) connection-sharing? ( net-dns/dnsmasq[dbus,dhcp] net-firewall/iptables ) dhclient? ( >=net-misc/dhcp-4[client] ) dhcpcd? ( >=net-misc/dhcpcd-9.3.3 ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991:0= net-misc/mobile-broadband-provider-info ) ncurses? ( >=dev-libs/newt-0.52.15 ) nss? ( >=dev-libs/nss-3.11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !nss? ( gnutls? ( dev-libs/libgcrypt:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-2.12:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ofono? ( net-misc/ofono ) ovs? ( dev-libs/jansson ) ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] ) resolvconf? ( net-dns/openresolv ) selinux? ( sys-libs/libselinux ) systemd? ( >=sys-apps/systemd-209:0= ) teamd? ( dev-libs/jansson >=net-misc/libteam-1.9 ) acct-group/plugdev || ( net-misc/iputils[arping(+)] net-analyzer/arping ) wifi? ( !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) iwd? ( net-wireless/iwd ) )
+REQUIRED_USE=bluetooth? ( modemmanager ) iwd? ( wifi ) vala? ( introspection ) wext? ( wifi ) || ( nss gnutls ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/NetworkManager/1.30/NetworkManager-1.30.2.tar.xz
+_eclasses_=bash-completion-r1 be99724bde4274de21e581204e9d164a edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 c156bb2ac81c822dd861424ce19bc168 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 linux-info c90a203b1c14cfa77bd3e37a0e96c955 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6 vala 5fab64090cefe75c5df431cefa0b653d virtualx 7e60d3b10c791ab996f717bc1f30072f wrapper 4251d4c84c25f59094fd557e0063a974 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=58e94a49a3555b0bad1d04e6bb24c43e
diff --git a/metadata/md5-cache/net-misc/wput-0.6.1-r1 b/metadata/md5-cache/net-misc/wput-0.6.1-r1
deleted file mode 100644
index 53a5a1e35db0..000000000000
--- a/metadata/md5-cache/net-misc/wput-0.6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext )
-DEFINED_PHASES=configure
-DEPEND=ssl? ( net-libs/gnutls )
-DESCRIPTION=Tiny program like wget to upload files/whole directories via FTP
-EAPI=7
-HOMEPAGE=http://wput.sourceforge.net/
-IUSE=debug nls ssl
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( net-libs/gnutls )
-SLOT=0
-SRC_URI=mirror://sourceforge/wput/wput-0.6.1.tgz
-_md5_=5ae9b39852aa3dca358d80b00eee08ea
diff --git a/metadata/md5-cache/net-misc/zerotier-1.4.6 b/metadata/md5-cache/net-misc/zerotier-1.4.6
deleted file mode 100644
index aa3ce390dd01..000000000000
--- a/metadata/md5-cache/net-misc/zerotier-1.4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install setup test
-DEPEND=dev-libs/json-glib net-libs/libnatpmp net-libs/miniupnpc:= clang? ( >=sys-devel/clang-6:* ) !!sys-devel/llvm:0
-DESCRIPTION=A software-based managed Ethernet switch for planet Earth
-EAPI=7
-HOMEPAGE=https://www.zerotier.com/
-IUSE=clang neon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSL-1.1
-RDEPEND=dev-libs/json-glib net-libs/libnatpmp net-libs/miniupnpc:= clang? ( >=sys-devel/clang-6:* )
-SLOT=0
-SRC_URI=https://github.com/zerotier/ZeroTierOne/archive/1.4.6.tar.gz -> zerotier-1.4.6.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e llvm 96482dd3973a93c32659252dfeba1433 multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=310dcc98c6e74c99250f232bfd6e0d22
diff --git a/metadata/md5-cache/net-misc/zerotier-1.6.2 b/metadata/md5-cache/net-misc/zerotier-1.6.2
deleted file mode 100644
index cd46c3bb3293..000000000000
--- a/metadata/md5-cache/net-misc/zerotier-1.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile install setup test
-DEPEND=dev-libs/json-glib net-libs/libnatpmp net-libs/miniupnpc:= clang? ( >=sys-devel/clang-6:* ) !!sys-devel/llvm:0
-DESCRIPTION=A software-based managed Ethernet switch for planet Earth
-EAPI=7
-HOMEPAGE=https://www.zerotier.com/
-IUSE=clang neon
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSL-1.1
-RDEPEND=dev-libs/json-glib net-libs/libnatpmp net-libs/miniupnpc:= clang? ( >=sys-devel/clang-6:* )
-SLOT=0
-SRC_URI=https://github.com/zerotier/ZeroTierOne/archive/1.6.2.tar.gz -> zerotier-1.6.2.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e llvm 96482dd3973a93c32659252dfeba1433 multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=40b01ba557fe4a9f8f01b73b1d9310d0
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 536df2cad91c..549a02f1d1f9 100644
Binary files a/metadata/md5-cache/net-news/Manifest.gz and b/metadata/md5-cache/net-news/Manifest.gz differ
diff --git a/metadata/md5-cache/net-news/rssguard-3.5.9-r1 b/metadata/md5-cache/net-news/rssguard-3.5.9-r1
deleted file mode 100644
index 6259001b9b42..000000000000
--- a/metadata/md5-cache/net-news/rssguard-3.5.9-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-qt/linguist-tools:5
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 webengine? ( dev-qt/qtwebengine:5[widgets] )
-DESCRIPTION=Tiny RSS and Atom feed reader
-EAPI=7
-HOMEPAGE=https://github.com/martinrotter/rssguard
-IUSE=debug webengine
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 webengine? ( dev-qt/qtwebengine:5[widgets] )
-SLOT=0
-SRC_URI=https://github.com/martinrotter/rssguard/archive/3.5.9.tar.gz -> rssguard-3.5.9.tar.gz
-_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e qmake-utils dc74fe3891abc25e80dad5cd3d7c6e47 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=e71053f862a5fd2cc27ac79451dba2fe
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 194c6318be0a..161b5ffae929 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/cndrvcups-common-lb-3.60-r1 b/metadata/md5-cache/net-print/cndrvcups-common-lb-3.60-r1
deleted file mode 100644
index 59df6a78dc73..000000000000
--- a/metadata/md5-cache/net-print/cndrvcups-common-lb-3.60-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare setup unpack
-DESCRIPTION=Common files for Canon drivers
-EAPI=7
-HOMEPAGE=https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx
-KEYWORDS=-* amd64 x86
-LICENSE=Canon-UFR-II GPL-2 MIT
-RDEPEND=>=dev-libs/libxml2-2.6:2 >=gnome-base/libglade-2.4:2.0 >=net-print/cups-1.1.17 >=x11-libs/gtk+-2.4:2
-SLOT=0
-SRC_URI=http://gdlp01.c-wss.com/gds/0/0100009240/02/linux-UFRII-drv-v360-uken.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=13a3f9e63b47f7de73bcf3cb4acf96a8
diff --git a/metadata/md5-cache/net-print/cndrvcups-lb-3.60-r2 b/metadata/md5-cache/net-print/cndrvcups-lb-3.60-r2
deleted file mode 100644
index 2aeac3a36ecb..000000000000
--- a/metadata/md5-cache/net-print/cndrvcups-lb-3.60-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare setup unpack
-DESCRIPTION=Canon UFR II / LIPSLX Printer Driver for Linux
-EAPI=7
-HOMEPAGE=https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx
-KEYWORDS=-* amd64 x86
-LICENSE=Canon-UFR-II
-RDEPEND=>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)] >=gnome-base/libglade-2.4:2.0 >=net-print/cups-1.1.17 ~net-print/cndrvcups-common-lb-3.60 >=x11-libs/gtk+-2.4:2
-SLOT=0
-SRC_URI=http://gdlp01.c-wss.com/gds/0/0100009240/02/linux-UFRII-drv-v360-uken.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=0cd211793ed2822c5361a0f197cb5652
diff --git a/metadata/md5-cache/net-print/hplip-3.20.11 b/metadata/md5-cache/net-print/hplip-3.20.11
deleted file mode 100644
index a05fff030b10..000000000000
--- a/metadata/md5-cache/net-print/hplip-3.20.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp:= python_single_target_python3_7? ( net-dns/avahi[dbus,python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-dns/avahi[dbus,python_targets_python3_8(-)] ) ) )
-DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
-EAPI=7
-HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
-IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp:= python_single_target_python3_7? ( net-dns/avahi[dbus,python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-dns/avahi[dbus,python_targets_python3_8(-)] ) ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_7? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] fax? ( dev-python/reportlab[python_targets_python3_7(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_7(-)] libnotify? ( dev-python/notify2[python_targets_python3_7(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_7(-)] >=dev-python/pillow-3.1.1[python_targets_python3_7(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 )
-SLOT=0
-SRC_URI=mirror://sourceforge/hplip/hplip-3.20.11.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.20.11-patches-1.tar.xz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=fdd92e733ee11201ad515490b87feb6b
diff --git a/metadata/md5-cache/net-print/hplip-3.20.9-r3 b/metadata/md5-cache/net-print/hplip-3.20.9-r3
deleted file mode 100644
index db9c40d31a9a..000000000000
--- a/metadata/md5-cache/net-print/hplip-3.20.9-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 =sys-devel/automake-1.13* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp:= python_single_target_python3_7? ( net-dns/avahi[dbus,python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-dns/avahi[dbus,python_targets_python3_8(-)] ) ) )
-DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
-EAPI=7
-HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
-IUSE=doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X kernel_linux python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp:= python_single_target_python3_7? ( net-dns/avahi[dbus,python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-dns/avahi[dbus,python_targets_python3_8(-)] ) ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_7? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_7(-)] dev-python/distro[python_targets_python3_7(-)] fax? ( dev-python/reportlab[python_targets_python3_7(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_7(-)] libnotify? ( dev-python/notify2[python_targets_python3_7(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_7(-)] >=dev-python/pillow-3.1.1[python_targets_python3_7(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
-REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/hplip/hplip-3.20.9.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.20.9-patches-2.tar.xz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=c27c41405e5af35aef3e4ff199da5424
diff --git a/metadata/md5-cache/net-print/hplip-3.21.2 b/metadata/md5-cache/net-print/hplip-3.21.2
index 01227da8de93..2089cf67ff4c 100644
--- a/metadata/md5-cache/net-print/hplip-3.21.2
+++ b/metadata/md5-cache/net-print/hplip-3.21.2
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
SLOT=0
SRC_URI=mirror://sourceforge/hplip/hplip-3.21.2.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.21.2-patches-1.tar.xz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e python-single-r1 d3100de905f978df912135806cf27188 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=1dad798d771cab201b07ce0f1e000de5
+_md5_=0d4b98ad5199bd2cec289ce9316bd0ce
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.20.9 b/metadata/md5-cache/net-print/hplip-plugin-3.20.9
deleted file mode 100644
index 7bc14fa8a7c9..000000000000
--- a/metadata/md5-cache/net-print/hplip-plugin-3.20.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Proprietary plugins and firmware for HPLIP
-EAPI=7
-HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing/plugins
-IUSE=orblite
-KEYWORDS=amd64 arm x86
-LICENSE=hplip-plugin
-RDEPEND=~net-print/hplip-3.20.9 virtual/udev orblite? ( media-gfx/sane-backends >=sys-libs/glibc-2.26 virtual/libusb:0 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.20.9-plugin.run
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 unpacker 45b49db67094fdafbb6a16a2299e894b
-_md5_=41fd29dd363e98f7ada70cce96ab4d40
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 6e94dd562b76..10a3aa5092af 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/frp-0.36.0 b/metadata/md5-cache/net-vpn/frp-0.36.0
new file mode 100644
index 000000000000..8494926570a9
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/frp-0.36.0
@@ -0,0 +1,12 @@
+BDEPEND=>=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=A reverse proxy that exposes a server behind a NAT or firewall to the internet
+EAPI=7
+HOMEPAGE=https://github.com/fatedier/frp
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/fatedier/frp/archive/v0.36.0.tar.gz -> frp-0.36.0.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.34.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.34.0.mod mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.zip -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.zip mirror://goproxy//github.com/!azure/go-ntlmssp/@v/v0.0.0-20200615164410-66371956d46c.mod -> github.com%2F!azure%2Fgo-ntlmssp%2F@v%2Fv0.0.0-20200615164410-66371956d46c.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v0.0.0-20170623195520-56545f4a5d46.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv0.0.0-20170623195520-56545f4a5d46.mod mirror://goproxy//github.com/!puerkito!bio/purell/@v/v1.0.0.mod -> github.com%2F!puerkito!bio%2Fpurell%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/!puerkito!bio/urlesc/@v/v0.0.0-20160726150825-5bd2802263f2.mod -> github.com%2F!puerkito!bio%2Furlesc%2F@v%2Fv0.0.0-20160726150825-5bd2802263f2.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20160405071501-a0175ee3bccc.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20160405071501-a0175ee3bccc.mod mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20151022065526-2efee857e7cf.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20151022065526-2efee857e7cf.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190717042225-c3de453c63f4.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190717042225-c3de453c63f4.mod mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.zip -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.zip mirror://goproxy//github.com/armon/go-socks5/@v/v0.0.0-20160902184237-e75332964ef5.mod -> github.com%2Farmon%2Fgo-socks5%2F@v%2Fv0.0.0-20160902184237-e75332964ef5.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.0.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/beorn7/perks/@v/v1.0.1.mod -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.zip -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.zip mirror://goproxy//github.com/cespare/xxhash/v2/@v/v2.1.1.mod -> github.com%2Fcespare%2Fxxhash%2Fv2%2F@v%2Fv2.1.1.mod mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.zip -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.zip mirror://goproxy//github.com/coreos/go-oidc/@v/v2.2.1+incompatible.mod -> github.com%2Fcoreos%2Fgo-oidc%2F@v%2Fv2.2.1+incompatible.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/docker/spdystream/@v/v0.0.0-20160310174837-449fdfce4d96.mod -> github.com%2Fdocker%2Fspdystream%2F@v%2Fv0.0.0-20160310174837-449fdfce4d96.mod mirror://goproxy//github.com/elazarl/goproxy/@v/v0.0.0-20180725130230-947c36da3153.mod -> github.com%2Felazarl%2Fgoproxy%2F@v%2Fv0.0.0-20180725130230-947c36da3153.mod mirror://goproxy//github.com/emicklei/go-restful/@v/v0.0.0-20170410110728-ff4f55a20633.mod -> github.com%2Femicklei%2Fgo-restful%2F@v%2Fv0.0.0-20170410110728-ff4f55a20633.mod mirror://goproxy//github.com/evanphx/json-patch/@v/v4.2.0+incompatible.mod -> github.com%2Fevanphx%2Fjson-patch%2F@v%2Fv4.2.0+incompatible.mod mirror://goproxy//github.com/fatedier/beego/@v/v0.0.0-20171024143340-6c6a4f5bd5eb.zip -> github.com%2Ffatedier%2Fbeego%2F@v%2Fv0.0.0-20171024143340-6c6a4f5bd5eb.zip mirror://goproxy//github.com/fatedier/beego/@v/v0.0.0-20171024143340-6c6a4f5bd5eb.mod -> github.com%2Ffatedier%2Fbeego%2F@v%2Fv0.0.0-20171024143340-6c6a4f5bd5eb.mod mirror://goproxy//github.com/fatedier/golib/@v/v0.1.1-0.20200901083111-1f870741e185.zip -> github.com%2Ffatedier%2Fgolib%2F@v%2Fv0.1.1-0.20200901083111-1f870741e185.zip mirror://goproxy//github.com/fatedier/golib/@v/v0.1.1-0.20200901083111-1f870741e185.mod -> github.com%2Ffatedier%2Fgolib%2F@v%2Fv0.1.1-0.20200901083111-1f870741e185.mod mirror://goproxy//github.com/fatedier/kcp-go/@v/v2.0.4-0.20190803094908-fe8645b0a904+incompatible.zip -> github.com%2Ffatedier%2Fkcp-go%2F@v%2Fv2.0.4-0.20190803094908-fe8645b0a904+incompatible.zip mirror://goproxy//github.com/fatedier/kcp-go/@v/v2.0.4-0.20190803094908-fe8645b0a904+incompatible.mod -> github.com%2Ffatedier%2Fkcp-go%2F@v%2Fv2.0.4-0.20190803094908-fe8645b0a904+incompatible.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.zip mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.9.mod -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.9.mod mirror://goproxy//github.com/ghodss/yaml/@v/v0.0.0-20150909031657-73d445a93680.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv0.0.0-20150909031657-73d445a93680.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.8.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/go-kit/kit/@v/v0.9.0.mod -> github.com%2Fgo-kit%2Fkit%2F@v%2Fv0.9.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.3.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/go-logfmt/logfmt/@v/v0.4.0.mod -> github.com%2Fgo-logfmt%2Flogfmt%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-logr/logr/@v/v0.1.0.mod -> github.com%2Fgo-logr%2Flogr%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/go-openapi/jsonpointer/@v/v0.0.0-20160704185906-46af16f9f7b1.mod -> github.com%2Fgo-openapi%2Fjsonpointer%2F@v%2Fv0.0.0-20160704185906-46af16f9f7b1.mod mirror://goproxy//github.com/go-openapi/jsonreference/@v/v0.0.0-20160704190145-13c6e3589ad9.mod -> github.com%2Fgo-openapi%2Fjsonreference%2F@v%2Fv0.0.0-20160704190145-13c6e3589ad9.mod mirror://goproxy//github.com/go-openapi/spec/@v/v0.0.0-20160808142527-6aced65f8501.mod -> github.com%2Fgo-openapi%2Fspec%2F@v%2Fv0.0.0-20160808142527-6aced65f8501.mod mirror://goproxy//github.com/go-openapi/swag/@v/v0.0.0-20160704191624-1d0bd113de87.mod -> github.com%2Fgo-openapi%2Fswag%2F@v%2Fv0.0.0-20160704191624-1d0bd113de87.mod mirror://goproxy//github.com/go-stack/stack/@v/v1.8.0.mod -> github.com%2Fgo-stack%2Fstack%2F@v%2Fv1.8.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.3.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/groupcache/@v/v0.0.0-20160516000752-02826c3e7903.mod -> github.com%2Fgolang%2Fgroupcache%2F@v%2Fv0.0.0-20160516000752-02826c3e7903.mod mirror://goproxy//github.com/golang/protobuf/@v/v0.0.0-20161109072736-4bd1920723d7.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv0.0.0-20161109072736-4bd1920723d7.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.3.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.1.0.20200221234624-67d41d38c208.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.1.0.20200221234624-67d41d38c208.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.2.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0-rc.4.0.20200313231945-b860323f09d0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0-rc.4.0.20200313231945-b860323f09d0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.0.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/golang/protobuf/@v/v1.4.2.mod -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.zip -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.zip mirror://goproxy//github.com/golang/snappy/@v/v0.0.1.mod -> github.com%2Fgolang%2Fsnappy%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.3.1.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.4.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.0.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/google/gofuzz/@v/v1.1.0.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/google/uuid/@v/v1.1.1.zip -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/google/uuid/@v/v1.1.1.mod -> github.com%2Fgoogle%2Fuuid%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.0.0-20170729233727-0c5108395e2d.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.0.0-20170729233727-0c5108395e2d.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.1.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20181017120253-0766667cb4d1.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.zip -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.zip mirror://goproxy//github.com/gorilla/mux/@v/v1.7.3.mod -> github.com%2Fgorilla%2Fmux%2F@v%2Fv1.7.3.mod mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.zip -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/gorilla/websocket/@v/v1.4.0.mod -> github.com%2Fgorilla%2Fwebsocket%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.zip -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.zip mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20181012175058-2f1d1f20f75d.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20181012175058-2f1d1f20f75d.mod mirror://goproxy//github.com/hpcloud/tail/@v/v1.0.0.mod -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.zip -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/inconshreveable/mousetrap/@v/v1.0.0.mod -> github.com%2Finconshreveable%2Fmousetrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.6.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.6.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.8.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.8.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.9.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.9.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.zip -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip mirror://goproxy//github.com/jtolds/gls/@v/v4.20.0+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod mirror://goproxy//github.com/julienschmidt/httprouter/@v/v1.2.0.mod -> github.com%2Fjulienschmidt%2Fhttprouter%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.2.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/kisielk/gotool/@v/v1.0.0.mod -> github.com%2Fkisielk%2Fgotool%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.zip -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.zip mirror://goproxy//github.com/klauspost/cpuid/@v/v1.2.0.mod -> github.com%2Fklauspost%2Fcpuid%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/klauspost/reedsolomon/@v/v1.9.1.zip -> github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.1.zip mirror://goproxy//github.com/klauspost/reedsolomon/@v/v1.9.1.mod -> github.com%2Fklauspost%2Freedsolomon%2F@v%2Fv1.9.1.mod mirror://goproxy//github.com/konsorten/go-windows-terminal-sequences/@v/v1.0.1.mod -> github.com%2Fkonsorten%2Fgo-windows-terminal-sequences%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/kr/logfmt/@v/v0.0.0-20140226030751-b84e30acd515.mod -> github.com%2Fkr%2Flogfmt%2F@v%2Fv0.0.0-20140226030751-b84e30acd515.mod mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pty/@v/v1.1.1.mod -> github.com%2Fkr%2Fpty%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/kr/text/@v/v0.1.0.zip -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/kr/text/@v/v0.1.0.mod -> github.com%2Fkr%2Ftext%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/mailru/easyjson/@v/v0.0.0-20160728113105-d5b7844b561a.mod -> github.com%2Fmailru%2Feasyjson%2F@v%2Fv0.0.0-20160728113105-d5b7844b561a.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.4.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.4.mod mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.zip -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/matttproud/golang_protobuf_extensions/@v/v1.0.1.mod -> github.com%2Fmatttproud%2Fgolang_protobuf_extensions%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180228061459-e0a39a4cb421.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180228061459-e0a39a4cb421.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.mod -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v0.0.0-20180701023420-4b7aa43c6742.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv0.0.0-20180701023420-4b7aa43c6742.mod mirror://goproxy//github.com/modern-go/reflect2/@v/v1.0.1.mod -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/munnerz/goautoneg/@v/v0.0.0-20120707110453-a547fc61f48d.mod -> github.com%2Fmunnerz%2Fgoautoneg%2F@v%2Fv0.0.0-20120707110453-a547fc61f48d.mod mirror://goproxy//github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod -> github.com%2Fmwitkow%2Fgo-conntrack%2F@v%2Fv0.0.0-20161129095857-cc309e4a2223.mod mirror://goproxy//github.com/mxk/go-flowrate/@v/v0.0.0-20140419014527-cca7078d478f.mod -> github.com%2Fmxk%2Fgo-flowrate%2F@v%2Fv0.0.0-20140419014527-cca7078d478f.mod mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.zip -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.zip mirror://goproxy//github.com/nxadm/tail/@v/v1.4.4.mod -> github.com%2Fnxadm%2Ftail%2F@v%2Fv1.4.4.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v0.0.0-20170829012221-11459a886d9c.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv0.0.0-20170829012221-11459a886d9c.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.11.0.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.11.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.1.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.1.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.3.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.3.zip mirror://goproxy//github.com/onsi/ginkgo/@v/v1.12.3.mod -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.12.3.mod mirror://goproxy//github.com/onsi/gomega/@v/v0.0.0-20170829124025-dcabb60a477c.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv0.0.0-20170829124025-dcabb60a477c.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.0.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.7.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.10.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.10.1.mod mirror://goproxy//github.com/pires/go-proxyproto/@v/v0.0.0-20190111085350-4d51b51e3bfc.zip -> github.com%2Fpires%2Fgo-proxyproto%2F@v%2Fv0.0.0-20190111085350-4d51b51e3bfc.zip mirror://goproxy//github.com/pires/go-proxyproto/@v/v0.0.0-20190111085350-4d51b51e3bfc.mod -> github.com%2Fpires%2Fgo-proxyproto%2F@v%2Fv0.0.0-20190111085350-4d51b51e3bfc.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.0.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.zip -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.zip mirror://goproxy//github.com/pkg/errors/@v/v0.8.1.mod -> github.com%2Fpkg%2Ferrors%2F@v%2Fv0.8.1.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.zip -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.zip mirror://goproxy//github.com/pquerna/cachecontrol/@v/v0.0.0-20180517163645-1555304b9b35.mod -> github.com%2Fpquerna%2Fcachecontrol%2F@v%2Fv0.0.0-20180517163645-1555304b9b35.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.0.0.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v1.4.1.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20190129233127-fd36f4220a90.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20190129233127-fd36f4220a90.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/prometheus/client_model/@v/v0.2.0.mod -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/prometheus/common/@v/v0.4.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.4.1.mod mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/prometheus/common/@v/v0.9.1.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181005140218-185b4288413d.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181005140218-185b4288413d.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.2.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.2.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.8.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/rakyll/statik/@v/v0.1.1.zip -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.1.zip mirror://goproxy//github.com/rakyll/statik/@v/v0.1.1.mod -> github.com%2Frakyll%2Fstatik%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/rodaine/table/@v/v1.0.0.zip -> github.com%2Frodaine%2Ftable%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/rodaine/table/@v/v1.0.0.mod -> github.com%2Frodaine%2Ftable%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.2.0.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.2.0.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.4.2.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.zip -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180927180507-b2de0cb4f26d.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.zip -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip mirror://goproxy//github.com/smartystreets/goconvey/@v/v1.6.4.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.zip -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.zip mirror://goproxy//github.com/spf13/cobra/@v/v0.0.3.mod -> github.com%2Fspf13%2Fcobra%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/spf13/pflag/@v/v0.0.0-20170130214245-9ff6c6923cff.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv0.0.0-20170130214245-9ff6c6923cff.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.5.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.5.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.1.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.2.2.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.2.2.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.3.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.3.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/templexxx/cpufeat/@v/v0.0.0-20170927014610-3794dfbfb047.zip -> github.com%2Ftemplexxx%2Fcpufeat%2F@v%2Fv0.0.0-20170927014610-3794dfbfb047.zip mirror://goproxy//github.com/templexxx/cpufeat/@v/v0.0.0-20170927014610-3794dfbfb047.mod -> github.com%2Ftemplexxx%2Fcpufeat%2F@v%2Fv0.0.0-20170927014610-3794dfbfb047.mod mirror://goproxy//github.com/templexxx/xor/@v/v0.0.0-20170926022130-0af8e873c554.zip -> github.com%2Ftemplexxx%2Fxor%2F@v%2Fv0.0.0-20170926022130-0af8e873c554.zip mirror://goproxy//github.com/templexxx/xor/@v/v0.0.0-20170926022130-0af8e873c554.mod -> github.com%2Ftemplexxx%2Fxor%2F@v%2Fv0.0.0-20170926022130-0af8e873c554.mod mirror://goproxy//github.com/tjfoc/gmsm/@v/v0.0.0-20171124023159-98aa888b79d8.zip -> github.com%2Ftjfoc%2Fgmsm%2F@v%2Fv0.0.0-20171124023159-98aa888b79d8.zip mirror://goproxy//github.com/tjfoc/gmsm/@v/v0.0.0-20171124023159-98aa888b79d8.mod -> github.com%2Ftjfoc%2Fgmsm%2F@v%2Fv0.0.0-20171124023159-98aa888b79d8.mod mirror://goproxy//github.com/xtaci/lossyconn/@v/v0.0.0-20190602105132-8df528c0c9ae.zip -> github.com%2Fxtaci%2Flossyconn%2F@v%2Fv0.0.0-20190602105132-8df528c0c9ae.zip mirror://goproxy//github.com/xtaci/lossyconn/@v/v0.0.0-20190602105132-8df528c0c9ae.mod -> github.com%2Fxtaci%2Flossyconn%2F@v%2Fv0.0.0-20190602105132-8df528c0c9ae.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20180904163835-0709b304e793.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20180904163835-0709b304e793.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190228161510-8dd112bcdc25.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190228161510-8dd112bcdc25.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20170114055629-f2499483f923.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20170114055629-f2499483f923.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180724234803-3673e40ba225.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180724234803-3673e40ba225.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20180906233101-161cd47e91fd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180906233101-161cd47e91fd.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181114220301-adae6a3d119a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181114220301-adae6a3d119a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190108225652-1e06a53dbb7e.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190108225652-1e06a53dbb7e.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190228165749-92fc7df08ae7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190228165749-92fc7df08ae7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190311183353-d8887717615a.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190613194153-d28f0bde5980.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190613194153-d28f0bde5980.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20191004110552-13f9640d40b9.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20191004110552-13f9640d40b9.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20200520004742-59133d7f0dd7.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20200520004742-59133d7f0dd7.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20200107190931-bf48bf16ab8d.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20200107190931-bf48bf16ab8d.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20180314180146-1d60e4601c6f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20180314180146-1d60e4601c6f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181108010431-42b317875d0f.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181108010431-42b317875d0f.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20181221193216-37e7f081c4d4.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20181221193216-37e7f081c4d4.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190911185100-cd5d95a43a6e.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190911185100-cd5d95a43a6e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20170830134202-bb24a47a89ea.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20170830134202-bb24a47a89ea.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180905080454-ebe1bf3edb33.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180905080454-ebe1bf3edb33.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180909124046-d0be0721c37e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180909124046-d0be0721c37e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20181116152217-5ac8a444bdc5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181116152217-5ac8a444bdc5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190422165155-953cdadca894.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190422165155-953cdadca894.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190904154756-749cb33beabd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190904154756-749cb33beabd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191005200804-aed5e4c7ecf9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191005200804-aed5e4c7ecf9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191022100944-742c48ecaeb7.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191022100944-742c48ecaeb7.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191120155948-bd437916bb0e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191120155948-bd437916bb0e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200122134326-e047566fdf82.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200122134326-e047566fdf82.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200323222414-85ca7c5b95cd.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200519105757-fe76b779f299.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200519105757-fe76b779f299.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200602225109-6fdc65e7d980.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200602225109-6fdc65e7d980.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160726164857-2910a502d2bf.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160726164857-2910a502d2bf.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.2.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.zip mirror://goproxy//golang.org/x/text/@v/v0.3.2.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20191024005414-555d28b269f0.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20191024005414-555d28b269f0.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181011042414-1f849cf54d09.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181011042414-1f849cf54d09.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20181030221726-6c7e314b6563.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20181030221726-6c7e314b6563.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190328211700-ab21143f2384.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.zip -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.zip mirror://goproxy//google.golang.org/appengine/@v/v1.4.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.4.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200109180630-ec00e32a8dfd.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200109180630-ec00e32a8dfd.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200221191635-4d8936d0db64.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200221191635-4d8936d0db64.mod mirror://goproxy//google.golang.org/protobuf/@v/v0.0.0-20200228230310-ab0ca4ff8a60.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv0.0.0-20200228230310-ab0ca4ff8a60.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.20.1-0.20200309200217-e05f789c0967.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.20.1-0.20200309200217-e05f789c0967.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.21.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.21.0.mod mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.zip -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/protobuf/@v/v1.23.0.mod -> google.golang.org%2Fprotobuf%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20180628173108-788fd7840127.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20180628173108-788fd7840127.mod mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.zip mirror://goproxy//gopkg.in/check.v1/@v/v1.0.0-20190902080502-41f04d3bba15.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv1.0.0-20190902080502-41f04d3bba15.mod mirror://goproxy//gopkg.in/fsnotify.v1/@v/v1.4.7.mod -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.mod -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.62.0.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.62.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.4.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.4.1.mod mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.zip -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.zip mirror://goproxy//gopkg.in/tomb.v1/@v/v1.0.0-20141024135613-dd632973f1e7.mod -> gopkg.in%2Ftomb.v1%2F@v%2Fv1.0.0-20141024135613-dd632973f1e7.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.1.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.1.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.4.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.5.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.5.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.3.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.3.0.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.18.3.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.18.3.mod mirror://goproxy//k8s.io/gengo/@v/v0.0.0-20190128074634-0689ccc1d7d6.mod -> k8s.io%2Fgengo%2F@v%2Fv0.0.0-20190128074634-0689ccc1d7d6.mod mirror://goproxy//k8s.io/klog/@v/v0.0.0-20181102134211-b9b56d5dfc92.mod -> k8s.io%2Fklog%2F@v%2Fv0.0.0-20181102134211-b9b56d5dfc92.mod mirror://goproxy//k8s.io/klog/@v/v1.0.0.mod -> k8s.io%2Fklog%2F@v%2Fv1.0.0.mod mirror://goproxy//k8s.io/kube-openapi/@v/v0.0.0-20200410145947-61e04a5be9a6.mod -> k8s.io%2Fkube-openapi%2F@v%2Fv0.0.0-20200410145947-61e04a5be9a6.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0-20200116222232-67a7b8c61874.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0-20200116222232-67a7b8c61874.mod mirror://goproxy//sigs.k8s.io/structured-merge-diff/v3/@v/v3.0.0.mod -> sigs.k8s.io%2Fstructured-merge-diff%2Fv3%2F@v%2Fv3.0.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.1.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.1.0.mod mirror://goproxy//sigs.k8s.io/yaml/@v/v1.2.0.mod -> sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod
+_eclasses_=go-module 92660621959e7fab813173772987588b multilib d410501a125f99ffb560b0c523cd3d1e systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=d8d476aae80f5468c66321de267ca1ab
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index ddacdf52ad8f..02492c1ce31c 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/m4rie-20200115 b/metadata/md5-cache/sci-libs/m4rie-20200115
deleted file mode 100644
index 05e2193b3cf4..000000000000
--- a/metadata/md5-cache/sci-libs/m4rie-20200115
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=sci-libs/m4ri-20140914
-DESCRIPTION=Fast dense matrix arithmetic over GF(2^e) for 2 <= e <= 16
-EAPI=7
-HOMEPAGE=https://bitbucket.org/malb/m4rie/
-IUSE=debug static-libs
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-2+
-RDEPEND=>=sci-libs/m4ri-20140914
-SLOT=0
-SRC_URI=https://bitbucket.org/malb/m4rie/downloads/m4rie-20200115.tar.gz
-_md5_=2d057f87c6b6fe0bd14d2f5f08fd2164
diff --git a/metadata/md5-cache/sci-libs/m4rie-20200115-r1 b/metadata/md5-cache/sci-libs/m4rie-20200115-r1
new file mode 100644
index 000000000000..084f5ba0344b
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/m4rie-20200115-r1
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=sci-libs/m4ri
+DESCRIPTION=Fast dense matrix arithmetic over GF(2^e) for 2 <= e <= 16
+EAPI=7
+HOMEPAGE=https://bitbucket.org/malb/m4rie/
+IUSE=debug static-libs
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+LICENSE=GPL-2+
+RDEPEND=sci-libs/m4ri
+SLOT=0
+SRC_URI=https://bitbucket.org/malb/m4rie/downloads/m4rie-20200115.tar.gz
+_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=dfd3defa2378b5b48fced8595274c055
diff --git a/metadata/md5-cache/sci-libs/openblas-0.3.14 b/metadata/md5-cache/sci-libs/openblas-0.3.14
new file mode 100644
index 000000000000..a0d55451aefc
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.14
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile install postinst postrm prepare pretend setup test
+DEPEND=virtual/fortran
+DESCRIPTION=Optimized BLAS library based on GotoBLAS2
+EAPI=7
+HOMEPAGE=http://xianyi.github.com/OpenBLAS/
+IUSE=dynamic eselect-ldso index-64bit openmp pthread relapack test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 >=app-eselect/eselect-lapack-0.2 ) virtual/fortran
+REQUIRED_USE=?? ( openmp pthread )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.14.tar.gz -> openblas-0.3.14.tar.gz
+_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 fortran-2 b4796813ccda91c9c0d3463fc90aa969 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=383a1059bda6b97723b672d95e4b1ce0
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index 4da317deadb5..108aa11e8385 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r1 b/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r1
index 5ec580f1585c..5f087b1870b4 100644
--- a/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r1
+++ b/metadata/md5-cache/sci-mathematics/topcom-0.17.8-r1
@@ -4,11 +4,11 @@ DEPEND=dev-libs/gmp:0 >=sci-libs/cddlib-094f
DESCRIPTION=Computing Triangulations Of Point Configurations and Oriented Matroids
EAPI=7
HOMEPAGE=http://www.rambau.wm.uni-bayreuth.de/TOPCOM/
-IUSE=doc examples
+IUSE=examples
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/gmp:0 >=sci-libs/cddlib-094f
SLOT=0
-SRC_URI=http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-0.17.8.tar.gz doc? ( http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html )
+SRC_URI=http://www.rambau.wm.uni-bayreuth.de/Software/TOPCOM-0.17.8.tar.gz http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=ee3be5b3034a8a18ac2294baf7eb1c3e
+_md5_=db2c81f675467b39bb364775158ceb76
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index bdda2dc3a4c2..e2ddc3a014fa 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/fakechroot-2.19 b/metadata/md5-cache/sys-apps/fakechroot-2.19
deleted file mode 100644
index d091a0519284..000000000000
--- a/metadata/md5-cache/sys-apps/fakechroot-2.19
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Provide a faked chroot environment without requiring root privileges
-EAPI=7
-HOMEPAGE=https://github.com/dex4er/fakechroot
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86
-LICENSE=LGPL-2.1
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/dex4er/fakechroot/releases/download/2.19/fakechroot-2.19.tar.gz
-_md5_=bbc7e5973905a0e26e246b0f6484e62e
diff --git a/metadata/md5-cache/sys-apps/file-5.39-r4 b/metadata/md5-cache/sys-apps/file-5.39-r4
index fed08333be20..e89828e3966e 100644
--- a/metadata/md5-cache/sys-apps/file-5.39-r4
+++ b/metadata/md5-cache/sys-apps/file-5.39-r4
@@ -5,11 +5,11 @@ DESCRIPTION=identify a file's format by scanning binary data for patterns
EAPI=7
HOMEPAGE=https://www.darwinsys.com/file/
IUSE=bzip2 lzma python seccomp static-libs zlib python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD-2
RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 ) )
SLOT=0
SRC_URI=ftp://ftp.astron.com/pub/file/file-5.39.tar.gz
_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=87abc51b804740270e3a2e98157a316f
+_md5_=74a2252307ac9070226d25785fcefe89
diff --git a/metadata/md5-cache/sys-apps/fwts-20.05.00 b/metadata/md5-cache/sys-apps/fwts-20.05.00
deleted file mode 100644
index 85dd0ac99441..000000000000
--- a/metadata/md5-cache/sys-apps/fwts-20.05.00
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/glib:2 >=dev-libs/json-c-0.10-r1 dev-libs/libpcre sys-apps/dmidecode sys-apps/pciutils sys-power/iasl sys-power/pmtools sys-devel/libtool
-DESCRIPTION=Firmware Test Suite
-EAPI=7
-HOMEPAGE=https://wiki.ubuntu.com/Kernel/Reference/fwts
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-libs/json-c-0.10-r1 dev-libs/libpcre sys-apps/dmidecode sys-apps/pciutils sys-power/iasl sys-power/pmtools
-SLOT=0
-SRC_URI=https://launchpad.net/ubuntu/+archive/primary/+files/fwts_20.05.00.orig.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=a8d03842ea79209cbb0d243baaaf0e2c
diff --git a/metadata/md5-cache/sys-apps/miller-5.3.0 b/metadata/md5-cache/sys-apps/miller-5.3.0
deleted file mode 100644
index 5a1ffc30b9c1..000000000000
--- a/metadata/md5-cache/sys-apps/miller-5.3.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=sys-devel/flex >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A tool like sed, awk, cut, join, and sort for name-indexed data (CSV, JSON, ..)
-EAPI=6
-HOMEPAGE=https://johnkerl.org/miller/doc/index.html
-IUSE=doc test
-KEYWORDS=amd64 arm x86
-LICENSE=BSD-2
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/johnkerl/miller/archive/v5.3.0.tar.gz -> miller-5.3.0.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=4dc1581e19af79a70f6485eb070e91c8
diff --git a/metadata/md5-cache/sys-apps/pick-3.0.1 b/metadata/md5-cache/sys-apps/pick-3.0.1
deleted file mode 100644
index 183a7484e712..000000000000
--- a/metadata/md5-cache/sys-apps/pick-3.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install
-DEPEND=sys-libs/ncurses:0= virtual/pkgconfig
-DESCRIPTION=a fuzzy search tool for the command-line
-EAPI=7
-HOMEPAGE=https://github.com/mptre/pick
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=https://github.com/mptre/pick/releases/download/v3.0.1/pick-3.0.1.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=c52a439f335977ebb821f05e3c75058f
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.11.4-r1 b/metadata/md5-cache/sys-apps/pkgcore-0.11.4-r1
index 9ea2c47509bb..829047da6912 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.11.4-r1
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.11.4-r1
@@ -4,7 +4,7 @@ DESCRIPTION=a framework for package management
EAPI=7
HOMEPAGE=https://github.com/pkgcore/pkgcore
IUSE=test python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos
LICENSE=BSD MIT
RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.9.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_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(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.11.4.tar.gz
_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=26319f896db23df339c8fa5b51685d49
+_md5_=ad1fff346d10d3e51eb8e8b1bfd45cf5
diff --git a/metadata/md5-cache/sys-apps/systemd-247.2-r4 b/metadata/md5-cache/sys-apps/systemd-247.2-r4
index def88048c9d9..fa6b39075acc 100644
--- a/metadata/md5-cache/sys-apps/systemd-247.2-r4
+++ b/metadata/md5-cache/sys-apps/systemd-247.2-r4
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
SLOT=0/2
SRC_URI=https://github.com/systemd/systemd-stable/archive/v247.2/systemd-stable-247.2.tar.gz
_eclasses_=bash-completion-r1 be99724bde4274de21e581204e9d164a edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 meson e43eef9331f54965a573ed380854ff47 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multilib-build 9a65133006c608964888346a412cc454 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pam b097695df28f3974e3af860d6704d4f2 python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6 usr-ldscript 7c918d239d0f9098867d0c8e33348fc9 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=74c8f23cf8a9cfa580435873ede5a710
+_md5_=0d805a7491fd0209706e0aa690bdf2eb
diff --git a/metadata/md5-cache/sys-apps/udevil-0.4.4-r3 b/metadata/md5-cache/sys-apps/udevil-0.4.4-r3
deleted file mode 100644
index e62ad8aaacbc..000000000000
--- a/metadata/md5-cache/sys-apps/udevil-0.4.4-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/plugdev >=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=mount and unmount removable devices without a password
-EAPI=6
-HOMEPAGE=https://ignorantguru.github.com/udevil/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=acct-group/plugdev >=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143
-SLOT=0
-SRC_URI=https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz -> udevil-0.4.4.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=e55d119d1a36f400a0a59daedbcbaa2f
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 1a979961eca9..53190250f063 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/otpcalc-0.97-r8 b/metadata/md5-cache/sys-auth/otpcalc-0.97-r8
deleted file mode 100644
index df6b5e338694..000000000000
--- a/metadata/md5-cache/sys-auth/otpcalc-0.97-r8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/gtk+:2 dev-libs/openssl:0= virtual/pkgconfig
-DESCRIPTION=A One Time Password and S/Key calculator for X
-EAPI=6
-HOMEPAGE=http://www.killa.net/infosec/otpCalc/
-KEYWORDS=~alpha amd64 ppc sparc x86
-LICENSE=GPL-2+
-RDEPEND=x11-libs/gtk+:2 dev-libs/openssl:0=
-SLOT=0
-SRC_URI=http://www.killa.net/infosec/otpCalc/otpCalc-0.97.tar.gz https://dev.gentoo.org/~ulm/distfiles/otpcalc-0.97-patches-1.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=21661fa8dad010e6572112f54b58ca2a
diff --git a/metadata/md5-cache/sys-auth/otpcalc-0.97.9 b/metadata/md5-cache/sys-auth/otpcalc-0.97.9
index f76e08b2c848..fc06d68ef7df 100644
--- a/metadata/md5-cache/sys-auth/otpcalc-0.97.9
+++ b/metadata/md5-cache/sys-auth/otpcalc-0.97.9
@@ -4,10 +4,10 @@ DEPEND=dev-libs/openssl:0= x11-libs/gtk+:3 dev-util/desktop-file-utils x11-misc/
DESCRIPTION=A One Time Password and S/Key calculator for GTK+
EAPI=7
HOMEPAGE=http://www.killa.net/infosec/otpCalc/ https://gitlab.com/ulm/otpcalc
-KEYWORDS=~alpha ~amd64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ppc sparc x86
LICENSE=GPL-2+
RDEPEND=dev-libs/openssl:0= x11-libs/gtk+:3
SLOT=0
SRC_URI=https://gitlab.com/ulm/otpcalc/-/archive/0.97.9/otpcalc-0.97.9.tar.bz2
_eclasses_=meson e43eef9331f54965a573ed380854ff47 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=c4604e36d565780a0d31f0b3148d0665
+_md5_=a560ab01242412baa4024952f94fe11c
diff --git a/metadata/md5-cache/sys-auth/seatd-0.5.0 b/metadata/md5-cache/sys-auth/seatd-0.5.0
new file mode 100644
index 000000000000..a4ef1ae2a810
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/seatd-0.5.0
@@ -0,0 +1,15 @@
+BDEPEND=>=app-text/scdoc-1.9.7 >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install test
+DEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+DESCRIPTION=Minimal seat management daemon and universal library
+EAPI=7
+HOMEPAGE=https://sr.ht/~kennylevinsen/seatd
+IUSE=elogind systemd
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0/1
+SRC_URI=https://git.sr.ht/~kennylevinsen/seatd/archive/0.5.0.tar.gz -> seatd-0.5.0.tar.gz
+_eclasses_=meson e43eef9331f54965a573ed380854ff47 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 2dc8e06a3429719b43e9140f7292a425 systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=9fb398337cd9ad49d2b4b7846815571f
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 24888d0b77cc..fc96664bd263 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/di-4.48.0.1 b/metadata/md5-cache/sys-block/di-4.48.0.1
index 6a7717b48571..05b57058d58c 100644
--- a/metadata/md5-cache/sys-block/di-4.48.0.1
+++ b/metadata/md5-cache/sys-block/di-4.48.0.1
@@ -4,10 +4,10 @@ DESCRIPTION=Disk Information Utility
EAPI=7
HOMEPAGE=https://diskinfo-di.sourceforge.io/
IUSE=nls
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ppc ~ppc64 ~x86
LICENSE=ZLIB
RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/diskinfo-di/di-4.48.0.1.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=96289b65103c14b9be0a186450576831
+_md5_=edb7e60f9ad8b241b8c75ada1e1f4da8
diff --git a/metadata/md5-cache/sys-block/di-4.47.3 b/metadata/md5-cache/sys-block/di-4.49
similarity index 60%
rename from metadata/md5-cache/sys-block/di-4.47.3
rename to metadata/md5-cache/sys-block/di-4.49
index aa6a5db338f4..5ea44f42b73f 100644
--- a/metadata/md5-cache/sys-block/di-4.47.3
+++ b/metadata/md5-cache/sys-block/di-4.49
@@ -2,12 +2,12 @@ BDEPEND=nls? ( sys-devel/gettext )
DEFINED_PHASES=compile configure install
DESCRIPTION=Disk Information Utility
EAPI=7
-HOMEPAGE=https://gentoo.com/di/
+HOMEPAGE=https://diskinfo-di.sourceforge.io/
IUSE=nls
-KEYWORDS=amd64 ppc ppc64 x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
LICENSE=ZLIB
RESTRICT=test
SLOT=0
-SRC_URI=https://gentoo.com/di/di-4.47.3.tar.gz
+SRC_URI=mirror://sourceforge/diskinfo-di/di-4.49.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=8ba88cb3180ac6253000c01ccbcd87b2
+_md5_=96289b65103c14b9be0a186450576831
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index d0365b37c93b..9ac096b8ed12 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/grub-2.06_rc1 b/metadata/md5-cache/sys-boot/grub-2.06_rc1
index aa611b7c6f5b..3a507e5d85c8 100644
--- a/metadata/md5-cache/sys-boot/grub-2.06_rc1
+++ b/metadata/md5-cache/sys-boot/grub-2.06_rc1
@@ -1,5 +1,5 @@
BDEPEND=app-misc/pax-utils sys-devel/flex sys-devel/bison sys-apps/help2man sys-apps/texinfo fonts? ( media-libs/freetype:2 virtual/pkgconfig ) test? ( app-admin/genromfs app-arch/cpio app-arch/lzop app-emulation/qemu dev-libs/libisoburn sys-apps/miscfiles sys-block/parted sys-fs/squashfs-tools ) themes? ( app-arch/unzip media-libs/freetype:2 virtual/pkgconfig ) truetype? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
DEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 )
DESCRIPTION=GNU GRUB boot loader
EAPI=7
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.gnu.org/software/grub/
IUSE=device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs grub_platforms_coreboot grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_emu grub_platforms_ieee1275 grub_platforms_loongson grub_platforms_multiboot grub_platforms_qemu grub_platforms_qemu-mips grub_platforms_pc grub_platforms_uboot grub_platforms_xen grub_platforms_xen-32 grub_platforms_xen-pvh
KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )
-RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 !sys-boot/grub-static nls? ( sys-devel/gettext )
+RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 nls? ( sys-devel/gettext )
REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts )
RESTRICT=!test? ( test )
SLOT=2/2.06_rc1
SRC_URI=https://alpha.gnu.org/gnu/grub/grub-2.06~rc1.tar.xz fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
_eclasses_=bash-completion-r1 be99724bde4274de21e581204e9d164a edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e optfeature 6a2add34e06e5a05d88471a33ccdd73e pax-utils a41d1fd1c111289ffa04490de6ee79d7 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=c355c67f247122db20395e99234162db
+_md5_=e798b1e2ba1bdec2a6706aa4cabb054c
diff --git a/metadata/md5-cache/sys-boot/grub-9999 b/metadata/md5-cache/sys-boot/grub-9999
index f322c739d649..1221399a9802 100644
--- a/metadata/md5-cache/sys-boot/grub-9999
+++ b/metadata/md5-cache/sys-boot/grub-9999
@@ -7,10 +7,10 @@ HOMEPAGE=https://www.gnu.org/software/grub/
IUSE=device-mapper doc efiemu +fonts mount nls sdl test +themes truetype libzfs grub_platforms_coreboot grub_platforms_efi-32 grub_platforms_efi-64 grub_platforms_emu grub_platforms_ieee1275 grub_platforms_loongson grub_platforms_multiboot grub_platforms_qemu grub_platforms_qemu-mips grub_platforms_pc grub_platforms_uboot grub_platforms_xen grub_platforms_xen-32 grub_platforms_xen-pvh
LICENSE=GPL-3+ BSD MIT fonts? ( GPL-2-with-font-exception ) themes? ( CC-BY-SA-3.0 BitstreamVera )
PROPERTIES=live
-RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 !sys-boot/grub-static nls? ( sys-devel/gettext )
+RDEPEND=app-arch/xz-utils >=sys-libs/ncurses-5.2-r5:0= grub_platforms_emu? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs:= ) mount? ( sys-fs/fuse:0 ) truetype? ( media-libs/freetype:2= ) ppc? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) ppc64? ( >=sys-apps/ibm-powerpc-utils-1.3.5 ) kernel_linux? ( grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr ) ) !sys-boot/grub:0 nls? ( sys-devel/gettext )
REQUIRED_USE=grub_platforms_coreboot? ( fonts ) grub_platforms_qemu? ( fonts ) grub_platforms_ieee1275? ( fonts ) grub_platforms_loongson? ( fonts )
RESTRICT=!test? ( test )
SLOT=2/9999
SRC_URI=fonts? ( mirror://gnu/unifont/unifont-12.1.02/unifont-12.1.02.pcf.gz ) themes? ( mirror://sourceforge/dejavu/dejavu-sans-ttf-2.37.zip )
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 bash-completion-r1 be99724bde4274de21e581204e9d164a edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 git-r3 3e7ec3d6619213460c85e2aa48398441 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e optfeature 6a2add34e06e5a05d88471a33ccdd73e pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=c355c67f247122db20395e99234162db
+_md5_=e798b1e2ba1bdec2a6706aa4cabb054c
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 9ae483cd9d9c..239b7f81e0eb 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/drbd-utils-9.15.1 b/metadata/md5-cache/sys-cluster/drbd-utils-9.15.1-r1
similarity index 95%
rename from metadata/md5-cache/sys-cluster/drbd-utils-9.15.1
rename to metadata/md5-cache/sys-cluster/drbd-utils-9.15.1-r1
index 00600530caa3..f32ce39899d8 100644
--- a/metadata/md5-cache/sys-cluster/drbd-utils-9.15.1
+++ b/metadata/md5-cache/sys-cluster/drbd-utils-9.15.1-r1
@@ -11,4 +11,4 @@ RDEPEND=pacemaker? ( sys-cluster/pacemaker ) udev? ( virtual/udev )
SLOT=0
SRC_URI=https://www.linbit.com/downloads/drbd/utils/drbd-utils-9.15.1.tar.gz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 bash-completion-r1 be99724bde4274de21e581204e9d164a libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=2309a09d9a65c3cf36688f08999b24b3
+_md5_=1f007aedcc925d341ec2d350f9e44d2d
diff --git a/metadata/md5-cache/sys-cluster/libqb-2.0.1-r1 b/metadata/md5-cache/sys-cluster/libqb-2.0.1-r1
index 4349bdb0455a..657bc8575c72 100644
--- a/metadata/md5-cache/sys-cluster/libqb-2.0.1-r1
+++ b/metadata/md5-cache/sys-cluster/libqb-2.0.1-r1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0/100
SRC_URI=https://github.com/ClusterLabs/libqb/releases/download/v2.0.1/libqb-2.0.1.tar.xz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=45154f1022b7cc4e270b7645e60dde37
+_md5_=a4e318d21e501a4f2d61a51fbf346f2a
diff --git a/metadata/md5-cache/sys-cluster/nova-21.2.0 b/metadata/md5-cache/sys-cluster/nova-21.2.0
new file mode 100644
index 000000000000..a374658e2c7d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nova-21.2.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] app-admin/sudo
+DESCRIPTION=Cloud computing fabric controller
+EAPI=7
+HOMEPAGE=https://launchpad.net/nova
+IUSE=+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python3_7 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.19[sqlite,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/decorator-3.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/eventlet-0.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/eventlet-0.20.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jinja-2.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/lxml-2.4.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/lxml-3.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cryptography-2.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/greenlet-0.4.10[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/greenlet-0.4.14[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] =dev-python/sqlalchemy-migrate-0.13.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/paramiko-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/Babel-2.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/Babel-2.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jsonschema-2.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/python-cinderclient-4.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-neutronclient-6.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/websockify-0.9.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-concurrency-3.29.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-config-6.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-context-2.22.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-serialization-1.21.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-upgradecheck-0.1.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-utils-4.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-db-4.44.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-messaging-10.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-policy-3.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-privsep-1.33.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-service-1.40.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/rfc3986-1.1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/oslo-versionedobjects-1.35.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-brick-3.0.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-resource-classes-0.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-traits-2.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-vif-1.14.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-win-3.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/castellan-0.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/microversion-parse-0.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-xenapi-0.3.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cursive-0.2.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pypowervm-1.1.15[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/retrying-1.3.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/os-service-types-1.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/taskflow-2.16.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/zVMCloudConnector-1.3.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/openstacksdk-0.35.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/libvirt-python[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] app-emulation/libvirt[iscsi?] app-emulation/spice-html5 novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) acct-user/nova acct-group/nova python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/ussuri/nova.conf.sample -> nova.conf.sample-21.2.0 https://tarballs.openstack.org/nova/nova-21.2.0.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=d6625cd78cfe587fb6e85c7da87e3e5e
diff --git a/metadata/md5-cache/sys-cluster/nova-22.2.0 b/metadata/md5-cache/sys-cluster/nova-22.2.0
new file mode 100644
index 000000000000..ac39518bb4ee
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nova-22.2.0
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-admin/sudo
+DESCRIPTION=Cloud computing fabric controller
+EAPI=7
+HOMEPAGE=https://launchpad.net/nova
+IUSE=+compute compute-only iscsi +memcached +mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python3_7 python_targets_python3_8 kernel_linux
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] compute-only? ( >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.2.19[sqlite,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pymysql-0.7.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/sqlalchemy-1.2.19[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=dev-python/decorator-4.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/eventlet-0.22.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jinja-2.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/lxml-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/routes-2.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cryptography-2.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/webob-1.8.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/greenlet-0.4.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/paste-2.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/prettytable-0.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] =dev-python/sqlalchemy-migrate-0.13.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netaddr-0.7.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/paramiko-2.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/jsonschema-3.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-cinderclient-3.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/python-cinderclient-4.0.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/keystoneauth-3.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-neutronclient-6.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-glanceclient-2.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/requests-2.23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.11.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/websockify-0.9.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-concurrency-3.29.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-config-6.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-context-2.22.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-log-3.36.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-reports-1.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-serialization-1.21.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-upgradecheck-0.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/oslo-serialization-2.19.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-utils-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-db-4.44.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-rootwrap-5.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-messaging-10.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-policy-3.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-privsep-1.33.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-service-1.40.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/rfc3986-1.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/psutil-3.2.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/oslo-versionedobjects-1.35.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-brick-3.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-resource-classes-0.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-traits-2.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-vif-1.14.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-win-4.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/castellan-0.16.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/microversion-parse-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-xenapi-0.3.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/tooz-1.58.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/cursive-0.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pypowervm-1.1.15[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/retrying-1.3.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/os-service-types-1.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/taskflow-3.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/python-dateutil-2.5.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/zVMCloudConnector-1.3.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/openstacksdk-0.35.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/libvirt-python[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-emulation/libvirt[iscsi?] app-emulation/spice-html5 novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( net-misc/openvswitch ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrtools sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r1 ) acct-user/nova acct-group/nova python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/victoria/nova.conf.sample -> nova.conf.sample-22.2.0 https://tarballs.openstack.org/nova/nova-22.2.0.tar.gz
+_eclasses_=distutils-r1 16579e06f8839831bd5c03455bb87e3f edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 udev 452708c3f55cf6e918b045adb949a9e6 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=429c7817517c9c772d7b3c9c173683b7
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 98ada70974b3..b608747be7a1 100644
Binary files a/metadata/md5-cache/sys-fs/Manifest.gz and b/metadata/md5-cache/sys-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-fs/fatresize-1.0.4 b/metadata/md5-cache/sys-fs/fatresize-1.0.4
deleted file mode 100644
index 0cd8ec9aac25..000000000000
--- a/metadata/md5-cache/sys-fs/fatresize-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-block/parted >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Resize FAT partitions using libparted
-EAPI=6
-HOMEPAGE=https://github.com/ya-mouse/fatresize
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=sys-block/parted
-SLOT=0
-SRC_URI=https://github.com/ya-mouse/fatresize/archive/v1.0.4.tar.gz -> fatresize-1.0.4.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=937625d4707d12e21aeebe9b2cb2a0ab
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 1c0ab0d6b7ee..b621f27ea4dd 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.24 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.24
new file mode 100644
index 000000000000..7dee2714e6fa
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.24
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.24
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.24 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.24
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils ba761317b3fcd25e34c3fb8e5bf1e45f kernel-build b34a23faa4245fd914731f4abd7f70d4 kernel-install 2154935526abef328cb31b7a02890f47 mount-boot 060ced4c5e0fd737db17cbb609bbf557 multilib d410501a125f99ffb560b0c523cd3d1e portability b2e405b5a3f051d58b50c9ffc6b883cf python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 savedconfig 0bc45cb0429003c9abc73bae24a0d5bd toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=fba18d6ed88831c3bfb3be6f23df76b1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7
new file mode 100644
index 000000000000..f1c8084e2ef3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.11.7
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.11.7
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.11.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.11.7
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.7 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.7 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.7 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.7 )
+_eclasses_=dist-kernel-utils ba761317b3fcd25e34c3fb8e5bf1e45f kernel-build b34a23faa4245fd914731f4abd7f70d4 kernel-install 2154935526abef328cb31b7a02890f47 mount-boot 060ced4c5e0fd737db17cbb609bbf557 multilib d410501a125f99ffb560b0c523cd3d1e portability b2e405b5a3f051d58b50c9ffc6b883cf python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 savedconfig 0bc45cb0429003c9abc73bae24a0d5bd toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=1687654212710ec51da40ff741f32e42
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.106 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.106
new file mode 100644
index 000000000000..d07120285eba
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.106
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.106
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.106 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.106
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.extras.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils ba761317b3fcd25e34c3fb8e5bf1e45f kernel-build b34a23faa4245fd914731f4abd7f70d4 kernel-install 2154935526abef328cb31b7a02890f47 mount-boot 060ced4c5e0fd737db17cbb609bbf557 multilib d410501a125f99ffb560b0c523cd3d1e portability b2e405b5a3f051d58b50c9ffc6b883cf python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 savedconfig 0bc45cb0429003c9abc73bae24a0d5bd toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=4f80f63e54afe6ee78426218f659326e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.24 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.24
new file mode 100644
index 000000000000..73ad29e7d180
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.24
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.24
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.24 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.24
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-27.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.24-1.xpak -> gentoo-kernel-5.10.24-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.24-1.xpak -> gentoo-kernel-5.10.24-1.x86.xpak )
+_eclasses_=dist-kernel-utils ba761317b3fcd25e34c3fb8e5bf1e45f kernel-install 2154935526abef328cb31b7a02890f47 mount-boot 060ced4c5e0fd737db17cbb609bbf557 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7
new file mode 100644
index 000000000000..62a240b7c187
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.11.7
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.11.7
+RDEPEND=!sys-kernel/gentoo-kernel:5.11.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.11.7
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7-1.xpak -> gentoo-kernel-5.11.7-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.11.7-1.xpak -> gentoo-kernel-5.11.7-1.x86.xpak )
+_eclasses_=dist-kernel-utils ba761317b3fcd25e34c3fb8e5bf1e45f kernel-install 2154935526abef328cb31b7a02890f47 mount-boot 060ced4c5e0fd737db17cbb609bbf557 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=17647ae32aae091a1fc3068d824145d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.106 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.106
new file mode 100644
index 000000000000..a3bc9abe74b0
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.106
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.106
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.106 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.106
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.106-1.xpak -> gentoo-kernel-5.4.106-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.106-1.xpak -> gentoo-kernel-5.4.106-1.x86.xpak )
+_eclasses_=dist-kernel-utils ba761317b3fcd25e34c3fb8e5bf1e45f kernel-install 2154935526abef328cb31b7a02890f47 mount-boot 060ced4c5e0fd737db17cbb609bbf557 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=8040503440faa9331505cbbbbc2a081a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.226 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.226
new file mode 100644
index 000000000000..8a29627ffd76
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.226
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.14 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.14.226
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-236.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-236.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-236.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-236.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-236.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-236.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-236.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-236.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-236.experimental.tar.xz )
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 055c42df72f76a4f45ec92b35e83cd56 kernel-2 29b0ddf528a34e7e8c7c179cfbdb5c26 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=1af704a6441d2f43910cc92fd44743ce
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.181 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.181
new file mode 100644
index 000000000000..3f3458e51f5a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.181
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.181
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-180.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-180.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-180.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-180.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-180.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-180.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-180.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-180.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-180.experimental.tar.xz )
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 055c42df72f76a4f45ec92b35e83cd56 kernel-2 29b0ddf528a34e7e8c7c179cfbdb5c26 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=4c90148c6785e72c091807174267f53d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.262 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.262
new file mode 100644
index 000000000000..830e646bf816
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.262
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.4.262
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-264.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-264.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-264.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-264.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-264.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-264.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.4-264.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.4-264.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.4-264.experimental.tar.xz )
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 055c42df72f76a4f45ec92b35e83cd56 kernel-2 29b0ddf528a34e7e8c7c179cfbdb5c26 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=5ccdd0c586afc7b3d521b68b5f186b2b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.262 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.262
new file mode 100644
index 000000000000..af29d6614b5d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.262
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.9.262
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-266.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-266.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-266.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-266.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-266.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-266.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-266.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-266.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-266.experimental.tar.xz )
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 055c42df72f76a4f45ec92b35e83cd56 kernel-2 29b0ddf528a34e7e8c7c179cfbdb5c26 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=886cce1642cb4907ac66cb9c7adb28c6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.7 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.7
new file mode 100644
index 000000000000..e380c34a29c6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.11.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.11 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.11.7
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-8.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-8.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-8.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.11-8.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.11-8.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.11-8.experimental.tar.xz )
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 055c42df72f76a4f45ec92b35e83cd56 kernel-2 29b0ddf528a34e7e8c7c179cfbdb5c26 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=17044596e01bdbfb5ec162f71671df16
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.106 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.106
new file mode 100644
index 000000000000..99289165590c
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.106
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.106
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-109.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-109.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-109.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-109.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-109.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-109.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-109.experimental.tar.xz )
+_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 055c42df72f76a4f45ec92b35e83cd56 kernel-2 29b0ddf528a34e7e8c7c179cfbdb5c26 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
+_md5_=bc6c1f754d3c438a37a324b6d7b68017
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20210315 b/metadata/md5-cache/sys-kernel/linux-firmware-20210315
new file mode 100644
index 000000000000..37759b92102b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20210315
@@ -0,0 +1,15 @@
+BDEPEND=initramfs? ( app-arch/cpio )
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
+DESCRIPTION=Linux firmware files
+EAPI=7
+HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
+IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable ( BSD-2 BSD BSD-4 ISC MIT no-source-code ) ) unknown-license? ( all-rights-reserved )
+RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl6050-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
+REQUIRED_USE=initramfs? ( redistributable )
+RESTRICT=strip test unknown-license? ( bindist )
+SLOT=0
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20210315.tar.xz
+_eclasses_=mount-boot 060ced4c5e0fd737db17cbb609bbf557 portability b2e405b5a3f051d58b50c9ffc6b883cf savedconfig 0bc45cb0429003c9abc73bae24a0d5bd
+_md5_=84f43187d6add4dd48ff4cc215f036b8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.24 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.24
new file mode 100644
index 000000000000..a97f99f6bffa
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.24
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.24
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.10.24 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.24
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.24.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.24.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils ba761317b3fcd25e34c3fb8e5bf1e45f kernel-build b34a23faa4245fd914731f4abd7f70d4 kernel-install 2154935526abef328cb31b7a02890f47 mount-boot 060ced4c5e0fd737db17cbb609bbf557 multilib d410501a125f99ffb560b0c523cd3d1e portability b2e405b5a3f051d58b50c9ffc6b883cf python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 savedconfig 0bc45cb0429003c9abc73bae24a0d5bd toolchain-funcs 24921b57d6561d87cbef4916a296ada4 verify-sig 40b4f4f782cf67118f594ce604cc4c0a
+_md5_=55d25c768d2ca6f514b0cfddb0277c73
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.7 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.7
new file mode 100644
index 000000000000..94a0f10e0354
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.11.7
@@ -0,0 +1,16 @@
+BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.11.7
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.11.7 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.11.7
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.7.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.10.18.tar.gz -> gentoo-kernel-config-5.10.18.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.11.7.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.11.7 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.11.7 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.11.7 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ee22e4872dec1ab1f08fabe765e18b945ebcc29e/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.11.7 )
+_eclasses_=dist-kernel-utils ba761317b3fcd25e34c3fb8e5bf1e45f kernel-build b34a23faa4245fd914731f4abd7f70d4 kernel-install 2154935526abef328cb31b7a02890f47 mount-boot 060ced4c5e0fd737db17cbb609bbf557 multilib d410501a125f99ffb560b0c523cd3d1e portability b2e405b5a3f051d58b50c9ffc6b883cf python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 savedconfig 0bc45cb0429003c9abc73bae24a0d5bd toolchain-funcs 24921b57d6561d87cbef4916a296ada4 verify-sig 40b4f4f782cf67118f594ce604cc4c0a
+_md5_=c7e39dc11f18c90fdb560df828929d00
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.106 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.106
new file mode 100644
index 000000000000..4d593c6b48dd
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.106
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) verify-sig? ( app-crypt/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( dev-lang/python:3.9 dev-lang/python:3.8 dev-lang/python:3.7 ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.4.106
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.106 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 ) virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.4.106
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.106.tar.xz https://github.com/mgorny/gentoo-kernel-config/archive/v5.4.89.tar.gz -> gentoo-kernel-config-5.4.89.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.106.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=dist-kernel-utils ba761317b3fcd25e34c3fb8e5bf1e45f kernel-build b34a23faa4245fd914731f4abd7f70d4 kernel-install 2154935526abef328cb31b7a02890f47 mount-boot 060ced4c5e0fd737db17cbb609bbf557 multilib d410501a125f99ffb560b0c523cd3d1e portability b2e405b5a3f051d58b50c9ffc6b883cf python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 savedconfig 0bc45cb0429003c9abc73bae24a0d5bd toolchain-funcs 24921b57d6561d87cbef4916a296ada4 verify-sig 40b4f4f782cf67118f594ce604cc4c0a
+_md5_=c898d64a206cfd37cd303e3d73d72a5f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.225 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.226
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.14.225
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.14.226
index fecd81d70eed..11737cea08bf 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.225
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.14.226
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
LICENSE=GPL-2
RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
RESTRICT=binchecks strip
-SLOT=4.14.225
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.225.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
+SLOT=4.14.226
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.226.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 055c42df72f76a4f45ec92b35e83cd56 kernel-2 29b0ddf528a34e7e8c7c179cfbdb5c26 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.180 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.181
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.180
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.181
index 1e69aadd04cb..a1d62c491c7c 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.180
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.181
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
LICENSE=GPL-2
RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
RESTRICT=binchecks strip
-SLOT=4.19.180
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.180.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.181
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.181.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 055c42df72f76a4f45ec92b35e83cd56 kernel-2 29b0ddf528a34e7e8c7c179cfbdb5c26 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.261 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.262
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.4.261
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.4.262
index bed0b269163f..ef935685738b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.261
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.4.262
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
LICENSE=GPL-2 linux-firmware
RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
RESTRICT=binchecks strip
-SLOT=4.4.261
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.261.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
+SLOT=4.4.262
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.262.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 055c42df72f76a4f45ec92b35e83cd56 kernel-2 29b0ddf528a34e7e8c7c179cfbdb5c26 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.261 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.262
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.9.261
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.9.262
index 1df3daeb6c6b..74c65883cebc 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.261
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.9.262
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
LICENSE=GPL-2 linux-firmware
RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
RESTRICT=binchecks strip
-SLOT=4.9.261
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.261.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
+SLOT=4.9.262
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.9.262.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 055c42df72f76a4f45ec92b35e83cd56 kernel-2 29b0ddf528a34e7e8c7c179cfbdb5c26 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.23 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.24
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.10.23
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.10.24
index 809f282503f9..0cebab27481a 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.23
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.10.24
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
LICENSE=GPL-2
RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
RESTRICT=binchecks strip
-SLOT=5.10.23
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.23.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
+SLOT=5.10.24
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.10.24.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 055c42df72f76a4f45ec92b35e83cd56 kernel-2 29b0ddf528a34e7e8c7c179cfbdb5c26 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.11.6 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.11.7
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.11.6
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.11.7
index 186289e764f1..a92d019b5348 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.11.6
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.11.7
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
LICENSE=GPL-2
RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
RESTRICT=binchecks strip
-SLOT=5.11.6
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.11.6.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
+SLOT=5.11.7
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.11.7.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.11.tar.xz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 055c42df72f76a4f45ec92b35e83cd56 kernel-2 29b0ddf528a34e7e8c7c179cfbdb5c26 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.105 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.106
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.105
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.106
index 042b803a82f4..b815da1b25be 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.105
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.106
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x
LICENSE=GPL-2
RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
RESTRICT=binchecks strip
-SLOT=5.4.105
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.105.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.106
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.106.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 055c42df72f76a4f45ec92b35e83cd56 kernel-2 29b0ddf528a34e7e8c7c179cfbdb5c26 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
_md5_=58f7232930e52ceba081454f3063a063
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index c26905386467..e9f091e6d9ea 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/zlib-ng-2.0.1 b/metadata/md5-cache/sys-libs/zlib-ng-2.0.1
new file mode 100644
index 000000000000..e4f4fd8f205c
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/zlib-ng-2.0.1
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=zlib data compression library
+EAPI=7
+HOMEPAGE=https://github.com/zlib-ng/zlib-ng
+IUSE=compat test
+LICENSE=ZLIB
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/zlib-ng/zlib-ng/archive/2.0.1.tar.gz -> zlib-ng-2.0.1.tar.gz
+_eclasses_=cmake 314a813be2f09820e8978cdee941e501 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=0aaa790d874501f04af78238bd3c4647
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 2a2d85b249cd..bf364edda0ba 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/cronie-1.5.6 b/metadata/md5-cache/sys-process/cronie-1.5.6
new file mode 100644
index 000000000000..6ffc1801ba24
--- /dev/null
+++ b/metadata/md5-cache/sys-process/cronie-1.5.6
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) elibc_uclibc? ( sys-libs/obstack-standalone ) ) >=sys-apps/sed-4.0.5
+DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cron
+EAPI=7
+HOMEPAGE=https://github.com/cronie-crond/cronie
+IUSE=+anacron +inotify pam selinux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=ISC BSD BSD-2 GPL-2
+RDEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) elibc_uclibc? ( sys-libs/obstack-standalone ) ) sys-apps/debianutils >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
+SLOT=0
+SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.5.6.tar.gz
+_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 cron 7804080fdc06c5016bdac0cc054e4b19 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e pam b097695df28f3974e3af860d6704d4f2 systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
+_md5_=44a01cc638265549f00254d8b3cb0868
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 7941ea688e8d..f099e1956d50 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.24 b/metadata/md5-cache/virtual/dist-kernel-5.10.24
new file mode 100644
index 000000000000..b76d38429e1f
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.24
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.24 ~sys-kernel/gentoo-kernel-bin-5.10.24 ~sys-kernel/vanilla-kernel-5.10.24 )
+SLOT=0/5.10.24
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.11.7 b/metadata/md5-cache/virtual/dist-kernel-5.11.7
new file mode 100644
index 000000000000..8d689e1aec47
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.11.7
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.11.7 ~sys-kernel/gentoo-kernel-bin-5.11.7 ~sys-kernel/vanilla-kernel-5.11.7 )
+SLOT=0/5.11.7
+_md5_=91d8b5962acc5c49e446c8c36367c827
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.106 b/metadata/md5-cache/virtual/dist-kernel-5.4.106
new file mode 100644
index 000000000000..d392d4365af7
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.106
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.106 ~sys-kernel/gentoo-kernel-bin-5.4.106 ~sys-kernel/vanilla-kernel-5.4.106 )
+SLOT=0/5.4.106
+_md5_=d432bd6c060165e457b136172ea0be2d
diff --git a/metadata/md5-cache/virtual/imap-c-client-1 b/metadata/md5-cache/virtual/imap-c-client-1
deleted file mode 100644
index 7e7e71ac4ed3..000000000000
--- a/metadata/md5-cache/virtual/imap-c-client-1
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for IMAP c-client
-EAPI=5
-IUSE=ssl
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-RDEPEND=|| ( net-libs/c-client[ssl=] net-mail/uw-imap[ssl=] )
-SLOT=0
-_md5_=c20b6b10beaaf74ad40059689c9570e0
diff --git a/metadata/md5-cache/virtual/mailx-1 b/metadata/md5-cache/virtual/mailx-1
deleted file mode 100644
index 2652f0d8406a..000000000000
--- a/metadata/md5-cache/virtual/mailx-1
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for mail implementations
-EAPI=5
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-RDEPEND=|| ( net-mail/mailutils mail-client/mailx mail-client/nail )
-SLOT=0
-_md5_=331070869f72f2d0a3ce29eb56073e99
diff --git a/metadata/md5-cache/virtual/mailx-2 b/metadata/md5-cache/virtual/mailx-2
deleted file mode 100644
index d950d0cdf6ce..000000000000
--- a/metadata/md5-cache/virtual/mailx-2
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for mail implementations
-EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-RDEPEND=|| ( net-mail/mailutils mail-client/mailx mail-client/s-nail mail-client/nail )
-SLOT=0
-_md5_=16c11552a4845ae7a60d7716962471b9
diff --git a/metadata/md5-cache/virtual/mailx-3 b/metadata/md5-cache/virtual/mailx-3
index a239d6d117e5..d1fea06ef7ac 100644
--- a/metadata/md5-cache/virtual/mailx-3
+++ b/metadata/md5-cache/virtual/mailx-3
@@ -1,7 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for mail implementations
EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
RDEPEND=|| ( net-mail/mailutils mail-client/mailx mail-client/s-nail )
SLOT=0
-_md5_=c752b904fb1cbd6c6bc206eeb447f6c2
+_md5_=1cf0fec13b50014aabd687883d436a3d
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 08eaa4377df6..fd7495f87b88 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/radicale-2.1.11-r1 b/metadata/md5-cache/www-apps/radicale-2.1.11-r1
deleted file mode 100644
index ac423769d198..000000000000
--- a/metadata/md5-cache/www-apps/radicale-2.1.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] virtual/pkgconfig
-DESCRIPTION=A simple CalDAV calendar server
-EAPI=6
-HOMEPAGE=https://radicale.org/
-IUSE=+bcrypt python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3+
-RDEPEND=sys-apps/util-linux >=dev-python/vobject-0.9.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.7.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] bcrypt? ( dev-python/passlib[bcrypt,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/R/Radicale/Radicale-2.1.11.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 distutils-r1 16579e06f8839831bd5c03455bb87e3f edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multibuild 6b3d5ee849dafe6cdfd7b859c211fb01 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 6d099888c5b4dd4868c26508df307e95 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 systemd 74b223e42834adf09a2d21fe5fe13741 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 user b0a0d4ca9e3f79c38f8f4143b8d5a2d8 user-info a2abd4e2f4c3b9b06d64bf1329359a02 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=207388a90f1475c0038398b9ed67e31f
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index ac6ac35288fd..5767a621d912 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-89.0.4389.82 b/metadata/md5-cache/www-client/chromium-89.0.4389.90
similarity index 98%
rename from metadata/md5-cache/www-client/chromium-89.0.4389.82
rename to metadata/md5-cache/www-client/chromium-89.0.4389.90
index 0b797bd4b906..fdd875bc3b7e 100644
--- a/metadata/md5-cache/www-client/chromium-89.0.4389.82
+++ b/metadata/md5-cache/www-client/chromium-89.0.4389.90
@@ -10,6 +10,6 @@ LICENSE=BSD
RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.4.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !headless? ( media-libs/mesa:=[gbm] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libXScrnSaver:= x11-libs/libxcb:= vaapi? ( >=x11-libs/libva-2.7:=[X,drm] ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 x11-libs/gtk+:3[X] wayland? ( dev-libs/wayland:= dev-libs/libffi:= screencast? ( media-video/pipewire:0/0.3 ) x11-libs/gtk+:3[wayland,X] x11-libs/libdrm:= x11-libs/libxkbcommon:= ) ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !=dev-libs/re2-0.2019.08.01:= >=media-libs/openh264-1.6.0:= system-icu? ( >=dev-libs/icu-68.1:= )
REQUIRED_USE=component-build? ( !suid ) screencast? ( wayland )
SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-89.0.4389.82.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-89-patchset-7/chromium-89-patchset-7.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-89.0.4389.90.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-89-patchset-7/chromium-89-patchset-7.tar.xz
_eclasses_=check-reqs 7e3fd1855a5e1b50bb9e80827b3f672d chromium-2 199d6bc7f8b84ac7c00aca900739e570 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e linux-info c90a203b1c14cfa77bd3e37a0e96c955 multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils a41d1fd1c111289ffa04490de6ee79d7 portability b2e405b5a3f051d58b50c9ffc6b883cf python-any-r1 0a79a9b53fce4525f438f8ea9695fb88 python-utils-r1 2dc8e06a3429719b43e9140f7292a425 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
_md5_=123de2d8e7ac8420f4d911df5cdf2dd3
diff --git a/metadata/md5-cache/www-client/otter-1.0.01-r1 b/metadata/md5-cache/www-client/otter-1.0.01-r1
deleted file mode 100644
index c1240bb494a9..000000000000
--- a/metadata/md5-cache/www-client/otter-1.0.01-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) >=dev-qt/qtwebengine-5.9:5[widgets]
-DESCRIPTION=Project aiming to recreate classic Opera (12.x) UI using Qt5
-EAPI=7
-HOMEPAGE=https://otter-browser.org/
-IUSE=spell
-KEYWORDS=~amd64 ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) >=dev-qt/qtwebengine-5.9:5[widgets]
-SLOT=0
-SRC_URI=https://github.com/OtterBrowser/otter-browser/archive/v1.0.01.tar.gz -> otter-1.0.01.tar.gz
-_eclasses_=cmake 314a813be2f09820e8978cdee941e501 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=8d097e77fdfeefffad7c001cf00c9f92
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 02c6838eb3f5..640bc70c392e 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/fox-wrapper-2 b/metadata/md5-cache/x11-libs/fox-wrapper-2
deleted file mode 100644
index ab09ce671cc5..000000000000
--- a/metadata/md5-cache/x11-libs/fox-wrapper-2
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=wrapper for fox-config to manage multiple versions
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-_md5_=2eda810652d894f5b9f68a5dc131ea8f
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 1d306aad8a3b..c010fb2f6a4a 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/gpaste-3.20.3 b/metadata/md5-cache/x11-misc/gpaste-3.20.3
deleted file mode 100644
index 6e1a78ecad5f..000000000000
--- a/metadata/md5-cache/x11-misc/gpaste-3.20.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare unpack
-DEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.48.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.34:2 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXi gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango ) dev-util/intltool virtual/pkgconfig vala? ( || ( dev-lang/vala:0.50[vapigen(+)] dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] dev-lang/vala:0.36[vapigen(+)] ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Clipboard management system
-EAPI=5
-HOMEPAGE=https://github.com/Keruspe/GPaste
-IUSE=+applet gnome vala
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/appstream-glib >=dev-libs/glib-2.48:2 >=dev-libs/gobject-introspection-1.48.0 sys-apps/dbus >=x11-libs/gdk-pixbuf-2.34:2 >=x11-libs/gtk+-3.20:3 x11-libs/libX11 x11-libs/libXi gnome? ( gnome-base/gnome-control-center:2 media-libs/clutter x11-libs/pango ) gnome? ( gnome-base/gnome-shell )
-SLOT=0
-SRC_URI=https://github.com/Keruspe/GPaste/archive/v3.20.3.tar.gz -> gpaste-3.20.3.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vala 5fab64090cefe75c5df431cefa0b653d vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b1abf460a493fc59ebb25de0df3f09dd wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=58d3c7699e8cde385057986a3e394472
diff --git a/metadata/md5-cache/x11-misc/lineakd-0.9.0-r2 b/metadata/md5-cache/x11-misc/lineakd-0.9.0-r2
deleted file mode 100644
index bdf7fe92825d..000000000000
--- a/metadata/md5-cache/x11-misc/lineakd-0.9.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto x11-libs/libxkbfile x11-libs/libXt x11-libs/libXtst
-DESCRIPTION=Linux support for Easy Access and Internet Keyboards
-EAPI=6
-HOMEPAGE=http://lineak.sourceforge.net
-IUSE=debug
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext
-SLOT=0
-SRC_URI=mirror://sourceforge/lineak/lineakd-0.9.tar.gz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=cd1bfaed5c42b0e21ea636a549696a35
diff --git a/metadata/md5-cache/x11-misc/lineakd-0.9.0-r3 b/metadata/md5-cache/x11-misc/lineakd-0.9.0-r3
index be418339ea6c..ff36fd78402c 100644
--- a/metadata/md5-cache/x11-misc/lineakd-0.9.0-r3
+++ b/metadata/md5-cache/x11-misc/lineakd-0.9.0-r3
@@ -4,10 +4,10 @@ DESCRIPTION=Linux support for Easy Access and Internet Keyboards
EAPI=7
HOMEPAGE=http://lineak.sourceforge.net
IUSE=debug
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ppc sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext
SLOT=0
SRC_URI=mirror://sourceforge/lineak/lineakd-0.9.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=9ee58c392bad29ca55888a7736a77030
+_md5_=bccadb06840ef86636469ccc006aca6e
diff --git a/metadata/md5-cache/x11-misc/nitrogen-1.6.1 b/metadata/md5-cache/x11-misc/nitrogen-1.6.1
deleted file mode 100644
index e496d433e0e8..000000000000
--- a/metadata/md5-cache/x11-misc/nitrogen-1.6.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A background browser and setter for X
-EAPI=6
-HOMEPAGE=http://projects.l3ib.org/nitrogen/
-IUSE=nls xinerama
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=http://projects.l3ib.org/nitrogen/files/nitrogen-1.6.1.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=6b8bd72e3ebf5d87006790d253e81942
diff --git a/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1 b/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1
index f35bc8797bc4..a8e63c3fa1c8 100644
--- a/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1
+++ b/metadata/md5-cache/x11-misc/nitrogen-1.6.1-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure postinst postrm prepare
-DEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=A background browser and setter for X
EAPI=6
HOMEPAGE=https://github.com/l3ib/nitrogen
IUSE=nls xinerama
-KEYWORDS=amd64 ~ppc ~x86
+KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama )
SLOT=0
SRC_URI=https://github.com/l3ib/nitrogen/releases/download/1.6.1/nitrogen-1.6.1.tar.gz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 gnome2-utils c8e3fff820d850c0e003e22208d2eea3 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=0799b25c1cd483575b8fc4fa91df94d3
+_md5_=4df88aac13ea038db4d37bed48ef8df9
diff --git a/metadata/md5-cache/x11-misc/nitrogen-99999 b/metadata/md5-cache/x11-misc/nitrogen-99999
index 9a209ed69f8f..2d4949f1b005 100644
--- a/metadata/md5-cache/x11-misc/nitrogen-99999
+++ b/metadata/md5-cache/x11-misc/nitrogen-99999
@@ -1,5 +1,6 @@
-BDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=configure postinst postrm prepare unpack
+DEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama ) nls? ( sys-devel/gettext ) xinerama? ( x11-base/xorg-proto )
DESCRIPTION=A background browser and setter for X
EAPI=7
HOMEPAGE=https://github.com/l3ib/nitrogen
@@ -9,4 +10,4 @@ PROPERTIES=live
RDEPEND=>=dev-cpp/gtkmm-2.10:2.4 >=gnome-base/librsvg-2.20:2 >=x11-libs/gtk+-2.10:2 xinerama? ( x11-libs/libXinerama )
SLOT=0
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 git-r3 3e7ec3d6619213460c85e2aa48398441 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=68a60b6db694344071c743f85d331ac0
+_md5_=3c9e88fbec12613d8a735c8f0c813e10
diff --git a/metadata/md5-cache/x11-misc/rofi-calc-1.5 b/metadata/md5-cache/x11-misc/rofi-calc-1.5
deleted file mode 100644
index bbfe396a723b..000000000000
--- a/metadata/md5-cache/x11-misc/rofi-calc-1.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=prepare
-DEPEND=x11-misc/rofi >=sci-libs/libqalculate-2.0
-DESCRIPTION=Do live calculations in rofi!
-EAPI=7
-HOMEPAGE=https://github.com/svenstaro/rofi-calc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=x11-misc/rofi >=sci-libs/libqalculate-2.0
-SLOT=0
-SRC_URI=https://github.com/svenstaro/rofi-calc/archive/v1.5.tar.gz -> rofi-calc-1.5.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=4b2c4a4388b24914beae50e3b15167a3
diff --git a/metadata/md5-cache/x11-misc/rofi-calc-1.6 b/metadata/md5-cache/x11-misc/rofi-calc-1.6
deleted file mode 100644
index e11d2078701a..000000000000
--- a/metadata/md5-cache/x11-misc/rofi-calc-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=prepare
-DEPEND=x11-misc/rofi >=sci-libs/libqalculate-2.0
-DESCRIPTION=Do live calculations in rofi!
-EAPI=7
-HOMEPAGE=https://github.com/svenstaro/rofi-calc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=x11-misc/rofi >=sci-libs/libqalculate-2.0
-SLOT=0
-SRC_URI=https://github.com/svenstaro/rofi-calc/archive/v1.6.tar.gz -> rofi-calc-1.6.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=4b2c4a4388b24914beae50e3b15167a3
diff --git a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202 b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202
deleted file mode 100644
index 8bcb3ecfc5b3..000000000000
--- a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=tool that allows you to tune SiS drivers from X
-EAPI=5
-HOMEPAGE=http://www.winischhofer.net/linuxsispart1.shtml#sisctrl
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm
-SLOT=0
-SRC_URI=http://www.winischhofer.net/sis/sisctrl-0.0.20051202.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=a29ea01a6d40025423779fb9b3b32e40
diff --git a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1 b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1
index 49cd6d937405..fc3f1ca35122 100644
--- a/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1
+++ b/metadata/md5-cache/x11-misc/sisctrl-0.0.20051202-r1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-li
DESCRIPTION=tool that allows you to tune SiS drivers from X
EAPI=7
HOMEPAGE=http://www.winischhofer.net/linuxsispart1.shtml#sisctrl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXrender x11-libs/libXv x11-libs/libXxf86vm
SLOT=0
SRC_URI=http://www.winischhofer.net/sis/sisctrl-0.0.20051202.tar.gz
_eclasses_=edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=039f9f763dee1b03676d9baca6be8ed2
+_md5_=22e196c17d2c8f7bd787a34e11bf38f2
diff --git a/metadata/md5-cache/x11-misc/sux-1.0.1 b/metadata/md5-cache/x11-misc/sux-1.0.1
index 5a29a7e37adc..4dfac8c9b54d 100644
--- a/metadata/md5-cache/x11-misc/sux-1.0.1
+++ b/metadata/md5-cache/x11-misc/sux-1.0.1
@@ -3,9 +3,9 @@ DEPEND=x11-apps/xauth
DESCRIPTION="su" wrapper which transfers X credentials
EAPI=7
HOMEPAGE=http://fgouget.free.fr/sux/sux-readme.shtml
-KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ppc sparc x86
LICENSE=MIT
RDEPEND=x11-apps/xauth
SLOT=0
SRC_URI=mirror://sourceforge/sux/1.0.1/sux-1.0.1.tar.gz
-_md5_=afcd83fd15583a0f19ae01aea2db25b2
+_md5_=39dc7cecc498d3e2fea6bc48155f74df
diff --git a/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1 b/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1
deleted file mode 100644
index 3cc2ab8d7e70..000000000000
--- a/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=|| ( x11-misc/alock x11-misc/i3lock x11-misc/slim x11-misc/slock x11-misc/xlockmore x11-misc/xtrlock ) x11-libs/libXScrnSaver app-text/rman x11-base/xorg-proto x11-misc/imake
-DESCRIPTION=An automatic X screen-locker/screen-saver
-EAPI=6
-HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=|| ( x11-misc/alock x11-misc/i3lock x11-misc/slim x11-misc/slock x11-misc/xlockmore x11-misc/xtrlock ) x11-libs/libXScrnSaver
-SLOT=0
-SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz mirror://debian/pool/main/x/xautolock/xautolock_2.2-5.1.debian.tar.xz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=2e1f73d98297693219e259d48c552858
diff --git a/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1-r1 b/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1-r1
deleted file mode 100644
index 9f031422def3..000000000000
--- a/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=x11-libs/libXScrnSaver app-text/rman x11-base/xorg-proto x11-misc/imake
-DESCRIPTION=An automatic X screen-locker/screen-saver
-EAPI=6
-HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXScrnSaver
-SLOT=0
-SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz mirror://debian/pool/main/x/xautolock/xautolock_2.2-5.1.debian.tar.xz
-_eclasses_=estack 055c42df72f76a4f45ec92b35e83cd56 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 versionator d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=8a4af5c486c5ff49dd189b3d85c7a1ca
diff --git a/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p2 b/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p2
deleted file mode 100644
index 16910f831471..000000000000
--- a/metadata/md5-cache/x11-misc/xautolock-2.2_p5_p2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libXScrnSaver app-text/rman x11-base/xorg-proto x11-misc/imake
-DESCRIPTION=An automatic X screen-locker/screen-saver
-EAPI=7
-HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXScrnSaver
-SLOT=0
-SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz mirror://debian/pool/main/x/xautolock/xautolock_2.2-5.2.debian.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=1407fa264f4ef089258e602da13bd4da
diff --git a/metadata/md5-cache/x11-misc/xautolock-2.2_p6 b/metadata/md5-cache/x11-misc/xautolock-2.2_p6
deleted file mode 100644
index 366521d5ab95..000000000000
--- a/metadata/md5-cache/x11-misc/xautolock-2.2_p6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libXScrnSaver app-text/rman x11-base/xorg-proto x11-misc/imake
-DESCRIPTION=An automatic X screen-locker/screen-saver
-EAPI=7
-HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libXScrnSaver
-SLOT=0
-SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz mirror://debian/pool/main/x/xautolock/xautolock_2.2-6.debian.tar.xz
-_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=f890c530049ceae1af7a209fbe6779de
diff --git a/metadata/md5-cache/x11-misc/xautolock-2.2_p7 b/metadata/md5-cache/x11-misc/xautolock-2.2_p7
index 87df69f67153..5b79581892fd 100644
--- a/metadata/md5-cache/x11-misc/xautolock-2.2_p7
+++ b/metadata/md5-cache/x11-misc/xautolock-2.2_p7
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libXScrnSaver app-text/rman x11-base/xorg-proto x11-misc/imake
DESCRIPTION=An automatic X screen-locker/screen-saver
EAPI=7
HOMEPAGE=http://www.ibiblio.org/pub/Linux/X11/screensavers/
-KEYWORDS=amd64 ~arm ~arm64 ppc ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ppc sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libXScrnSaver
SLOT=0
SRC_URI=http://www.ibiblio.org/pub/Linux/X11/screensavers/xautolock-2.2.tgz mirror://debian/pool/main/x/xautolock/xautolock_2.2-7.debian.tar.xz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=2c070a4f033b38ef9c16125b92dc4b4b
+_md5_=08267d5a08d5162df4d5e8723e87580b
diff --git a/metadata/md5-cache/x11-misc/xkbset-0.5_p5_p1 b/metadata/md5-cache/x11-misc/xkbset-0.5_p5_p1
deleted file mode 100644
index 4f4eedc5871b..000000000000
--- a/metadata/md5-cache/x11-misc/xkbset-0.5_p5_p1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11
-DESCRIPTION=User preference utility for XKB extensions for X
-EAPI=6
-HOMEPAGE=https://faculty.missouri.edu/~stephen/software/#xkbset
-IUSE=tk
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=x11-libs/libX11 tk? ( dev-perl/Tk )
-SLOT=0
-SRC_URI=https://faculty.missouri.edu/~stephen/software/xkbset/xkbset-0.5.tar.gz mirror://debian/pool/main/x/xkbset/xkbset_0.5-5.1.diff.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=1ac830e5da2e82f6db234acd1fe61e67
diff --git a/metadata/md5-cache/x11-misc/xkbset-0.5_p6 b/metadata/md5-cache/x11-misc/xkbset-0.5_p6
deleted file mode 100644
index 3aca508d42aa..000000000000
--- a/metadata/md5-cache/x11-misc/xkbset-0.5_p6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=x11-libs/libX11
-DESCRIPTION=User preference utility for XKB extensions for X
-EAPI=6
-HOMEPAGE=https://faculty.missouri.edu/~stephen/software/#xkbset
-IUSE=tk
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=x11-libs/libX11 tk? ( dev-perl/Tk )
-SLOT=0
-SRC_URI=https://faculty.missouri.edu/~stephen/software/xkbset/xkbset-0.5.tar.gz mirror://debian/pool/main/x/xkbset/xkbset_0.5-6.debian.tar.xz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator d3fb3ba33acc3bbbdc4d7970227c100d wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=10b9dc93200e91a2a916dd626485e66e
diff --git a/metadata/md5-cache/x11-misc/xlockmore-5.65-r1 b/metadata/md5-cache/x11-misc/xlockmore-5.65-r1
index 273e4ff7c8f8..7cca9c0b7965 100644
--- a/metadata/md5-cache/x11-misc/xlockmore-5.65-r1
+++ b/metadata/md5-cache/x11-misc/xlockmore-5.65-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Just another screensaver application for X
EAPI=7
HOMEPAGE=https://www.sillycycle.com/xlockmore.html
IUSE=crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock
-KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86
LICENSE=BSD GPL-2
RDEPEND=gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick:= ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( virtual/opengl virtual/glu truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( sys-libs/pam ) truetype? ( media-libs/freetype:2 ) x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
REQUIRED_USE=|| ( crypt pam ) pam? ( !xlockrc ) xlockrc? ( !pam )
SLOT=0
SRC_URI=https://www.sillycycle.com/xlock/xlockmore-5.65.tar.xz https://www.sillycycle.com/xlock/recent-releases/xlockmore-5.65.tar.xz
_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e pam b097695df28f3974e3af860d6704d4f2 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=c69dfea7e0e356127a4860c02ace0202
+_md5_=c0277fe06863bc86357192882a84af9f
diff --git a/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r1 b/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r1
deleted file mode 100644
index 964f8be1dc4a..000000000000
--- a/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto
-DESCRIPTION=small tool to report and change the keyboard LED states of an X display
-EAPI=5
-HOMEPAGE=ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXtst
-SLOT=0
-SRC_URI=ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/xsetleds-0.1.3.tar.gz
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=45b47f7f70523d07e9f89e21551e671b
diff --git a/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2 b/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2
index e8f7c89a18fa..270ce9f6938a 100644
--- a/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2
+++ b/metadata/md5-cache/x11-misc/xsetleds-0.1.3-r2
@@ -3,10 +3,10 @@ DEPEND=x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto
DESCRIPTION=small tool to report and change the keyboard LED states of an X display
EAPI=6
HOMEPAGE=https://github.com/bmeurer/xsetleds
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 x11-libs/libXtst
SLOT=0
SRC_URI=ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/xsetleds-0.1.3.tar.gz https://dev.gentoo.org/~jer/xsetleds-0.1.3.tar.gz
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=fc1c09ab036d75e1a0741acded4fb6d9
+_md5_=148c90e9a3e6be5fa36dca2921ebdd1f
diff --git a/metadata/md5-cache/x11-misc/xxkb-1.11.1 b/metadata/md5-cache/x11-misc/xxkb-1.11.1
deleted file mode 100644
index def5bd2fa8a7..000000000000
--- a/metadata/md5-cache/x11-misc/xxkb-1.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt svg? ( dev-libs/glib:2 gnome-base/librsvg:2 x11-libs/gtk+:2 ) app-text/rman svg? ( virtual/pkgconfig ) x11-misc/imake
-DESCRIPTION=eXtended XKB - assign different keymaps to different windows
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/xxkb/
-IUSE=svg
-KEYWORDS=amd64 ppc x86
-LICENSE=Artistic-2
-RDEPEND=x11-libs/libX11 x11-libs/libXpm x11-libs/libXt svg? ( dev-libs/glib:2 gnome-base/librsvg:2 x11-libs/gtk+:2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/xxkb/xxkb-1.11.1-src.tar.gz svg? ( https://dev.gentoo.org/~jer/xxkb-flags.tar.bz2 )
-_eclasses_=desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 epatch e8f1ec13660dc2f44b32775765d85e42 estack 055c42df72f76a4f45ec92b35e83cd56 eutils 2d5b3f4b315094768576b6799e4f926e l10n 8cdd85e169b835d518bc2fd59f780d8e ltprune 4f3f2db5ce3ccbeeacdf3f94954043aa multilib d410501a125f99ffb560b0c523cd3d1e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 24921b57d6561d87cbef4916a296ada4 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=46a325fc0c743258b1c4c98185d8915e
diff --git a/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1 b/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
index 7c92c9dc402f..c254c3ea6d7d 100644
--- a/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
+++ b/metadata/md5-cache/x11-misc/xxkb-1.11.1-r1
@@ -5,10 +5,10 @@ DESCRIPTION=eXtended XKB - assign different keymaps to different windows
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/xxkb/
IUSE=svg
-KEYWORDS=amd64 ~ppc x86
+KEYWORDS=amd64 ppc x86
LICENSE=Artistic-2
RDEPEND=x11-libs/gdk-pixbuf-xlib x11-libs/libX11 x11-libs/libXpm x11-libs/libXt svg? ( dev-libs/glib:2 gnome-base/librsvg:2 x11-libs/gtk+:2 )
SLOT=0
SRC_URI=mirror://sourceforge/xxkb/xxkb-1.11.1-src.tar.gz svg? ( https://dev.gentoo.org/~jer/xxkb-flags.tar.bz2 )
_eclasses_=multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4
-_md5_=f937db1039c25b902f6d589e014eda7b
+_md5_=59b4e73d21b4f6679a5cf1a21fe3d5d6
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 33bde19bae2d..fb8baf7d9e35 100644
Binary files a/metadata/md5-cache/x11-themes/Manifest.gz and b/metadata/md5-cache/x11-themes/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-themes/silver-xcursors-0.4 b/metadata/md5-cache/x11-themes/silver-xcursors-0.4
deleted file mode 100644
index 627ffb1ad703..000000000000
--- a/metadata/md5-cache/x11-themes/silver-xcursors-0.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=A high quality set of Xfree 4.3.0 animated mouse cursors
-EAPI=6
-HOMEPAGE=http://www.kde-look.org/content/show.php?content=5533
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=http://www.kde-look.org/CONTENT/content-files/5533-Silver-XCursors-3D-0.4.tar.bz2
-_eclasses_=readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190
-_md5_=91282af395cc330b6bb31877b771fd41
diff --git a/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1 b/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1
index ff2a999a785a..1cb35bd4b4b6 100644
--- a/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1
+++ b/metadata/md5-cache/x11-themes/silver-xcursors-0.4-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
DESCRIPTION=A high quality set of Xfree 4.3.0 animated mouse cursors
EAPI=6
HOMEPAGE=http://www.kde-look.org/content/show.php?content=5533
-KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86
+KEYWORDS=~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=http://www.kde-look.org/CONTENT/content-files/5533-Silver-XCursors-3D-0.4.tar.bz2
-_md5_=9632807d052d590642ae92ad23e8e3cd
+_md5_=c8780c025190f76bd35b5347211373ab
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index e1bf47cfedc1..ad526567dbd7 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/fvwm-2.6.8-r2 b/metadata/md5-cache/x11-wm/fvwm-2.6.8-r2
deleted file mode 100644
index 1e97f11266c8..000000000000
--- a/metadata/md5-cache/x11-wm/fvwm-2.6.8-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender virtual/libiconv bidi? ( dev-libs/fribidi ) nls? ( virtual/libintl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg ) truetype? ( media-libs/fontconfig x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto doc? ( dev-libs/libxslt )
-DESCRIPTION=An extremely powerful ICCCM-compliant multiple virtual desktop window manager
-EAPI=7
-HOMEPAGE=https://www.fvwm.org/
-IUSE=bidi debug doc netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2+ FVWM
-RDEPEND=sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXpm x11-libs/libXrandr x11-libs/libXrender virtual/libiconv bidi? ( dev-libs/fribidi ) nls? ( virtual/libintl ) png? ( media-libs/libpng:0= ) readline? ( sys-libs/ncurses:0= sys-libs/readline:0= ) stroke? ( dev-libs/libstroke ) svg? ( gnome-base/librsvg ) truetype? ( media-libs/fontconfig x11-libs/libXft ) xinerama? ( x11-libs/libXinerama ) dev-lang/perl perl? ( tk? ( dev-lang/tk dev-perl/Tk >=dev-perl/X11-Protocol-0.56 ) ) rplay? ( media-sound/rplay ) lock? ( x11-misc/xlockmore ) userland_GNU? ( sys-apps/debianutils ) !x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
-SLOT=0
-SRC_URI=https://github.com/fvwmorg/fvwm/releases/download/2.6.8/fvwm-2.6.8.tar.gz
-_eclasses_=autotools 9988ecbe04129214297a7bbf3d253710 desktop c0d27bf73aa08ca05b663dbd31fbef28 edos2unix 33e347e171066657f91f8b0c72ec8773 eutils 2d5b3f4b315094768576b6799e4f926e flag-o-matic 09a8beb8e6a8e02dc1e1bd83ac353741 l10n 8cdd85e169b835d518bc2fd59f780d8e libtool f143db5a74ccd9ca28c1234deffede96 multilib d410501a125f99ffb560b0c523cd3d1e toolchain-funcs 24921b57d6561d87cbef4916a296ada4 wrapper 4251d4c84c25f59094fd557e0063a974
-_md5_=e89dda5eac90fbdbe8df3bbbd04f5352
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 61caaf25b566..a9b7e7ce5dd7 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Mar 2021 19:38:44 +0000
+Thu, 18 Mar 2021 05:08:27 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 6e6c6d119b9e..92fe3c5a7f4c 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -3200,10 +3200,6 @@
dilfridge@gentoo.org
Andreas K. Hüttel
-
- jstein@gentoo.org
- Jonas Stein
-
sam@gentoo.org
Sam James
diff --git a/metadata/timestamp b/metadata/timestamp
index 27ce5d909548..171edfcf54be 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Mar 16 07:38:44 PM UTC 2021
+Thu Mar 18 05:08:26 AM UTC 2021
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 331e9c8cf124..e1e66c38add5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Mar 2021 20:00:01 +0000
+Thu, 18 Mar 2021 05:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index f82ccfcfc30c..375f6dee93ff 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-528a1608f9d53a1ce5402ea97c7949f7eb031706 1615922564 2021-03-16T19:22:44+00:00
+0c635a9098c3117fcc0695cd23b775ea56a4964d 1616043378 2021-03-18T04:56:18+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4c7b48afa644..cccd72b4576d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1615923301 Tue 16 Mar 2021 07:35:01 PM UTC
+1616043901 Thu 18 Mar 2021 05:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 61caaf25b566..541785b3fdb2 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 16 Mar 2021 19:38:44 +0000
+Thu, 18 Mar 2021 05:08:26 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 5769ea0a88a4..cf5a5debf0e3 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch b/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch
deleted file mode 100644
index 525f03740dd9..000000000000
--- a/net-analyzer/arpon/files/arpon-2.7.2-CFLAGS.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,11 +51,9 @@
- if(cmake_build_type_tolower STREQUAL "debug")
- message(STATUS "Build Type: Debug")
- set(CMAKE_BUILD_TYPE "Debug")
-- set(CMAKE_C_FLAGS "-Wall -Werror -pedantic -O0 -g")
- else()
- message(STATUS "Build Type: Release")
- set(CMAKE_BUILD_TYPE "Release")
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror")
- endif()
-
- include_directories(
diff --git a/net-analyzer/arpon/files/arpon-2.7.2-etc.patch b/net-analyzer/arpon/files/arpon-2.7.2-etc.patch
deleted file mode 100644
index 03e80f9d5955..000000000000
--- a/net-analyzer/arpon/files/arpon-2.7.2-etc.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/etc/CMakeLists.txt
-+++ b/etc/CMakeLists.txt
-@@ -14,7 +14,7 @@
- COMPONENT Etcfile)
- else(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
- install(FILES ${arpon_etc_src}
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/etc
-+ DESTINATION /etc
- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ
- COMPONENT Etcfile)
- endif(${CMAKE_INSTALL_PREFIX} STREQUAL "/")
diff --git a/net-analyzer/arpon/files/arpon.confd b/net-analyzer/arpon/files/arpon.confd
deleted file mode 100644
index d1ce050fa4cb..000000000000
--- a/net-analyzer/arpon/files/arpon.confd
+++ /dev/null
@@ -1,5 +0,0 @@
-METHOD="--darpi"
-IFACE="eth0"
-LOGFILE="/var/log/arpon.log"
-
-ARPON_OPTS="${METHOD} --iface ${IFACE} --log-file ${LOGFILE} --log"
diff --git a/net-analyzer/arpon/files/arpon.initd b/net-analyzer/arpon/files/arpon.initd
deleted file mode 100644
index dc69135c26e3..000000000000
--- a/net-analyzer/arpon/files/arpon.initd
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/openrc-run
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting arpon"
- start-stop-daemon --start --background --make-pidfile --pidfile "/var/run/arpon.pid" \
- --exec /usr/sbin/arpon -- ${ARPON_OPTS} >/dev/null 2>&1
- eend $?
-}
-
-stop() {
- ebegin "Stopping arpon"
- start-stop-daemon --stop --pidfile "/var/run/arpon.pid"
- eend $?
-}
diff --git a/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild b/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild
index f2f51511fcd7..74a75dcce777 100644
--- a/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-3.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
https://dev.gentoo.org/~jer/ethercodes.dat-${ETHERCODES_DATE}.xz
"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
+KEYWORDS="amd64 ~hppa ~ppc sparc x86"
IUSE="selinux"
DEPEND="
diff --git a/net-analyzer/check_mk_agent/Manifest b/net-analyzer/check_mk_agent/Manifest
index d378a34fa03d..4f03d903bfdd 100644
--- a/net-analyzer/check_mk_agent/Manifest
+++ b/net-analyzer/check_mk_agent/Manifest
@@ -1,2 +1 @@
-DIST check-mk-raw-1.2.8p27.cre.tar.gz 150213236 BLAKE2B f239edee68fdfc32aba9af40dead69ecdcb699b437b3ec615a3bf84b5eaa3644203ba4afea3d24a16ae722fe05eebb2650af1846eded97e322d88f2d7f5d102d SHA512 781b3dad0e144dc23a0d6791fa90a8ee2652919f898fa275abf7760d137f18ebe037a7d5d8f17c437f99fb7d0b22e57fdb42749dd6c084c74c5e2ef404eb3c1f
DIST check-mk-raw-1.4.0p31.cre.tar.gz 314212612 BLAKE2B 07c9bda8524250f949a21204427d455ef0ac0a323fe38b66c7c4f03b50f7677099b5c24dae22f55fe1e1a2e475d541e1b643169a2368925e960ea514a03fd6b2 SHA512 b1dfe22e54a3d6f9c7f76b408adeb7ca46aa4b21d933149c1681bf87dae7af8f5bf645ba19b225f30b0057d8d075f657756019e3b908d3090e1d14451e7fcc0b
diff --git a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild b/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild
deleted file mode 100644
index c41c9b1f3484..000000000000
--- a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p27.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="Agent to report data to Check_MK for monitoring"
-HOMEPAGE="http://mathias-kettner.de/check_mk.html"
-
-MY_PV="${PV/_p/p}"
-MY_P="check-mk-raw-${MY_PV}.cre"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache_status inventory logwatch mysql nfsexports oracle postgres smart +xinetd zypper"
-
-RDEPEND="!!net-analyzer/check_mk
- app-shells/bash:*
- xinetd? ( || ( sys-apps/xinetd sys-apps/systemd ) )
- "
-DEPEND="${RDEPEND}"
-
-SRC_URI="http://mathias-kettner.de/support/${MY_PV}/${MY_P}.tar.gz"
-
-src_unpack() {
- # check_mk is a tarball containing tarballs
- unpack ${A}
- unpack "${WORKDIR}"/${MY_P}/packages/check_mk/check_mk-${MY_PV}.tar.gz
- mkdir -p "${S}" || die
- cd "${S}" || die
- unpack "${WORKDIR}"/check_mk-${MY_PV}/agents.tar.gz
- mkdir -p "${S}"/doc || die
- cd "${S}"/doc || die
- unpack "${WORKDIR}"/check_mk-${MY_PV}/doc.tar.gz
-}
-
-src_install() {
- # Install agent related files
- newbin check_mk_agent.linux check_mk_agent
-
- keepdir /usr/lib/check_mk_agent/local
- dodir /usr/lib/check_mk_agent/plugins
- dodir /etc/check_mk
-
- dodoc doc/{AUTHORS,COPYING,ChangeLog}
- docompress
-
- if use xinetd; then
- insinto /etc/xinetd.d
- newins cfg_examples/xinetd.conf check_mk
- systemd_dounit cfg_examples/systemd/check_mk{.socket,@.service}
- fi
-
- # Install the check_mk_agent logwatch plugin
- if use logwatch; then
- insinto /etc/check_mk
- doins cfg_examples/logwatch.cfg
- exeinto /usr/lib/check_mk_agent/plugins
- doexe plugins/mk_logwatch
- fi
-
- # Install any other useflag-enabled agent plugins
- exeinto /usr/lib/check_mk_agent/plugins
- use inventory && newexe plugins/mk_inventory.linux mk_inventory
- use smart && doexe plugins/smart
- use mysql && doexe plugins/mk_mysql
- use postgres && doexe plugins/mk_postgres
- use apache_status && doexe plugins/apache_status
- use zypper && doexe plugins/mk_zypper
- use oracle && doexe plugins/mk_oracle
- use nfsexports && doexe plugins/nfsexports
-}
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
index 5ed0a845c74d..5e9fd5b53171 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_SINGLE_IMPL=1
inherit bash-completion-r1 distutils-r1 systemd tmpfiles
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
+DESCRIPTION="Scans log files and bans IPs that show malicious signs"
HOMEPAGE="https://www.fail2ban.org/"
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index 5e5fb78a51f6..4a13926cd46f 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -8,13 +8,12 @@ DISTUTILS_SINGLE_IMPL=1
inherit bash-completion-r1 distutils-r1 git-r3 systemd tmpfiles
-DESCRIPTION="scans log files and bans IPs that show malicious signs"
+DESCRIPTION="Scans log files and bans IPs that show malicious signs"
HOMEPAGE="https://www.fail2ban.org/"
EGIT_REPO_URI="https://github.com/${PN}/${PN}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
IUSE="selinux systemd"
# Needs some work to enable them right now
RESTRICT="test"
diff --git a/net-analyzer/fwlogwatch/Manifest b/net-analyzer/fwlogwatch/Manifest
index aa622d9eff42..5572520f8b49 100644
--- a/net-analyzer/fwlogwatch/Manifest
+++ b/net-analyzer/fwlogwatch/Manifest
@@ -1,2 +1 @@
-DIST fwlogwatch-1.4.tar.bz2 92652 BLAKE2B 94c5ecd6e17c3ce07ffaa33f738109162913253b837bcc4c4fc79068edb610c046b3a178db5481c3e145482686f3f837ecd2fc579700b4a5a68bbaae47f9e537 SHA512 0a67c0ae8b096fdf7a06e279a11b0bc71f2d514790c1669f60606b17a7f3f3ec97dedc2005438ce0ec82efcd66a822b62dbb36603f4b02e010f469fb885b87e6
DIST fwlogwatch-1.5.tar.bz2 94451 BLAKE2B c0456931dc425df4ec190f1c8bcba21e0784009dae66869a5f5c0371b68d0bdb1bf57c788468f7c9fd32abf8b676a4029bcde7d348c37e4b7f5771bc48f04297 SHA512 d4890596859929ddc6adfd7f9e735e0c414bad40eff6732120a522a8bd4fb8d1442c7d1026f0f3c6ac5c4d51b76a2bac486d04f0fbceae67395c585098afef85
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
deleted file mode 100644
index 54a2095f9c3d..000000000000
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="A packet filter and firewall log analyzer"
-HOMEPAGE="http://fwlogwatch.inside-security.de/"
-SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2"
-
-KEYWORDS="amd64 ~ppc sparc x86"
-LICENSE="GPL-1"
-SLOT="0"
-IUSE="nls zlib"
-
-RDEPEND="
- zlib? ( sys-libs/zlib )
-"
-DEPEND="
- ${RDEPEND}
- sys-devel/flex
- nls? ( sys-devel/gettext )
-"
-
-src_prepare() {
- if use nls; then
- strip-linguas -i po/
- local lingua pofile
- for pofile in po/*.po; do
- lingua=${pofile/po\/}
- lingua=${lingua/.po}
- if ! has ${lingua} ${LINGUAS}; then
- sed -i \
- -e "/${lingua}.[mp]o/d" \
- Makefile po/Makefile || die
- fi
- done
- fi
-
- sed -i \
- -e '/^INSTALL_/s|$| -D|g' \
- -e 's|make|$(MAKE)|g ' \
- Makefile || die
-}
-
-src_configure() {
- if ! use zlib; then
- sed -i Makefile -e '/^LIBS/ s|-lz||g' || die
- else
- append-cflags -DHAVE_ZLIB
- fi
-
- use nls && append-cflags -DHAVE_GETTEXT
-}
-
-src_compile() {
- emake \
- CC=$(tc-getCC) \
- CFLAGS="${CFLAGS}" \
- LDFLAGS="${LDFLAGS}"
- use nls && emake -C po
-}
-
-src_install() {
- emake \
- LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
- install
- use nls && emake \
- LOCALE_DIR="${D}/usr" INSTALL_DIR="${D}/usr" \
- install-i18n
-
- dosbin contrib/fwlw_notify
- dosbin contrib/fwlw_respond
-
- dodoc AUTHORS ChangeLog CREDITS README
-
- insinto /usr/share/fwlogwatch/contrib
-
- doins contrib/fwlogsummary.cgi
- doins contrib/fwlogsummary_small.cgi
- doins contrib/fwlogwatch.php
-
- insinto /etc
- doins fwlogwatch.config
-}
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
index 76955ecc5654..1f4f953ecd59 100644
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A packet filter and firewall log analyzer"
HOMEPAGE="http://fwlogwatch.inside-security.de/"
SRC_URI="http://fwlogwatch.inside-security.de/sw/${P}.tar.bz2"
-KEYWORDS="amd64 ~ppc ~sparc x86"
+KEYWORDS="amd64 ~ppc sparc x86"
LICENSE="GPL-1"
SLOT="0"
IUSE="geoip nls zlib"
diff --git a/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild
index 159c685cfff3..2653de68f200 100644
--- a/net-analyzer/netcat/netcat-110-r9.ebuild
+++ b/net-analyzer/netcat/netcat-110-r9.ebuild
@@ -1,17 +1,19 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
-inherit eutils toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic
PATCH_VER="1.0"
MY_P=nc${PV}
-DESCRIPTION="the network swiss army knife"
+DESCRIPTION="The network swiss army knife"
HOMEPAGE="https://nc110.sourceforge.io"
SRC_URI="mirror://sourceforge/nc110/${MY_P}.tgz
ftp://sith.mimuw.edu.pl/pub/users/baggins/IPv6/nc-v6-20000918.patch.gz
- mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
+ mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2
+"
+S="${WORKDIR}"
LICENSE="netcat"
SLOT="0"
@@ -20,26 +22,46 @@ IUSE="crypt ipv6 static"
LIB_DEPEND="crypt? ( dev-libs/libmix[static-libs(+)] )"
RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )"
-
-S=${WORKDIR}
+DEPEND="
+ ${RDEPEND}
+ static? ( ${LIB_DEPEND} )
+"
src_prepare() {
- epatch "${DISTDIR}"/nc-v6-20000918.patch.gz patch
+ default
+
+ eapply "${WORKDIR}"/nc-v6-20000918.patch
+
sed -i 's:#define HAVE_BIND:#undef HAVE_BIND:' netcat.c
- sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c #34250
- [[ ${CHOST} == *-solaris* ]] && \
- sed -i 's:gethostbyname2(\([^)]\+\)):getipnodebyname(\1, AI_DEFAULT, NULL):' netcat.c
+ # bug 34250
+ sed -i 's:#define FD_SETSIZE 16:#define FD_SETSIZE 1024:' netcat.c
+
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ sed -i 's:gethostbyname2(\([^)]\+\)):getipnodebyname(\1, AI_DEFAULT, NULL):' netcat.c || die
+ fi
}
src_compile() {
export XLIBS=""
export XFLAGS="-DLINUX -DTELNET -DGAPING_SECURITY_HOLE"
- use ipv6 && XFLAGS="${XFLAGS} -DINET6"
- use static && export STATIC="-static"
- use crypt && XFLAGS="${XFLAGS} -DAESCRYPT" && XLIBS="${XLIBS} -lmix"
- [[ ${CHOST} == *-solaris* ]] && XLIBS="${XLIBS} -lnsl -lsocket"
+
+ if use ipv6 ; then
+ XFLAGS+=" -DINET6"
+ fi
+
+ if use static ; then
+ export STATIC="-static"
+ fi
+
+ if use crypt ; then
+ XFLAGS+=" -DAESCRYPT"
+ XLIBS+=" -lmix"
+ fi
+
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ XLIBS+=" -lnsl -lsocket"
+ fi
+
emake -e CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" nc
}
diff --git a/net-analyzer/netcat/netcat-110.20180111-r1.ebuild b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
index 176dfce1e77a..5127d1c620fd 100644
--- a/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
+++ b/net-analyzer/netcat/netcat-110.20180111-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
inherit toolchain-funcs flag-o-matic
MY_P="nc${PV}"
-DESCRIPTION="the network swiss army knife"
+DESCRIPTION="The network swiss army knife"
HOMEPAGE="https://nc110.sourceforge.io"
SRC_URI="mirror://sourceforge/nc110/${MY_P}.tar.xz"
diff --git a/net-analyzer/snort/snort-2.9.15.1.ebuild b/net-analyzer/snort/snort-2.9.15.1.ebuild
index 21bdbd512480..440d87d8359a 100644
--- a/net-analyzer/snort/snort-2.9.15.1.ebuild
+++ b/net-analyzer/snort/snort-2.9.15.1.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
@@ -154,8 +154,8 @@ src_install() {
rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
# Remove unneeded .la files (Bug #382863)
- rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
- rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+ rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+ rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
diff --git a/net-analyzer/snort/snort-2.9.16-r100.ebuild b/net-analyzer/snort/snort-2.9.16-r100.ebuild
index c3363729e9af..66b2b845e872 100644
--- a/net-analyzer/snort/snort-2.9.16-r100.ebuild
+++ b/net-analyzer/snort/snort-2.9.16-r100.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
@@ -159,8 +159,8 @@ src_install() {
rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
# Remove unneeded .la files (Bug #382863)
- rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
- rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+ rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+ rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
diff --git a/net-analyzer/snort/snort-2.9.16.ebuild b/net-analyzer/snort/snort-2.9.16.ebuild
index 6e7835a53107..4a3f0392b5c1 100644
--- a/net-analyzer/snort/snort-2.9.16.ebuild
+++ b/net-analyzer/snort/snort-2.9.16.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
@@ -154,8 +154,8 @@ src_install() {
rm "${ED}"/usr/share/doc/"${PF}"/Makefile* || die "Failed to remove doc make files"
# Remove unneeded .la files (Bug #382863)
- rm "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
- rm "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
+ rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicengine/libsf_engine.la || die
+ rm -f "${ED}"/usr/$(get_libdir)/snort_dynamicpreprocessor/libsf_*_preproc.la || die "Failed to remove libsf_?_preproc.la"
# Set the correct lib path for dynamicengine, dynamicpreprocessor, and dynamicdetection
sed -i -e 's|/usr/local/lib|/usr/'$(get_libdir)'|g' \
diff --git a/net-analyzer/ssldump/ssldump-1.1.ebuild b/net-analyzer/ssldump/ssldump-1.1.ebuild
index 552c500170c7..84bf5b42e215 100644
--- a/net-analyzer/ssldump/ssldump-1.1.ebuild
+++ b/net-analyzer/ssldump/ssldump-1.1.ebuild
@@ -2,7 +2,8 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit multilib toolchain-funcs
+
+inherit toolchain-funcs
DESCRIPTION="An SSLv3/TLS network protocol analyzer"
HOMEPAGE="https://github.com/adulau/ssldump/"
@@ -12,16 +13,14 @@ SRC_URI="
LICENSE="openssl"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~arm ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="ssl"
RDEPEND="
net-libs/libpcap
ssl? ( >=dev-libs/openssl-1:0= )
"
-DEPEND="
- ${RDEPEND}
-"
+DEPEND="${RDEPEND}"
src_configure() {
tc-export CC
@@ -29,7 +28,7 @@ src_configure() {
econf \
$(usex ssl --with-openssl-inc="${EPREFIX}/usr/include" '') \
$(usex ssl --with-openssl-lib="${EPREFIX}/usr/$(get_libdir)" '') \
- $(usex ssl --with-openssl="${EPREFIX}/usr") \
+ $(usex ssl --with-openssl="${EPREFIX}/usr" '--without-openssl') \
--with-pcap-inc="${EPREFIX}/usr/include" \
--with-pcap-lib="${EPREFIX}/usr/$(get_libdir)"
}
diff --git a/net-analyzer/ssldump/ssldump-1.3.ebuild b/net-analyzer/ssldump/ssldump-1.3-r1.ebuild
similarity index 93%
rename from net-analyzer/ssldump/ssldump-1.3.ebuild
rename to net-analyzer/ssldump/ssldump-1.3-r1.ebuild
index 65ef0419b688..ddd41125cefe 100644
--- a/net-analyzer/ssldump/ssldump-1.3.ebuild
+++ b/net-analyzer/ssldump/ssldump-1.3-r1.ebuild
@@ -12,13 +12,12 @@ SRC_URI="https://github.com/adulau/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="openssl"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ssl"
RDEPEND="
dev-libs/json-c:=
net-libs/libnet:1.1
net-libs/libpcap
- ssl? ( >=dev-libs/openssl-1:0= )
+ >=dev-libs/openssl-1:0=
"
DEPEND="${RDEPEND}"
diff --git a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
index 6c0d493d0ed5..217b3f570c80 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.9.3-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit autotools
-DESCRIPTION="A Tool for network monitoring and data acquisition"
+DESCRIPTION="A tool for network monitoring and data acquisition"
HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz"
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
index 9ddf16dd2aa5..2edd75502e32 100644
--- a/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.99.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
inherit autotools
-DESCRIPTION="A Tool for network monitoring and data acquisition"
+DESCRIPTION="A tool for network monitoring and data acquisition"
HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
SRC_URI="https://github.com/the-tcpdump-group/${PN}/archive/${P/_}.tar.gz"
S="${WORKDIR}/${PN}-${P/_}"
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index 4765315651b1..17c0eed4bfee 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-9999.ebuild
@@ -5,17 +5,17 @@ EAPI=7
inherit autotools git-r3
-DESCRIPTION="A Tool for network monitoring and data acquisition"
+DESCRIPTION="A tool for network monitoring and data acquisition"
HOMEPAGE="
https://www.tcpdump.org/
https://github.com/the-tcpdump-group/tcpdump
"
-LICENSE="BSD"
EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
+LICENSE="BSD"
SLOT="0"
-KEYWORDS=""
IUSE="+drop-root libressl +smi +ssl +samba suid test"
+
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( samba )"
diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch
deleted file mode 100644
index e3e0df933d5c..000000000000
--- a/net-analyzer/tcpstat/files/tcpstat-1.5-_DEFAULT_SOURCE.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -68,7 +68,7 @@
- case $my_build_os in
- aix*) AC_DEFINE(AIX_STRANGENESS, 1, [ defined on AIX systems. ]) ;;
- osf1*) AC_DEFINE(TRU64_STRANGENESS, 1, [ defined on OSF systems. ]) ;;
-- linux*) AC_DEFINE(_BSD_SOURCE, 1, [ defined usually on linux systems ] ) ;;
-+ linux*) AC_DEFINE(_DEFAULT_SOURCE, 1, [ defined usually on linux systems ] ) ;;
- bsd/os*) ;;
- freebsd*) ;;
- sunos*) ;;
diff --git a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch b/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch
deleted file mode 100644
index 88e668e1a4a5..000000000000
--- a/net-analyzer/tcpstat/files/tcpstat-1.5-db.patch
+++ /dev/null
@@ -1,165 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -84,15 +84,26 @@
- dnl #######################
- dnl Checks for header files
- dnl #######################
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
--AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h netinet/ip6.h)
-+AC_CHECK_HEADERS(sys/time.h sys/stat.h unistd.h strings.h fcntl.h)
-
- dnl BSD/OS Seems to not have a good ethernet header, so we gotta wing it
- AC_CHECK_HEADERS(net/if.h net/ethernet.h netinet/if_ether.h net/ppp_defs.h)
-
-+AC_ARG_ENABLE( ipv6, [ AC_HELP_STRING([--enable-ipv6], [s use IPv6?]) ], ip6=$enableval )
-+if test "$ip6" = "yes"
-+then
-+ AC_CHECK_HEADER(netinet/ip6.h, , [AC_MSG_ERROR([I couldn't find netinet/ip6.h though you asked for ipv6 support.])] )
-+elif test "$ip6" != "no"
-+then
-+ AC_CHECK_HEADER(netinet/ip6.h)
-+
-+fi
-+
-+
- dnl #############################################################
- dnl Checks for typedefs, structures, and compiler characteristics
- dnl #############################################################
- AC_C_CONST
- AC_TYPE_SIZE_T
-@@ -147,34 +158,11 @@
- If you already have... then please rerun configure with the option
- --with-pcap-lib=DIR
- with "DIR" being where libpcap is found.])
- ])
-
--dnl look for dbopen for tcpprof
--TCPPROF=""
--LD_TCPPROF=""
--AC_CHECK_LIB(c, dbopen, [ TCPPROF=tcpprof ], [
-- AC_CHECK_LIB(db1, dbopen, [
-- TCPPROF=tcpprof
-- LD_TCPPROF="-ldb1"
-- AC_DEFINE(USE_DB1_LIBRARY, 1, [ Use the sleepycat DB library. ])
-- ], [
-- AC_MSG_WARN([
--
-- *** WARNING ***
-- I couldn't locate the Berkeley DB library. The extra utility
-- "tcpprof" will not be built. THIS IS OK!!! "tcpstat" will
-- continue to be built as if this never happened.
--
-- If you wish to use the extra "tcpprof" program, please install
-- the Berkeley DB library from:
-- ftp://ftp.cs.berkeley.edu/ucb/4bsd/db.tar.gz
-- ])
-- ])
--])
- AC_SUBST(TCPPROF)
--AC_SUBST(LD_TCPPROF)
- AC_SUBST(MATHLIB)
-
- AC_CONFIG_FILES([
- Makefile
- doc/Makefile
---- a/lib/process.c
-+++ b/lib/process.c
-@@ -230,12 +230,12 @@
- * calls a user function pointing to the data
- *
- * XXX: filter is not used. capture_seconds also isn't, but snoop is
- * always read from a file.
- */
--int get_snoop_data(char *fname, char *filter, int flags,
-- Double capture_seconds, void (*hook)(packet_data *, void **),
-+int get_snoop_data(char *fname, char *filter __attribute__((unused)), int flags,
-+ Double capture_seconds __attribute__((unused)), void (*hook)(packet_data *, void **),
- void **args) {
-
- u_char *packet;
- int fd, len, blen, ret = 0;
- struct snoop_file_header fh;
---- a/lib/tcpseq.c
-+++ b/lib/tcpseq.c
-@@ -54,11 +54,10 @@
- u_char flags;
- struct tcpseq_ha test_ha;
- struct tcphdr *tp = NULL;
- struct ip *ip;
- #ifdef INET6
-- int is_ip6 = 0;
- struct ip6_hdr *ip6;
-
- ip6 = (struct ip6_hdr *) &pd->data.ip6.hdr;
- if (is_ip6_packet(pd))
- tp= &(pd->data.ip6.body.tcphdr);
---- a/src/catpcap.c
-+++ b/src/catpcap.c
-@@ -50,11 +50,11 @@
- if (c == ' ') return c;
- if ((u_char)c > 0xa1 && SHOW_HIGH_BIT) return c;
- return '.';
- }
-
--void proc_pcap(u_char *user, const struct pcap_pkthdr *h, const u_char *p) {
-+void proc_pcap(u_char *user __attribute__((unused)), const struct pcap_pkthdr *h, const u_char *p) {
- u_int length = h->caplen, i, j, k, step;
- u_char *r, *s;
- char c;
-
- r = (u_char *)p;
-@@ -90,11 +90,11 @@
- }
- /*
- * process_file() takes the output of tcpdump, saves packets, and displays
- * statistics
- */
--void process_file(char *fname, u_int unused) {
-+void process_file(char *fname, u_int unused __attribute__((unused))) {
- int run = 1, i;
- pcap_t *pd;
- char ebuf[PCAP_ERRBUF_SIZE];
- struct bpf_program bpf_prog;
-
---- a/src/dump.c
-+++ b/src/dump.c
-@@ -37,21 +37,21 @@
- char filterexpr[BUF_SIZ] = "";
- int get_tcp_flags = 0;
- int what_to_show = 0;
- int packet_number = 0;
-
--void my_hook(packet_data *pd, void **args) {
-+void my_hook(packet_data *pd) {
- printf("PACKET NUMBER: %d\n", ++packet_number);
- print_packet(pd, what_to_show);
- printf("-------------------\n");
- }
-
- /*
- * process_file() takes the output of tcpdump, saves packets, and displays
- * statistics
- */
--void process_file(char *fname, u_int unused) {
-+void process_file(char *fname, u_int unused __attribute__((unused))) {
- get_dump_data(fname, filterexpr, get_tcp_flags,
- -1.0, my_hook, NULL);
- }
-
- int parse_show_types(char *in) {
---- a/src/tcpstat.c
-+++ b/src/tcpstat.c
-@@ -421,11 +421,11 @@
- }
-
- /*
- * process_file() gets the data, and then displays the statistics
- */
--void process_file(char *fname, u_int unused) {
-+void process_file(char *fname, u_int unused __attribute__((unused))) {
- void *argv[2];
- statistics stats;
- Double x;
-
- signal(SIGUSR1, catch_signal);
diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild
deleted file mode 100644
index ce12a85db51b..000000000000
--- a/net-analyzer/tcpstat/tcpstat-1.5-r3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Reports network interface statistics"
-HOMEPAGE="https://www.frenchfries.net/paul/tcpstat/"
-SRC_URI="https://www.frenchfries.net/paul/tcpstat/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
-IUSE="ipv6"
-
-DEPEND="
- net-libs/libpcap
-"
-RDEPEND="
- ${DEPEND}
-"
-DOCS=( AUTHORS ChangeLog NEWS README doc/Tips_and_Tricks.txt )
-PATCHES=(
- "${FILESDIR}"/${P}-db.patch
- "${FILESDIR}"/${P}-_DEFAULT_SOURCE.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- append-cflags -Wall -Wextra
- econf \
- $(use_enable ipv6) \
- --with-pcap-include='' \
- --with-pcap-lib="$( $(tc-getPKG_CONFIG) --libs libpcap)"
-}
-
-src_install() {
- default
- dobin src/{catpcap,packetdump}
- newdoc src/README README.src
-}
diff --git a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
index f93379e1a21f..859524d5c260 100644
--- a/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
+++ b/net-analyzer/tcpstat/tcpstat-1.5_p8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ppc64 sparc x86"
IUSE="ipv6"
DEPEND="
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index b9aed215c06f..bd345985e350 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/xl2tpd/Manifest b/net-dialup/xl2tpd/Manifest
index c7005a312290..cf1a52b2633b 100644
--- a/net-dialup/xl2tpd/Manifest
+++ b/net-dialup/xl2tpd/Manifest
@@ -1,5 +1,2 @@
-DIST xl2tpd-1.3.10.tar.gz 510777 BLAKE2B 15ec09a6186d20facd4eceeca87a33a4676644a6976c2b69a61b288a2534c354bcc9b64eca4305aa7774d3b5fc29c97078478bebec7e81f8071865b29a97809e SHA512 304b8cd098608a866d32c65c55ba98a01e10abb473d8bff488c723fd1f6d4a66cf98c6d3044f7986a334739693767608c48999f873e95a51f0fa6c23cb61ecd4
-DIST xl2tpd-1.3.11.tar.gz 510652 BLAKE2B c120ba0a2bb96a87334743319808e4a1dfb1b95140fc37df51c33e176bdefdac547ad27d38731bab9d94a939b9a3ca93404ef17c8076e16567a3ecc5b568fb47 SHA512 9fd478aa6b7e22867aa977aa0c22ba9d856e3b659aa0ffdcdb17aa0d8358cceab37da565eeb799590d65fc2914720715423e006f6bbe7ca742f09d7cced52cb7
-DIST xl2tpd-1.3.12.tar.gz 513173 BLAKE2B a1f2e4d0e1af4402679eeec6589ca17b0422c664d37beae628511f988f6508ca22160d4657f8ff84bc5e5aac4d3e837c501b4d307964530044a792f2ecc599ab SHA512 e18f15ba038cd358fbad9dd7284c5f3c34273d9291bf8c66494c46d78150acfc1666cbf935fb5a66bd1f0220014f0b49fa0f7f55cb42de125e4123112c6eb00b
-DIST xl2tpd-1.3.13.tar.gz 513958 BLAKE2B 66c2bcbb54191445f1a519d507b2ec67b48d9e994db09b8c6fc9980b03bf5aab09a2f6187170f0e8639bd8a323b8417bf6e5d0a80fd9e45f8adc310902b256ae SHA512 02e3502a75f41745c001fe1a34dd9900c3a77eea274e08f9361f7145ac24e9a663975efe85ef6aef7c6da1aa9f3369eeb5542ac26e90b9d59753158a17b69ee4
DIST xl2tpd-1.3.15.tar.gz 524960 BLAKE2B 5349b4bce7e4b8ea26ec3c739847456b6c8fdac667c8ad9d5241d3c83bc450a47c88c99c37cea2b0461fd4abb3e32da67de7c8ab95d288c8c423bea9af4abf1d SHA512 f65c7f2f1c03728d825b8857baa0c2297e9d5dbd97a2375484a32851326db5951deb9bf3598cbec860f0787d1bb577b4f0a47372e3244fd92c8bad7ce684889b
+DIST xl2tpd-1.3.16.tar.gz 531861 BLAKE2B 2f809c8623c1a77ee538014d4ff3389e32e142f8cd6acad1657198323835574dd3d062e5ed6ee81ded5c4a1a65d8e200759ed6013884bb655ca6f5eef5333931 SHA512 d92bd9070c0e78ba1f4f7ee38be9e87d1f869fe240433f2fd7d1c974f1bce1573ab7aeb5922f316e53bd0fd4580b6152d585b1e0e0cd6fb01ef8fa85d9509b16
diff --git a/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch b/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch
deleted file mode 100644
index b27703fe435e..000000000000
--- a/net-dialup/xl2tpd/files/xl2tpd-dnsretry.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=307489
-http://homenet.beeline.ru/index.php?showtopic=192551&st=0&p=1063626345entry1063626345
-
---- xl2tpd.c 2010-05-10 22:35:43.000000000 +0200
-+++ xl2tpd.c 2010-08-15 22:02:14.000000000 +0200
-@@ -587,9 +587,33 @@
- hp = gethostbyname (host);
- if (!hp)
- {
-- l2tp_log (LOG_WARNING, "Host name lookup failed for %s.\n",
-- host);
-- return NULL;
-+ if ( lac->redial )
-+ {
-+ int imax=lac->rmax;
-+ if ( lac->rmax == 0 )
-+ imax = 1;
-+ while ( imax > 0 )
-+ {
-+ hp = gethostbyname ( host );
-+ if ( hp )
-+ break;
-+ l2tp_log ( LOG_WARNING, "Y: Host name lookup failed for %s. Trying to look again in %d seconds.\n", host, lac->rtimeout );
-+ if ( lac->rtimeout > 0 )
-+ sleep ( lac->rtimeout );
-+ if ( lac->rmax > 0 )
-+ imax--;
-+ }
-+ if ( ( imax == 0 ) && ( lac->rmax > 0 ) )
-+ {
-+ l2tp_log ( LOG_WARNING, "Y: Host name lookup failed for %s after %d tries. Lookup stops now.\n", host, lac->rmax );
-+ return NULL;
-+ }
-+ }
-+ else
-+ {
-+ l2tp_log (LOG_WARNING, "Host name lookup failed for %s.\n", host);
-+ return NULL;
-+ }
- }
- bcopy (hp->h_addr, &addr, hp->h_length);
- /* Force creation of a new tunnel
diff --git a/net-dialup/xl2tpd/metadata.xml b/net-dialup/xl2tpd/metadata.xml
index 42549f5d851d..bab6c0296178 100644
--- a/net-dialup/xl2tpd/metadata.xml
+++ b/net-dialup/xl2tpd/metadata.xml
@@ -4,7 +4,6 @@
xl2tpd is a fork of l2tpd Layer 2 Tunneling Protocol (L2TP) daemon that can be used to transfer frames of OSI layer 2 protocols through an IP tunnel. While it provides authentication via CHAP or PAP it does not provide encryption itself and should therefore be externally secured (via IPSEC).
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild
deleted file mode 100644
index 4f97f86be8e9..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.10.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/services/software/xl2tpd/"
-SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ppc64 x86"
-IUSE="dnsretry"
-
-DEPEND="
- net-libs/libpcap
- >sys-kernel/linux-headers-2.6"
-
-RDEPEND="
- ${DEPEND}
- net-dialup/ppp"
-
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
-
-src_prepare() {
- default
- # The below patch is questionable. Why wasn't it submitted upstream? If it
- # ever breaks, it will just be removed. -darkside 20120914
- # Patch has been discussed with upstream and is marked as feature by now:
- # https://github.com/xelerance/xl2tpd/issues/134 // -- tenX 2017-08-06
- use dnsretry && eapply -p0 "${FILESDIR}/${PN}-dnsretry.patch"
-}
-
-src_compile() {
- tc-export CC
- emake OSFLAGS="-DLINUX"
-}
-
-src_install() {
- emake PREFIX=/usr DESTDIR="${D}" install
-
- insinto /etc/xl2tpd
- newins doc/l2tpd.conf.sample xl2tpd.conf
- newins doc/l2tp-secrets.sample l2tp-secrets
- fperms 0600 /etc/xl2tpd/l2tp-secrets
-
- newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
-
- systemd_dounit "${FILESDIR}"/xl2tpd.service
- dotmpfiles "${FILESDIR}"/xl2tpd.conf
-
- einstalldocs
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.11.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.11.ebuild
deleted file mode 100644
index ff66464ce648..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.11.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="http://www.xelerance.com/services/software/xl2tpd/"
-SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="dnsretry"
-
-DEPEND="
- net-libs/libpcap
- >sys-kernel/linux-headers-2.6"
-
-RDEPEND="
- ${DEPEND}
- net-dialup/ppp"
-
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
-
-src_prepare() {
- default
- # The below patch is questionable. Why wasn't it submitted upstream? If it
- # ever breaks, it will just be removed. -darkside 20120914
- # Patch has been discussed with upstream and is marked as feature by now:
- # https://github.com/xelerance/xl2tpd/issues/134 // -- tenX 2017-08-06
- use dnsretry && eapply -p0 "${FILESDIR}/${PN}-dnsretry.patch"
-}
-
-src_compile() {
- tc-export CC
- emake OSFLAGS="-DLINUX"
-}
-
-src_install() {
- emake PREFIX=/usr DESTDIR="${D}" install
-
- insinto /etc/xl2tpd
- newins doc/l2tpd.conf.sample xl2tpd.conf
- newins doc/l2tp-secrets.sample l2tp-secrets
- fperms 0600 /etc/xl2tpd/l2tp-secrets
-
- newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
-
- systemd_dounit "${FILESDIR}"/xl2tpd.service
- dotmpfiles "${FILESDIR}"/xl2tpd.conf
-
- einstalldocs
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.12.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.12.ebuild
deleted file mode 100644
index 3e7e2ce70f46..000000000000
--- a/net-dialup/xl2tpd/xl2tpd-1.3.12.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd toolchain-funcs tmpfiles
-
-DESCRIPTION="A modern version of the Layer 2 Tunneling Protocol (L2TP) daemon"
-HOMEPAGE="https://github.com/xelerance/xl2tpd"
-SRC_URI="https://github.com/xelerance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-
-DEPEND="
- net-libs/libpcap
- >=sys-kernel/linux-headers-2.6"
-
-RDEPEND="
- ${DEPEND}
- net-dialup/ppp"
-
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
-
-src_compile() {
- tc-export CC
- emake OSFLAGS="-DLINUX"
-}
-
-src_install() {
- emake PREFIX=/usr DESTDIR="${D}" install
-
- newinitd "${FILESDIR}"/xl2tpd-init-r1 xl2tpd
-
- systemd_dounit "${FILESDIR}"/xl2tpd.service
- dotmpfiles "${FILESDIR}"/xl2tpd.conf
-
- einstalldocs
-
- insinto /etc/xl2tpd
- newins doc/l2tpd.conf.sample xl2tpd.conf
- insopts -m 0600
- newins doc/l2tp-secrets.sample l2tp-secrets
-}
diff --git a/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild b/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
similarity index 93%
rename from net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild
rename to net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
index a383fd15cbf8..e20c5ce6dfa5 100644
--- a/net-dialup/xl2tpd/xl2tpd-1.3.13.ebuild
+++ b/net-dialup/xl2tpd/xl2tpd-1.3.16.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit systemd toolchain-funcs tmpfiles
@@ -22,7 +22,7 @@ RDEPEND="
${DEPEND}
net-dialup/ppp"
-DOCS=(CREDITS README.xl2tpd BUGS CHANGES TODO doc/README.patents)
+DOCS=(CREDITS README.md BUGS CHANGES TODO doc/README.patents)
src_compile() {
tc-export CC
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 918c9950a708..e0eb3e632bc1 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/dnscap/Manifest b/net-dns/dnscap/Manifest
index 2fd39d66ad00..832dd7372903 100644
--- a/net-dns/dnscap/Manifest
+++ b/net-dns/dnscap/Manifest
@@ -1,2 +1 @@
-DIST dnscap-1.10.2.tar.gz 655932 BLAKE2B 317547e9d7b8f87d08e954639b62e1894e4d8e37eb9612a984dc10deb674c35973f03f94843df0e9eeb74c94904de00b2718e7121f3dddb9e343b3519d13e02e SHA512 22df8068a17b202b1dfed2dc4ce1c4178abf32af16a3b15a76ae8f46510b3979d44c62eac673afd8452abda69a49e3da133f740217b7ab64631d2c18657a9a8b
DIST dnscap-1.10.3.tar.gz 655965 BLAKE2B 8ee267839424b4876833ed5f466ee5972facf0fa866025a2172aa3cdd8900b182b9c8f4f7bf1ecc2f41d017237b9f2d9085722c114a4a0cabf9c953c02a9be02 SHA512 7bc97881c2cbd985010f3bd515aec454440767a0e9926d1fd7060c0d815679544384efbc74786ad6922436b2d6626ce1a9f3e9fd2d4b753ad7409fe018ecb5f5
diff --git a/net-dns/dnscap/dnscap-1.10.2.ebuild b/net-dns/dnscap/dnscap-1.10.2.ebuild
deleted file mode 100644
index 38e157300abc..000000000000
--- a/net-dns/dnscap/dnscap-1.10.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Network capture utility designed specifically for DNS traffic"
-HOMEPAGE="https://dnscap.dns-oarc.net/"
-SRC_URI="https://www.dns-oarc.net/files/dnscap/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="ISC"
-IUSE=""
-
-RDEPEND="net-libs/libpcap
- net-libs/ldns
- sys-libs/zlib
- dev-libs/openssl:=
- dev-perl/YAML"
-
-DEPEND="${RDEPEND}"
-
-pkg_postinst() {
- elog "If you plan to use dnscap's -x/-X features, it is necessary to install"
- elog "net-dns/bind as well."
-}
diff --git a/net-dns/dnssec-tools/dnssec-tools-2.2.3-r1.ebuild b/net-dns/dnssec-tools/dnssec-tools-2.2.3-r1.ebuild
deleted file mode 100644
index 7328cfb57af5..000000000000
--- a/net-dns/dnssec-tools/dnssec-tools-2.2.3-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 systemd
-
-DESCRIPTION="Tools to ease the deployment of DNSSEC related technologies"
-HOMEPAGE="https://dnssec-tools.org/"
-SRC_URI="https://github.com/DNSSEC-Tools/DNSSEC-Tools/archive/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="static-libs"
-
-RDEPEND="
- dev-lang/perl:=
- dev-perl/CGI
- dev-perl/Crypt-OpenSSL-Random
- dev-perl/Getopt-GUI-Long
- dev-perl/GraphViz
- dev-perl/MailTools
- dev-perl/Net-DNS
- dev-perl/Net-DNS-SEC
- dev-perl/XML-Simple"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/DNSSEC-Tools-${P}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-dtinitconf.patch )
-
-src_prepare() {
- default
- sed -e '/^maninstall:/,+3s:$(MKPATH) $(mandir)/$(man1dir):$(MKPATH) $(DESTDIR)/$(mandir)/$(man1dir):' \
- -i Makefile.in || die
- sed -e 's:/usr/local/etc:/etc:g' \
- -e 's:/usr/local:/usr:g' \
- -i tools/donuts/donuts \
- -i tools/etc/dnssec-tools/dnssec-tools.conf \
- -i tools/scripts/genkrf || die
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-bind-checks
- --without-validator
- --with-perl-build-args=INSTALLDIRS=vendor
- $(use_enable static-libs static)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- newinitd "${FILESDIR}"/rollerd.initd rollerd
- newconfd "${FILESDIR}"/rollerd.confd rollerd
- systemd_dounit "${FILESDIR}"/rollerd.service
-
- newinitd "${FILESDIR}"/donutsd.initd donutsd
- newconfd "${FILESDIR}"/donutsd.confd donutsd
- systemd_dounit "${FILESDIR}"/donutsd.service
-
- find "${ED}" -name "*.la" -delete || die
- readme.gentoo_create_doc
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Please run 'dtinitconf' in order to set up the required
-/etc/dnssec-tools/dnssec-tools.conf file
-
-DNSSEC Validator has been split into net-dns/dnssec-validator
-"
diff --git a/net-dns/resolv_wrapper/Manifest b/net-dns/resolv_wrapper/Manifest
index 1efec700e444..512449c54d28 100644
--- a/net-dns/resolv_wrapper/Manifest
+++ b/net-dns/resolv_wrapper/Manifest
@@ -1,2 +1,3 @@
DIST resolv_wrapper-1.1.5.tar.gz 34241 BLAKE2B 7025885731a1defa79ae7a0381ca4394c37508883dc5e19aa9e29b0545cddc1c3f2b5091991a3e1599654e1a64442a6a36760f7725e54d1270c1a5b71bd3fadb SHA512 d11beff60cf935c0c12ac97ae375299ab1cd2e270d09438cf81b5c19dd94b7d430484c44ec9611171b67654d5c0f26afc4aa9d069d61293a956ef8fc59efc7a8
DIST resolv_wrapper-1.1.6.tar.gz 38276 BLAKE2B 4b1c79a342b74f33063ba480b1706a107c53275430b3f5e1e46204265af3501394f72b6119e98ad3382e48f9a8f2511e679b3f4093446beaa11095bfaed340ce SHA512 cc379124c6104ba1330dfc038f04f9b473b71ac81b18889e481fb7812b38e71040ca6bed7bffd6eeaf77abeb8452a4d3308514ec6380811327dc832aa0381be8
+DIST resolv_wrapper-1.1.7.tar.gz 45148 BLAKE2B d1b860187bfa3be6eadd848abc458d5c9e3c4c4048a70b37d7548caf2604bda51f8a3606487fb95d682ab39e06f63f29b85de981ae32527997799fa5d72befab SHA512 531a7734f40d8a7cb3da4618eebbb4530657ad2cdcf3c1cd48f3ae1dcf55fc003205e44745fc3f70704060ae0c6a2516919c61fd10223ff56d90a47a3c59b3c0
diff --git a/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild b/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
new file mode 100644
index 000000000000..50e162a27887
--- /dev/null
+++ b/net-dns/resolv_wrapper/resolv_wrapper-1.1.7.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Wrapper for DNS name resolving or DNS faking"
+HOMEPAGE="https://cwrap.org/resolv_wrapper.html"
+SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? (
+ dev-util/cmocka
+ net-libs/socket_wrapper
+ )"
+
+# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
+# Because of this we cannot use cmake-multilib_src_configure() here.
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir)
+ -DUNIT_TESTING=$(usex test)
+ )
+ cmake_src_configure
+}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index db232e1f46bd..2b29e1bb35f9 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild b/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild
index 875567fd5087..5d3d95a6b3fa 100644
--- a/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild
+++ b/net-firewall/conntrack-tools/conntrack-tools-1.4.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.netfilter.org/projects/conntrack-tools/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ppc ppc64 x86"
IUSE="doc +cthelper +cttimeout systemd"
RDEPEND="
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 4d10a332797a..d5112bcbc8f9 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index 6b2d11221274..b1fa920bd591 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -4,6 +4,8 @@ DIST mattermost-desktop-4.5.2-linux-ia32.tar.gz 104826222 BLAKE2B f0552069099e54
DIST mattermost-desktop-4.5.2-linux-x64.tar.gz 103238897 BLAKE2B 46e56c55409db645ba0962a816f584610decea4696c182e66544d2085d5b420019aed7d2680c5a90b7bdd293f9549be81508d24f79d409446918f862bfeca474 SHA512 f22938b629840dd6e8fbdec5e6ae6fdadaa0eae0fb727a063ef1539a3a0a625d61dd8468ea8cf45732a8f3b2c6da002dceed2b287aa75b14d09a03268f967eb4
DIST mattermost-desktop-4.6.1-linux-ia32.tar.gz 116278144 BLAKE2B 737089a5454c8d8bc87cfefc68d4fbe5036287f2b8c4e92d8cdc000b481996641cc22c7aec1915bac0bd21f0fc2c2019e0e6d011070879cda25f566716f0c193 SHA512 8a2b7369fedf4cfb28bb5e54b2fa61bdc22ceda4ae01753a4259581856ba71459d4c2bea238d2e9aba8fe1c11bddfe6e45f1e470e99e7ca642058605c5589453
DIST mattermost-desktop-4.6.1-linux-x64.tar.gz 114688536 BLAKE2B 68be76641eeb0e073388ce6cbd6987903ff0a4a0e266ac1e27fa977dff7e1354ac226d1f19b43b4f07d0d731ea92ded2585b2744f68263ff57751f059703a0c2 SHA512 ed24ad4e33c88ae55440e8aa5f57e4e83f022b22ccb488146507707a79cf403895066be6b43dcaeb34217ddf0df4e1d02c3a8128bf8568d7b4be94a4e51bdd06
+DIST mattermost-desktop-4.6.2-linux-ia32.tar.gz 116280086 BLAKE2B f0770b12abf23c43ae1a71b068045abcbbc44d7cd40de3ef84e4cde7e22210c911cd8401a8ad330bd5ea19f664087d423fadd43834a351e48b479693686e9ba8 SHA512 409966b02256f5250da976ca825d75ea5690f667bfafb30cfae7e16cf96aa39f8a2fc797768bc1b8b9bfc0e511dfabd85a9033161830077d0a424deac22bb362
+DIST mattermost-desktop-4.6.2-linux-x64.tar.gz 114689112 BLAKE2B 9efc54fc424dc1be2544b6f1901387ef4ee2ad976dfa1a2c0fa18c4410f16393a471e9549dc0c36219eedefde2d246d9c6a054f8a7c38bde68f700bd5574116b SHA512 19e1f3a273ae5ab202bbd380f68f3acbc3b42748ad978897bac05be8ba264026fe3466ddfa73b711bc3b1bd331661a49fcd6f800ca23e11a463e5b97ee9f35eb
DIST mattermost-desktop-bin-4.5.1.tar.gz 1653861 BLAKE2B 2ad02df830cd2b62a730e8c6b385a739cfa7be30765ee4245f92e7a3db194ea03863490b337d03d47357f0d18ec31dd34fcde4576b93c80702e716ae9fd772a7 SHA512 6e2269de681ec416be2354ff8ee37d219ede4b10361e6a3669cc4e93e9ab06cd6a198dece05411756fdea271e55cafb94ad29161801cc55b5dae02b99b24ccab
DIST mattermost-desktop-bin-4.5.2.tar.gz 1653801 BLAKE2B fac573ce27cd693489a173d3b90480476e569a7d0c435a53e44b075fc96a56720558e1e555c5a587f0fb7bed06b7f5e53c11728280804e812ee2090adc6d96d3 SHA512 69148aa9de18f6dac78450dc0b79630e9ea1552027ed46f6d03aca02ae57342b251a236f4c3ed6b9145e050be38d7748820bc4dd9f36f300c59940b7c2db7827
DIST mattermost-desktop-bin-4.6.1.tar.gz 1702070 BLAKE2B 1c8f0c21add6563f6cca51bea37c25f41ba2e00daed7101b3d937941b12cef2e34cfb958a2c83c9641e08b99dd99d4784196e71cdc98227a66d6f2a31ee35219 SHA512 ee16e27cd836a49c8329397ee70d0d61e72c1295dcc2329e235cd813ac2583394d24e7d0d40c8c6d47dc85c5c900a22d3b96bd3b4f0262224443e5232d2b2102
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.2.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.2.ebuild
new file mode 100644
index 000000000000..c56080aefd20
--- /dev/null
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-4.6.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%-*}"
+
+inherit desktop
+
+DESCRIPTION="Mattermost Desktop application"
+HOMEPAGE="https://about.mattermost.com/"
+
+SRC_URI="
+ amd64? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-x64.tar.gz )
+ x86? ( https://releases.mattermost.com/desktop/${PV}/mattermost-desktop-${PV}-linux-ia32.tar.gz )
+"
+
+LICENSE="Apache-2.0 GPL-2+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-accessibility/at-spi2-atk:2
+ app-accessibility/at-spi2-core:2[X]
+ dev-libs/expat
+ dev-libs/nss
+ media-libs/alsa-lib
+ net-print/cups
+ sys-apps/dbus
+ x11-libs/gtk+:3[X]
+ x11-libs/libXScrnSaver
+"
+
+QA_PREBUILT="
+ opt/mattermost-desktop/mattermost-desktop
+ opt/mattermost-desktop/libnode.so
+ opt/mattermost-desktop/libffmpeg.so
+ opt/mattermost-desktop/libGLESv2.so
+ opt/mattermost-desktop/libEGL.so
+"
+
+DOCS=(
+ NOTICE.txt
+ README.md
+)
+
+S="${WORKDIR}"
+
+src_install() {
+ if use amd64; then
+ cd "${WORKDIR}/mattermost-desktop-${PV}-linux-x64" || die
+ elif use x86; then
+ cd "${WORKDIR}/mattermost-desktop-${PV}-linux-ia32" || die
+ fi
+
+ insinto "/opt/${MY_PN}/locales"
+ doins locales/*.pak
+
+ insinto "/opt/${MY_PN}/resources"
+ doins resources/*.asar
+
+ insinto "/opt/${MY_PN}"
+ doins *.pak *.bin *.dat
+ exeinto "/opt/${MY_PN}"
+ doexe *.so "${MY_PN}"
+
+ dosym "../../opt/${MY_PN}/${MY_PN}" "/usr/bin/${MY_PN}"
+
+ newicon "./icon.svg" "${MY_PN}.svg"
+ make_desktop_entry "${MY_PN}" Mattermost "${MY_PN}"
+
+ einstalldocs
+}
diff --git a/net-im/mattermost-desktop-bin/metadata.xml b/net-im/mattermost-desktop-bin/metadata.xml
index f8151855e277..413869a3fa99 100644
--- a/net-im/mattermost-desktop-bin/metadata.xml
+++ b/net-im/mattermost-desktop-bin/metadata.xml
@@ -1,7 +1,14 @@
-
+
+ ceamac.paragon@gmail.com
+ Viorel Munteanu
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
mattermost/desktop
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 5c49d03b1f7d..77dae6920211 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/cvm/Manifest b/net-libs/cvm/Manifest
index 47589513a49f..3c2c7a723e66 100644
--- a/net-libs/cvm/Manifest
+++ b/net-libs/cvm/Manifest
@@ -1,2 +1 @@
-DIST cvm-0.96.tar.gz 127999 BLAKE2B bf6a0f26538f4f10dafe9d021e6f3ef22ee57230f64cf50cba95be3cb5ddf54a0479d033936d26ee9526745ead61fc6af7bfd1fdc3da10a6915108b2d873772c SHA512 23adf39571bf414fa61084ac824a54b3cb37ef32a46c72ad50734743fb66bb923168eb866d72fba7f88397b37831e2ce7603c7d543996b28761ed1d5b053d73d
DIST cvm-0.97.tar.gz 127759 BLAKE2B 857a30ae52e7edc5e8bc66dfbe7e2ada6ba7763260b073eabbca6ee289b68ceece92442dffc5aa1d358faec24f90993d88d3555dd9399837f25e9f689ab6d66b SHA512 b04ca9edb8c84e06628ed1a827d28bf7d787c3853bec1e064fc1eb7e3082ad81998e7c902e029c0f01c346a52a4419e3c9890e2a7a75ab38625e0078dc4e9891
diff --git a/net-libs/cvm/cvm-0.96-r1.ebuild b/net-libs/cvm/cvm-0.96-r1.ebuild
deleted file mode 100644
index 4f150585b773..000000000000
--- a/net-libs/cvm/cvm-0.96-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Credential Validation Modules by Bruce Guenter"
-HOMEPAGE="http://untroubled.org/cvm/"
-SRC_URI="http://untroubled.org/cvm/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc ~x86"
-IUSE="mysql postgres test vpopmail"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-db/cdb:=
- >=dev-libs/bglibs-1.041:="
-DEPEND="${RDEPEND}
- mysql? ( dev-db/mysql-connector-c:0= )
- postgres? ( dev-db/postgresql[server] )
- vpopmail? ( net-mail/vpopmail )
- test? (
- app-editors/vim
- dev-db/sqlite
- )"
-# some of the testcases use
-# - ex/vi/xxd
-# - cdbmake
-# - sqlite
-
-PATCHES=( "${FILESDIR}"/${PN}-0.96-fix-test-padding.patch )
-
-src_prepare() {
- default
- # disable this test, as it breaks under Portage
- # and there is no easy fix
- sed -i.orig \
- -e '/qmail-lookup-nodomain/,/^END_OF_TEST_RESULTS/d' \
- "${S}"/tests.sh || die "sed failed"
- # Fix the vpopmail build
- sed -i.orig \
- -e '/.\/ltload cvm-vchkpw/s,-lmysqlclient,,g' \
- -e '/.\/ltload cvm-vchkpw/s,-L/usr/local/vpopmail/lib,,g' \
- -e '/.\/ltload cvm-vchkpw/s,-L/var/vpopmail/lib,,g' \
- -e '/.\/ltload cvm-vchkpw/s,-L/usr/local/lib/mysql,,g' \
- -e '/.\/ltload cvm-vchkpw/s,\.la,.la `cat /var/vpopmail/etc/lib_deps`,g' \
- "${S}"/Makefile \
- || die "Failed to fix vpopmail linking parts of Makefile"
- sed -i.orig \
- -e '/.\/compile cvm-vchkpw/s,$, `cat /var/vpopmail/etc/inc_deps`,g' \
- "${S}"/Makefile \
- || die "Failed to fix vpopmail compiling parts of Makefile"
-}
-
-src_configure() {
- echo "/usr/include/bglibs" > conf-bgincs || die
- echo "/usr/$(get_libdir)/bglibs" > conf-bglibs || die
- echo "/usr/include" > conf-include || die
- echo "/usr/$(get_libdir)" > conf-lib || die
- echo "/usr/bin" > conf-bin || die
- echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
- echo "$(tc-getCC) ${LDFLAGS} -lcrypt" > conf-ld || die
-}
-
-src_compile() {
- emake -j1
-
- if use mysql; then
- einfo "Building MySQL support"
- emake -j1 mysql
- fi
-
- if use postgres; then
- einfo "Building Postgresql support"
- emake -j1 pgsql
- fi
-
- if use vpopmail; then
- einfo "Building vpopmail support"
- emake -j1 cvm-vchkpw
- fi
-}
-
-src_test() {
- # bug 624384
- # the test suite tests stuff that isn't potentially enabled
- emake -j1 sqlite
- sh tests.sh || die "Testing Failed"
-}
-
-src_install() {
- # Upstreams installer is incredibly broken
- dolib.a .libs/*.a
- dolib.so .libs/*.so.*
-
- local i
- for i in a so; do
- dosym libcvm-v2client.${i} /usr/$(get_libdir)/libcvm-client.${i}
- done
-
- for i in {bench,test}client chain checkpassword pwfile qmail unix \
- vmailmgr{,-local,-udp} v1{benchclient,checkpassword,testclient} \
- ; do
- dobin .libs/cvm-${i}
- done
- use mysql && dobin .libs/cvm-mysql{,-local,-udp}
- use postgres && dobin .libs/cvm-pgsql{,-local,-udp}
- use vpopmail && dobin .libs/cvm-vchkpw
-
- insinto /usr/include/cvm
- doins {credentials,errors,facts,module,protocol,sasl,v1client,v2client}.h
- dosym v1client.h /usr/include/cvm/client.h
- dosym cvm/sasl.h /usr/include/cvm-sasl.h
-
- dodoc ANNOUNCEMENT NEWS{,.sql,.vmailmgr}
- dodoc README{,.vchkpw,.vmailmgr}
- dodoc TODO VERSION ChangeLog*
- docinto html
- dodoc *.html
-}
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index 90396725d723..6f894687f9ed 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,2 +1 @@
-DIST gloox-1.0.22.tar.bz2 722653 BLAKE2B e029930ae51053772d4f7bb0cb0933cb260aacc571a6fab6b78c0e12cb7e119938c742afcc0e1af037a97c293f03b423a626c9b01dc9ce974b922c7e9054bcf2 SHA512 89b51dbee338ef8b234d934a5536a2e5d83d8121fa624e933b63bd15017d60f941781a1045884d0d125f50370ed7857cf4131242d39f6703e72c9cf064691416
DIST gloox-1.0.24.tar.bz2 727442 BLAKE2B 57e8916ddf057c115350e005a027e3a81684269f688dd80126bf3753a8dd71a8d64a86e1eb59de2886a6657ad1dac5f9431549db79f314173f49233044b52cb5 SHA512 e3ddb331a57e635b8da5d8cd36a89fa9521599301d1108a025a3526a02df5bf73555d54bccd3706fdffd857134716b23df6bf57a59a17be4f6a7873a810268ee
diff --git a/net-libs/gloox/gloox-1.0.22.ebuild b/net-libs/gloox/gloox-1.0.22.ebuild
deleted file mode 100644
index 683420569f62..000000000000
--- a/net-libs/gloox/gloox-1.0.22.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
-HOMEPAGE="https://camaya.net/gloox/"
-SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug gnutls idn libressl ssl static-libs test zlib"
-
-DEPEND="idn? ( net-dns/libidn:= )
- gnutls? ( net-libs/gnutls )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- zlib? ( sys-libs/zlib )"
-
-RDEPEND="${DEPEND}"
-
-# GnuTLS checks hang forever
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
- # Examples are not installed anyway, so - why should we build them?
- local myeconfargs=(
- --without-examples
- $(usex debug "--enable-debug" '')
- $(use_enable static-libs static)
- $(use_with idn libidn)
- $(use_with gnutls)
- $(use_with ssl openssl)
- $(use_with test tests)
- $(use_with zlib)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/net-libs/libdom/Manifest b/net-libs/libdom/Manifest
index f48b00b1aa02..a7fb9819ea48 100644
--- a/net-libs/libdom/Manifest
+++ b/net-libs/libdom/Manifest
@@ -1,3 +1 @@
-DIST libdom-0.3.3-src.tar.gz 870035 BLAKE2B 6dc77fe0ef31e491810243b461e6e7fbab2d6d2bb56e68730497ed9e0e1acf9dfcc29be024bd0010292e57d25849124153772c24503012fbdf38d24363f35a05 SHA512 3b08b20976b36adf441f088e9feb756b9ce6a43133e57b90fa6d6b8809d74c6d500c7d2a883dd19d520c6ef71d9e04685d9765e6c6a00677a412265ecc6273a8
-DIST libdom-0.4.0-src.tar.gz 871499 BLAKE2B e0ab1a1cf14b532eec1bd68c3ee2557a720a984232ede2f9b0e1d4c68299cc8b39b3d83fa1ff77233d07b8148188ec3012dca64787cfe476b4eb6990f1c71629 SHA512 4d3acb6520619c6c28f20c9fef72b19a879070d0e65d896212c557ada44d35c1fcae4712b901db720ddeb3b1b90832005d63075dcafaddb5f4ba2088fa7a9eef
DIST libdom-0.4.1-src.tar.gz 872954 BLAKE2B 7a6d15fbb4bb7046b8ee9670a14c89f5da2ea0eac10631274d9b47eb0ee1181a85eb62aea326d293c407a006091452fba174dddfbb8cd0297a224850159ff9b1 SHA512 8927b294c98dcb424a454036b20981963ba9982c1aad95b07fc0ca1efc58756b7d85373ed4cde0dcff6281b518a2b5993358494f432d85f7ac7ebd51230a6c22
diff --git a/net-libs/libdom/libdom-0.3.3-r2.ebuild b/net-libs/libdom/libdom-0.3.3-r2.ebuild
deleted file mode 100644
index 7198d7ecdb69..000000000000
--- a/net-libs/libdom/libdom-0.3.3-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="implementation of the W3C DOM, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="expat test xml"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/libparserutils-0.2.1-r1
- >=dev-libs/libwapcaplet-0.3.0
- >=net-libs/libhubbub-0.3.1-r1
- xml? (
- expat? ( >=dev-libs/expat-2.1.0-r3 )
- !expat? ( >=dev-libs/libxml2-2.9.1-r4 )
- )"
-DEPEND="${RDEPEND}
- dev-util/netsurf-buildsystem
- virtual/pkgconfig
- test? (
- dev-perl/XML-XPath
- dev-perl/libxml-perl
- dev-perl/Switch
- )"
-
-REQUIRED_USE="test? ( xml )"
-
-_emake() {
- netsurf_define_makeconf
- emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
- WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no) \
- WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no) \
- $@
-}
-
-src_compile() {
- _emake
-}
-
-src_test() {
- _emake test
-}
-
-src_install() {
- _emake DESTDIR="${D}" install
-}
diff --git a/net-libs/libdom/libdom-0.4.0-r1.ebuild b/net-libs/libdom/libdom-0.4.0-r1.ebuild
deleted file mode 100644
index 19c4937b1fd3..000000000000
--- a/net-libs/libdom/libdom-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="implementation of the W3C DOM, written in C"
-HOMEPAGE="http://www.netsurf-browser.org/projects/libdom/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64"
-IUSE="expat test xml"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/libparserutils
- dev-libs/libwapcaplet
- net-libs/libhubbub
- xml? (
- expat? ( >=dev-libs/expat-2.1.0-r3 )
- !expat? ( >=dev-libs/libxml2-2.9.1-r4 )
- )"
-DEPEND="${RDEPEND}
- test? (
- dev-perl/XML-XPath
- dev-perl/libxml-perl
- dev-perl/Switch
- )"
-BDEPEND="
- dev-util/netsurf-buildsystem
- virtual/pkgconfig"
-
-REQUIRED_USE="test? ( xml )"
-
-_emake() {
- netsurf_define_makeconf
- emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared \
- WITH_EXPAT_BINDING=$(usex xml $(usex expat yes no) no) \
- WITH_LIBXML_BINDING=$(usex xml $(usex expat no yes) no) \
- $@
-}
-
-src_compile() {
- _emake
-}
-
-src_test() {
- _emake test
-}
-
-src_install() {
- _emake DESTDIR="${D}" install
-}
diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index a58a5d0e9203..7716a5c41dd2 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,3 +1 @@
DIST libgsasl-1.10.0.tar.gz 1854755 BLAKE2B 691c143ece57b0b895f17ff3bfce8e216adb2ffcc7f6058501626b7b2e83d9eb0a85a036b6c7978b10eefbc94aab7b191e056341732d155597be5037e527b0e0 SHA512 33a8ea43be90a00fcda1b099ced8086b2ef9f72ee0dbce07bca04c944fa2d17588b6e5a32b7ab4ffeaf7ee695f9c84d3eb89c757c71934300d35580e423196dd
-DIST libgsasl-1.8.0.tar.gz 1208417 BLAKE2B 03eea4be45ccc28bbc5c98b5f266552e6f5da151dfc561b1f01dac107a6edf0f06a3000e868c07d5539df33334d3c965c6c276de30c75038e25165aa7e2db2e8 SHA512 7e591d12404919559bf67590f862270ffcae2030a14097cdaf92820aa79619b3048541e9f83b3fcb98a84622c44a52ecaceeebb1be55b9e9f68fb1790ade8721
-DIST libgsasl-1.8.1.tar.gz 1791261 BLAKE2B bd8b954f9d950fe449fe140baca840a14f12ef6318e74a6fd070b35504b8c3a7002f13fe93142bce992e4a1df773ebaad4ec01d04c01c63a7374187a8142136b SHA512 52bda3a962a2cbb598009fd02c547a4f8b5b9a4243511aa8104df97b4737023281ab57dbbcf839db3cad73c64cbc72bbd89b49da8b0379dd635220ffb642aa22
diff --git a/net-libs/libgsasl/files/libgsasl-1.8.0-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-1.8.0-gss-extra.patch
deleted file mode 100644
index e9ec10d183c4..000000000000
--- a/net-libs/libgsasl/files/libgsasl-1.8.0-gss-extra.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Gentoo bug #359005
---- a/gl/m4/gss-extra.m4
-+++ b/gl/m4/gss-extra.m4
-@@ -19,7 +19,16 @@
- AC_CHECK_FUNCS([gss_decapsulate_token])
- AC_CHECK_FUNCS([gss_oid_equal])
- AC_CHECK_FUNCS([gss_inquire_mech_for_saslname])
-- AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE])
-+ AC_MSG_CHECKING([for GSS_C_NT_HOSTBASED_SERVICE])
-+ AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
-+ [#include
-+ #ifdef GSS_C_NT_HOSTBASED_SERVICE
-+ hostbased_service_gss_nt_yes
-+ #endif],
-+ [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-+ [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])
-+ AC_MSG_RESULT([yes])],
-+ AC_MSG_RESULT([no]))
- if test "$gssapi_impl" != "gss"; then
- AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
- if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then
diff --git a/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch b/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch
deleted file mode 100644
index a2a558db5a64..000000000000
--- a/net-libs/libgsasl/files/libgsasl-1.8.1-ac-270.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/m4/std-gnu11.m4
-+++ b/m4/std-gnu11.m4
-@@ -6,6 +6,8 @@
- # This implementation will be obsolete once we can assume Autoconf 2.70
- # or later is installed everywhere a Gnulib program might be developed.
-
-+m4_version_prereq([2.70], [], [
-+
-
- # Copyright (C) 2001-2020 Free Software Foundation, Inc.
-
-@@ -70,7 +72,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version])
- set X $ac_compile
- ac_compiler=$[2]
- for ac_option in --version -v -V -qversion -version; do
-- m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
-+ _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
- done
-
- m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
-@@ -135,7 +137,7 @@ _AS_ECHO_LOG([checking for _AC_LANG compiler version])
- set X $ac_compile
- ac_compiler=$[2]
- for ac_option in --version -v -V -qversion; do
-- m4_ifdef([_AC_DO_LIMIT],[_AC_DO_LIMIT],[_AC_DO])([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
-+ _AC_DO_LIMIT([$ac_compiler $ac_option >&AS_MESSAGE_LOG_FD])
- done
-
- m4_expand_once([_AC_COMPILER_EXEEXT])[]dnl
-@@ -822,3 +824,6 @@ dnl Tru64 N/A (no support)
- dnl with extended modes being tried first.
- [[-std=gnu++11 -std=c++11 -std=gnu++0x -std=c++0x -qlanglvl=extended0x -AA]], [$1], [$2])[]dnl
- ])# _AC_PROG_CXX_CXX11
-+
-+
-+])# m4_version_prereq
diff --git a/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch
deleted file mode 100644
index 15350a87d51d..000000000000
--- a/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Gentoo bug #359005
---- a/m4/gss-extra.m4
-+++ b/m4/gss-extra.m4
-@@ -19,7 +19,16 @@
- AC_CHECK_FUNCS([gss_decapsulate_token])
- AC_CHECK_FUNCS([gss_oid_equal])
- AC_CHECK_FUNCS([gss_inquire_mech_for_saslname])
-- AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE])
-+ AC_MSG_CHECKING([for GSS_C_NT_HOSTBASED_SERVICE])
-+ AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
-+ [#include
-+ #ifdef GSS_C_NT_HOSTBASED_SERVICE
-+ hostbased_service_gss_nt_yes
-+ #endif],
-+ [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
-+ [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])
-+ AC_MSG_RESULT([yes])],
-+ AC_MSG_RESULT([no]))
- if test "$gssapi_impl" != "gss"; then
- AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
- if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then
diff --git a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
deleted file mode 100644
index 3c6634c1ebe5..000000000000
--- a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-# NOTE: Please bump with net-misc/gsasl
-DESCRIPTION="The GNU SASL library"
-HOMEPAGE="https://www.gnu.org/software/gsasl/"
-SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="idn gcrypt kerberos nls ntlm static-libs"
-
-DEPEND="
- gcrypt? ( dev-libs/libgcrypt:0= )
- idn? ( net-dns/libidn:= )
- kerberos? ( virtual/krb5 )
- nls? ( >=sys-devel/gettext-0.18.1 )
- ntlm? ( net-libs/libntlm )
-"
-RDEPEND="${DEPEND}
- !net-misc/gsasl"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.8.0-gss-extra.patch"
-)
-
-src_prepare() {
- default
-
- sed -i -e 's/ -Werror//' configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- local krb5_impl
- if use kerberos; then
- krb5_impl="--with-gssapi-impl="
- # These are the two providers of virtual/krb5
- if has_version app-crypt/mit-krb5; then
- krb5_impl+="mit"
- else
- krb5_impl+="heimdal"
- fi
- fi
-
- local myeconfargs=(
- $(use_with gcrypt libgcrypt)
- $(use_with idn stringprep)
- $(use_enable kerberos gssapi)
- ${krb5_impl}
- $(use_enable nls)
- $(use_enable ntlm)
- $(use_enable static-libs static)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if ! use static-libs; then
- rm -f "${ED}"/usr/lib*/lib*.la || die
- fi
-}
diff --git a/net-libs/libgsasl/libgsasl-1.8.1.ebuild b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
deleted file mode 100644
index f83373ad3e87..000000000000
--- a/net-libs/libgsasl/libgsasl-1.8.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-# NOTE: Please bump with net-misc/gsasl
-DESCRIPTION="The GNU SASL library"
-HOMEPAGE="https://www.gnu.org/software/gsasl/"
-SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="idn gcrypt kerberos nls ntlm static-libs"
-
-DEPEND="
- gcrypt? ( dev-libs/libgcrypt:0= )
- idn? ( net-dns/libidn:= )
- kerberos? ( virtual/krb5 )
- nls? ( >=sys-devel/gettext-0.18.1 )
- ntlm? ( net-libs/libntlm )
-"
-RDEPEND="${DEPEND}
- !net-misc/gsasl"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.1-gss-extra.patch
- "${FILESDIR}"/${PN}-1.8.1-ac-270.patch
-)
-
-src_prepare() {
- default
-
- sed -i -e 's/ -Werror//' configure.ac || die
- eautoreconf
-}
-
-src_configure() {
- local krb5_impl
- if use kerberos; then
- krb5_impl="--with-gssapi-impl="
- # These are the two providers of virtual/krb5
- if has_version app-crypt/mit-krb5; then
- krb5_impl+="mit"
- else
- krb5_impl+="heimdal"
- fi
- fi
-
- local myeconfargs=(
- $(use_with gcrypt libgcrypt)
- $(use_with idn stringprep)
- $(use_enable kerberos gssapi)
- ${krb5_impl}
- $(use_enable nls)
- $(use_enable ntlm)
- $(use_enable static-libs static)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- if ! use static-libs; then
- rm -f "${ED}"/usr/lib*/lib*.la || die
- fi
-}
diff --git a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
index 45d0351f13e5..4cca37b449ef 100644
--- a/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
+++ b/net-libs/libnetfilter_conntrack/libnetfilter_conntrack-1.0.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
IUSE="static-libs"
RDEPEND="
diff --git a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
index 0944f98dc881..c5facfb44a4a 100644
--- a/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
+++ b/net-libs/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
BDEPEND="virtual/pkgconfig"
RDEPEND="net-libs/libmnl:="
diff --git a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
index 3d368f94b73a..c668e13398bb 100644
--- a/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
+++ b/net-libs/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
BDEPEND="virtual/pkgconfig"
RDEPEND="net-libs/libmnl:="
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
index 0d40ed627b8d..5e97c76a1ada 100644
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.ebuild
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.3.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
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
IUSE="static-libs"
RDEPEND="
diff --git a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
index 61cefa4c58e1..37342c1a97ec 100644
--- a/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
+++ b/net-libs/libnetfilter_queue/libnetfilter_queue-1.0.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.netfilter.org/projects/${PN}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
IUSE="doc static-libs"
RDEPEND="
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 1ef2e1bcb095..bf26426cc01e 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest
index 2db9f5643e0b..d64efe1c744b 100644
--- a/net-mail/imapsync/Manifest
+++ b/net-mail/imapsync/Manifest
@@ -1,2 +1 @@
-DIST imapsync-1.882.tar.gz 1557501 BLAKE2B 92f37d0c6c64569016a15d71d1b95ca08e4a8bb2402a5151f1429260fb37db47ebfc273e2bb73b06ba77974100780924fa3f256565fcd3e77cbff4c7bbf7b56e SHA512 3953cb29b210c283be3fe72f1e1537594415bd5457b469b801625d6c857b982d2b2b3da9528dd1e6ccc6831c022ce495f7a5eaaea04d228bca374f185344f455
DIST imapsync-1.977.tar.gz 1814568 BLAKE2B ccbe678f331a59b2ee50150b4e6dd3b2a7fb7750f204f3d67c90beed600b83b38a712bfa723dc0a73d21fb9bc03a5013f287469afa1164962cfb0f2923d93910 SHA512 b9810d53f5dc4e0a350e18dff03563c38cd64cff45ad741e77211a22ab49695de14bc4f09df6cf5fde7f3025f1f54d614f7c79ece1bda9f4c0052e5f38dedfd9
diff --git a/net-mail/imapsync/imapsync-1.882.ebuild b/net-mail/imapsync/imapsync-1.882.ebuild
deleted file mode 100644
index 1341851d6e31..000000000000
--- a/net-mail/imapsync/imapsync-1.882.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tool for incremental and recursive IMAP transfers between mailboxes"
-HOMEPAGE="http://ks.lamiral.info/imapsync/ https://github.com/imapsync/imapsync"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-
-LICENSE="WTFPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-# ppc dropped pending keywording of:
-# dev-perl/App-cpanminus
-# dev-perl/Data-Uniqid
-# dev-perl/PAR
-IUSE="test" # not fully supported yet
-
-RDEPEND="
- dev-perl/App-cpanminus
- dev-perl/Authen-NTLM
- dev-perl/CGI
- dev-perl/Crypt-OpenSSL-RSA
- dev-perl/Data-Uniqid
- dev-perl/Digest-HMAC
- dev-perl/Dist-CheckConflicts
- dev-perl/File-Copy-Recursive
- dev-perl/IO-Socket-INET6
- dev-perl/IO-Socket-SSL
- dev-perl/IO-Tee
- dev-perl/JSON
- dev-perl/libwww-perl
- dev-perl/Mail-IMAPClient
- dev-perl/Module-Implementation
- dev-perl/Module-Runtime
- dev-perl/Module-ScanDeps
- dev-perl/Net-SSLeay
- dev-perl/Package-Stash
- dev-perl/Package-Stash-XS
- dev-perl/PAR
- dev-perl/Parse-RecDescent
- dev-perl/Readonly
- dev-perl/Readonly-XS
- dev-perl/Regexp-Common
- dev-perl/Sys-MemInfo
- dev-perl/TermReadKey
- dev-perl/Try-Tiny
- dev-perl/Unicode-String
- dev-perl/URI
- virtual/perl-Compress-Raw-Zlib
- virtual/perl-Data-Dumper
- virtual/perl-Digest
- virtual/perl-Digest-MD5
- virtual/perl-Digest-SHA
- virtual/perl-Encode
- virtual/perl-MIME-Base64
- "
- # Not yet in tree:
- # HTML::Entities
- # JSON::WebToken
- # JSON::WebToken::Crypt::RSA
-DEPEND="
- ${RDEPEND}
- test? (
- virtual/perl-Test
- dev-perl/Test-Deep
- dev-perl/Test-Fatal
- dev-perl/Test-MockObject
- dev-perl/Test-Pod
- dev-perl/Test-Requires
- dev-perl/Test-Warn
- dev-perl/Test-NoWarnings
- )"
- # Not yet in tree:
- # test? ( Test::Mock::Guard )
-
-RESTRICT="test"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_prepare() {
- sed -e "s/^install: testp/install:/" \
- -e "/^DO_IT/,/^$/d" \
- -i "${S}"/Makefile || die
-
- default
-}
-
-src_compile() { :; }
diff --git a/net-mail/mpop/Manifest b/net-mail/mpop/Manifest
index 0b2784b39187..0d25caf065a9 100644
--- a/net-mail/mpop/Manifest
+++ b/net-mail/mpop/Manifest
@@ -1,2 +1 @@
-DIST mpop-1.4.4.tar.xz 319372 BLAKE2B acf5bdb62479126ae212bb008878872d16efba1eb9a077bf4697ba22ff512977fcd5affad090bc952fb01cf07a607a4dce91b873128c43f087c34dca6d6bae81 SHA512 1ed89108d35d7bbd6bcbd6de956f51cfcfaefd808f6aa7135b168d789f8cbe7070be9db676d1222dce5b6fe8b6692616d6b7adec9c23df11ac3de112897924da
DIST mpop-1.4.7.tar.xz 322488 BLAKE2B ea73e84b5ed3b5aad7ef91ceb510187c3f2d42976329a6a53511329a84713edc056ca6db35b1de2c9bff8b417e2710e598c472e78acbdc499dd73b24c46dfb47 SHA512 ce0ac899fd2af1d50ef221c88282c12263c5862b9ff1f6341a8551c3fe6b69272772599a2040a0f553a776245514c55b8102ca8cf291b411e5127a3f39897832
diff --git a/net-mail/mpop/mpop-1.4.4.ebuild b/net-mail/mpop/mpop-1.4.4.ebuild
deleted file mode 100644
index df58c65aef22..000000000000
--- a/net-mail/mpop/mpop-1.4.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A small, fast, and portable POP3 client"
-HOMEPAGE="https://marlam.de/mpop/"
-SRC_URI="https://marlam.de/mpop/releases/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gnutls idn libressl gnome-keyring nls sasl ssl vim-syntax"
-
-RDEPEND="
- idn? ( net-dns/libidn2 )
- gnome-keyring? ( app-crypt/libsecret )
- nls? ( virtual/libintl )
- sasl? ( virtual/gsasl )
- ssl? (
- gnutls? ( net-libs/gnutls:0=[idn?] )
- !gnutls? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- )"
-DEPEND="${RDEPEND}
- nls? ( sys-devel/gettext )
- virtual/pkgconfig"
-
-REQUIRED_USE="gnutls? ( ssl )"
-
-DOCS="AUTHORS ChangeLog NEWS NOTES README THANKS"
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_with ssl tls $(usex gnutls "gnutls" "openssl")) \
- $(use_with sasl libgsasl) \
- $(use_with idn libidn) \
- $(use_with gnome-keyring libsecret)
-}
-
-src_install() {
- default
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/syntax
- doins scripts/vim/mpop.vim
- fi
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 53b87d381926..6da5cf2b003d 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/bopm/metadata.xml b/net-misc/bopm/metadata.xml
index 5ed9ca4d7b38..1ce1de9cfec3 100644
--- a/net-misc/bopm/metadata.xml
+++ b/net-misc/bopm/metadata.xml
@@ -1,7 +1,10 @@
-
+
+ sam@gentoo.org
+ Sam James
+
blitzed-org/bopm
diff --git a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
index 1fa46b7c2467..71dc46831ee3 100644
--- a/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
+++ b/net-misc/dhcpcd/dhcpcd-9.3.4.ebuild
@@ -33,6 +33,10 @@ RDEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/${PN}-9.4.0-sparc_privsep.patch" #776178
+)
+
src_configure() {
local myeconfargs=(
--dbdir="${EPREFIX}/var/lib/dhcpcd"
diff --git a/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
new file mode 100644
index 000000000000..51628651f42b
--- /dev/null
+++ b/net-misc/dhcpcd/dhcpcd-9.4.0-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://roy.marples.name/cgit/dhcpcd.git"
+else
+ MY_P="${P/_alpha/-alpha}"
+ MY_P="${MY_P/_beta/-beta}"
+ MY_P="${MY_P/_rc/-rc}"
+ SRC_URI="https://roy.marples.name/downloads/${PN}/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="A fully featured, yet light weight RFC2131 compliant DHCP client"
+HOMEPAGE="https://roy.marples.name/projects/dhcpcd"
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="debug elibc_glibc +embedded ipv6 kernel_linux privsep +udev"
+
+COMMON_DEPEND="udev? ( virtual/udev )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="
+ ${COMMON_DEPEND}
+ privsep? (
+ acct-group/dhcpcd
+ acct-user/dhcpcd
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-memleak_fix.patch"
+ "${FILESDIR}/${P}-unlink_socket.patch"
+ "${FILESDIR}/${P}-sparc_privsep.patch" #776178
+)
+
+src_configure() {
+ local myeconfargs=(
+ --dbdir="${EPREFIX}/var/lib/dhcpcd"
+ --libexecdir="${EPREFIX}/lib/dhcpcd"
+ --localstatedir="${EPREFIX}/var"
+ --prefix="${EPREFIX}"
+ --with-hook=ntp.conf
+ $(use_enable debug)
+ $(use_enable embedded)
+ $(use_enable ipv6)
+ $(use_enable privsep)
+ $(usex elibc_glibc '--with-hook=yp.conf' '')
+ --rundir=$(usex kernel_linux "${EPREFIX}/run/dhcpcd" "${EPREFIX}/var/run/dhcpcd")
+ $(usex privsep '--privsepuser=dhcpcd' '')
+ $(usex udev '' '--without-dev --without-udev')
+ CC="$(tc-getCC)"
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ keepdir /var/lib/dhcpcd
+ newinitd "${FILESDIR}"/dhcpcd.initd-r1 dhcpcd
+ systemd_newunit "${FILESDIR}"/dhcpcd.service-r1 dhcpcd.service
+}
+
+pkg_postinst() {
+ local dbdir="${EROOT}"/var/lib/dhcpcd old_files=()
+
+ local old_old_duid="${EROOT}"/var/lib/dhcpcd/dhcpcd.duid
+ local old_duid="${EROOT}"/etc/dhcpcd.duid
+ local new_duid="${dbdir}"/duid
+ if [[ -e "${old_old_duid}" ]] ; then
+ # Upgrade the duid file to the new format if needed
+ if ! grep -q '..:..:..:..:..:..' "${old_old_duid}"; then
+ sed -i -e 's/\(..\)/\1:/g; s/:$//g' "${old_old_duid}"
+ fi
+
+ # Move the duid to /etc, a more sensible location
+ if [[ ! -e "${old_duid}" ]] ; then
+ cp -p "${old_old_duid}" "${new_duid}"
+ fi
+ old_files+=( "${old_old_duid}" )
+ fi
+
+ # dhcpcd-7 moves the files out of /etc
+ if [[ -e "${old_duid}" ]] ; then
+ if [[ ! -e "${new_duid}" ]] ; then
+ cp -p "${old_duid}" "${new_duid}"
+ fi
+ old_files+=( "${old_duid}" )
+ fi
+ local old_secret="${EROOT}"/etc/dhcpcd.secret
+ local new_secret="${dbdir}"/secret
+ if [[ -e "${old_secret}" ]] ; then
+ if [[ ! -e "${new_secret}" ]] ; then
+ cp -p "${old_secret}" "${new_secret}"
+ fi
+ old_files+=( "${old_secret}" )
+ fi
+
+ # dhcpcd-7 renames some files in /var/lib/dhcpcd
+ local old_rdm="${dbdir}"/dhcpcd-rdm.monotonic
+ local new_rdm="${dbdir}"/rdm_monotonic
+ if [[ -e "${old_rdm}" ]] ; then
+ if [[ ! -e "${new_rdm}" ]] ; then
+ cp -p "${old_rdm}" "${new_rdm}"
+ fi
+ old_files+=( "${old_rdm}" )
+ fi
+ local lease=
+ for lease in "${dbdir}"/dhcpcd-*.lease*; do
+ [[ -f "${lease}" ]] || continue
+ old_files+=( "${lease}" )
+ local new_lease=$(basename "${lease}" | sed -e "s/dhcpcd-//")
+ [[ -e "${dbdir}/${new_lease}" ]] && continue
+ cp "${lease}" "${dbdir}/${new_lease}"
+ done
+
+ # Warn about removing stale files
+ if [[ -n "${old_files[@]}" ]] ; then
+ elog
+ elog "dhcpcd-7 has copied dhcpcd.duid and dhcpcd.secret from"
+ elog "${EROOT}/etc to ${dbdir}"
+ elog "and copied leases in ${dbdir} to new files with the dhcpcd-"
+ elog "prefix dropped."
+ elog
+ elog "You should remove these files if you don't plan on reverting"
+ elog "to an older version:"
+ local old_file=
+ for old_file in ${old_files[@]}; do
+ elog " ${old_file}"
+ done
+ fi
+
+ if [ -z "${REPLACING_VERSIONS}" ]; then
+ elog
+ elog "dhcpcd has zeroconf support active by default."
+ elog "This means it will always obtain an IP address even if no"
+ elog "DHCP server can be contacted, which will break any existing"
+ elog "failover support you may have configured in your net configuration."
+ elog "This behaviour can be controlled with the noipv4ll configuration"
+ elog "file option or the -L command line switch."
+ elog "See the dhcpcd and dhcpcd.conf man pages for more details."
+
+ elog
+ elog "Dhcpcd has duid enabled by default, and this may cause issues"
+ elog "with some dhcp servers. For more information, see"
+ elog "https://bugs.gentoo.org/show_bug.cgi?id=477356"
+ fi
+
+ if ! has_version net-dns/bind-tools; then
+ elog
+ elog "If you activate the lookup-hostname hook to look up your hostname"
+ elog "using the dns, you need to install net-dns/bind-tools."
+ fi
+}
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch
new file mode 100644
index 000000000000..61aed69656d3
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-9.4.0-memleak_fix.patch
@@ -0,0 +1,36 @@
+From ba9f3823ae825c341ea30f45b46d942b4ce5b8d9 Mon Sep 17 00:00:00 2001
+From: Roy Marples
+Date: Sun, 24 Jan 2021 22:53:20 +0000
+Subject: [PATCH] Linux: fix a memory leak when dhcpcd exits or the log is
+ reopened
+
+---
+ src/logerr.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/logerr.c b/src/logerr.c
+index 21e933b8..35268870 100644
+--- a/src/logerr.c
++++ b/src/logerr.c
+@@ -484,13 +484,14 @@ logclose(void)
+ #endif
+
+ closelog();
++#if defined(__linux__)
++ free(_logprog);
++ _logprog = NULL;
++#endif
+ #ifndef SMALL
+ if (ctx->log_file == NULL)
+ return;
+ fclose(ctx->log_file);
+ ctx->log_file = NULL;
+ #endif
+-#if defined(__linux__)
+- free(_logprog);
+-#endif
+ }
+--
+2.30.0
+
+
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch
new file mode 100644
index 000000000000..a91db28d08c7
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-9.4.0-sparc_privsep.patch
@@ -0,0 +1,40 @@
+From dcfd7a23f002793a855156255e81662ef84064d3 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine
+Date: Fri, 5 Feb 2021 09:25:12 +0100
+Subject: [PATCH] src/privsep-linux: fix build on sparc (#26)
+
+Fix the following build failure:
+
+privsep-linux.c:203: warning: "AUDIT_ARCH_SPARC64" redefined
+ 203 | # define AUDIT_ARCH_SPARC64
+ |
+In file included from privsep-linux.c:35:
+/srv/storage/autobuild/run/instance-0/output-1/host/sparc64-buildroot-linux-gnu/sysroot/usr/include/linux/audit.h:392: note: this is the location of the previous definition
+ 392 | #define AUDIT_ARCH_SPARC64 (EM_SPARCV9|__AUDIT_ARCH_64BIT)
+ |
+In file included from privsep-linux.c:36:
+privsep-linux.c:215:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
+ 215 | BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
+ | ^~~~~~~~~~~~~~~~~~
+
+Signed-off-by: Fabrice Fontaine
+---
+ src/privsep-linux.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/privsep-linux.c b/src/privsep-linux.c
+index d00894ab..5c80c1b3 100644
+--- a/src/privsep-linux.c
++++ b/src/privsep-linux.c
+@@ -222,9 +222,9 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
+ # endif
+ #elif defined(__sparc__)
+ # if defined(__arch64__)
+-# define AUDIT_ARCH_SPARC64
++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC64
+ # else
+-# define AUDIT_ARCH_SPARC
++# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_SPARC
+ # endif
+ #elif defined(__xtensa__)
+ # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_XTENSA
diff --git a/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch b/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch
new file mode 100644
index 000000000000..493e9c342f51
--- /dev/null
+++ b/net-misc/dhcpcd/files/dhcpcd-9.4.0-unlink_socket.patch
@@ -0,0 +1,55 @@
+From d55f8e440389fbf333e14fe9f1a7d7f4da2b5197 Mon Sep 17 00:00:00 2001
+From: Roy Marples
+Date: Tue, 26 Jan 2021 17:37:29 +0000
+Subject: [PATCH] control: unlink privileged socket when shutting down
+ without privsep
+
+Otherwise we have a connection refused when dhcpcd starts again
+as it sees the stale socket file.
+---
+ src/control.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/src/control.c b/src/control.c
+index 71405ed1..a601ad0a 100644
+--- a/src/control.c
++++ b/src/control.c
+@@ -50,7 +50,7 @@
+
+ #ifndef SUN_LEN
+ #define SUN_LEN(su) \
+- (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
++ (sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
+ #endif
+
+ static void
+@@ -350,12 +350,12 @@ control_start1(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family,
+ }
+ #endif
+
+- if ((fmode & S_PRIV) == S_PRIV)
+- strlcpy(ctx->control_sock, sa.sun_path,
+- sizeof(ctx->control_sock));
+- else
++ if ((fmode & S_UNPRIV) == S_UNPRIV)
+ strlcpy(ctx->control_sock_unpriv, sa.sun_path,
+ sizeof(ctx->control_sock_unpriv));
++ else
++ strlcpy(ctx->control_sock, sa.sun_path,
++ sizeof(ctx->control_sock));
+ return fd;
+ }
+
+@@ -368,7 +368,8 @@ control_start(struct dhcpcd_ctx *ctx, const char *ifname, sa_family_t family)
+ if (IN_PRIVSEP_SE(ctx)) {
+ make_path(ctx->control_sock, sizeof(ctx->control_sock),
+ ifname, family, false);
+- make_path(ctx->control_sock_unpriv, sizeof(ctx->control_sock),
++ make_path(ctx->control_sock_unpriv,
++ sizeof(ctx->control_sock_unpriv),
+ ifname, family, true);
+ return 0;
+ }
+--
+2.30.0
+
diff --git a/net-misc/dhcpcd/metadata.xml b/net-misc/dhcpcd/metadata.xml
index 4b1d24a8fad0..45f27d424f62 100644
--- a/net-misc/dhcpcd/metadata.xml
+++ b/net-misc/dhcpcd/metadata.xml
@@ -10,6 +10,7 @@
Gentoo Base System
+ rsmarples/dhcpcd
cpe:/a:roy_marples:dhcpcd
Install the periodic anacron command scheduler.
- Enable inotify filesystem monitoring support.
cronie-crond/cronie
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 988b2554fcf1..c210a95d5496 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/dist-kernel/dist-kernel-5.10.24.ebuild b/virtual/dist-kernel/dist-kernel-5.10.24.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.24.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+ || (
+ ~sys-kernel/gentoo-kernel-${PV}
+ ~sys-kernel/gentoo-kernel-bin-${PV}
+ ~sys-kernel/vanilla-kernel-${PV}
+ )"
diff --git a/virtual/dist-kernel/dist-kernel-5.11.7.ebuild b/virtual/dist-kernel/dist-kernel-5.11.7.ebuild
new file mode 100644
index 000000000000..3df38272de32
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.11.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+ || (
+ ~sys-kernel/gentoo-kernel-${PV}
+ ~sys-kernel/gentoo-kernel-bin-${PV}
+ ~sys-kernel/vanilla-kernel-${PV}
+ )"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.106.ebuild b/virtual/dist-kernel/dist-kernel-5.4.106.ebuild
new file mode 100644
index 000000000000..11d6573ded7c
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.4.106.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+ || (
+ ~sys-kernel/gentoo-kernel-${PV}
+ ~sys-kernel/gentoo-kernel-bin-${PV}
+ ~sys-kernel/vanilla-kernel-${PV}
+ )"
diff --git a/virtual/imap-c-client/imap-c-client-1.ebuild b/virtual/imap-c-client/imap-c-client-1.ebuild
deleted file mode 100644
index 174e95c822f5..000000000000
--- a/virtual/imap-c-client/imap-c-client-1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for IMAP c-client"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="ssl"
-
-RDEPEND=" || ( net-libs/c-client[ssl=]
- net-mail/uw-imap[ssl=] )"
diff --git a/virtual/mailx/mailx-1.ebuild b/virtual/mailx/mailx-1.ebuild
deleted file mode 100644
index 2bc1190cbc83..000000000000
--- a/virtual/mailx/mailx-1.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual for mail implementations"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="|| ( net-mail/mailutils
- mail-client/mailx
- mail-client/nail )"
diff --git a/virtual/mailx/mailx-2.ebuild b/virtual/mailx/mailx-2.ebuild
deleted file mode 100644
index 9224959c73ec..000000000000
--- a/virtual/mailx/mailx-2.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for mail implementations"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-RDEPEND="|| ( net-mail/mailutils
- mail-client/mailx
- mail-client/s-nail
- mail-client/nail )"
diff --git a/virtual/mailx/mailx-3.ebuild b/virtual/mailx/mailx-3.ebuild
index fae580487e68..9d78949e9569 100644
--- a/virtual/mailx/mailx-3.ebuild
+++ b/virtual/mailx/mailx-3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for mail implementations"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
RDEPEND="|| ( net-mail/mailutils
mail-client/mailx
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 0d353c417e18..f6735c313c09 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index 4238d899fb39..9147cf28c9ac 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1,2 +1 @@
-DIST Radicale-2.1.11.tar.gz 76490 BLAKE2B 35578b693a32d4a77f8ff1c93cbb8fb63fd8dabf9fde79cd928d4afa6e059fe836840ca6a33621c13e9421a69bfb25cbb59688ba83bed62003ef3b56b54804b1 SHA512 e85f12664d3db6b911dd534eaddd15c498ca4f641cc15523644300aca8b1ef3f6fd4d9645857235502f03a7903111905537b04f9a6fdbde1a60fbb720d377733
DIST Radicale-2.1.12.tar.gz 109781 BLAKE2B 743eaeffab43f2efcfc798f84d00fee40a09609beeb555e3afe3c9f4c54d8e0ce3a7eba4c1e14d6702775ab7d156b085408ee968b0d53437982cf2ea7cb4653c SHA512 a708fb1269f7ba8c9e351e101f613a8adb18c12b1239b832ed9e0287476f30aa7ded30f9bc259da9c4b5f3aefe90bbf9980d0d08d98dd07b79cd19930b0e204c
diff --git a/www-apps/radicale/radicale-2.1.11-r1.ebuild b/www-apps/radicale/radicale-2.1.11-r1.ebuild
deleted file mode 100644
index 691e1cde8aa3..000000000000
--- a/www-apps/radicale/radicale-2.1.11-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1 eutils user systemd
-
-MY_PN="Radicale"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A simple CalDAV calendar server"
-HOMEPAGE="https://radicale.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+bcrypt"
-
-RDEPEND="sys-apps/util-linux
- >=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]
- bcrypt? ( dev-python/passlib[bcrypt,${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-RDIR=/var/lib/${PN}
-
-pkg_pretend() {
- if [[ -f ${RDIR}/.props && ${MERGE_TYPE} != buildonly ]]; then
- eerror "It looks like you have a version 1 database in ${RDIR}."
- eerror "You must convert this database to version 2 format before upgrading."
- eerror "You may want to back up the old database before migrating."
- eerror
- eerror "If you have kept the Gentoo-default database configuration, this will work:"
- eerror "1. Stop any running instance of Radicale."
- eerror "2. Run \`radicale --export-storage ~/radicale-exported\`."
- eerror "3. Run \`chown -R radicale: ~/radicale-exported\`"
- eerror "4. Run \`mv \"${RDIR}\" \"${RDIR}.old\"\`."
- eerror "5. Install Radicale version 2."
- eerror "6. Run \`mv ~/radicale-exported \"${RDIR}/collections\"\`."
- eerror
- eerror "For more details, or if you are have a more complex configuration,"
- eerror "please see the migration guide: https://radicale.org/1to2/"
- eerror "If you do a custom migration, please ensure the database is cleaned out of"
- eerror "${RDIR}, including the hidden .props file."
- die
- fi
-}
-
-pkg_setup() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 ${RDIR} ${PN}
-}
-
-python_install_all() {
- rm README* || die
-
- # init file
- newinitd "${FILESDIR}"/radicale-r2.init.d radicale
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- # directories
- keepdir ${RDIR}
- fowners ${PN}:${PN} ${RDIR}
- fperms 0750 ${RDIR}
-
- # config file
- insinto /etc/${PN}
- doins config logging
-
- # fcgi and wsgi files
- exeinto /usr/share/${PN}
- doexe radicale.fcgi radicale.wsgi
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- local _erdir="${EROOT%/}${RDIR}"
-
- einfo "A sample WSGI script has been put into ${EROOT%/}/usr/share/${PN}."
- einfo "You will also find there an example FastCGI script."
- if [[ $(stat --format="%U:%G:%a" "${_erdir}") != "${PN}:${PN}:750" ]]
- then
- ewarn "Unsafe file permissions detected on ${_erdir}. This probably comes"
- ewarn "from an earlier version of this ebuild."
- ewarn "To fix run:"
- ewarn " \`chown -R ${PN}:${PN} ${_erdir}\`"
- ewarn " \`chmod 0750 ${_erdir}\`"
- ewarn " \`chmod -R o= ${_erdir}\`"
- fi
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index abc2e88ae051..e30d0ea3a9da 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index e123ded34a5d..dfb3a1daced5 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,6 +1,6 @@
DIST chromium-89-patchset-7.tar.xz 4640 BLAKE2B 6150f92a4cb83025b7521c573e9a14bfcb26f7a5ff4ebe79cfc819b214ae05d0e986b9db561a99b4f9c7b4a8e4adf1c8ee966011bb0791ef11fc2be89b03b216 SHA512 6ef5be9e56b82c70d3d1a0596e74af3bab97ea82a8247b6d0ba736411779be10b17c7cd9ccd9eae5fac27af3907fd3b56e301e73011f58b2c4052bbc03390b1c
DIST chromium-89.0.4389.72.tar.xz 890838884 BLAKE2B c84286128ad3563f0570815efb2fe190153e5ea4c2ea74a48a9d9b31614b3f88850ddfb74819a8b27d594f97071ef5c1f356d0419d4dd3bbc2003c636c3aa60b SHA512 b5e3693bc104ff857a2ef4de9b0a9265d44c26e5b94c44e5054bfa810c24dbb1933f1f4a626dda4d74ba6cb13fe5045c4ea9d7ea43e1b0e4057e01428d645fb7
-DIST chromium-89.0.4389.82.tar.xz 890793532 BLAKE2B 9d1861f548f5af67611b398b5e87812ff92cbb2069bb9480b3264febf5b916564a45cb0e4d9f2793dd4f0e0c355a24cc08ab138f4e2c786a8d933f4cdf707bc8 SHA512 41c85743ef92e04cb73d374934cf3efcf6e7ab1c12f11abaeb7687ca2dc365f7107d316aabb439cd9bc26cfdaca92e0a1a4a9d751a73c47218633f2a3253563f
+DIST chromium-89.0.4389.90.tar.xz 890844888 BLAKE2B 7e599e17f6ffae422d0eb268f2847d5611424971508656abe50d5a89475382ec10bb348441648fbdb939b8acc01fb64a70467595d6649b9e2f3309e59e27a875 SHA512 d95ea0cc42a792b68cb5ba9bd455c6e964ce06c15ac849a2d317cc1cb07940578ff5f7b73be775915fff2decf7dc8e230935e6b545743959ba1cdfc9ab904b4b
DIST chromium-90-patchset-6.tar.xz 3828 BLAKE2B bbd1378868cf4d699ff097ea41226ff694d58468f8f93860f2d6cc60924f35fb1f0b17fcf5a916f04545171d1219b699072222f138240fd483c704874cfce178 SHA512 70321eb4e9fe27818d5e6ae3109d3871a870a7fb6886328dcc9fc8291ac72fc003d678aec7f9925afe0c5667c70ce9bca8f61434b11a331fc1a29d61ad7b59e3
DIST chromium-90.0.4430.11.tar.xz 917713136 BLAKE2B 828a141a1a36904542b7a274db17b8c8917b37cad3ab7070568c83bd6084f42838ce673e24c3f4b2753068548983e490cdeacbb5501215176f7f32b18d686535 SHA512 3d08fc57a22014eb324b99e5b97c2a8c8c5ff4de038753f8fa1c3ab4b44a19c2ffb6dcbc554f78cb493cb0a9cbbc04ac148ef4bd8a0141e5dff04813913c08a4
DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
diff --git a/www-client/chromium/chromium-89.0.4389.82.ebuild b/www-client/chromium/chromium-89.0.4389.90.ebuild
similarity index 100%
rename from www-client/chromium/chromium-89.0.4389.82.ebuild
rename to www-client/chromium/chromium-89.0.4389.90.ebuild
diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
index d98796d4c079..ffd7eb734ffe 100644
--- a/www-client/otter/Manifest
+++ b/www-client/otter/Manifest
@@ -1,2 +1 @@
-DIST otter-1.0.01.tar.gz 4866820 BLAKE2B 7e23654142f35e17b4c4a240c4f8b897826229bae7cd5dabebc352a438881ff912829325547ee2a4bc7ec0a2b7c20640cb5e26ba7babb35435e987ebd86d2e75 SHA512 594bbdcbbc3b5fea903cc0beb749cf76be402cb1c2766706750bdbd6aad84f3d9f48687e1b12945f30e40b3876b9fbf511f41915fd276473b259d7311e33f19d
DIST otter-1.0.02.tar.gz 4940331 BLAKE2B 686547b4302e79e882c5c4967680992faf54b5330896207ae98b1633fa6eb2df70793bfd0c8da5c7b5b8be39c5b9528f32303f69026dcd43f12fd528923b9011 SHA512 5b142486298f2ef1f0613363c7a4de3340544ecd82406efc64225e78eb958337ea4045c0c44553fe3b29a0836bd5f6cdab37d615ebf98756108f9aa5473360a1
diff --git a/www-client/otter/files/otter-1.0.01-qtgui-5.15.0.patch b/www-client/otter/files/otter-1.0.01-qtgui-5.15.0.patch
deleted file mode 100644
index ec60a4b2c42b..000000000000
--- a/www-client/otter/files/otter-1.0.01-qtgui-5.15.0.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/modules/windows/web/StartPageWidget.cpp
-+++ b/src/modules/windows/web/StartPageWidget.cpp
-@@ -41,6 +41,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
- #include
diff --git a/www-client/otter/otter-1.0.01-r1.ebuild b/www-client/otter/otter-1.0.01-r1.ebuild
deleted file mode 100644
index 2efa58e6f140..000000000000
--- a/www-client/otter/otter-1.0.01-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake desktop xdg-utils
-
-DESCRIPTION="Project aiming to recreate classic Opera (12.x) UI using Qt5"
-HOMEPAGE="https://otter-browser.org/"
-SRC_URI="https://github.com/OtterBrowser/${PN}-browser/archive/v${PV/_p/-dev}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="spell"
-
-DEPEND="
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtdeclarative:5
- dev-qt/qtgui:5
- dev-qt/qtmultimedia:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxmlpatterns:5
- spell? ( kde-frameworks/sonnet )
- >=dev-qt/qtwebengine-5.9:5[widgets]
-"
-RDEPEND="
- ${DEPEND}
-"
-DOCS=( CHANGELOG CONTRIBUTING.md TODO )
-S=${WORKDIR}/${PN}-browser-${PV/_p/-dev}
-PATCHES=(
- "${FILESDIR}"/${PN}-1.0.01-qtgui-5.15.0.patch
- "${FILESDIR}"/${PN}-1.0.01-webengine.patch
-)
-
-src_prepare() {
- cmake_src_prepare
-
- if [[ -n ${LINGUAS} ]]; then
- local lingua
- for lingua in resources/translations/*.qm; do
- lingua=$(basename ${lingua})
- lingua=${lingua/otter-browser_/}
- lingua=${lingua/.qm/}
- if ! has ${lingua} ${LINGUAS}; then
- rm resources/translations/otter-browser_${lingua}.qm || die
- fi
- done
- fi
-
- if ! use spell; then
- sed -i -e '/find_package(KF5Sonnet)/d' CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- mycmakeargs=(
- -DENABLE_QTWEBENGINE=true
- -DENABLE_QTWEBKIT=false
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- domenu ${PN}-browser.desktop
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_icon_cache_update
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 67410a285ea1..7f6674040f57 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/fox-wrapper/files/fox-wrapper-2.sh b/x11-libs/fox-wrapper/files/fox-wrapper-2.sh
deleted file mode 100644
index 19d09b5b9ca6..000000000000
--- a/x11-libs/fox-wrapper/files/fox-wrapper-2.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Based on the am-wrapper.sh script (sys-devel/automake-wrapper-1-r1)
-#
-# Executes the correct fox-config version, based on the value of WANT_FOX.
-# All versions of fox after 1.0.x ship with a fox-config script
-#
-#
-# Stable branches first, in descending order, then unstable branches.
-# After a new stable branch, prepend the new version and bump (or remove)
-# the last unstable branch
-#
-vers="1.6 1.4 1.2 1.5"
-bindir=/usr/bin
-
-if [ "${0##*/}" = "fox-wrapper.sh" ] ; then
- echo "fox-wrapper: Don't call this script directly, use fox-config instead" >&2
- exit 1
-fi
-
-if [ -z "${WANT_FOX}" ] ; then
- echo "fox-wrapper: Set the WANT_FOX variable to the desired version of fox, e.g.:" >&2
- echo " WANT_FOX=\"1.2\" fox-config $@"
- exit 1
-fi
-
-for v in ${vers} ; do
- eval binary_${v/./_}="fox-${v}-config"
-done
-
-#
-# Check the WANT_FOX setting
-#
-for v in ${vers} x ; do
- if [ "${v}" = "x" ] ; then
- echo "fox-wrapper: WANT_FOX was set to an invalid version ${WANT_FOX}" >&2
- echo " Valid values of WANT_FOX are: ${vers// /, }"
- exit 1
- fi
-
- if [ "${WANT_FOX}" = "${v}" ] ; then
- binary="binary_${v/./_}"
- binary="${!binary}"
- break
- fi
-done
-
-if [ "${WANT_FOXWRAPPER_DEBUG}" ] ; then
- echo "fox-wrapper: DEBUG: WANT_FOX is set to ${WANT_FOX}" >&2
- echo "fox-wrapper: DEBUG: will execute <$binary>" >&2
-fi
-
-#
-# for further consistency
-#
-for v in ${vers} ; do
- mybin="binary_${v/./_}"
- if [ "${binary}" = "${!mybin}" ] ; then
- export WANT_FOX="${v}"
- fi
-done
-
-#
-# Now try to run the binary
-#
-if [ ! -x "${bindir}/${binary}" ] ; then
- echo "fox-wrapper: $binary is missing or not executable." >&2
- echo " Please try emerging the correct version of fox, i.e.:" >&2
- echo " emerge '=x11-libs/${binary/-config/}*'" >&2
- exit 1
-fi
-
-"$binary" "$@"
diff --git a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
deleted file mode 100644
index eeb9dd5e6bac..000000000000
--- a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="wrapper for fox-config to manage multiple versions"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-
-S=${WORKDIR}
-
-src_install() {
- exeinto /usr/lib/misc
- newexe "${FILESDIR}"/fox-wrapper-${PV}.sh fox-wrapper.sh
-
- dodir /usr/bin
- dosym ../lib/misc/fox-wrapper.sh /usr/bin/fox-config
-}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 3028aa9672c3..44e7609a1abd 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/gpaste/Manifest b/x11-misc/gpaste/Manifest
index 4a12fc415f35..e80b091a12ed 100644
--- a/x11-misc/gpaste/Manifest
+++ b/x11-misc/gpaste/Manifest
@@ -1,2 +1 @@
-DIST gpaste-3.20.3.tar.gz 157869 BLAKE2B 02b52b8023c875bd3c651cc5864603812f0cfd49cfac774ee4e27eae63c66e46f34d5128b717af514cc1c57fb93a775ff01f827210bd7cfa5e9ab5de9a87fd07 SHA512 08b7c52d16e630ac57e4d583ae985763b536728ef9997ce5ecc8a8ffb9be8745e1e5aed9003a4ab522ba76a276855c6a095fef7a73b4f4d80b54c7a9c3e6e9d1
DIST gpaste-3.36.3.tar.gz 186352 BLAKE2B b00af3f32076bbeb4f06853a7892772901d0c72dd972d08fff0520afae388bed0c9eee81892a2492f4bb972b3a80a924519e1c137edb660fa5f9dfa2fab31856 SHA512 e5fe4a31367e96089aefd1af5ed0a3ad591eee009bbc74b1b33c9c736061831979d79f2d6a5c072cf55fc6f1982ade581fe73d2039c5dbd607081683860c7b9f
diff --git a/x11-misc/gpaste/gpaste-3.20.3.ebuild b/x11-misc/gpaste/gpaste-3.20.3.ebuild
deleted file mode 100644
index 01387a0ecc27..000000000000
--- a/x11-misc/gpaste/gpaste-3.20.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-VALA_MIN_API_VERSION="0.30"
-VALA_USE_DEPEND="vapigen"
-
-inherit eutils autotools gnome2-utils ltprune vala vcs-snapshot
-
-DESCRIPTION="Clipboard management system"
-HOMEPAGE="https://github.com/Keruspe/GPaste"
-SRC_URI="https://github.com/Keruspe/GPaste/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+applet gnome vala"
-
-CDEPEND="
- dev-libs/appstream-glib
- >=dev-libs/glib-2.48:2
- >=dev-libs/gobject-introspection-1.48.0
- sys-apps/dbus
- >=x11-libs/gdk-pixbuf-2.34:2
- >=x11-libs/gtk+-3.20:3
- x11-libs/libX11
- x11-libs/libXi
- gnome? (
- gnome-base/gnome-control-center:2
- media-libs/clutter
- x11-libs/pango
- )
-"
-RDEPEND="${CDEPEND}
- gnome? (
- gnome-base/gnome-shell
- )
-"
-DEPEND="${CDEPEND}
- dev-util/intltool
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-src_prepare() {
- eautoreconf
- intltoolize --force --automake || die "intltoolize error"
- vala_src_prepare
-
- if ! use gnome ; then
- echo "" > data/control-center.mk || die
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable vala) \
- $(use_enable applet) \
- --disable-unity \
- $(use_enable gnome gnome-shell-extension) \
- --disable-static \
- --disable-schemas-compile
-}
-
-src_install() {
- default
- prune_libtool_files
-}
-
-pkg_preinst() {
- gnome2_schemas_savelist
-}
-
-pkg_postinst() {
- gnome2_schemas_update
-}
-
-pkg_postrm() {
- gnome2_schemas_update
-}
diff --git a/x11-misc/gpaste/metadata.xml b/x11-misc/gpaste/metadata.xml
index b673fd439b9f..a8c9b40ff58e 100644
--- a/x11-misc/gpaste/metadata.xml
+++ b/x11-misc/gpaste/metadata.xml
@@ -3,7 +3,6 @@
- Enable gpaste-applet
Enable proper gnome support and
enable gnome shell extension.
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
deleted file mode 100644
index b1d571e4369a..000000000000
--- a/x11-misc/lineakd/lineakd-0.9.0-r2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib
-
-MY_P=${P/.0/}
-
-DESCRIPTION="Linux support for Easy Access and Internet Keyboards"
-HOMEPAGE="http://lineak.sourceforge.net"
-SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="debug"
-
-RDEPEND="
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXext
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
- x11-libs/libxkbfile
- x11-libs/libXt
- x11-libs/libXtst
-"
-
-S=${WORKDIR}/${MY_P}
-PATCHES=(
- "${FILESDIR}"/${P}-gcc43.patch
- "${FILESDIR}"/${P}-DELL-XPS-M1330-XOrg-1_5.patch
-)
-
-src_configure() {
- econf \
- $(use_enable debug) \
- --with-x \
- --disable-static
-}
-
-src_install() {
- sed -i -e 's:$(DESTDIR)${DESTDIR}:$(DESTDIR):' lineakd/Makefile
-
- dodir /usr/share/man/man8
-
- emake -j1 DESTDIR="${D}" install
-
- dodoc AUTHORS README TODO
-
- keepdir /usr/$(get_libdir)/lineakd/plugins
-
- insinto /etc/lineak
- doins lineakd.conf.example lineakd.conf.kde.example
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
index 21a90c825f75..00a75e407fb0 100644
--- a/x11-misc/lineakd/lineakd-0.9.0-r3.ebuild
+++ b/x11-misc/lineakd/lineakd-0.9.0-r3.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/lineak/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
IUSE="debug"
RDEPEND="
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
index d8a653ff0195..420044457248 100644
--- a/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.6.1-r1.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
inherit autotools flag-o-matic gnome2-utils xdg-utils
DESCRIPTION="A background browser and setter for X"
@@ -10,9 +11,10 @@ SRC_URI="https://github.com/l3ib/nitrogen/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="nls xinerama"
+BDEPEND="virtual/pkgconfig"
RDEPEND="
>=dev-cpp/gtkmm-2.10:2.4
>=gnome-base/librsvg-2.20:2
@@ -21,7 +23,6 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- virtual/pkgconfig
nls? ( sys-devel/gettext )
xinerama? ( x11-base/xorg-proto )
"
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
deleted file mode 100644
index aee77e158ce4..000000000000
--- a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic xdg-utils
-
-DESCRIPTION="A background browser and setter for X"
-HOMEPAGE="http://projects.l3ib.org/nitrogen/"
-SRC_URI="http://projects.l3ib.org/${PN}/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="nls xinerama"
-
-RDEPEND="
- >=dev-cpp/gtkmm-2.10:2.4
- >=gnome-base/librsvg-2.20:2
- >=x11-libs/gtk+-2.10:2
- xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
- xinerama? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
- default
-
- sed -i -e '/^UPDATE_DESKTOP/s#=.*#= :#g' data/Makefile.am || die
-
- eautoreconf
-}
-
-src_configure() {
- append-cxxflags -std=c++11
- econf \
- $(use_enable nls) \
- $(use_enable xinerama)
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/x11-misc/nitrogen/nitrogen-99999.ebuild b/x11-misc/nitrogen/nitrogen-99999.ebuild
index dec80fb27a1d..ce8061fea451 100644
--- a/x11-misc/nitrogen/nitrogen-99999.ebuild
+++ b/x11-misc/nitrogen/nitrogen-99999.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit autotools flag-o-matic git-r3 xdg-utils
DESCRIPTION="A background browser and setter for X"
HOMEPAGE="https://github.com/l3ib/nitrogen"
EGIT_REPO_URI="https://github.com/l3ib/${PN}"
-IUSE="nls xinerama"
-KEYWORDS=""
LICENSE="GPL-2"
SLOT="0"
+IUSE="nls xinerama"
+BDEPEND="virtual/pkgconfig"
RDEPEND="
>=dev-cpp/gtkmm-2.10:2.4
>=gnome-base/librsvg-2.20:2
>=x11-libs/gtk+-2.10:2
xinerama? ( x11-libs/libXinerama )
"
-BDEPEND="
+DEPEND="
${RDEPEND}
- virtual/pkgconfig
nls? ( sys-devel/gettext )
xinerama? ( x11-base/xorg-proto )
"
diff --git a/x11-misc/rofi-calc/Manifest b/x11-misc/rofi-calc/Manifest
index beef4cb00a5d..916e7b8d7309 100644
--- a/x11-misc/rofi-calc/Manifest
+++ b/x11-misc/rofi-calc/Manifest
@@ -1,3 +1 @@
-DIST rofi-calc-1.5.tar.gz 1693385 BLAKE2B 7ff21873ee298c4295f2766917318796d6327959e63d99adc86857d2e05534e77062c9546ba8c6cf645a12ae46147e4583a61fc95dbc6953ee642449ff108d40 SHA512 04213b6489cd9e3c5085a88cee07ee9413819c19d4ee08f6e2eef3ad418d21b5acaf1d4ef21f1495d81694e5706f93598c91ada65f1bcc83ce94a6cf5d50ea0c
-DIST rofi-calc-1.6.tar.gz 1694150 BLAKE2B bc1f3a2589c0e704793693e0f007503d1b0eaa363f416f0d111709541f2960f0f5ab31d0eb129000e7f82af3d46ce0a52918cfbfc00d14292a839a40a0986bb0 SHA512 a87523d3d64fbd53e431dba7da674a213fcfbdcaac25906a19bc83aa3feb14da479b702b39fd58ffeb04198ea0a5d52808f7c9c36495defc99c9c83df963e0b6
DIST rofi-calc-2.0.0.tar.gz 1695125 BLAKE2B d76c304724b0f3326a8bd26ab2c7eaed5f77f3b6d07ddc97570a1fb28d56504d98ac9ab66411290cb548b760bd3231a729dfc470e748a8447e323d1b290f677c SHA512 298f9983dbd140f5aee5b3799b165500eae100f3f5744ba07914b962faf01661dee0f5f4c9c12a07a4e210b6115ac6fb377d9fa9a7e64ef5a19600e9f55cd478
diff --git a/x11-misc/rofi-calc/rofi-calc-1.5.ebuild b/x11-misc/rofi-calc/rofi-calc-1.5.ebuild
deleted file mode 100644
index a267871cd50b..000000000000
--- a/x11-misc/rofi-calc/rofi-calc-1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Do live calculations in rofi!"
-HOMEPAGE="https://github.com/svenstaro/rofi-calc"
-SRC_URI="https://github.com/svenstaro/rofi-calc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- x11-misc/rofi
- >=sci-libs/libqalculate-2.0
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- eautoreconf -i
-}
diff --git a/x11-misc/rofi-calc/rofi-calc-1.6.ebuild b/x11-misc/rofi-calc/rofi-calc-1.6.ebuild
deleted file mode 100644
index a267871cd50b..000000000000
--- a/x11-misc/rofi-calc/rofi-calc-1.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Do live calculations in rofi!"
-HOMEPAGE="https://github.com/svenstaro/rofi-calc"
-SRC_URI="https://github.com/svenstaro/rofi-calc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
- x11-misc/rofi
- >=sci-libs/libqalculate-2.0
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- default
- eautoreconf -i
-}
diff --git a/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild b/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild
index eca4dc548443..072b2dfda9b1 100644
--- a/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild
+++ b/x11-misc/sisctrl/sisctrl-0.0.20051202-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.winischhofer.net/sis/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
BDEPEND="virtual/pkgconfig"
RDEPEND="
diff --git a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild b/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
deleted file mode 100644
index c6a8cc504965..000000000000
--- a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic
-
-DESCRIPTION="tool that allows you to tune SiS drivers from X"
-HOMEPAGE="http://www.winischhofer.net/linuxsispart1.shtml#sisctrl"
-SRC_URI="http://www.winischhofer.net/sis/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
- x11-libs/gtk+:2
- x11-libs/libXrender
- x11-libs/libXv
- x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-no-xv.patch
- sed -i -e 's,/X11R6,,g' configure || die
- append-flags -lm
-}
diff --git a/x11-misc/sux/sux-1.0.1.ebuild b/x11-misc/sux/sux-1.0.1.ebuild
index 4cff435296df..6af851a19172 100644
--- a/x11-misc/sux/sux-1.0.1.ebuild
+++ b/x11-misc/sux/sux-1.0.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc sparc x86"
RDEPEND="x11-apps/xauth"
DEPEND="${RDEPEND}"
diff --git a/x11-misc/xautolock/Manifest b/x11-misc/xautolock/Manifest
index 90006c192c31..85b37638f82a 100644
--- a/x11-misc/xautolock/Manifest
+++ b/x11-misc/xautolock/Manifest
@@ -1,5 +1,2 @@
DIST xautolock-2.2.tgz 35288 BLAKE2B 0cd709470002d7a6852a41a56e9f6b540405e172f30e3243a93b578e362f117a3ddd3b6ff15e653eb5466d15e7ff1d5505c19ccfd27d6e7d6ccae4c826a689ac SHA512 5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04
-DIST xautolock_2.2-5.1.debian.tar.xz 5828 BLAKE2B 6a664d30b993986e70af853c037738da0576ca5ee3a0452329d4dffd3132899d1099b5bcc5bbf68ab688240b388396335b0d5227b140a74deca313112d0088cd SHA512 315f27518b89fa6633e3ce157423cd271f3db3b797fc59febc35aa8b33379bd6eda55ac9c7ccdf996c2d9d50bb6bef3b15add84b39236ace425740238de77e59
-DIST xautolock_2.2-5.2.debian.tar.xz 6216 BLAKE2B bda8c7a084e8975d268d626cc5aa02c87c7e6b0ae92351375f298cde4fabd8e48a0578c7c4bf32a280e2ecf13d82b7dcd73a874863616c0f9812ea98ffbe27e8 SHA512 807c9c7da51b16ed3a6600732f8d3b606d2f6c628238df0e6d975ea176ddce3d0e321779b19662f693ed1811b288ddae1b45228c0939e0728c122c1a2e556391
-DIST xautolock_2.2-6.debian.tar.xz 6376 BLAKE2B a7ef40b0fedd21146e359b85b7245695d9395a54aac568800b80a89fb13a08616fe771997d8b9e155c49f8218447022fcb2b256802156ee5f66d923e394a53ba SHA512 c5d350ae2e123e63564e9145de3a7a180b47cca745262cc4f935ced83e0fe2450d68fcbd0c3de3f4566e6650b3d6183b4491f5a2d0caed838221d2bc0b9e1613
DIST xautolock_2.2-7.debian.tar.xz 7976 BLAKE2B d56687d0eee58e513eae152f2d6d30496346935a05410759eb116eb9fb19c3073db10f1393ab26ae5a63436693b82557b01c0dc18be75af4ee04de8a783bc618 SHA512 5cc0cce408466a57fc99d701199b6a1b3545d9faae86e2474450263a07fbe9920dc89cc3ac14bd8a00274e7e80768be3e360e81ad7378bcdbe34ada23958745a
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.ebuild
deleted file mode 100644
index d9595592a63a..000000000000
--- a/x11-misc/xautolock/xautolock-2.2_p5_p1-r1.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
-inherit toolchain-funcs versionator
-
-DESCRIPTION="An automatic X screen-locker/screen-saver"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
-
-DEB_REV_MAJ="$(get_version_component_range 3)"
-DEB_REV_MIN="$(get_version_component_range 4)"
-DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
-SRC_URI="
- http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
- mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="
- x11-libs/libXScrnSaver
-"
-DEPEND="
- ${RDEPEND}
- app-text/rman
- x11-base/xorg-proto
- x11-misc/imake
-"
-PATCHES=(
- "${WORKDIR}"/debian/patches/10-fix-memory-corruption.patch
- "${WORKDIR}"/debian/patches/11-fix-no-dpms.patch
- "${WORKDIR}"/debian/patches/12-fix-manpage.patch
- "${WORKDIR}"/debian/patches/13-fix-hppa-build.patch
- "${FILESDIR}"/${PN}-2.2_p5_p1-waitpid.patch
-)
-S=${WORKDIR}/${P/_p*}
-
-src_configure() {
- xmkmf || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- CDEBUGFLAGS="${CFLAGS}" \
- EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
- dobin xautolock
- newman xautolock.man xautolock.1
- dodoc Changelog Readme Todo
-}
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
deleted file mode 100644
index 5cff11d974cd..000000000000
--- a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator
-
-DESCRIPTION="An automatic X screen-locker/screen-saver"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
-
-DEB_REV_MAJ="$(get_version_component_range 3)"
-DEB_REV_MIN="$(get_version_component_range 4)"
-DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
-SRC_URI="
- http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
- mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-RDEPEND="
- || (
- x11-misc/alock
- x11-misc/i3lock
- x11-misc/slim
- x11-misc/slock
- x11-misc/xlockmore
- x11-misc/xtrlock
- )
- x11-libs/libXScrnSaver
-"
-DEPEND="
- ${RDEPEND}
- app-text/rman
- x11-base/xorg-proto
- x11-misc/imake
-"
-
-S=${WORKDIR}/${P/_p*}
-
-PATCHES=(
- "${WORKDIR}"/debian/patches/10-fix-memory-corruption.patch
- "${WORKDIR}"/debian/patches/11-fix-no-dpms.patch
- "${WORKDIR}"/debian/patches/12-fix-manpage.patch
- "${WORKDIR}"/debian/patches/13-fix-hppa-build.patch
- "${WORKDIR}"/debian/patches/14-do-not-use-union-wait-type.patch
-)
-
-src_configure() {
- xmkmf || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- CDEBUGFLAGS="${CFLAGS}" \
- EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
- dobin xautolock
- newman xautolock.man xautolock.1
- dodoc Changelog Readme Todo
-}
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild
deleted file mode 100644
index 6125ac05fb94..000000000000
--- a/x11-misc/xautolock/xautolock-2.2_p5_p2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="An automatic X screen-locker/screen-saver"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
-
-DEB_REV_MAJ="$(ver_cut 4)"
-DEB_REV_MIN="$(ver_cut 6)"
-DEB_REVISION="${DEB_REV_MAJ/p}.${DEB_REV_MIN/p}"
-SRC_URI="
- http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
- mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
-
-RDEPEND="
- x11-libs/libXScrnSaver
-"
-DEPEND="
- ${RDEPEND}
- app-text/rman
- x11-base/xorg-proto
- x11-misc/imake
-"
-S=${WORKDIR}/${P/_p*}
-
-src_prepare() {
- eapply "${WORKDIR}"/debian/patches/*.patch
- default
-}
-
-src_configure() {
- xmkmf || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- CDEBUGFLAGS="${CFLAGS}" \
- EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
- dobin xautolock
- newman xautolock.man xautolock.1
- dodoc Changelog Readme Todo
-}
diff --git a/x11-misc/xautolock/xautolock-2.2_p6.ebuild b/x11-misc/xautolock/xautolock-2.2_p6.ebuild
deleted file mode 100644
index 1abba4868157..000000000000
--- a/x11-misc/xautolock/xautolock-2.2_p6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="An automatic X screen-locker/screen-saver"
-HOMEPAGE="http://www.ibiblio.org/pub/Linux/X11/screensavers/"
-
-DEB_REVISION="$(ver_cut 4)"
-SRC_URI="
- http://www.ibiblio.org/pub/Linux/X11/screensavers/${P/_p*/}.tgz
- mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEB_REVISION}.debian.tar.xz
-"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
-
-RDEPEND="
- x11-libs/libXScrnSaver
-"
-DEPEND="
- ${RDEPEND}
- app-text/rman
- x11-base/xorg-proto
- x11-misc/imake
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-2.2_p5_p1-waitpid.patch
-)
-S=${WORKDIR}/${P/_p*}
-
-src_prepare() {
- mv "${WORKDIR}"/debian/patches/14-do-not-use-union-wait-type.patch{,.skip} || die
- eapply "${WORKDIR}"/debian/patches/*.patch
- default
-}
-
-src_configure() {
- xmkmf || die
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- CDEBUGFLAGS="${CFLAGS}" \
- EXTRA_LDOPTIONS="${LDFLAGS}"
-}
-
-src_install() {
- dobin xautolock
- newman xautolock.man xautolock.1
- dodoc Changelog Readme Todo
-}
diff --git a/x11-misc/xautolock/xautolock-2.2_p7.ebuild b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
index 2281d2a7c003..bfd5bdfe3a6c 100644
--- a/x11-misc/xautolock/xautolock-2.2_p7.ebuild
+++ b/x11-misc/xautolock/xautolock-2.2_p7.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc sparc x86"
RDEPEND="
x11-libs/libXScrnSaver
diff --git a/x11-misc/xkbset/Manifest b/x11-misc/xkbset/Manifest
index a8d43eb7a8e6..dbb062b684c8 100644
--- a/x11-misc/xkbset/Manifest
+++ b/x11-misc/xkbset/Manifest
@@ -1,4 +1,2 @@
DIST xkbset-0.5.tar.gz 13933 BLAKE2B f889bbf527e6ee808d970796815445cfa4803f315916c412d540eaac778f8cfdfa6e3d00e171cb21de589a61e5320de2af4f8b8c19c4c2a45c3cf837da38a0e7 SHA512 64de1a18076c0e0fd3e3189444b6033880028f53777566286caf935bfafcf062ccbd408d20926e2a4febb77d15b026349e0288f2aa93c815ddd9437b96589d8c
-DIST xkbset_0.5-5.1.diff.gz 3744 BLAKE2B 3294afd74ddfa81d18827ef388935113eeaa6b2b8abfff799b13cec04f76dda2b78be685991933f133f5eb2b8ebcea5dbba6f5e4429d8363c984aa5c6d22de77 SHA512 92c362653088d5249dc26959cc898d4f8882f77b410ae09bbb2f03972940ed64ee2864b6da3425692c5cfa2bfe3b34d8316f5d7aa619f25c6311ac7a91a8db4b
-DIST xkbset_0.5-6.debian.tar.xz 4028 BLAKE2B 5892ffc95e1926515cb98eaa40829f1f1d91009260e53d62834ce3fbc1bf99559ad5df9ff5b8a57cf7989579cbd351a7bb5481f7e284c9adaf954b2f20cb5d05 SHA512 c7d806406756785c77c12152a092c3f1245941682d063d503f3279d033a1adffa29c7b62723c720cdc03ebde882c134c494b30eda240211f899ceffbc874c366
DIST xkbset_0.5-7.1.debian.tar.xz 4336 BLAKE2B 48de493553add438ccce22567d1e8b706418a6db8a70aaeb83835c33662c8ebc22f8e3250a8b87d521a02c41e44f7252dce774525a1fa5c4bfbf57f876dd728f SHA512 f927cc1fde5b3d0658d28a8fc1cdaa0c366826f7a8eab19404dda6a66a0e91ce3c262da1e783169a7521eb10a3470e9c75c01e60728daea737ad1319bc0b946f
diff --git a/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild b/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild
deleted file mode 100644
index 87d2b2816bdc..000000000000
--- a/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs versionator
-
-DEBIAN_P_MAJOR=$(get_version_component_range 3)
-DEBIAN_P_MAJOR=${DEBIAN_P_MAJOR/p/}
-DEBIAN_P_MINOR=$(get_version_component_range 4)
-DEBIAN_P_MINOR=${DEBIAN_P_MINOR/p/}
-
-DESCRIPTION="User preference utility for XKB extensions for X"
-HOMEPAGE="https://faculty.missouri.edu/~stephen/software/#xkbset"
-SRC_URI="
- https://faculty.missouri.edu/~stephen/software/${PN}/${P/_p*/}.tar.gz
- mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEBIAN_P_MAJOR}.${DEBIAN_P_MINOR}.diff.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tk"
-
-CDEPEND="
- x11-libs/libX11
-"
-DEPEND="
- ${CDEPEND}
-"
-RDEPEND="
- ${CDEPEND}
- tk? ( dev-perl/Tk )
-"
-
-S=${WORKDIR}/${P/_p*/}
-
-PATCHES=(
- "${FILESDIR}"/${P/_p*/}-ldflags.patch
- "${WORKDIR}"/${PN}_${PV/_p*}-${DEBIAN_P_MAJOR}.${DEBIAN_P_MINOR}.diff
- "${WORKDIR}"/${P/_p*/}/debian/patches/02_clarify_errors.dpatch
-)
-
-src_compile() {
- emake CC=$(tc-getCC) INC_PATH= LIB_PATH=
-}
-
-src_install() {
- dobin xkbset
- use tk && dobin xkbset-gui
- doman xkbset.1
- dodoc README TODO
-}
diff --git a/x11-misc/xkbset/xkbset-0.5_p6.ebuild b/x11-misc/xkbset/xkbset-0.5_p6.ebuild
deleted file mode 100644
index 7ac0f9aa012e..000000000000
--- a/x11-misc/xkbset/xkbset-0.5_p6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs versionator
-
-DEBIAN_P_MAJOR=$(get_version_component_range 3)
-DEBIAN_P_MAJOR=${DEBIAN_P_MAJOR/p/}
-
-DESCRIPTION="User preference utility for XKB extensions for X"
-HOMEPAGE="https://faculty.missouri.edu/~stephen/software/#xkbset"
-SRC_URI="
- https://faculty.missouri.edu/~stephen/software/${PN}/${P/_p*/}.tar.gz
- mirror://debian/pool/main/x/${PN}/${PN}_${PV/_p*/}-${DEBIAN_P_MAJOR}.debian.tar.xz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="tk"
-
-CDEPEND="
- x11-libs/libX11
-"
-DEPEND="
- ${CDEPEND}
-"
-RDEPEND="
- ${CDEPEND}
- tk? ( dev-perl/Tk )
-"
-
-S=${WORKDIR}/${P/_p*/}
-
-PATCHES=(
- "${FILESDIR}"/${P/_p*/}-ldflags.patch
- "${WORKDIR}"/debian/patches/02-clarify-errors.patch
-)
-
-src_compile() {
- emake CC=$(tc-getCC) INC_PATH= LIB_PATH=
-}
-
-src_install() {
- dobin xkbset
- use tk && dobin xkbset-gui
- doman xkbset.1
- dodoc README TODO
-}
diff --git a/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild b/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild
index 600c7b14b222..d620594421d0 100644
--- a/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.65-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86"
IUSE="crypt debug gtk imagemagick motif nas opengl pam truetype xinerama xlockrc vtlock"
REQUIRED_USE="
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
deleted file mode 100644
index 6c0a7070272f..000000000000
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="small tool to report and change the keyboard LED states of an X display"
-HOMEPAGE="ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/"
-SRC_URI="ftp://ftp.unix-ag.org/user/bmeurer/xsetleds/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86"
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXtst
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
-"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-assignment.patch \
- "${FILESDIR}"/${P}-isalpha.patch
- tc-export CC
-}
-
-DOCS=( AUTHORS ChangeLog README TODO )
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
index 240350523025..741d565b461c 100644
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86"
RDEPEND="
x11-libs/libX11
diff --git a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
index 2b78dab9a9dd..bd8c8243f121 100644
--- a/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
+++ b/x11-misc/xxkb/xxkb-1.11.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
IUSE="svg"
RDEPEND="
diff --git a/x11-misc/xxkb/xxkb-1.11.1.ebuild b/x11-misc/xxkb/xxkb-1.11.1.ebuild
deleted file mode 100644
index 16f2f9b64abe..000000000000
--- a/x11-misc/xxkb/xxkb-1.11.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils multilib
-
-DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
-HOMEPAGE="https://sourceforge.net/projects/xxkb/"
-SRC_URI="
- mirror://sourceforge/${PN}/${P}-src.tar.gz
- svg? ( https://dev.gentoo.org/~jer/${PN}-flags.tar.bz2 )
-"
-
-LICENSE="Artistic-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="svg"
-
-RDEPEND="
- x11-libs/libX11
- x11-libs/libXpm
- x11-libs/libXt
- svg? (
- dev-libs/glib:2
- gnome-base/librsvg:2
- x11-libs/gtk+:2
- )
-"
-DEPEND="
- ${RDEPEND}
- app-text/rman
- svg? ( virtual/pkgconfig )
- x11-misc/imake
-"
-
-src_prepare() {
- if use svg; then
- mv "${WORKDIR}"/flags . || die
- epatch "${FILESDIR}"/svg-flags.patch
- epatch "${FILESDIR}"/svg-appdefaults.patch
- fi
-
- epatch "${FILESDIR}"/missing_init.patch
-}
-
-src_configure() {
- xmkmf $(usex svg -DWITH_SVG_SUPPORT '') || die
-}
-
-src_compile() {
- emake \
- CDEBUGFLAGS="${CFLAGS}" \
- EXTRA_LIBRARIES="-lXext" \
- LOCAL_LDFLAGS="${LDFLAGS}" \
- PIXMAPDIR=/usr/share/xxkb \
- PROJECTROOT=/usr
-}
-
-src_install() {
- local myopts
- if use svg; then
- myopts="PIXMAPS=flags/de.svg flags/pl.svg flags/il.svg flags/by.svg \
- flags/ua.svg flags/su.svg flags/ru.svg flags/bg.svg flags/en.svg"
- else
- myopts="FOOBAR=buzz"
- fi
-
- emake "${myopts}" DESTDIR="${D}" install
- rm -r "${D}"/usr/$(get_libdir)/X11/app-defaults || die
-
- emake DESTDIR="${D}" install.man
-
- insinto /usr/share/xxkb
- use svg || doins "${FILESDIR}"/*.xpm
- dodoc README* CHANGES*
-}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index ff52d46ec845..ec05ada4f81e 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild
index b254ff70fcc0..5345336dffd5 100644
--- a/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild
+++ b/x11-themes/silver-xcursors/silver-xcursors-0.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.kde-look.org/CONTENT/content-files/$MY_P.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86"
S="${WORKDIR}/${MY_P:5}"
diff --git a/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild b/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
deleted file mode 100644
index 6db853812b58..000000000000
--- a/x11-themes/silver-xcursors/silver-xcursors-0.4.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit readme.gentoo-r1
-
-MY_P="5533-Silver-XCursors-3D-${PV}"
-DESCRIPTION="A high quality set of Xfree 4.3.0 animated mouse cursors"
-HOMEPAGE="http://www.kde-look.org/content/show.php?content=5533"
-SRC_URI="http://www.kde-look.org/CONTENT/content-files/$MY_P.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P:5}"
-
-DOC_CONTENTS="To use this set of cursors, edit or create the file ~/.Xdefaults
-and add the following line:
-Xcursor.theme: Silver
-
-You can change the size by adding a line like:
-Xcursor.size: 48
-
-Also, to globally use this set of mouse cursors edit the file:
- /usr/share/cursors/xorg-x11/default/index.theme
-and change the line:
- Inherits=[current setting]
-to
- Inherits=Silver
-
-Note this will be overruled by a user's ~/.Xdefaults file."
-
-src_install() {
- insinto /usr/share/cursors/xorg-x11/Silver
- doins -r Silver/cursors
- einstalldocs
-
- DISABLE_AUTOFORMATTING="yes"
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- DISABLE_AUTOFORMATTING="yes"
- readme.gentoo_print_elog
-
- ewarn "If you experience flickering, try setting the following line in"
- ewarn "the Device section of your xorg.conf file:"
- ewarn " Option \"HWCursor\" \"false\""
-
-}
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 14e683d4762b..9eee0726b442 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index d8a1292f91f3..18a4810efc83 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,2 +1 @@
-DIST fvwm-2.6.8.tar.gz 3915662 BLAKE2B 0b71182c5c0b5a07314fde8a673efe46712b92484e1164cd6357ad2e36e557dd822bf6c25d201092953ec10200bb0f93846af6cde0d701c65c81a4086de64652 SHA512 12e0def0a1d565c1c44356b48b4e516b7be4f51f13f91d9f8b89364ae106f6d7773e12fd17c71b6f0569c64fb3a5374c036c118cb76f739a63b1e17b5dfba287
DIST fvwm-2.6.9.tar.gz 3942859 BLAKE2B 8faf2d420d96049ab0528a6c6a5dc6ed8ee9449f8e533b9ad9bb526faea86030684fc0aa8ed0d307cb64575457676611298adf582b1249c37a3db35a72b43bf1 SHA512 a9c2214ad19edd17da81446a6d4250284cc50b59b53c233212f2a9354c01143dbb870521392752f272f00af50bee2dd8f0b6bf6176b0d4b3075694d2a61a623e
diff --git a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild b/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
deleted file mode 100644
index d479aafd388b..000000000000
--- a/x11-wm/fvwm/fvwm-2.6.8-r2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic desktop
-
-DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-HOMEPAGE="https://www.fvwm.org/"
-SRC_URI="https://github.com/fvwmorg/fvwm/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+ FVWM"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bidi debug doc netpbm nls perl png readline rplay stroke svg tk truetype +vanilla xinerama lock"
-
-COMMON_DEPEND="
- sys-libs/zlib
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libxcb
- x11-libs/libXcursor
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXpm
- x11-libs/libXrandr
- x11-libs/libXrender
- virtual/libiconv
- bidi? ( dev-libs/fribidi )
- nls? ( virtual/libintl )
- png? ( media-libs/libpng:0= )
- readline? (
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- )
- stroke? ( dev-libs/libstroke )
- svg? ( gnome-base/librsvg )
- truetype? (
- media-libs/fontconfig
- x11-libs/libXft
- )
- xinerama? ( x11-libs/libXinerama )
-"
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl
- perl? ( tk? (
- dev-lang/tk
- dev-perl/Tk
- >=dev-perl/X11-Protocol-0.56
- )
- )
- rplay? ( media-sound/rplay )
- lock? ( x11-misc/xlockmore )
- userland_GNU? ( sys-apps/debianutils )
- !x86-fbsd? ( netpbm? ( media-libs/netpbm ) )
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto
- doc? ( dev-libs/libxslt )
-"
-
-src_prepare() {
- if ! use vanilla; then
- # Enables fast translucent menus; patch from fvwm-user mailing list.
- eapply -p0 "${FILESDIR}/${PN}-2.5.27-translucent-menus.diff"
-
- # Allow more mouse buttons, bug #411811
- eapply -p0 "${FILESDIR}/${PN}-2.6.5-mouse-buttons.patch"
- fi
-
- eapply -p0 "${FILESDIR}/${PN}-2.6.5-ar.patch" #474528
-
- # Fix for Perl 5.28
- eapply -p0 "${FILESDIR}/${PN}-2.6.8-perl528.patch"
-
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --libexecdir="${EPREFIX}"/usr/$(get_libdir)
- --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm
- --enable-iconv
- --enable-package-subdirs
- $(use_enable bidi)
- $(use_enable debug debug-msgs)
- $(use_enable debug command-log)
- $(use_enable doc htmldoc)
- $(use_enable nls)
- $(use_enable perl perllib)
- $(use_enable png)
- $(use_with readline readline-library)
- $(use_with rplay rplay-library)
- $(use_with stroke stroke-library)
- $(use_enable svg rsvg)
- $(use_enable truetype xft)
- $(use_enable xinerama)
- )
-
- # Non-upstream email where bugs should be sent; used in fvwm-bug.
- export FVWM_BUGADDR="maintainer-needed@gentoo.org"
-
- # Recommended by upstream, reference ????
- append-flags -fno-strict-aliasing
-
- # Signed chars are required.
- use ppc && append-flags -fsigned-char
-
- use readline && myeconfargs+=( --without-termcap-library )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- make_session_desktop fvwm /usr/bin/fvwm
-
- if ! use lock; then
- find "${D}" -name '*fvwm-menu-xlock' -exec rm -f '{}' \; 2>/dev/null
- fi
-
- if use perl; then
- if ! use tk; then
- rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Tk.pm || die
- rm "${D}"/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm || die
- find "${D}"/usr/share/fvwm/perllib -depth -type d -exec rmdir '{}' \; 2>/dev/null
- fi
- else
- # Completely wipe it if ! use perl
- rm -r "${D}"/usr/bin/fvwm-perllib "${D}"/usr/share/man/man1/fvwm-perllib.1
- fi
-
- # Utility for testing FVWM behaviour by creating a simple window with
- # configurable hints.
- if use debug; then
- dobin "${S}"/tests/hints/hints_test
- newdoc "${S}"/tests/hints/README README.hints
- fi
-
- dodir /etc/X11/Sessions
- echo "/usr/bin/fvwm" > "${D}"/etc/X11/Sessions/${PN} || die
- fperms a+x /etc/X11/Sessions/${PN}
-
- dodoc docs/{COMMANDS,DEVELOPERS.md}
-
- # README file for translucent menus patch.
- if ! use vanilla; then
- dodoc "${FILESDIR}"/README.translucency
- ewarn "You are using a patched build, so, please, don't"
- ewarn "report bugs at the fvwm-workers list unless you are"
- ewarn "also able to reproduce them with a vanilla build (USE=vanilla)."
- fi
-}