diff --git a/Manifest.files.gz b/Manifest.files.gz
index 67dbee797bf0..8c7f56aec4fc 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index ba957d2ef321..5ec2e9571503 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/cdist/Manifest b/app-admin/cdist/Manifest
index 97e2f22bcd90..bc4b2680265d 100644
--- a/app-admin/cdist/Manifest
+++ b/app-admin/cdist/Manifest
@@ -1,3 +1,4 @@
DIST cdist-5.1.3.tar.gz 915245 BLAKE2B 5fce58f6fcbd48852e1c0c5568b72c360e74fd49b5321e2aedfdc8e48fd090cbdd7bab87a94e76d087f04f5a706bf2c7b1bebdc5a80867e26d8cc6e28afdeab3 SHA512 8330a5af80dfc07da722675ae1d402ebae4ba0aada451a02d782365d68d1d43a643609f3326f5ed793d2902838ee29071c0255c9d8a9d38c1e8a7c92a24cef46
DIST cdist-6.0.0.tar.gz 934813 BLAKE2B 3cb18ebb3059fc9a37beb1567c691e1d34a9cde5d49081e8798b5ba86ea8da3b6c964d2c8bea7bf2f04f986b0b4a8766c8ea53ce48fb4bc024264e72efec1fcb SHA512 e846060f3020d6281d41e97b9cc33250cd1d4ae0d110a2792fc2447af110fef91199fc0382d5a1e501f487fda42f703957ff5a39cf28061338609a600290d792
DIST cdist-6.5.4.tar.gz 898002 BLAKE2B b4565cd8112ce1bff6ac74625a5920886a708fec827f70c3a3a2df156408761badebff4e161900cd09685bfbbb4954927c9771f6516c54a510b582ebec075e76 SHA512 3f1405e1b28d7568ef3ae543d59e760b2dc1fc8004be031550ba52d3aa2d8911cef4325865fb9ed5df053ec1609a076bb31a520b100bad5811f0de9cd73f416e
+DIST cdist-6.5.6.tar.gz 950790 BLAKE2B f13927009eb8c0172ecc0d59c1eb90fccd17542beed21033f17cec0746f6a41d5f9b39103942ffadf5a45251f49d97bc10ac82ff94bd5cd05d86c48f5d4f839f SHA512 b62a62feca742be233af9602b9216408c68cc66f114d9e581619f564359ccddc23a54257f16d70105476b76f6ba19ecd8937253f01dc479f806609e11fde8741
diff --git a/app-admin/cdist/cdist-6.5.6.ebuild b/app-admin/cdist/cdist-6.5.6.ebuild
new file mode 100644
index 000000000000..ed4bd09b8c98
--- /dev/null
+++ b/app-admin/cdist/cdist-6.5.6.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="A usable configuration management system"
+HOMEPAGE="https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/dist/html/*.html docs/dist/html/man{1,7}/*.html )
+ distutils-r1_python_install_all
+
+ doman docs/dist/man/man1/*.1 docs/dist/man/man7/*.7
+}
diff --git a/app-admin/consul/consul-1.7.4.ebuild b/app-admin/consul/consul-1.7.4.ebuild
index 2d7b12ac4068..140e5eea9226 100644
--- a/app-admin/consul/consul-1.7.4.ebuild
+++ b/app-admin/consul/consul-1.7.4.ebuild
@@ -477,7 +477,7 @@ SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT"
RESTRICT+=" test"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
BDEPEND="dev-go/gox"
COMMON_DEPEND="
diff --git a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
index 49ce7d2cac57..607a2d15b283 100644
--- a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
+++ b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
@@ -13,9 +13,7 @@ LICENSE="|| ( GPL-2 LGPL-2.1 )"
SLOT="0"
KEYWORDS="amd64 hppa x86"
-RDEPEND="
- sys-libs/ncurses:0=
- !app-admin/procinfo"
+RDEPEND="sys-libs/ncurses:0="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index f56b1a545593..1f061f897420 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/pet2tgz/metadata.xml b/app-arch/pet2tgz/metadata.xml
index 5e531f2269f7..a272aeda686c 100644
--- a/app-arch/pet2tgz/metadata.xml
+++ b/app-arch/pet2tgz/metadata.xml
@@ -1,8 +1,8 @@
-
-
- pet2tgz
-
+
+
+ pet2tgz
+
diff --git a/app-arch/pet2tgz/pet2tgz-0.3.ebuild b/app-arch/pet2tgz/pet2tgz-0.3-r1.ebuild
similarity index 79%
rename from app-arch/pet2tgz/pet2tgz-0.3.ebuild
rename to app-arch/pet2tgz/pet2tgz-0.3-r1.ebuild
index a2c746113538..fc99eb44b020 100644
--- a/app-arch/pet2tgz/pet2tgz-0.3.ebuild
+++ b/app-arch/pet2tgz/pet2tgz-0.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
DESCRIPTION="Puppy Linux .pet to .tar.gz converter"
HOMEPAGE="https://sourceforge.net/projects/pet2tgz/"
@@ -10,6 +10,3 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DOCS="AUTHORS"
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 9758c539ec75..76505eb54d09 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/cdw/cdw-0.8.1-r1.ebuild b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
index 2e0b7596745d..c524d89d06de 100644
--- a/app-cdr/cdw/cdw-0.8.1-r1.ebuild
+++ b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
HOMEPAGE="http://cdw.sourceforge.net"
@@ -22,8 +22,15 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=( "${FILESDIR}/${PN}-0.8.1-fix-ar-call.patch" )
+
DOCS=( AUTHORS ChangeLog NEWS README THANKS cdw.conf )
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_configure() {
econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
}
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
index 5013ebb9082d..f23f85b84c76 100644
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,6 @@ HOMEPAGE="http://cdw.sourceforge.net"
LICENSE="GPL-2+"
SLOT="0"
-DOCS=( AUTHORS ChangeLog NEWS README THANKS cdw.conf )
RDEPEND="
app-cdr/dvd+rw-tools
@@ -27,6 +26,10 @@ BDEPEND="virtual/pkgconfig"
S=${WORKDIR}/${ECVS_MODULE}
+PATCHES=( "${FILESDIR}/${PN}-0.8.1-fix-ar-call.patch" )
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS cdw.conf )
+
src_prepare() {
default
eautoreconf
diff --git a/app-cdr/cdw/files/cdw-0.8.1-fix-ar-call.patch b/app-cdr/cdw/files/cdw-0.8.1-fix-ar-call.patch
new file mode 100644
index 000000000000..a578696c1c82
--- /dev/null
+++ b/app-cdr/cdw/files/cdw-0.8.1-fix-ar-call.patch
@@ -0,0 +1,26 @@
+diff --git a/configure.ac b/configure.ac
+index 76627c7..527e2cb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -119,7 +119,7 @@ AC_TYPE_UINT16_T
+ AC_TYPE_UINT32_T
+ AC_TYPE_UINT8_T
+ AC_CHECK_TYPES([ptrdiff_t])
+-
++AC_CHECK_TOOL(AR, ar, false)
+
+
+
+diff --git a/src/user_interface/Makefile.in b/src/user_interface/Makefile.in
+index 5d5f1fc..4d8214b 100644
+--- a/src/user_interface/Makefile.in
++++ b/src/user_interface/Makefile.in
+@@ -88,7 +88,7 @@ CONFIG_HEADER = $(top_builddir)/config_cdw.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ AM_V_AR = $(am__v_AR_@AM_V@)
+ am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@)
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index a8979e903574..87abf7878e78 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild b/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
index fd1198b631ab..b67db0a54898 100644
--- a/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
+++ b/app-crypt/tpm2-tss/tpm2-tss-2.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
IUSE="doc +fapi gcrypt +openssl static-libs test"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/trousers/files/trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch b/app-crypt/trousers/files/trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch
new file mode 100644
index 000000000000..f777b629cebe
--- /dev/null
+++ b/app-crypt/trousers/files/trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch
@@ -0,0 +1,25 @@
+From 5b1dbb5f8eada9002ec10f4ebc0bc418272e58b2 Mon Sep 17 00:00:00 2001
+From: Salah Coronya
+Date: Sun, 7 Jun 2020 12:34:03 -0500
+Subject: [PATCH] src/tddl/Makefile.am: Mark tddl.a nodist
+
+This makes tddl.a nodist like the others, so it is not installed
+
+Signed-off-by: Salah Coronya
+---
+ src/tddl/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tddl/Makefile.am b/src/tddl/Makefile.am
+index 607eb8e..2cd599b 100644
+--- a/src/tddl/Makefile.am
++++ b/src/tddl/Makefile.am
+@@ -1,4 +1,4 @@
+-lib_LIBRARIES=libtddl.a
++noinst_LIBRARIES=libtddl.a
+
+ libtddl_a_SOURCES=tddl.c
+ libtddl_a_CFLAGS=-DAPPID=\"TCSD\ TDDL\" -I${top_srcdir}/src/include -fPIE -DPIE
+--
+2.26.2
+
diff --git a/app-crypt/trousers/trousers-0.3.14-r1.ebuild b/app-crypt/trousers/trousers-0.3.14-r1.ebuild
deleted file mode 100644
index b9fbfed67e72..000000000000
--- a/app-crypt/trousers/trousers-0.3.14-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info readme.gentoo-r1 systemd user udev
-
-DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
-HOMEPAGE="http://trousers.sf.net"
-SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
-
-LICENSE="CPL-1.0 GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 x86"
-IUSE="doc libressl selinux" # gtk
-
-# gtk support presently does NOT compile.
-# gtk? ( >=x11-libs/gtk+-2 )
-
-DEPEND=">=dev-libs/glib-2
- !libressl? ( >=dev-libs/openssl-0.9.7:0= )
- libressl? ( dev-libs/libressl:0= )"
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-tcsd )"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
- "${FILESDIR}/${P}-libressl.patch"
-)
-
-DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
-
-DOC_CONTENTS="
- If you have problems starting tcsd, please check permissions and
- ownership on /dev/tpm* and ~tss/system.data
-"
-
-S="${WORKDIR}"
-
-pkg_setup() {
- # Check for driver (not sure it can be an rdep, because ot depends on the
- # version of virtual/linux-sources... Is that supported by portage?)
- linux-info_pkg_setup
- local tpm_kernel_version tpm_kernel_present tpm_module
- kernel_is ge 2 6 12 && tpm_kernel_version="yes"
- if linux_config_exists; then
- linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
- else
- ewarn "No kernel configuration could be found."
- fi
- has_version app-crypt/tpm-emulator && tpm_module="yes"
- if [[ -n "${tpm_kernel_present}" ]]; then
- einfo "Good, you seem to have in-kernel TPM support."
- elif [[ -n "${tpm_module}" ]]; then
- einfo "Good, you seem to have TPM support with the external module."
- if [[ -n "${tpm_kernel_version}" ]]; then
- elog
- elog "Note that since you have a >=2.6.12 kernel, you could use"
- elog "the in-kernel driver instead of (CONFIG_TCG_TPM)."
- fi
- elif [[ -n "${tpm_kernel_version}" ]]; then
- eerror
- eerror "To use this package, you will have to activate TPM support"
- eerror "in your kernel configuration. That's at least CONFIG_TCG_TPM,"
- eerror "plus probably a chip specific driver (like CONFIG_TCG_ATMEL)."
- eerror
- else
- eerror
- eerror "To use this package, you should install a TPM driver."
- eerror "You can have the following options:"
- eerror " - install app-crypt/tpm-emulator"
- eerror " - switch to a >=2.6.12 kernel and compile the kernel module"
- eerror
- fi
-
- # New user/group for the daemon
- enewgroup tss
- enewuser tss -1 -1 /var/lib/tpm tss
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # econf --with-gui=$(usex gtk gtk openssl)
- econf --with-gui=openssl
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-
- keepdir /var/lib/tpm
- use doc && dodoc doc/*
- newinitd "${FILESDIR}"/tcsd.initd tcsd
- newconfd "${FILESDIR}"/tcsd.confd tcsd
- systemd_dounit "${FILESDIR}"/tcsd.service
- udev_dorules "${FILESDIR}"/61-trousers.rules
- fowners tss:tss /var/lib/tpm
- readme.gentoo_create_doc
-}
diff --git a/app-crypt/trousers/trousers-0.3.14-r2.ebuild b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
index b62a9eb93452..a36ff6830733 100644
--- a/app-crypt/trousers/trousers-0.3.14-r2.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r2.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
"${FILESDIR}/${P}-libressl.patch"
"${FILESDIR}/${P}-fno-common.patch"
+ "${FILESDIR}/${P}-Makefile.am-Mark-tddl.a-nodist.patch"
)
DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index cc0602c84407..58e822deeeb6 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/mg/metadata.xml b/app-editors/mg/metadata.xml
index 00486d5abd44..156c5660d642 100644
--- a/app-editors/mg/metadata.xml
+++ b/app-editors/mg/metadata.xml
@@ -6,7 +6,11 @@
Gentoo Emacs project
- mg is Micro GNU/emacs, this is a portable version of the mg maintained by
- the OpenBSD team.
+ Mg (mg) is intended to be a small, fast, and portable editor for
+ people who can't (or don't want to) run real Emacs for one reason
+ or another. It is compatible with GNU Emacs because there shouldn't
+ be any reason to learn more than one Emacs flavor.
+
+ This is a portable version of the Mg maintained by the OpenBSD team.
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index d62f625f29ae..c8f5287077fa 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/blogmax/metadata.xml b/app-emacs/blogmax/metadata.xml
index 18aa34682d6d..0240753d62dd 100644
--- a/app-emacs/blogmax/metadata.xml
+++ b/app-emacs/blogmax/metadata.xml
@@ -6,7 +6,9 @@
Gentoo GNU Emacs project
- BlogMax is an Emacs package that aids in the creation of a weblog.
+ BlogMax is an Emacs major-mode for maintaining a weblog. It lets you
+ focus on the text of your web site, while wrapping a template that
+ you define around each page.
diff --git a/app-emacs/scim-bridge-el/metadata.xml b/app-emacs/scim-bridge-el/metadata.xml
index 43c14ac67d16..d351407087a4 100644
--- a/app-emacs/scim-bridge-el/metadata.xml
+++ b/app-emacs/scim-bridge-el/metadata.xml
@@ -9,7 +9,16 @@
Gentoo GNU Emacs project
- A SCIM-Bridge client for Emacs.
+ The Smart Common Input Method platform (SCIM) is an input method (IM)
+ platform containing support for more than thirty languages (CJK and
+ many European languages) for POSIX-style operating systems including
+ Linux and BSD.
+
+ scim-bridge.el is a SCIM-Bridge client for Emacs. This program allows
+ users on-the-spot style input with SCIM. The input statuses are
+ individually kept for each buffer, and prefix-keys such as C-x and C-c
+ can be used even if SCIM is active. So you can input various languages
+ fast and comfortably by using it.
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 973e1b3a9842..ffb598a9796b 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/virtualbox/virtualbox-6.1.10-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.10-r1.ebuild
index ba14c3938f30..48c20b4aecc2 100644
--- a/app-emulation/virtualbox/virtualbox-6.1.10-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.1.10-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# $Id: 8881f0924916cef4ba5f7bfa39c3c3d8e02a7704 $
EAPI=7
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index 38a08e060527..7af49449d957 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/alertmanager/Manifest b/app-metrics/alertmanager/Manifest
index 0f339d55ede0..77f498a5c51b 100644
--- a/app-metrics/alertmanager/Manifest
+++ b/app-metrics/alertmanager/Manifest
@@ -1,2 +1,3 @@
DIST alertmanager-0.18.0.tar.gz 5181819 BLAKE2B efcc856ccacb97646915e8d622179cf3cc7554351036cf556347ec46cdede5c9223139cb209b52376964c7b19b119f3683f82698d1e7c07b1432bb3e4bb37239 SHA512 59faec308abaac3d2b59198fef25109b208de1a807b38803dc10722ff0caf1bac9d9795005fefb3b4e2acda62be136bfcafe7b9702ae52565021a424f99fa730
DIST alertmanager-0.19.0.tar.gz 5862442 BLAKE2B a79336286ca1099dcc73cce897eccaff8d40f8d3140ebf1943a1189cf1d2ec58738cbe7fc02221826ffc0e1535954a11a461ac6ea222113c79a44d43cc9eda83 SHA512 2c21bfbb1001e07e81b1115439ad15e7c0e7089839e56a19c445177e322b8ef9aa2b85e96478f3c3d709cbbd3a5447662a8c55da370b84aa4b6b24f83848744b
+DIST alertmanager-0.21.0.tar.gz 5704209 BLAKE2B 646ac0b05eb194d1c35f49e38c0a206d09a9c45d4f2f7c371a53ecfff5deba6e2c2af82f3f4ce2b591338c557241766395f42b8bd3c91ae2da4ef7e570666fda SHA512 72568407af4e90455975eff504ed49f4877eb517673532f655b6b0459725db5df7bbd1a3be120106c46b30dd7056714cc0b34b46df9c4d8c98e1f8c9eb0c39da
diff --git a/app-metrics/alertmanager/alertmanager-0.21.0.ebuild b/app-metrics/alertmanager/alertmanager-0.21.0.ebuild
new file mode 100644
index 000000000000..028f242a3a36
--- /dev/null
+++ b/app-metrics/alertmanager/alertmanager-0.21.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module user
+GIT_COMMIT=4c6c03eb
+MY_PV="${PV/_rc/-rc.}"
+
+DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
+HOMEPAGE="https://github.com/prometheus/alertmanager"
+SRC_URI="https://github.com/prometheus/alertmanager/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="dev-util/promu"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+ enewgroup ${PN}
+ enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+ default
+ sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+ promu build -v --prefix bin || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc {README,CHANGELOG,CONTRIBUTING}.md
+ insinto /etc/alertmanager/
+ newins doc/examples/simple.yml config.yml.example
+ keepdir /var/lib/alertmanager /var/log/alertmanager
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
+}
diff --git a/app-metrics/prometheus/Manifest b/app-metrics/prometheus/Manifest
index b88e3208874e..517cf63cccd0 100644
--- a/app-metrics/prometheus/Manifest
+++ b/app-metrics/prometheus/Manifest
@@ -1 +1,3 @@
DIST prometheus-2.13.1.tar.gz 15249891 BLAKE2B 35cd3c81bdb4f3a783c2ab1f1318946db5b25c94496fe351739a59259a726bf54d418d6b29efeff44c8007353ed63368819ce89ffe6a4f380b7ae216da3c4d63 SHA512 aed3b44db97cd2a67add64d13e950246b25c2b459f6b1081a6c548862c4e85c055254a0dfb94b08ac85f83dbbe30afceb1c54a8ad6f7ff1367aeb6af6d270e8a
+DIST prometheus-2.19.1-assets.tar.gz 5032055 BLAKE2B 75bc247d3dfbcccf3a9d7ef8a23fabe2d92d698670f5aabb19e1ee019e0197aa4fd49cfd53353e09a765a014af70ad860c7d1b6bce292632e5ed1175dd206ae9 SHA512 52d1f80d9ab2de778e8a0c81549ff83647d3d8af37ccf535a6fc4ac45fe29f25f6592e9b5eb137cd5ed6f6730835e4ba52b6c4c82e5b0bb2336b90c809d756de
+DIST prometheus-2.19.1.tar.gz 13343138 BLAKE2B 042f2c6e10e3d7f50b2373d9c3977db0318c8c9839e313463890ccae58c91d6d46c306d5aaeb795fb1a9649477b179999cb6b182aca9dee222d8fba557bf6d74 SHA512 a54a83b21ac8f3477e678ca365b8f04adcbe5cdd8a17d842eb9cd2e3428238841fb0492da6f4ec973f48803b0739667c734ae8a88b48d12555e23410e6461629
diff --git a/app-metrics/prometheus/prometheus-2.19.1.ebuild b/app-metrics/prometheus/prometheus-2.19.1.ebuild
new file mode 100644
index 000000000000..86894dfc6925
--- /dev/null
+++ b/app-metrics/prometheus/prometheus-2.19.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module user
+
+MY_PV=v${PV/_rc/-rc.}
+GIT_COMMIT=eba3fdcbf
+
+DESCRIPTION="Prometheus monitoring system and time series database"
+HOMEPAGE="https://github.com/prometheus/prometheus"
+SRC_URI="https://github.com/prometheus/prometheus/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~williamh/dist/${P}-assets.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND=">=dev-util/promu-0.3.0"
+DEPEND="!app-metrics/prometheus-bin"
+
+PROMETHEUS_HOME="/var/lib/prometheus"
+
+RESTRICT+=" test"
+
+pkg_setup() {
+ enewgroup prometheus
+ enewuser prometheus -1 -1 "${PROMETHEUS_HOME}" prometheus
+}
+
+src_prepare() {
+ default
+ sed -i -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
+ mv ../assets_vfsdata.go web/ui || die
+}
+
+src_compile() {
+ promu build --prefix bin -v || die
+}
+
+src_install() {
+ dobin bin/*
+ dodoc -r {documentation,{README,CHANGELOG,CONTRIBUTING}.md}
+ insinto /etc/prometheus
+ doins documentation/examples/prometheus.yml
+ insinto /usr/share/prometheus
+ doins -r console_libraries consoles
+ dosym ../../usr/share/prometheus/console_libraries /etc/prometheus/console_libraries
+ dosym ../../usr/share/prometheus/consoles /etc/prometheus/consoles
+
+ newinitd "${FILESDIR}"/prometheus.initd prometheus
+ newconfd "${FILESDIR}"/prometheus.confd prometheus
+ keepdir /var/log/prometheus /var/lib/prometheus
+ fowners prometheus:prometheus /var/log/prometheus /var/lib/prometheus
+}
+
+pkg_postinst() {
+ if has_version 'shell-tools@gentoo.org
Gentoo Shell Tools Project
- binclock displays a binary clock in your terminal.
diff --git a/app-misc/lfm/Manifest b/app-misc/lfm/Manifest
index a1d31f1752f6..9c8f52bd1678 100644
--- a/app-misc/lfm/Manifest
+++ b/app-misc/lfm/Manifest
@@ -1,2 +1 @@
-DIST lfm-2.3.tar.gz 119120 BLAKE2B 12d72d1caed7745dc336644589fba359c198c145d29bb419dbd0586ebe5e170d1a743e24638913a4581137c6e0d2f312a58fb84b22218ecb3f93942cf3d63db9 SHA512 d244cd03ebf4b145c0d364d9d7038a2b640010e7e6bc413a3613d4519afac4856ee7694a962176d7693bef6503b80703685b1cefab1eda0f8d0768ae10abf6c7
DIST lfm-3.1.tar.gz 88878 BLAKE2B 409b61d24de671db33c25ff78c039f690fb376fce7bf146c452a67e72d3b50d54b461994ae7a2fb9a17fb64fc94de83f58d5faa0bd960970a53ee5c42fc9c166 SHA512 9e6142c0d871fe19b4b82e5333e03de562ca87a7498bd7fb496cca27e0b42c56a33913f2a7eb46439447ab7adb4a87da44bfcc1548101e15703aaa21ec105af8
diff --git a/app-misc/lfm/files/lfm-2.3-no-doc.patch b/app-misc/lfm/files/lfm-2.3-no-doc.patch
deleted file mode 100644
index 3b69881589e0..000000000000
--- a/app-misc/lfm/files/lfm-2.3-no-doc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- lfm-2.3/setup.py.orig
-+++ lfm-2.3/setup.py
-@@ -56,8 +56,7 @@
- 'lfm/actions', 'lfm/compress', 'lfm/utils', 'lfm/vfs',
- 'lfm/config', 'lfm/pyview'],
- scripts = ['lfm/lfm', 'lfm/pyview'],
-- data_files = [('share/doc/lfm', DOC_FILES),
-- ('share/man/man1', MAN_FILES)]
-+ data_files = [('share/man/man1', MAN_FILES)]
- # **addargs
- )
-
diff --git a/app-misc/lfm/lfm-2.3-r1.ebuild b/app-misc/lfm/lfm-2.3-r1.ebuild
deleted file mode 100644
index 63105cd4a3a5..000000000000
--- a/app-misc/lfm/lfm-2.3-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Last File Manager is a powerful file manager for the console"
-HOMEPAGE="https://inigo.katxi.org/devel/lfm/"
-SRC_URI="https://inigo.katxi.org/devel/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-no-doc.patch
-}
diff --git a/app-misc/oneko/oneko-1.2_p6_p14.ebuild b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
similarity index 96%
rename from app-misc/oneko/oneko-1.2_p6_p14.ebuild
rename to app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
index 24af54e6b8a2..8ad80ac4a084 100644
--- a/app-misc/oneko/oneko-1.2_p6_p14.ebuild
+++ b/app-misc/oneko/oneko-1.2_p6_p14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -23,8 +23,10 @@ RDEPEND="
"
DEPEND="
${RDEPEND}
- app-text/rman
x11-base/xorg-proto
+"
+BDEPEND="
+ app-text/rman
x11-misc/gccmakedep
x11-misc/imake
"
diff --git a/app-misc/rl/metadata.xml b/app-misc/rl/metadata.xml
index b78a944212a5..33f5f6d36521 100644
--- a/app-misc/rl/metadata.xml
+++ b/app-misc/rl/metadata.xml
@@ -8,5 +8,4 @@
shell-tools@gentoo.org
Gentoo Shell Tools Project
- randomize lines can be used to randomize the contents of text files or standard input.
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index d21461745efc..4feffe1890b2 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/homebank/homebank-5.2.8.ebuild b/app-office/homebank/homebank-5.2.8.ebuild
index e071ac7d4868..6ce67e8a1086 100644
--- a/app-office/homebank/homebank-5.2.8.ebuild
+++ b/app-office/homebank/homebank-5.2.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://homebank.free.fr/public/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE="+ofx"
-KEYWORDS="~amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
RDEPEND=">=dev-libs/glib-2.39
>=net-libs/libsoup-2.26
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2ab1a0053f32..0aa9a7ea457c 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/convmv/convmv-2.05-r1.ebuild b/app-text/convmv/convmv-2.05-r1.ebuild
new file mode 100644
index 000000000000..3384fadada92
--- /dev/null
+++ b/app-text/convmv/convmv-2.05-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="convert filenames to utf8 or any other charset"
+HOMEPAGE="https://www.j3e.de/linux/convmv/"
+SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+BDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.05-manpage_nocompress.patch" #729544
+)
+
+src_prepare() {
+ default
+ sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+ dodoc CREDITS Changes TODO VERSION
+}
+
+src_test() {
+ unpack ./testsuite.tar
+
+ cd "${S}"/suite || die
+ ./dotests.sh || die "Tests failed"
+}
diff --git a/app-text/convmv/files/convmv-2.05-manpage_nocompress.patch b/app-text/convmv/files/convmv-2.05-manpage_nocompress.patch
new file mode 100644
index 000000000000..02f0c41032ee
--- /dev/null
+++ b/app-text/convmv/files/convmv-2.05-manpage_nocompress.patch
@@ -0,0 +1,16 @@
+--- convmv-2.05/Makefile
++++ convmv-2.05/Makefile
+@@ -10,11 +10,11 @@
+ install: all
+ mkdir -p $(DESTDIR)$(MANDIR)/man1/
+ mkdir -p $(DESTDIR)$(PREFIX)/bin/
+- cp convmv.1.gz $(DESTDIR)$(MANDIR)/man1/
++ cp convmv.1 $(DESTDIR)$(MANDIR)/man1/
+ install -m 755 convmv $(DESTDIR)$(PREFIX)/bin/
+
+ manpage:
+- pod2man --section 1 --center=" " convmv | gzip > convmv.1.gz
++ pod2man --section 1 --center=" " convmv > convmv.1
+
+ clean:
+ rm -f convmv.1.gz convmv-*.tar.gz MD5sums SHA256sums .files .name
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 28893afe0d82..88b44b536ed2 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,2 +1 @@
-DIST grip-4.2.0.zip 43079 BLAKE2B b7aa31c554d646fdedee88f54e2ad825d56eed26cb18ec364cc0e2638f3d002f2fb3192daa15085b2db5a9d608e37df8c74b19466042c57fa62b80f7bc259eef SHA512 2989a1cc2cb98254e932d5bf6679a205992e74802e68fe45d11cf087747d2379778df254bbf1cf980bb8993dc5568c5112707c645babbb32aae49f443319ff6b
DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
diff --git a/app-text/grip/grip-4.2.0.ebuild b/app-text/grip/grip-4.2.0.ebuild
deleted file mode 100644
index d5e458d1fbb6..000000000000
--- a/app-text/grip/grip-4.2.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( pypy3 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
-HOMEPAGE="https://github.com/joeyespo/grip"
-LICENSE="MIT"
-
-SLOT="0"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-KEYWORDS="~amd64"
-
-DEPEND="app-arch/unzip"
-RDEPEND="
- >=dev-python/docopt-0.6.2
- >=dev-python/flask-0.10.1
- >=dev-python/markdown-2.5.1
- >=dev-python/path-and-address-1.0.0
- >=dev-python/pygments-1.6
- >=dev-python/requests-2.4.1
-"
diff --git a/app-text/q-text-as-data/Manifest b/app-text/q-text-as-data/Manifest
index 081b6340c159..0d554c366130 100644
--- a/app-text/q-text-as-data/Manifest
+++ b/app-text/q-text-as-data/Manifest
@@ -1 +1 @@
-DIST q-1.5.0.tar.gz 58746 BLAKE2B a35f7ea605a42e81be1ee4899ed9e8c2b4e81e896b6e4c1eb6045b64cc7fa3ffdf6f754be168b3ebe25faa4c8b80f63e2ffff3174231357260263acf335b8d5c SHA512 d21dd16a31629e36f0dee72ebc574283c7937821cb2da7ccaacb8484a35b53193dad05fe9857d1498434a0c1083514ea5b9e5d8a636bcd51d4c5924cb7bb1b55
+DIST q-2.0.10.tar.gz 218824 BLAKE2B 91f6485d94325768d7bfd32223d379cd90f3ade3760e44c859ec25aee6aeb73c943b3dedbf56b378222f6bc094faf160d86dcacab3dd0ce5ebf93230ca61696d SHA512 ab503a555380b6d17500972256db5e9eb19066d7a1f480091e777681d694746d6d7743254f3839bfd2f08697308aee8cea60e4583a0b1a4d93caf522342f25b2
diff --git a/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild b/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
similarity index 68%
rename from app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild
rename to app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
index 3441091a9944..f3c988259f1b 100644
--- a/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild
+++ b/app-text/q-text-as-data/q-text-as-data-2.0.10.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
-# Does not yet support py3
-PYTHON_COMPAT=( python2_7 )
+EAPI="7"
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
PYTHON_REQ_USE="sqlite"
inherit python-r1
@@ -18,15 +17,23 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# No dependencies other than python >= 2.5
-# http://harelba.github.io/q/requirements.html
-RDEPEND="${PYTHON_DEPS}"
-DEPEND=""
+# Upstream is wrong
+# http://harelba.github.io/q/#requirements
+RDEPEND="${PYTHON_DEPS}
+ $(python_gen_any_dep '
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/flake8[${PYTHON_USEDEP}]
+ ')"
+DEPEND="${RDEPEND}"
S="${WORKDIR}/${MY_P}"
+src_compile() {
+ : # Do not use the Makefile
+}
+
q_install() {
- python_newexe bin/q q-text-as-data
+ python_newexe bin/q.py q-text-as-data
}
src_install() {
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index fe55d2508317..e262d9f318d2 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild
index 82893ce57cab..e5c1fdd5914b 100644
--- a/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild
+++ b/dev-ada/gnatcoll-bindings/gnatcoll-bindings-2020.ebuild
@@ -32,7 +32,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
S="${WORKDIR}"/${MYP}-src
pkg_setup() {
- python-single-r1_pkg_setup
+ use python && python-single-r1_pkg_setup
ada_pkg_setup
}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index bdaa6825aabc..0cefea34e358 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/pgxnclient/pgxnclient-1.3.ebuild b/dev-db/pgxnclient/pgxnclient-1.3-r2.ebuild
similarity index 78%
rename from dev-db/pgxnclient/pgxnclient-1.3.ebuild
rename to dev-db/pgxnclient/pgxnclient-1.3-r2.ebuild
index 586f7287262e..4af1585476da 100644
--- a/dev-db/pgxnclient/pgxnclient-1.3.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.3-r2.ebuild
@@ -3,6 +3,7 @@
EAPI=7
+RESTRICT="test"
PYTHON_COMPAT=( python3_{6..9} )
DISTUTILS_USE_SETUPTOOLS=rdepend
inherit distutils-r1
@@ -16,12 +17,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
LICENSE="BSD"
SLOT="0"
-IUSE="test"
-
-# Test data isn't included in releases. So, the tests fail.
-# https://github.com/pgxn/pgxnclient/issues/36
-RESTRICT="test
- !test? ( test )"
+IUSE=""
distutils_enable_tests pytest
@@ -29,10 +25,11 @@ RDEPEND="dev-db/postgresql:*[server]
dev-python/six[${PYTHON_USEDEP}]
"
DEPEND+="${RDEPEND}
- test? ( dev-python/mock[${PYTHON_USEDEP}] )
"
src_prepare() {
+ sed "s/setup_requires/#/" -i setup.py || die
+
sed "s/find_packages()/find_packages(exclude=['tests'])/" -i setup.py || die
default
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index ba628a6c3748..87f0c4de0a0c 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild
index 8dbd1b377847..81391c36b1b2 100644
--- a/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild
+++ b/dev-haskell/lhs2tex/lhs2tex-1.18.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,8 @@ IUSE=""
# dev-texlive/texlive-mathscience contains 'stmaryrd' font used
# for guide generation
-RDEPEND=">=dev-tex/polytable-0.8.2
+# dev-texlive/texlive-latexextra for polytable
+RDEPEND="dev-texlive/texlive-latexextra
dev-texlive/texlive-mathscience"
DEPEND="${RDEPEND}
diff --git a/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild b/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild
index 8dbd1b377847..81391c36b1b2 100644
--- a/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild
+++ b/dev-haskell/lhs2tex/lhs2tex-1.19-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,8 @@ IUSE=""
# dev-texlive/texlive-mathscience contains 'stmaryrd' font used
# for guide generation
-RDEPEND=">=dev-tex/polytable-0.8.2
+# dev-texlive/texlive-latexextra for polytable
+RDEPEND="dev-texlive/texlive-latexextra
dev-texlive/texlive-mathscience"
DEPEND="${RDEPEND}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9f7e83709748..11ba690b9b47 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/crystal/files/crystal-0.34.0-no-usr-lib.patch b/dev-lang/crystal/files/crystal-0.34.0-no-usr-lib.patch
deleted file mode 100644
index 4dc0b42d90a0..000000000000
--- a/dev-lang/crystal/files/crystal-0.34.0-no-usr-lib.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-On amd64 linux /usr/lib does not match default 64-bit ABI.
-
-Let's rely on default compiler and linker paths instead.
---- a/src/compiler/crystal/codegen/link.cr
-+++ b/src/compiler/crystal/codegen/link.cr
-@@ -106,7 +106,7 @@ module Crystal
-
- private def lib_flags_posix
- library_path = ENV["LIBRARY_PATH"]?.try(&.split(':', remove_empty: true)) ||
-- ["/usr/lib", "/usr/local/lib"]
-+ [] of String
- has_pkg_config = nil
-
- String.build do |flags|
diff --git a/dev-lang/elixir/files/elixir-1.10.2-test-regex-fix.patch b/dev-lang/elixir/files/elixir-1.10.2-test-regex-fix.patch
deleted file mode 100644
index 01b27a050276..000000000000
--- a/dev-lang/elixir/files/elixir-1.10.2-test-regex-fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 8491f0dc74f8bc89bb926b8130b45eaa5ba92c4b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Valim?=
-Date: Sat, 28 Mar 2020 10:49:16 +0100
-Subject: [PATCH] Fix improper regex use, closes #9914
-
----
- lib/elixir/test/elixir/regex_test.exs | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/lib/elixir/test/elixir/regex_test.exs
-+++ b/lib/elixir/test/elixir/regex_test.exs
-@@ -91,8 +91,10 @@ defmodule RegexTest do
- assert <<0xA0::utf8>> =~ ~r/[[:space:]]/u
- assert <<0xA0::utf8>> =~ ~r/\s/u
-
-+ # Erlang/OTP 23 raises badarg on invalid UTF-8.
-+ # Earlier versions simply would not match.
-+ assert catch_error(if <>> =~ ~r/<.>/u, do: flunk("failed"), else: raise("failed"))
- assert <>> =~ ~r/<.>/
-- refute <>> =~ ~r/<.>/u
- end
-
- test "ungreedy" do
-@@ -349,6 +351,6 @@ defmodule RegexTest do
- end
-
- defp matches_escaped?(string, match) do
-- Regex.match?(~r/#{Regex.escape(string)}/simxu, match)
-+ Regex.match?(~r/#{Regex.escape(string)}/simx, match)
- end
- end
---
-2.26.1
-
diff --git a/dev-lang/qu-prolog/Manifest b/dev-lang/qu-prolog/Manifest
index 6ae5f8da31b2..576e943a1e72 100644
--- a/dev-lang/qu-prolog/Manifest
+++ b/dev-lang/qu-prolog/Manifest
@@ -2,3 +2,4 @@ DIST qp10.1.tar.gz 1521610 BLAKE2B a4d6d277a35284accfff1afd70901218df198b2b33f5c
DIST qp10.2.tar.gz 1667066 BLAKE2B fe466bc892a0923f463347bfa22618061d8a8baf9e2fc60ea27694c66be6dc8ac9b0bacd3084bccff95ff06ef949660cb9a0637a8e3e3595d04c44eb2b682bc9 SHA512 5cfebab17a812513bb4ddf4c04890af32339bef18d746dd6503cee13d295c43f1ef687a6c7814b2f40473766c695459f8234541ae8a6945a0f2930556985ad96
DIST qp10.3.tar.gz 1669345 BLAKE2B 9dc14f683555b22e7bb2119dd6d29cad7c934bb162def4358d69da65cd259b586fac593c7770dc1d665ab56da2e1129a696e84b01a271b747a9e3a8598c0d7fa SHA512 e28519fccf58f2b755382f2b8e56c15f2622508822c920975577feb6b837f96346a14eb23a5209ed126e617264ed7846b8a35d5936e99284503d5c435c0a1c18
DIST qp10.4.tar.gz 1671144 BLAKE2B 293cbc09a058714f762e5d371074ca1b87e8177868851a3db2606a837810b474e926c43f6715c5088c718f2b1841c46f9668795ac53edc0266a9a6d5d04386f5 SHA512 39193ba2c39dc24b234092a47f9834af5b8dff6edc34ba6e0ceb6a4bda60c2f30b951bc17ef72da1dd220ef62563c88f4106dd0115a5bf8e51045abfb96151c6
+DIST qp10.5.tar.gz 1670927 BLAKE2B 74fd47beb18f7081ade39bf215a999066a2a5e99753ee8e48751c37d7bff111d355a7713f13af43a1cffc2fa6ca5efdf89a633fba45accdef17ee265f068e57a SHA512 6a7d46f09015304ffa222c82be5d9fb28c272ce27641455113740f3a4a08887369208456c478320b30d9464d8eeea0f7fcc1c1e56e1a130134e2fe54d5446958
diff --git a/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch b/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch
new file mode 100644
index 000000000000..cfc7cbfd4c14
--- /dev/null
+++ b/dev-lang/qu-prolog/files/qu-prolog-10.5-gcc-version.patch
@@ -0,0 +1,25 @@
+--- qp10.5.orig/configure.in 2019-12-29 00:57:44.000000000 +0100
++++ qp10.5/configure.in 2020-06-25 08:53:32.610430095 +0200
+@@ -209,22 +209,6 @@
+ uname \
+ )
+
+-#----------------------------------------------------------------------------
+-dnl Check for CPP version
+-AC_MSG_CHECKING([for GCC version])
+-qp_cpp_ver=[`gcc --version 2>/dev/null | head -1 | sed -e 's/^[^[:digit:]]*\([[:digit:]][^[:space:]]*\).*$/\1/'`]
+-if test -n "$qp_cpp_ver"; then
+- AC_MSG_RESULT($qp_cpp_ver)
+- case "$qp_cpp_ver" in
+- 2.*)
+- AC_DEFINE(GCC_VERSION_2, 1, [Whether or not the GCC is gcc 2])
+- ;;
+- esac
+-else
+- AC_MSG_RESULT(not found)
+- AC_MSG_ERROR(Could not determine GCC version)
+-fi
+-
+ #-----------------------------------------------------------------------------
+ dnl Check for -fno-strict-aliasing
+ AC_MSG_CHECKING([for -fno-strict-aliasing])
diff --git a/dev-lang/qu-prolog/qu-prolog-10.5.ebuild b/dev-lang/qu-prolog/qu-prolog-10.5.ebuild
new file mode 100644
index 000000000000..36fdb457ce21
--- /dev/null
+++ b/dev-lang/qu-prolog/qu-prolog-10.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils multilib qmake-utils
+
+MY_P=qp${PV}
+
+DESCRIPTION="Extended Prolog supporting quantifiers, object-variables and substitutions"
+HOMEPAGE="http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html"
+SRC_URI="http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc examples pedro qt5 readline threads"
+
+RDEPEND="
+ !dev-util/mpatch
+ !dev-util/rej
+ qt5? (
+ dev-qt/qtwidgets:5
+ dev-qt/qtgui:5
+ )
+ pedro? ( net-misc/pedro )
+ readline? ( app-misc/rlwrap )"
+DEPEND="${RDEPEND}
+ dev-lang/perl"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+ eapply "${FILESDIR}"/${PN}-10.x-qt5.patch
+ eapply "${FILESDIR}"/${PN}-10.5-gcc-version.patch
+ eapply_user
+
+ eautoconf
+}
+
+src_configure() {
+ econf \
+ --libdir=/usr/$(get_libdir) \
+ $(use_enable debug) \
+ $(use_enable threads multiple-threads)
+
+ if use qt5; then
+ cd "${S}"/src/xqp || die
+ eqmake5 xqp.pro
+ fi
+}
+
+src_compile() {
+ emake OPTIMISATION="${CXXFLAGS}"
+
+ if use qt5; then
+ cd "${S}"/src/xqp || die
+ emake
+ fi
+}
+
+src_install() {
+ sed \
+ -e "s|${S}|/usr/$(get_libdir)/qu-prolog|g" \
+ -i bin/qc bin/qc1.qup bin/qecat bin/qg bin/qp || die
+
+ dobin bin/{qc,qecat,qp,kq}
+
+ use qt5 && dobin src/xqp/xqp
+
+ into /usr/$(get_libdir)/${PN}
+ dobin bin/{qa,qc1.qup,qdeal,qem,qg,ql,qppp}
+
+ insinto /usr/$(get_libdir)/${PN}/bin
+ doins bin/rl_commands
+ doins bin/{qc1.qup,qecat,qg,qp}.qx
+
+ insinto /usr/$(get_libdir)/${PN}/library
+ doins prolog/library/*.qo
+
+ insinto /usr/$(get_libdir)/${PN}/compiler
+ doins prolog/compiler/*.qo
+
+ doman doc/man/man1/*.1
+
+ dodoc README
+
+ if use doc ; then
+ docinto reference-manual
+ dodoc doc/manual/*.html
+ docinto user-guide
+ dodoc doc/user/main.pdf
+ fi
+
+ if use examples ; then
+ docinto examples
+ newdoc examples/README README.examples
+ dodoc examples/*.ql
+ fi
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 1cdfd109cc3d..72266c5e0c0c 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/libclangformat-ide/Manifest b/dev-libs/libclangformat-ide/Manifest
new file mode 100644
index 000000000000..75e6601c5836
--- /dev/null
+++ b/dev-libs/libclangformat-ide/Manifest
@@ -0,0 +1,2 @@
+DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
+DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-libs/libclangformat-ide/files/clang-qtcreator-compat.patch b/dev-libs/libclangformat-ide/files/clang-qtcreator-compat.patch
new file mode 100644
index 000000000000..72b9453ce7a4
--- /dev/null
+++ b/dev-libs/libclangformat-ide/files/clang-qtcreator-compat.patch
@@ -0,0 +1,185 @@
+From fa1b9053729ec6a4425a44ec5502dd388928274a Mon Sep 17 00:00:00 2001
+From: Ivan Donchevskii
+Date: Fri, 12 Oct 2018 08:19:25 +0200
+Subject: [PATCH] [clang-format] Introduce the flag which allows not to shrink
+ lines
+
+--------------------------------------------------------------------------
+* https://reviews.llvm.org/D53072
+--------------------------------------------------------------------------
+
+Currently there's no way to prevent to lines optimization even
+if you have intentionally put to split the line.
+
+In general case it's fine. So I would prefer to have such option
+which you can enable in special cases (for me it's an IDE related use case).
+
+Revert this change if upstream clang-format offers better solution.
+
+This is a cherry pick from commits b748c82e3664c2e2e3d29645ede472d87b8cde63
+and 1817513d4f3a2e4e26be124dbe395340f798fd51.
+
+Change-Id: I9d2935b937bb68ea8dc59fac8463718475e9c080
+Reviewed-by: Orgad Shaneh
+---
+ include/clang/Format/Format.h | 13 +++++++++++++
+ lib/Format/Format.cpp | 4 ++++
+ lib/Format/UnwrappedLineFormatter.cpp | 9 +++++----
+ lib/Format/UnwrappedLineParser.cpp | 2 ++
+ unittests/Format/FormatTest.cpp | 16 ++++++++++++++++
+ 5 files changed, 40 insertions(+), 4 deletions(-)
+
+diff --git a/include/clang/Format/Format.h b/include/clang/Format/Format.h
+index cb37b0c890c..b9c4df3d1af 100644
+--- a/include/clang/Format/Format.h
++++ b/include/clang/Format/Format.h
+@@ -22,6 +22,8 @@
+ #include "llvm/Support/Regex.h"
+ #include
+
++#define KEEP_LINE_BREAKS_FOR_NON_EMPTY_LINES_BACKPORTED
++
+ namespace llvm {
+ namespace vfs {
+ class FileSystem;
+@@ -1200,6 +1202,16 @@ struct FormatStyle {
+ /// \endcode
+ bool JavaScriptWrapImports;
+
++ /// If true, no line breaks are optimized out (works only with ColumnLimit = 0)
++ /// \code
++ /// true: false:
++ /// int foo(int a, vs. int foo(int a, int b) {
++ /// int b) {
++ /// bar(); bar();
++ /// } }
++ /// \endcode
++ bool KeepLineBreaksForNonEmptyLines;
++
+ /// If true, the empty line at the start of blocks is kept.
+ /// \code
+ /// true: false:
+@@ -1767,6 +1779,7 @@ struct FormatStyle {
+ JavaImportGroups == R.JavaImportGroups &&
+ JavaScriptQuotes == R.JavaScriptQuotes &&
+ JavaScriptWrapImports == R.JavaScriptWrapImports &&
++ KeepLineBreaksForNonEmptyLines == R.KeepLineBreaksForNonEmptyLines &&
+ KeepEmptyLinesAtTheStartOfBlocks ==
+ R.KeepEmptyLinesAtTheStartOfBlocks &&
+ MacroBlockBegin == R.MacroBlockBegin &&
+diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
+index 2c4f8760540..61ea88626ee 100644
+--- a/lib/Format/Format.cpp
++++ b/lib/Format/Format.cpp
+@@ -417,6 +417,8 @@ template <> struct MappingTraits {
+ IO.mapOptional("JavaImportGroups", Style.JavaImportGroups);
+ IO.mapOptional("JavaScriptQuotes", Style.JavaScriptQuotes);
+ IO.mapOptional("JavaScriptWrapImports", Style.JavaScriptWrapImports);
++ IO.mapOptional("KeepLineBreaksForNonEmptyLines",
++ Style.KeepLineBreaksForNonEmptyLines);
+ IO.mapOptional("KeepEmptyLinesAtTheStartOfBlocks",
+ Style.KeepEmptyLinesAtTheStartOfBlocks);
+ IO.mapOptional("MacroBlockBegin", Style.MacroBlockBegin);
+@@ -678,6 +680,7 @@ FormatStyle getLLVMStyle() {
+ LLVMStyle.JavaScriptWrapImports = true;
+ LLVMStyle.TabWidth = 8;
+ LLVMStyle.MaxEmptyLinesToKeep = 1;
++ LLVMStyle.KeepLineBreaksForNonEmptyLines = false;
+ LLVMStyle.KeepEmptyLinesAtTheStartOfBlocks = true;
+ LLVMStyle.NamespaceIndentation = FormatStyle::NI_None;
+ LLVMStyle.ObjCBinPackProtocolList = FormatStyle::BPS_Auto;
+@@ -745,6 +748,7 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) {
+ {"^", 2}, {"^<.*\\.h>", 1}, {"^<.*", 2}, {".*", 3}};
+ GoogleStyle.IncludeStyle.IncludeIsMainRegex = "([-_](test|unittest))?$";
+ GoogleStyle.IndentCaseLabels = true;
++ GoogleStyle.KeepLineBreaksForNonEmptyLines = false;
+ GoogleStyle.KeepEmptyLinesAtTheStartOfBlocks = false;
+ GoogleStyle.ObjCBinPackProtocolList = FormatStyle::BPS_Never;
+ GoogleStyle.ObjCSpaceAfterProperty = false;
+diff --git a/lib/Format/UnwrappedLineFormatter.cpp b/lib/Format/UnwrappedLineFormatter.cpp
+index 6b6a9aff461..c88efbc6867 100644
+--- a/lib/Format/UnwrappedLineFormatter.cpp
++++ b/lib/Format/UnwrappedLineFormatter.cpp
+@@ -684,7 +684,7 @@ public:
+ LineFormatter(ContinuationIndenter *Indenter, WhitespaceManager *Whitespaces,
+ const FormatStyle &Style,
+ UnwrappedLineFormatter *BlockFormatter)
+- : Indenter(Indenter), Whitespaces(Whitespaces), Style(Style),
++ : Indenter(Indenter), Style(Style), Whitespaces(Whitespaces),
+ BlockFormatter(BlockFormatter) {}
+ virtual ~LineFormatter() {}
+
+@@ -727,7 +727,8 @@ protected:
+ // assert so that we can simply call this function for all tokens.
+ return true;
+
+- if (NewLine) {
++ if (NewLine || (Previous.Children[0]->First->MustBreakBefore &&
++ Style.KeepLineBreaksForNonEmptyLines)) {
+ int AdditionalIndent = State.Stack.back().Indent -
+ Previous.Children[0]->Level * Style.IndentWidth;
+
+@@ -772,10 +773,10 @@ protected:
+ }
+
+ ContinuationIndenter *Indenter;
++ const FormatStyle &Style;
+
+ private:
+ WhitespaceManager *Whitespaces;
+- const FormatStyle &Style;
+ UnwrappedLineFormatter *BlockFormatter;
+ };
+
+@@ -798,7 +799,7 @@ public:
+ while (State.NextToken) {
+ bool Newline =
+ Indenter->mustBreak(State) ||
+- (Indenter->canBreak(State) && State.NextToken->NewlinesBefore > 0);
++ (State.NextToken->NewlinesBefore > 0 && Indenter->canBreak(State));
+ unsigned Penalty = 0;
+ formatChildren(State, Newline, /*DryRun=*/false, Penalty);
+ Indenter->addTokenToState(State, Newline, /*DryRun=*/false);
+diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
+index 3cd3c8f9cdf..3aa30c7cb3f 100644
+--- a/lib/Format/UnwrappedLineParser.cpp
++++ b/lib/Format/UnwrappedLineParser.cpp
+@@ -2554,6 +2554,8 @@ void UnwrappedLineParser::nextToken(int LevelDifference) {
+ else
+ readTokenWithJavaScriptASI();
+ FormatTok->Previous = Previous;
++ if (FormatTok->NewlinesBefore && Style.KeepLineBreaksForNonEmptyLines)
++ FormatTok->MustBreakBefore = true;
+ }
+
+ void UnwrappedLineParser::distributeComments(
+diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
+index c05fceb4766..38906d9ee31 100644
+--- a/unittests/Format/FormatTest.cpp
++++ b/unittests/Format/FormatTest.cpp
+@@ -385,6 +385,22 @@ TEST_F(FormatTest, RemovesEmptyLines) {
+ " void funk() {}\n"
+ "};",
+ Style));
++
++ Style.KeepLineBreaksForNonEmptyLines = true;
++ Style.ColumnLimit = 0;
++ EXPECT_EQ("int foo(int a,\n"
++ " int b)\n"
++ "{\n"
++ "}",
++ format("int foo(int a,\n"
++ "int b) {}",
++ Style));
++
++ EXPECT_EQ("[]() {\n"
++ " foo(); }",
++ format("[]() {\n"
++ "foo(); }",
++ Style));
+ }
+
+ TEST_F(FormatTest, RecognizesBinaryOperatorKeywords) {
+--
+2.26.2
+
diff --git a/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild b/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild
new file mode 100644
index 000000000000..5c04b67cf27c
--- /dev/null
+++ b/dev-libs/libclangformat-ide/libclangformat-ide-10.0.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake llvm llvm.org toolchain-funcs
+
+DESCRIPTION="A static clangformat library patched for IDE use"
+HOMEPAGE="https://www.qt.io/blog/2019/04/17/clangformat-plugin-qt-creator-4-9"
+LLVM_COMPONENTS=( clang )
+
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="~sys-devel/llvm-${PV}:${SLOT}=[debug=]"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+PATCHES=( "${FILESDIR}/clang-qtcreator-compat.patch" )
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+}
+
+src_unpack() {
+ llvm.org_src_unpack
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+ -DBUILD_SHARED_LIBS=OFF
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+ )
+
+ if [[ -n ${EPREFIX} ]]; then
+ mycmakeargs+=(
+ -DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+ )
+ fi
+
+ if tc-is-cross-compiler; then
+ [[ -x "/usr/bin/clang-tblgen" ]] \
+ || die "/usr/bin/clang-tblgen not found or usable"
+ mycmakeargs+=(
+ -DCMAKE_CROSSCOMPILING=ON
+ -DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+ )
+ fi
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile libclangFormat.a
+}
+
+src_install() {
+ into usr/lib/llvm/${SLOT}
+ newlib.a "${BUILD_DIR}/$(get_libdir)/libclangFormat.a" libclangFormatIDE.a
+ insinto usr/lib/llvm/${SLOT}/include/clang/Format
+ newins "${S}/include/clang/Format/Format.h" FormatIDE.h
+}
diff --git a/dev-libs/libclangformat-ide/libclangformat-ide-9.0.1.ebuild b/dev-libs/libclangformat-ide/libclangformat-ide-9.0.1.ebuild
new file mode 100644
index 000000000000..5c04b67cf27c
--- /dev/null
+++ b/dev-libs/libclangformat-ide/libclangformat-ide-9.0.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake llvm llvm.org toolchain-funcs
+
+DESCRIPTION="A static clangformat library patched for IDE use"
+HOMEPAGE="https://www.qt.io/blog/2019/04/17/clangformat-plugin-qt-creator-4-9"
+LLVM_COMPONENTS=( clang )
+
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="~sys-devel/llvm-${PV}:${SLOT}=[debug=]"
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+PATCHES=( "${FILESDIR}/clang-qtcreator-compat.patch" )
+
+pkg_setup() {
+ LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
+}
+
+src_unpack() {
+ llvm.org_src_unpack
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DLLVM_CMAKE_PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)/cmake/llvm"
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
+ -DBUILD_SHARED_LIBS=OFF
+ -DLLVM_ENABLE_EH=ON
+ -DLLVM_ENABLE_RTTI=ON
+ )
+
+ if [[ -n ${EPREFIX} ]]; then
+ mycmakeargs+=(
+ -DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
+ )
+ fi
+
+ if tc-is-cross-compiler; then
+ [[ -x "/usr/bin/clang-tblgen" ]] \
+ || die "/usr/bin/clang-tblgen not found or usable"
+ mycmakeargs+=(
+ -DCMAKE_CROSSCOMPILING=ON
+ -DCLANG_TABLEGEN=/usr/bin/clang-tblgen
+ )
+ fi
+
+ # LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
+ use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile libclangFormat.a
+}
+
+src_install() {
+ into usr/lib/llvm/${SLOT}
+ newlib.a "${BUILD_DIR}/$(get_libdir)/libclangFormat.a" libclangFormatIDE.a
+ insinto usr/lib/llvm/${SLOT}/include/clang/Format
+ newins "${S}/include/clang/Format/Format.h" FormatIDE.h
+}
diff --git a/dev-libs/libclangformat-ide/metadata.xml b/dev-libs/libclangformat-ide/metadata.xml
new file mode 100644
index 000000000000..d472e560c734
--- /dev/null
+++ b/dev-libs/libclangformat-ide/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ pesa@gentoo.org
+ Davide Pesavento
+
+
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index c97bac2fd18e..bdf5e050541b 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,3 +1,2 @@
-DIST libinput-1.15.4.tar.xz 580616 BLAKE2B cac324f08b8dc3c6cc18ca62d528c3a00fbd70a1d434aa171da2e144d8d74f961bcb491f6dc39b365f766ea8e5ed87b29b1dd5aa9f62b12707f8e49e5c63a5d7 SHA512 4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80
DIST libinput-1.15.5.tar.xz 582800 BLAKE2B 8575dbe6699230610e05f4c7e9e72aebb1fb765be1d305ba6d9fcf69c6efc990ec78bd0746b29921a2414df99c536c3f267b1dd1d6d98c872e360fc16572e2a4 SHA512 a0a3a325048841fc017e19d3bc5f5490605972ab9e2730dc5678bda7efb7a5b1fa6f531f3c8abd8393899ec383d8d2bcfd586eacee04fc1fbda0e02ba2af956a
DIST libinput-1.15.6.tar.xz 584184 BLAKE2B 9963e9df41cb32c40454a3dc76975315f74a2e8b2549c037868c651c2ada90f77a605048ba603a4c01d0641fc39154b578a766309f1c376c07d3bdd02dfd387c SHA512 90459e5a1f22fd42ffcbab157b461e4514c30803bcebdaced76c65c05cccfa6f259640a50497055fe7ed0b376a6979f6d1d01227ae447fe60ba88fa81142b969
diff --git a/dev-libs/libinput/libinput-1.15.4.ebuild b/dev-libs/libinput/libinput-1.15.4.ebuild
deleted file mode 100644
index 931b05cb869e..000000000000
--- a/dev-libs/libinput/libinput-1.15.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 2014-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit meson python-any-r1 udev
-
-DESCRIPTION="Library to handle input devices in Wayland"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput"
-SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0/10"
-[[ "$(ver_cut 3)" -gt 900 ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="doc input_devices_wacom test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- virtual/pkgconfig
- doc? (
- $(python_gen_any_dep '
- dev-python/commonmark[${PYTHON_USEDEP}]
- dev-python/recommonmark[${PYTHON_USEDEP}]
- dev-python/sphinx[${PYTHON_USEDEP}]
- >=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]
- ')
- >=app-doc/doxygen-1.8.3
- >=media-gfx/graphviz-2.38.0
- )
-"
-# test? ( dev-util/valgrind )
-RDEPEND="
- input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
- >=dev-libs/libevdev-1.3
- >=sys-libs/mtdev-1.1
- virtual/libudev:=
- virtual/udev
-"
-DEPEND="${RDEPEND}
- test? ( >=dev-libs/check-0.9.10 )"
-
-python_check_deps() {
- has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \
- has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \
- has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \
- has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
- # gui can be built but will not be installed
- local emesonargs=(
- -Ddebug-gui=false
- $(meson_use doc documentation)
- $(meson_use input_devices_wacom libwacom)
- $(meson_use test tests)
- -Dudev-dir="${EPREFIX}$(get_udevdir)"
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- if use doc ; then
- docinto html
- dodoc -r "${BUILD_DIR}"/Documentation/.
- fi
-}
-
-pkg_postinst() {
- pkgname="dev-python/python-libevdev"
- if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version "${pkgname}"; then
- einfo "${pkgname} must be installed to use the"
- einfo "libinput measure and libinput replay tools."
- fi
-
- udevadm hwdb --update --root="${ROOT}"
-}
diff --git a/dev-libs/libjcat/libjcat-0.1.3.ebuild b/dev-libs/libjcat/libjcat-0.1.3.ebuild
index e20c8660675a..31d4ff92eb40 100644
--- a/dev-libs/libjcat/libjcat-0.1.3.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="gpg gtk-doc +introspection +man pkcs7 test"
RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild b/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
index 845e8e45096d..68409989938f 100644
--- a/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
+++ b/dev-libs/libxmlb/libxmlb-0.1.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/libxmlb/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
IUSE="doc introspection stemmer test"
RESTRICT="!test? ( test )"
diff --git a/dev-libs/pigpio/files/pigpio-70-makefile.patch b/dev-libs/pigpio/files/pigpio-70-makefile.patch
index 10df7e872c6c..1102fa5b6253 100644
--- a/dev-libs/pigpio/files/pigpio-70-makefile.patch
+++ b/dev-libs/pigpio/files/pigpio-70-makefile.patch
@@ -1,6 +1,6 @@
---- a/Makefile 2019-08-10 10:10:22.834043361 +0200
-+++ b/Makefile 2019-08-10 10:43:15.797503591 +0200
-@@ -9,6 +9,9 @@
+--- a/Makefile 2020-06-05 20:28:12.691759233 +0200
++++ b/Makefile 2020-06-05 21:23:46.334235268 +0200
+@@ -9,8 +9,12 @@
STRIP = $(CROSS_PREFIX)strip
SHLIB = $(CC) -shared
STRIPLIB = $(STRIP) --strip-unneeded
@@ -9,8 +9,11 @@
+PYTHON3 = $(shell type -P python3 || echo ':' 2> /dev/null)
SOVERSION = 1
++LIBVERSION = 1.0
-@@ -25,7 +28,7 @@
+ CFLAGS += -O3 -Wall -pthread
+
+@@ -25,7 +29,7 @@
LIB = $(LIB1) $(LIB2) $(LIB3)
@@ -19,23 +22,23 @@
LL1 = -L. -lpigpio -pthread -lrt
-@@ -66,28 +69,21 @@
+@@ -66,52 +70,43 @@
$(CC) -o x_pigpiod_if2 x_pigpiod_if2.o $(LL3)
pigpiod: pigpiod.o $(LIB1)
- $(CC) -o pigpiod pigpiod.o $(LL1)
+- $(STRIP) pigpiod
+ $(CC) $(CFLAGS) $(LDFLAGS) -o pigpiod pigpiod.o $(LL1)
- $(STRIP) pigpiod
pigs: pigs.o command.o
- $(CC) -o pigs pigs.o command.o
+- $(STRIP) pigs
+ $(CC) $(CFLAGS) $(LDFLAGS) -o pigs pigs.o command.o
- $(STRIP) pigs
pig2vcd: pig2vcd.o
- $(CC) -o pig2vcd pig2vcd.o
+- $(STRIP) pig2vcd
+ $(CC) $(CFLAGS) $(LDFLAGS) -o pig2vcd pig2vcd.o
- $(STRIP) pig2vcd
clean:
rm -f *.o *.i *.s *~ $(ALL) *.so.$(SOVERSION)
@@ -51,7 +54,24 @@
install -m 0755 -d $(DESTDIR)$(includedir)
install -m 0644 pigpio.h $(DESTDIR)$(includedir)
install -m 0644 pigpiod_if.h $(DESTDIR)$(includedir)
-@@ -103,15 +99,13 @@
+ install -m 0644 pigpiod_if2.h $(DESTDIR)$(includedir)
+ install -m 0755 -d $(DESTDIR)$(libdir)
+- install -m 0755 libpigpio.so.$(SOVERSION) $(DESTDIR)$(libdir)
+- install -m 0755 libpigpiod_if.so.$(SOVERSION) $(DESTDIR)$(libdir)
+- install -m 0755 libpigpiod_if2.so.$(SOVERSION) $(DESTDIR)$(libdir)
+- cd $(DESTDIR)$(libdir) && ln -fs libpigpio.so.$(SOVERSION) libpigpio.so
+- cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if.so.$(SOVERSION) libpigpiod_if.so
+- cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if2.so.$(SOVERSION) libpigpiod_if2.so
++ install -m 0755 libpigpio.so.$(LIBVERSION) $(DESTDIR)$(libdir)
++ install -m 0755 libpigpiod_if.so.$(LIBVERSION) $(DESTDIR)$(libdir)
++ install -m 0755 libpigpiod_if2.so.$(LIBVERSION) $(DESTDIR)$(libdir)
++ cd $(DESTDIR)$(libdir) && ln -fs libpigpio.so.$(LIBVERSION) libpigpio.so
++ cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if.so.$(LIBVERSION) libpigpiod_if.so
++ cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if2.so.$(LIBVERSION) libpigpiod_if2.so
++ cd $(DESTDIR)$(libdir) && ln -fs libpigpio.so.$(LIBVERSION) libpigpio.so.$(SOVERSION)
++ cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if.so.$(LIBVERSION) libpigpiod_if.so.$(SOVERSION)
++ cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if2.so.$(LIBVERSION) libpigpiod_if2.so.$(SOVERSION)
+ install -m 0755 -d $(DESTDIR)$(bindir)
install -m 0755 pig2vcd $(DESTDIR)$(bindir)
install -m 0755 pigpiod $(DESTDIR)$(bindir)
install -m 0755 pigs $(DESTDIR)$(bindir)
@@ -72,27 +92,29 @@
uninstall:
rm -f $(DESTDIR)$(includedir)/pigpio.h
-@@ -136,19 +130,19 @@
+@@ -136,22 +131,13 @@
endif
$(LIB1): $(OBJ1)
- $(SHLIB) -pthread -Wl,-soname,$(LIB1).$(SOVERSION) -o $(LIB1).$(SOVERSION) $(OBJ1)
-+ $(SHLIB) -o $(LIB1).$(SOVERSION) $(OBJ1)
- ln -fs $(LIB1).$(SOVERSION) $(LIB1)
- $(STRIPLIB) $(LIB1)
- $(SIZE) $(LIB1)
+- ln -fs $(LIB1).$(SOVERSION) $(LIB1)
+- $(STRIPLIB) $(LIB1)
+- $(SIZE) $(LIB1)
++ $(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB1).$(SOVERSION) -o $(LIB1).$(LIBVERSION) $(OBJ1)
$(LIB2): $(OBJ2)
- $(SHLIB) -pthread -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB2).$(SOVERSION) $(OBJ2)
-+ $(SHLIB) -o $(LIB2).$(SOVERSION) $(OBJ2)
- ln -fs $(LIB2).$(SOVERSION) $(LIB2)
- $(STRIPLIB) $(LIB2)
- $(SIZE) $(LIB2)
+- ln -fs $(LIB2).$(SOVERSION) $(LIB2)
+- $(STRIPLIB) $(LIB2)
+- $(SIZE) $(LIB2)
++ $(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB2).$(LIBVERSION) $(OBJ2)
$(LIB3): $(OBJ3)
- $(SHLIB) -pthread -Wl,-soname,$(LIB3).$(SOVERSION) -o $(LIB3).$(SOVERSION) $(OBJ3)
-+ $(SHLIB) -o $(LIB3).$(SOVERSION) $(OBJ3)
- ln -fs $(LIB3).$(SOVERSION) $(LIB3)
- $(STRIPLIB) $(LIB3)
- $(SIZE) $(LIB3)
-
+- ln -fs $(LIB3).$(SOVERSION) $(LIB3)
+- $(STRIPLIB) $(LIB3)
+- $(SIZE) $(LIB3)
++ $(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB3).$(LIBVERSION) $(OBJ3)
+
+ # generated using gcc -MM *.c
+
diff --git a/dev-lua/Manifest.gz b/dev-lua/Manifest.gz
index 7a96835f454d..1dc5f1e19ba4 100644
Binary files a/dev-lua/Manifest.gz and b/dev-lua/Manifest.gz differ
diff --git a/dev-lua/lua-openssl/files/0001-fix-libressl-compat.patch b/dev-lua/lua-openssl/files/0001-fix-libressl-compat.patch
deleted file mode 100644
index 19b0539c0820..000000000000
--- a/dev-lua/lua-openssl/files/0001-fix-libressl-compat.patch
+++ /dev/null
@@ -1,433 +0,0 @@
-From 44d5360d0caed1f4f364691f789fe825fcd17a3e Mon Sep 17 00:00:00 2001
-From: crito
-Date: Mon, 1 Oct 2018 20:10:05 +0200
-Subject: [PATCH] fix libressl compat
-
-add conditions to build with libressl and add missing functions.
-backported from upstream repo.
----
- src/compat.c | 11 ++++++++---
- src/digest.c | 2 +-
- src/ec.c | 2 +-
- src/engine.c | 10 +++++-----
- src/lhash.c | 7 ++++---
- src/openssl.c | 12 ++++++++++--
- src/ots.c | 5 +++++
- src/pkcs7.c | 24 ++++++++++++------------
- src/private.h | 7 ++++---
- src/sm2.c | 2 +-
- src/srp.c | 3 ++-
- src/x509.c | 2 +-
- 12 files changed, 54 insertions(+), 33 deletions(-)
-
-diff --git a/src/compat.c b/src/compat.c
-index cc4cc21..cc45845 100644
---- a/src/compat.c
-+++ b/src/compat.c
-@@ -5,7 +5,7 @@
- #include "openssl.h"
- #include "private.h"
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- int BIO_up_ref(BIO *b)
- {
- CRYPTO_add(&b->references, 1, CRYPTO_LOCK_BIO);
-@@ -16,6 +16,11 @@ int X509_up_ref(X509 *x)
- CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
- return 1;
- }
-+int X509_CRL_up_ref(X509_CRL *x)
-+{
-+ int refs = CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509_CRL);
-+ return (refs > 1) ? 1 : 0;
-+}
- int X509_STORE_up_ref(X509_STORE *s)
- {
- CRYPTO_add(&s->references, 1, CRYPTO_LOCK_X509_STORE);
-@@ -464,7 +469,7 @@ const ASN1_BIT_STRING *TS_STATUS_INFO_get0_failure_info(const TS_STATUS_INFO *a)
- return a->failure_info;
- }
-
--#if OPENSSL_VERSION_NUMBER < 0x10002000L
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
- int i2d_re_X509_tbs(X509 *x, unsigned char **pp)
- {
- x->cert_info->enc.modified = 1;
-@@ -527,4 +532,4 @@ unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
- return ctx->imprint;
- }
-
--#endif /* < 1.1.0 */
-\ No newline at end of file
-+#endif /* < 1.1.0 */
-diff --git a/src/digest.c b/src/digest.c
-index 02e8fe1..0dcf65b 100644
---- a/src/digest.c
-+++ b/src/digest.c
-@@ -468,7 +468,7 @@ restore md data
- static LUA_FUNCTION(openssl_digest_ctx_data)
- {
- EVP_MD_CTX *ctx = CHECK_OBJECT(1, EVP_MD_CTX, "openssl.evp_digest_ctx");
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- if (lua_isnone(L, 2))
- {
- lua_pushlstring(L, ctx->md_data, ctx->digest->ctx_size);
-diff --git a/src/ec.c b/src/ec.c
-index f0d2b6b..5db32db 100644
---- a/src/ec.c
-+++ b/src/ec.c
-@@ -611,7 +611,7 @@ static int openssl_ecdsa_set_method(lua_State *L)
- {
- EC_KEY *ec = CHECK_OBJECT(1, EC_KEY, "openssl.ec_key");
- ENGINE *e = CHECK_OBJECT(2, ENGINE, "openssl.engine");
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- const ECDSA_METHOD *m = ENGINE_get_ECDSA(e);
- if (m) {
- int r = ECDSA_set_method(ec, m);
-diff --git a/src/engine.c b/src/engine.c
-index 1a26d8b..f12ca53 100644
---- a/src/engine.c
-+++ b/src/engine.c
-@@ -14,7 +14,7 @@ enum
- {
- TYPE_RSA,
- TYPE_DSA,
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- TYPE_ECDH,
- TYPE_ECDSA,
- #else
-@@ -24,7 +24,7 @@ enum
- TYPE_RAND,
- TYPE_CIPHERS,
- TYPE_DIGESTS,
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- TYPE_STORE,
- #else
- TYPE_PKEY_METHODS,
-@@ -150,7 +150,7 @@ static int openssl_engine_register(lua_State*L)
- else
- ENGINE_register_DSA(eng);
- break;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- case TYPE_ECDH:
- if (unregister)
- ENGINE_unregister_ECDH(eng);
-@@ -183,7 +183,7 @@ static int openssl_engine_register(lua_State*L)
- else
- ENGINE_register_RAND(eng);
- break;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- case TYPE_STORE:
- if (unregister)
- ENGINE_unregister_STORE(eng);
-@@ -392,7 +392,7 @@ static int openssl_engine_set_default(lua_State*L)
- case TYPE_DSA:
- ret = ENGINE_set_default_DSA(eng);
- break;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- case TYPE_ECDH:
- ret = ENGINE_set_default_ECDH(eng);
- break;
-diff --git a/src/lhash.c b/src/lhash.c
-index 564bb52..8057efb 100644
---- a/src/lhash.c
-+++ b/src/lhash.c
-@@ -130,21 +130,22 @@ static void dump_value_doall_arg(CONF_VALUE *a, lua_State *L)
- }
- }
-
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- IMPLEMENT_LHASH_DOALL_ARG_CONST(CONF_VALUE, lua_State);
- #elif OPENSSL_VERSION_NUMBER >= 0x10000002L
- static IMPLEMENT_LHASH_DOALL_ARG_FN(dump_value, CONF_VALUE, lua_State)
- #endif
-+#if !defined(LIBRESSL_VERSION_NUMBER)
- #define LHM_lh_doall_arg(type, lh, fn, arg_type, arg) \
- lh_doall_arg(CHECKED_LHASH_OF(type, lh), fn, CHECKED_PTR_OF(arg_type, arg))
--
-+#endif
-
- static LUA_FUNCTION(openssl_lhash_parse)
- {
- LHASH* lhash = CHECK_OBJECT(1, LHASH, "openssl.lhash");
-
- lua_newtable(L);
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
- lh_CONF_VALUE_doall_lua_State(lhash, dump_value_doall_arg, L);
- #elif OPENSSL_VERSION_NUMBER >= 0x10000002L
- lh_CONF_VALUE_doall_arg(lhash, LHASH_DOALL_ARG_FN(dump_value), lua_State, L);
-diff --git a/src/openssl.c b/src/openssl.c
-index 994c22b..debea63 100644
---- a/src/openssl.c
-+++ b/src/openssl.c
-@@ -338,6 +338,9 @@ get FIPS mode
- */
- static int openssl_fips_mode(lua_State *L)
- {
-+#if defined(LIBRESSL_VERSION_NUMBER)
-+ return 0;
-+#else
- int ret =0, on = 0;
- if(lua_isnone(L, 1))
- {
-@@ -353,6 +356,7 @@ static int openssl_fips_mode(lua_State *L)
- else
- ret = openssl_pushresult(L, ret);
- return ret;
-+#endif
- }
-
- #ifndef OPENSSL_NO_CRYPTO_MDEBUG
-@@ -405,7 +409,9 @@ void CRYPTO_thread_cleanup(void);
-
- static int luaclose_openssl(lua_State *L)
- {
-+#if !defined(LIBRESSL_VERSION_NUMBER)
- FIPS_mode_set(0);
-+#endif
- #if defined(OPENSSL_THREADS)
- CRYPTO_thread_cleanup();
- #endif
-@@ -421,7 +427,7 @@ static int luaclose_openssl(lua_State *L)
- CRYPTO_cleanup_all_ex_data();
- #ifndef OPENSSL_NO_CRYPTO_MDEBUG
- #if !(defined(OPENSSL_NO_STDIO) || defined(OPENSSL_NO_FP_API))
--#if OPENSSL_VERSION_NUMBER < 0x10101000L
-+#if OPENSSL_VERSION_NUMBER < 0x10101000L || defined(LIBRESSL_VERSION_NUMBER)
- CRYPTO_mem_leaks_fp(stderr);
- #else
- if(CRYPTO_mem_leaks_fp(stderr)!=1)
-@@ -541,13 +547,15 @@ LUALIB_API int luaopen_openssl(lua_State*L)
- luaopen_dh(L);
- lua_setfield(L, -2, "dh");
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2) && !defined(LIBRESSL_VERSION_NUMBER)
- luaopen_sm2(L);
- lua_setfield(L, -2, "sm2");
- #endif
-
-+#if !defined(LIBRESSL_VERSION_NUMBER)
- luaopen_srp(L);
- lua_setfield(L, -2, "srp");
-+#endif
-
- #ifdef ENABLE_OPENSSL_GLOBAL
- lua_pushvalue(L, -1);
-diff --git a/src/ots.c b/src/ots.c
-index 6b75946..762d17e 100644
---- a/src/ots.c
-+++ b/src/ots.c
-@@ -1265,7 +1265,12 @@ static LUA_FUNCTION(openssl_ts_resp_ctx_set_time_cb)
- arg->cb_arg = luaL_ref(L, LUA_REGISTRYINDEX);
-
- openssl_valueset(L, ctx, time_cb_key);
-+#if defined(LIBRESSL_VERSION_NUMBER)
-+ ctx->time_cb = openssl_time_cb;
-+ ctx->time_cb_data = L;
-+#else
- TS_RESP_CTX_set_time_cb(ctx, openssl_time_cb, L);
-+#endif
- return 0;
- }
-
-diff --git a/src/pkcs7.c b/src/pkcs7.c
-index f043c86..f0e5221 100644
---- a/src/pkcs7.c
-+++ b/src/pkcs7.c
-@@ -346,7 +346,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
- os = p7->d.signed_and_enveloped->enc_data->enc_data;
- if (!os)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- os = M_ASN1_OCTET_STRING_new();
- #else
- os = ASN1_OCTET_STRING_new();
-@@ -364,7 +364,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
- os = p7->d.enveloped->enc_data->enc_data;
- if (!os)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- os = M_ASN1_OCTET_STRING_new();
- #else
- os = ASN1_OCTET_STRING_new();
-@@ -383,7 +383,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
- /* If detached data then the content is excluded */
- if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- M_ASN1_OCTET_STRING_free(os);
- #else
- ASN1_OCTET_STRING_free(os);
-@@ -398,7 +398,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
- /* If detached data then the content is excluded */
- if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- M_ASN1_OCTET_STRING_free(os);
- #else
- ASN1_OCTET_STRING_free(os);
-@@ -474,7 +474,7 @@ static int openssl_pkcs7_dataFinal(PKCS7 *p7, BIO *bio)
- goto err;
- if (!EVP_DigestFinal_ex(mdc, md_data, &md_len))
- goto err;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- M_ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
- #else
- ASN1_OCTET_STRING_set(p7->d.digest->digest, md_data, md_len);
-@@ -577,7 +577,7 @@ int PKCS7_signatureVerify_digest(PKCS7 *p7, PKCS7_SIGNER_INFO *si, X509 *x509,
-
- md_type = OBJ_obj2nid(si->digest_alg->algorithm);
- md = EVP_get_digestbynid(md_type);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- if (!md || !data || (hash && len != (size_t) md->ctx_size) )
- goto err;
-
-@@ -1137,7 +1137,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
- os = p7->d.signed_and_enveloped->enc_data->enc_data;
- if (!os)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- os = M_ASN1_OCTET_STRING_new();
- #else
- os = ASN1_OCTET_STRING_new();
-@@ -1155,7 +1155,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
- os = p7->d.enveloped->enc_data->enc_data;
- if (!os)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- os = M_ASN1_OCTET_STRING_new();
- #else
- os = ASN1_OCTET_STRING_new();
-@@ -1174,7 +1174,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
- /* If detached data then the content is excluded */
- if (PKCS7_type_is_data(p7->d.sign->contents) && p7->detached)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- M_ASN1_OCTET_STRING_free(os);
- #else
- ASN1_OCTET_STRING_free(os);
-@@ -1189,7 +1189,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
- /* If detached data then the content is excluded */
- if (PKCS7_type_is_data(p7->d.digest->contents) && p7->detached)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- M_ASN1_OCTET_STRING_free(os);
- #else
- ASN1_OCTET_STRING_free(os);
-@@ -1217,7 +1217,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
-
- if (hash)
- {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- if (l == (size_t) mdc->digest->ctx_size)
- {
- memcpy(mdc->md_data, data, l);
-@@ -1272,7 +1272,7 @@ static LUA_FUNCTION(openssl_pkcs7_sign_digest)
- unsigned int md_len;
- md = EVP_get_digestbynid(OBJ_obj2nid(p7->d.digest->md->algorithm));
- EVP_DigestInit_ex(mdc, md, NULL);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- if (l == (size_t) mdc->digest->ctx_size)
- {
- memcpy(mdc->md_data, data, l);
-diff --git a/src/private.h b/src/private.h
-index 8e9d5b8..7140cae 100644
---- a/src/private.h
-+++ b/src/private.h
-@@ -46,9 +46,10 @@ extern "C" {
- luaL_getmetatable(L,"openssl.bn"); \
- lua_setmetatable(L,-2)
-
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- int BIO_up_ref(BIO *b);
- int X509_up_ref(X509 *x);
-+int X509_CRL_up_ref(X509_CRL *x);
- int X509_STORE_up_ref(X509_STORE *s);
- int EVP_PKEY_up_ref(EVP_PKEY *pkey);
-
-@@ -124,12 +125,12 @@ STACK_OF(X509) *TS_VERIFY_CTS_set_certs(TS_VERIFY_CTX *ctx,
- unsigned char *TS_VERIFY_CTX_set_imprint(TS_VERIFY_CTX *ctx,
- unsigned char *hexstr, long len);
-
--#if OPENSSL_VERSION_NUMBER < 0x10002000L
-+#if OPENSSL_VERSION_NUMBER < 0x10002000L || defined(LIBRESSL_VERSION_NUMBER)
- int i2d_re_X509_tbs(X509 *x, unsigned char **pp);
-+#endif
- void X509_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
- const X509 *x);
- int X509_get_signature_nid(const X509 *x);
--#endif
-
- #endif
-
-diff --git a/src/sm2.c b/src/sm2.c
-index 0655888..1db3198 100644
---- a/src/sm2.c
-+++ b/src/sm2.c
-@@ -1,7 +1,7 @@
- #include "openssl.h"
- #include "private.h"
-
--#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2)
-+#if (OPENSSL_VERSION_NUMBER >= 0x10101007L) && !defined(OPENSSL_NO_SM2) && !defined(LIBRESSL_VERSION_NUMBER)
-
- # include
-
-diff --git a/src/srp.c b/src/srp.c
-index 85626b5..6fb0a50 100644
---- a/src/srp.c
-+++ b/src/srp.c
-@@ -1,6 +1,7 @@
- #include "openssl.h"
- #include "private.h"
-
-+#if !defined(LIBRESSL_VERSION_NUMBER)
- #include
- #include
-
-@@ -198,4 +199,4 @@ int luaopen_srp(lua_State *L)
- lua_settable(L, -3);
- return 1;
- }
--
-+#endif
-diff --git a/src/x509.c b/src/x509.c
-index 94e9982..07adb54 100644
---- a/src/x509.c
-+++ b/src/x509.c
-@@ -1196,7 +1196,7 @@ static int openssl_x509_extensions(lua_State* L)
- else
- {
- STACK_OF(X509_EXTENSION) *others = (STACK_OF(X509_EXTENSION) *)openssl_sk_x509_extension_fromtable(L, 2);
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- sk_X509_EXTENSION_pop_free(self->cert_info->extensions, X509_EXTENSION_free);
- self->cert_info->extensions = others;
- #else
---
-2.16.4
-
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index f82f9a526a0f..1c4340c53a71 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/moto/moto-1.3.14-r1.ebuild b/dev-python/moto/moto-1.3.14-r1.ebuild
index 71f3637af836..915c8ed2a58b 100644
--- a/dev-python/moto/moto-1.3.14-r1.ebuild
+++ b/dev-python/moto/moto-1.3.14-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild b/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
index 8d2ecb683814..295c1da3eca1 100644
--- a/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
+++ b/dev-python/python-sshpubkeys/python-sshpubkeys-3.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ojarva/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
RDEPEND="
dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch b/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch
deleted file mode 100644
index e1a760d4d464..000000000000
--- a/dev-python/reportlab/files/reportlab-3.5.13-disable-network-tests.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -r f52d1198146d tests/test_lib_utils.py
---- a/tests/test_lib_utils.py Tue Jan 15 16:06:40 2019 +0000
-+++ b/tests/test_lib_utils.py Sun Jan 27 10:21:29 2019 -0500
-@@ -112,7 +112,7 @@
- "test open and read of a relative file: URL"
- b = _rel_open_and_read('file:../docs/images/Edit_Prefs.gif')
-
-- def test9(self):
-+ def xtest9(self):
- "test open and read of an http: URL"
- from reportlab.lib.utils import open_and_read
- b = open_and_read('http://www.reportlab.com/rsrc/encryption.gif')
-diff -r f52d1198146d tests/test_platypus_general.py
---- a/tests/test_platypus_general.py Tue Jan 15 16:06:40 2019 +0000
-+++ b/tests/test_platypus_general.py Sun Jan 27 10:21:29 2019 -0500
-@@ -587,7 +587,7 @@
-
- class PlatypusTestCase(unittest.TestCase):
-
-- def test0(self):
-+ def xtest0(self):
- "Make a platypus document"
- run()
diff --git a/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch b/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch
deleted file mode 100644
index 3b2093d9a8c5..000000000000
--- a/dev-python/reportlab/files/reportlab-3.5.13-pillow-VERSION.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/reportlab/lib/utils.py
-+++ b/src/reportlab/lib/utils.py
-@@ -883,7 +883,13 @@
- im = self._image
- mode = self.mode = im.mode
- if mode in ('LA','RGBA'):
-- if Image.VERSION.startswith('1.1.7'): im.load()
-+ # Pillow 6.0.0 and above have removed the 'VERSION' attribute
-+ # https://bitbucket.org/rptlab/reportlab/issues/176/incompatibility-with-pillow-600
-+ try:
-+ im_ver = Image.__version__
-+ except AttributeError:
-+ im_ver = Image.VERSION
-+ if im_ver.startswith('1.1.7'): im.load()
- self._dataA = ImageReader(im.split()[3 if mode=='RGBA' else 1])
- nm = mode[:-1]
- im = im.convert(nm)
diff --git a/dev-python/yapf/yapf-0.30.0.ebuild b/dev-python/yapf/yapf-0.30.0.ebuild
index 24a461376faa..ca683033d50a 100644
--- a/dev-python/yapf/yapf-0.30.0.ebuild
+++ b/dev-python/yapf/yapf-0.30.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/google/yapf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
distutils_enable_tests setup.py
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 3973f89146cd..fdc6907ff22a 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index d75868258072..98c7d26ee6f5 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,3 @@
DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
-DIST qt-creator-opensource-src-4.12.0.tar.xz 32575196 BLAKE2B 193e10a790f35944473c2177ba84e6e15d00effc769b4d63a51a217e4da93a4d6ca0061976d0def31c625a73d49b0adcb40e551d02a70ab7225b40f441d9b6b6 SHA512 9c35ebf095c2874b89af54b06fd190976a27f7e753a23e47db3b26947bdba64e4fe7774ae8b252867cf7f6f0c86b35d773a4012cae6d4aaa9101d7a31973f215
+DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450
diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch b/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch
new file mode 100644
index 000000000000..0d4deb2c7956
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch
@@ -0,0 +1,84 @@
+From 1c5faa6dcf16135ee31252d13766d01536a69405 Mon Sep 17 00:00:00 2001
+From: Peter Levine
+Date: Tue, 5 May 2020 03:45:35 -0400
+Subject: [PATCH] Fix building against clang configured with
+ CLANG_LINK_CLANG_DYLIB
+
+LLVM/Clang upstream only officially supports building shared
+components as a single dynamic library (via
+LLVM_BUILD_LLVM_DYLIB=ON, CLANG_LINK_CLANG_DYLIB=ON, etc..).
+Linux distros like Fedora and Gentoo have followed suit.
+
+Unfortunately, QT-Creator's src/shared/clang/clang_installation.pri
+file assumes clang is built with separate component libraries
+and the build fails.
+
+This change alters the build to check for the existence
+of clang component libraries and, if found, link to them, or
+otherwise to libclang-cpp.
+
+Task-number: QTCREATORBUG-23172
+Change-Id: I17df5822d7aeb471227f21f2cf4a71871d6f9b86
+---
+ src/shared/clang/clang_installation.pri | 35 +++++++++++++++----------
+ 1 file changed, 21 insertions(+), 14 deletions(-)
+
+diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri
+index 08838838bca..c191c57f1c7 100644
+--- a/src/shared/clang/clang_installation.pri
++++ b/src/shared/clang/clang_installation.pri
+@@ -204,19 +204,6 @@ isEmpty(LLVM_VERSION) {
+ }
+ }
+
+- isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
+- CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
+- exists($$CLANGFORMAT_MAIN_HEADER) {
+- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
+- ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \
+- -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
+- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
+- -lclangASTMatchers -lclangAST -lclangLex -lclangBasic
+- win32:CLANGFORMAT_LIBS += -lversion
+- }
+- }
+- win32:ALL_CLANG_LIBS += -lversion
+-
+ LIBCLANG_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang-c/Index.h
+ !exists($$LIBCLANG_MAIN_HEADER) {
+ $$llvmWarningOrError(\
+@@ -237,10 +224,30 @@ isEmpty(LLVM_VERSION) {
+ LIBCLANG_LIBS += $${CLANG_LIB}
+
+ isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
++ CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
++ exists($$CLANGFORMAT_MAIN_HEADER) {
++ exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) {
++ CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
++ ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \
++ -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
++ -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
++ -lclangASTMatchers -lclangAST -lclangLex -lclangBasic
++ win32:CLANGFORMAT_LIBS += -lversion
++ win32:ALL_CLANG_LIBS += -lversion
++ } else {
++ CLANGFORMAT_LIBS=-lclang-cpp
++ ALL_CLANG_LIBS=-lclang-cpp
++ }
++ }
++
+ QTC_DISABLE_CLANG_REFACTORING=$$(QTC_DISABLE_CLANG_REFACTORING)
+ isEmpty(QTC_DISABLE_CLANG_REFACTORING) {
+ !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS = -L$${LLVM_LIBDIR}
+- LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS
++ exists($${LLVM_LIBDIR}/libclangTooling.so*)|exists($${LLVM_LIBDIR}/libclangTooling.dylib) {
++ LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS
++ } else {
++ LIBTOOLING_LIBS += -lclang-cpp $$LLVM_STATIC_LIBS
++ }
+ }
+ }
+
+--
+2.26.2
+
diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch b/dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch
new file mode 100644
index 000000000000..12c46c89ed0e
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-4.12.0-libclangformat-ide.patch
@@ -0,0 +1,64 @@
+--- a/src/plugins/clangformat/clangformatbaseindenter.h
++++ b/src/plugins/clangformat/clangformatbaseindenter.h
+@@ -27,7 +27,7 @@
+
+ #include
+
+-#include
++#include
+
+ namespace ClangFormat {
+
+--- a/src/plugins/clangformat/clangformatconfigwidget.cpp
++++ b/src/plugins/clangformat/clangformatconfigwidget.cpp
+@@ -32,7 +32,7 @@
+ #include "ui_clangformatchecks.h"
+ #include "ui_clangformatconfigwidget.h"
+
+-#include
++#include
+
+ #include
+ #include
+--- a/src/plugins/clangformat/clangformatplugin.cpp
++++ b/src/plugins/clangformat/clangformatplugin.cpp
+@@ -56,7 +56,7 @@
+ #include
+ #include
+
+-#include
++#include
+
+ #include
+
+--- a/src/plugins/clangformat/clangformatutils.h
++++ b/src/plugins/clangformat/clangformatutils.h
+@@ -27,7 +27,7 @@
+
+ #include
+ #include
+-#include
++#include
+
+ #include
+
+--- a/src/shared/clang/clang_installation.pri
++++ b/src/shared/clang/clang_installation.pri
+@@ -227,7 +227,7 @@
+ CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
+ exists($$CLANGFORMAT_MAIN_HEADER) {
+ exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib) {
+- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
++ CLANGFORMAT_LIBS=-lclangFormatIDE -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
+ ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \
+ -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \
+ -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \
+@@ -235,7 +235,7 @@
+ win32:CLANGFORMAT_LIBS += -lversion
+ win32:ALL_CLANG_LIBS += -lversion
+ } else {
+- CLANGFORMAT_LIBS=-lclang-cpp
++ CLANGFORMAT_LIBS=-lclangFormatIDE -lclang-cpp
+ ALL_CLANG_LIBS=-lclang-cpp
+ }
+ }
diff --git a/dev-qt/qt-creator/qt-creator-4.12.0.ebuild b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild
similarity index 81%
rename from dev-qt/qt-creator/qt-creator-4.12.0.ebuild
rename to dev-qt/qt-creator/qt-creator-4.12.3.ebuild
index a4ca520e9938..ff58c169e4e0 100644
--- a/dev-qt/qt-creator/qt-creator-4.12.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-LLVM_MAX_SLOT=9
+LLVM_MAX_SLOT=10
PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
inherit llvm qmake-utils virtualx xdg
@@ -20,32 +20,38 @@ else
MY_P=${PN}-opensource-src-${MY_PV}
[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
fi
-# TODO: unbundle sqlite and KSyntaxHighlighting
+# TODO: unbundle sqlite
QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt
'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
- cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios +lsp:languageclient
- mercurial modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager
- +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion
- valgrind winrt)
+ cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios
+ lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python
+ qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal
+ silversearcher subversion valgrind webassembly winrt)
IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
RESTRICT="!test? ( test )"
REQUIRED_USE="
- clang? ( test? ( qbs ) )
- qnx? ( remotelinux )
boot2qt? ( remotelinux )
+ clang? ( test? ( qbs ) )
+ mcu? ( cmake )
python? ( lsp )
+ qnx? ( remotelinux )
"
# minimum Qt version required
QT_PV="5.12.3:5"
+BDEPEND="
+ >=dev-qt/linguist-tools-${QT_PV}
+ virtual/pkgconfig
+ doc? ( >=dev-qt/qdoc-${QT_PV} )
+"
CDEPEND="
- >=dev-cpp/yaml-cpp-0.6.2
+ >=dev-cpp/yaml-cpp-0.6.2:=
>=dev-qt/qtconcurrent-${QT_PV}
>=dev-qt/qtcore-${QT_PV}
>=dev-qt/qtdeclarative-${QT_PV}[widgets]
@@ -59,7 +65,16 @@ CDEPEND="
>=dev-qt/qtwidgets-${QT_PV}
>=dev-qt/qtx11extras-${QT_PV}
>=dev-qt/qtxml-${QT_PV}
- clang? ( >=sys-devel/clang-9.0.1:= )
+ kde-frameworks/syntax-highlighting:5
+ clang? (
+ || (
+ ( sys-devel/clang:10
+ dev-libs/libclangformat-ide:10 )
+ ( sys-devel/clang:9
+ dev-libs/libclangformat-ide:9 )
+ )
+ =dev-qt/designer-${QT_PV} )
help? (
>=dev-qt/qthelp-${QT_PV}
@@ -71,9 +86,6 @@ CDEPEND="
systemd? ( sys-apps/systemd:= )
"
DEPEND="${CDEPEND}
- >=dev-qt/linguist-tools-${QT_PV}
- virtual/pkgconfig
- doc? ( >=dev-qt/qdoc-${QT_PV} )
test? (
>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
>=dev-qt/qtquickcontrols2-${QT_PV}
@@ -88,6 +100,7 @@ RDEPEND="${CDEPEND}
cvs? ( dev-vcs/cvs )
git? ( dev-vcs/git )
mercurial? ( dev-vcs/mercurial )
+ qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
silversearcher? ( sys-apps/the_silver_searcher )
subversion? ( dev-vcs/subversion )
valgrind? ( dev-util/valgrind )
@@ -99,6 +112,16 @@ for x in ${PLOCALES}; do
done
unset x
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch
+ "${FILESDIR}"/${PN}-4.12.0-libclangformat-ide.patch
+)
+
+llvm_check_deps() {
+ has_version -d "sys-devel/clang:${LLVM_SLOT}" && \
+ has_version -d "dev-libs/libclangformat-ide:${LLVM_SLOT}"
+}
+
pkg_setup() {
use clang && llvm_pkg_setup
}
@@ -131,8 +154,8 @@ src_prepare() {
sed -i -e '/modelinglib/d' src/libs/libs.pro || die
fi
if ! use perfprofiler; then
- rm -rf src/tools/perfparser || die
- if ! use qmlprofiler && ! use ctfvisualizer; then
+ rm -r src/tools/perfparser || die
+ if ! use ctfvisualizer && ! use qmlprofiler; then
sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
fi
fi
@@ -169,13 +192,21 @@ src_prepare() {
done
sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
+ # remove bundled syntax-highlighting
+ rm -r src/libs/3rdparty/syntax-highlighting || die
+
+ # remove bundled yaml-cpp
+ rm -r src/libs/3rdparty/yaml-cpp || die
+
# remove bundled qbs
- rm -rf src/shared/qbs || die
+ rm -r src/shared/qbs || die
}
src_configure() {
eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
IDE_PACKAGE_MODE=1 \
+ KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+ KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
CONFIG+=qbs_disable_rpath \
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index c6649849153f..ff58c169e4e0 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-LLVM_MAX_SLOT=8
+LLVM_MAX_SLOT=10
PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
inherit llvm qmake-utils virtualx xdg
@@ -20,11 +20,11 @@ else
MY_P=${PN}-opensource-src-${MY_PV}
[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
fi
-# TODO: unbundle sqlite, yaml-cpp, and KSyntaxHighlighting
+# TODO: unbundle sqlite
QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt
'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
@@ -45,7 +45,13 @@ REQUIRED_USE="
# minimum Qt version required
QT_PV="5.12.3:5"
+BDEPEND="
+ >=dev-qt/linguist-tools-${QT_PV}
+ virtual/pkgconfig
+ doc? ( >=dev-qt/qdoc-${QT_PV} )
+"
CDEPEND="
+ >=dev-cpp/yaml-cpp-0.6.2:=
>=dev-qt/qtconcurrent-${QT_PV}
>=dev-qt/qtcore-${QT_PV}
>=dev-qt/qtdeclarative-${QT_PV}[widgets]
@@ -59,7 +65,16 @@ CDEPEND="
>=dev-qt/qtwidgets-${QT_PV}
>=dev-qt/qtx11extras-${QT_PV}
>=dev-qt/qtxml-${QT_PV}
- clang? ( sys-devel/clang:8= )
+ kde-frameworks/syntax-highlighting:5
+ clang? (
+ || (
+ ( sys-devel/clang:10
+ dev-libs/libclangformat-ide:10 )
+ ( sys-devel/clang:9
+ dev-libs/libclangformat-ide:9 )
+ )
+ =dev-qt/designer-${QT_PV} )
help? (
>=dev-qt/qthelp-${QT_PV}
@@ -71,9 +86,6 @@ CDEPEND="
systemd? ( sys-apps/systemd:= )
"
DEPEND="${CDEPEND}
- >=dev-qt/linguist-tools-${QT_PV}
- virtual/pkgconfig
- doc? ( >=dev-qt/qdoc-${QT_PV} )
test? (
>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
>=dev-qt/qtquickcontrols2-${QT_PV}
@@ -88,6 +100,7 @@ RDEPEND="${CDEPEND}
cvs? ( dev-vcs/cvs )
git? ( dev-vcs/git )
mercurial? ( dev-vcs/mercurial )
+ qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
silversearcher? ( sys-apps/the_silver_searcher )
subversion? ( dev-vcs/subversion )
valgrind? ( dev-util/valgrind )
@@ -99,6 +112,16 @@ for x in ${PLOCALES}; do
done
unset x
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch
+ "${FILESDIR}"/${PN}-4.12.0-libclangformat-ide.patch
+)
+
+llvm_check_deps() {
+ has_version -d "sys-devel/clang:${LLVM_SLOT}" && \
+ has_version -d "dev-libs/libclangformat-ide:${LLVM_SLOT}"
+}
+
pkg_setup() {
use clang && llvm_pkg_setup
}
@@ -131,7 +154,7 @@ src_prepare() {
sed -i -e '/modelinglib/d' src/libs/libs.pro || die
fi
if ! use perfprofiler; then
- rm -rf src/tools/perfparser || die
+ rm -r src/tools/perfparser || die
if ! use ctfvisualizer && ! use qmlprofiler; then
sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
fi
@@ -169,13 +192,21 @@ src_prepare() {
done
sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
+ # remove bundled syntax-highlighting
+ rm -r src/libs/3rdparty/syntax-highlighting || die
+
+ # remove bundled yaml-cpp
+ rm -r src/libs/3rdparty/yaml-cpp || die
+
# remove bundled qbs
- rm -rf src/shared/qbs || die
+ rm -r src/shared/qbs || die
}
src_configure() {
eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
IDE_PACKAGE_MODE=1 \
+ KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+ KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
CONFIG+=qbs_disable_rpath \
diff --git a/dev-qt/qt-docs/Manifest b/dev-qt/qt-docs/Manifest
index f3b1fd5d9770..2090f2c741c8 100644
--- a/dev-qt/qt-docs/Manifest
+++ b/dev-qt/qt-docs/Manifest
@@ -31,6 +31,7 @@ DIST 5.14.2-0-202003291239qtquickcontrols-documentation.7z 9331828 BLAKE2B 08d52
DIST 5.14.2-0-202003291239qtquickcontrols1-documentation.7z 1961340 BLAKE2B 46b1795874e9e29019427259c502ddd644c5de6e985700416fff1494b199b6f518fca17e07168cb3de1a201a2754518c4055559442301254f2bd86e87b1c354f SHA512 bf715dffa72e0369faa159d67ba9bacf31154da382a87a031577729acf7caa51af55cbf2fb94ab529afbfaa5dd65f1a011ef8e52b8ce764dbfff037358d0f22c
DIST 5.14.2-0-202003291239qtquickdialogs-documentation.7z 183373 BLAKE2B e1b1d4ddb85ce48e9c744ce7566f1ec2789b2fcf03f65c2616fa63b2a7ccdabc0a2ab60811bc723f3e9aa4bfa304b04bcd5097b0e617dd4f8c72b19d499e2ee0 SHA512 18a0914c7d398fdeb065829e9f93f51efddb58c35e43962fc891a46538807ce7dad27644acd976886fbb441e8b9e35790f4ed1271546a155da38b9dcd803a027
DIST 5.14.2-0-202003291239qtquickextras-documentation.7z 673822 BLAKE2B d06bead9f468325f1457fd41d047797f3618322131e5fbc095c1a78e0926b020a5f3012f86f251c96d52e8d52b0d79c05f4639c19338d67f0e6de65901bb5af7 SHA512 d6fa5acb6558fc840d731da25d9061fe3dfa4e3bbb47354bc8760afe0431bcdbd1cb21491416d7773bb171108492b35e14d2f5df0fdf67e307e3ccd6fa0cc598
+DIST 5.14.2-0-202003291239qtquicktimeline-documentation.7z 149836 BLAKE2B 28cc7173aea37167a7aaada170bb0fa7fa378ddf270c6237836c47bf2b741aefd7f0454e33be4c089742644bb72b91f9aec1e00d54d837790b21349d1d66092b SHA512 b92c321d486a49a586569dd248cf9a6f49a5acb7806bd3ba60e1f29b85919d2ef79749cef644d9f53be5cb242ef9475bf1358e38bfb4bdaedb4b02f2f90de86c
DIST 5.14.2-0-202003291239qtscript-documentation.7z 601309 BLAKE2B 24b63ae7f20f60d5e2b2c1cbbc5dc47f3f19cc1bb0bc1dade609bcb0a253f483d49359a7b2f9f508936a8c3d22802907fdb64fcf388e4c6b42cb60c6b154f2d7 SHA512 8cbff7316c0b0f2dfd302b374bb78fb6b7f4f466e886299d9c2aa22097ff2b871e4a41bad2f4262c49b065e13892f1e155f1dd6aa179b9a9e898227bb0641d76
DIST 5.14.2-0-202003291239qtscripttools-documentation.7z 85919 BLAKE2B 9da6dfdc7bb18e4fbb6bad8326040e35e55ac8be556d8cc7e280b8fb481d56c9e26fa1f8bce4fa47acb0024bf622c2d46f99f5199cf0dd8412626c23f3b06767 SHA512 545e3b7cfe5fc2a76928e5c75866e350f2a80c7d47104171252e734e9d0c2966c4dae3100118730854f3de9bba7e1bc84167f60f44956730db0e0543a10819a8
DIST 5.14.2-0-202003291239qtscxml-documentation.7z 622979 BLAKE2B 6243b5dc2c17eb6c0727174f61327a7a687a0af6cdc99a27d6f3c796f29358873e2fdadc2384341bf4ebe57078ada9ba2e9633c64699a280c1dd148bff273f29 SHA512 19e836eda1e1f7d9dc278a2195309665a0962ba4ba339511a2060217751de5288e137139833dc6e5825a7a5914ec66f234ceb58497058ae183f57b663b7b9cd3
@@ -85,6 +86,7 @@ DIST 5.15.0-0-202005140838qtquickcontrols-documentation.7z 9346972 BLAKE2B d0085
DIST 5.15.0-0-202005140838qtquickcontrols1-documentation.7z 1956754 BLAKE2B 397c522177dd6f0617001ac19b4186063b6769e5f43f79d3e0106dc56b72081c2b7ce5ea8cb321cc21b56d1c1137da7c4616bb5fe670d0e2ee5d48633c58cd74 SHA512 18ae89bf4f06cd82ab1b2035cffa6836c2f44d5c279c24020e4120e6e61be468a1880d702adbcabcda42c944e0cba0206e87b927fdc3ddcfb271b86ef4adc924
DIST 5.15.0-0-202005140838qtquickdialogs-documentation.7z 182847 BLAKE2B d4f21132d5cf64495fcff0ef67b4d013cf2232c5e9def804e451fb23cf7637c79dcf4449fbf17ab29c424381b551c24878f0831f12222a31b8e5fb6aed03f0be SHA512 99238206e08daf62ce87361a8c80cdbabf0e08e84c7b517a8cabbdc569075f619e53e4fbdf57e02473ce69aa0aa30708fcfc354702153cb765c9c1b338d37710
DIST 5.15.0-0-202005140838qtquickextras-documentation.7z 672364 BLAKE2B 7ceda31a991583da626a37b99153c3fa96011d9c6cbedb7a5215ed630c35a981b05eea83b144c805bf8ce23205e24c9c283dd4e174942e1e238c7654dc17c2f0 SHA512 80cf53613b769baca47ef4dff59d02484da1299844473418909bc9050baac49ad502ee11071977defea636da4a550c9023484317c8f1f9ab4c309a986a49e57c
+DIST 5.15.0-0-202005140838qtquicktimeline-documentation.7z 149475 BLAKE2B 3bb26c0600d3ec05394a9a42a7f3c78b0f149158469a42a18010bc1e9d8025d335045360c5e14996b2ed5a56b3fdddb5fe3924fe8f7b6ee5f62f55a3df87674a SHA512 24de8a2535398796f39a11a5cbc8551920a9f7befc255f54de58ef5c54d5ebc7c5bde203e503ccc56ffa9a39021ab4fc4f8c927d6d812d9a592bdd2467e1b842
DIST 5.15.0-0-202005140838qtscript-documentation.7z 598991 BLAKE2B c0884b13cac91c18de7b281f8bc8885bec318669c4f2ab33ce6e11b77ebd8638b2d93a62d816051a449b84491fea0097eeb6e0b704aeb949e4301e4cc1825205 SHA512 5dd47de26a0f6b865482a01c5a498611f8daecc727b1183b5370345c0cdc60c8858a3662ffa558c824dea42a2978ae56ac05357306ff1d65ab106c69bb16b943
DIST 5.15.0-0-202005140838qtscripttools-documentation.7z 85666 BLAKE2B 811ebe15745781c62bfecac034dba7abbdcb5156c1bc9e214810b65fd7df1cebb53b17b31277f65134664becbf218aee2eff3b4a04937bc60c50bcff7381ba6e SHA512 9bb9f3fe7d19ea9eaafe94ed13446fc55310f209aaa69cf56bd44f8cc77fa81277836bf32ad0d23311c2e4431773d6361ff0d19fdee4ba4fcfc6b306501a7a0c
DIST 5.15.0-0-202005140838qtscxml-documentation.7z 618965 BLAKE2B 189b2986fe8264fe7c3b72519540fbdc4ff019e93a374aa623f4175bf6aeb7019ff783b22f0f675af076c6d81facd35530a6a119e0880d66c64bcdbd983ad5e9 SHA512 14de1ef2607a8d93fc8ed1a0392911113373ed1aa5bc2fdbc06312a74c46effe7c0f18d028f02a0e557dfe5be95fd8791302676be13bcc5a5c1cfeb8d9d47ad1
diff --git a/dev-qt/qt-docs/metadata.xml b/dev-qt/qt-docs/metadata.xml
index 37201cd0276d..af49c1ea8e0e 100644
--- a/dev-qt/qt-docs/metadata.xml
+++ b/dev-qt/qt-docs/metadata.xml
@@ -39,6 +39,7 @@
Install documentation for dev-qt/qtserialport
Install documentation for dev-qt/qtspeech
Install documentation for dev-qt/qtsql
+ Install documentation for dev-qt/qtquicktimeline
Install documentation for dev-qt/qtvirtualkeyboard
Install documentation for dev-qt/qtwebchannel
Install documentation for dev-qt/qtwebengine
diff --git a/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild b/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild
new file mode 100644
index 000000000000..9014281d55fc
--- /dev/null
+++ b/dev-qt/qt-docs/qt-docs-5.14.2_p202003291239-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PV_FULL=${PV/_p/-0-}
+PV_NODOTS=$(ver_rs 1-3 '' ${PV%_p*})
+BASE_URI="https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_${PV_NODOTS}_src_doc_examples/qt.qt5.${PV_NODOTS}.doc"
+
+declare -A QT5_DOCS=(
+ [3d]="qt3d"
+ [assistant]="qtassistant"
+ [bluetooth]="qtbluetooth"
+ [concurrent]="qtconcurrent"
+ [core]="qtcore qmake qtdoc"
+ [dbus]="qtdbus"
+ [declarative]="qtqml qtqmltest qtquick qtquickdialogs qtquickextras"
+ [designer]="qtdesigner qtuitools"
+ [gamepad]="qtgamepad"
+ [graphicaleffects]="qtgraphicaleffects"
+ [gui]="qtgui qtplatformheaders"
+ [help]="qthelp"
+ [imageformats]="qtimageformats"
+ [linguist]="qtlinguist"
+ [location]="qtlocation"
+ [multimedia]="qtmultimedia"
+ [network]="qtnetwork"
+ [opengl]="qtopengl"
+ [positioning]="qtpositioning"
+ [printsupport]="qtprintsupport"
+ [qdoc]="qdoc"
+ [quickcontrols2]="qtquickcontrols"
+ [quickcontrols]="qtquickcontrols1"
+ [scxml]="qtscxml"
+ [sensors]="qtsensors"
+ [serialbus]="qtserialbus"
+ [serialport]="qtserialport"
+ [speech]="qtspeech"
+ [sql]="qtsql"
+ [svg]="qtsvg"
+ [test]="qttestlib"
+ [wayland]="qtwaylandcompositor"
+ [webchannel]="qtwebchannel"
+ [websockets]="qtwebsockets"
+ [webview]="qtwebview"
+ [widgets]="qtwidgets"
+ [x11extras]="qtx11extras"
+ [xml]="qtxml"
+ [xmlpatterns]="qtxmlpatterns"
+)
+
+DESCRIPTION="Qt5 documentation, for use with Qt Creator and other tools"
+HOMEPAGE="https://doc.qt.io/"
+
+LICENSE="FDL-1.3"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+IUSE="charts datavis +html networkauth +qch script timeline virtualkeyboard webengine"
+REQUIRED_USE="|| ( html qch )"
+
+SRC_URI="
+ charts? ( ${BASE_URI}.qtcharts/${PV_FULL}qtcharts-documentation.7z )
+ datavis? ( ${BASE_URI}.qtdatavis3d/${PV_FULL}qtdatavisualization-documentation.7z )
+ networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
+ script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
+ ${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
+ timeline? ( ${BASE_URI}.qtquicktimeline/${PV_FULL}qtquicktimeline-documentation.7z )
+ virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
+ webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
+"
+
+for DOCUSE in ${!QT5_DOCS[@]}; do
+ IUSE+=" +${DOCUSE}"
+ for DOCTAR in ${QT5_DOCS[${DOCUSE}]}; do
+ SRC_URI+=" ${DOCUSE}? ( ${BASE_URI}/${PV_FULL}${DOCTAR}-documentation.7z )"
+ done
+done
+unset DOCTAR DOCUSE
+
+BDEPEND="
+ app-arch/p7zip
+ media-libs/libpng:0
+"
+
+S=${WORKDIR}/Docs/Qt-${PV%_p*}
+
+src_prepare() {
+ default
+
+ # Fix broken png file, bug 679146
+ local png=qtdoc/images/used-in-examples/demos/tweetsearch/content/resources/anonymous.png
+ pngfix -q --out=${png/.png/fixed.png} ${png} # see pngfix help for exit codes
+ [[ $? -gt 15 ]] && die "Failed to fix ${png}"
+ mv -f ${png/.png/fixed.png} ${png} || die
+}
+
+src_install() {
+ # must be the same as QT5_DOCDIR
+ insinto /usr/share/qt5-doc
+ use html && doins -r */
+ use qch && doins *.qch
+}
diff --git a/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild b/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild
index 466a8de3c9dc..9014281d55fc 100644
--- a/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild
+++ b/dev-qt/qt-docs/qt-docs-5.15.0_p202005140838.ebuild
@@ -56,7 +56,7 @@ LICENSE="FDL-1.3"
SLOT="5"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="charts datavis +html networkauth +qch script virtualkeyboard webengine"
+IUSE="charts datavis +html networkauth +qch script timeline virtualkeyboard webengine"
REQUIRED_USE="|| ( html qch )"
SRC_URI="
@@ -65,6 +65,7 @@ SRC_URI="
networkauth? ( ${BASE_URI}.qtnetworkauth/${PV_FULL}qtnetworkauth-documentation.7z )
script? ( ${BASE_URI}.qtscript/${PV_FULL}qtscript-documentation.7z
${BASE_URI}.qtscript/${PV_FULL}qtscripttools-documentation.7z )
+ timeline? ( ${BASE_URI}.qtquicktimeline/${PV_FULL}qtquicktimeline-documentation.7z )
virtualkeyboard? ( ${BASE_URI}.qtvirtualkeyboard/${PV_FULL}qtvirtualkeyboard-documentation.7z )
webengine? ( ${BASE_URI}.qtwebengine/${PV_FULL}qtwebengine-documentation.7z )
"
diff --git a/dev-qt/qtquicktimeline/Manifest b/dev-qt/qtquicktimeline/Manifest
new file mode 100644
index 000000000000..28374971a941
--- /dev/null
+++ b/dev-qt/qtquicktimeline/Manifest
@@ -0,0 +1 @@
+DIST qtquicktimeline-everywhere-src-5.15.0.tar.xz 102460 BLAKE2B f563ba5ab8ec1171e32a85422529a9e4e14833377091f3bd66d3f72b14671acc74db9dd11f3d56719921bb516ead885ce6cf994f8b00ea6a734a0f7b9371c451 SHA512 14e0f52800bf7b347f03264f306f2c13f4c0bf590c8881135b3bfeb1a08cd07248345de7ab7d3ae9af39f75a5247c0c9f98dde33466481995e45a93717a937b0
diff --git a/dev-qt/qtquicktimeline/metadata.xml b/dev-qt/qtquicktimeline/metadata.xml
new file mode 100644
index 000000000000..c3b4f7735310
--- /dev/null
+++ b/dev-qt/qtquicktimeline/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ qt@gentoo.org
+ Gentoo Qt Project
+
+
+ https://bugreports.qt.io/
+ https://doc.qt.io/qt-5/qtquicktimeline-index.html
+
+
diff --git a/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild
new file mode 100644
index 000000000000..109d4654f8ba
--- /dev/null
+++ b/dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit qt5-build
+
+DESCRIPTION="Qt module for keyframe-based timeline construction"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DEPEND="
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtdeclarative-${PV}
+ ~dev-qt/qtgui-${PV}
+"
+
+RDEPEND="${DEPEND}"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 4f20ded037e3..79fa810b6831 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/dejagnu/dejagnu-1.6.2.ebuild b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
index 59b1ec7bb617..ab640bdfb782 100644
--- a/dev-util/dejagnu/dejagnu-1.6.2.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND="dev-lang/tcl
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
index d75ee7472c59..c6c31a235060 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.5.2.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="PHP plugin for KDevelop"
HOMEPAGE="https://www.kdevelop.org/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-2 LGPL-2"
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
index 1651d8f19a9d..4d844c56f1fd 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.5.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Python plugin for KDevelop"
HOMEPAGE="https://www.kdevelop.org/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="~amd64 x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="GPL-2" # TODO: CHECK
diff --git a/dev-util/kdevelop/kdevelop-5.5.2.ebuild b/dev-util/kdevelop/kdevelop-5.5.2.ebuild
index 33d9fa02191f..18f5ab2c9edd 100644
--- a/dev-util/kdevelop/kdevelop-5.5.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.5.2.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and mu
HOMEPAGE="https://www.kdevelop.org/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- KEYWORDS="~amd64 ~arm64 x86"
+ KEYWORDS="amd64 ~arm64 x86"
fi
LICENSE="GPL-2 LGPL-2"
diff --git a/dev-util/rt-tests/rt-tests-1.8.ebuild b/dev-util/rt-tests/rt-tests-1.8.ebuild
index 994e2f56115f..f94e433d66c0 100644
--- a/dev-util/rt-tests/rt-tests-1.8.ebuild
+++ b/dev-util/rt-tests/rt-tests-1.8.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{6..8} )
-inherit python-single-r1
+inherit python-single-r1 toolchain-funcs
DESCRIPTION="A collection of latency testing tools for the linux(-rt) kernel"
HOMEPAGE="https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/about/"
@@ -27,6 +27,10 @@ src_prepare() {
use elibc_musl && eapply "${FILESDIR}/${P}-musl.patch"
}
+src_compile() {
+ emake CC="$(tc-getCC)" AR="$(tc-getAR)"
+}
+
src_install() {
emake prefix=/usr DESTDIR="${D}" MAN_COMPRESSION=none install
python_fix_shebang "${ED}"
diff --git a/dev-util/source-highlight/source-highlight-3.1.9.ebuild b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
index ab8887fee35b..2792f93247fa 100644
--- a/dev-util/source-highlight/source-highlight-3.1.9.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
SLOT="0"
IUSE="doc static-libs"
diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
index 105da8e53ea0..6f0275625128 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="+introspection static-libs test"
RESTRICT="!test? ( test )"
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 984fb578ed8b..842c37e5eec3 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/usolitaire/Manifest b/games-misc/usolitaire/Manifest
new file mode 100644
index 000000000000..1d39f83de1ed
--- /dev/null
+++ b/games-misc/usolitaire/Manifest
@@ -0,0 +1 @@
+DIST usolitaire-0.2.1.tar.gz 118199 BLAKE2B 99b828d8aeb91897f5d070250a20c1a5f9b49b3be889781dcc3f2348e8f4946fde3ad07d915d87cbd309b2fa6b87777ab8ecd1bfaf65d76bc6989e36a0263785 SHA512 5bd7b222643e2decfc6e1f7749b8632bb0b99f5af28d49088f28746b8ffbd07443855b557e969f40f427ca71f8d2ac9386d8d90c2121880eb8bce5e3b5d4f4f4
diff --git a/games-misc/usolitaire/metadata.xml b/games-misc/usolitaire/metadata.xml
new file mode 100644
index 000000000000..b09023bbc390
--- /dev/null
+++ b/games-misc/usolitaire/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ monsieurp@gentoo.org
+ Patrice Clement
+
+
+ shell-tools@gentoo.org
+ Gentoo Shell Tools Project
+
+
diff --git a/games-misc/usolitaire/usolitaire-0.2.1.ebuild b/games-misc/usolitaire/usolitaire-0.2.1.ebuild
new file mode 100644
index 000000000000..84f9ac2b0bbd
--- /dev/null
+++ b/games-misc/usolitaire/usolitaire-0.2.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="solitaire in your terminal"
+HOMEPAGE="https://github.com/eliasdorneles/usolitaire"
+SRC_URI="https://github.com/eliasdorneles/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-python/urwid[${PYTHON_USEDEP}]"
+
+DEPEND="
+ ${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index afd21bbd9d99..1a9a59450942 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/libksysguard/libksysguard-5.19.2.ebuild b/kde-plasma/libksysguard/libksysguard-5.19.2.ebuild
index 2b31297bb630..83ecb2162325 100644
--- a/kde-plasma/libksysguard/libksysguard-5.19.2.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.19.2.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Task management and system monitoring library"
LICENSE="LGPL-2+"
SLOT="5/9"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="minimal webengine X"
+IUSE="webengine X"
RDEPEND="
>=dev-qt/qtdbus-${QTMIN}:5
diff --git a/licenses/ATOK b/licenses/ATOK
deleted file mode 100644
index cba37268a268..000000000000
--- a/licenses/ATOK
+++ /dev/null
@@ -1,3 +0,0 @@
-ATOK for Linux is copyrighted by Justsystem Corporation.
-Please read /opt/atokx2/doc/information/license.html before
-using it.
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 5d13da32cd10..fe812d981c95 100644
Binary files a/licenses/Manifest.gz and b/licenses/Manifest.gz differ
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 32e9114dd728..eb826c948527 100644
Binary files a/mail-client/Manifest.gz and b/mail-client/Manifest.gz differ
diff --git a/mail-client/alpine/alpine-2.23.ebuild b/mail-client/alpine/alpine-2.23.ebuild
index a3563213e20a..c2e943c37638 100644
--- a/mail-client/alpine/alpine-2.23.ebuild
+++ b/mail-client/alpine/alpine-2.23.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://alpine.x10host.com/alpine/release/src/${P}.tar.xz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="+chappa doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads"
DEPEND=">=sys-libs/ncurses-5.1:0=
diff --git a/mail-client/mutt/mutt-1.14.4-r1.ebuild b/mail-client/mutt/mutt-1.14.4-r1.ebuild
index 65056ee741dd..5ca782116a8d 100644
--- a/mail-client/mutt/mutt-1.14.4-r1.ebuild
+++ b/mail-client/mutt/mutt-1.14.4-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
autocrypt? ( gpgme )"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# yes, we overdepend on the backend impls here, hopefully one day we can
# have REQUIRED_USE do what it is made for again. bug #607360
CDEPEND="
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 13a2e7569a47..ed9669c501ef 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index f73b18199f44..1ba63b659607 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -5,8 +5,10 @@ EAPI=6
PYTHON_COMPAT=( python3_{6,7,8} )
GNOME2_EAUTORECONF=yes
+VALA_MIN_API_VERSION="0.40"
+VALA_USE_DEPEND=vapigen
-inherit autotools git-r3 gnome2 python-single-r1 virtualx
+inherit autotools git-r3 gnome2 python-single-r1 vala virtualx
DESCRIPTION="GNU Image Manipulation Program"
HOMEPAGE="https://www.gimp.org/"
@@ -29,16 +31,16 @@ COMMON_DEPEND="
>=app-text/poppler-0.69[cairo]
>=app-text/poppler-data-0.4.9
>=dev-libs/atk-2.4.0
- >=dev-libs/glib-2.56.0:2
+ >=dev-libs/glib-2.56.2:2
>=dev-libs/json-glib-1.2.6
dev-libs/libxml2
dev-libs/libxslt
>=gnome-base/librsvg-2.40.6:2
>=media-gfx/mypaint-brushes-1.3.0
- >=media-libs/babl-0.1.74[introspection]
+ >=media-libs/babl-0.1.78[introspection,lcms,vala]
>=media-libs/fontconfig-2.12.4
>=media-libs/freetype-2.1.7
- >=media-libs/gegl-0.4.20:0.4[cairo,introspection]
+ >=media-libs/gegl-0.4.24:0.4[cairo,introspection,lcms,vala]
>=media-libs/gexiv2-0.10.6
>=media-libs/harfbuzz-0.9.19
>=media-libs/lcms-2.8:2
@@ -99,6 +101,7 @@ DEPEND="
>=dev-util/gtk-doc-1.0
dev-util/gtk-doc-am
)
+ $(vala_depend)
"
DOCS=( "AUTHORS" "HACKING" "NEWS" "README" "README.i18n" )
@@ -125,6 +128,8 @@ src_prepare() {
gnome2_src_prepare # calls eautoreconf
+ vala_src_prepare
+
sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144
fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test
}
@@ -156,6 +161,7 @@ src_configure() {
--with-appdata-test
--with-bug-report-url=https://bugs.gentoo.org/
--with-xmc
+ --with-vala
--without-libbacktrace
--without-webkit
--without-xvfb-run
diff --git a/media-gfx/netpaint/Manifest b/media-gfx/netpaint/Manifest
new file mode 100644
index 000000000000..d0d25bc2d29b
--- /dev/null
+++ b/media-gfx/netpaint/Manifest
@@ -0,0 +1 @@
+DIST netpaint-1.1.2.tar.gz 427241 BLAKE2B 7884dadf63849bf45caf84bc009da818bdf3277660411c486b32333bf0caf9e0e03ab6f56f77add68456896e4d16520b803c51e19c4dc6b01ef1227f0bd90a28 SHA512 f998714fe176c84074aaa710e2950c83d5c3ac0819e69c6bbbd93e19f6415a66f8ef21e0799d3112a7c468c1a99383a878ac1837157b079089aaf072c664ee53
diff --git a/media-gfx/netpaint/metadata.xml b/media-gfx/netpaint/metadata.xml
new file mode 100644
index 000000000000..b09023bbc390
--- /dev/null
+++ b/media-gfx/netpaint/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ monsieurp@gentoo.org
+ Patrice Clement
+
+
+ shell-tools@gentoo.org
+ Gentoo Shell Tools Project
+
+
diff --git a/media-gfx/netpaint/netpaint-1.1.2.ebuild b/media-gfx/netpaint/netpaint-1.1.2.ebuild
new file mode 100644
index 000000000000..36c3bcd4fe2a
--- /dev/null
+++ b/media-gfx/netpaint/netpaint-1.1.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="curses-based drawing tool"
+HOMEPAGE="https://github.com/SyntheticDreams/NetPaint"
+SRC_URI="https://github.com/SyntheticDreams/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+MY_PN="NetPaint"
+MY_P="${MY_PN}-${PV}"
+
+RDEPEND="
+ dev-python/urwid[${PYTHON_USEDEP}]
+ dev-python/pillow[${PYTHON_USEDEP}]"
+
+DEPEND="
+ ${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ mv netpaint.py netpaint || die
+ sed -e 's#netpaint\.py#netpaint#g;' \
+ -i setup.py || die "can't patch setup.py"
+}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 98c2b014d136..6b0d3a04829b 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/babl/babl-0.1.66-r1.ebuild b/media-libs/babl/babl-0.1.66-r1.ebuild
new file mode 100644
index 000000000000..5f6ba2b9f668
--- /dev/null
+++ b/media-libs/babl/babl-0.1.66-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == *9999* ]]; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
+ SRC_URI=""
+else
+ SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="http://www.gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="altivec lcms cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c"
+
+RDEPEND="lcms? ( >=media-libs/lcms-2.8:2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+ [[ ${PV} == *9999* ]] && eautoreconf
+}
+
+src_configure() {
+ # Automagic rsvg support is just for website generation we do not call,
+ # so we don't need to fix it
+ # w3m is used for dist target thus no issue for us that it is automagically
+ # detected
+ econf \
+ --disable-docs \
+ --disable-static \
+ --disable-maintainer-mode \
+ $(use_enable altivec) \
+ $(use_enable cpu_flags_x86_f16c f16c) \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable cpu_flags_x86_sse2 sse2) \
+ $(use_enable cpu_flags_x86_sse3 sse3) \
+ $(use_enable cpu_flags_x86_sse4_1 sse4_1) \
+ $(use_with lcms)
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/media-libs/babl/babl-0.1.74-r1.ebuild b/media-libs/babl/babl-0.1.74-r1.ebuild
new file mode 100644
index 000000000000..16fe9b5de136
--- /dev/null
+++ b/media-libs/babl/babl-0.1.74-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/babl.git"
+ SRC_URI=""
+else
+ SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A dynamic, any to any, pixel format conversion library"
+HOMEPAGE="http://www.gegl.org/babl/"
+
+LICENSE="LGPL-3"
+SLOT="0"
+IUSE="introspection lcms cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+ lcms? ( >=media-libs/lcms-2.8:2 )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ # Automagic rsvg support is just for website generation we do not call,
+ # so we don't need to fix it
+ # w3m is used for dist target thus no issue for us that it is automagically
+ # detected
+ local emesonargs=(
+ -Dwith-docs=false
+ $(meson_use introspection enable-gir)
+ $(meson_use lcms with-lcms)
+ $(meson_use cpu_flags_x86_avx2 enable-avx2)
+ $(meson_use cpu_flags_x86_f16c enable-f16c)
+ $(meson_use cpu_flags_x86_mmx enable-mmx)
+ $(meson_use cpu_flags_x86_sse enable-sse)
+ $(meson_use cpu_flags_x86_sse2 enable-sse2)
+ $(meson_use cpu_flags_x86_sse3 enable-sse3)
+ $(meson_use cpu_flags_x86_sse4_1 enable-sse4_1)
+ )
+ meson_src_configure
+}
diff --git a/media-libs/babl/babl-9999.ebuild b/media-libs/babl/babl-9999.ebuild
index e31e4dbc6a4d..be6f45add6b0 100644
--- a/media-libs/babl/babl-9999.ebuild
+++ b/media-libs/babl/babl-9999.ebuild
@@ -3,7 +3,9 @@
EAPI=7
-inherit meson
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils vala
if [[ ${PV} == *9999* ]]; then
inherit git-r3
@@ -19,12 +21,25 @@ HOMEPAGE="http://www.gegl.org/babl/"
LICENSE="LGPL-3"
SLOT="0"
-IUSE="introspection lcms cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
+IUSE="introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
+REQUIRED_USE="vala? ( introspection )"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="lcms? ( media-libs/lcms:2 )"
+BDEPEND="
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+RDEPEND="
+ introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+ lcms? ( >=media-libs/lcms-2.8:2 )
+"
DEPEND="${RDEPEND}"
+src_prepare() {
+ default
+ gnome2_environment_reset
+ use vala && vala_src_prepare
+}
+
src_configure() {
# Automagic rsvg support is just for website generation we do not call,
# so we don't need to fix it
@@ -34,6 +49,7 @@ src_configure() {
-Dwith-docs=false
$(meson_use introspection enable-gir)
$(meson_use lcms with-lcms)
+ $(meson_use vala enable-vapi)
$(meson_use cpu_flags_x86_avx2 enable-avx2)
$(meson_use cpu_flags_x86_f16c enable-f16c)
$(meson_use cpu_flags_x86_mmx enable-mmx)
diff --git a/media-libs/gegl/files/gegl-0.3.34-failing-tests.patch b/media-libs/gegl/files/gegl-0.3.34-failing-tests.patch
new file mode 100644
index 000000000000..c388ac556e9b
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.3.34-failing-tests.patch
@@ -0,0 +1,27 @@
+diff -Naur a/tests/ff-load-save/Makefile.am b/tests/ff-load-save/Makefile.am
+--- a/tests/ff-load-save/Makefile.am 2017-09-21 22:11:00.000000000 +0300
++++ b/tests/ff-load-save/Makefile.am 2020-03-07 16:33:21.000000000 +0300
+@@ -6,13 +6,7 @@
+
+ EXTRA_DIST = $(TESTS)
+
+-check: vids images
+-
+-images:
+- for a in *.avi *.mp4 *.ogv ;do \
+- GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/gegl-video \
+- $$a -s 74 -e 74 -of $$a- ;\
+- done
++check: vids
+
+ vids: $(TESTS) $(top_builddir)/examples/frame-counter
+ GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/frame-counter \
+@@ -27,8 +21,6 @@
+ --video-codec mpeg4 --fps 12 --video-bit-rate 128 128kb-12fps.mp4
+ GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/frame-counter \
+ --video-codec mpeg4 --fps 100 --video-bit-rate 128 128kb-100fps.mp4
+- GEGL_PATH=$(top_builddir)/operations $(top_builddir)/examples/frame-counter \
+- --fps 28 --video-bit-rate 512 512kb-28fps.ogv
+
+ clean-local:
+ rm -f *.png *.avi *.ogv *.mp4 *.webm
diff --git a/media-libs/gegl/files/gegl-0.3.34-fno-common.patch b/media-libs/gegl/files/gegl-0.3.34-fno-common.patch
new file mode 100644
index 000000000000..8c1c045758b4
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.3.34-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/gcut/gcut.h
++++ b/gcut/gcut.h
+@@ -172,7 +172,7 @@
+ GMutex mutex;
+ };
+
+-struct _GeglEDL
++extern struct _GeglEDL
+ {
+ GFileMonitor *monitor;
+ char *path;
diff --git a/media-libs/gegl/gegl-0.3.34-r1.ebuild b/media-libs/gegl/gegl-0.3.34-r1.ebuild
new file mode 100644
index 000000000000..8abaed16a8d8
--- /dev/null
+++ b/media-libs/gegl/gegl-0.3.34-r1.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2-utils eutils autotools python-any-r1 vala
+
+SRC_URI="http://download.gimp.org/pub/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0.3"
+
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+ svg? ( cairo )
+ test? ( introspection )
+ vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+# so there is no chance to support libav right now (Gentoo bug #567638)
+# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ dev-libs/json-glib
+ >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?]
+ sys-libs/zlib
+ >=x11-libs/gdk-pixbuf-2.32:2
+ x11-libs/pango
+
+ cairo? ( >=x11-libs/cairo-1.12.2 )
+ ffmpeg? ( >=media-video/ffmpeg-2.8:0= )
+ introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+ virtual/jpeg:0=
+ lcms? ( >=media-libs/lcms-2.8:2 )
+ lensfun? ( >=media-libs/lensfun-0.2.5 )
+ openexr? ( >=media-libs/openexr-1.6.1:= )
+ >=media-libs/libpng-1.6.0:0=
+ raw? ( >=media-libs/libraw-0.15.4:0= )
+ sdl? ( >=media-libs/libsdl-1.2.0 )
+ svg? ( >=gnome-base/librsvg-2.40.6:2 )
+ tiff? ( >=media-libs/tiff-4:0 )
+ umfpack? ( sci-libs/umfpack )
+ v4l? ( >=media-libs/libv4l-1.0.1 )
+ webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+ dev-lang/perl
+ >=dev-util/gtk-doc-am-1
+ >=sys-devel/gettext-0.19.8
+ >=sys-devel/libtool-2.2
+ virtual/pkgconfig
+ test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
+ vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+ use test && use introspection && python-any-r1_pkg_setup
+}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+ "${FILESDIR}"/${PN}-0.3.34-failing-tests.patch # bug 631930, 686202
+ "${FILESDIR}"/${PN}-0.3.34-fno-common.patch # bug 719198
+ "${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-1.patch # bug 654172
+ "${FILESDIR}"/${PN}-0.4.0-ffmpeg-4-0-compat-2.patch # bug 654172
+)
+
+src_prepare() {
+ default
+
+ # FIXME: the following should be proper patch sent to upstream
+ # fix OSX loadable module filename extension
+ sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+ # don't require Apple's OpenCL on versions of OSX that don't have it
+ if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+ sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+ fi
+
+ # commit 7c78497b : tests that use gegl.png are broken on non-amd64
+ sed -e '/clones.xml/d' \
+ -e '/composite-transform.xml/d' \
+ -i tests/compositions/Makefile.am || die
+
+ eautoreconf
+
+ gnome2_environment_reset
+
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ # never enable altering of CFLAGS via profile option
+ # libspiro: not in portage main tree
+ # disable documentation as the generating is bit automagic
+ # if anyone wants to work on it just create bug with patch
+
+ # Also please note that:
+ #
+ # - Some auto-detections are not patched away since the docs are
+ # not built (--disable-docs, lack of --enable-gtk-doc) and these
+ # tools affect re-generation of docs, only
+ # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+ #
+ # - Parameter --with-exiv2 compiles a noinst-app only, no use
+ #
+ # - Parameter --disable-workshop disables any use of Lua, effectivly
+ #
+ # - v4l support does not work with our media-libs/libv4l-0.8.9,
+ # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+ #
+ # - There are two checks for dot, one controllable by --with(out)-graphviz
+ # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
+ #
+ # - mrg is not in tree and gexiv2 support only has effect when mrg support
+ # is enabled
+ #
+ # So that's why USE="exif graphviz lua v4l" got resolved. More at:
+ # https://bugs.gentoo.org/show_bug.cgi?id=451136
+ #
+ econf \
+ --disable-docs \
+ --disable-profile \
+ --disable-workshop \
+ --program-suffix=-${SLOT} \
+ --with-gdk-pixbuf \
+ --with-pango \
+ --without-exiv2 \
+ --without-gexiv2 \
+ --without-graphviz \
+ --without-jasper \
+ --without-libspiro \
+ --without-lua \
+ --without-mrg \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable debug) \
+ $(use_with cairo) \
+ $(use_with cairo pangocairo) \
+ $(use_with ffmpeg libavformat) \
+ $(use_with lcms) \
+ $(use_with lensfun) \
+ $(use_with openexr) \
+ $(use_with raw libraw) \
+ $(use_with sdl) \
+ $(use_with svg librsvg) \
+ $(use_with tiff libtiff) \
+ $(use_with umfpack) \
+ $(use_with v4l libv4l) \
+ $(use_with v4l libv4l2) \
+ $(use_enable introspection) \
+ $(use_with vala) \
+ $(use_with webp)
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gegl/gegl-0.4.16-r1.ebuild b/media-libs/gegl/gegl-0.4.16-r1.ebuild
new file mode 100644
index 000000000000..fe4898d8fc2a
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.16-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit autotools gnome2-utils python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+ SRC_URI=""
+else
+ SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+REQUIRED_USE="
+ svg? ( cairo )
+ test? ( introspection )
+ vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+# so there is no chance to support libav right now (Gentoo bug #567638)
+# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ dev-libs/json-glib
+ >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?]
+ >=media-libs/libpng-1.6.0:0=
+ virtual/jpeg:0=
+ >=x11-libs/gdk-pixbuf-2.32:2
+ x11-libs/pango
+ cairo? ( >=x11-libs/cairo-1.12.2 )
+ ffmpeg? ( media-video/ffmpeg:0= )
+ introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+ lcms? ( >=media-libs/lcms-2.8:2 )
+ lensfun? ( >=media-libs/lensfun-0.2.5 )
+ openexr? ( >=media-libs/openexr-2.2.0:= )
+ pdf? ( >=app-text/poppler-0.71.0[cairo] )
+ raw? ( >=media-libs/libraw-0.15.4:0= )
+ sdl? ( >=media-libs/libsdl-1.2.0 )
+ svg? ( >=gnome-base/librsvg-2.40.6:2 )
+ tiff? ( >=media-libs/tiff-4:0 )
+ umfpack? ( sci-libs/umfpack )
+ v4l? ( >=media-libs/libv4l-1.0.1 )
+ webp? ( >=media-libs/libwebp-0.5.0:= )
+ zlib? ( >=sys-libs/zlib-1.2.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/perl
+ >=dev-util/gtk-doc-am-1
+ >=sys-devel/gettext-0.19.8
+ >=sys-devel/libtool-2.2
+ virtual/pkgconfig
+ test? ( ffmpeg? ( media-libs/gexiv2 )
+ $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]')
+ )
+ vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.3.12-failing-tests.patch"
+)
+
+pkg_setup() {
+ use test && use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # FIXME: the following should be proper patch sent to upstream
+ # fix OSX loadable module filename extension
+ sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+ # don't require Apple's OpenCL on versions of OSX that don't have it
+ if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+ sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+ fi
+
+ # commit 7c78497b : tests that use gegl.png are broken on non-amd64
+ sed -e '/clones.xml/d' \
+ -e '/composite-transform.xml/d' \
+ -i tests/compositions/Makefile.am || die
+
+ eautoreconf
+
+ gnome2_environment_reset
+
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ # disable documentation as the generating is bit automagic
+ # if anyone wants to work on it just create bug with patch
+ --disable-docs
+ # never enable altering of CFLAGS via profile option
+ --disable-profile
+ # - Parameter --disable-workshop disables any use of Lua, effectivly
+ --disable-workshop
+ --program-suffix=-${SLOT}
+ --with-gdk-pixbuf
+ --with-pango
+ # - There are two checks for dot, one controllable by --with(out)-graphviz
+ # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
+ --without-graphviz
+ # libspiro: not in portage main tree
+ --without-libspiro
+ --without-lua
+ --without-mrg
+ $(use_enable cpu_flags_x86_mmx mmx)
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable debug)
+ $(use_enable introspection)
+ $(use_with cairo)
+ $(use_with cairo pangocairo)
+ $(use_with ffmpeg libavformat)
+ --without-jasper
+ $(use_with lcms)
+ $(use_with lensfun)
+ $(use_with openexr)
+ $(use_with pdf popplerglib)
+ $(use_with raw libraw)
+ $(use_with sdl)
+ $(use_with svg librsvg)
+ $(use_with tiff libtiff)
+ $(use_with umfpack)
+ # - v4l support does not work with our media-libs/libv4l-0.8.9,
+ # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+ $(use_with v4l libv4l)
+ $(use_with v4l libv4l2)
+ $(use_with vala)
+ $(use_with webp)
+ $(use_with zlib)
+ )
+
+ if use test; then
+ myeconfargs+=( $(use_with ffmpeg gexiv2) )
+ else
+ myeconfargs+=( --without-gexiv2 )
+ fi
+
+ econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+ default
+
+ [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gegl/gegl-0.4.18-r1.ebuild b/media-libs/gegl/gegl-0.4.18-r1.ebuild
new file mode 100644
index 000000000000..cad3f9ebf9b5
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.18-r1.ebuild
@@ -0,0 +1,161 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+ SRC_URI=""
+else
+ SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+ svg? ( cairo )
+ test? ( introspection )
+ vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+# so there is no chance to support libav right now (Gentoo bug #567638)
+# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ >=dev-libs/json-glib-1.2.6
+ >=media-libs/babl-0.1.72[introspection?,lcms?]
+ media-libs/libnsgif
+ >=media-libs/libpng-1.6.0:0=
+ >=sys-libs/zlib-1.2.0
+ virtual/jpeg:0=
+ >=x11-libs/gdk-pixbuf-2.32:2
+ >=x11-libs/pango-1.38.0
+ cairo? ( >=x11-libs/cairo-1.12.2 )
+ ffmpeg? ( media-video/ffmpeg:0= )
+ introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+ lcms? ( >=media-libs/lcms-2.8:2 )
+ lensfun? ( >=media-libs/lensfun-0.2.5 )
+ openexr? ( >=media-libs/openexr-1.6.1:= )
+ pdf? ( >=app-text/poppler-0.71.0[cairo] )
+ raw? ( >=media-libs/libraw-0.15.4:0= )
+ sdl? ( >=media-libs/libsdl-1.2.0 )
+ svg? ( >=gnome-base/librsvg-2.40.6:2 )
+ tiff? ( >=media-libs/tiff-4:0 )
+ umfpack? ( sci-libs/umfpack )
+ v4l? ( >=media-libs/libv4l-1.0.1 )
+ webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+DEPEND="
+ ${RDEPEND}
+"
+BDEPEND="
+ dev-lang/perl
+ >=dev-util/gtk-doc-am-1
+ >=sys-devel/gettext-0.19.8
+ >=sys-devel/libtool-2.2
+ virtual/pkgconfig
+ test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
+ vala? ( $(vala_depend) )
+"
+
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-drop-failing-tests.patch
+ "${FILESDIR}"/${P}-program-suffix.patch
+ "${FILESDIR}"/${P}-meson_cpu_detection.patch
+ "${FILESDIR}"/${P}-cltostring_force_utf8.patch
+)
+
+python_check_deps() {
+ has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # don't require Apple's OpenCL on versions of OSX that don't have it
+ if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+ sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+ fi
+
+ # commit 7c78497b : tests that use gegl.png are broken on non-amd64
+ sed -e '/clones.xml/d' \
+ -e '/composite-transform.xml/d' \
+ -i tests/compositions/meson.build || die
+
+ # fix skipping mipmap tests due to executable not found
+ for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
+ sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
+ sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
+ done
+
+ gnome2_environment_reset
+
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ # - Disable documentation as the generating is bit automagic
+ # if anyone wants to work on it just create bug with patch
+ -Ddocs=false
+ -Dexiv2=disabled
+ -Dgdk-pixbuf=enabled
+ -Dgexiv2=disabled
+ # - There are two checks for dot, one controllable by --with(out)-graphviz
+ # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
+ -Dgraphviz=disabled
+ -Djasper=disabled
+ -Dlibjpeg=enabled
+ -Dlibpng=enabled
+ # - libspiro: not in portage main tree
+ -Dlibspiro=disabled
+ -Dlua=disabled
+ -Dmrg=disabled
+ -Dpango=enabled
+ -Dsdl2=disabled
+ # - Parameter -Dworkshop=false disables any use of Lua, effectivly
+ -Dworkshop=false
+ $(meson_feature cairo)
+ $(meson_feature cairo pangocairo)
+ $(meson_feature ffmpeg libav)
+ $(meson_feature lcms)
+ $(meson_feature lensfun)
+ $(meson_feature openexr)
+ $(meson_feature raw libraw)
+ $(meson_feature sdl sdl1)
+ $(meson_feature svg librsvg)
+ $(meson_feature test pygobject)
+ $(meson_feature tiff libtiff)
+ $(meson_feature umfpack)
+ # - v4l support does not work with our media-libs/libv4l-0.8.9,
+ # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+ $(meson_feature v4l libv4l)
+ $(meson_feature v4l libv4l2)
+ $(meson_feature vala vapigen)
+ $(meson_feature webp)
+ $(meson_use introspection)
+ )
+ meson_src_configure
+}
diff --git a/media-libs/gegl/gegl-0.4.22-r1.ebuild b/media-libs/gegl/gegl-0.4.22-r1.ebuild
new file mode 100644
index 000000000000..f7d5f9dbbd43
--- /dev/null
+++ b/media-libs/gegl/gegl-0.4.22-r1.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit meson gnome2-utils python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
+ SRC_URI=""
+else
+ SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3+ LGPL-3 )"
+SLOT="0.4"
+
+IUSE="cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+ svg? ( cairo )
+ test? ( introspection )
+ vala? ( introspection )
+"
+
+RESTRICT="!test? ( test )"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+# so there is no chance to support libav right now (Gentoo bug #567638)
+# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ >=dev-libs/json-glib-1.2.6
+ >=media-libs/babl-0.1.74[introspection?,lcms?]
+ media-libs/libnsgif
+ >=media-libs/libpng-1.6.0:0=
+ >=sys-libs/zlib-1.2.0
+ virtual/jpeg:0=
+ >=x11-libs/gdk-pixbuf-2.32:2
+ >=x11-libs/pango-1.38.0
+ cairo? ( >=x11-libs/cairo-1.12.2 )
+ ffmpeg? ( media-video/ffmpeg:0= )
+ introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+ lcms? ( >=media-libs/lcms-2.8:2 )
+ lensfun? ( >=media-libs/lensfun-0.2.5 )
+ openexr? ( >=media-libs/openexr-1.6.1:= )
+ pdf? ( >=app-text/poppler-0.71.0[cairo] )
+ raw? ( >=media-libs/libraw-0.15.4:0= )
+ sdl? ( >=media-libs/libsdl-1.2.0 )
+ svg? ( >=gnome-base/librsvg-2.40.6:2 )
+ tiff? ( >=media-libs/tiff-4:0 )
+ umfpack? ( sci-libs/umfpack )
+ v4l? ( >=media-libs/libv4l-1.0.1 )
+ webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-lang/perl
+ >=dev-util/gtk-doc-am-1
+ >=sys-devel/gettext-0.19.8
+ >=sys-devel/libtool-2.2
+ virtual/pkgconfig
+ test? ( $(python_gen_any_dep '>=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]') )
+ vala? ( $(vala_depend) )
+"
+
+DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
+ "${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
+)
+
+python_check_deps() {
+ has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # don't require Apple's OpenCL on versions of OSX that don't have it
+ if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+ sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+ fi
+
+ # commit 7c78497b : tests that use gegl.png are broken on non-amd64
+ sed -e '/clones.xml/d' \
+ -e '/composite-transform.xml/d' \
+ -i tests/compositions/meson.build || die
+
+ # fix skipping mipmap tests due to executable not found
+ for item in "invert-crop.sh" "invert.sh" "rotate-crop.sh" "rotate.sh" "unsharp-crop.sh" "unsharp.sh"; do
+ sed -i "s:/bin/gegl:/bin/gegl-0.4:g" "${S}/tests/mipmap/${item}" || die
+ sed -i "s:/tools/gegl-imgcmp:/tools/gegl-imgcmp-0.4:g" "${S}/tests/mipmap/${item}" || die
+ done
+
+ gnome2_environment_reset
+
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ # - Disable documentation as the generating is bit automagic
+ # if anyone wants to work on it just create bug with patch
+ -Ddocs=false
+ -Dexiv2=disabled
+ -Dgdk-pixbuf=enabled
+ -Dgexiv2=disabled
+ # - There are two checks for dot, one controllable by --with(out)-graphviz
+ # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
+ -Dgraphviz=disabled
+ -Djasper=disabled
+ -Dlibjpeg=enabled
+ -Dlibpng=enabled
+ # - libspiro: not in portage main tree
+ -Dlibspiro=disabled
+ -Dlua=disabled
+ -Dmrg=disabled
+ -Dpango=enabled
+ -Dsdl2=disabled
+ # - Parameter -Dworkshop=false disables any use of Lua, effectivly
+ -Dworkshop=false
+ $(meson_feature cairo)
+ $(meson_feature cairo pangocairo)
+ $(meson_feature ffmpeg libav)
+ $(meson_feature lcms)
+ $(meson_feature lensfun)
+ $(meson_feature openexr)
+ $(meson_feature pdf poppler)
+ $(meson_feature raw libraw)
+ $(meson_feature sdl sdl1)
+ $(meson_feature svg librsvg)
+ $(meson_feature test pygobject)
+ $(meson_feature tiff libtiff)
+ $(meson_feature umfpack)
+ # - v4l support does not work with our media-libs/libv4l-0.8.9,
+ # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+ $(meson_feature v4l libv4l)
+ $(meson_feature v4l libv4l2)
+ $(meson_feature vala vapigen)
+ $(meson_feature webp)
+ $(meson_use introspection)
+ )
+ meson_src_configure
+}
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index e48fb86ed8f7..c854f48fae02 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -4,7 +4,6 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
-# vala and introspection support is broken, bug #468208
VALA_USE_DEPEND=vapigen
inherit meson gnome2-utils python-any-r1 vala
@@ -15,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
SRC_URI=""
else
SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A graph based image processing framework"
@@ -39,7 +38,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
>=dev-libs/glib-2.44:2
>=dev-libs/json-glib-1.2.6
- >=media-libs/babl-0.1.74[introspection?]
+ >=media-libs/babl-0.1.78[introspection?,lcms?,vala?]
media-libs/libnsgif
>=media-libs/libpng-1.6.0:0=
>=sys-libs/zlib-1.2.0
@@ -61,9 +60,7 @@ RDEPEND="
v4l? ( >=media-libs/libv4l-1.0.1 )
webp? ( >=media-libs/libwebp-0.5.0:= )
"
-
DEPEND="${RDEPEND}"
-
BDEPEND="
dev-lang/perl
>=dev-util/gtk-doc-am-1
@@ -135,6 +132,7 @@ src_configure() {
$(meson_feature lcms)
$(meson_feature lensfun)
$(meson_feature openexr)
+ $(meson_feature pdf poppler)
$(meson_feature raw libraw)
$(meson_feature sdl sdl1)
$(meson_feature svg librsvg)
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 30157ae042c6..20f643634420 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,3 +1,2 @@
-DIST mesa-19.3.5.tar.xz 12064980 BLAKE2B a20ebfb149624f13951795e07154ab70dc1856a7a1261b339b0bdf0009511111756c88439e7b8729f768b0b4b298301b9a3c0c10d7f2fab3abd91649c12ba51c SHA512 413929573fab31e1bb2a1a04c0c770161c2db464a5aab3f0567d27603fff889ede70e1f6e197e7ff1c1639dc4cc543457bcf45761f0f8e6dffafccfa773a4e3f
DIST mesa-20.0.8.tar.xz 12360736 BLAKE2B 19e3f8a40b34b5f17ed76077c5d92f728a134b2479c43d86674ed1818ab99639a9b732041f67488251df808564f6abe5b587d756ef9c7c13dcada87cd0fc05de SHA512 d906330c412899907dd05a84034a929107fccaf3044814c4b1f30ba5690cbcf1587b5f17534c6345111f3cb7cf292afd5984a60486643ff6f534b57cec615374
DIST mesa-20.1.1.tar.xz 12683180 BLAKE2B de602430ea91076f93b66d1be6da31bd3c74bc194709d36834bac6767c8c2f6047b0930cc070a19293f89a041dc881855ae1f1adedf02284ee4ebc3682487d61 SHA512 a8ae02915305488e5e0d8c104da73df1cdd61ab0b5c5d27a6851c418d25a2c9beeea9cddf93a341afa63cec52d356fe68b194c8c36e78c26f66fa884fc27f147
diff --git a/media-libs/mesa/mesa-19.3.5.ebuild b/media-libs/mesa/mesa-19.3.5.ebuild
deleted file mode 100644
index 734d4a391c51..000000000000
--- a/media-libs/mesa/mesa-19.3.5.ebuild
+++ /dev/null
@@ -1,556 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit llvm meson multilib-minimal pax-utils python-any-r1 linux-info
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
-
-if [[ ${PV} == 9999 ]]; then
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
- inherit git-r3
-else
- SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-RESTRICT="
- !test? ( test )
-"
-
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
- lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
- vdpau vulkan vulkan-overlay wayland +X xa xvmc"
-
-REQUIRED_USE="
- d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
- gles1? ( egl )
- gles2? ( egl )
- vulkan? ( dri3
- || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
- video_cards_radeonsi? ( llvm ) )
- vulkan-overlay? ( vulkan )
- wayland? ( egl gbm )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_iris? ( gallium )
- video_cards_lima? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_panfrost? ( gallium )
- video_cards_radeon? ( || ( classic gallium )
- gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vc4? ( gallium )
- video_cards_virgl? ( gallium )
- video_cards_vivante? ( gallium gbm )
- video_cards_vmware? ( gallium )
- xa? ( X )
- xvmc? ( X )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100"
-RDEPEND="
- !app-eselect/eselect-mesa
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
- libglvnd? (
- >=media-libs/libglvnd-1.2.0-r1[X?,${MULTILIB_USEDEP}]
- !app-eselect/eselect-opengl
- )
- !libglvnd? (
- >=app-eselect/eselect-opengl-1.3.0
- )
- gallium? (
- unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
- llvm? (
- video_cards_radeonsi? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- video_cards_r600? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- video_cards_radeon? (
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- )
- lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
- opencl? (
- dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
- dev-libs/libclc
- virtual/libelf:0=[${MULTILIB_USEDEP}]
- )
- vaapi? (
- >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
- )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- )
- selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
- wayland? (
- >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
- >=dev-libs/wayland-protocols-1.8
- )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
- video_cards_intel? (
- !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- )
- video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
- X? (
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- )
-"
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 10.
-# 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="9"
-LLVM_DEPSTR="
- || (
- sys-devel/llvm:9[${MULTILIB_USEDEP}]
- sys-devel/llvm:8[${MULTILIB_USEDEP}]
- )
- sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
- gallium? (
- llvm? (
- opencl? (
- video_cards_r600? (
- ${CLANG_DEPSTR_AMDGPU}
- )
- !video_cards_r600? (
- video_cards_radeonsi? (
- ${CLANG_DEPSTR_AMDGPU}
- )
- )
- !video_cards_r600? (
- !video_cards_radeonsi? (
- video_cards_radeon? (
- ${CLANG_DEPSTR_AMDGPU}
- )
- )
- )
- !video_cards_r600? (
- !video_cards_radeon? (
- !video_cards_radeonsi? (
- ${CLANG_DEPSTR}
- )
- )
- )
- )
- !opencl? (
- video_cards_r600? (
- ${LLVM_DEPSTR_AMDGPU}
- )
- !video_cards_r600? (
- video_cards_radeonsi? (
- ${LLVM_DEPSTR_AMDGPU}
- )
- )
- !video_cards_r600? (
- !video_cards_radeonsi? (
- video_cards_radeon? (
- ${LLVM_DEPSTR_AMDGPU}
- )
- )
- )
- !video_cards_r600? (
- !video_cards_radeon? (
- !video_cards_radeonsi? (
- ${LLVM_DEPSTR}
- )
- )
- )
- )
- )
- )
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
- valgrind? ( dev-util/valgrind )
- X? (
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- x11-base/xorg-proto
- )
-"
-BDEPEND="
- ${PYTHON_DEPS}
- opencl? (
- >=sys-devel/gcc-4.6
- )
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
-)"
-
-llvm_check_deps() {
- local flags=${MULTILIB_USEDEP}
- if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
- then
- flags+=",llvm_targets_AMDGPU(-)"
- fi
-
- if use opencl; then
- has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
- fi
- has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
-}
-
-pkg_pretend() {
- if use opencl; then
- if ! use video_cards_r600 &&
- ! use video_cards_radeonsi; then
- ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
- fi
- fi
-
- if use vaapi; then
- if ! use video_cards_r600 &&
- ! use video_cards_radeonsi &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
- fi
- fi
-
- if use vdpau; then
- if ! use video_cards_r300 &&
- ! use video_cards_r600 &&
- ! use video_cards_radeonsi &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
- fi
- fi
-
- if use xa; then
- if ! use video_cards_freedreno &&
- ! use video_cards_nouveau &&
- ! use video_cards_vmware; then
- ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
- fi
- fi
-
- if use xvmc; then
- if ! use video_cards_r600 &&
- ! use video_cards_nouveau; then
- ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
- fi
- fi
-
- if ! use gallium; then
- use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
- use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
- use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
- use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
- use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
- use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
- use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
- use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
- fi
-
- if ! use llvm; then
- use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
- fi
-}
-
-python_check_deps() {
- has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- # os_same_file_description requires the kcmp syscall,
- # which is only available with CONFIG_CHECKPOINT_RESTORE=y.
- # Currently only AMDGPU utilizes this function, so only AMDGPU users would
- # get a spooky warning message if the syscall fails.
- if use gallium && use video_cards_radeonsi; then
- CONFIG_CHECK="~CHECKPOINT_RESTORE"
- linux-info_pkg_setup
- fi
-
- if use gallium && use llvm; then
- llvm_pkg_setup
- fi
- python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
- local emesonargs=()
-
- if use classic; then
- # Intel code
- dri_driver_enable video_cards_i915 i915
- dri_driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- dri_driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- dri_driver_enable video_cards_nouveau nouveau
-
- # ATI code
- dri_driver_enable video_cards_r100 r100
- dri_driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- dri_driver_enable video_cards_radeon r100 r200
- fi
- fi
-
- emesonargs+=( -Dplatforms=$(use X && echo "x11,")$(use wayland && echo "wayland,")$(use gbm && echo "drm,")surfaceless )
-
- if use gallium; then
- emesonargs+=(
- $(meson_use llvm)
- $(meson_use lm-sensors lmsensors)
- $(meson_use unwind libunwind)
- )
-
- if use video_cards_iris ||
- use video_cards_r300 ||
- use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau ||
- use video_cards_vmware; then
- emesonargs+=($(meson_use d3d9 gallium-nine))
- else
- emesonargs+=(-Dgallium-nine=false)
- fi
-
- if use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_use vaapi gallium-va))
- use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
- else
- emesonargs+=(-Dgallium-va=false)
- fi
-
- if use video_cards_r300 ||
- use video_cards_r600 ||
- use video_cards_radeonsi ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_use vdpau gallium-vdpau))
- else
- emesonargs+=(-Dgallium-vdpau=false)
- fi
-
- if use video_cards_freedreno ||
- use video_cards_nouveau ||
- use video_cards_vmware; then
- emesonargs+=($(meson_use xa gallium-xa))
- else
- emesonargs+=(-Dgallium-xa=false)
- fi
-
- if use video_cards_r600 ||
- use video_cards_nouveau; then
- emesonargs+=($(meson_use xvmc gallium-xvmc))
- else
- emesonargs+=(-Dgallium-xvmc=false)
- fi
-
- if use video_cards_freedreno ||
- use video_cards_lima ||
- use video_cards_panfrost ||
- use video_cards_vc4 ||
- use video_cards_vivante; then
- gallium_enable -- kmsro
- fi
-
- gallium_enable video_cards_lima lima
- gallium_enable video_cards_panfrost panfrost
- gallium_enable video_cards_vc4 vc4
- gallium_enable video_cards_vivante etnaviv
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
-
- # Only one i915 driver (classic vs gallium). Default to classic.
- if ! use classic; then
- gallium_enable video_cards_i915 i915
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
- fi
-
- gallium_enable video_cards_iris iris
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- gallium_enable video_cards_virgl virgl
-
- # opencl stuff
- emesonargs+=(
- -Dgallium-opencl="$(usex opencl icd disabled)"
- )
- fi
-
- if use vulkan; then
- vulkan_enable video_cards_i965 intel
- vulkan_enable video_cards_iris intel
- vulkan_enable video_cards_radeonsi amd
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if [[ ${ABI} == x86 ]]; then
- emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
- fi
-
- if use gallium; then
- gallium_enable -- swrast
- emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
- else
- dri_driver_enable -- swrast
- emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
- fi
-
- driver_list() {
- local drivers="$(sort -u <<< "${1// /$'\n'}")"
- echo "${drivers//$'\n'/,}"
- }
-
- emesonargs+=(
- $(meson_use test build-tests)
- -Dglx=$(usex X dri disabled)
- -Dshared-glapi=true
- $(meson_use dri3)
- $(meson_use egl)
- $(meson_use gbm)
- $(meson_use gles1)
- $(meson_use gles2)
- $(meson_use libglvnd glvnd)
- $(meson_use selinux)
- -Dvalgrind=$(usex valgrind auto false)
- -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
- -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
- -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
- $(meson_use vulkan-overlay vulkan-overlay-layer)
- --buildtype $(usex debug debug plain)
- -Db_ndebug=$(usex debug false true)
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-
- use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
-}
-
-multilib_src_install_all() {
- einstalldocs
-}
-
-multilib_src_test() {
- meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-pkg_postinst() {
- if ! use libglvnd; then
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
- fi
-}
-
-# $1 - VIDEO_CARDS flag (check skipped for "--")
-# other args - names of DRI drivers to enable
-dri_driver_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- DRI_DRIVERS+=("$@")
- fi
-}
-
-gallium_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- GALLIUM_DRIVERS+=("$@")
- fi
-}
-
-vulkan_enable() {
- if [[ $1 == -- ]] || use $1; then
- shift
- VULKAN_DRIVERS+=("$@")
- fi
-}
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index a50cb625e992..d2020b8e602b 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -19,7 +19,6 @@
Enable Gallium HUD lm-sensors support.
Enable the Clover Gallium OpenCL state tracker.
Build the Mesa library for off-screen rendering.
- Enable if the user plans to run the package under a pax enabled hardened kernel
Compile in valgrind memory hints
Enable the VDPAU acceleration interface for the Gallium3D Video Layer.
Enable Vulkan drivers
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index ba85a5a0f538..4bf84423ad75 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/gtick/Manifest b/media-sound/gtick/Manifest
index 0e84f79deecf..c932678881c0 100644
--- a/media-sound/gtick/Manifest
+++ b/media-sound/gtick/Manifest
@@ -1 +1,2 @@
DIST gtick-0.5.4.tar.gz 641902 BLAKE2B f1832f46b559908ae0c40bd0f6a08e145a0ba58a6cf2f8e7235b4f3f0b9141ea514cf52c51cef24d745ce360423daab855c42b5f6719664be65bf5f254650c1d SHA512 28ea6f38952c376f1f684e7b598d1032063f7fdf3454cdb86735cb835079312c0d1c30dfeade7272f5399296f2a2ede5b81524036a9ac0d91e0878865fab446e
+DIST gtick-0.5.5.tar.gz 659596 BLAKE2B 74e40cd20bf24ef8a9cb9f6abf49d885bb5e660a6b4faa40fa18a10153edad1e522ca555c802e9b5364abbc94f79989e4dfdfd2d19a038f4c6f63895a287dc12 SHA512 8f308c312f6cc59bb8b786af09b1498c76adc1b2692369886e85fa97524b417bf3a5e075ba20061f009b36cb4fe12cd455befe7e466d8215620640229ebbdb87
diff --git a/media-sound/gtick/files/gtick-0.5.5-desktop.patch b/media-sound/gtick/files/gtick-0.5.5-desktop.patch
new file mode 100644
index 000000000000..d1492316dc58
--- /dev/null
+++ b/media-sound/gtick/files/gtick-0.5.5-desktop.patch
@@ -0,0 +1,30 @@
+From 17d3d5060160169706a9a0847aa15c068484fe5e Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy
+Date: Thu, 19 Mar 2020 21:17:22 +0300
+Subject: [PATCH] Fix desktop file
+
+---
+ gtick.desktop | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/gtick.desktop b/gtick.desktop
+index 05cf5ed..a31dee3 100644
+--- a/gtick.desktop
++++ b/gtick.desktop
+@@ -5,9 +5,10 @@ Name=GTick
+ Comment=a GTK-based metronome
+ Comment[pt]=Um metrônomo baseado em GTK
+ Comment[pt-br]=Um metrônomo baseado em GTK
+-Exec=/usr/bin/gtick
+-Icon=/usr/share/icons/hicolor/64x64/apps/gtick.xpm
++Exec=gtick
++Icon=gtick
+ Terminal=false
+ Type=Application
+ Categories=GTK;AudioVideo;Audio;
+-GenericName[pt_BR]=
++GenericName=Graphical Metronome
++StartupNotify=true
+--
+2.26.2
+
diff --git a/media-sound/gtick/gtick-0.5.5.ebuild b/media-sound/gtick/gtick-0.5.5.ebuild
new file mode 100644
index 000000000000..3d6b5f7e7945
--- /dev/null
+++ b/media-sound/gtick/gtick-0.5.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="Metronome application supporting different meters and speeds ranging"
+HOMEPAGE="https://www.antcom.de/gtick"
+SRC_URI="https://www.antcom.de/gtick/download/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="nls sndfile"
+
+RDEPEND="media-sound/pulseaudio
+ x11-libs/gtk+:2
+ sndfile? ( media-libs/libsndfile )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ nls? ( sys-devel/gettext )"
+
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-desktop.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i 's:^\(appdatadir = .*/\)appdata:\1metainfo:' \
+ Makefile.in || die
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable nls)
+ $(use_with sndfile)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ local res
+
+ default
+
+ for res in 32 48 64; do
+ newicon -s ${res} src/icon${res}x${res}.xpm gtick.xpm
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index 734522f2aef6..b5029b9da9fd 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1 +1,2 @@
DIST guitarix2-0.39.0.tar.xz 80769472 BLAKE2B a699545b7e4a9992ed11a17ee9f82170c1891a95a0543c3b847ff2a02ab4e6597c28cbb4708f85022b1e94f0184b6dc712c271729bdda07373101ea9e8a1323f SHA512 5eb799498385ab9aa865e3f5a7e79d77f7f62c9bd7ad6875ec32bdec85829ed5b84bed3b0eab786ce74088fe2e1d53080f70afcb25ab1ef8d8f78a676b4947df
+DIST guitarix2-0.40.0.tar.xz 70880548 BLAKE2B 08d849d15fcfaa26e6eacb5480e8ea28a86e94f2c28969abc00c479c2f8c31ecb80cd4e02f0244f2ead26d687ff90dcdb9027a5c7ad448cf1241d69ab56d2521 SHA512 902e4d924cae68a477518cb87d7b63edb8716db93e11add921e733c315f2646652fb1b434d182e836e1e866035cabe22a41d8dc66df0b6156b5242cdd31d51e8
diff --git a/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch b/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
new file mode 100644
index 000000000000..f64a21f26b51
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.40.0-noexecstack.patch
@@ -0,0 +1,26 @@
+From fc3e0b4754425bb262c8bcfd24cd345dd10e8d60 Mon Sep 17 00:00:00 2001
+From: brummer10
+Date: Fri, 5 Jun 2020 06:41:30 +0200
+Subject: [PATCH] Fix issue #104 lv2 plugins contains executable stack, patch
+ by Alexander Tsoy
+
+---
+ trunk/src/LV2/xputty/resources/wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/LV2/xputty/resources/wscript b/src/LV2/xputty/resources/wscript
+index a2f0402c..3c383393 100644
+--- a/src/LV2/xputty/resources/wscript
++++ b/src/LV2/xputty/resources/wscript
+@@ -41,7 +41,7 @@ def img2obj(task):
+ src = " ".join(["'%s'" % os.path.splitext(v.name)[0] for v in task.inputs[0:]])
+ cmd = ("cd src/LV2/xputty/resources/ \
+ && for f in %s; do\
+- %s -r -b binary ${f}.png -o ${f}.o; \
++ %s -r -b binary -z noexecstack ${f}.png -o ${f}.o; \
+ done " % (src, env.LD[0]) )
+ # Logs.debug("runner: system command -> %s" % cmd)
+ ret = task.exec_command(cmd, shell=True)
+--
+2.26.2
+
diff --git a/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch b/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
new file mode 100644
index 000000000000..2bc77f443b16
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.40.0-nostrip.patch
@@ -0,0 +1,24 @@
+From 3dd1e0a8ea7db95b76a7b38e27a9b54d6fe75c76 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy
+Date: Fri, 5 Jun 2020 17:21:10 +0300
+Subject: [PATCH] Do not strip lv2 plugins
+
+---
+ trunk/wscript | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index 2699325f..f2d8f86d 100644
+--- a/wscript
++++ b/wscript
+@@ -375,7 +375,6 @@ def configure(conf):
+ conf.env['DESKAPPS_DIR'] = os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications'))
+ conf.env['BIN_NAME'] = APPNAME
+ if opt.lv2:
+- conf.gxload('strip')
+ conf.gxload('lv2')
+ conf.env['LADSPA'] = opt.ladspa
+ conf.env['NEW_LADSPA'] = opt.new_ladspa
+--
+2.26.2
+
diff --git a/media-sound/guitarix/guitarix-0.39.0.ebuild b/media-sound/guitarix/guitarix-0.39.0.ebuild
index 9d500a3a0a3a..688596340430 100644
--- a/media-sound/guitarix/guitarix-0.39.0.ebuild
+++ b/media-sound/guitarix/guitarix-0.39.0.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE='threads(+)'
@@ -10,7 +11,7 @@ inherit python-any-r1 waf-utils xdg
MY_P="${PN}2-${PV}"
DESCRIPTION="Virtual guitar amplifier for Linux"
-HOMEPAGE="http://guitarix.org/"
+HOMEPAGE="https://guitarix.org/"
SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
LICENSE="GPL-2"
diff --git a/media-sound/guitarix/guitarix-0.40.0.ebuild b/media-sound/guitarix/guitarix-0.40.0.ebuild
new file mode 100644
index 000000000000..7a7c6a6d4525
--- /dev/null
+++ b/media-sound/guitarix/guitarix-0.40.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit python-any-r1 waf-utils xdg
+
+MY_P="${PN}2-${PV}"
+
+DESCRIPTION="Virtual guitar amplifier for Linux"
+HOMEPAGE="https://guitarix.org/"
+SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="bluetooth debug lv2 nls +standalone zeroconf"
+REQUIRED_USE="|| ( lv2 standalone )"
+
+COMMON_DEPEND="dev-cpp/eigen:3
+ dev-cpp/glibmm:2
+ dev-cpp/gtkmm:3.0
+ dev-libs/glib:2
+ >=media-libs/libsndfile-1.0.17
+ >=media-libs/zita-convolver-3:=
+ media-libs/zita-resampler
+ >=net-misc/curl-7.26.0
+ >=sci-libs/fftw-3.1.2:3.0=
+ x11-libs/gtk+:3
+ lv2? ( media-libs/lv2 )
+ standalone? (
+ dev-libs/boost:=
+ media-libs/liblrdf
+ media-libs/lilv
+ virtual/jack
+ bluetooth? ( net-wireless/bluez )
+ zeroconf? ( net-dns/avahi )
+ )
+"
+# roboto fonts are required for correct ui rendering
+RDEPEND="${COMMON_DEPEND}
+ standalone? (
+ media-fonts/roboto
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ dev-lang/sassc
+ virtual/pkgconfig
+ nls? (
+ dev-util/intltool
+ sys-devel/gettext
+ )
+"
+
+DOCS=( changelog README )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-noexecstack.patch
+ "${FILESDIR}"/${P}-nostrip.patch
+)
+
+src_configure() {
+ local myconf=(
+ --cxxflags-debug=""
+ --cxxflags-release="-DNDEBUG"
+ --ldflags="${LDFLAGS}"
+ --enable-lfs
+ --lib-dev
+ --no-desktop-update
+ --no-faust
+ --no-ldconfig
+ --shared-lib
+ $(use_enable nls)
+ $(usex bluetooth "" "--no-bluez")
+ $(usex debug "--debug" "")
+ $(usex lv2 "--lv2dir=${EPREFIX}/usr/$(get_libdir)/lv2" "--no-lv2 --no-lv2-gui")
+ $(usex standalone "" "--no-standalone")
+ $(usex zeroconf "" "--no-avahi")
+ )
+ waf-utils_src_configure "${myconf[@]}"
+}
diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
index a9962b2bb430..95daa28f6cff 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
PYTHON_COMPAT=( python3_{6,7,8} )
PYTHON_REQ_USE='threads(+)'
@@ -10,8 +11,9 @@ inherit python-any-r1 waf-utils xdg git-r3
MY_P="${PN}2-${PV}"
DESCRIPTION="Virtual guitar amplifier for Linux"
-HOMEPAGE="http://guitarix.org/"
+HOMEPAGE="https://guitarix.org/"
EGIT_REPO_URI="https://git.code.sf.net/p/guitarix/git"
+S="${WORKDIR}/${P}/trunk"
LICENSE="GPL-2"
SLOT="0"
@@ -21,15 +23,14 @@ REQUIRED_USE="|| ( lv2 standalone )"
COMMON_DEPEND="dev-cpp/eigen:3
dev-cpp/glibmm:2
- dev-cpp/gtkmm:2.4
- dev-lang/sassc
+ dev-cpp/gtkmm:3.0
dev-libs/glib:2
>=media-libs/libsndfile-1.0.17
>=media-libs/zita-convolver-3:=
media-libs/zita-resampler
>=net-misc/curl-7.26.0
>=sci-libs/fftw-3.1.2:3.0=
- x11-libs/gtk+:2
+ x11-libs/gtk+:3
lv2? ( media-libs/lv2 )
standalone? (
dev-libs/boost:=
@@ -40,21 +41,22 @@ COMMON_DEPEND="dev-cpp/eigen:3
zeroconf? ( net-dns/avahi )
)
"
-# clearlooks gtk engine and roboto fonts are required for correct ui rendering
+# roboto fonts are required for correct ui rendering
RDEPEND="${COMMON_DEPEND}
- x11-themes/gtk-engines
standalone? (
media-fonts/roboto
)
"
DEPEND="${COMMON_DEPEND}
${PYTHON_DEPS}
+ dev-lang/sassc
virtual/pkgconfig
- nls? ( dev-util/intltool )
+ nls? (
+ dev-util/intltool
+ sys-devel/gettext
+ )
"
-S="${WORKDIR}/${P}/trunk"
-
DOCS=( changelog README )
src_configure() {
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 0c98f35351bd..42efae461cac 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/smtube/smtube-20.1.0.ebuild b/media-video/smtube/smtube-20.1.0.ebuild
index 6cb45ba9dad7..8f436349e0cd 100644
--- a/media-video/smtube/smtube-20.1.0.ebuild
+++ b/media-video/smtube/smtube-20.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/smtube/${P}.tar.bz2"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
BDEPEND="
dev-qt/linguist-tools:5
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index d8b25b979780..3ad6d045c309 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 7aed7b4a40bd..03d7d8b5445f 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 24 Jun 2020 19:38:16 +0000
+Thu, 25 Jun 2020 09:08:17 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 7aed7b4a40bd..03d7d8b5445f 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 24 Jun 2020 19:38:16 +0000
+Thu, 25 Jun 2020 09:08:17 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index daebd80b7f4c..5231b0cc536c 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 86f9f49f89e8..3908d7ce7f7e 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/cdist-6.5.6 b/metadata/md5-cache/app-admin/cdist-6.5.6
new file mode 100644
index 000000000000..64936c247dab
--- /dev/null
+++ b/metadata/md5-cache/app-admin/cdist-6.5.6
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A usable configuration management system
+EAPI=7
+HOMEPAGE=https://www.cdi.st/ https://code.ungleich.ch/ungleich-public/cdist
+IUSE=doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/c/cdist/cdist-6.5.6.tar.gz
+_eclasses_=distutils-r1 44725b3eb803b8abcd6978759c231210 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=840cc54282e0f55646e0dad2b0a25bc6
diff --git a/metadata/md5-cache/app-admin/consul-1.7.4 b/metadata/md5-cache/app-admin/consul-1.7.4
index 831e12075dcb..788a96b808bf 100644
--- a/metadata/md5-cache/app-admin/consul-1.7.4
+++ b/metadata/md5-cache/app-admin/consul-1.7.4
@@ -4,11 +4,11 @@ DEPEND=acct-group/consul acct-user/consul
DESCRIPTION=A tool for service discovery, monitoring and configuration
EAPI=7
HOMEPAGE=https://www.consul.io
-KEYWORDS=~amd64
+KEYWORDS=amd64
LICENSE=MPL-2.0 Apache-2.0 BSD BSD-2 CC0-1.0 ISC MIT
RDEPEND=acct-group/consul acct-user/consul
RESTRICT=strip test
SLOT=0
SRC_URI=https://github.com/hashicorp/consul/archive/v1.7.4.tar.gz -> consul-1.7.4.tar.gz mirror://goproxy//cloud.google.com/go/@v/v0.26.0.zip -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.zip mirror://goproxy//cloud.google.com/go/@v/v0.26.0.mod -> cloud.google.com%2Fgo%2F@v%2Fv0.26.0.mod mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.zip -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.zip mirror://goproxy//github.com/!azure/azure-sdk-for-go/@v/v16.0.0+incompatible.mod -> github.com%2F!azure%2Fazure-sdk-for-go%2F@v%2Fv16.0.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.7.0+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.7.0+incompatible.mod mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.zip -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.zip mirror://goproxy//github.com/!azure/go-autorest/@v/v10.15.3+incompatible.mod -> github.com%2F!azure%2Fgo-autorest%2F@v%2Fv10.15.3+incompatible.mod mirror://goproxy//github.com/!burnt!sushi/toml/@v/v0.3.1.mod -> github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.zip -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.zip mirror://goproxy//github.com/!data!dog/datadog-go/@v/v2.2.0+incompatible.mod -> github.com%2F!data!dog%2Fdatadog-go%2F@v%2Fv2.2.0+incompatible.mod mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.zip -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.zip mirror://goproxy//github.com/!microsoft/go-winio/@v/v0.4.3.mod -> github.com%2F!microsoft%2Fgo-winio%2F@v%2Fv0.4.3.mod mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.zip -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/!n!y!times/gziphandler/@v/v1.0.1.mod -> github.com%2F!n!y!times%2Fgziphandler%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20180116203802-5d049714c4a6.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20180116203802-5d049714c4a6.mod mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.zip -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.zip mirror://goproxy//github.com/abdullin/seq/@v/v0.0.0-20160510034733-d5467c17e7af.mod -> github.com%2Fabdullin%2Fseq%2F@v%2Fv0.0.0-20160510034733-d5467c17e7af.mod mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.zip -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.zip mirror://goproxy//github.com/armon/circbuf/@v/v0.0.0-20150827004946-bbbad097214e.mod -> github.com%2Farmon%2Fcircbuf%2F@v%2Fv0.0.0-20150827004946-bbbad097214e.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20180917152333-f0300d1749da.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20180917152333-f0300d1749da.mod mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.zip -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.zip mirror://goproxy//github.com/armon/go-metrics/@v/v0.0.0-20190430140413-ec5e00d3c878.mod -> github.com%2Farmon%2Fgo-metrics%2F@v%2Fv0.0.0-20190430140413-ec5e00d3c878.mod mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.zip mirror://goproxy//github.com/armon/go-radix/@v/v0.0.0-20180808171621-7fddfc383310.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv0.0.0-20180808171621-7fddfc383310.mod mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.zip -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/armon/go-radix/@v/v1.0.0.mod -> github.com%2Farmon%2Fgo-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.zip -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.zip mirror://goproxy//github.com/aws/aws-sdk-go/@v/v1.25.41.mod -> github.com%2Faws%2Faws-sdk-go%2F@v%2Fv1.25.41.mod mirror://goproxy//github.com/beorn7/perks/@v/v0.0.0-20180321164747-3a771d992973.zip -> github.com%2Fbeorn7%2Fperks%2F@v%2Fv0.0.0-20180321164747-3a771d992973.zip 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/bgentry/speakeasy/@v/v0.1.0.zip -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/bgentry/speakeasy/@v/v0.1.0.mod -> github.com%2Fbgentry%2Fspeakeasy%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.zip -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.zip mirror://goproxy//github.com/boltdb/bolt/@v/v1.3.1.mod -> github.com%2Fboltdb%2Fbolt%2F@v%2Fv1.3.1.mod mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.zip -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.zip mirror://goproxy//github.com/circonus-labs/circonus-gometrics/@v/v2.3.1+incompatible.mod -> github.com%2Fcirconus-labs%2Fcirconus-gometrics%2F@v%2Fv2.3.1+incompatible.mod mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.zip -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.zip mirror://goproxy//github.com/circonus-labs/circonusllhist/@v/v0.1.3.mod -> github.com%2Fcirconus-labs%2Fcirconusllhist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/client9/misspell/@v/v0.3.4.mod -> github.com%2Fclient9%2Fmisspell%2F@v%2Fv0.3.4.mod mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.zip -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/coredns/coredns/@v/v1.1.2.mod -> github.com%2Fcoredns%2Fcoredns%2F@v%2Fv1.1.2.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/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.zip -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.zip mirror://goproxy//github.com/denverdino/aliyungo/@v/v0.0.0-20170926055100-d3308649c661.mod -> github.com%2Fdenverdino%2Faliyungo%2F@v%2Fv0.0.0-20170926055100-d3308649c661.mod mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.zip -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.zip mirror://goproxy//github.com/dgrijalva/jwt-go/@v/v3.2.0+incompatible.mod -> github.com%2Fdgrijalva%2Fjwt-go%2F@v%2Fv3.2.0+incompatible.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.1.1.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.zip -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.zip mirror://goproxy//github.com/digitalocean/godo/@v/v1.10.0.mod -> github.com%2Fdigitalocean%2Fgodo%2F@v%2Fv1.10.0.mod mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.zip -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/dimchansky/utfbom/@v/v1.1.0.mod -> github.com%2Fdimchansky%2Futfbom%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.zip -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/dnaeon/go-vcr/@v/v1.0.1.mod -> github.com%2Fdnaeon%2Fgo-vcr%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.zip -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.zip mirror://goproxy//github.com/docker/go-connections/@v/v0.3.0.mod -> github.com%2Fdocker%2Fgo-connections%2F@v%2Fv0.3.0.mod mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.zip -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.zip mirror://goproxy//github.com/elazarl/go-bindata-assetfs/@v/v0.0.0-20160803192304-e1a2a7ec64b0.mod -> github.com%2Felazarl%2Fgo-bindata-assetfs%2F@v%2Fv0.0.0-20160803192304-e1a2a7ec64b0.mod mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.8.0.zip -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.8.0.zip mirror://goproxy//github.com/envoyproxy/go-control-plane/@v/v0.8.0.mod -> github.com%2Fenvoyproxy%2Fgo-control-plane%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.0.14.zip -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.0.14.zip mirror://goproxy//github.com/envoyproxy/protoc-gen-validate/@v/v0.0.14.mod -> github.com%2Fenvoyproxy%2Fprotoc-gen-validate%2F@v%2Fv0.0.14.mod mirror://goproxy//github.com/fatih/color/@v/v1.7.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.7.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.7.0.mod mirror://goproxy//github.com/fatih/color/@v/v1.9.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.9.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod mirror://goproxy//github.com/fatih/structs/@v/v1.1.0.mod -> github.com%2Ffatih%2Fstructs%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/fsnotify/fsnotify/@v/v1.4.7.zip -> github.com%2Ffsnotify%2Ffsnotify%2F@v%2Fv1.4.7.zip 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/ghodss/yaml/@v/v1.0.0.zip -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ghodss/yaml/@v/v1.0.0.mod -> github.com%2Fghodss%2Fyaml%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/go-check/check/@v/v0.0.0-20140225173054-eb6ee6f84d0a.mod -> github.com%2Fgo-check%2Fcheck%2F@v%2Fv0.0.0-20140225173054-eb6ee6f84d0a.mod mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.zip -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.zip mirror://goproxy//github.com/go-ldap/ldap/@v/v3.0.2+incompatible.mod -> github.com%2Fgo-ldap%2Fldap%2F@v%2Fv3.0.2+incompatible.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.1.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2-0.20181118220953-042da051cf31.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2-0.20181118220953-042da051cf31.mod mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.zip -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/go-test/deep/@v/v1.0.2.mod -> github.com%2Fgo-test%2Fdeep%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.zip -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/gogo/googleapis/@v/v1.1.0.mod -> github.com%2Fgogo%2Fgoogleapis%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/gogo/protobuf/@v/v1.1.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.1.1.zip 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.2.1.zip -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.zip mirror://goproxy//github.com/gogo/protobuf/@v/v1.2.1.mod -> github.com%2Fgogo%2Fprotobuf%2F@v%2Fv1.2.1.mod mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.zip -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.zip mirror://goproxy//github.com/golang/glog/@v/v0.0.0-20160126235308-23def4e6c14b.mod -> github.com%2Fgolang%2Fglog%2F@v%2Fv0.0.0-20160126235308-23def4e6c14b.mod mirror://goproxy//github.com/golang/mock/@v/v1.1.1.zip -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/golang/mock/@v/v1.1.1.mod -> github.com%2Fgolang%2Fmock%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/golang/protobuf/@v/v1.2.0.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.2.0.zip 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.zip -> github.com%2Fgolang%2Fprotobuf%2F@v%2Fv1.3.1.zip 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/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/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.zip -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.zip mirror://goproxy//github.com/google/btree/@v/v0.0.0-20180813153112-4030bb1f1f0c.mod -> github.com%2Fgoogle%2Fbtree%2F@v%2Fv0.0.0-20180813153112-4030bb1f1f0c.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.2.0.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.zip -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.zip mirror://goproxy//github.com/google/go-querystring/@v/v0.0.0-20170111101155-53e6ce116135.mod -> github.com%2Fgoogle%2Fgo-querystring%2F@v%2Fv0.0.0-20170111101155-53e6ce116135.mod mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.zip -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.zip mirror://goproxy//github.com/google/gofuzz/@v/v0.0.0-20170612174753-24818f796faf.mod -> github.com%2Fgoogle%2Fgofuzz%2F@v%2Fv0.0.0-20170612174753-24818f796faf.mod mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.zip -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/googleapis/gnostic/@v/v0.2.0.mod -> github.com%2Fgoogleapis%2Fgnostic%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.zip -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.zip mirror://goproxy//github.com/gophercloud/gophercloud/@v/v0.0.0-20180828235145-f29afc2cceca.mod -> github.com%2Fgophercloud%2Fgophercloud%2F@v%2Fv0.0.0-20180828235145-f29afc2cceca.mod mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.zip -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.zip mirror://goproxy//github.com/gopherjs/gopherjs/@v/v0.0.0-20180825215210-0210a2f0f73c.mod -> github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20180825215210-0210a2f0f73c.mod mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.zip -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.zip mirror://goproxy//github.com/gregjones/httpcache/@v/v0.0.0-20180305231024-9cad4c3443a7.mod -> github.com%2Fgregjones%2Fhttpcache%2F@v%2Fv0.0.0-20180305231024-9cad4c3443a7.mod mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/errwrap/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Ferrwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.zip -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.zip mirror://goproxy//github.com/hashicorp/go-bexpr/@v/v0.1.2.mod -> github.com%2Fhashicorp%2Fgo-bexpr%2F@v%2Fv0.1.2.mod mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.zip -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.zip mirror://goproxy//github.com/hashicorp/go-checkpoint/@v/v0.0.0-20171009173528-1545e56e46de.mod -> github.com%2Fhashicorp%2Fgo-checkpoint%2F@v%2Fv0.0.0-20171009173528-1545e56e46de.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.zip mirror://goproxy//github.com/hashicorp/go-cleanhttp/@v/v0.5.1.mod -> github.com%2Fhashicorp%2Fgo-cleanhttp%2F@v%2Fv0.5.1.mod mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.zip -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/hashicorp/go-connlimit/@v/v0.2.0.mod -> github.com%2Fhashicorp%2Fgo-connlimit%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.zip -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.zip mirror://goproxy//github.com/hashicorp/go-discover/@v/v0.0.0-20191202160150-7ec2cfbda7a2.mod -> github.com%2Fhashicorp%2Fgo-discover%2F@v%2Fv0.0.0-20191202160150-7ec2cfbda7a2.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.0.0-20180709165350-ff2cf002a8dd.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.0.0-20180709165350-ff2cf002a8dd.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.8.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.8.0.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.9.1.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.9.1.mod mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.zip -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.zip mirror://goproxy//github.com/hashicorp/go-hclog/@v/v0.12.0.mod -> github.com%2Fhashicorp%2Fgo-hclog%2F@v%2Fv0.12.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-immutable-radix/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-immutable-radix%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.zip -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/hashicorp/go-memdb/@v/v1.0.3.mod -> github.com%2Fhashicorp%2Fgo-memdb%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.zip -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.zip mirror://goproxy//github.com/hashicorp/go-msgpack/@v/v0.5.5.mod -> github.com%2Fhashicorp%2Fgo-msgpack%2F@v%2Fv0.5.5.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-multierror/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-multierror%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go-plugin/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-plugin%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.zip -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.zip mirror://goproxy//github.com/hashicorp/go-raftchunking/@v/v0.6.1.mod -> github.com%2Fhashicorp%2Fgo-raftchunking%2F@v%2Fv0.6.1.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.3.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.3.mod mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.zip -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.zip mirror://goproxy//github.com/hashicorp/go-retryablehttp/@v/v0.5.4.mod -> github.com%2Fhashicorp%2Fgo-retryablehttp%2F@v%2Fv0.5.4.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-rootcerts/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-rootcerts%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.zip -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.zip mirror://goproxy//github.com/hashicorp/go-sockaddr/@v/v1.0.2.mod -> github.com%2Fhashicorp%2Fgo-sockaddr%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/go-syslog/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-syslog%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/go-uuid/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fgo-uuid%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.zip -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/hashicorp/go-version/@v/v1.1.0.mod -> github.com%2Fhashicorp%2Fgo-version%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/hashicorp/go.net/@v/v0.0.1.mod -> github.com%2Fhashicorp%2Fgo.net%2F@v%2Fv0.0.1.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.0.mod -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.0.mod mirror://goproxy//github.com/hashicorp/golang-lru/@v/v0.5.1.zip -> github.com%2Fhashicorp%2Fgolang-lru%2F@v%2Fv0.5.1.zip 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/hcl/@v/v1.0.0.zip -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/hashicorp/hcl/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fhcl%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.zip -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.zip mirror://goproxy//github.com/hashicorp/hil/@v/v0.0.0-20160711231837-1e86c6b523c5.mod -> github.com%2Fhashicorp%2Fhil%2F@v%2Fv0.0.0-20160711231837-1e86c6b523c5.mod mirror://goproxy//github.com/hashicorp/logutils/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Flogutils%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.0.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.zip -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/hashicorp/mdns/@v/v1.0.1.mod -> github.com%2Fhashicorp%2Fmdns%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.1.3.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.1.3.mod mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.zip -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.zip mirror://goproxy//github.com/hashicorp/memberlist/@v/v0.2.2.mod -> github.com%2Fhashicorp%2Fmemberlist%2F@v%2Fv0.2.2.mod mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.zip -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.zip mirror://goproxy//github.com/hashicorp/net-rpc-msgpackrpc/@v/v0.0.0-20151116020338-a14192a58a69.mod -> github.com%2Fhashicorp%2Fnet-rpc-msgpackrpc%2F@v%2Fv0.0.0-20151116020338-a14192a58a69.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.1.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.zip -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.zip mirror://goproxy//github.com/hashicorp/raft/@v/v1.1.2.mod -> github.com%2Fhashicorp%2Fraft%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.zip -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.zip mirror://goproxy//github.com/hashicorp/raft-boltdb/@v/v0.0.0-20171010151810-6e5ba93211ea.mod -> github.com%2Fhashicorp%2Fraft-boltdb%2F@v%2Fv0.0.0-20171010151810-6e5ba93211ea.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.8.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.8.2.mod mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.2.zip -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/hashicorp/serf/@v/v0.9.2.mod -> github.com%2Fhashicorp%2Fserf%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.zip -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.zip mirror://goproxy//github.com/hashicorp/vault/api/@v/v1.0.4.mod -> github.com%2Fhashicorp%2Fvault%2Fapi%2F@v%2Fv1.0.4.mod mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.zip -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.zip mirror://goproxy//github.com/hashicorp/vault/sdk/@v/v0.1.13.mod -> github.com%2Fhashicorp%2Fvault%2Fsdk%2F@v%2Fv0.1.13.mod mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.zip -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.zip mirror://goproxy//github.com/hashicorp/vic/@v/v1.5.1-0.20190403131502-bbfe86ec9443.mod -> github.com%2Fhashicorp%2Fvic%2F@v%2Fv1.5.1-0.20190403131502-bbfe86ec9443.mod mirror://goproxy//github.com/hashicorp/yamux/@v/v0.0.0-20180604194846-3520598351bb.mod -> github.com%2Fhashicorp%2Fyamux%2F@v%2Fv0.0.0-20180604194846-3520598351bb.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.zip -> github.com%2Fhpcloud%2Ftail%2F@v%2Fv1.0.0.zip 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/imdario/mergo/@v/v0.3.6.zip -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.zip mirror://goproxy//github.com/imdario/mergo/@v/v0.3.6.mod -> github.com%2Fimdario%2Fmergo%2F@v%2Fv0.3.6.mod mirror://goproxy//github.com/istio/gogo-genproto/@v/v0.0.0-20190124151557-6d926a6e6feb.mod -> github.com%2Fistio%2Fgogo-genproto%2F@v%2Fv0.0.0-20190124151557-6d926a6e6feb.mod mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.zip -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.zip mirror://goproxy//github.com/jarcoal/httpmock/@v/v0.0.0-20180424175123-9c70cfe4a1da.mod -> github.com%2Fjarcoal%2Fhttpmock%2F@v%2Fv0.0.0-20180424175123-9c70cfe4a1da.mod mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.zip -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.zip mirror://goproxy//github.com/jmespath/go-jmespath/@v/v0.0.0-20180206201540-c2b33e8439af.mod -> github.com%2Fjmespath%2Fgo-jmespath%2F@v%2Fv0.0.0-20180206201540-c2b33e8439af.mod mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.zip -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.zip mirror://goproxy//github.com/joyent/triton-go/@v/v0.0.0-20180628001255-830d2b111e62.mod -> github.com%2Fjoyent%2Ftriton-go%2F@v%2Fv0.0.0-20180628001255-830d2b111e62.mod mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.zip -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.zip mirror://goproxy//github.com/json-iterator/go/@v/v1.1.5.mod -> github.com%2Fjson-iterator%2Fgo%2F@v%2Fv1.1.5.mod mirror://goproxy//github.com/jtolds/gls/@v/v4.2.1+incompatible.mod -> github.com%2Fjtolds%2Fgls%2F@v%2Fv4.2.1+incompatible.mod mirror://goproxy//github.com/kisielk/errcheck/@v/v1.1.0.mod -> github.com%2Fkisielk%2Ferrcheck%2F@v%2Fv1.1.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/kr/pretty/@v/v0.1.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.zip -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/kr/pretty/@v/v0.2.0.mod -> github.com%2Fkr%2Fpretty%2F@v%2Fv0.2.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/likexian/gokit/@v/v0.0.0-20190309162924-0a377eecf7aa.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190309162924-0a377eecf7aa.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190418170008-ace88ad0983b.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190418170008-ace88ad0983b.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.0.0-20190501133040-e77ea8b19cdc.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.0.0-20190501133040-e77ea8b19cdc.mod mirror://goproxy//github.com/likexian/gokit/@v/v0.20.16.mod -> github.com%2Flikexian%2Fgokit%2F@v%2Fv0.20.16.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190409170913-40473a74d76d.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190409170913-40473a74d76d.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190419151922-c1f9f0b4f084.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190419151922-c1f9f0b4f084.mod mirror://goproxy//github.com/likexian/simplejson-go/@v/v0.0.0-20190502021454-d8787b4bfa0b.mod -> github.com%2Flikexian%2Fsimplejson-go%2F@v%2Fv0.0.0-20190502021454-d8787b4bfa0b.mod mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.zip -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.zip mirror://goproxy//github.com/linode/linodego/@v/v0.7.1.mod -> github.com%2Flinode%2Flinodego%2F@v%2Fv0.7.1.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.4.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.6.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.6.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.3.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.3.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.8.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.10.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.10.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.11.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.12.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.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/miekg/dns/@v/v1.0.14.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.0.14.mod mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.zip -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.zip mirror://goproxy//github.com/miekg/dns/@v/v1.1.26.mod -> github.com%2Fmiekg%2Fdns%2F@v%2Fv1.1.26.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/cli/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fcli%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/copystructure/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fcopystructure%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.zip -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/mitchellh/go-homedir/@v/v1.1.0.mod -> github.com%2Fmitchellh%2Fgo-homedir%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v0.0.0-20171004221916-a61a99592b77.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv0.0.0-20171004221916-a61a99592b77.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.zip -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/mitchellh/go-testing-interface/@v/v1.0.3.mod -> github.com%2Fmitchellh%2Fgo-testing-interface%2F@v%2Fv1.0.3.mod mirror://goproxy//github.com/mitchellh/go-wordwrap/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fgo-wordwrap%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/gox/@v/v0.4.0.mod -> github.com%2Fmitchellh%2Fgox%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.zip -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.zip mirror://goproxy//github.com/mitchellh/hashstructure/@v/v0.0.0-20170609045927-2bca23e0e452.mod -> github.com%2Fmitchellh%2Fhashstructure%2F@v%2Fv0.0.0-20170609045927-2bca23e0e452.mod mirror://goproxy//github.com/mitchellh/iochan/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Fiochan%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v0.0.0-20160808181253-ca63d7c062ee.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv0.0.0-20160808181253-ca63d7c062ee.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.1.2.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.1.2.mod mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.zip -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/mitchellh/mapstructure/@v/v1.2.3.mod -> github.com%2Fmitchellh%2Fmapstructure%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.0.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.zip -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.zip mirror://goproxy//github.com/mitchellh/reflectwalk/@v/v1.0.1.mod -> github.com%2Fmitchellh%2Freflectwalk%2F@v%2Fv1.0.1.mod mirror://goproxy//github.com/modern-go/concurrent/@v/v0.0.0-20180306012644-bacd9c7ef1dd.zip -> github.com%2Fmodern-go%2Fconcurrent%2F@v%2Fv0.0.0-20180306012644-bacd9c7ef1dd.zip 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/v1.0.1.zip -> github.com%2Fmodern-go%2Freflect2%2F@v%2Fv1.0.1.zip 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/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.zip -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.zip mirror://goproxy//github.com/nicolai86/scaleway-sdk/@v/v1.10.2-0.20180628010248-798f60e20bb2.mod -> github.com%2Fnicolai86%2Fscaleway-sdk%2F@v%2Fv1.10.2-0.20180628010248-798f60e20bb2.mod mirror://goproxy//github.com/oklog/run/@v/v1.0.0.mod -> github.com%2Foklog%2Frun%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/onsi/ginkgo/@v/v1.6.0.zip -> github.com%2Fonsi%2Fginkgo%2F@v%2Fv1.6.0.zip 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/gomega/@v/v1.4.1.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.1.mod mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.zip -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.zip mirror://goproxy//github.com/onsi/gomega/@v/v1.4.2.mod -> github.com%2Fonsi%2Fgomega%2F@v%2Fv1.4.2.mod mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.zip -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.zip mirror://goproxy//github.com/packethost/packngo/@v/v0.1.1-0.20180711074735-b9cb5096f54c.mod -> github.com%2Fpackethost%2Fpackngo%2F@v%2Fv0.1.1-0.20180711074735-b9cb5096f54c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.0.0-20180627143212-57f6aae5913c.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.0.0-20180627143212-57f6aae5913c.mod mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.zip -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/pascaldekloe/goe/@v/v0.1.0.mod -> github.com%2Fpascaldekloe%2Fgoe%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.zip -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.zip mirror://goproxy//github.com/peterbourgon/diskv/@v/v2.0.1+incompatible.mod -> github.com%2Fpeterbourgon%2Fdiskv%2F@v%2Fv2.0.1+incompatible.mod mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.zip -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.zip mirror://goproxy//github.com/pierrec/lz4/@v/v2.0.5+incompatible.mod -> github.com%2Fpierrec%2Flz4%2F@v%2Fv2.0.5+incompatible.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/posener/complete/@v/v1.1.1.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/posener/complete/@v/v1.2.3.zip -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.zip mirror://goproxy//github.com/posener/complete/@v/v1.2.3.mod -> github.com%2Fposener%2Fcomplete%2F@v%2Fv1.2.3.mod mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.zip -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.zip mirror://goproxy//github.com/prometheus/client_golang/@v/v0.9.2.mod -> github.com%2Fprometheus%2Fclient_golang%2F@v%2Fv0.9.2.mod mirror://goproxy//github.com/prometheus/client_model/@v/v0.0.0-20180712105110-5c3871d89910.zip -> github.com%2Fprometheus%2Fclient_model%2F@v%2Fv0.0.0-20180712105110-5c3871d89910.zip 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/common/@v/v0.0.0-20181126121408-4724e9255275.zip -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.zip mirror://goproxy//github.com/prometheus/common/@v/v0.0.0-20181126121408-4724e9255275.mod -> github.com%2Fprometheus%2Fcommon%2F@v%2Fv0.0.0-20181126121408-4724e9255275.mod mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.zip -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.zip mirror://goproxy//github.com/prometheus/procfs/@v/v0.0.0-20181204211112-1dc9a6cbc91a.mod -> github.com%2Fprometheus%2Fprocfs%2F@v%2Fv0.0.0-20181204211112-1dc9a6cbc91a.mod mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.zip -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.zip mirror://goproxy//github.com/rboyer/safeio/@v/v0.2.1.mod -> github.com%2Frboyer%2Fsafeio%2F@v%2Fv0.2.1.mod mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.zip -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.zip mirror://goproxy//github.com/renier/xmlrpc/@v/v0.0.0-20170708154548-ce4a1a486c03.mod -> github.com%2Frenier%2Fxmlrpc%2F@v%2Fv0.0.0-20170708154548-ce4a1a486c03.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v0.0.0-20160712163229-9b3edd62028f.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv0.0.0-20160712163229-9b3edd62028f.mod mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.zip -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.zip mirror://goproxy//github.com/ryanuber/columnize/@v/v2.1.0+incompatible.mod -> github.com%2Fryanuber%2Fcolumnize%2F@v%2Fv2.1.0+incompatible.mod mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.zip -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/ryanuber/go-glob/@v/v1.0.0.mod -> github.com%2Fryanuber%2Fgo-glob%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.zip -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.zip mirror://goproxy//github.com/sean-/seed/@v/v0.0.0-20170313163322-e2103e2c3529.mod -> github.com%2Fsean-%2Fseed%2F@v%2Fv0.0.0-20170313163322-e2103e2c3529.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v0.0.0-20181107111621-48177ef5f880.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv0.0.0-20181107111621-48177ef5f880.mod mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.zip -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.zip mirror://goproxy//github.com/shirou/w32/@v/v0.0.0-20160930032740-bb4de0191aa4.mod -> github.com%2Fshirou%2Fw32%2F@v%2Fv0.0.0-20160930032740-bb4de0191aa4.mod mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.zip -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.zip mirror://goproxy//github.com/sirupsen/logrus/@v/v1.0.6.mod -> github.com%2Fsirupsen%2Flogrus%2F@v%2Fv1.0.6.mod mirror://goproxy//github.com/smartystreets/assertions/@v/v0.0.0-20180820201707-7c9eb446e3cf.mod -> github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180820201707-7c9eb446e3cf.mod mirror://goproxy//github.com/smartystreets/goconvey/@v/v0.0.0-20180222194500-ef6db91d284a.mod -> github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv0.0.0-20180222194500-ef6db91d284a.mod mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.zip -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.zip mirror://goproxy//github.com/softlayer/softlayer-go/@v/v0.0.0-20180806151055-260589d94c7d.mod -> github.com%2Fsoftlayer%2Fsoftlayer-go%2F@v%2Fv0.0.0-20180806151055-260589d94c7d.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.2.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.2.mod mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.zip -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.zip mirror://goproxy//github.com/spf13/pflag/@v/v1.0.3.mod -> github.com%2Fspf13%2Fpflag%2F@v%2Fv1.0.3.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.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.1.zip 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/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.zip -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.zip mirror://goproxy//github.com/tencentcloud/tencentcloud-sdk-go/@v/v3.0.83+incompatible.mod -> github.com%2Ftencentcloud%2Ftencentcloud-sdk-go%2F@v%2Fv3.0.83+incompatible.mod mirror://goproxy//github.com/tent/http-link-go/@v/v0.0.0-20130702225549-ac974c61c2f9.mod -> github.com%2Ftent%2Fhttp-link-go%2F@v%2Fv0.0.0-20130702225549-ac974c61c2f9.mod mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.zip -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.zip mirror://goproxy//github.com/tv42/httpunix/@v/v0.0.0-20150427012821-b75d8614f926.mod -> github.com%2Ftv42%2Fhttpunix%2F@v%2Fv0.0.0-20150427012821-b75d8614f926.mod mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.zip -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.zip mirror://goproxy//github.com/vmware/govmomi/@v/v0.18.0.mod -> github.com%2Fvmware%2Fgovmomi%2F@v%2Fv0.18.0.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20181029021203-45a5f77698d3.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20181029021203-45a5f77698d3.mod 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/crypto/@v/v0.0.0-20190923035154-9ee001bba392.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190923035154-9ee001bba392.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20191106202628-ed6320f186d4.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20191106202628-ed6320f186d4.mod mirror://goproxy//golang.org/x/exp/@v/v0.0.0-20190121172915-509febef88a4.mod -> golang.org%2Fx%2Fexp%2F@v%2Fv0.0.0-20190121172915-509febef88a4.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20181026193005-c67002cb31c3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20181026193005-c67002cb31c3.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190227174305-5b3e6a55c961.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190227174305-5b3e6a55c961.mod mirror://goproxy//golang.org/x/lint/@v/v0.0.0-20190313153728-d0100b6bd8b3.mod -> golang.org%2Fx%2Flint%2F@v%2Fv0.0.0-20190313153728-d0100b6bd8b3.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-20180826012351-8a410e7b638d.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20180826012351-8a410e7b638d.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-20181023162649-9b4f9f5ad519.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181023162649-9b4f9f5ad519.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181201002055-351d144fa1fc.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181201002055-351d144fa1fc.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20181220203305-927f97764cc3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20181220203305-927f97764cc3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190213061140-3a22650c66bd.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190213061140-3a22650c66bd.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-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190503192946-f4e77d36d62c.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190503192946-f4e77d36d62c.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190620200207-3b0461eec859.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190620200207-3b0461eec859.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190923162816-aa69164e4478.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190923162816-aa69164e4478.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20170807180024-9a379c6b3e95.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20170807180024-9a379c6b3e95.mod mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.zip -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.zip mirror://goproxy//golang.org/x/oauth2/@v/v0.0.0-20180821212333-d2e6202438be.mod -> golang.org%2Fx%2Foauth2%2F@v%2Fv0.0.0-20180821212333-d2e6202438be.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-20190227155943-e225da77a7e6.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190227155943-e225da77a7e6.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20190423024810-112230192c58.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20190423024810-112230192c58.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180823144017-11551d06cbcc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180823144017-11551d06cbcc.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20180830151530-49385e6e1522.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.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-20181026203630-95b1ffbd15a5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20181026203630-95b1ffbd15a5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190129075346-302c3dd5f1cc.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190129075346-302c3dd5f1cc.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-20190222072716-a9d3bda3a223.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190403152447-81d4e9dc473e.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190403152447-81d4e9dc473e.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190508220229-2d0786266e9c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190508220229-2d0786266e9c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190523142557-0e01d883c5c5.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190523142557-0e01d883c5c5.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190922100055-0a153f010e69.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190922100055-0a153f010e69.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190924154521-2837fb4f24fe.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190924154521-2837fb4f24fe.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191008105621-543471e840be.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191008105621-543471e840be.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200116001909-b77594299b42.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200124204421-9fbb57f87de9.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200124204421-9fbb57f87de9.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200223170610-d5e6a3e2c0ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200223170610-d5e6a3e2c0ae.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.1-0.20181227161524-e6919f6577db.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.1-0.20181227161524-e6919f6577db.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-20180412165947-fbb02b2291d2.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20180412165947-fbb02b2291d2.mod mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.zip -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.zip mirror://goproxy//golang.org/x/time/@v/v0.0.0-20190308202827-9d24e82272b4.mod -> golang.org%2Fx%2Ftime%2F@v%2Fv0.0.0-20190308202827-9d24e82272b4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180221164845-07fd8470d635.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180221164845-07fd8470d635.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-20190114222345-bf090417da8b.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190114222345-bf090417da8b.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190226205152-f727befe758c.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190226205152-f727befe758c.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190311212946-11955173bddd.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190311212946-11955173bddd.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190524140312-2c0ae7006135.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190524140312-2c0ae7006135.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20190907020128-2ca718005c18.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190907020128-2ca718005c18.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20190717185122-a985d3407aa7.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.zip -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.zip mirror://goproxy//google.golang.org/api/@v/v0.0.0-20180829000535-087779f1d2c9.mod -> google.golang.org%2Fapi%2F@v%2Fv0.0.0-20180829000535-087779f1d2c9.mod mirror://goproxy//google.golang.org/appengine/@v/v1.1.0.mod -> google.golang.org%2Fappengine%2F@v%2Fv1.1.0.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/genproto/@v/v0.0.0-20180817151627-c66870c02cf8.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20180817151627-c66870c02cf8.mod mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.zip -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.zip mirror://goproxy//google.golang.org/genproto/@v/v0.0.0-20190404172233-64821d5d2107.mod -> google.golang.org%2Fgenproto%2F@v%2Fv0.0.0-20190404172233-64821d5d2107.mod mirror://goproxy//google.golang.org/grpc/@v/v1.14.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.14.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.19.1.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.19.1.mod mirror://goproxy//google.golang.org/grpc/@v/v1.22.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.22.0.mod mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.zip -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.zip mirror://goproxy//google.golang.org/grpc/@v/v1.23.0.mod -> google.golang.org%2Fgrpc%2F@v%2Fv1.23.0.mod mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.zip -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.zip mirror://goproxy//gopkg.in/airbrake/gobrake.v2/@v/v2.0.9.mod -> gopkg.in%2Fairbrake%2Fgobrake.v2%2F@v%2Fv2.0.9.mod mirror://goproxy//gopkg.in/asn1-ber.v1/@v/v1.0.0-20181015200546-f715ec2f112d.mod -> gopkg.in%2Fasn1-ber.v1%2F@v%2Fv1.0.0-20181015200546-f715ec2f112d.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-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.zip -> gopkg.in%2Ffsnotify.v1%2F@v%2Fv1.4.7.zip 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/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.zip -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.zip mirror://goproxy//gopkg.in/gemnasium/logrus-airbrake-hook.v2/@v/v2.1.2.mod -> gopkg.in%2Fgemnasium%2Flogrus-airbrake-hook.v2%2F@v%2Fv2.1.2.mod mirror://goproxy//gopkg.in/inf.v0/@v/v0.9.1.zip -> gopkg.in%2Finf.v0%2F@v%2Fv0.9.1.zip 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/resty.v1/@v/v1.12.0.zip -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.zip mirror://goproxy//gopkg.in/resty.v1/@v/v1.12.0.mod -> gopkg.in%2Fresty.v1%2F@v%2Fv1.12.0.mod mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.zip -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.1.zip mirror://goproxy//gopkg.in/square/go-jose.v2/@v/v2.3.1.mod -> gopkg.in%2Fsquare%2Fgo-jose.v2%2F@v%2Fv2.3.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.8.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.8.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.8.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190102054323-c2f93a96b099.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190102054323-c2f93a96b099.mod mirror://goproxy//honnef.co/go/tools/@v/v0.0.0-20190523083050-ea95bdfd59fc.mod -> honnef.co%2Fgo%2Ftools%2F@v%2Fv0.0.0-20190523083050-ea95bdfd59fc.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20180806132203-61b11ee65332.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20180806132203-61b11ee65332.mod mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.zip -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.zip mirror://goproxy//k8s.io/api/@v/v0.0.0-20190325185214-7544f9db76f6.mod -> k8s.io%2Fapi%2F@v%2Fv0.0.0-20190325185214-7544f9db76f6.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20180821005732-488889b0007f.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20180821005732-488889b0007f.mod mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.zip -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.zip mirror://goproxy//k8s.io/apimachinery/@v/v0.0.0-20190223001710-c182ff3b9841.mod -> k8s.io%2Fapimachinery%2F@v%2Fv0.0.0-20190223001710-c182ff3b9841.mod mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.zip -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.zip mirror://goproxy//k8s.io/client-go/@v/v8.0.0+incompatible.mod -> k8s.io%2Fclient-go%2F@v%2Fv8.0.0+incompatible.mod
_eclasses_=go-module 45394825d9260b479aa1cf252ea58e01 multilib 2477ebe553d3e4d2c606191fe6c33602 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=00207ab3afb14686497d80e0406ebf22
+_md5_=f2dee0f5092cbd16b07366279645345c
diff --git a/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1 b/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
index ed3b8bf21d9b..b20b462ee62c 100644
--- a/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
+++ b/metadata/md5-cache/app-admin/procinfo-ng-2.0.304-r1
@@ -1,13 +1,13 @@
BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DEFINED_PHASES=prepare
-DEPEND=sys-libs/ncurses:0= !app-admin/procinfo
+DEPEND=sys-libs/ncurses:0=
DESCRIPTION=Completely rewrite of the old system monitoring app procinfo
EAPI=7
HOMEPAGE=https://sourceforge.net/projects/procinfo-ng/
KEYWORDS=amd64 hppa x86
LICENSE=|| ( GPL-2 LGPL-2.1 )
-RDEPEND=sys-libs/ncurses:0= !app-admin/procinfo
+RDEPEND=sys-libs/ncurses:0=
SLOT=0
SRC_URI=mirror://sourceforge/procinfo-ng/procinfo-ng-2.0.304.tar.bz2
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=fafda5c12128d954af93b79a6074f982
+_md5_=e26096fb7dbc3ff3ca2565bf634cac47
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index eb1fbcf1182a..43bff8db852d 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/pet2tgz-0.3 b/metadata/md5-cache/app-arch/pet2tgz-0.3-r1
similarity index 82%
rename from metadata/md5-cache/app-arch/pet2tgz-0.3
rename to metadata/md5-cache/app-arch/pet2tgz-0.3-r1
index 71dc3bce2afd..23d9ce697bed 100644
--- a/metadata/md5-cache/app-arch/pet2tgz-0.3
+++ b/metadata/md5-cache/app-arch/pet2tgz-0.3-r1
@@ -1,9 +1,9 @@
DEFINED_PHASES=-
DESCRIPTION=Puppy Linux .pet to .tar.gz converter
-EAPI=4
+EAPI=7
HOMEPAGE=https://sourceforge.net/projects/pet2tgz/
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
SLOT=0
SRC_URI=mirror://sourceforge/pet2tgz/pet2tgz-0.3.tar.gz
-_md5_=5c18991667135df17e321b0c5063e830
+_md5_=546d858ca8913be76831d6eb0b916972
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 01aef9a190c8..d55def8fc2b4 100644
Binary files a/metadata/md5-cache/app-cdr/Manifest.gz and b/metadata/md5-cache/app-cdr/Manifest.gz differ
diff --git a/metadata/md5-cache/app-cdr/cdw-0.8.1-r1 b/metadata/md5-cache/app-cdr/cdw-0.8.1-r1
index d6022d45abce..ccf21657a1cf 100644
--- a/metadata/md5-cache/app-cdr/cdw-0.8.1-r1
+++ b/metadata/md5-cache/app-cdr/cdw-0.8.1-r1
@@ -1,5 +1,5 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure prepare
DEPEND=app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode] virtual/cdrtools
DESCRIPTION=An ncurses based console frontend for cdrtools and dvd+rw-tools
EAPI=7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
RDEPEND=app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode] virtual/cdrtools
SLOT=0
SRC_URI=mirror://sourceforge/cdw/cdw-0.8.1.tar.gz
-_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=465a97b818413633c1fa5c490b87933d
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=ea7a3725bf565167fd2b8a14ac754f2e
diff --git a/metadata/md5-cache/app-cdr/cdw-9999 b/metadata/md5-cache/app-cdr/cdw-9999
index 55ef8457dc84..404c96b0e79f 100644
--- a/metadata/md5-cache/app-cdr/cdw-9999
+++ b/metadata/md5-cache/app-cdr/cdw-9999
@@ -9,4 +9,4 @@ PROPERTIES=live
RDEPEND=app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio:=[-minimal] sys-libs/ncurses:0=[unicode] virtual/cdrtools
SLOT=0
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 cvs 6625b4ea3655a11531b433946cebd6b3 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=8933f1ae479eab8f99878a3bc9a7ece4
+_md5_=1f1d2d03bc17e383003f1288b73db7da
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 2cc684b25a15..a072be044ae6 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/tpm2-tss-2.4.1 b/metadata/md5-cache/app-crypt/tpm2-tss-2.4.1
index c5b925dc81dd..b279ce0bf8a6 100644
--- a/metadata/md5-cache/app-crypt/tpm2-tss-2.4.1
+++ b/metadata/md5-cache/app-crypt/tpm2-tss-2.4.1
@@ -5,7 +5,7 @@ DESCRIPTION=TCG Trusted Platform Module 2.0 Software Stack
EAPI=7
HOMEPAGE=https://github.com/tpm2-software/tpm2-tss
IUSE=doc +fapi gcrypt +openssl static-libs test kernel_linux
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
LICENSE=BSD-2
RDEPEND=acct-group/tss acct-user/tss fapi? ( dev-libs/json-c net-misc/curl ) gcrypt? ( dev-libs/libgcrypt:0= ) openssl? ( dev-libs/openssl:0= ) virtual/tmpfiles
REQUIRED_USE=^^ ( gcrypt openssl ) fapi? ( openssl !gcrypt )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/tpm2-software/tpm2-tss/releases/download/2.4.1/tpm2-tss-2.4.1.tar.gz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 multilib 2477ebe553d3e4d2c606191fe6c33602 tmpfiles 6170dc7770585fb3f16efdee789a3218 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=0b2f6e4627d0f2ed980f003d60c3060f
+_md5_=868cb103ffd7539eade81901512e0bbb
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.14-r1 b/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
deleted file mode 100644
index 6a24a80ee150..000000000000
--- a/metadata/md5-cache/app-crypt/trousers-0.3.14-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/glib-2 !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:0= )
-DESCRIPTION=An open-source TCG Software Stack (TSS) v1.1 implementation
-EAPI=7
-HOMEPAGE=http://trousers.sf.net
-IUSE=doc libressl selinux kernel_linux
-KEYWORDS=amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 x86
-LICENSE=CPL-1.0 GPL-2
-RDEPEND=>=dev-libs/glib-2 !libressl? ( >=dev-libs/openssl-0.9.7:0= ) libressl? ( dev-libs/libressl:0= ) selinux? ( sec-policy/selinux-tcsd )
-SLOT=0
-SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.14.tar.gz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 multilib 2477ebe553d3e4d2c606191fe6c33602 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02
-_md5_=4ed553af69a07c251b5235a1c4bf9803
diff --git a/metadata/md5-cache/app-crypt/trousers-0.3.14-r2 b/metadata/md5-cache/app-crypt/trousers-0.3.14-r2
index f8b7961a876a..4036b02fdf0e 100644
--- a/metadata/md5-cache/app-crypt/trousers-0.3.14-r2
+++ b/metadata/md5-cache/app-crypt/trousers-0.3.14-r2
@@ -11,4 +11,4 @@ RDEPEND=acct-group/tss acct-user/tss >=dev-libs/glib-2 !libressl? ( >=dev-libs/o
SLOT=0
SRC_URI=mirror://sourceforge/trousers/trousers/trousers-0.3.14.tar.gz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 multilib 2477ebe553d3e4d2c606191fe6c33602 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=5661d1892452298ff656dda19034fdc2
+_md5_=de90eb1a08e13957400ea0654c043ef5
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 8d189f29bb6c..4cdeff40da97 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/virtualbox-6.1.10-r1 b/metadata/md5-cache/app-emulation/virtualbox-6.1.10-r1
index 35c297923419..7671d5002977 100644
--- a/metadata/md5-cache/app-emulation/virtualbox-6.1.10-r1
+++ b/metadata/md5-cache/app-emulation/virtualbox-6.1.10-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=java? ( sdk ) python? ( sdk ) vboxwebsrv? ( java ) ^^ ( python_sing
SLOT=0
SRC_URI=https://download.virtualbox.org/virtualbox/6.1.10/VirtualBox-6.1.10.tar.bz2 https://dev.gentoo.org/~polynomial-c/virtualbox/patchsets/virtualbox-6.1.10-patches-01.tar.xz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 16d46032afaca1d6d0621f82084880cb linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 multilib 2477ebe553d3e4d2c606191fe6c33602 pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a tmpfiles 6170dc7770585fb3f16efdee789a3218 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=48211fccd3db1b9744d4933fcff222e9
+_md5_=fc205b1dbd478d80066221a1372b146a
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 05ab2b70be1a..14a6e336ab1c 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/alertmanager-0.21.0 b/metadata/md5-cache/app-metrics/alertmanager-0.21.0
new file mode 100644
index 000000000000..37d3dcd78e52
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/alertmanager-0.21.0
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/promu >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
+EAPI=7
+HOMEPAGE=https://github.com/prometheus/alertmanager
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 MIT MPL-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.21.0.tar.gz -> alertmanager-0.21.0.tar.gz
+_eclasses_=go-module 45394825d9260b479aa1cf252ea58e01 user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=7f583542e7faa0c27a62fce1fafbba37
diff --git a/metadata/md5-cache/app-metrics/prometheus-2.19.1 b/metadata/md5-cache/app-metrics/prometheus-2.19.1
new file mode 100644
index 000000000000..4abf12a282a0
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/prometheus-2.19.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/promu-0.3.0 >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DEPEND=!app-metrics/prometheus-bin
+DESCRIPTION=Prometheus monitoring system and time series database
+EAPI=7
+HOMEPAGE=https://github.com/prometheus/prometheus
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/prometheus/prometheus/archive/v2.19.1.tar.gz -> prometheus-2.19.1.tar.gz https://dev.gentoo.org/~williamh/dist/prometheus-2.19.1-assets.tar.gz
+_eclasses_=go-module 45394825d9260b479aa1cf252ea58e01 user 7b7fc6ec5eb1c1eee55b0609f01e7362 user-info a2abd4e2f4c3b9b06d64bf1329359a02
+_md5_=fe901c8a53904bc4cfce8b3e978040cf
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 3e49668ecce8..69825d6c103b 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/lfm-2.3-r1 b/metadata/md5-cache/app-misc/lfm-2.3-r1
deleted file mode 100644
index 7218cd0452c1..000000000000
--- a/metadata/md5-cache/app-misc/lfm-2.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Last File Manager is a powerful file manager for the console
-EAPI=5
-HOMEPAGE=https://inigo.katxi.org/devel/lfm/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://inigo.katxi.org/devel/lfm/lfm-2.3.tar.gz
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 44725b3eb803b8abcd6978759c231210 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=6adeb9c9cd5c235a7acbc0da8bd1d0ac
diff --git a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14 b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
similarity index 80%
rename from metadata/md5-cache/app-misc/oneko-1.2_p6_p14
rename to metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
index 8d1da21e5658..ffae6da7e956 100644
--- a/metadata/md5-cache/app-misc/oneko-1.2_p6_p14
+++ b/metadata/md5-cache/app-misc/oneko-1.2_p6_p14-r1
@@ -1,5 +1,6 @@
+BDEPEND=app-text/rman x11-misc/gccmakedep x11-misc/imake
DEFINED_PHASES=compile configure install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext app-text/rman x11-base/xorg-proto x11-misc/gccmakedep x11-misc/imake
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-base/xorg-proto
DESCRIPTION=A cat, dog and others which chase the mouse or windows around the screen
EAPI=7
HOMEPAGE=http://www.daidouji.com/oneko/
@@ -9,4 +10,4 @@ RDEPEND=x11-libs/libX11 x11-libs/libXext
SLOT=0
SRC_URI=mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6-14.debian.tar.xz mirror://debian/pool/main/o/oneko/oneko_1.2.sakura.6.orig.tar.gz mirror://gentoo/oneko-1.2-cat.png mirror://gentoo/oneko-1.2-dog.png
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=ea6025fa68a4c64222d354d28f9af0a3
+_md5_=8adf0d70edf21957ad75c62a20ca8f08
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 88d365242b27..82e517996f7a 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/homebank-5.2.8 b/metadata/md5-cache/app-office/homebank-5.2.8
index 9a39ffb89f02..c960423bb4cf 100644
--- a/metadata/md5-cache/app-office/homebank-5.2.8
+++ b/metadata/md5-cache/app-office/homebank-5.2.8
@@ -4,10 +4,10 @@ DESCRIPTION=Free, easy, personal accounting for everyone
EAPI=6
HOMEPAGE=http://homebank.free.fr/index.php
IUSE=+ofx
-KEYWORDS=~amd64 ppc ~ppc64 x86
+KEYWORDS=amd64 ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.39 >=net-libs/libsoup-2.26 x11-libs/cairo x11-libs/gdk-pixbuf >=x11-libs/gtk+-3.22:3 x11-libs/pango ofx? ( >=dev-libs/libofx-0.8.3 )
SLOT=0
SRC_URI=http://homebank.free.fr/public/homebank-5.2.8.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=70cda77ebd6d578a734d6f0675a30ef3
+_md5_=b0720f4802c3305a1dcc2777a67c3b10
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index bb757e7cf2d0..528f1edc5c67 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/convmv-2.05-r1 b/metadata/md5-cache/app-text/convmv-2.05-r1
new file mode 100644
index 000000000000..463e8da09a81
--- /dev/null
+++ b/metadata/md5-cache/app-text/convmv-2.05-r1
@@ -0,0 +1,12 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=convert filenames to utf8 or any other charset
+EAPI=7
+HOMEPAGE=https://www.j3e.de/linux/convmv/
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl
+SLOT=0
+SRC_URI=https://www.j3e.de/linux/convmv/convmv-2.05.tar.gz
+_md5_=d90868758f9f3e6f6c708263b7dfdc6d
diff --git a/metadata/md5-cache/app-text/grip-4.2.0 b/metadata/md5-cache/app-text/grip-4.2.0
deleted file mode 100644
index e938fd3a0f22..000000000000
--- a/metadata/md5-cache/app-text/grip-4.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Preview GitHub Markdown files like Readme locally before committing them
-EAPI=6
-HOMEPAGE=https://github.com/joeyespo/grip
-IUSE=python_targets_pypy3 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/docopt-0.6.2 >=dev-python/flask-0.10.1 >=dev-python/markdown-2.5.1 >=dev-python/path-and-address-1.0.0 >=dev-python/pygments-1.6 >=dev-python/requests-2.4.1 python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/g/grip/grip-4.2.0.zip
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 distutils-r1 44725b3eb803b8abcd6978759c231210 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=2a1af4c9a7fc9f8e86f66f1b61747900
diff --git a/metadata/md5-cache/app-text/q-text-as-data-1.5.0 b/metadata/md5-cache/app-text/q-text-as-data-1.5.0
deleted file mode 100644
index 8c8a1a77a617..000000000000
--- a/metadata/md5-cache/app-text/q-text-as-data-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=A CLI tool that allows direct execution of SQL-like queries on text
-EAPI=5
-HOMEPAGE=http://harelba.github.io/q/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/harelba/q/archive/1.5.0.tar.gz -> q-1.5.0.tar.gz
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=80b836c63cd682eaa68a27470e3a25a6
diff --git a/metadata/md5-cache/app-text/q-text-as-data-2.0.10 b/metadata/md5-cache/app-text/q-text-as-data-2.0.10
new file mode 100644
index 000000000000..f97f397d804e
--- /dev/null
+++ b/metadata/md5-cache/app-text/q-text-as-data-2.0.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) 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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] || ( ( dev-lang/python:3.9[sqlite] dev-python/six[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/flake8[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[sqlite] dev-python/six[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flake8[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite] dev-python/six[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/flake8[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite] dev-python/six[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/flake8[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] dev-python/six[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/flake8[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+DESCRIPTION=A CLI tool that allows direct execution of SQL-like queries on text
+EAPI=7
+HOMEPAGE=http://harelba.github.io/q/
+IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) 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_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] || ( ( dev-lang/python:3.9[sqlite] dev-python/six[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/flake8[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8[sqlite] dev-python/six[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/flake8[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7[sqlite] dev-python/six[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/flake8[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6[sqlite] dev-python/six[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/flake8[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] dev-python/six[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/flake8[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/harelba/q/archive/2.0.10.tar.gz -> q-2.0.10.tar.gz
+_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=4728534a04a792911e84c3dce6a6d20c
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index bb12be0681b4..28e02f1aa7bb 100644
Binary files a/metadata/md5-cache/dev-ada/Manifest.gz and b/metadata/md5-cache/dev-ada/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020 b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020
index e0eee8e6c198..23ba174245ee 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020
+++ b/metadata/md5-cache/dev-ada/gnatcoll-bindings-2020
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) ) ^^ ( ada_target_g
SLOT=0
SRC_URI=https://community.download.adacore.com/v1/3c54db553121bf88877e2f56ac4fca36765186eb?filename=gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz -> gnatcoll-bindings-20.0-20191009-1B2EA-src.tar.gz
_eclasses_=ada 9205d12ceb057a9282bea2a773e7c681 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=92e3efd7a017a702c3844443b9ac4b6c
+_md5_=5c08e2527e62d8af90029bf29a31c61d
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 23d0c8af6a06..89f2a29802b7 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/pgxnclient-1.3 b/metadata/md5-cache/dev-db/pgxnclient-1.3-r2
similarity index 85%
rename from metadata/md5-cache/dev-db/pgxnclient-1.3
rename to metadata/md5-cache/dev-db/pgxnclient-1.3-r2
index a2e464f6a7ae..e26d3c0aeb01 100644
--- a/metadata/md5-cache/dev-db/pgxnclient-1.3
+++ b/metadata/md5-cache/dev-db/pgxnclient-1.3-r2
@@ -1,16 +1,16 @@
BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-db/postgresql:*[server] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DEPEND=dev-db/postgresql:*[server] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
DESCRIPTION=PostgreSQL Extension Network Client
EAPI=7
HOMEPAGE=http://pgxnclient.projects.postgresql.org/ https://pypi.org/project/pgxnclient
-IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
LICENSE=BSD
RDEPEND=dev-db/postgresql:*[server] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
-RESTRICT=test !test? ( test ) !test? ( test )
+RESTRICT=test !test? ( test )
SLOT=0
SRC_URI=mirror://pypi/p/pgxnclient/pgxnclient-1.3.tar.gz
_eclasses_=distutils-r1 44725b3eb803b8abcd6978759c231210 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=2d6ad9e727804b32dff5def95c12af29
+_md5_=364323f5b4a48d137b3f8c1638ba1d66
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index dff933ce96b5..63dada80a3fa 100644
Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1-r1 b/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1-r1
index 982c013e2f1c..f55358685c45 100644
--- a/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1-r1
+++ b/metadata/md5-cache/dev-haskell/lhs2tex-1.18.1-r1
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience >=dev-haskell/cabal-1.10 dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1
+DEPEND=dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience >=dev-haskell/cabal-1.10 dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1
DESCRIPTION=Preprocessor for typesetting Haskell sources with LaTeX
EAPI=5
HOMEPAGE=http://www.andres-loeh.de/lhs2tex/
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience
+RDEPEND=dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience
SLOT=0
SRC_URI=https://hackage.haskell.org/package/lhs2tex-1.18.1/lhs2tex-1.18.1.tar.gz
_eclasses_=base 2ec5c64f5de125f0c65a927c4c128fef desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79c796696d5758a3b61fb77816a65829
+_md5_=deab6258625ee822c0ebecdc2b163991
diff --git a/metadata/md5-cache/dev-haskell/lhs2tex-1.19-r1 b/metadata/md5-cache/dev-haskell/lhs2tex-1.19-r1
index 9d33ce1f28a2..ece54986622c 100644
--- a/metadata/md5-cache/dev-haskell/lhs2tex-1.19-r1
+++ b/metadata/md5-cache/dev-haskell/lhs2tex-1.19-r1
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience >=dev-haskell/cabal-1.10 dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1
+DEPEND=dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience >=dev-haskell/cabal-1.10 dev-haskell/mtl dev-haskell/regex-compat >=dev-lang/ghc-6.12.1
DESCRIPTION=Preprocessor for typesetting Haskell sources with LaTeX
EAPI=5
HOMEPAGE=http://www.andres-loeh.de/lhs2tex/
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=>=dev-tex/polytable-0.8.2 dev-texlive/texlive-mathscience
+RDEPEND=dev-texlive/texlive-latexextra dev-texlive/texlive-mathscience
SLOT=0
SRC_URI=https://hackage.haskell.org/package/lhs2tex-1.19/lhs2tex-1.19.tar.gz
_eclasses_=base 2ec5c64f5de125f0c65a927c4c128fef desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 ghc-package e3a4a688accbd5f1226e46b379cc1c3e haskell-cabal 433b5153bec6b0ffe21c7be2210e8396 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79c796696d5758a3b61fb77816a65829
+_md5_=deab6258625ee822c0ebecdc2b163991
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index ceee90733e51..00c7fe18e464 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/qu-prolog-10.5 b/metadata/md5-cache/dev-lang/qu-prolog-10.5
new file mode 100644
index 000000000000..8007b2bb2335
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/qu-prolog-10.5
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=!dev-util/mpatch !dev-util/rej qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) pedro? ( net-misc/pedro ) readline? ( app-misc/rlwrap ) dev-lang/perl
+DESCRIPTION=Extended Prolog supporting quantifiers, object-variables and substitutions
+EAPI=7
+HOMEPAGE=http://www.itee.uq.edu.au/~pjr/HomePages/QuPrologHome.html
+IUSE=debug doc examples pedro qt5 readline threads
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Apache-2.0 GPL-2+
+RDEPEND=!dev-util/mpatch !dev-util/rej qt5? ( dev-qt/qtwidgets:5 dev-qt/qtgui:5 ) pedro? ( net-misc/pedro ) readline? ( app-misc/rlwrap )
+SLOT=0
+SRC_URI=http://www.itee.uq.edu.au/~pjr/HomePages/QPFiles/qp10.5.tar.gz
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=590187d20660af6a92858b318ba3d606
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 8421cb5d2b02..7a0f978aaf20 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/libclangformat-ide-10.0.0 b/metadata/md5-cache/dev-libs/libclangformat-ide-10.0.0
new file mode 100644
index 000000000000..d47db9d547ac
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libclangformat-ide-10.0.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-10.0.0:10=[debug=] !!sys-devel/llvm:0
+DESCRIPTION=A static clangformat library patched for IDE use
+EAPI=7
+HOMEPAGE=https://www.qt.io/blog/2019/04/17/clangformat-plugin-qt-creator-4-9
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+SLOT=10
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
+_eclasses_=cmake 19b0421555865baefd505831dd4303e3 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 llvm 78f8b6f29bd3b0263a4c9a3785e5af71 llvm.org de1162ce05041c923a8c6efc9175fb66 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce74c5307bfe422894fe175359b0331c
diff --git a/metadata/md5-cache/dev-libs/libclangformat-ide-9.0.1 b/metadata/md5-cache/dev-libs/libclangformat-ide-9.0.1
new file mode 100644
index 000000000000..cf1f6eaab256
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libclangformat-ide-9.0.1
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-9.0.1:9=[debug=] !!sys-devel/llvm:0
+DESCRIPTION=A static clangformat library patched for IDE use
+EAPI=7
+HOMEPAGE=https://www.qt.io/blog/2019/04/17/clangformat-plugin-qt-creator-4-9
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
+SLOT=9
+SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-9.0.1.tar.gz
+_eclasses_=cmake 19b0421555865baefd505831dd4303e3 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 llvm 78f8b6f29bd3b0263a4c9a3785e5af71 llvm.org de1162ce05041c923a8c6efc9175fb66 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=ce74c5307bfe422894fe175359b0331c
diff --git a/metadata/md5-cache/dev-libs/libinput-1.15.4 b/metadata/md5-cache/dev-libs/libinput-1.15.4
deleted file mode 100644
index 884e17031d61..000000000000
--- a/metadata/md5-cache/dev-libs/libinput-1.15.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( || ( ( dev-lang/python:3.7 dev-python/commonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/recommonmark[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/commonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/recommonmark[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] >=dev-python/sphinx_rtd_theme-0.2.4[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev test? ( >=dev-libs/check-0.9.10 )
-DESCRIPTION=Library to handle input devices in Wayland
-EAPI=7
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/ https://gitlab.freedesktop.org/libinput/libinput
-IUSE=doc input_devices_wacom test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
-RESTRICT=!test? ( test )
-SLOT=0/10
-SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.15.4.tar.xz
-_eclasses_=meson 8f7dc8ed2d76af0b33328789c017e677 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6
-_md5_=86dca6f59debc47c3de97d0ebb23f288
diff --git a/metadata/md5-cache/dev-libs/libjcat-0.1.3 b/metadata/md5-cache/dev-libs/libjcat-0.1.3
index 4b3515063378..a8283c1e0546 100644
--- a/metadata/md5-cache/dev-libs/libjcat-0.1.3
+++ b/metadata/md5-cache/dev-libs/libjcat-0.1.3
@@ -5,11 +5,11 @@ DESCRIPTION=Library and tool for reading and writing Jcat files
EAPI=7
HOMEPAGE=https://github.com/hughsie/libjcat
IUSE=gpg gtk-doc +introspection +man pkcs7 test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-2.1+
RDEPEND=dev-libs/glib:2 dev-libs/json-glib:= gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) introspection? ( dev-libs/gobject-introspection:= ) pkcs7? ( net-libs/gnutls ) dev-lang/vala:=
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/hughsie/libjcat/archive/0.1.3.tar.gz -> libjcat-0.1.3.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 meson 8f7dc8ed2d76af0b33328789c017e677 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 5b72a65a36d681d65aef5f7b4b8b2cb6 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=5e938e4a426c83bf43f7def971fdc039
+_md5_=410ce45837c631d5b5bc2b9a726cd0d7
diff --git a/metadata/md5-cache/dev-libs/libxmlb-0.1.15 b/metadata/md5-cache/dev-libs/libxmlb-0.1.15
index 792a3995ad8e..cd33378ad443 100644
--- a/metadata/md5-cache/dev-libs/libxmlb-0.1.15
+++ b/metadata/md5-cache/dev-libs/libxmlb-0.1.15
@@ -5,11 +5,11 @@ DESCRIPTION=Library to help create and query binary XML blobs
EAPI=7
HOMEPAGE=https://github.com/hughsie/libxmlb
IUSE=doc introspection stemmer test
-KEYWORDS=~amd64 ~arm ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=LGPL-2.1+
RDEPEND=dev-libs/glib:2 sys-apps/util-linux stemmer? ( dev-libs/snowball-stemmer )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/hughsie/libxmlb/archive/0.1.15.tar.gz -> libxmlb-0.1.15.tar.gz
_eclasses_=meson 8f7dc8ed2d76af0b33328789c017e677 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=97216492020d49e84b2939e2758cd2c6
+_md5_=36a966216b9b10f8169f31ecce11153e
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index d35abd8dc215..0baeec1bee09 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/moto-1.3.14-r1 b/metadata/md5-cache/dev-python/moto-1.3.14-r1
index 39954f1888f3..1c6456e2235f 100644
--- a/metadata/md5-cache/dev-python/moto-1.3.14-r1
+++ b/metadata/md5-cache/dev-python/moto-1.3.14-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Mock library for boto
EAPI=7
HOMEPAGE=https://github.com/spulec/moto
IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
RDEPEND=>=dev-python/aws-xray-sdk-python-0.93[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-python/backports-tempfile[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/backports-tempfile[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/cfn-python-lint[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/cryptography-2.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/cookies[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/dicttoxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/docker-py-2.5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jsondiff-1.1.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/boto-2.36.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/boto3-1.9.201[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/botocore-1.12.201[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/flask[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pretty-yaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/python-dateutil-2.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytz[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-dateutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-jose[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/python-sshpubkeys[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/responses-0.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/requests-2.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/xmltodict[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
SLOT=0
SRC_URI=mirror://pypi/m/moto/moto-1.3.14.tar.gz
_eclasses_=distutils-r1 44725b3eb803b8abcd6978759c231210 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=676c73646defc2085506764b9b256e75
+_md5_=a41af44de67498ece19e06bf290a7f38
diff --git a/metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0 b/metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0
index 86e066e8b732..9694b9bba678 100644
--- a/metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0
+++ b/metadata/md5-cache/dev-python/python-sshpubkeys-3.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=OpenSSH public key parser for Python
EAPI=7
HOMEPAGE=https://pypi.org/project/sshpubkeys/ https://github.com/ojarva/python-sshpubkeys
IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=dev-python/cryptography[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/ecdsa[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_6 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/ojarva/python-sshpubkeys/archive/v3.1.0.tar.gz -> python-sshpubkeys-3.1.0.tar.gz
_eclasses_=distutils-r1 44725b3eb803b8abcd6978759c231210 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=b64396b2ac090dcdefa87559a68f281a
+_md5_=ed06ac2a639662b0a9bb0eddf99c1014
diff --git a/metadata/md5-cache/dev-python/yapf-0.30.0 b/metadata/md5-cache/dev-python/yapf-0.30.0
index 1b7d7e426a42..c7a7e3165776 100644
--- a/metadata/md5-cache/dev-python/yapf-0.30.0
+++ b/metadata/md5-cache/dev-python/yapf-0.30.0
@@ -4,11 +4,11 @@ DESCRIPTION=A formatter for Python files
EAPI=7
HOMEPAGE=https://github.com/google/yapf
IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
SLOT=0
SRC_URI=https://github.com/google/yapf/archive/v0.30.0.tar.gz -> yapf-0.30.0.tar.gz
_eclasses_=distutils-r1 44725b3eb803b8abcd6978759c231210 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=50b208fcd82529039af36a01b9471068
+_md5_=3005750191f54afbed963192616e0ed1
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 632c6aeec798..8d31212345c6 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qt-creator-4.12.0 b/metadata/md5-cache/dev-qt/qt-creator-4.12.0
deleted file mode 100644
index fa1be4d8c810..000000000000
--- a/metadata/md5-cache/dev-qt/qt-creator-4.12.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=>=dev-cpp/yaml-cpp-0.6.2 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 clang? ( >=sys-devel/clang-9.0.1:= ) designer? ( >=dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) >=dev-qt/linguist-tools-5.12.3:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.12.3:5 ) test? ( >=dev-qt/qtdeclarative-5.12.3:5[localstorage] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5[qml] ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
-EAPI=7
-HOMEPAGE=https://doc.qt.io/qtcreator/
-IUSE=doc systemd test +webengine android +autotest baremetal beautifier boot2qt +clang clearcase cmake cppcheck ctfvisualizer cvs +designer git glsl +help ios +lsp mercurial modeling nim perforce perfprofiler python qbs +qmldesigner qmlprofiler qnx remotelinux scxml serialterminal silversearcher subversion valgrind winrt l10n_cs l10n_da l10n_de l10n_fr l10n_ja l10n_pl l10n_ru l10n_sl l10n_uk l10n_zh-CN l10n_zh-TW test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-cpp/yaml-cpp-0.6.2 >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 clang? ( >=sys-devel/clang-9.0.1:= ) designer? ( >=dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) sys-devel/gdb[client,python] cmake? ( dev-util/cmake ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_da? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_de? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.12.3:5 )
-REQUIRED_USE=clang? ( test? ( qbs ) ) qnx? ( remotelinux ) boot2qt? ( remotelinux ) python? ( lsp )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://download.qt.io/official_releases/qtcreator/4.12/4.12.0/qt-creator-opensource-src-4.12.0.tar.xz
-_eclasses_=estack 686eaab303305a908fd57b2fd7617800 llvm 78f8b6f29bd3b0263a4c9a3785e5af71 multilib 2477ebe553d3e4d2c606191fe6c33602 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=175c27fc75745a19fbdf76395fb35bb5
diff --git a/metadata/md5-cache/dev-qt/qt-creator-4.12.3 b/metadata/md5-cache/dev-qt/qt-creator-4.12.3
new file mode 100644
index 000000000000..e9a96bf6b515
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt-creator-4.12.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-qt/linguist-tools-5.12.3:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.12.3:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-cpp/yaml-cpp-0.6.2:= >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 kde-frameworks/syntax-highlighting:5 clang? ( || ( ( sys-devel/clang:10 dev-libs/libclangformat-ide:10 ) ( sys-devel/clang:9 dev-libs/libclangformat-ide:9 ) ) =dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) test? ( >=dev-qt/qtdeclarative-5.12.3:5[localstorage] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5[qml] ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
+EAPI=7
+HOMEPAGE=https://doc.qt.io/qtcreator/
+IUSE=doc systemd test +webengine android +autotest baremetal beautifier boot2qt +clang clearcase cmake cppcheck ctfvisualizer cvs +designer git glsl +help ios lsp mcu mercurial modeling nim perforce perfprofiler python qbs +qmldesigner qmlprofiler qnx remotelinux scxml serialterminal silversearcher subversion valgrind webassembly winrt l10n_cs l10n_da l10n_de l10n_fr l10n_ja l10n_pl l10n_ru l10n_sl l10n_uk l10n_zh-CN l10n_zh-TW test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-cpp/yaml-cpp-0.6.2:= >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 kde-frameworks/syntax-highlighting:5 clang? ( || ( ( sys-devel/clang:10 dev-libs/libclangformat-ide:10 ) ( sys-devel/clang:9 dev-libs/libclangformat-ide:9 ) ) =dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) sys-devel/gdb[client,python] cmake? ( dev-util/cmake ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) qmldesigner? ( >=dev-qt/qtquicktimeline-5.12.3:5 ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_da? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_de? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.12.3:5 )
+REQUIRED_USE=boot2qt? ( remotelinux ) clang? ( test? ( qbs ) ) mcu? ( cmake ) python? ( lsp ) qnx? ( remotelinux )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.qt.io/official_releases/qtcreator/4.12/4.12.3/qt-creator-opensource-src-4.12.3.tar.xz
+_eclasses_=estack 686eaab303305a908fd57b2fd7617800 llvm 78f8b6f29bd3b0263a4c9a3785e5af71 multilib 2477ebe553d3e4d2c606191fe6c33602 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=629bd68f5b2047f86febbc1f2f46feff
diff --git a/metadata/md5-cache/dev-qt/qt-creator-9999 b/metadata/md5-cache/dev-qt/qt-creator-9999
index caee0b4e4a55..662e1963553f 100644
--- a/metadata/md5-cache/dev-qt/qt-creator-9999
+++ b/metadata/md5-cache/dev-qt/qt-creator-9999
@@ -1,15 +1,15 @@
-BDEPEND=test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-qt/linguist-tools-5.12.3:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.12.3:5 ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 clang? ( sys-devel/clang:8= ) designer? ( >=dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) >=dev-qt/linguist-tools-5.12.3:5 virtual/pkgconfig doc? ( >=dev-qt/qdoc-5.12.3:5 ) test? ( >=dev-qt/qtdeclarative-5.12.3:5[localstorage] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5[qml] ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-cpp/yaml-cpp-0.6.2:= >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 kde-frameworks/syntax-highlighting:5 clang? ( || ( ( sys-devel/clang:10 dev-libs/libclangformat-ide:10 ) ( sys-devel/clang:9 dev-libs/libclangformat-ide:9 ) ) =dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) test? ( >=dev-qt/qtdeclarative-5.12.3:5[localstorage] >=dev-qt/qtquickcontrols2-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtxmlpatterns-5.12.3:5[qml] ) !!sys-devel/llvm:0 dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Lightweight IDE for C++/QML development centering around Qt
EAPI=7
HOMEPAGE=https://doc.qt.io/qtcreator/
IUSE=doc systemd test +webengine android +autotest baremetal beautifier boot2qt +clang clearcase cmake cppcheck ctfvisualizer cvs +designer git glsl +help ios lsp mcu mercurial modeling nim perforce perfprofiler python qbs +qmldesigner qmlprofiler qnx remotelinux scxml serialterminal silversearcher subversion valgrind webassembly winrt l10n_cs l10n_da l10n_de l10n_fr l10n_ja l10n_pl l10n_ru l10n_sl l10n_uk l10n_zh-CN l10n_zh-TW test
LICENSE=GPL-3
PROPERTIES=live
-RDEPEND=>=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 clang? ( sys-devel/clang:8= ) designer? ( >=dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) sys-devel/gdb[client,python] cmake? ( dev-util/cmake ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_da? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_de? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.12.3:5 )
+RDEPEND=>=dev-cpp/yaml-cpp-0.6.2:= >=dev-qt/qtconcurrent-5.12.3:5 >=dev-qt/qtcore-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5[ssl] >=dev-qt/qtprintsupport-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtscript-5.12.3:5 >=dev-qt/qtsql-5.12.3:5[sqlite] >=dev-qt/qtsvg-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtx11extras-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 kde-frameworks/syntax-highlighting:5 clang? ( || ( ( sys-devel/clang:10 dev-libs/libclangformat-ide:10 ) ( sys-devel/clang:9 dev-libs/libclangformat-ide:9 ) ) =dev-qt/designer-5.12.3:5 ) help? ( >=dev-qt/qthelp-5.12.3:5 webengine? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) ) perfprofiler? ( dev-libs/elfutils ) qbs? ( >=dev-util/qbs-1.13.1 ) serialterminal? ( >=dev-qt/qtserialport-5.12.3:5 ) systemd? ( sys-apps/systemd:= ) sys-devel/gdb[client,python] cmake? ( dev-util/cmake ) cppcheck? ( dev-util/cppcheck ) cvs? ( dev-vcs/cvs ) git? ( dev-vcs/git ) mercurial? ( dev-vcs/mercurial ) qmldesigner? ( >=dev-qt/qtquicktimeline-5.12.3:5 ) silversearcher? ( sys-apps/the_silver_searcher ) subversion? ( dev-vcs/subversion ) valgrind? ( dev-util/valgrind ) l10n_cs? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_da? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_de? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_fr? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ja? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_pl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_ru? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_sl? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_uk? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-CN? ( >=dev-qt/qttranslations-5.12.3:5 ) l10n_zh-TW? ( >=dev-qt/qttranslations-5.12.3:5 )
REQUIRED_USE=boot2qt? ( remotelinux ) clang? ( test? ( qbs ) ) mcu? ( cmake ) python? ( lsp ) qnx? ( remotelinux )
RESTRICT=!test? ( test )
SLOT=0
_eclasses_=estack 686eaab303305a908fd57b2fd7617800 git-r3 86a0188f2ad9eb3d65e4d031ab8a0422 llvm 78f8b6f29bd3b0263a4c9a3785e5af71 multilib 2477ebe553d3e4d2c606191fe6c33602 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=68c1779bb84e87db6a0d0950a90d051d
+_md5_=629bd68f5b2047f86febbc1f2f46feff
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.14.2_p202003291239-r1 b/metadata/md5-cache/dev-qt/qt-docs-5.14.2_p202003291239-r1
new file mode 100644
index 000000000000..7a35533afc50
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.14.2_p202003291239-r1
@@ -0,0 +1,12 @@
+BDEPEND=app-arch/p7zip media-libs/libpng:0
+DEFINED_PHASES=install prepare
+DESCRIPTION=Qt5 documentation, for use with Qt Creator and other tools
+EAPI=7
+HOMEPAGE=https://doc.qt.io/
+IUSE=charts datavis +html networkauth +qch script timeline virtualkeyboard webengine +sql +x11extras +declarative +svg +linguist +printsupport +imageformats +gui +webview +dbus +assistant +help +network +bluetooth +3d +xml +core +quickcontrols +qdoc +location +scxml +speech +webchannel +quickcontrols2 +graphicaleffects +concurrent +sensors +multimedia +websockets +serialport +xmlpatterns +wayland +serialbus +test +opengl +gamepad +positioning +designer +widgets
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=FDL-1.3
+REQUIRED_USE=|| ( html qch )
+SLOT=5
+SRC_URI=charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtcharts/5.14.2-0-202003291239qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtdatavis3d/5.14.2-0-202003291239qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtnetworkauth/5.14.2-0-202003291239qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtscript/5.14.2-0-202003291239qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtscript/5.14.2-0-202003291239qtscripttools-documentation.7z ) timeline? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtquicktimeline/5.14.2-0-202003291239qtquicktimeline-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtvirtualkeyboard/5.14.2-0-202003291239qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc.qtwebengine/5.14.2-0-202003291239qtwebengine-documentation.7z ) sql? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtsql-documentation.7z ) x11extras? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtx11extras-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtqml-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtqmltest-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtquick-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtquickdialogs-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtquickextras-documentation.7z ) svg? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtsvg-documentation.7z ) linguist? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtlinguist-documentation.7z ) printsupport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtprintsupport-documentation.7z ) imageformats? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtimageformats-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtgui-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtplatformheaders-documentation.7z ) webview? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtwebview-documentation.7z ) dbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtdbus-documentation.7z ) assistant? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtassistant-documentation.7z ) help? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qthelp-documentation.7z ) network? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtnetwork-documentation.7z ) bluetooth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtbluetooth-documentation.7z ) 3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qt3d-documentation.7z ) xml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtxml-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtcore-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qmake-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtdoc-documentation.7z ) quickcontrols? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtquickcontrols1-documentation.7z ) qdoc? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qdoc-documentation.7z ) location? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtlocation-documentation.7z ) scxml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtscxml-documentation.7z ) speech? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtspeech-documentation.7z ) webchannel? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtwebchannel-documentation.7z ) quickcontrols2? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtquickcontrols-documentation.7z ) graphicaleffects? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtgraphicaleffects-documentation.7z ) concurrent? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtconcurrent-documentation.7z ) sensors? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtsensors-documentation.7z ) multimedia? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtmultimedia-documentation.7z ) websockets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtwebsockets-documentation.7z ) serialport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtserialport-documentation.7z ) xmlpatterns? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtxmlpatterns-documentation.7z ) wayland? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtwaylandcompositor-documentation.7z ) serialbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtserialbus-documentation.7z ) test? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qttestlib-documentation.7z ) opengl? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtopengl-documentation.7z ) gamepad? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtgamepad-documentation.7z ) positioning? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtpositioning-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtdesigner-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtuitools-documentation.7z ) widgets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5142_src_doc_examples/qt.qt5.5142.doc/5.14.2-0-202003291239qtwidgets-documentation.7z )
+_md5_=11ec886844732c7194987de7f3c0c4f6
diff --git a/metadata/md5-cache/dev-qt/qt-docs-5.15.0_p202005140838 b/metadata/md5-cache/dev-qt/qt-docs-5.15.0_p202005140838
index 81a8781a4cc7..49b47bf4c9cb 100644
--- a/metadata/md5-cache/dev-qt/qt-docs-5.15.0_p202005140838
+++ b/metadata/md5-cache/dev-qt/qt-docs-5.15.0_p202005140838
@@ -3,10 +3,10 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Qt5 documentation, for use with Qt Creator and other tools
EAPI=7
HOMEPAGE=https://doc.qt.io/
-IUSE=charts datavis +html networkauth +qch script virtualkeyboard webengine +sql +x11extras +declarative +svg +linguist +printsupport +imageformats +gui +webview +dbus +assistant +help +network +bluetooth +3d +xml +core +quickcontrols +qdoc +location +scxml +speech +webchannel +quickcontrols2 +graphicaleffects +concurrent +sensors +multimedia +websockets +serialport +xmlpatterns +wayland +serialbus +test +opengl +gamepad +positioning +designer +widgets
+IUSE=charts datavis +html networkauth +qch script timeline virtualkeyboard webengine +sql +x11extras +declarative +svg +linguist +printsupport +imageformats +gui +webview +dbus +assistant +help +network +bluetooth +3d +xml +core +quickcontrols +qdoc +location +scxml +speech +webchannel +quickcontrols2 +graphicaleffects +concurrent +sensors +multimedia +websockets +serialport +xmlpatterns +wayland +serialbus +test +opengl +gamepad +positioning +designer +widgets
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
LICENSE=FDL-1.3
REQUIRED_USE=|| ( html qch )
SLOT=5
-SRC_URI=charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtcharts/5.15.0-0-202005140838qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtdatavis3d/5.15.0-0-202005140838qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtnetworkauth/5.15.0-0-202005140838qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtscript/5.15.0-0-202005140838qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtscript/5.15.0-0-202005140838qtscripttools-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtvirtualkeyboard/5.15.0-0-202005140838qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtwebengine/5.15.0-0-202005140838qtwebengine-documentation.7z ) sql? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsql-documentation.7z ) x11extras? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtx11extras-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtqml-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtqmltest-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquick-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickdialogs-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickextras-documentation.7z ) svg? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsvg-documentation.7z ) linguist? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtlinguist-documentation.7z ) printsupport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtprintsupport-documentation.7z ) imageformats? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtimageformats-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgui-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtplatformheaders-documentation.7z ) webview? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebview-documentation.7z ) dbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdbus-documentation.7z ) assistant? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtassistant-documentation.7z ) help? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qthelp-documentation.7z ) network? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtnetwork-documentation.7z ) bluetooth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtbluetooth-documentation.7z ) 3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qt3d-documentation.7z ) xml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtxml-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtcore-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qmake-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdoc-documentation.7z ) quickcontrols? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickcontrols1-documentation.7z ) qdoc? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qdoc-documentation.7z ) location? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtlocation-documentation.7z ) scxml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtscxml-documentation.7z ) speech? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtspeech-documentation.7z ) webchannel? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebchannel-documentation.7z ) quickcontrols2? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickcontrols-documentation.7z ) graphicaleffects? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgraphicaleffects-documentation.7z ) concurrent? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtconcurrent-documentation.7z ) sensors? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsensors-documentation.7z ) multimedia? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtmultimedia-documentation.7z ) websockets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebsockets-documentation.7z ) serialport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtserialport-documentation.7z ) xmlpatterns? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtxmlpatterns-documentation.7z ) wayland? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwaylandcompositor-documentation.7z ) serialbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtserialbus-documentation.7z ) test? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qttestlib-documentation.7z ) opengl? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtopengl-documentation.7z ) gamepad? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgamepad-documentation.7z ) positioning? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtpositioning-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdesigner-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtuitools-documentation.7z ) widgets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwidgets-documentation.7z )
-_md5_=92af700aed84f015220b80722b417234
+SRC_URI=charts? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtcharts/5.15.0-0-202005140838qtcharts-documentation.7z ) datavis? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtdatavis3d/5.15.0-0-202005140838qtdatavisualization-documentation.7z ) networkauth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtnetworkauth/5.15.0-0-202005140838qtnetworkauth-documentation.7z ) script? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtscript/5.15.0-0-202005140838qtscript-documentation.7z https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtscript/5.15.0-0-202005140838qtscripttools-documentation.7z ) timeline? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtquicktimeline/5.15.0-0-202005140838qtquicktimeline-documentation.7z ) virtualkeyboard? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtvirtualkeyboard/5.15.0-0-202005140838qtvirtualkeyboard-documentation.7z ) webengine? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc.qtwebengine/5.15.0-0-202005140838qtwebengine-documentation.7z ) sql? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsql-documentation.7z ) x11extras? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtx11extras-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtqml-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtqmltest-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquick-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickdialogs-documentation.7z ) declarative? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickextras-documentation.7z ) svg? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsvg-documentation.7z ) linguist? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtlinguist-documentation.7z ) printsupport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtprintsupport-documentation.7z ) imageformats? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtimageformats-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgui-documentation.7z ) gui? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtplatformheaders-documentation.7z ) webview? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebview-documentation.7z ) dbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdbus-documentation.7z ) assistant? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtassistant-documentation.7z ) help? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qthelp-documentation.7z ) network? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtnetwork-documentation.7z ) bluetooth? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtbluetooth-documentation.7z ) 3d? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qt3d-documentation.7z ) xml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtxml-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtcore-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qmake-documentation.7z ) core? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdoc-documentation.7z ) quickcontrols? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickcontrols1-documentation.7z ) qdoc? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qdoc-documentation.7z ) location? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtlocation-documentation.7z ) scxml? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtscxml-documentation.7z ) speech? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtspeech-documentation.7z ) webchannel? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebchannel-documentation.7z ) quickcontrols2? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtquickcontrols-documentation.7z ) graphicaleffects? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgraphicaleffects-documentation.7z ) concurrent? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtconcurrent-documentation.7z ) sensors? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtsensors-documentation.7z ) multimedia? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtmultimedia-documentation.7z ) websockets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwebsockets-documentation.7z ) serialport? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtserialport-documentation.7z ) xmlpatterns? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtxmlpatterns-documentation.7z ) wayland? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwaylandcompositor-documentation.7z ) serialbus? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtserialbus-documentation.7z ) test? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qttestlib-documentation.7z ) opengl? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtopengl-documentation.7z ) gamepad? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtgamepad-documentation.7z ) positioning? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtpositioning-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtdesigner-documentation.7z ) designer? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtuitools-documentation.7z ) widgets? ( https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt5_5150_src_doc_examples/qt.qt5.5150.doc/5.15.0-0-202005140838qtwidgets-documentation.7z )
+_md5_=11ec886844732c7194987de7f3c0c4f6
diff --git a/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.0 b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.0
new file mode 100644
index 000000000000..3e1cf705ca28
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtquicktimeline-5.15.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 test? ( ~dev-qt/qttest-5.15.0 )
+DESCRIPTION=Qt module for keyframe-based timeline construction
+EAPI=7
+HOMEPAGE=https://www.qt.io/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND=~dev-qt/qtcore-5.15.0 ~dev-qt/qtdeclarative-5.15.0 ~dev-qt/qtgui-5.15.0 dev-qt/qtchooser
+RESTRICT=test
+SLOT=5/5.15
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/qtquicktimeline-everywhere-src-5.15.0.tar.xz
+_eclasses_=estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 multilib 2477ebe553d3e4d2c606191fe6c33602 qt5-build b73c1a2aa059052f72ed80be501ea5ca toolchain-funcs 605c126bed8d87e4378d5ff1645330cb virtualx e49dbce7ac14426e1155497476915307
+_md5_=86b3c9cbe370f58e6550c79e8f62ac4d
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 0d5479489834..7dc329877e6b 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/dejagnu-1.6.2 b/metadata/md5-cache/dev-util/dejagnu-1.6.2
index ea1cd4c3f18d..723eccdb8579 100644
--- a/metadata/md5-cache/dev-util/dejagnu-1.6.2
+++ b/metadata/md5-cache/dev-util/dejagnu-1.6.2
@@ -3,9 +3,9 @@ DEPEND=dev-lang/tcl dev-tcltk/expect
DESCRIPTION=Framework for testing other programs
EAPI=7
HOMEPAGE=https://www.gnu.org/software/dejagnu/
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-3
RDEPEND=dev-lang/tcl dev-tcltk/expect
SLOT=0
SRC_URI=mirror://gnu/dejagnu/dejagnu-1.6.2.tar.gz
-_md5_=d6bdda6d6aa8be0d13e304c4877efa2e
+_md5_=3ec391ee2edc4712d40e83ea567cb177
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.5.2 b/metadata/md5-cache/dev-util/kdevelop-5.5.2
index 9c1ba41f62a4..f35888b44a44 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.5.2
+++ b/metadata/md5-cache/dev-util/kdevelop-5.5.2
@@ -5,11 +5,11 @@ DESCRIPTION=Integrated Development Environment, supporting KF5/Qt, C/C++ and muc
EAPI=7
HOMEPAGE=https://www.kdevelop.org/
IUSE=+gdbui hex +plasma +qmake reviewboard subversion webkit test debug +handbook test
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
LICENSE=GPL-2 LGPL-2
RDEPEND=dev-libs/grantlee:5 >=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtdeclarative-5.12.3:5[widgets] >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qthelp-5.12.3:5 >=dev-qt/qtnetwork-5.12.3:5 >=dev-qt/qttest-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 >=dev-qt/qtxml-5.12.3:5 >=dev-util/astyle-3.1:= kde-apps/libkomparediff2:5 >=kde-frameworks/karchive-5.60.0:5 >=kde-frameworks/kbookmarks-5.60.0:5 >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kcodecs-5.60.0:5 >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/kcrash-5.60.0:5 >=kde-frameworks/kdeclarative-5.60.0:5 >=kde-frameworks/kguiaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kiconthemes-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/kitemviews-5.60.0:5 >=kde-frameworks/kjobwidgets-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/knotifications-5.60.0:5 >=kde-frameworks/knotifyconfig-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/kservice-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/ktextwidgets-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kwindowsystem-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/sonnet-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 >=sys-devel/clang-6.0:= gdbui? ( kde-plasma/libksysguard:5= ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.60.0:5 >=kde-frameworks/plasma-5.60.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.60.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) !webkit? ( >=dev-qt/qtwebengine-5.12.3:5[widgets] ) >=dev-qt/qdbus-5.12.3:5 >=dev-qt/qtquickcontrols-5.12.3:5 >=dev-qt/qtquickcontrols2-5.12.3:5 dev-util/ninja kde-apps/kapptemplate:5 kde-apps/kio-extras:5 >=sys-devel/gdb-7.0[python] reviewboard? ( kde-apps/ktp-accounts-kcm:5 ) !dev-util/kdevelop-clang-tidy || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
RESTRICT=!test? ( test ) !test? ( test ) test
SLOT=5/55
SRC_URI=mirror://kde/stable/kdevelop/5.5.2/src/kdevelop-5.5.2.tar.xz
_eclasses_=cmake 19b0421555865baefd505831dd4303e3 ecm e341cb3583b4219b5c207e24915b0264 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 kde.org 805aef05bd5352355744e28a6ab5ae3c multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=f894b9265bbe63cc941340b8af1226f4
+_md5_=a1870d72358098ed86896edc8aac53ac
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.5.2 b/metadata/md5-cache/dev-util/kdevelop-php-5.5.2
index b3e9f2addcba..fc1f9623d76e 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.5.2
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.5.2
@@ -5,11 +5,11 @@ DESCRIPTION=PHP plugin for KDevelop
EAPI=7
HOMEPAGE=https://www.kdevelop.org/
IUSE=test debug +handbook test
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2 LGPL-2
RDEPEND=>=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop-pg-qt:5 dev-util/kdevelop:5= >=kde-frameworks/kcmutils-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kconfigwidgets-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
RESTRICT=!test? ( test ) !test? ( test ) test
SLOT=5
SRC_URI=mirror://kde/stable/kdevelop/5.5.2/src/kdev-php-5.5.2.tar.xz
_eclasses_=cmake 19b0421555865baefd505831dd4303e3 ecm e341cb3583b4219b5c207e24915b0264 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 kde.org 805aef05bd5352355744e28a6ab5ae3c multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=8131ed5cf0c3a71017f5ef87f64d3820
+_md5_=5a2129da279a6b8cd6fe6a4b46713f8b
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.5.2 b/metadata/md5-cache/dev-util/kdevelop-python-5.5.2
index 30e4f314648b..d06d509b721e 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.5.2
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.5.2
@@ -5,7 +5,7 @@ DESCRIPTION=Python plugin for KDevelop
EAPI=7
HOMEPAGE=https://www.kdevelop.org/
IUSE=debug test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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] ) >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12.3:5 dev-util/kdevelop:5= >=kde-frameworks/kcompletion-5.60.0:5 >=kde-frameworks/kconfig-5.60.0:5 >=kde-frameworks/kcoreaddons-5.60.0:5 >=kde-frameworks/ki18n-5.60.0:5 >=kde-frameworks/kio-5.60.0:5 >=kde-frameworks/kitemmodels-5.60.0:5 >=kde-frameworks/knewstuff-5.60.0:5 >=kde-frameworks/kparts-5.60.0:5 >=kde-frameworks/ktexteditor-5.60.0:5 >=kde-frameworks/kwidgetsaddons-5.60.0:5 >=kde-frameworks/kxmlgui-5.60.0:5 >=kde-frameworks/threadweaver-5.60.0:5 python_single_target_python3_6? ( dev-python/pycodestyle[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pycodestyle[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pycodestyle[python_targets_python3_8(-)] ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) test
SLOT=5
SRC_URI=mirror://kde/stable/kdevelop/5.5.2/src/kdev-python-5.5.2.tar.xz
_eclasses_=cmake 19b0421555865baefd505831dd4303e3 ecm e341cb3583b4219b5c207e24915b0264 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 kde.org 805aef05bd5352355744e28a6ab5ae3c multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=4565aaff8dcaace92ab7132ae1d2bb8e
+_md5_=5ca83d18fdfdafaf02f22083817cb755
diff --git a/metadata/md5-cache/dev-util/rt-tests-1.8 b/metadata/md5-cache/dev-util/rt-tests-1.8
index cc03182070e7..8936e35e9cc7 100644
--- a/metadata/md5-cache/dev-util/rt-tests-1.8
+++ b/metadata/md5-cache/dev-util/rt-tests-1.8
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install prepare setup
+DEFINED_PHASES=compile install prepare setup
DEPEND=python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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] ) sys-process/numactl
DESCRIPTION=A collection of latency testing tools for the linux(-rt) kernel
EAPI=7
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7
SLOT=0
SRC_URI=https://kernel.org/pub/linux/utils/rt-tests/rt-tests-1.8.tar.xz https://kernel.org/pub/linux/utils/rt-tests/older/rt-tests-1.8.tar.xz
_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=bdd5035813311f5aeaf7557a191ff66b
+_md5_=1ab9d4caf6a1cb681f148e61805081e0
diff --git a/metadata/md5-cache/dev-util/source-highlight-3.1.9 b/metadata/md5-cache/dev-util/source-highlight-3.1.9
index 2b289a05903a..db1ca8c31311 100644
--- a/metadata/md5-cache/dev-util/source-highlight-3.1.9
+++ b/metadata/md5-cache/dev-util/source-highlight-3.1.9
@@ -4,10 +4,10 @@ DESCRIPTION=Generate highlighted source code as an (x)html document
EAPI=7
HOMEPAGE=https://www.gnu.org/software/src-highlite/source-highlight.html
IUSE=doc static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
LICENSE=GPL-3
RDEPEND=>=dev-libs/boost-1.62.0:=[threads] dev-util/ctags
SLOT=0
SRC_URI=mirror://gnu/src-highlite/source-highlight-3.1.9.tar.gz
_eclasses_=bash-completion-r1 e5f9c3faab3ab3d1e7e007daa8c736ef eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=46b667699bb0104fc128b148d1a89969
+_md5_=5a5fdbc737c59362b58d5d81061afe2f
diff --git a/metadata/md5-cache/dev-util/umockdev-0.12.1 b/metadata/md5-cache/dev-util/umockdev-0.12.1
index 72f3aff58efd..55e14d03faa8 100644
--- a/metadata/md5-cache/dev-util/umockdev-0.12.1
+++ b/metadata/md5-cache/dev-util/umockdev-0.12.1
@@ -4,11 +4,11 @@ DESCRIPTION=Mock hardware devices for creating unit tests
EAPI=6
HOMEPAGE=https://github.com/martinpitt/umockdev/
IUSE=+introspection static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-2.1+
RDEPEND=virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.32:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-1.32:= )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/martinpitt/umockdev/releases/download/0.12.1/umockdev-0.12.1.tar.xz
_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build dfda7934df092a96e439c05b4aeac519 multilib-minimal 8bddda43703ba94d8341f4e247f97566 python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=17d3a6ba04d64f5413d517e35ea353df
+_md5_=49cc11e332643df30c0d0973750c5ecb
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index fa3ce4662288..3475c7eefc5a 100644
Binary files a/metadata/md5-cache/games-misc/Manifest.gz and b/metadata/md5-cache/games-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/games-misc/usolitaire-0.2.1 b/metadata/md5-cache/games-misc/usolitaire-0.2.1
new file mode 100644
index 000000000000..e984f58e6641
--- /dev/null
+++ b/metadata/md5-cache/games-misc/usolitaire-0.2.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/urwid[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=solitaire in your terminal
+EAPI=7
+HOMEPAGE=https://github.com/eliasdorneles/usolitaire
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/urwid[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/eliasdorneles/usolitaire/archive/v0.2.1.tar.gz -> usolitaire-0.2.1.tar.gz
+_eclasses_=distutils-r1 44725b3eb803b8abcd6978759c231210 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=935a2971885ad2f56edd5cc36c87911a
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index c84839747bc7..4b2ace8a00a3 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.19.2 b/metadata/md5-cache/kde-plasma/libksysguard-5.19.2
index e21d83ff3b9f..9ce4530015a9 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.19.2
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.19.2
@@ -4,7 +4,7 @@ DEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5
DESCRIPTION=Task management and system monitoring library
EAPI=7
HOMEPAGE=https://kde.org/plasma-desktop
-IUSE=minimal webengine X test debug test
+IUSE=webengine X test debug test
KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
LICENSE=LGPL-2+
RDEPEND=>=dev-qt/qtdbus-5.14.2:5 >=dev-qt/qtdeclarative-5.14.2:5 >=dev-qt/qtgui-5.14.2:5 >=dev-qt/qtnetwork-5.14.2:5 >=dev-qt/qtwidgets-5.14.2:5 >=kde-frameworks/kauth-5.71.0:5 >=kde-frameworks/kcompletion-5.71.0:5 >=kde-frameworks/kconfig-5.71.0:5 >=kde-frameworks/kconfigwidgets-5.71.0:5 >=kde-frameworks/kcoreaddons-5.71.0:5 >=kde-frameworks/ki18n-5.71.0:5 >=kde-frameworks/kjobwidgets-5.71.0:5 >=kde-frameworks/knewstuff-5.71.0:5 >=kde-frameworks/kwidgetsaddons-5.71.0:5 >=kde-frameworks/kwindowsystem-5.71.0:5 sys-libs/zlib webengine? ( >=dev-qt/qtwebchannel-5.14.2:5 >=dev-qt/qtwebengine-5.14.2:5 ) X? ( >=dev-qt/qtx11extras-5.14.2:5 x11-libs/libX11 x11-libs/libXres ) || ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* ) >=kde-frameworks/kf-env-4 dev-qt/qtcore:5
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
SLOT=5/9
SRC_URI=mirror://kde/stable/plasma/5.19.2/libksysguard-5.19.2.tar.xz
_eclasses_=cmake 19b0421555865baefd505831dd4303e3 ecm e341cb3583b4219b5c207e24915b0264 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 kde.org 805aef05bd5352355744e28a6ab5ae3c multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ceb119bb1d8c9f8ed965d8695697732
+_md5_=917ebdfd5bef106377c6b23e4549971d
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 12982cdc2cf0..477e884f1707 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/alpine-2.23 b/metadata/md5-cache/mail-client/alpine-2.23
index 8344bba17f80..bb58fc6fcd7b 100644
--- a/metadata/md5-cache/mail-client/alpine-2.23
+++ b/metadata/md5-cache/mail-client/alpine-2.23
@@ -5,10 +5,10 @@ DESCRIPTION=An easy to use text-based based mail and news client
EAPI=7
HOMEPAGE=http://alpine.x10host.com/alpine/ https://repo.or.cz/alpine.git/
IUSE=+chappa doc ipv6 kerberos ldap libressl nls onlyalpine passfile smime spell ssl threads
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=Apache-2.0
RDEPEND=>=sys-libs/ncurses-5.1:0= kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) spell? ( app-text/aspell ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) app-misc/mime-types
SLOT=0
SRC_URI=http://alpine.x10host.com/alpine/release/src/alpine-2.23.tar.xz chappa? ( http://alpine.x10host.com/alpine/patches/alpine-2.23/all.patch.gz -> alpine-2.23-chappa.patch.gz )
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=6b410e54cbc64d6b1ac752d362a58944
+_md5_=fcb1a220eeb90a4830e357323cf6bf14
diff --git a/metadata/md5-cache/mail-client/mutt-1.14.4-r1 b/metadata/md5-cache/mail-client/mutt-1.14.4-r1
index 51d75b019812..2c05e5940afd 100644
--- a/metadata/md5-cache/mail-client/mutt-1.14.4-r1
+++ b/metadata/md5-cache/mail-client/mutt-1.14.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A small but very powerful text-based mail client
EAPI=6
HOMEPAGE=http://www.mutt.org/
IUSE=autocrypt berkdb debug doc gdbm gnutls gpgme +hcache idn +imap kerberos libressl +lmdb mbox nls pgp-classic pop qdbm +sasl selinux slang smime-classic +smtp +ssl tokyocabinet vanilla prefix
-KEYWORDS=~alpha ~amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=app-misc/mime-types virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gdbm? ( sys-libs/gdbm ) lmdb? ( dev-db/lmdb:= ) qdbm? ( dev-db/qdbm ) tokyocabinet? ( dev-db/tokyocabinet ) ssl? ( gnutls? ( >=net-libs/gnutls-1.0.17:= ) !gnutls? ( libressl? ( dev-libs/libressl:= ) !libressl? ( >=dev-libs/openssl-0.9.6:0= ) ) ) nls? ( virtual/libintl ) sasl? ( >=dev-libs/cyrus-sasl-2 ) kerberos? ( virtual/krb5 ) idn? ( net-dns/libidn2 ) gpgme? ( >=app-crypt/gpgme-0.9.0:= ) autocrypt? ( >=dev-db/sqlite-3 ) slang? ( sys-libs/slang ) !slang? ( >=sys-libs/ncurses-5.2:0= ) selinux? ( sec-policy/selinux-mutt ) smime-classic? ( || ( dev-libs/libressl >=dev-libs/openssl-0.9.6:0 ) ) pgp-classic? ( app-crypt/gnupg )
REQUIRED_USE=hcache? ( || ( berkdb gdbm lmdb qdbm tokyocabinet ) ) imap? ( ssl ) pop? ( ssl ) smime-classic? ( ssl !gnutls ) smtp? ( ssl sasl ) sasl? ( || ( imap pop smtp ) ) kerberos? ( || ( imap pop smtp ) ) autocrypt? ( gpgme )
SLOT=0
SRC_URI=ftp://ftp.mutt.org/pub/mutt/mutt-1.14.4.tar.gz https://bitbucket.org/mutt/mutt/downloads/mutt-1.14.4.tar.gz https://dev.gentoo.org/~grobian/distfiles/mutt-gentoo-1.14.4-patches-r0.tar.xz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=07c3589532402a48488787e34f3cf0e9
+_md5_=464177033fefc2fa1674fc9376e40ca1
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 71dab799ea63..6f8e53cad835 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/gimp-9999 b/metadata/md5-cache/media-gfx/gimp-9999
index f025826fbb79..944ccd205490 100644
--- a/metadata/md5-cache/media-gfx/gimp-9999
+++ b/metadata/md5-cache/media-gfx/gimp-9999
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-arch/bzip2 >=app-arch/xz-utils-5.0.0 >=app-text/poppler-0.69[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.4.0 >=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.74[introspection] >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.20:0.4[cairo,introspection] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg:0 >=x11-libs/cairo-1.14.0 >=x11-libs/gdk-pixbuf-2.36:2 >=x11-libs/gtk+-3.22.29:3 x11-libs/libXcursor >=x11-libs/pango-1.42.0 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) lua? ( dev-lang/luajit ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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_6? ( >=dev-python/pygobject-3.0:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.0:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 >=dev-libs/appstream-glib-0.7.7 dev-util/gdbus-codegen dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 sys-apps/findutils >=sys-devel/autoconf-2.54 >=sys-devel/automake-1.11 >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.0 dev-util/gtk-doc-am ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-arch/bzip2 >=app-arch/xz-utils-5.0.0 >=app-text/poppler-0.69[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.4.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.78[introspection,lcms,vala] >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.24:0.4[cairo,introspection,lcms,vala] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg:0 >=x11-libs/cairo-1.14.0 >=x11-libs/gdk-pixbuf-2.36:2 >=x11-libs/gtk+-3.22.29:3 x11-libs/libXcursor >=x11-libs/pango-1.42.0 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) lua? ( dev-lang/luajit ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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_6? ( >=dev-python/pygobject-3.0:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.0:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) >=dev-lang/perl-5.10.0 >=dev-libs/appstream-glib-0.7.7 dev-util/gdbus-codegen dev-util/gtk-update-icon-cache >=dev-util/intltool-0.40.1 sys-apps/findutils >=sys-devel/autoconf-2.54 >=sys-devel/automake-1.11 >=sys-devel/gettext-0.19 >=sys-devel/libtool-2.2 virtual/pkgconfig doc? ( >=dev-util/gtk-doc-1.0 dev-util/gtk-doc-am ) || ( dev-lang/vala:0.48[vapigen(+)] dev-lang/vala:0.46[vapigen(+)] dev-lang/vala:0.44[vapigen(+)] dev-lang/vala:0.40[vapigen(+)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=GNU Image Manipulation Program
EAPI=6
HOMEPAGE=https://www.gimp.org/
IUSE=aalib alsa aqua debug doc gnome heif javascript jpeg2k lua mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
LICENSE=GPL-3 LGPL-3
PROPERTIES=live
-RDEPEND=app-arch/bzip2 >=app-arch/xz-utils-5.0.0 >=app-text/poppler-0.69[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.4.0 >=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.74[introspection] >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.20:0.4[cairo,introspection] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg:0 >=x11-libs/cairo-1.14.0 >=x11-libs/gdk-pixbuf-2.36:2 >=x11-libs/gtk+-3.22.29:3 x11-libs/libXcursor >=x11-libs/pango-1.42.0 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) lua? ( dev-lang/luajit ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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_6? ( >=dev-python/pygobject-3.0:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.0:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
+RDEPEND=app-arch/bzip2 >=app-arch/xz-utils-5.0.0 >=app-text/poppler-0.69[cairo] >=app-text/poppler-data-0.4.9 >=dev-libs/atk-2.4.0 >=dev-libs/glib-2.56.2:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.78[introspection,lcms,vala] >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.24:0.4[cairo,introspection,lcms,vala] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg:0 >=x11-libs/cairo-1.14.0 >=x11-libs/gdk-pixbuf-2.36:2 >=x11-libs/gtk+-3.22.29:3 x11-libs/libXcursor >=x11-libs/pango-1.42.0 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) javascript? ( dev-libs/gjs ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) lua? ( dev-lang/luajit ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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_6? ( >=dev-python/pygobject-3.0:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( >=dev-python/pygobject-3.0:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( >=dev-python/pygobject-3.0:3[python_targets_python3_8(-)] ) ) udev? ( >=dev-libs/libgudev-167:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
RESTRICT=!test? ( test )
SLOT=2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 86a0188f2ad9eb3d65e4d031ab8a0422 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c9f63711ba29cb169fbae7fb95b2e49
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 86a0188f2ad9eb3d65e4d031ab8a0422 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 2df69d3da6a26b1ca7cd81185f0599d6 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 5b72a65a36d681d65aef5f7b4b8b2cb6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx e49dbce7ac14426e1155497476915307 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=563d7cdedbfc684b41cc14d1b56ebedf
diff --git a/metadata/md5-cache/media-gfx/netpaint-1.1.2 b/metadata/md5-cache/media-gfx/netpaint-1.1.2
new file mode 100644
index 000000000000..e401eaf0546a
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/netpaint-1.1.2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/urwid[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=curses-based drawing tool
+EAPI=7
+HOMEPAGE=https://github.com/SyntheticDreams/NetPaint
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/urwid[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pillow[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) 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_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=https://github.com/SyntheticDreams/netpaint/archive/v1.1.2.tar.gz -> netpaint-1.1.2.tar.gz
+_eclasses_=distutils-r1 44725b3eb803b8abcd6978759c231210 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 8386b016a2b3bbefa88443fdaa898057 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=213a9093071e2a8714bf3be4c9f738f7
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index f41d841496df..82c6f13c8929 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/babl-0.1.66-r1 b/metadata/md5-cache/media-libs/babl-0.1.66-r1
new file mode 100644
index 000000000000..016c843c55c0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/babl-0.1.66-r1
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=lcms? ( >=media-libs/lcms-2.8:2 )
+DESCRIPTION=A dynamic, any to any, pixel format conversion library
+EAPI=7
+HOMEPAGE=http://www.gegl.org/babl/
+IUSE=altivec lcms cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=LGPL-3
+RDEPEND=lcms? ( >=media-libs/lcms-2.8:2 )
+SLOT=0
+SRC_URI=http://ftp.gimp.org/pub/babl/0.1/babl-0.1.66.tar.bz2
+_md5_=f0823b3502b4a060e6bbca80e5def347
diff --git a/metadata/md5-cache/media-libs/babl-0.1.74-r1 b/metadata/md5-cache/media-libs/babl-0.1.74-r1
new file mode 100644
index 000000000000..f3a662c7d600
--- /dev/null
+++ b/metadata/md5-cache/media-libs/babl-0.1.74-r1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test
+DEPEND=introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 )
+DESCRIPTION=A dynamic, any to any, pixel format conversion library
+EAPI=7
+HOMEPAGE=http://www.gegl.org/babl/
+IUSE=introspection lcms cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=LGPL-3
+RDEPEND=introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 )
+SLOT=0
+SRC_URI=http://ftp.gimp.org/pub/babl/0.1/babl-0.1.74.tar.xz
+_eclasses_=meson 8f7dc8ed2d76af0b33328789c017e677 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=48bf4ddb2e461ee4dbf738f6f964ba79
diff --git a/metadata/md5-cache/media-libs/babl-9999 b/metadata/md5-cache/media-libs/babl-9999
index 20bf5580f0d5..ebed4d778ce6 100644
--- a/metadata/md5-cache/media-libs/babl-9999
+++ b/metadata/md5-cache/media-libs/babl-9999
@@ -1,13 +1,14 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=lcms? ( media-libs/lcms:2 )
+BDEPEND=virtual/pkgconfig vala? ( || ( 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(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 )
DESCRIPTION=A dynamic, any to any, pixel format conversion library
EAPI=7
HOMEPAGE=http://www.gegl.org/babl/
-IUSE=introspection lcms cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1
+IUSE=introspection lcms vala cpu_flags_x86_avx2 cpu_flags_x86_f16c cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1
LICENSE=LGPL-3
PROPERTIES=live
-RDEPEND=lcms? ( media-libs/lcms:2 )
+RDEPEND=introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 )
+REQUIRED_USE=vala? ( introspection )
SLOT=0
-_eclasses_=git-r3 86a0188f2ad9eb3d65e4d031ab8a0422 meson 8f7dc8ed2d76af0b33328789c017e677 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=6e925d7a566289846dcb29dcc4f1b1e2
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 86a0188f2ad9eb3d65e4d031ab8a0422 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 meson 8f7dc8ed2d76af0b33328789c017e677 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 5b72a65a36d681d65aef5f7b4b8b2cb6 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=6383f60359fd3c748909f84ed9dfe2d6
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.34-r1 b/metadata/md5-cache/media-libs/gegl-0.3.34-r1
new file mode 100644
index 000000000000..d99e546e0bca
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gegl-0.3.34-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) vala? ( || ( 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.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare setup
+DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?] sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+DESCRIPTION=A graph based image processing framework
+EAPI=7
+HOMEPAGE=http://www.gegl.org/
+IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( GPL-3 LGPL-3 )
+RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?] sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0.3
+SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.34.tar.bz2
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 5b72a65a36d681d65aef5f7b4b8b2cb6 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=b74f825d771e1c6aaaec5af9de92e943
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.16-r1 b/metadata/md5-cache/media-libs/gegl-0.4.16-r1
new file mode 100644
index 000000000000..91282a40afb5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gegl-0.4.16-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( ffmpeg? ( media-libs/gexiv2 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-python/pygobject-3.2:3[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) vala? ( || ( 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.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?] >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 )
+DESCRIPTION=A graph based image processing framework
+EAPI=7
+HOMEPAGE=http://www.gegl.org/
+IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( GPL-3+ LGPL-3 )
+RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.66[introspection(-)?,lcms(-)?] >=media-libs/libpng-1.6.0:0= virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-2.2.0:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= ) zlib? ( >=sys-libs/zlib-1.2.0 )
+REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0.4
+SRC_URI=http://download.gimp.org/pub/gegl/0.4/gegl-0.4.16.tar.bz2
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 5b72a65a36d681d65aef5f7b4b8b2cb6 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=557efeb653011bb39893b68860d56fd6
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.18-r1 b/metadata/md5-cache/media-libs/gegl-0.4.18-r1
new file mode 100644
index 000000000000..f1277b10d422
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gegl-0.4.18-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( dev-lang/python:3.7 >=dev-python/pygobject-3.2:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/pygobject-3.2:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) vala? ( || ( 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(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.72[introspection?,lcms?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+DESCRIPTION=A graph based image processing framework
+EAPI=7
+HOMEPAGE=http://www.gegl.org/
+IUSE=cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( GPL-3+ LGPL-3 )
+RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.72[introspection?,lcms?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0.4
+SRC_URI=http://download.gimp.org/pub/gegl/0.4/gegl-0.4.18.tar.xz
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 meson 8f7dc8ed2d76af0b33328789c017e677 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 5b72a65a36d681d65aef5f7b4b8b2cb6 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=c81acddd16f6187eb7eeab5b663a4bf9
diff --git a/metadata/md5-cache/media-libs/gegl-0.4.22-r1 b/metadata/md5-cache/media-libs/gegl-0.4.22-r1
new file mode 100644
index 000000000000..b621e63f39da
--- /dev/null
+++ b/metadata/md5-cache/media-libs/gegl-0.4.22-r1
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( dev-lang/python:3.8 >=dev-python/pygobject-3.2:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/pygobject-3.2:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/pygobject-3.2:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) vala? ( || ( 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(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.74[introspection?,lcms?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+DESCRIPTION=A graph based image processing framework
+EAPI=7
+HOMEPAGE=http://www.gegl.org/
+IUSE=cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( GPL-3+ LGPL-3 )
+RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.74[introspection?,lcms?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
+RESTRICT=!test? ( test )
+SLOT=0.4
+SRC_URI=http://download.gimp.org/pub/gegl/0.4/gegl-0.4.22.tar.xz
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 meson 8f7dc8ed2d76af0b33328789c017e677 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 5b72a65a36d681d65aef5f7b4b8b2cb6 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=986db7a3f81b2f2ffba832fd8061d81e
diff --git a/metadata/md5-cache/media-libs/gegl-9999 b/metadata/md5-cache/media-libs/gegl-9999
index bf119a3be8bb..e56c59ec506e 100644
--- a/metadata/md5-cache/media-libs/gegl-9999
+++ b/metadata/md5-cache/media-libs/gegl-9999
@@ -1,15 +1,15 @@
BDEPEND=dev-lang/perl >=dev-util/gtk-doc-am-1 >=sys-devel/gettext-0.19.8 >=sys-devel/libtool-2.2 virtual/pkgconfig test? ( || ( ( dev-lang/python:3.8 >=dev-python/pygobject-3.2:3[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/pygobject-3.2:3[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/pygobject-3.2:3[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) vala? ( || ( 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(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.74[introspection?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+DEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.78[introspection?,lcms?,vala?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
DESCRIPTION=A graph based image processing framework
EAPI=7
HOMEPAGE=http://www.gegl.org/
IUSE=cairo debug ffmpeg introspection lcms lensfun openexr pdf raw sdl svg test tiff umfpack vala v4l webp
LICENSE=|| ( GPL-3+ LGPL-3 )
PROPERTIES=live
-RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.74[introspection?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
+RDEPEND=>=dev-libs/glib-2.44:2 >=dev-libs/json-glib-1.2.6 >=media-libs/babl-0.1.78[introspection?,lcms?,vala?] media-libs/libnsgif >=media-libs/libpng-1.6.0:0= >=sys-libs/zlib-1.2.0 virtual/jpeg:0= >=x11-libs/gdk-pixbuf-2.32:2 >=x11-libs/pango-1.38.0 cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( media-video/ffmpeg:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) pdf? ( >=app-text/poppler-0.71.0[cairo] ) raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
REQUIRED_USE=svg? ( cairo ) test? ( introspection ) vala? ( introspection )
RESTRICT=!test? ( test )
SLOT=0.4
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 git-r3 86a0188f2ad9eb3d65e4d031ab8a0422 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 meson 8f7dc8ed2d76af0b33328789c017e677 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 5b72a65a36d681d65aef5f7b4b8b2cb6 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=6d0949b1105ec6c6d63519cdea0c33c7
+_md5_=7adffac7d33447b55b5e30b8310d7227
diff --git a/metadata/md5-cache/media-libs/mesa-19.3.5 b/metadata/md5-cache/media-libs/mesa-19.3.5
deleted file mode 100644
index dce235897d23..000000000000
--- a/metadata/md5-cache/media-libs/mesa-19.3.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( dev-lang/python:3.8 dev-lang/python:3.7 dev-lang/python:3.6 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex sys-devel/gettext virtual/pkgconfig || ( ( dev-lang/python:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 >=dev-python/mako-0.8.0[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 >=dev-python/mako-0.8.0[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install postinst pretend setup test
-DEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) ) valgrind? ( dev-util/valgrind ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
-DESCRIPTION=OpenGL-like graphic library for Linux
-EAPI=7
-HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
-IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_intel video_cards_iris video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=!app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] libglvnd? ( >=media-libs/libglvnd-1.2.0-r1[X?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) gallium? ( unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( dev-libs/ocl-icd[khronos-headers,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) selinux? ( sys-libs/libselinux[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.15.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/wayland-protocols-1.8 ) >=x11-libs/libdrm-2.4.100[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.100[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.100[video_cards_amdgpu] ) gallium? ( llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/clang:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/clang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:9[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/llvm:8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/llvm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) )
-REQUIRED_USE=d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) gles1? ( egl ) gles2? ( egl ) vulkan? ( dri3 || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) wayland? ( egl gbm ) video_cards_freedreno? ( gallium ) video_cards_intel? ( classic ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vc4? ( gallium ) video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) xa? ( X ) xvmc? ( X )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://mesa.freedesktop.org/archive/mesa-19.3.5.tar.xz
-_eclasses_=linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 llvm 78f8b6f29bd3b0263a4c9a3785e5af71 meson 8f7dc8ed2d76af0b33328789c017e677 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build dfda7934df092a96e439c05b4aeac519 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils a41d1fd1c111289ffa04490de6ee79d7 python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=95d5d3c115348c8c3b5061c2ca30d331
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 58ea296ffe36..737806cce0e4 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/gtick-0.5.5 b/metadata/md5-cache/media-sound/gtick-0.5.5
new file mode 100644
index 000000000000..6738567ba54d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/gtick-0.5.5
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=media-sound/pulseaudio x11-libs/gtk+:2 sndfile? ( media-libs/libsndfile )
+DESCRIPTION=Metronome application supporting different meters and speeds ranging
+EAPI=7
+HOMEPAGE=https://www.antcom.de/gtick
+IUSE=nls sndfile
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-3+
+RDEPEND=media-sound/pulseaudio x11-libs/gtk+:2 sndfile? ( media-libs/libsndfile )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.antcom.de/gtick/download/gtick-0.5.5.tar.gz
+_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=7159ebf1f0c761218006619290644753
diff --git a/metadata/md5-cache/media-sound/guitarix-0.39.0 b/metadata/md5-cache/media-sound/guitarix-0.39.0
index 7ede5ee564f6..58b1be3c8c98 100644
--- a/metadata/md5-cache/media-sound/guitarix-0.39.0
+++ b/metadata/md5-cache/media-sound/guitarix-0.39.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
DEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:2 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) virtual/pkgconfig nls? ( dev-util/intltool ) dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Virtual guitar amplifier for Linux
EAPI=6
-HOMEPAGE=http://guitarix.org/
+HOMEPAGE=https://guitarix.org/
IUSE=bluetooth debug lv2 nls +standalone zeroconf
KEYWORDS=amd64
LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( lv2 standalone )
SLOT=0
SRC_URI=mirror://sourceforge/guitarix/guitarix/guitarix2-0.39.0.tar.xz
_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb waf-utils cf9742c01975dc707eb982114a9d70fa xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=0e36c72c94a0982c98f08951ff581dbc
+_md5_=9f2d4ecf9e1d6502ae1493522156bf24
diff --git a/metadata/md5-cache/media-sound/guitarix-0.40.0 b/metadata/md5-cache/media-sound/guitarix-0.40.0
new file mode 100644
index 000000000000..5fd85f34d165
--- /dev/null
+++ b/metadata/md5-cache/media-sound/guitarix-0.40.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) dev-lang/sassc virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Virtual guitar amplifier for Linux
+EAPI=6
+HOMEPAGE=https://guitarix.org/
+IUSE=bluetooth debug lv2 nls +standalone zeroconf
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) standalone? ( media-fonts/roboto )
+REQUIRED_USE=|| ( lv2 standalone )
+SLOT=0
+SRC_URI=mirror://sourceforge/guitarix/guitarix/guitarix2-0.40.0.tar.xz
+_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb waf-utils cf9742c01975dc707eb982114a9d70fa xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=3cec8e1be43a45367671686b9b7e63f2
diff --git a/metadata/md5-cache/media-sound/guitarix-9999 b/metadata/md5-cache/media-sound/guitarix-9999
index 9fd347c17c10..e6159b771ecc 100644
--- a/metadata/md5-cache/media-sound/guitarix-9999
+++ b/metadata/md5-cache/media-sound/guitarix-9999
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-lang/sassc dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:2 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) virtual/pkgconfig nls? ( dev-util/intltool ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) || ( dev-lang/python:3.8[threads(+)] dev-lang/python:3.7[threads(+)] dev-lang/python:3.6[threads(+)] ) dev-lang/sassc virtual/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Virtual guitar amplifier for Linux
EAPI=6
-HOMEPAGE=http://guitarix.org/
+HOMEPAGE=https://guitarix.org/
IUSE=bluetooth debug lv2 nls +standalone zeroconf
LICENSE=GPL-2
PROPERTIES=live
-RDEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:2.4 dev-lang/sassc dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:2 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) x11-themes/gtk-engines standalone? ( media-fonts/roboto )
+RDEPEND=dev-cpp/eigen:3 dev-cpp/glibmm:2 dev-cpp/gtkmm:3.0 dev-libs/glib:2 >=media-libs/libsndfile-1.0.17 >=media-libs/zita-convolver-3:= media-libs/zita-resampler >=net-misc/curl-7.26.0 >=sci-libs/fftw-3.1.2:3.0= x11-libs/gtk+:3 lv2? ( media-libs/lv2 ) standalone? ( dev-libs/boost:= media-libs/liblrdf media-libs/lilv virtual/jack bluetooth? ( net-wireless/bluez ) zeroconf? ( net-dns/avahi ) ) standalone? ( media-fonts/roboto )
REQUIRED_USE=|| ( lv2 standalone )
SLOT=0
_eclasses_=git-r3 86a0188f2ad9eb3d65e4d031ab8a0422 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb waf-utils cf9742c01975dc707eb982114a9d70fa xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=7342316d082282fa4965017bb5c6c901
+_md5_=844115c2b108b1b5dae2f22d0a373f19
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 44ad7acedf1e..5b9ceeaa7607 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/smtube-20.1.0 b/metadata/md5-cache/media-video/smtube-20.1.0
index e68fcabe378c..5b101bc3279e 100644
--- a/metadata/md5-cache/media-video/smtube-20.1.0
+++ b/metadata/md5-cache/media-video/smtube-20.1.0
@@ -4,10 +4,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5
DESCRIPTION=YouTube Browser for SMPlayer
EAPI=7
HOMEPAGE=http://smplayer.sourceforge.net/smtube
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=GPL-2+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtscript:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 || ( media-video/smplayer media-video/mpv media-video/mplayer media-video/vlc media-video/totem )
SLOT=0
SRC_URI=mirror://sourceforge/smtube/smtube-20.1.0.tar.bz2
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 estack 686eaab303305a908fd57b2fd7617800 l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 2477ebe553d3e4d2c606191fe6c33602 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=d067a1aac81b2143c4be80c029a332dd
+_md5_=28e45549ef0ba46154abca2c32a24174
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 48c112a82dc7..7d7750e5c4e0 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/samba-4.11.6-r2 b/metadata/md5-cache/net-fs/samba-4.11.6-r2
deleted file mode 100644
index cb65b8841842..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.11.6-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgcrypt:0 dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0 net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.8[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =sys-libs/talloc-2.2.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto =sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libgcrypt:0 dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0 net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.8[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =sys-libs/talloc-2.2.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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] ) ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.11.6.tar.gz
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build dfda7934df092a96e439c05b4aeac519 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 pam a1771fc1e5831c201eaf18451747d94b preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils cf9742c01975dc707eb982114a9d70fa
-_md5_=625349e0c79b54921728c016bb54891c
diff --git a/metadata/md5-cache/net-fs/samba-4.11.9 b/metadata/md5-cache/net-fs/samba-4.11.9
deleted file mode 100644
index f38c2edfaf46..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.11.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.10[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =sys-libs/talloc-2.2.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto =sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.10[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =sys-libs/talloc-2.2.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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] ) ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
-REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.11.9.tar.gz
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build dfda7934df092a96e439c05b4aeac519 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 pam a1771fc1e5831c201eaf18451747d94b preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils cf9742c01975dc707eb982114a9d70fa
-_md5_=10950749272e88ca4a024a58ce1df8f2
diff --git a/metadata/md5-cache/net-fs/samba-4.11.9-r1 b/metadata/md5-cache/net-fs/samba-4.11.9-r1
index 74e90fc86d4b..54da0e66a2e6 100644
--- a/metadata/md5-cache/net-fs/samba-4.11.9-r1
+++ b/metadata/md5-cache/net-fs/samba-4.11.9-r1
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://samba/stable/samba-4.11.9.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build dfda7934df092a96e439c05b4aeac519 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 pam a1771fc1e5831c201eaf18451747d94b preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils cf9742c01975dc707eb982114a9d70fa
-_md5_=71007f29be270da37c7d134d753b7ac3
+_md5_=3500e06bfd993ea8147e28f5d421e2eb
diff --git a/metadata/md5-cache/net-fs/samba-4.12.2 b/metadata/md5-cache/net-fs/samba-4.12.2
deleted file mode 100644
index 2333293ae6f6..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.12.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.1.2[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =sys-libs/talloc-2.3.1[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto =sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.1.2[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =sys-libs/talloc-2.3.1[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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] ) ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba )
-REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.12.2.tar.gz
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build dfda7934df092a96e439c05b4aeac519 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 pam a1771fc1e5831c201eaf18451747d94b preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils cf9742c01975dc707eb982114a9d70fa
-_md5_=007bd92b83aff7016a6e520445cc0b5d
diff --git a/metadata/md5-cache/net-fs/samba-4.12.3 b/metadata/md5-cache/net-fs/samba-4.12.3
deleted file mode 100644
index 4366be8b8d66..000000000000
--- a/metadata/md5-cache/net-fs/samba-4.12.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.1.3[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =sys-libs/talloc-2.3.1[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto =sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.9 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
-DESCRIPTION=Samba Suite Version 4
-EAPI=6
-HOMEPAGE=https://www.samba.org/
-IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.1.3[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] =sys-libs/talloc-2.3.1[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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] ) ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba )
-REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://samba/stable/samba-4.12.3.tar.gz
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build dfda7934df092a96e439c05b4aeac519 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 pam a1771fc1e5831c201eaf18451747d94b preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils cf9742c01975dc707eb982114a9d70fa
-_md5_=26feb71a620e7fbc1cdca8265a7cd543
diff --git a/metadata/md5-cache/net-fs/samba-4.12.3-r1 b/metadata/md5-cache/net-fs/samba-4.12.3-r1
index 55c3de5d114b..f83b570b0664 100644
--- a/metadata/md5-cache/net-fs/samba-4.12.3-r1
+++ b/metadata/md5-cache/net-fs/samba-4.12.3-r1
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://samba/stable/samba-4.12.3.tar.gz
_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build dfda7934df092a96e439c05b4aeac519 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 pam a1771fc1e5831c201eaf18451747d94b preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils cf9742c01975dc707eb982114a9d70fa
-_md5_=2430de65f2deab80c48d3255a6e5f75c
+_md5_=3a68171f3e3b1a555b615dd8c0b39ac7
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 65aca6da79ba..596d844377cb 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/irccloud-desktop-bin-0.15.0 b/metadata/md5-cache/net-irc/irccloud-desktop-bin-0.15.0
new file mode 100644
index 000000000000..e3346fc212c8
--- /dev/null
+++ b/metadata/md5-cache/net-irc/irccloud-desktop-bin-0.15.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=>=x11-libs/gtk+-3.0 x11-libs/libnotify >=dev-libs/nss-3 x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/xdg-utils net-print/cups >=app-accessibility/at-spi2-core-2.0.0 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=IRCCloud Desktop Client
+EAPI=7
+HOMEPAGE=https://github.com/irccloud/irccloud-desktop https://www.irccloud.com/
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=x11-libs/gtk+-3.0 x11-libs/libnotify >=dev-libs/nss-3 x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/xdg-utils net-print/cups >=app-accessibility/at-spi2-core-2.0.0
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://github.com/irccloud/irccloud-desktop/releases/download/v0.15.0/irccloud-desktop_0.15.0_linux_amd64.deb
+_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 unpacker b5891c9326ad2e7905c011d44c927c34 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=ff1d8a26400a95a39732306394cf545f
diff --git a/metadata/md5-cache/net-irc/unrealircd-5.0.3.1 b/metadata/md5-cache/net-irc/unrealircd-5.0.3.1
deleted file mode 100644
index ee4e663ce084..000000000000
--- a/metadata/md5-cache/net-irc/unrealircd-5.0.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( dev-libs/openssl:0 dev-libs/libressl:0 )
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) curl? ( net-misc/curl[adns] )
-DESCRIPTION=An advanced Internet Relay Chat daemon
-EAPI=7
-HOMEPAGE=https://www.unrealircd.org/
-IUSE=class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) curl? ( net-misc/curl[adns] )
-SLOT=0
-SRC_URI=https://www.unrealircd.org/downloads/unrealircd-5.0.3.1.tar.gz
-_eclasses_=ssl-cert 876f0e74ef1cc2e7c4edd9bca336d350
-_md5_=68bb8e2d091874656832a700f191b36c
diff --git a/metadata/md5-cache/net-irc/unrealircd-5.0.4 b/metadata/md5-cache/net-irc/unrealircd-5.0.4
deleted file mode 100644
index f02ded23cafe..000000000000
--- a/metadata/md5-cache/net-irc/unrealircd-5.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig || ( dev-libs/openssl:0 dev-libs/libressl:0 ) virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) curl? ( net-misc/curl[adns] )
-DESCRIPTION=An advanced Internet Relay Chat daemon
-EAPI=7
-HOMEPAGE=https://www.unrealircd.org/
-IUSE=class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 >=net-dns/c-ares-1.7:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) curl? ( net-misc/curl[adns] )
-SLOT=0
-SRC_URI=https://www.unrealircd.org/downloads/unrealircd-5.0.4.tar.gz
-_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 ssl-cert 876f0e74ef1cc2e7c4edd9bca336d350 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=dc62ddbf4932e654dc3a2323a45bb3a6
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index e70a25b43afe..f6e9e8f354d8 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/xrootd-4.12.0 b/metadata/md5-cache/net-libs/xrootd-4.12.0
index 1caa70318e4b..f668c28b425b 100644
--- a/metadata/md5-cache/net-libs/xrootd-4.12.0
+++ b/metadata/md5-cache/net-libs/xrootd-4.12.0
@@ -5,7 +5,7 @@ DESCRIPTION=Extended ROOT remote file server
EAPI=7
HOMEPAGE=http://xrootd.org/
IUSE=doc examples fuse http kerberos python readline ssl test python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-3
RDEPEND=acct-group/xrootd acct-user/xrootd sys-libs/zlib fuse? ( sys-fs/fuse:= ) kerberos? ( virtual/krb5 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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] ) ) readline? ( sys-libs/readline:0= ) ssl? ( dev-libs/openssl:0= ) dev-lang/perl
REQUIRED_USE=http? ( kerberos ssl ) python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=http://xrootd.org/download/v4.12.0/xrootd-4.12.0.tar.gz
_eclasses_=cmake-utils 7555f0a45c22f33391d9c0c80f57cf23 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=c1085ad76f63a7670105d154c319b4e4
+_md5_=2d234934a517f9b23ce987dcbc0a1091
diff --git a/metadata/md5-cache/net-libs/xrootd-ceph-4.12.0 b/metadata/md5-cache/net-libs/xrootd-ceph-4.12.0
index c91c39dbc76b..971fbeba94b8 100644
--- a/metadata/md5-cache/net-libs/xrootd-ceph-4.12.0
+++ b/metadata/md5-cache/net-libs/xrootd-ceph-4.12.0
@@ -4,10 +4,10 @@ DEPEND=net-libs/xrootd ! xrootd-ceph-4.12.0.tar.gz
_eclasses_=cmake 19b0421555865baefd505831dd4303e3 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=912d799131f71002b0258bffd2ccb8e8
+_md5_=5e9c5d8c5780173f395f047db4ff92b4
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 19ce8f5320c3..779fe782109c 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/nextcloud-client-2.6.4 b/metadata/md5-cache/net-misc/nextcloud-client-2.6.4
index 2f4784c67c4d..bab3d2eba978 100644
--- a/metadata/md5-cache/net-misc/nextcloud-client-2.6.4
+++ b/metadata/md5-cache/net-misc/nextcloud-client-2.6.4
@@ -5,11 +5,11 @@ DESCRIPTION=Desktop Syncing Client for Nextcloud
EAPI=7
HOMEPAGE=https://github.com/nextcloud/desktop
IUSE=doc dolphin nautilus shibboleth test
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
LICENSE=CC-BY-3.0 GPL-2
RDEPEND=>=dev-db/sqlite-3.4:3 >=dev-libs/openssl-1.1.0:0= dev-libs/qtkeychain[qt5(+)] dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5 dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtxml:5 sys-fs/inotify-tools dolphin? ( kde-frameworks/kcoreaddons:5 kde-frameworks/kio:5 ) nautilus? ( dev-python/nautilus-python ) shibboleth? ( dev-qt/qtwebkit:5 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/nextcloud/desktop/archive/v2.6.4.tar.gz -> nextcloud-client-2.6.4.tar.gz
_eclasses_=cmake-utils 7555f0a45c22f33391d9c0c80f57cf23 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e456b2583bf3e1708b6bbc63b91ac90
+_md5_=7985f3f4943a58c1d33895c6ca7b8c34
diff --git a/metadata/md5-cache/net-misc/rsync-3.1.3 b/metadata/md5-cache/net-misc/rsync-3.1.3
deleted file mode 100644
index c3f60df05439..000000000000
--- a/metadata/md5-cache/net-misc/rsync-3.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) static? ( acl? ( virtual/acl[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) >=dev-libs/popt-1.5[static-libs(+)] ) virtual/pkgconfig
-DESCRIPTION=File transfer program to keep remote files into sync
-EAPI=6
-HOMEPAGE=https://rsync.samba.org/
-IUSE=acl examples iconv ipv6 static stunnel xattr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
-SLOT=0
-SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.3.tar.gz
-_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 prefix c2993e4c430c1ee24f278983d6189501 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e00e644c9b20857220ab8025ce13ef5d
diff --git a/metadata/md5-cache/net-misc/rsync-3.2.0-r1 b/metadata/md5-cache/net-misc/rsync-3.2.0-r1
index e868748845f4..cc7e93c0d6b4 100644
--- a/metadata/md5-cache/net-misc/rsync-3.2.0-r1
+++ b/metadata/md5-cache/net-misc/rsync-3.2.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=File transfer program to keep remote files into sync
EAPI=7
HOMEPAGE=https://rsync.samba.org/
IUSE=acl examples iconv ipv6 libressl lz4 ssl static stunnel system-zlib xattr xxhash zstd cpu_flags_x86_sse2
-KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-3
RDEPEND=!static? ( acl? ( virtual/acl ) lz4? ( app-arch/lz4 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) system-zlib? ( sys-libs/zlib ) xattr? ( kernel_linux? ( sys-apps/attr ) ) xxhash? ( dev-libs/xxhash ) zstd? ( app-arch/zstd ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
SLOT=0
SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.2.0.tar.gz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 prefix c2993e4c430c1ee24f278983d6189501 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=cdad9bd3830471cd287e7507ac6e3da9
+_md5_=4099c24d810cb670afc24eed8a774f4e
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index adc4211f48fa..68f1fc848b49 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/networkmanager-wireguard-0_pre20191128-r5 b/metadata/md5-cache/net-vpn/networkmanager-wireguard-0_pre20191128-r5
index 626ad5ecfdd3..0c68b568e625 100644
--- a/metadata/md5-cache/net-vpn/networkmanager-wireguard-0_pre20191128-r5
+++ b/metadata/md5-cache/net-vpn/networkmanager-wireguard-0_pre20191128-r5
@@ -5,10 +5,10 @@ DESCRIPTION=NetworkManager WireGuard plugin
EAPI=7
HOMEPAGE=https://github.com/max-moser/network-manager-wireguard
IUSE=+gtk +nls
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2+
RDEPEND=>=net-misc/networkmanager-1.7.0 net-vpn/wireguard-tools[wg-quick] >=dev-libs/glib-2.32:2 gtk? ( >=x11-libs/gtk+-3.4:3 >=net-libs/libnma-1.7.0 >=app-crypt/libsecret-0.18 )
SLOT=0
SRC_URI=https://github.com/max-moser/network-manager-wireguard/archive/0e1124df9e97129c5e0d9996a2c3876ae18f01c4.tar.gz -> networkmanager-wireguard-0_pre20191128.tar.gz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=eae9493b8a255f467b9fd8dcb49edc34
+_md5_=3b78231c29dbeb8b2f3b823d7c53b8b1
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 96414c64a46a..bd3be5ac6bd5 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/openblas-0.3.9-r1 b/metadata/md5-cache/sci-libs/openblas-0.3.9-r1
index 39a5359b2261..cb9bc2011457 100644
--- a/metadata/md5-cache/sci-libs/openblas-0.3.9-r1
+++ b/metadata/md5-cache/sci-libs/openblas-0.3.9-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Optimized BLAS library based on GotoBLAS2
EAPI=7
HOMEPAGE=http://xianyi.github.com/OpenBLAS/
IUSE=dynamic eselect-ldso index-64bit openmp pthread test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
LICENSE=BSD
RDEPEND=eselect-ldso? ( >=app-eselect/eselect-blas-0.2 !app-eselect/eselect-cblas >=app-eselect/eselect-lapack-0.2 ) virtual/fortran
REQUIRED_USE=?? ( openmp pthread )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/xianyi/OpenBLAS/archive/v0.3.9 -> openblas-0.3.9.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 fortran-2 1a8c9d0b2d30f756bae6be4e9b39e46b multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=804fbef1b1e4448e683dba3373816d2a
+_md5_=e14d5c0d6fd394938bc43bc2f25c1880
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index c6fff9fb9a57..6acdba1c052d 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/biosdisk-1.01 b/metadata/md5-cache/sys-apps/biosdisk-1.01
new file mode 100644
index 000000000000..9ef9ec33ada3
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/biosdisk-1.01
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=FreeDOS based BIOS updating utility for Dell machines
+EAPI=7
+HOMEPAGE=https://github.com/dell/biosdisk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=app-cdr/cdrtools sys-boot/grub sys-boot/syslinux
+SLOT=0
+SRC_URI=https://github.com/dell/biosdisk/archive/1.01.tar.gz -> biosdisk-1.01.tar.gz
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5
+_md5_=9f4a5559f146ed606dc5cef48a023eb6
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.3.10 b/metadata/md5-cache/sys-apps/fwupd-1.3.10
index 3c41443c3a88..82858deba5b1 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.3.10
+++ b/metadata/md5-cache/sys-apps/fwupd-1.3.10
@@ -5,7 +5,7 @@ DESCRIPTION=Aims to make updating firmware on Linux automatic, safe and reliable
EAPI=7
HOMEPAGE=https://fwupd.org
IUSE=agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~arm x86
+KEYWORDS=amd64 ~arm x86
LICENSE=LGPL-2.1+
RDEPEND=!=dev-lang/python-exec-2:=[python_targets_python3_6] ) 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] ) >=app-arch/gcab-1.0 app-arch/libarchive:= dev-db/sqlite >=dev-libs/glib-2.45.8:2 dev-libs/json-glib dev-libs/libgpg-error dev-libs/libgudev:= >=dev-libs/libgusb-0.2.9[introspection?] >=dev-libs/libxmlb-0.1.13 python_single_target_python3_6? ( dev-python/pillow[python_targets_python3_6(-)] dev-python/pycairo[python_targets_python3_6(-)] dev-python/pygobject:3[cairo,python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pillow[python_targets_python3_7(-)] dev-python/pycairo[python_targets_python3_7(-)] dev-python/pygobject:3[cairo,python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycairo[python_targets_python3_8(-)] dev-python/pygobject:3[cairo,python_targets_python3_8(-)] ) >=net-libs/libsoup-2.51.92:2.4[introspection?] virtual/libelf:0= virtual/udev consolekit? ( >=sys-auth/consolekit-1.0.0 ) dell? ( sys-libs/efivar >=sys-libs/libsmbios-2.4.0 ) elogind? ( sys-auth/elogind ) gpg? ( app-crypt/gpgme dev-libs/libgpg-error ) !minimal? ( >=sys-auth/polkit-0.103 ) nvme? ( sys-libs/efivar ) pkcs7? ( >=net-libs/gnutls-3.4.4.1:= ) redfish? ( sys-libs/efivar ) systemd? ( >=sys-apps/systemd-211 ) tpm? ( app-crypt/tpm2-tss ) uefi? ( app-crypt/tpm2-tss media-libs/fontconfig media-libs/freetype sys-boot/gnu-efi sys-boot/efibootmgr >=sys-libs/efivar-33 x11-libs/cairo ) sys-apps/dbus
REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ^^ ( consolekit elogind minimal systemd ) dell? ( uefi ) minimal? ( !introspection )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/hughsie/fwupd/archive/1.3.10.tar.gz -> fwupd-1.3.10.tar.gz
_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 meson 8f7dc8ed2d76af0b33328789c017e677 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 2d2617a730e75e491e1d17af87841ec5 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 5b72a65a36d681d65aef5f7b4b8b2cb6 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=03313d81fb59389f1a240f6e7f997e6c
+_md5_=4863350e8c85a3a3d3022759bee5370e
diff --git a/metadata/md5-cache/sys-apps/unscd-0.53 b/metadata/md5-cache/sys-apps/unscd-0.53
index a58977c9ab05..992dcd302fcc 100644
--- a/metadata/md5-cache/sys-apps/unscd-0.53
+++ b/metadata/md5-cache/sys-apps/unscd-0.53
@@ -3,10 +3,10 @@ DEPEND=sys-libs/glibc[nscd(+)] virtual/pkgconfig
DESCRIPTION=simple & stable nscd replacement
EAPI=6
HOMEPAGE=https://busybox.net/~vda/unscd/README
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=GPL-2
RDEPEND=sys-libs/glibc[nscd(+)]
SLOT=0
SRC_URI=https://busybox.net/~vda/unscd/nscd-0.53.c
_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=e304ccbc8f911312ad599805d7948329
+_md5_=2089e7c5acd011952999b5e788b428c7
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index d641789c0207..c1df43f2c366 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/gcc-config-9999 b/metadata/md5-cache/sys-devel/gcc-config-9999
index 507092f914c6..df6e7f9bc62f 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-9999
+++ b/metadata/md5-cache/sys-devel/gcc-config-9999
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install postinst unpack
DESCRIPTION=Utility to manage compilers
EAPI=7
HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
-IUSE=+native-symlinks
+IUSE=+cc-wrappers +native-symlinks
LICENSE=GPL-2
PROPERTIES=live
RDEPEND=>=sys-apps/gentoo-functions-0.10
SLOT=0
_eclasses_=git-r3 86a0188f2ad9eb3d65e4d031ab8a0422 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=5aa90735b2af7ea537d6c4f7f67e77c2
+_md5_=05c8653528fa62482d64f18e74cc5f02
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 6f7075cd7ca4..c7dd1fb9f11c 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/diskdev_cmds-332.14_p1-r2 b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r2
index 7c697404ebeb..80aa1af6fc24 100644
--- a/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r2
+++ b/metadata/md5-cache/sys-fs/diskdev_cmds-332.14_p1-r2
@@ -3,10 +3,10 @@ DEPEND=dev-libs/openssl
DESCRIPTION=HFS and HFS+ utils ported from OSX, supplies mkfs and fsck
EAPI=7
HOMEPAGE=http://opendarwin.org
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
LICENSE=APSL-2
RDEPEND=dev-libs/openssl
SLOT=0
SRC_URI=http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-332.14.tar.gz mirror://gentoo/diskdev_cmds-332.14_p1.patch.bz2
_eclasses_=multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=861321a36318d3f13b70d265c645e659
+_md5_=df9f997797d95b5bb375010613541f1b
diff --git a/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14 b/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14
index 37ebd011327a..9b70ab771d49 100644
--- a/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14
+++ b/metadata/md5-cache/sys-fs/hfsutils-3.2.6_p14
@@ -5,11 +5,11 @@ DESCRIPTION=HFS FS Access utils
EAPI=7
HOMEPAGE=https://www.mars.org/home/rob/proj/hfs/
IUSE=tcl tk
-KEYWORDS=~amd64 ~arm ppc ppc64 sparc ~x86
+KEYWORDS=amd64 ~arm ppc ppc64 sparc ~x86
LICENSE=GPL-2
RDEPEND=tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= )
REQUIRED_USE=tk? ( tcl )
SLOT=0
SRC_URI=mirror://debian/pool/main/h/hfsutils/hfsutils_3.2.6.orig.tar.gz mirror://debian/pool/main/h/hfsutils/hfsutils_3.2.6-14.debian.tar.xz
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=5951135622c2e5a93d2fbe1b4b6e144a
+_md5_=49acd55c8aed0cb90f4d42b6390db91e
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 512d7d81ba9f..96d29e80947d 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/vanilla-sources-5.4.48 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.49
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.48
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.49
index 4476cf6407af..a2c4f1a4157f 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.48
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.49
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~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 )
RESTRICT=binchecks strip
-SLOT=5.4.48
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.48.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.49
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.49.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 686eaab303305a908fd57b2fd7617800 kernel-2 f818331411666c019e77dc2779a8ee31 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.5 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.6
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.7.5
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.7.6
index 97ae84161823..ff2820594c75 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.5
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.6
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~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 )
RESTRICT=binchecks strip
-SLOT=5.7.5
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.7.5.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
+SLOT=5.7.6
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.7.6.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 estack 686eaab303305a908fd57b2fd7617800 kernel-2 f818331411666c019e77dc2779a8ee31 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
_md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index dcf50e7e8c50..0ac447cdac20 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/editor-0-r3 b/metadata/md5-cache/virtual/editor-0-r3
index c1a60413792f..eacbe55849f6 100644
--- a/metadata/md5-cache/virtual/editor-0-r3
+++ b/metadata/md5-cache/virtual/editor-0-r3
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for editor
EAPI=6
KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-RDEPEND=|| ( app-editors/nano app-editors/dav app-editors/e3 app-editors/ee app-editors/elvis app-editors/emacs:* app-editors/emact app-editors/ersatz-emacs app-editors/fe app-editors/jasspa-microemacs app-editors/jed app-editors/joe app-editors/jove app-editors/kakoune app-editors/le app-editors/levee app-editors/lpe app-editors/mg app-editors/moe app-editors/ne app-editors/neovim app-editors/ng app-editors/nvi app-editors/qemacs app-editors/teco app-editors/uemacs-pk app-editors/vile app-editors/vim app-editors/gvim app-editors/vis app-editors/xemacs app-editors/zile app-misc/mc[edit] dev-lisp/cmucl mail-client/alpine[-onlyalpine] )
+RDEPEND=|| ( app-editors/nano app-editors/dav app-editors/e3 app-editors/ee app-editors/elvis app-editors/emacs:* app-editors/emact app-editors/ersatz-emacs app-editors/fe app-editors/jasspa-microemacs app-editors/jed app-editors/joe app-editors/jove app-editors/kakoune app-editors/le app-editors/levee app-editors/lpe app-editors/mg app-editors/moe app-editors/ne app-editors/neovim app-editors/ng app-editors/qemacs app-editors/teco app-editors/uemacs-pk app-editors/vile app-editors/vim app-editors/gvim app-editors/vis app-editors/xemacs app-editors/zile app-misc/mc[edit] dev-lisp/cmucl mail-client/alpine[-onlyalpine] )
SLOT=0
-_md5_=f3f9c3ed53dc0fafc00b58e48ddd5f56
+_md5_=6237f74713c32fe2093ff143c9786d28
diff --git a/metadata/md5-cache/virtual/libc-1-r1 b/metadata/md5-cache/virtual/libc-1-r1
index 403322893a16..befd7f5c6533 100644
--- a/metadata/md5-cache/virtual/libc-1-r1
+++ b/metadata/md5-cache/virtual/libc-1-r1
@@ -1,7 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for the C library
EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
RDEPEND=!prefix-guest? ( elibc_glibc? ( sys-libs/glibc:2.2 ) elibc_musl? ( sys-libs/musl ) elibc_uclibc? ( sys-libs/uclibc-ng ) ) prefix-guest? ( elibc_Cygwin? ( sys-libs/cygwin-crypt ) !sys-libs/glibc !sys-libs/musl !sys-libs/uclibc-ng !sys-libs/uclibc )
SLOT=0
-_md5_=3acc108d4da068ff66ce99a903208b72
+_md5_=76b044c8ddf5156655f3d388d1469291
diff --git a/metadata/md5-cache/virtual/os-headers-0-r2 b/metadata/md5-cache/virtual/os-headers-0-r2
index c961aaf96e95..48841f349e7f 100644
--- a/metadata/md5-cache/virtual/os-headers-0-r2
+++ b/metadata/md5-cache/virtual/os-headers-0-r2
@@ -1,7 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for operating system headers
EAPI=7
-KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
RDEPEND=!prefix-guest? ( || ( kernel_linux? ( sys-kernel/linux-headers:0 ) kernel_Winnt? ( elibc_mingw? ( dev-util/mingw64-runtime ) ) ) ) prefix-guest? ( !sys-kernel/linux-headers )
SLOT=0
-_md5_=349c179ca13654650832321362d56e97
+_md5_=5e154fb29cc06198769c9345f54ec2ef
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 9f888e9b44e6..2cbadd9f14a3 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/chromedriver-bin-2.24-r1 b/metadata/md5-cache/www-apps/chromedriver-bin-2.24-r1
deleted file mode 100644
index a68dc50d4b6a..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-2.24-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/2.24/chromedriver_linux64.zip -> chromedriver-bin-2.24.linux64.zip ) x86? ( https://chromedriver.storage.googleapis.com/2.24/chromedriver_linux32.zip -> chromedriver-bin-2.24.linux32.zip )
-_md5_=9a2b692b8db51a0d022bde3c730d04e6
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-2.30-r1 b/metadata/md5-cache/www-apps/chromedriver-bin-2.30-r1
deleted file mode 100644
index 1c842e1433e9..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-2.30-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/2.30/chromedriver_linux64.zip -> chromedriver-bin-2.30.linux64.zip ) x86? ( https://chromedriver.storage.googleapis.com/2.30/chromedriver_linux32.zip -> chromedriver-bin-2.30.linux32.zip )
-_md5_=9a2b692b8db51a0d022bde3c730d04e6
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-2.35-r1 b/metadata/md5-cache/www-apps/chromedriver-bin-2.35-r1
deleted file mode 100644
index b181b6f9feed..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-2.35-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/2.35/chromedriver_linux64.zip -> chromedriver-bin-2.35.linux64.zip )
-_md5_=1a90b4759ac377781cbad0849a1d87b5
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-2.40 b/metadata/md5-cache/www-apps/chromedriver-bin-2.40
deleted file mode 100644
index 5dc8ca893000..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-2.40
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/2.40/chromedriver_linux64.zip -> chromedriver-bin-2.40.linux64.zip )
-_md5_=1a90b4759ac377781cbad0849a1d87b5
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-2.41 b/metadata/md5-cache/www-apps/chromedriver-bin-2.41
deleted file mode 100644
index 03900a4ae308..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-2.41
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/2.41/chromedriver_linux64.zip -> chromedriver-bin-2.41.linux64.zip )
-_md5_=1a90b4759ac377781cbad0849a1d87b5
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-74.0.3729.6 b/metadata/md5-cache/www-apps/chromedriver-bin-74.0.3729.6
deleted file mode 100644
index 7367d7717baa..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-74.0.3729.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/74.0.3729.6/chromedriver_linux64.zip -> chromedriver-bin-74.0.3729.6.linux64.zip )
-_md5_=cce934fd1fedb6112f915ff55e84c08c
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-76.0.3809.68 b/metadata/md5-cache/www-apps/chromedriver-bin-76.0.3809.68
deleted file mode 100644
index 5b1b8f38a75b..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-76.0.3809.68
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/76.0.3809.68/chromedriver_linux64.zip -> chromedriver-bin-76.0.3809.68.linux64.zip )
-_md5_=cce934fd1fedb6112f915ff55e84c08c
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-77.0.3865.40 b/metadata/md5-cache/www-apps/chromedriver-bin-77.0.3865.40
deleted file mode 100644
index 714a82a7ab1e..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-77.0.3865.40
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/77.0.3865.40/chromedriver_linux64.zip -> chromedriver-bin-77.0.3865.40.linux64.zip )
-_md5_=cce934fd1fedb6112f915ff55e84c08c
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-78.0.3904.105 b/metadata/md5-cache/www-apps/chromedriver-bin-78.0.3904.105
deleted file mode 100644
index df603879a455..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-78.0.3904.105
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=7
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/78.0.3904.105/chromedriver_linux64.zip -> chromedriver-bin-78.0.3904.105.linux64.zip )
-_md5_=cd21b13a7f832c8353dd3afe1deb75d0
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-78.0.3904.70 b/metadata/md5-cache/www-apps/chromedriver-bin-78.0.3904.70
deleted file mode 100644
index 16ba53b93c46..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-78.0.3904.70
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=6
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/78.0.3904.70/chromedriver_linux64.zip -> chromedriver-bin-78.0.3904.70.linux64.zip )
-_md5_=cce934fd1fedb6112f915ff55e84c08c
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-79.0.3945.36 b/metadata/md5-cache/www-apps/chromedriver-bin-79.0.3945.36
deleted file mode 100644
index 27843eba9ccd..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-79.0.3945.36
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=7
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/79.0.3945.36/chromedriver_linux64.zip -> chromedriver-bin-79.0.3945.36.linux64.zip )
-_md5_=cd21b13a7f832c8353dd3afe1deb75d0
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-80.0.3987.106 b/metadata/md5-cache/www-apps/chromedriver-bin-80.0.3987.106
deleted file mode 100644
index 44fce0e34926..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-80.0.3987.106
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=7
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/80.0.3987.106/chromedriver_linux64.zip -> chromedriver-bin-80.0.3987.106.linux64.zip )
-_md5_=884a68f99111bd33819a5e9fafd99539
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-81.0.4044.69 b/metadata/md5-cache/www-apps/chromedriver-bin-81.0.4044.69
deleted file mode 100644
index 0ce925c7d8ac..000000000000
--- a/metadata/md5-cache/www-apps/chromedriver-bin-81.0.4044.69
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=install
-DESCRIPTION=WebDriver for Chrome
-EAPI=7
-HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
-LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/81.0.4044.69/chromedriver_linux64.zip -> chromedriver-bin-81.0.4044.69.linux64.zip )
-_md5_=884a68f99111bd33819a5e9fafd99539
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-83.0.4103.39 b/metadata/md5-cache/www-apps/chromedriver-bin-83.0.4103.39-r1
similarity index 79%
rename from metadata/md5-cache/www-apps/chromedriver-bin-83.0.4103.39
rename to metadata/md5-cache/www-apps/chromedriver-bin-83.0.4103.39-r1
index 0f5e32a611cd..5e0960ffdbaf 100644
--- a/metadata/md5-cache/www-apps/chromedriver-bin-83.0.4103.39
+++ b/metadata/md5-cache/www-apps/chromedriver-bin-83.0.4103.39-r1
@@ -5,8 +5,8 @@ EAPI=7
HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
KEYWORDS=~amd64
LICENSE=google-chrome
-RDEPEND=!www-client/chromium www-client/google-chrome
+RDEPEND=!www-client/chromium =www-client/google-chrome-83*
RESTRICT=bindist mirror strip
SLOT=0
SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/83.0.4103.39/chromedriver_linux64.zip -> chromedriver-bin-83.0.4103.39.linux64.zip )
-_md5_=884a68f99111bd33819a5e9fafd99539
+_md5_=028b56cd1522fd580e19cce0458e615d
diff --git a/metadata/md5-cache/www-apps/mediawiki-1.34.2 b/metadata/md5-cache/www-apps/mediawiki-1.34.2
new file mode 100644
index 000000000000..985fb92a678e
--- /dev/null
+++ b/metadata/md5-cache/www-apps/mediawiki-1.34.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst prerm setup unpack
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=The MediaWiki wiki web application (as used on wikipedia.org)
+EAPI=7
+HOMEPAGE=http://www.mediawiki.org
+IUSE=imagemagick mysql postgres +sqlite vhosts
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/php[ctype,fileinfo,iconv,json,postgres?,session,ssl,unicode,xml,xmlreader] imagemagick? ( virtual/imagemagick-tools ) !imagemagick? ( dev-lang/php[gd] ) mysql? ( dev-lang/php[mysql,mysqli] ) sqlite? ( dev-db/sqlite[fts3(+)] dev-lang/php[pdo,sqlite] ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+RESTRICT=test
+SLOT=1.34.2
+SRC_URI=http://releases.wikimedia.org/mediawiki/1.34/mediawiki-1.34.2.tar.gz
+_eclasses_=webapp 16783e418aca3ffa461d68310bf7ab12
+_md5_=233eacf5a934a971d7c386e5287b8bfa
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index ebedc2937f52..07c7c39fd2bd 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-83.0.4103.116 b/metadata/md5-cache/www-client/chromium-83.0.4103.116
index c6df0a7a6a00..eac362b12c49 100644
--- a/metadata/md5-cache/www-client/chromium-83.0.4103.116
+++ b/metadata/md5-cache/www-client/chromium-83.0.4103.116
@@ -5,7 +5,7 @@ DESCRIPTION=Open-source version of Google Chrome web browser
EAPI=7
HOMEPAGE=https://chromium.org/
IUSE=+closure-compile component-build cups cpu_flags_arm_neon +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
LICENSE=BSD
RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 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:= media-libs/mesa:=[gbm] system-libvpx? ( >=media-libs/libvpx-1.8.2:=[postproc,svc] ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:0 =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/gtk+:3[X] 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/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) 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-67.1:= )
REQUIRED_USE=component-build? ( !suid )
@@ -13,4 +13,4 @@ RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
SLOT=0
SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-83.0.4103.116.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
_eclasses_=check-reqs 7e3fd1855a5e1b50bb9e80827b3f672d chromium-2 92ff174aa2b13d6ea0c4539533f0b2de desktop 7fd20552ce4cc97e8acb132a499a7dd8 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils a41d1fd1c111289ffa04490de6ee79d7 portability e8f7ef3a41965b21a734550f8a94c1c6 python-any-r1 c26f95a5042de003dc58bef955e41c88 python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=4896e0cfee8ef2e28491c0b92cba58c9
+_md5_=b2078edca6d334a79aecb0239db0f1c6
diff --git a/metadata/md5-cache/x11-apps/Manifest.gz b/metadata/md5-cache/x11-apps/Manifest.gz
index f65428e3b4dc..59e62c37ea08 100644
Binary files a/metadata/md5-cache/x11-apps/Manifest.gz and b/metadata/md5-cache/x11-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-apps/appres-1.0.4 b/metadata/md5-cache/x11-apps/appres-1.0.4
deleted file mode 100644
index bab42aedc47e..000000000000
--- a/metadata/md5-cache/x11-apps/appres-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=list X application resource database
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/appres
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXt
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/appres-1.0.4.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=270b648e17ce3ea34465a6b3c4296522
diff --git a/metadata/md5-cache/x11-apps/editres-1.0.6 b/metadata/md5-cache/x11-apps/editres-1.0.6
deleted file mode 100644
index 4eb0fbac4dcc..000000000000
--- a/metadata/md5-cache/x11-apps/editres-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=a dynamic resource editor for X Toolkit applications
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/editres
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/editres-1.0.6.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=2aa73069187a3923e828214896f2056f
diff --git a/metadata/md5-cache/x11-apps/ico-1.0.4 b/metadata/md5-cache/x11-apps/ico-1.0.4
deleted file mode 100644
index 40f478652cb7..000000000000
--- a/metadata/md5-cache/x11-apps/ico-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=animate an icosahedron or other polyhedron
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/ico
-KEYWORDS=amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/ico-1.0.4.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=da2533a2a915cbc5cac3065f4b73bffa
diff --git a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.24 b/metadata/md5-cache/x11-apps/igt-gpu-tools-1.24
deleted file mode 100644
index 796caf689b0f..000000000000
--- a/metadata/md5-cache/x11-apps/igt-gpu-tools-1.24
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/libunwind:= sys-libs/zlib:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 x11-libs/pixman chamelium? ( dev-libs/xmlrpc-c[curl] sci-libs/gsl media-libs/alsa-lib:= ) overlay? ( >=x11-libs/libXrandr-1.3 xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) runner? ( dev-libs/json-c:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) doc? ( >=dev-util/gtk-doc-1.25-r1 ) man? ( dev-python/docutils ) overlay? ( >=dev-util/peg-0.1.18 x11-base/xorg-proto ) video_cards_intel? ( sys-devel/bison sys-devel/flex ) >=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DESCRIPTION=Intel GPU userland tools
-EAPI=6
-HOMEPAGE=https://01.org/linuxgraphics https://gitlab.freedesktop.org/drm/igt-gpu-tools
-IUSE=chamelium doc man overlay runner unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xv
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/elfutils dev-libs/glib:2 sys-apps/kmod:= sys-libs/libunwind:= sys-libs/zlib:= sys-process/procps:= virtual/libudev:= >=x11-libs/cairo-1.12.0[X?] >=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?] >=x11-libs/libpciaccess-0.10 x11-libs/pixman chamelium? ( dev-libs/xmlrpc-c[curl] sci-libs/gsl media-libs/alsa-lib:= ) overlay? ( >=x11-libs/libXrandr-1.3 xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) ) runner? ( dev-libs/json-c:= ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind )
-REQUIRED_USE=|| ( video_cards_amdgpu video_cards_intel video_cards_nouveau ) overlay? ( video_cards_intel || ( X xv ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/igt-gpu-tools-1.24.tar.xz
-_eclasses_=eapi7-ver f9ec87e93172b25ce65a85303dc06964 meson 8f7dc8ed2d76af0b33328789c017e677 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=685d8e9d10dcb4d60750b4f223856835
diff --git a/metadata/md5-cache/x11-apps/rgb-1.0.5 b/metadata/md5-cache/x11-apps/rgb-1.0.5
deleted file mode 100644
index 9a223dc0dab8..000000000000
--- a/metadata/md5-cache/x11-apps/rgb-1.0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=uncompile an rgb color-name database
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/rgb
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/rgb-1.0.5.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=f9b2bb6ece85654bff428e5748a8c496
diff --git a/metadata/md5-cache/x11-apps/showfont-1.0.4 b/metadata/md5-cache/x11-apps/showfont-1.0.4
deleted file mode 100644
index 045d34dcb48b..000000000000
--- a/metadata/md5-cache/x11-apps/showfont-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libFS >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=font dumper for X font server
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/showfont
-KEYWORDS=amd64 arm ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libFS
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/showfont-1.0.4.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=f2a8c8d5e0755dadba04c667d27484e4
diff --git a/metadata/md5-cache/x11-apps/transset-1.0.1 b/metadata/md5-cache/x11-apps/transset-1.0.1
deleted file mode 100644
index e3006ceca554..000000000000
--- a/metadata/md5-cache/x11-apps/transset-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=An utility for setting opacity property
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/transset
-KEYWORDS=amd64 x86
-LICENSE=SGI-B-2.0
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/transset-1.0.1.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=78c469bf2cd7257e6c6aba366ef2ac11
diff --git a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.1 b/metadata/md5-cache/x11-apps/xdpyinfo-1.3.1
deleted file mode 100644
index c4ec2c6111a7..000000000000
--- a/metadata/md5-cache/x11-apps/xdpyinfo-1.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama ) x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=Display information utility for X
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xdpyinfo
-IUSE=dga dmx xinerama
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst x11-libs/libXxf86vm x11-libs/libxcb dga? ( x11-libs/libXxf86dga ) dmx? ( x11-libs/libdmx ) xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xdpyinfo-1.3.1.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=e0a10310fd628d3d0f21c2c1486a3945
diff --git a/metadata/md5-cache/x11-apps/xdriinfo-1.0.5 b/metadata/md5-cache/x11-apps/xdriinfo-1.0.5
deleted file mode 100644
index b4ee45e11591..000000000000
--- a/metadata/md5-cache/x11-apps/xdriinfo-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libX11 virtual/opengl x11-base/xorg-proto >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=query configuration information of DRI drivers
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xdriinfo
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 virtual/opengl
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xdriinfo-1.0.5.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=58acab9e01eb53064d14a04b4ca0dac2
diff --git a/metadata/md5-cache/x11-apps/xedit-1.2.1 b/metadata/md5-cache/x11-apps/xedit-1.2.1
deleted file mode 100644
index 97e5f5e4bea5..000000000000
--- a/metadata/md5-cache/x11-apps/xedit-1.2.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=simple text editor for X
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xedit
-KEYWORDS=amd64 hppa ~mips ppc ppc64 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXt x11-libs/libXmu x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xedit-1.2.1.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=5214dd8499426785248890bbee504fd7
diff --git a/metadata/md5-cache/x11-apps/xeyes-1.1.1 b/metadata/md5-cache/x11-apps/xeyes-1.1.1
deleted file mode 100644
index 2cc7c77f46aa..000000000000
--- a/metadata/md5-cache/x11-apps/xeyes-1.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org xeyes application
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xeyes
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc64-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXt x11-libs/libXext x11-libs/libXmu x11-libs/libXrender
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xeyes-1.1.1.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=b2cd960378bc34bdf7c25746e93040d4
diff --git a/metadata/md5-cache/x11-apps/xfontsel-1.0.5 b/metadata/md5-cache/x11-apps/xfontsel-1.0.5
deleted file mode 100644
index b841ce663c7d..000000000000
--- a/metadata/md5-cache/x11-apps/xfontsel-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=point and click selection of X11 font names
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xfontsel
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXmu x11-libs/libXt x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xfontsel-1.0.5.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=cfd48093ac9aed85c716fa5b6e626934
diff --git a/metadata/md5-cache/x11-apps/xgc-1.0.4 b/metadata/md5-cache/x11-apps/xgc-1.0.4
deleted file mode 100644
index eababc78fe6e..000000000000
--- a/metadata/md5-cache/x11-apps/xgc-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X graphics demo
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xgc
-KEYWORDS=amd64 arm hppa ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXt
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xgc-1.0.4.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=3b1a84f5786baecf96f5ccf0638a7642
diff --git a/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r1 b/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r1
deleted file mode 100644
index ae43fbb90c7e..000000000000
--- a/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr gtk? ( dev-cpp/gtkmm:2.4 ) x11-base/xorg-proto >=app-portage/elt-patches-20170815
-DESCRIPTION=A generic touchscreen calibration program for X.Org
-EAPI=5
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/xinput_calibrator
-IUSE=gtk
-KEYWORDS=amd64 arm ~arm64 x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr gtk? ( dev-cpp/gtkmm:2.4 )
-SLOT=0
-SRC_URI=https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9fbea6781bec87485556a2e2ddc01fb
diff --git a/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r2 b/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r2
new file mode 100644
index 000000000000..c74706fa64d2
--- /dev/null
+++ b/metadata/md5-cache/x11-apps/xinput_calibrator-0.7.5-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-base/xorg-proto
+DESCRIPTION=A generic touchscreen calibration program for X.Org
+EAPI=7
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/xinput_calibrator
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr
+SLOT=0
+SRC_URI=https://github.com/downloads/tias/xinput_calibrator/xinput_calibrator-0.7.5.tar.gz
+_eclasses_=eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=36db0ce6b4d6810916d36efe3d2af551
diff --git a/metadata/md5-cache/x11-apps/xkill-1.0.4 b/metadata/md5-cache/x11-apps/xkill-1.0.4
deleted file mode 100644
index 358db2f4782f..000000000000
--- a/metadata/md5-cache/x11-apps/xkill-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=kill a client by its X resource
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xkill
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-winnt
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXmu
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xkill-1.0.4.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=f832e84e5fb1981734436547fdab8db5
diff --git a/metadata/md5-cache/x11-apps/xmessage-1.0.4 b/metadata/md5-cache/x11-apps/xmessage-1.0.4
deleted file mode 100644
index 850d5d4aaad7..000000000000
--- a/metadata/md5-cache/x11-apps/xmessage-1.0.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXaw x11-libs/libXt >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=display a message or query in a window (X-based /bin/echo)
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xmessage
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libXt
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xmessage-1.0.4.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=308430b31e6c43284c2206d4e1e3e41b
diff --git a/metadata/md5-cache/x11-apps/xrefresh-1.0.5 b/metadata/md5-cache/x11-apps/xrefresh-1.0.5
deleted file mode 100644
index 3768ca68b673..000000000000
--- a/metadata/md5-cache/x11-apps/xrefresh-1.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=refresh all or part of an X screen
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xrefresh
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xrefresh-1.0.5.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=31a8a2a7cc6e8885afbdddf513200654
diff --git a/metadata/md5-cache/x11-apps/xset-1.2.3 b/metadata/md5-cache/x11-apps/xset-1.2.3
deleted file mode 100644
index 21387d4912e5..000000000000
--- a/metadata/md5-cache/x11-apps/xset-1.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org xset application
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xset
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=x11-libs/libX11 x11-libs/libXmu x11-libs/libXext
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xset-1.2.3.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=4740fdcfac91ac23a9e066d1c5942b8e
diff --git a/metadata/md5-cache/x11-apps/xsetroot-1.1.1 b/metadata/md5-cache/x11-apps/xsetroot-1.1.1
deleted file mode 100644
index 28330c72d9db..000000000000
--- a/metadata/md5-cache/x11-apps/xsetroot-1.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X.Org xsetroot application
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xsetroot
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=x11-libs/libXmu x11-libs/libX11 x11-misc/xbitmaps x11-libs/libXcursor
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xsetroot-1.1.1.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=c028ff7c58ab11f21848a11fd91ed497
diff --git a/metadata/md5-cache/x11-apps/xsm-1.0.3 b/metadata/md5-cache/x11-apps/xsm-1.0.3
deleted file mode 100644
index d46992de939e..000000000000
--- a/metadata/md5-cache/x11-apps/xsm-1.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM rsh? ( net-misc/netkit-rsh ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=X Session Manager
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xsm
-IUSE=rsh
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=MIT
-RDEPEND=x11-libs/libXaw x11-libs/libX11 x11-libs/libXt x11-libs/libICE x11-libs/libSM rsh? ( net-misc/netkit-rsh )
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xsm-1.0.3.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=51e2f8e1fadc3e98eea7e870e2594552
diff --git a/metadata/md5-cache/x11-apps/xwd-1.0.6 b/metadata/md5-cache/x11-apps/xwd-1.0.6
deleted file mode 100644
index 4ad713bd0a14..000000000000
--- a/metadata/md5-cache/x11-apps/xwd-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-libs/libX11 x11-base/xorg-proto x11-libs/libXt x11-libs/libxkbfile >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DESCRIPTION=dump an image of an X window
-EAPI=5
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/app/xwd
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/app/xwd-1.0.6.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 autotools-utils 95db0904ad0f62535e18e5ccb67cce5e desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 e6d2349188531f9269a34fe438392e90
-_md5_=8f2d78a608f48a346bfb8f71eb1cd665
diff --git a/metadata/md5-cache/x11-base/Manifest.gz b/metadata/md5-cache/x11-base/Manifest.gz
index c17f92ced649..3c075ff9d70d 100644
Binary files a/metadata/md5-cache/x11-base/Manifest.gz and b/metadata/md5-cache/x11-base/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2019.2 b/metadata/md5-cache/x11-base/xorg-proto-2019.2
deleted file mode 100644
index 690403cfe257..000000000000
--- a/metadata/md5-cache/x11-base/xorg-proto-2019.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=X.Org combined protocol headers
-EAPI=7
-HOMEPAGE=https://gitlab.freedesktop.org/xorg/proto/xorgproto
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=!=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-drivers/nvidia-drivers[-libglvnd(-)] ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind sys-auth/pambase[elogind] ) sys-devel/flex >=x11-base/xorg-proto-2018.4 dmx? ( doc? ( || ( www-client/links www-client/lynx www-client/w3m ) ) )
-DESCRIPTION=X.Org X servers
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity static-libs doc
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-PDEPEND=xorg? ( >=x11-base/xorg-drivers-1.20 )
-RDEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-drivers/nvidia-drivers[-libglvnd(-)] ) !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-apps/iceauth-1.0.2 >=x11-apps/rgb-1.0.3 >=x11-apps/xauth-1.0.3 x11-apps/xkbcomp >=x11-libs/libdrm-2.4.89 >=x11-libs/libpciaccess-0.12.901 >=x11-libs/libXau-1.0.4 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXfont2-2.0.1 >=x11-libs/libxkbfile-1.0.4 >=x11-libs/libxshmfence-1.1 >=x11-libs/pixman-0.27.2 >=x11-libs/xtrans-1.3.5 >=x11-misc/xbitmaps-1.0.1 >=x11-misc/xkeyboard-config-2.4.1-r3 dmx? ( x11-libs/libXt >=x11-libs/libdmx-1.0.99.1 >=x11-libs/libX11-1.1.5 >=x11-libs/libXaw-1.0.4 >=x11-libs/libXext-1.0.99.4 >=x11-libs/libXfixes-5.0 >=x11-libs/libXi-1.2.99.1 >=x11-libs/libXmu-1.0.3 x11-libs/libXrender >=x11-libs/libXres-1.0.3 >=x11-libs/libXtst-1.0.99.2 ) kdrive? ( >=x11-libs/libXext-1.0.5 x11-libs/libXv ) xephyr? ( x11-libs/libxcb[xkb] x11-libs/xcb-util x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-renderutil x11-libs/xcb-util-wm ) !minimal? ( >=x11-libs/libX11-1.1.5 >=x11-libs/libXext-1.0.5 >=media-libs/mesa-18[X(+),egl,gbm] >=media-libs/libepoxy-1.5.4[X,egl(+)] ) udev? ( virtual/libudev:= ) unwind? ( sys-libs/libunwind ) wayland? ( >=dev-libs/wayland-1.3.0 >=media-libs/libepoxy-1.5.4[egl(+)] >=dev-libs/wayland-protocols-1.18 ) >=x11-apps/xinit-1.3.3-r1 systemd? ( sys-apps/dbus sys-apps/systemd ) elogind? ( sys-apps/dbus sys-auth/elogind sys-auth/pambase[elogind] ) selinux? ( sec-policy/selinux-xserver )
-REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !wayland ) xephyr? ( kdrive )
-SLOT=0/1.20.7
-SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.7.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xorg-3 f674df0f948f42c9f40bbdd2b1cd76b4
-_md5_=535db35e183ab6a0d939bba93bcf1d1c
diff --git a/metadata/md5-cache/x11-base/xorg-server-1.20.8-r1 b/metadata/md5-cache/x11-base/xorg-server-1.20.8-r1
index 82e0e45e04d4..1bb7df0c34e5 100644
--- a/metadata/md5-cache/x11-base/xorg-server-1.20.8-r1
+++ b/metadata/md5-cache/x11-base/xorg-server-1.20.8-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elog
SLOT=0/1.20.8
SRC_URI=https://www.x.org/releases/individual/xserver/xorg-server-1.20.8.tar.bz2
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xorg-3 f674df0f948f42c9f40bbdd2b1cd76b4
-_md5_=a2f2aa9109bf04ee6d48e3b0927d63db
+_md5_=aab45cb970b2c2c0910683a387eeb14a
diff --git a/metadata/md5-cache/x11-base/xorg-server-9999 b/metadata/md5-cache/x11-base/xorg-server-9999
index 3681de69681a..8ab5c9986fca 100644
--- a/metadata/md5-cache/x11-base/xorg-server-9999
+++ b/metadata/md5-cache/x11-base/xorg-server-9999
@@ -4,7 +4,7 @@ DEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-driv
DESCRIPTION=X.Org X servers
EAPI=7
HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/xserver/xorg-server
-IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity static-libs doc
+IUSE=dmx kdrive wayland xephyr xnest xorg xvfb debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity static-libs doc
LICENSE=MIT
PDEPEND=xorg? ( >=x11-base/xorg-drivers-9999 )
PROPERTIES=live
@@ -12,4 +12,4 @@ RDEPEND=libglvnd? ( media-libs/libglvnd[X] !app-eselect/eselect-opengl !!x11-dri
REQUIRED_USE=!minimal? ( || ( dmx kdrive wayland xephyr xnest xorg xvfb ) ) elogind? ( udev ) ?? ( elogind systemd ) minimal? ( !wayland ) xephyr? ( kdrive )
SLOT=0/9999
_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 git-r3 86a0188f2ad9eb3d65e4d031ab8a0422 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xorg-3 f674df0f948f42c9f40bbdd2b1cd76b4
-_md5_=726f4c2fb63ffba1993c9cc24f0882ac
+_md5_=9f6b5463d2d17dd2f0e997796b80b824
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index c71d123aff99..aa5bcae85b41 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138
new file mode 100644
index 000000000000..72b54d355bd1
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.138
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
+IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X ) static-libs? ( tools )
+RESTRICT=bindist mirror test
+SLOT=0/390
+SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/390.138/NVIDIA-FreeBSD-x86_64-390.138.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/390.138/NVIDIA-Linux-x86_64-390.138.run ) arm? ( https://us.download.nvidia.com/XFree86/Linux-x86-ARM/390.138/NVIDIA-Linux-armv7l-gnueabihf-390.138.run ) x86-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86/390.138/NVIDIA-FreeBSD-x86-390.138.tar.gz ) x86? ( https://us.download.nvidia.com/XFree86/Linux-x86/390.138/NVIDIA-Linux-x86-390.138.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.138.tar.bz2 )
+_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 linux-mod 9991808b521b5a8c569c9c4ccf8893f6 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build dfda7934df092a96e439c05b4aeac519 multilib-minimal 8bddda43703ba94d8341f4e247f97566 nvidia-driver a97e90b59a0f3927b9782cb2cae0445e portability e8f7ef3a41965b21a734550f8a94c1c6 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 unpacker b5891c9326ad2e7905c011d44c927c34
+_md5_=4495b3fbbf3c4e0db325a2a67660d779
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100 b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100
new file mode 100644
index 000000000000..5f3c67cb71b2
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-440.100
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
+IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X ) static-libs? ( tools )
+RESTRICT=bindist mirror test
+SLOT=0/440
+SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/440.100/NVIDIA-FreeBSD-x86_64-440.100.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/440.100/NVIDIA-Linux-x86_64-440.100.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.100.tar.bz2 )
+_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 linux-mod 9991808b521b5a8c569c9c4ccf8893f6 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build dfda7934df092a96e439c05b4aeac519 multilib-minimal 8bddda43703ba94d8341f4e247f97566 nvidia-driver a97e90b59a0f3927b9782cb2cae0445e portability e8f7ef3a41965b21a734550f8a94c1c6 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 unpacker b5891c9326ad2e7905c011d44c927c34
+_md5_=af0fbabdf2fe703df92b07b4d8988353
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.51 b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.51
new file mode 100644
index 000000000000..6b666d5457fc
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.51
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) kernel_linux? ( virtual/linux-sources ) tools? ( sys-apps/dbus ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) sys-apps/pciutils
+DESCRIPTION=NVIDIA Accelerated Graphics Driver
+EAPI=7
+HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
+IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+KEYWORDS=-* ~amd64
+LICENSE=GPL-2 NVIDIA-r2
+RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( =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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,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_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( net-libs/libtirpc ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X ) static-libs? ( tools )
+RESTRICT=bindist mirror test
+SLOT=0/450
+SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/450.51/NVIDIA-FreeBSD-x86_64-450.51.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/450.51/NVIDIA-Linux-x86_64-450.51.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-450.51.tar.bz2 )
+_eclasses_=desktop 7fd20552ce4cc97e8acb132a499a7dd8 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 linux-mod 9991808b521b5a8c569c9c4ccf8893f6 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build dfda7934df092a96e439c05b4aeac519 multilib-minimal 8bddda43703ba94d8341f4e247f97566 nvidia-driver a97e90b59a0f3927b9782cb2cae0445e portability e8f7ef3a41965b21a734550f8a94c1c6 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb udev 452708c3f55cf6e918b045adb949a9e6 unpacker b5891c9326ad2e7905c011d44c927c34
+_md5_=c597e22f0006b4a9058e850b80ed4370
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0
deleted file mode 100644
index a8d009471f65..000000000000
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.29.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install prepare pretend setup unpack
-DEPEND=>=dev-libs/libinput-1.7.0:0= x11-base/xorg-proto x11-base/xorg-proto >=x11-base/xorg-server-1.20[xorg]
-DESCRIPTION=X.org input driver based on libinput
-EAPI=7
-HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/driver/xf86-input-libinput
-IUSE=kernel_linux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libinput-1.7.0:0= x11-base/xorg-server:= >=x11-base/xorg-server-1.20[xorg]
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-0.29.0.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 5d5cc2632ef6b3c817019fa4fa3d8508 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xorg-3 f674df0f948f42c9f40bbdd2b1cd76b4
-_md5_=f9c3433ed96bb5a105c8b3f0fd6c9e53
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 4a9cc1666e27..f2dd9f05b166 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/pixman-0.38.4 b/metadata/md5-cache/x11-libs/pixman-0.38.4
deleted file mode 100644
index 4820593901bc..000000000000
--- a/metadata/md5-cache/x11-libs/pixman-0.38.4
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=>=dev-util/meson-0.51.2 >=dev-util/ninja-1.8.2
-DEFINED_PHASES=compile configure install test unpack
-DESCRIPTION=Low-level pixel manipulation routines
-EAPI=7
-HOMEPAGE=http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/
-IUSE=altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.38.4.tar.gz
-_eclasses_=meson 8f7dc8ed2d76af0b33328789c017e677 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build dfda7934df092a96e439c05b4aeac519 multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 ace0a9a129fcfeaae542c0d15c07f36a toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=0e8584949a6584725dbbe4b0b9b54909
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 8cba51c1d145..b702a515722e 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/lightdm-1.28.0 b/metadata/md5-cache/x11-misc/lightdm-1.28.0
deleted file mode 100644
index 358609a24385..000000000000
--- a/metadata/md5-cache/x11-misc/lightdm-1.28.0
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 sys-libs/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig gnome? ( gnome-base/gnome-common ) vala? ( || ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=A lightweight display manager
-EAPI=6
-HOMEPAGE=https://github.com/CanonicalLtd/lightdm
-IUSE=audit +gnome +gtk +introspection qt5 vala
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
-LICENSE=GPL-3 LGPL-3
-PDEPEND=gtk? ( x11-misc/lightdm-gtk-greeter )
-RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 sys-libs/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) >=sys-auth/pambase-20101024-r2
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.28.0/lightdm-1.28.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 flag-o-matic f1194291b9a1baca337c1c89b5f7f365 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 pam a1771fc1e5831c201eaf18451747d94b preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 4eb5e05ef7ee630c003e3f0edc094135 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vala 5b72a65a36d681d65aef5f7b4b8b2cb6 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=3f0f074f4058d8a0e8d4654e14307915
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.6 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.6
deleted file mode 100644
index 3c19bdf42232..000000000000
--- a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 dev-util/intltool sys-devel/gettext xfce-base/exo >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=LightDM GTK+ Greeter
-EAPI=6
-HOMEPAGE=https://launchpad.net/lightdm-gtk-greeter
-IUSE=appindicator branding
-KEYWORDS=~alpha amd64 arm arm64 ppc ppc64 x86
-LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
-RDEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1
-SLOT=0
-SRC_URI=https://launchpad.net/lightdm-gtk-greeter/2.0/2.0.6/+download/lightdm-gtk-greeter-2.0.6.tar.gz branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )
-_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 desktop 7fd20552ce4cc97e8acb132a499a7dd8 eapi7-ver f9ec87e93172b25ce65a85303dc06964 epatch ed88001f77c6dd0d5f09e45c1a5b480e estack 686eaab303305a908fd57b2fd7617800 eutils fcb2aa98e1948b835b5ae66ca52868c5 gnome2-utils 893e828f0f25f070f0b38d20c83c7670 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib 2477ebe553d3e4d2c606191fe6c33602 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils ff2ff954e6b17929574eee4efc5152ba
-_md5_=1b4c082dc3512626a06aba6120ef6887
diff --git a/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8 b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
new file mode 100644
index 000000000000..46f29dae74bf
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/lightdm-gtk-greeter-2.0.8
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/intltool dev-util/xfce4-dev-tools sys-devel/gettext >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2
+DESCRIPTION=LightDM GTK+ Greeter
+EAPI=7
+HOMEPAGE=https://github.com/Xubuntu/lightdm-gtk-greeter
+IUSE=appindicator branding
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3 LGPL-3 branding? ( CC-BY-3.0 )
+RDEPEND=appindicator? ( dev-libs/libindicator:3 ) x11-libs/gtk+:3 >=x11-misc/lightdm-1.2.2 x11-themes/gnome-themes-standard >=x11-themes/adwaita-icon-theme-3.14.1
+SLOT=0
+SRC_URI=https://github.com/Xubuntu/lightdm-gtk-greeter/releases/download/lightdm-gtk-greeter-2.0.8/lightdm-gtk-greeter-2.0.8.tar.gz branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )
+_eclasses_=autotools 7d999b62b8749fad43fff00620cedf47 libtool f143db5a74ccd9ca28c1234deffede96 multilib 2477ebe553d3e4d2c606191fe6c33602 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xdg-utils ff2ff954e6b17929574eee4efc5152ba
+_md5_=ddd5581a99b9b2cf771a446c610558eb
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 9ce10c7cea2f..1362913352b9 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/gentoo-xcursors-0.3.1 b/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.1
deleted file mode 100644
index b682b60cb317..000000000000
--- a/metadata/md5-cache/x11-themes/gentoo-xcursors-0.3.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=A high quality set of animated mouse cursors
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=mirror://gentoo/gentoo-cursors-tad-0.3.1.tar.bz2
-_md5_=fd4abf3e30d7024c93d7dfeb08bd9bc2
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 7aed7b4a40bd..03d7d8b5445f 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 24 Jun 2020 19:38:16 +0000
+Thu, 25 Jun 2020 09:08:17 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index fe04647bf5b7..004458a39240 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed 24 Jun 2020 07:38:16 PM UTC
+Thu 25 Jun 2020 09:08:17 AM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2b07059cccc7..5922183dbfca 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 24 Jun 2020 20:00:01 +0000
+Thu, 25 Jun 2020 09:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 63aa85f3db51..f602edc22b1d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-2176716a3965d80f5f6267955e865f91320b66ef 1593026710 2020-06-24T19:25:10+00:00
+6aeec8802ab7485b9d1e3e70167f9412aba3fa7d 1593075450 2020-06-25T08:57:30+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 2581bd95b93f..65f6a4abd08c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1593027301 Wed 24 Jun 2020 07:35:01 PM UTC
+1593075901 Thu 25 Jun 2020 09:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7aed7b4a40bd..03d7d8b5445f 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 24 Jun 2020 19:38:16 +0000
+Thu, 25 Jun 2020 09:08:17 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index ec4e7546bc01..81c03004da70 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/sarg/files/sarg-2.3.10-config.patch b/net-analyzer/sarg/files/sarg-2.3.10-config.patch
deleted file mode 100644
index cfbf103d5b2a..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.10-config.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/log.c
-+++ b/log.c
-@@ -241,7 +241,7 @@
- strcpy(LogoTextColor,"#006699");
- strcpy(FontSize,"9px");
- strcpy(TempDir,"/tmp");
-- strcpy(OutputDir,"/var/www/html/squid-reports");
-+ strcpy(OutputDir,"/var/www/localhost/htdocs/squid-reports");
- AnonymousOutputFiles=false;
- Ip2Name=false;
- strcpy(DateFormat,"u");
---- a/sarg-php/sarg-squidguard-block.php
-+++ b/sarg-php/sarg-squidguard-block.php
-@@ -26,8 +26,8 @@
- */
-
- // Change to squidGuard and sarg config file paths
--$SargConf = "/usr/local/sarg/sarg.conf";
--$squidGuardConf = "/usr/local/squidGuard/squidGuard.conf";
-+$SargConf = "/etc/sarg/sarg.conf";
-+$squidGuardConf = "/etc/squidGuard/squidGuard.conf";
-
- global $SargConf;
- global $dbhome;
-@@ -37,7 +37,7 @@
- include_once("style.php");
-
- $url = $_GET['url'];
--$squidGuard_conf = '/usr/local/squidGuard/squidGuard.conf';
-+$squidGuard_conf = '/etc/squidGuard/squidGuard.conf';
-
- function parse_config($line,$clave) {
- if (preg_match("/dbhome/i", $line)) {
---- a/sarg-php/sarg-block-it.php
-+++ b/sarg-php/sarg-block-it.php
-@@ -25,7 +25,7 @@
- *
- */
-
--$filename = "/usr/local/squid/etc/block.txt";
-+$filename = "/etc/squid/etc/block.txt";
-
- $url = $_GET['url'];
- $url = $url."\n";
---- a/htaccess
-+++ b/htaccess
-@@ -1,4 +1,4 @@
--AuthUserFile /usr/local/sarg/passwd
-+AuthUserFile /etc/sarg/passwd
- AuthName "SARG, Squid Analysis Report Generator"
- AuthType Basic
-
---- a/sarg.conf
-+++ b/sarg.conf
-@@ -4,7 +4,7 @@
- # Where is the access.log file
- # sarg -l file
- #
--#access_log /usr/local/squid/var/logs/access.log
-+#access_log /var/log/squid/access.log
-
- # TAG: graphs yes|no
- # Use graphics where is possible.
-@@ -117,7 +117,7 @@
- # The reports will be saved in that directory
- # sarg -o dir
- #
--#output_dir /var/www/html/squid-reports
-+#output_dir /var/www/localhost/htdocs/squid-reports
-
- # TAG: anonymous_output_files yes/no
- # Use anonymous file and directory names in the report. If it is set to
-@@ -545,7 +545,7 @@
- # Generate reports from SquidGuard logs.
- # Use 'none' to disable.
- # You can use sarg -L filename to use an alternate squidGuard log.
--# squidguard_conf /usr/local/squidGuard/squidGuard.conf
-+# squidguard_conf /etc/squidGuard/squidGuard.conf
- #
- #squidguard_conf none
-
---- a/user_limit_block
-+++ b/user_limit_block
-@@ -24,8 +24,8 @@
- #
- #
-
--conf="/usr/local/sarg/sarg.conf"
--squid_password_file="/usr/local/squid/etc/passwd"
-+conf="/etc/sarg/sarg.conf"
-+squid_password_file="/etc/squid/passwd"
- tmp="/tmp/sarg_limit.$$"
-
- limit_file=`grep "per_user_limit" $conf|grep -v "#"|awk '{print $2}'`
diff --git a/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch b/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch
deleted file mode 100644
index 035578793934..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.11-Werror.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -46,18 +46,18 @@
- CFLAGS="${saved_CFLAGS}"
- fi
-
--AC_MSG_CHECKING([for implicit-function-declaration error flag in $CC])
-+AC_MSG_CHECKING([for implicit-function-declaration warning flag in $CC])
- saved_CFLAGS="${CFLAGS}"
--CFLAGS="${CFLAGS} -Werror=implicit-function-declaration"
-+CFLAGS="${CFLAGS} -Wimplicit-function-declaration"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_implicit_function_declaration="yes"],[have_implicit_function_declaration="no"])
- AC_MSG_RESULT($have_implicit_function_declaration)
- if test "$have_implicit_function_declaration" = "no" ; then
- CFLAGS="${saved_CFLAGS}"
- fi
-
--AC_MSG_CHECKING([for format error flag in $CC])
-+AC_MSG_CHECKING([for format warning flag in $CC])
- saved_CFLAGS="${CFLAGS}"
--CFLAGS="${CFLAGS} -Werror=format"
-+CFLAGS="${CFLAGS} -Wformat"
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([])],[have_error_format="yes"],[have_error_format="no"])
- AC_MSG_RESULT($have_error_format)
- if test "$have_error_format" = "no" ; then
diff --git a/net-analyzer/sarg/files/sarg-2.3.11-configure.patch b/net-analyzer/sarg/files/sarg-2.3.11-configure.patch
deleted file mode 100644
index 583bfeb0e8e1..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.11-configure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2,6 +2,7 @@
- AC_INIT([sarg],[2.3.9])
- AC_CONFIG_SRCDIR([log.c])
- AC_CONFIG_AUX_DIR(cfgaux)
-+AC_CONFIG_MACRO_DIR(m4)
-
- AC_CANONICAL_HOST
-
-@@ -26,6 +27,11 @@
- dnl C99 support is required to define LLONG_MAX (at least on CentOS 5.7)
- AC_PROG_CC_C99
-
-+dnl mkdir_p / MKDIR_P
-+AC_PROG_MKDIR_P
-+mkdir_p="$MKDIR_P"
-+AC_SUBST(mkdir_p)
-+
- # Report more warnings to improve code quality.
- CFLAGS="${CFLAGS} -Wall -Wno-sign-compare"
-
-@@ -60,7 +66,7 @@
-
- case "$host" in
- *-solaris*)
-- LDFLAGS="${LDFLAGS} -lsocket -lnsl"
-+ LIBS="${LIBS} -lsocket -lnsl"
- CFLAGS="-DSOLARIS ${CFLAGS}"
- ;;
- esac
diff --git a/net-analyzer/sarg/files/sarg-2.3.11-format.patch b/net-analyzer/sarg/files/sarg-2.3.11-format.patch
deleted file mode 100644
index f2dc7d39b1e8..000000000000
--- a/net-analyzer/sarg/files/sarg-2.3.11-format.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/report.c
-+++ b/report.c
-@@ -54,7 +54,7 @@
- char accsmart[MAXLEN];
- char crc2[MAXLEN/2 -1];
- char siteind[MAX_TRUNCATED_URL];
-- char arqtt[256];
-+ char arqtt[MAX_USER_FNAME_LEN * 2 + MAXLEN + 10];
- char *oldurltt=NULL;
- char oldaccdiatt[11],oldacchoratt[9];
- char tmp3[MAXLEN];
---- a/index.c
-+++ b/index.c
-@@ -89,9 +89,9 @@
- char monthdir[MAXLEN];
- char monthname1[9], monthname2[9];
- char nmonth[30];
-- char monthnum[10];
-+ char monthnum[15];
- char dayindex[MAXLEN];
-- char daynum[10];
-+ char daynum[15];
- char title[80];
- int yearsort[150];
- int nyears;
---- a/userinfo.c
-+++ b/userinfo.c
-@@ -67,7 +67,7 @@
- int skip;
- int flen;
- int count, clen;
-- char cstr[9];
-+ char cstr[10];
-
- last=NULL;
- for (group=first_user_group ; group ; group=group->next) {
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index ec935042f806..7c0ea27c9f7b 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 343ff7d3f78e..e363ad4b728f 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -1,5 +1,3 @@
-DIST samba-4.11.6.tar.gz 18541566 BLAKE2B 2b4a40be7cec8a9706cbc344796885f59403aa11ca3d8a7dc40b3d287ec222c11d7395fd193c4b66c4116f1bffd869caf444a950d508f5a9a596db32553e1461 SHA512 3815080a1693c596a126371a5ea4e8534317a7266803c7de13a7e5b3ee9757dfbf13c0de20d498a6683d3aaf56941ed42f289e3c24f88713529a5f047a691af2
DIST samba-4.11.8.tar.gz 18571308 BLAKE2B 024920789ac8fcedfc79f4d094a47e4c1399a0bbc3ad79908f66b9bbabd765865795763c1017cc0caba18dbc11ce6a7e25231804d7dff11ab3d97a599ab8d9ed SHA512 a036c46e060d9edc11bf4e45e0449042fe44b74ff083d305779c68dad943f87fb6d2680f3a68e6bbcd0b19c8c397ec9fc5794229a311c25dad9efc366add613a
DIST samba-4.11.9.tar.gz 18576961 BLAKE2B 584e62df96bd7de6c0ff93f8fb45b85583b048c300cae020e1e1b467e773b4198c215cbef3b9c34ddf2e138118cca1dd7002ab9c671d111606e735ba8595f720 SHA512 77c1e928d23115eed0cc20f5836b02e73a26b0c23b2061c6148177fbf5b140e3d3a7a9fabfee3a2306158bc157708636c58c6655a57a64f0ff9a20c1a91e4f23
-DIST samba-4.12.2.tar.gz 18192360 BLAKE2B 1ef1b128dc628d5b8b69183fa99eceac27feaea54207eb2e5e2af5882cdf17d2819efbfc9f91cf73a9c744b5ef17c6b8dcd135783da9a36d8c41246d2c4515d0 SHA512 c1d5f62ea2e43c246988aa65c4b690de232f73c0213cbc5d532e43c8cfbea17f1ac92435526b64c9a85c582b29381eecfb57713861efc32f6e6257000c393562
DIST samba-4.12.3.tar.gz 18203604 BLAKE2B 4d95e472fe4dbec259c6efe14db56d38056209f22a1ad98a62f7b8a9efb09c09ef4ff16ac1ee287e5a93cc86cb7472ee7c1d4feb1d0e1bdc4b887b1a7213fdf2 SHA512 5de66c21db0710880b6e0347ae1eff17ff1881eb926e9a0cf5af9ddc27599cf8daa9ca6ea35b2a0a2158226a38cdf7074b28a51e460a139720c78a522b1a5908
diff --git a/net-fs/samba/samba-4.11.6-r2.ebuild b/net-fs/samba/samba-4.11.6-r2.ebuild
deleted file mode 100644
index d4dbcb43bbb1..000000000000
--- a/net-fs/samba/samba-4.11.6-r2.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint
-json ldap pam profiling-data python quota selinux syslog system-heimdal
-+system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/samba-4.0/policy.h
- /usr/include/samba-4.0/dcerpc_server.h
- /usr/include/samba-4.0/ctdb.h
- /usr/include/samba-4.0/ctdb_client.h
- /usr/include/samba-4.0/ctdb_protocol.h
- /usr/include/samba-4.0/ctdb_private.h
- /usr/include/samba-4.0/ctdb_typesafe_cb.h
- /usr/include/samba-4.0/ctdb_version.h
-)
-
-# sys-apps/attr is an automagic dependency (see bug #489748)
-CDEPEND="
- >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
- dev-lang/perl:=
- dev-libs/libaio[${MULTILIB_USEDEP}]
- dev-libs/libbsd[${MULTILIB_USEDEP}]
- dev-libs/libgcrypt:0
- dev-libs/iniparser:0
- dev-libs/popt[${MULTILIB_USEDEP}]
- >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
- >=net-libs/gnutls-3.2.0
- net-libs/libnsl:=[${MULTILIB_USEDEP}]
- sys-apps/attr[${MULTILIB_USEDEP}]
- >=sys-libs/ldb-2.0.8[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- =sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- virtual/libiconv
- pam? ( sys-libs/pam )
- acl? ( virtual/acl )
- $(python_gen_cond_dep "
- dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
- addns? (
- net-dns/bind-tools[gssapi]
- dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
- )
- ")
- ceph? ( sys-cluster/ceph )
- cluster? (
- net-libs/rpcsvc-proto
- !dev-db/ctdb
- )
- cups? ( net-print/cups )
- debug? ( dev-util/lttng-ust )
- dmapi? ( sys-apps/dmapi )
- fam? ( virtual/fam )
- gpg? ( app-crypt/gpgme )
- json? ( dev-libs/jansson )
- ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
- system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
- system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:0= )
- zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- net-libs/libtirpc[${MULTILIB_USEDEP}]
- virtual/pkgconfig
- || (
- net-libs/rpcsvc-proto
- =sys-libs/nss_wrapper-1.1.3
- >=net-dns/resolv_wrapper-1.1.4
- >=net-libs/socket_wrapper-1.1.9
- >=sys-libs/uid_wrapper-1.2.1
- )
- )"
-RDEPEND="${CDEPEND}
- python? ( ${PYTHON_DEPS} )
- client? ( net-fs/cifs-utils[ads?] )
- selinux? ( sec-policy/selinux-samba )
- !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
- addc? ( python json winbind )
- addns? ( python )
- ads? ( acl ldap winbind )
- cluster? ( ads )
- gpg? ( addc )
- test? ( python )
- ?? ( system-heimdal system-mitkrb5 )
- ${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.0-pam.patch"
- "${FILESDIR}/${PN}-4.9.2-timespec.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use cluster ; then
- SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
- elif use ads ; then
- SHAREDMODS="idmap_ad"
- fi
-}
-
-src_prepare() {
- default
-
- # un-bundle dnspython
- sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
- # unbundle iso8601 unless tests are enabled
- if ! use test ; then
- sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
- fi
-
- # ugly hackaround for bug #592502
- cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
- sed -e 's:::' \
- -i source4/dsdb/samdb/ldb_modules/password_hash.c \
- || die
-
- # Friggin' WAF shit
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # when specifying libs for samba build you must append NONE to the end to
- # stop it automatically including things
- local bundled_libs="NONE"
- if ! use system-heimdal && ! use system-mitkrb5 ; then
- bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- fi
-
- local myconf=(
- --enable-fhs
- --sysconfdir="${EPREFIX}/etc"
- --localstatedir="${EPREFIX}/var"
- --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
- --with-piddir="${EPREFIX}/run/${PN}"
- --bundled-libraries="${bundled_libs}"
- --builtin-libraries=NONE
- --disable-rpath
- --disable-rpath-install
- --nopyc
- --nopyo
- $(multilib_native_use_with acl acl-support)
- $(multilib_native_usex addc '' '--without-ad-dc')
- $(multilib_native_use_with addns dnsupdate)
- $(multilib_native_use_with ads)
- $(multilib_native_use_enable ceph cephfs)
- $(multilib_native_use_with cluster cluster-support)
- $(multilib_native_use_enable cups)
- $(multilib_native_use_with dmapi)
- $(multilib_native_use_with fam)
- $(multilib_native_use_with gpg gpgme)
- $(multilib_native_use_with json)
- $(multilib_native_use_enable iprint)
- $(multilib_native_use_with pam)
- $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
- $(multilib_native_use_with quota quotas)
- $(multilib_native_use_with syslog)
- $(multilib_native_use_with systemd)
- --systemd-install-services
- --with-systemddir="$(systemd_get_systemunitdir)"
- $(multilib_native_use_with winbind)
- $(multilib_native_usex python '' '--disable-python')
- $(multilib_native_use_enable zeroconf avahi)
- $(multilib_native_usex test '--enable-selftest' '')
- $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
- $(use_with debug lttng)
- $(use_with ldap)
- $(use_with profiling-data)
- # bug #683148
- --jobs 1
- )
-
- multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
- waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
- waf-utils_src_compile
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- # Make all .so files executable
- find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
- if multilib_is_native_abi ; then
- # install ldap schema for server (bug #491002)
- if use ldap ; then
- insinto /etc/openldap/schema
- doins examples/LDAP/samba.schema
- fi
-
- # create symlink for cups (bug #552310)
- if use cups ; then
- dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
- fi
-
- # install example config file
- insinto /etc/samba
- doins examples/smb.conf.default
-
- # Fix paths in example file (#603964)
- sed \
- -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
- -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
- -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
- -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
- -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
- -i "${ED%/}"/etc/samba/smb.conf.default || die
-
- # Install init script and conf.d file
- newinitd "${CONFDIR}/samba4.initd-r1" samba
- newconfd "${CONFDIR}/samba4.confd" samba
-
- systemd_dotmpfilesd "${FILESDIR}"/samba.conf
- use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
- # Preserve functionality for old gentoo-specific unit names
- dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
- dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
- dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
- fi
-
- if use pam && use winbind ; then
- newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
- # bugs #376853 and #590374
- insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf
- fi
-
- keepdir /var/cache/samba
- keepdir /var/lib/ctdb
- keepdir /var/lib/samba/{bind-dns,private}
- keepdir /var/log/samba
-}
-
-multilib_src_install_all() {
- # Attempt to fix bug #673168
- find "${ED}" -type d -name "Yapp" -print0 \
- | xargs -0 --no-run-if-empty rm -r || die
-}
-
-multilib_src_test() {
- if multilib_is_native_abi ; then
- "${WAF_BINARY}" test || die "test failed"
- fi
-}
-
-pkg_postinst() {
- ewarn "Be aware that this release contains the best of all of Samba's"
- ewarn "technology parts, both a file server (that you can reasonably expect"
- ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
- ewarn "controller work previously known as 'samba4'."
-
- elog "For further information and migration steps make sure to read "
- elog "https://samba.org/samba/history/${P}.html "
- elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.11.9-r1.ebuild b/net-fs/samba/samba-4.11.9-r1.ebuild
index 9043a94e1383..e3cde0c2d9df 100644
--- a/net-fs/samba/samba-4.11.9-r1.ebuild
+++ b/net-fs/samba/samba-4.11.9-r1.ebuild
@@ -133,7 +133,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
"${FILESDIR}/${PN}-4.9.2-timespec.patch"
"${FILESDIR}/${PN}-4.13-winexe_option.patch"
- "${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch"
+ "${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.11.9.ebuild b/net-fs/samba/samba-4.11.9.ebuild
deleted file mode 100644
index 3fe07a3d4303..000000000000
--- a/net-fs/samba/samba-4.11.9.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint
-json ldap pam profiling-data python quota selinux syslog system-heimdal
-+system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/samba-4.0/policy.h
- /usr/include/samba-4.0/dcerpc_server.h
- /usr/include/samba-4.0/ctdb.h
- /usr/include/samba-4.0/ctdb_client.h
- /usr/include/samba-4.0/ctdb_protocol.h
- /usr/include/samba-4.0/ctdb_private.h
- /usr/include/samba-4.0/ctdb_typesafe_cb.h
- /usr/include/samba-4.0/ctdb_version.h
-)
-
-CDEPEND="
- >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
- dev-lang/perl:=
- dev-libs/libbsd[${MULTILIB_USEDEP}]
- dev-libs/libtasn1[${MULTILIB_USEDEP}]
- dev-libs/popt[${MULTILIB_USEDEP}]
- >=net-libs/gnutls-3.2.0[${MULTILIB_USEDEP}]
- net-libs/libnsl:=[${MULTILIB_USEDEP}]
- sys-apps/dbus[${MULTILIB_USEDEP}]
- sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
- >=sys-libs/ldb-2.0.10[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- =sys-libs/talloc-2.2.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.4.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.10.0[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- virtual/libiconv
- pam? ( sys-libs/pam )
- acl? ( virtual/acl )
- $(python_gen_cond_dep "
- dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
- addns? (
- net-dns/bind-tools[gssapi]
- dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
- )
- ")
- ceph? ( sys-cluster/ceph )
- cluster? (
- net-libs/rpcsvc-proto
- !dev-db/ctdb
- )
- cups? ( net-print/cups )
- debug? ( dev-util/lttng-ust )
- dmapi? ( sys-apps/dmapi )
- fam? ( virtual/fam )
- gpg? ( app-crypt/gpgme )
- json? ( dev-libs/jansson )
- ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
- system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
- system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:0= )
- zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
- net-libs/libtirpc[${MULTILIB_USEDEP}]
- virtual/pkgconfig
- || (
- net-libs/rpcsvc-proto
- =sys-libs/nss_wrapper-1.1.3
- >=net-dns/resolv_wrapper-1.1.4
- >=net-libs/socket_wrapper-1.1.9
- >=sys-libs/uid_wrapper-1.2.1
- )
- )"
-RDEPEND="${CDEPEND}
- python? ( ${PYTHON_DEPS} )
- client? ( net-fs/cifs-utils[ads?] )
- selinux? ( sec-policy/selinux-samba )
- !dev-perl/Parse-Yapp
-"
-
-REQUIRED_USE="
- addc? ( python json winbind )
- addns? ( python )
- ads? ( acl ldap winbind )
- cluster? ( ads )
- gpg? ( addc )
- test? ( python )
- ?? ( system-heimdal system-mitkrb5 )
- ${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.0-pam.patch"
- "${FILESDIR}/${PN}-4.9.2-timespec.patch"
- "${FILESDIR}/${PN}-4.13-winexe_option.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use cluster ; then
- SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
- elif use ads ; then
- SHAREDMODS="idmap_ad"
- fi
-}
-
-src_prepare() {
- default
-
- # un-bundle dnspython
- sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
- # unbundle iso8601 unless tests are enabled
- if ! use test ; then
- sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
- fi
-
- ## ugly hackaround for bug #592502
- #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
- sed -e 's:::' \
- -i source4/dsdb/samdb/ldb_modules/password_hash.c \
- || die
-
- # Friggin' WAF shit
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # when specifying libs for samba build you must append NONE to the end to
- # stop it automatically including things
- local bundled_libs="NONE"
- if ! use system-heimdal && ! use system-mitkrb5 ; then
- bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- fi
-
- local myconf=(
- --enable-fhs
- --sysconfdir="${EPREFIX}/etc"
- --localstatedir="${EPREFIX}/var"
- --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
- --with-piddir="${EPREFIX}/run/${PN}"
- --bundled-libraries="${bundled_libs}"
- --builtin-libraries=NONE
- --disable-rpath
- --disable-rpath-install
- --nopyc
- --nopyo
- --without-winexe
- $(multilib_native_use_with acl acl-support)
- $(multilib_native_usex addc '' '--without-ad-dc')
- $(multilib_native_use_with addns dnsupdate)
- $(multilib_native_use_with ads)
- $(multilib_native_use_enable ceph cephfs)
- $(multilib_native_use_with cluster cluster-support)
- $(multilib_native_use_enable cups)
- $(multilib_native_use_with dmapi)
- $(multilib_native_use_with fam)
- $(multilib_native_use_with gpg gpgme)
- $(multilib_native_use_with json)
- $(multilib_native_use_enable iprint)
- $(multilib_native_use_with pam)
- $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
- $(multilib_native_use_with quota quotas)
- $(multilib_native_use_with syslog)
- $(multilib_native_use_with systemd)
- --systemd-install-services
- --with-systemddir="$(systemd_get_systemunitdir)"
- $(multilib_native_use_with winbind)
- $(multilib_native_usex python '' '--disable-python')
- $(multilib_native_use_enable zeroconf avahi)
- $(multilib_native_usex test '--enable-selftest' '')
- $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
- $(use_with debug lttng)
- $(use_with ldap)
- $(use_with profiling-data)
- # bug #683148
- --jobs 1
- )
-
- multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
- waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
- waf-utils_src_compile
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- # Make all .so files executable
- find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
- if multilib_is_native_abi ; then
- # install ldap schema for server (bug #491002)
- if use ldap ; then
- insinto /etc/openldap/schema
- doins examples/LDAP/samba.schema
- fi
-
- # create symlink for cups (bug #552310)
- if use cups ; then
- dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
- fi
-
- # install example config file
- insinto /etc/samba
- doins examples/smb.conf.default
-
- # Fix paths in example file (#603964)
- sed \
- -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
- -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
- -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
- -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
- -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
- -i "${ED%/}"/etc/samba/smb.conf.default || die
-
- # Install init script and conf.d file
- newinitd "${CONFDIR}/samba4.initd-r1" samba
- newconfd "${CONFDIR}/samba4.confd" samba
-
- systemd_dotmpfilesd "${FILESDIR}"/samba.conf
- use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
- # Preserve functionality for old gentoo-specific unit names
- dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
- dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
- dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
- fi
-
- if use pam && use winbind ; then
- newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
- # bugs #376853 and #590374
- insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf
- fi
-
- keepdir /var/cache/samba
- keepdir /var/lib/ctdb
- keepdir /var/lib/samba/{bind-dns,private}
- keepdir /var/log/samba
-}
-
-multilib_src_install_all() {
- # Attempt to fix bug #673168
- find "${ED}" -type d -name "Yapp" -print0 \
- | xargs -0 --no-run-if-empty rm -r || die
-}
-
-multilib_src_test() {
- if multilib_is_native_abi ; then
- "${WAF_BINARY}" test || die "test failed"
- fi
-}
-
-pkg_postinst() {
- ewarn "Be aware that this release contains the best of all of Samba's"
- ewarn "technology parts, both a file server (that you can reasonably expect"
- ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
- ewarn "controller work previously known as 'samba4'."
-
- elog "For further information and migration steps make sure to read "
- elog "https://samba.org/samba/history/${P}.html "
- elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.12.2.ebuild b/net-fs/samba/samba-4.12.2.ebuild
deleted file mode 100644
index 423237c1a0ef..000000000000
--- a/net-fs/samba/samba-4.12.2.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint
-json ldap pam profiling-data python quota selinux syslog system-heimdal
-+system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/samba-4.0/policy.h
- /usr/include/samba-4.0/dcerpc_server.h
- /usr/include/samba-4.0/ctdb.h
- /usr/include/samba-4.0/ctdb_client.h
- /usr/include/samba-4.0/ctdb_protocol.h
- /usr/include/samba-4.0/ctdb_private.h
- /usr/include/samba-4.0/ctdb_typesafe_cb.h
- /usr/include/samba-4.0/ctdb_version.h
-)
-
-CDEPEND="
- >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
- dev-lang/perl:=
- dev-libs/icu:=[${MULTILIB_USEDEP}]
- dev-libs/libbsd[${MULTILIB_USEDEP}]
- dev-libs/libtasn1[${MULTILIB_USEDEP}]
- dev-libs/popt[${MULTILIB_USEDEP}]
- dev-perl/Parse-Yapp
- >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
- net-libs/libnsl:=[${MULTILIB_USEDEP}]
- sys-apps/dbus[${MULTILIB_USEDEP}]
- sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
- >=sys-libs/ldb-2.1.2[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- =sys-libs/talloc-2.3.1[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.4.3[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.10.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- virtual/libiconv
- pam? ( sys-libs/pam )
- acl? ( virtual/acl )
- $(python_gen_cond_dep "
- dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
- addns? (
- net-dns/bind-tools[gssapi]
- dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
- )
- ")
- ceph? ( sys-cluster/ceph )
- cluster? (
- net-libs/rpcsvc-proto
- !dev-db/ctdb
- )
- cups? ( net-print/cups )
- debug? ( dev-util/lttng-ust )
- dmapi? ( sys-apps/dmapi )
- fam? ( virtual/fam )
- gpg? ( app-crypt/gpgme )
- json? ( dev-libs/jansson )
- ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
- system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
- system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:0= )
- zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
- net-libs/libtirpc[${MULTILIB_USEDEP}]
- virtual/pkgconfig
- || (
- net-libs/rpcsvc-proto
- =sys-libs/nss_wrapper-1.1.3
- >=net-dns/resolv_wrapper-1.1.4
- >=net-libs/socket_wrapper-1.1.9
- >=sys-libs/uid_wrapper-1.2.1
- )
- )"
-RDEPEND="${CDEPEND}
- python? ( ${PYTHON_DEPS} )
- client? ( net-fs/cifs-utils[ads?] )
- selinux? ( sec-policy/selinux-samba )
-"
-
-REQUIRED_USE="
- addc? ( python json winbind )
- addns? ( python )
- ads? ( acl ldap winbind )
- cluster? ( ads )
- gpg? ( addc )
- test? ( python )
- ?? ( system-heimdal system-mitkrb5 )
- ${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.0-pam.patch"
- "${FILESDIR}/${PN}-4.9.2-timespec.patch"
- "${FILESDIR}/${PN}-4.13-winexe_option.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use cluster ; then
- SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
- elif use ads ; then
- SHAREDMODS="idmap_ad"
- fi
-}
-
-src_prepare() {
- default
-
- # un-bundle dnspython
- sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
- # unbundle iso8601 unless tests are enabled
- if ! use test ; then
- sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
- fi
-
- ## ugly hackaround for bug #592502
- #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
- sed -e 's:::' \
- -i source4/dsdb/samdb/ldb_modules/password_hash.c \
- || die
-
- # Friggin' WAF shit
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # when specifying libs for samba build you must append NONE to the end to
- # stop it automatically including things
- local bundled_libs="NONE"
- if ! use system-heimdal && ! use system-mitkrb5 ; then
- bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- fi
-
- local myconf=(
- --enable-fhs
- --sysconfdir="${EPREFIX}/etc"
- --localstatedir="${EPREFIX}/var"
- --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
- --with-piddir="${EPREFIX}/run/${PN}"
- --bundled-libraries="${bundled_libs}"
- --builtin-libraries=NONE
- --disable-rpath
- --disable-rpath-install
- --nopyc
- --nopyo
- --without-winexe
- $(multilib_native_use_with acl acl-support)
- $(multilib_native_usex addc '' '--without-ad-dc')
- $(multilib_native_use_with addns dnsupdate)
- $(multilib_native_use_with ads)
- $(multilib_native_use_enable ceph cephfs)
- $(multilib_native_use_with cluster cluster-support)
- $(multilib_native_use_enable cups)
- $(multilib_native_use_with dmapi)
- $(multilib_native_use_with fam)
- $(multilib_native_use_with gpg gpgme)
- $(multilib_native_use_with json)
- $(multilib_native_use_enable iprint)
- $(multilib_native_use_with pam)
- $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
- $(multilib_native_use_with quota quotas)
- $(multilib_native_use_with syslog)
- $(multilib_native_use_with systemd)
- --systemd-install-services
- --with-systemddir="$(systemd_get_systemunitdir)"
- $(multilib_native_use_with winbind)
- $(multilib_native_usex python '' '--disable-python')
- $(multilib_native_use_enable zeroconf avahi)
- $(multilib_native_usex test '--enable-selftest' '')
- $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
- $(use_with debug lttng)
- $(use_with ldap)
- $(use_with profiling-data)
- # bug #683148
- --jobs 1
- )
-
- multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
- waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
- waf-utils_src_compile
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- # Make all .so files executable
- find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
- if multilib_is_native_abi ; then
- # install ldap schema for server (bug #491002)
- if use ldap ; then
- insinto /etc/openldap/schema
- doins examples/LDAP/samba.schema
- fi
-
- # create symlink for cups (bug #552310)
- if use cups ; then
- dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
- fi
-
- # install example config file
- insinto /etc/samba
- doins examples/smb.conf.default
-
- # Fix paths in example file (#603964)
- sed \
- -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
- -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
- -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
- -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
- -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
- -i "${ED%/}"/etc/samba/smb.conf.default || die
-
- # Install init script and conf.d file
- newinitd "${CONFDIR}/samba4.initd-r1" samba
- newconfd "${CONFDIR}/samba4.confd" samba
-
- systemd_dotmpfilesd "${FILESDIR}"/samba.conf
- use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
- # Preserve functionality for old gentoo-specific unit names
- dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
- dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
- dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
- fi
-
- if use pam && use winbind ; then
- newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
- # bugs #376853 and #590374
- insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf
- fi
-
- keepdir /var/cache/samba
- keepdir /var/lib/ctdb
- keepdir /var/lib/samba/{bind-dns,private}
- keepdir /var/lock/samba
- keepdir /var/log/samba
- keepdir /var/run/samba
-}
-
-multilib_src_test() {
- if multilib_is_native_abi ; then
- "${WAF_BINARY}" test || die "test failed"
- fi
-}
-
-pkg_postinst() {
- ewarn "Be aware that this release contains the best of all of Samba's"
- ewarn "technology parts, both a file server (that you can reasonably expect"
- ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
- ewarn "controller work previously known as 'samba4'."
-
- elog "For further information and migration steps make sure to read "
- elog "https://samba.org/samba/history/${P}.html "
- elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-fs/samba/samba-4.12.3-r1.ebuild b/net-fs/samba/samba-4.12.3-r1.ebuild
index 33b067a7ed60..bfe12176b97e 100644
--- a/net-fs/samba/samba-4.12.3-r1.ebuild
+++ b/net-fs/samba/samba-4.12.3-r1.ebuild
@@ -135,7 +135,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.4.0-pam.patch"
"${FILESDIR}/${PN}-4.9.2-timespec.patch"
"${FILESDIR}/${PN}-4.13-winexe_option.patch"
- "${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch"
+ "${FILESDIR}/${PN}-4.13-vfs_snapper_configure_option.patch"
)
#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
diff --git a/net-fs/samba/samba-4.12.3.ebuild b/net-fs/samba/samba-4.12.3.ebuild
deleted file mode 100644
index 7c7490b3b54e..000000000000
--- a/net-fs/samba/samba-4.12.3.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-PYTHON_REQ_USE='threads(+),xml(+)'
-inherit python-single-r1 waf-utils multilib-minimal linux-info systemd pam
-
-MY_PV="${PV/_rc/rc}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_PATH="stable"
-[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
-
-SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
-[[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="https://www.samba.org/"
-LICENSE="GPL-3"
-
-SLOT="0"
-
-IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint
-json ldap pam profiling-data python quota selinux syslog system-heimdal
-+system-mitkrb5 systemd test winbind zeroconf"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/samba-4.0/policy.h
- /usr/include/samba-4.0/dcerpc_server.h
- /usr/include/samba-4.0/ctdb.h
- /usr/include/samba-4.0/ctdb_client.h
- /usr/include/samba-4.0/ctdb_protocol.h
- /usr/include/samba-4.0/ctdb_private.h
- /usr/include/samba-4.0/ctdb_typesafe_cb.h
- /usr/include/samba-4.0/ctdb_version.h
-)
-
-CDEPEND="
- >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
- dev-lang/perl:=
- dev-libs/icu:=[${MULTILIB_USEDEP}]
- dev-libs/libbsd[${MULTILIB_USEDEP}]
- dev-libs/libtasn1[${MULTILIB_USEDEP}]
- dev-libs/popt[${MULTILIB_USEDEP}]
- dev-perl/Parse-Yapp
- >=net-libs/gnutls-3.4.7[${MULTILIB_USEDEP}]
- net-libs/libnsl:=[${MULTILIB_USEDEP}]
- sys-apps/dbus[${MULTILIB_USEDEP}]
- sys-libs/e2fsprogs-libs[${MULTILIB_USEDEP}]
- >=sys-libs/ldb-2.1.3[ldap(+)?,python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- =sys-libs/talloc-2.3.1[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tdb-1.4.3[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- >=sys-libs/tevent-0.10.2[python?,${PYTHON_SINGLE_USEDEP},${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- virtual/libiconv
- pam? ( sys-libs/pam )
- acl? ( virtual/acl )
- $(python_gen_cond_dep "
- dev-python/subunit[\${PYTHON_MULTI_USEDEP},${MULTILIB_USEDEP}]
- addns? (
- net-dns/bind-tools[gssapi]
- dev-python/dnspython:=[\${PYTHON_MULTI_USEDEP}]
- )
- ")
- ceph? ( sys-cluster/ceph )
- cluster? (
- net-libs/rpcsvc-proto
- !dev-db/ctdb
- )
- cups? ( net-print/cups )
- debug? ( dev-util/lttng-ust )
- dmapi? ( sys-apps/dmapi )
- fam? ( virtual/fam )
- gpg? ( app-crypt/gpgme )
- json? ( dev-libs/jansson )
- ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
- system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
- system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
- systemd? ( sys-apps/systemd:0= )
- zeroconf? ( net-dns/avahi )
-"
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- >=dev-util/cmocka-1.1.3[${MULTILIB_USEDEP}]
- net-libs/libtirpc[${MULTILIB_USEDEP}]
- virtual/pkgconfig
- || (
- net-libs/rpcsvc-proto
- =sys-libs/nss_wrapper-1.1.3
- >=net-dns/resolv_wrapper-1.1.4
- >=net-libs/socket_wrapper-1.1.9
- >=sys-libs/uid_wrapper-1.2.1
- )
- )"
-RDEPEND="${CDEPEND}
- python? ( ${PYTHON_DEPS} )
- client? ( net-fs/cifs-utils[ads?] )
- selinux? ( sec-policy/selinux-samba )
-"
-
-REQUIRED_USE="
- addc? ( python json winbind )
- addns? ( python )
- ads? ( acl ldap winbind )
- cluster? ( ads )
- gpg? ( addc )
- test? ( python )
- ?? ( system-heimdal system-mitkrb5 )
- ${PYTHON_REQUIRED_USE}
-"
-
-# the test suite is messed, it uses system-installed samba
-# bits instead of what was built, tests things disabled via use
-# flags, and generally just fails to work in a way ebuilds could
-# rely on in its current state
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.0-pam.patch"
- "${FILESDIR}/${PN}-4.9.2-timespec.patch"
- "${FILESDIR}/${PN}-4.13-winexe_option.patch"
-)
-
-#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
-CONFDIR="${FILESDIR}/4.4"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-SHAREDMODS=""
-
-pkg_setup() {
- python-single-r1_pkg_setup
- if use cluster ; then
- SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
- elif use ads ; then
- SHAREDMODS="idmap_ad"
- fi
-}
-
-src_prepare() {
- default
-
- # un-bundle dnspython
- sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
-
- # unbundle iso8601 unless tests are enabled
- if ! use test ; then
- sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
- fi
-
- ## ugly hackaround for bug #592502
- #cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
-
- sed -e 's:::' \
- -i source4/dsdb/samdb/ldb_modules/password_hash.c \
- || die
-
- # Friggin' WAF shit
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # when specifying libs for samba build you must append NONE to the end to
- # stop it automatically including things
- local bundled_libs="NONE"
- if ! use system-heimdal && ! use system-mitkrb5 ; then
- bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
- fi
-
- local myconf=(
- --enable-fhs
- --sysconfdir="${EPREFIX}/etc"
- --localstatedir="${EPREFIX}/var"
- --with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
- --with-piddir="${EPREFIX}/run/${PN}"
- --bundled-libraries="${bundled_libs}"
- --builtin-libraries=NONE
- --disable-rpath
- --disable-rpath-install
- --nopyc
- --nopyo
- --without-winexe
- $(multilib_native_use_with acl acl-support)
- $(multilib_native_usex addc '' '--without-ad-dc')
- $(multilib_native_use_with addns dnsupdate)
- $(multilib_native_use_with ads)
- $(multilib_native_use_enable ceph cephfs)
- $(multilib_native_use_with cluster cluster-support)
- $(multilib_native_use_enable cups)
- $(multilib_native_use_with dmapi)
- $(multilib_native_use_with fam)
- $(multilib_native_use_with gpg gpgme)
- $(multilib_native_use_with json)
- $(multilib_native_use_enable iprint)
- $(multilib_native_use_with pam)
- $(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
- $(multilib_native_use_with quota quotas)
- $(multilib_native_use_with syslog)
- $(multilib_native_use_with systemd)
- --systemd-install-services
- --with-systemddir="$(systemd_get_systemunitdir)"
- $(multilib_native_use_with winbind)
- $(multilib_native_usex python '' '--disable-python')
- $(multilib_native_use_enable zeroconf avahi)
- $(multilib_native_usex test '--enable-selftest' '')
- $(usex system-mitkrb5 "--with-system-mitkrb5 $(multilib_native_usex addc --with-experimental-mit-ad-dc '')" '')
- $(use_with debug lttng)
- $(use_with ldap)
- $(use_with profiling-data)
- # bug #683148
- --jobs 1
- )
-
- multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
-
- CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
- waf-utils_src_configure ${myconf[@]}
-}
-
-multilib_src_compile() {
- waf-utils_src_compile
-}
-
-multilib_src_install() {
- waf-utils_src_install
-
- # Make all .so files executable
- find "${ED}" -type f -name "*.so" -exec chmod +x {} + || die
-
- if multilib_is_native_abi ; then
- # install ldap schema for server (bug #491002)
- if use ldap ; then
- insinto /etc/openldap/schema
- doins examples/LDAP/samba.schema
- fi
-
- # create symlink for cups (bug #552310)
- if use cups ; then
- dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
- fi
-
- # install example config file
- insinto /etc/samba
- doins examples/smb.conf.default
-
- # Fix paths in example file (#603964)
- sed \
- -e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
- -e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
- -e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
- -e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
- -e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
- -i "${ED%/}"/etc/samba/smb.conf.default || die
-
- # Install init script and conf.d file
- newinitd "${CONFDIR}/samba4.initd-r1" samba
- newconfd "${CONFDIR}/samba4.confd" samba
-
- systemd_dotmpfilesd "${FILESDIR}"/samba.conf
- use addc || rm "${D}/$(systemd_get_systemunitdir)/samba.service" || die
-
- # Preserve functionality for old gentoo-specific unit names
- dosym nmb.service "$(systemd_get_systemunitdir)/nmbd.service"
- dosym smb.service "$(systemd_get_systemunitdir)/smbd.service"
- dosym winbind.service "$(systemd_get_systemunitdir)/winbindd.service"
- fi
-
- if use pam && use winbind ; then
- newpamd "${CONFDIR}/system-auth-winbind.pam" system-auth-winbind
- # bugs #376853 and #590374
- insinto /etc/security
- doins examples/pam_winbind/pam_winbind.conf
- fi
-
- keepdir /var/cache/samba
- keepdir /var/lib/ctdb
- keepdir /var/lib/samba/{bind-dns,private}
- keepdir /var/lock/samba
- keepdir /var/log/samba
- keepdir /var/run/samba
-}
-
-multilib_src_test() {
- if multilib_is_native_abi ; then
- "${WAF_BINARY}" test || die "test failed"
- fi
-}
-
-pkg_postinst() {
- ewarn "Be aware that this release contains the best of all of Samba's"
- ewarn "technology parts, both a file server (that you can reasonably expect"
- ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
- ewarn "controller work previously known as 'samba4'."
-
- elog "For further information and migration steps make sure to read "
- elog "https://samba.org/samba/history/${P}.html "
- elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
-}
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index add7cd6ea66c..8d5099b79073 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/irccloud-desktop-bin/Manifest b/net-irc/irccloud-desktop-bin/Manifest
new file mode 100644
index 000000000000..1be8b3ad48df
--- /dev/null
+++ b/net-irc/irccloud-desktop-bin/Manifest
@@ -0,0 +1 @@
+DIST irccloud-desktop_0.15.0_linux_amd64.deb 56822648 BLAKE2B 9311a0b1c7aca956cbcd75be20dd11d6114c4a593d7f3fb3cbc06d9806d9fe8631d72af3e0f209a3ecb1211a8027cd9d55c0999366359fe49e219a3f6efb9429 SHA512 69d3a6edaae05a71100ca791eb0986e5b58070fd20ec23ae853e14d59f613f2f25470983de34f24222c7f67e609ae5e2a83b5dc0dbadb9c49e9165b3d5b550d1
diff --git a/net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.15.0.ebuild b/net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.15.0.ebuild
new file mode 100644
index 000000000000..fd92a49e7005
--- /dev/null
+++ b/net-irc/irccloud-desktop-bin/irccloud-desktop-bin-0.15.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop unpacker xdg
+
+DESCRIPTION="IRCCloud Desktop Client"
+HOMEPAGE="https://github.com/irccloud/irccloud-desktop
+ https://www.irccloud.com/"
+SRC_URI="https://github.com/irccloud/irccloud-desktop/releases/download/v${PV}/irccloud-desktop_${PV}_linux_amd64.deb"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror strip"
+
+DEPEND="
+ >=x11-libs/gtk+-3.0
+ x11-libs/libnotify
+ >=dev-libs/nss-3
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ x11-misc/xdg-utils
+ net-print/cups
+ >=app-accessibility/at-spi2-core-2.0.0
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_unpack() {
+ unpack_deb ${A}
+}
+
+src_install() {
+ sed -i 's/--no-sandbox//g' usr/share/applications/irccloud.desktop || die
+ domenu usr/share/applications/irccloud.desktop
+
+ for size in 16 32 48 64 128 256 512; do
+ doicon -s ${size} usr/share/icons/hicolor/${size}x${size}/apps/irccloud.png
+ done
+
+ gunzip usr/share/doc/irccloud-desktop/changelog.gz || die
+ dodoc usr/share/doc/irccloud-desktop/changelog
+
+ insinto /
+ doins -r opt
+ fperms +x /opt/IRCCloud/irccloud
+ dosym ../IRCCloud/irccloud /opt/bin/irccloud
+}
diff --git a/net-irc/irccloud-desktop-bin/metadata.xml b/net-irc/irccloud-desktop-bin/metadata.xml
new file mode 100644
index 000000000000..915f00227065
--- /dev/null
+++ b/net-irc/irccloud-desktop-bin/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ zx2c4@gentoo.org
+ Jason A. Donenfeld
+
+
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 099df45415a5..6c7c0f474ffc 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -1,4 +1,2 @@
DIST unrealircd-4.2.4.1.tar.gz 6090725 BLAKE2B 817a7c2a13a495944676d08ed90b36f6795fe43ee171efc6661980e6da9a8cc8d98c4fb0eb8221ac6af85ab1a9b5578a2e992d7b41696434430e58918bc30145 SHA512 752573c4af1f92a10739bb2b0cdaade1948207b46d28ae5177e1dfd6b0663044bc22dce5ffe8549882cd70325e3ef7e3296182fffbb84e08d59dbbdd6551a686
-DIST unrealircd-5.0.3.1.tar.gz 4902967 BLAKE2B d3c2e2399091b3aa9906583231d5ba42534234c4c40ce7412609fe8866438848bb69a4fc3cd378e0ed9ab13970ba2a7b27ba9fccdaaaea3585ec0a05aa5f89c2 SHA512 1bf3e2aab2f14d68a02ae6925d9e91135a92cf08886f703be0cd203c8b4b323bfc3930254d2bda381e60b3991f379115c954fa1fd262e28d7a27172a25bb172a
-DIST unrealircd-5.0.4.tar.gz 4907069 BLAKE2B 223c45dbd060cf13afabafd13325bb76889fa64f663fff1be753de703df50265c6a05658edfe7300e97cf1431f54992b7e37801ef4773b02add9d5edca80237c SHA512 cdd83fa55bdf1960499fff48ba656b66cf5a1c43a360658bc37add217af36933f00280f7eaddcbbd39720058a401650b944a5f0ce79ae3ca6749bd58c9cd5241
DIST unrealircd-5.0.5.1.tar.gz 4957950 BLAKE2B 7e92f941662cec0a202589aecf372578e568559360761e17735d4637785ff737ec24c07593b666dd830b0fc1f36293a700693134c34ad32095839a73e7368677 SHA512 57272afa9b758c71522730a5a5a45819731271c02b25f6e0b9da30671d38ecfbc1adc0e91eef9dc4c1d67b2e1fa4fc9a09377152f2b0e3e97e8f7fe4f144288b
diff --git a/net-irc/unrealircd/unrealircd-5.0.3.1.ebuild b/net-irc/unrealircd/unrealircd-5.0.3.1.ebuild
deleted file mode 100644
index 10fd8b753269..000000000000
--- a/net-irc/unrealircd/unrealircd-5.0.3.1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SSL_CERT_MANDATORY=1
-inherit ssl-cert
-
-DESCRIPTION="An advanced Internet Relay Chat daemon"
-HOMEPAGE="https://www.unrealircd.org/"
-SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
-IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
-
-RDEPEND="
- acct-group/unrealircd
- acct-user/unrealircd
- >=app-crypt/argon2-20171227-r1:=
- dev-libs/libpcre2
- >=net-dns/c-ares-1.7:=
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- curl? ( net-misc/curl[adns] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
-
-src_prepare() {
- # QA check against bundled pkgs
- rm -r extras || die
-
- # building third-party modules (which we don't do) cause a sandbox violation
- # bug 704444
- echo "" > src/buildmod || die
-
- if use class-nofakelag; then
- sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
- fi
-
- eapply_user
-}
-
-src_configure() {
- # Default value for privatelibdir adds a build path to -Wl,-rpath.
- econf \
- --with-bindir="${EPREFIX}"/usr/bin \
- --with-cachedir="${EPREFIX}"/var/lib/${PN} \
- --with-confdir="${EPREFIX}"/etc/${PN} \
- --with-datadir="${EPREFIX}"/var/lib/${PN} \
- --with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-logdir="${EPREFIX}"/var/log/${PN} \
- --with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
- --without-privatelibdir \
- --with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
- --with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
- --with-maxconnections=1024 \
- --with-nick-history=2000 \
- --with-permissions=0640 \
- --with-system-argon2 \
- --with-system-cares \
- --with-system-pcre2 \
- --enable-dynamic-linking \
- --enable-ssl="${EPREFIX}"/usr \
- $(use_enable curl libcurl "${EPREFIX}"/usr) \
- $(use_enable prefixaq) \
- $(use_with showlistmodes) \
- $(use_with !operoverride no-operoverride) \
- $(use_with operoverride-verify)
-}
-
-src_install() {
- keepdir /var/log/${PN}
- keepdir /var/lib/${PN}/tmp
-
- newbin src/ircd ${PN}
-
- (
- cd src/modules || die
- for subdir in $(find . -type d -print); do
- if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
- exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
- doexe "${subdir}"/*.so
- fi
- done
- )
-
- insinto /etc/${PN}
- # Purposefully omitting the examples/ and ssl/ subdirectories. ssl
- # is redundant with app-misc/ca-certificates and examples will all
- # be in docs anyway.
- doins -r doc/conf/{aliases,help}
- doins doc/conf/*.conf
- newins doc/conf/examples/example.conf ${PN}.conf
- keepdir /etc/${PN}/tls
-
- einstalldocs
-
- newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
-
- # config should be read-only
- fperms -R 0640 /etc/${PN}
- fperms 0750 /etc/${PN}{,/aliases,/help}
- fperms 0750 /etc/${PN}/tls
- # state is editable but not owned by unrealircd directly
- fperms 0770 /var/log/${PN}
- fperms 0770 /var/lib/${PN}{,/tmp}
- fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
-
- # By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
- # that to look for ca-certificates-provided file instead. %s is
- # CONFDIR. #618066
- dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
-}
-
-pkg_postinst() {
- # Move docert call from src_install() to install_cert in pkg_postinst for
- # bug #201682
- if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
- if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
- ewarn "The location ${PN} looks for SSL certificates has changed"
- ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
- ewarn "Please move your existing certificates."
- else
- (
- umask 0037
- install_cert /etc/${PN}/tls/server.cert
- chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
- ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
- )
- fi
- fi
-
- local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
- # Fix up the default cloak keys.
- if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
- ebegin "Generating cloak-keys"
- local keys=(
- $(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
- )
- [[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
- eend $?
-
- ebegin "Substituting cloak-keys into ${unrealircd_conf}"
- sed -i \
- -e '/cloak-keys/ {
-n
-s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
-n
-s/"and another one";/"'"${keys[1]}"'";/
-n
-s/"and another one";/"'"${keys[2]}"'";/
-}' \
- "${unrealircd_conf}"
- eend $?
- fi
-
- elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
- elog
- elog "You can also configure ${PN} start at boot with rc-update(1)."
- elog "It is recommended to run unrealircd as an unprivileged user."
- elog "The provided init.d script does this for you."
-}
diff --git a/net-irc/unrealircd/unrealircd-5.0.4.ebuild b/net-irc/unrealircd/unrealircd-5.0.4.ebuild
deleted file mode 100644
index d2f7a8a96ec9..000000000000
--- a/net-irc/unrealircd/unrealircd-5.0.4.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-SSL_CERT_MANDATORY=1
-inherit ssl-cert systemd
-
-DESCRIPTION="An advanced Internet Relay Chat daemon"
-HOMEPAGE="https://www.unrealircd.org/"
-SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
-IUSE="class-nofakelag curl libressl +operoverride operoverride-verify +prefixaq showlistmodes"
-
-RDEPEND="
- acct-group/unrealircd
- acct-user/unrealircd
- >=app-crypt/argon2-20171227-r1:=
- dev-libs/libpcre2
- >=net-dns/c-ares-1.7:=
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- curl? ( net-misc/curl[adns] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
-
-src_prepare() {
- # QA check against bundled pkgs
- rm -r extras || die
-
- # building third-party modules (which we don't do) cause a sandbox violation
- # bug 704444
- echo "" > src/buildmod || die
-
- if use class-nofakelag; then
- sed -i -e 's:#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
- fi
-
- eapply_user
-}
-
-src_configure() {
- # Default value for privatelibdir adds a build path to -Wl,-rpath.
- econf \
- --with-bindir="${EPREFIX}"/usr/bin \
- --with-cachedir="${EPREFIX}"/var/lib/${PN} \
- --with-confdir="${EPREFIX}"/etc/${PN} \
- --with-datadir="${EPREFIX}"/var/lib/${PN} \
- --with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-logdir="${EPREFIX}"/var/log/${PN} \
- --with-modulesdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
- --without-privatelibdir \
- --with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
- --with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
- --with-maxconnections=1024 \
- --with-nick-history=2000 \
- --with-permissions=0640 \
- --with-system-argon2 \
- --with-system-cares \
- --with-system-pcre2 \
- --enable-dynamic-linking \
- --enable-ssl="${EPREFIX}"/usr \
- $(use_enable curl libcurl "${EPREFIX}"/usr) \
- $(use_enable prefixaq) \
- $(use_with showlistmodes) \
- $(use_with !operoverride no-operoverride) \
- $(use_with operoverride-verify)
-}
-
-src_install() {
- keepdir /var/log/${PN}
- keepdir /var/lib/${PN}/tmp
-
- newbin src/ircd ${PN}
-
- (
- cd src/modules || die
- for subdir in $(find . -type d -print); do
- if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
- exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
- doexe "${subdir}"/*.so
- fi
- done
- )
-
- insinto /etc/${PN}
- # Purposefully omitting the examples/ and ssl/ subdirectories. ssl
- # is redundant with app-misc/ca-certificates and examples will all
- # be in docs anyway.
- doins -r doc/conf/{aliases,help}
- doins doc/conf/*.conf
- newins doc/conf/examples/example.conf ${PN}.conf
- keepdir /etc/${PN}/tls
-
- einstalldocs
-
- newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd-r3 ${PN}
-
- # config should be read-only
- fperms -R 0640 /etc/${PN}
- fperms 0750 /etc/${PN}{,/aliases,/help}
- fperms 0750 /etc/${PN}/tls
- # state is editable but not owned by unrealircd directly
- fperms 0770 /var/log/${PN}
- fperms 0770 /var/lib/${PN}{,/tmp}
- fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
-
- # By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
- # that to look for ca-certificates-provided file instead. %s is
- # CONFDIR. #618066
- dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
-
- insinto $(systemd_get_systemunitdir)
- doins "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
- # Move docert call from src_install() to install_cert in pkg_postinst for
- # bug #201682
- if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
- if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
- ewarn "The location ${PN} looks for SSL certificates has changed"
- ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
- ewarn "Please move your existing certificates."
- else
- (
- umask 0037
- install_cert /etc/${PN}/tls/server.cert
- chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
- ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
- )
- fi
- fi
-
- local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
- # Fix up the default cloak keys.
- if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";$' "${unrealircd_conf}"; then
- ebegin "Generating cloak-keys"
- local keys=(
- $(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 3")
- )
- [[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
- eend $?
-
- ebegin "Substituting cloak-keys into ${unrealircd_conf}"
- sed -i \
- -e '/cloak-keys/ {
-n
-s/"aoAr1HnR6gl3sJ7hVz4Zb7x4YwpW";/"'"${keys[0]}"'";/
-n
-s/"and another one";/"'"${keys[1]}"'";/
-n
-s/"and another one";/"'"${keys[2]}"'";/
-}' \
- "${unrealircd_conf}"
- eend $?
- fi
-
- elog "UnrealIRCd will not run until you've set up /etc/unrealircd/unrealircd.conf"
- elog
- elog "You can also configure ${PN} start at boot with rc-update(1)."
- elog "It is recommended to run unrealircd as an unprivileged user."
- elog "The provided init.d script does this for you."
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 4bb8334baf35..d2633da92f84 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/xrootd-ceph/xrootd-ceph-4.12.0.ebuild b/net-libs/xrootd-ceph/xrootd-ceph-4.12.0.ebuild
index f701427b94c7..9936f476eb33 100644
--- a/net-libs/xrootd-ceph/xrootd-ceph-4.12.0.ebuild
+++ b/net-libs/xrootd-ceph/xrootd-ceph-4.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/xrootd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux"
+KEYWORDS="amd64 ~amd64-linux"
DEPEND="net-libs/xrootd
!=net-misc/stunnel-4\" in order to use stunnel feature."
- einfo
- einfo "You maybe have to update the certificates configured in"
- einfo "${EROOT}/etc/stunnel/rsync.conf"
- fi
-}
diff --git a/net-misc/rsync/rsync-3.2.0-r1.ebuild b/net-misc/rsync/rsync-3.2.0-r1.ebuild
index 9ce55ba847ab..334b1e917382 100644
--- a/net-misc/rsync/rsync-3.2.0-r1.ebuild
+++ b/net-misc/rsync/rsync-3.2.0-r1.ebuild
@@ -16,7 +16,7 @@ else
SRC_DIR="src-previews"
else
SRC_DIR="src"
- KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
SRC_URI="https://rsync.samba.org/ftp/rsync/${SRC_DIR}/${P/_/}.tar.gz"
S="${WORKDIR}/${P/_/}"
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index a260b58d03ef..5ac9cb0cc184 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild
index 1d828fc51e65..4d9e66dee6b3 100644
--- a/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild
+++ b/net-vpn/networkmanager-wireguard/networkmanager-wireguard-0_pre20191128-r5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/max-moser/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz ->
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="+gtk +nls"
RDEPEND="
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 7ae0b6f6e227..aaa7c4825daa 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index d266201073f1..846b87f7de0d 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,10 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Sergei Trofimovich (2020-06-24)
+# Don't let people lose 'cc' or 'f77' by accident.
+sys-devel/gcc-config cc-wrappers
+
# Sergei Trofimovich (2020-05-24)
# Many base packages still rely on unqualified tools.
# To contain the breakage flags are masked. Once most packages
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index ffaddf191845..be56e0c39db8 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2726,6 +2726,7 @@ dev-qt/qt-docs:serialbus - Install documentation for dev-qt/qtserialbus
dev-qt/qt-docs:serialport - Install documentation for dev-qt/qtserialport
dev-qt/qt-docs:speech - Install documentation for dev-qt/qtspeech
dev-qt/qt-docs:sql - Install documentation for dev-qt/qtsql
+dev-qt/qt-docs:timeline - Install documentation for dev-qt/qtquicktimeline
dev-qt/qt-docs:virtualkeyboard - Install documentation for dev-qt/qtvirtualkeyboard
dev-qt/qt-docs:webchannel - Install documentation for dev-qt/qtwebchannel
dev-qt/qt-docs:webengine - Install documentation for dev-qt/qtwebengine
@@ -4328,7 +4329,6 @@ media-libs/mesa:llvm - Enable LLVM backend for Gallium3D.
media-libs/mesa:lm-sensors - Enable Gallium HUD lm-sensors support.
media-libs/mesa:opencl - Enable the Clover Gallium OpenCL state tracker.
media-libs/mesa:osmesa - Build the Mesa library for off-screen rendering.
-media-libs/mesa:pax_kernel - Enable if the user plans to run the package under a pax enabled hardened kernel
media-libs/mesa:valgrind - Compile in valgrind memory hints
media-libs/mesa:vdpau - Enable the VDPAU acceleration interface for the Gallium3D Video Layer.
media-libs/mesa:vulkan - Enable Vulkan drivers
@@ -8306,6 +8306,7 @@ sys-devel/gcc:vtv - Build support for virtual table verification (a C++ hardenin
sys-devel/gcc-apple:bootstrap - !DO NOT SET THIS FLAG YOURSELF! avoids need for autoconf during bootstrap stage2
sys-devel/gcc-apple:objc - Build support for the Objective C code language
sys-devel/gcc-apple:objc++ - Build support for the Objective C++ language
+sys-devel/gcc-config:cc-wrappers - Install and manage 'cc' and 'f77' wrappers in /usr/bin. Otherwise ignore them.
sys-devel/gcc-config:native-symlinks - Install native symlinks like 'gcc' or 'g++' to /usr/bin. Otherwise keep only ${CTARGET}-gcc and friends.
sys-devel/gdb:client - Install the main "gdb" program (most people want this)
sys-devel/gdb:lzma - Support lzma compression in ELF debug info
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index b731222a773b..8739fb0cfa34 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert.patch b/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert.patch
deleted file mode 100644
index 8a92e19e1578..000000000000
--- a/sci-chemistry/chemical-mime-data/files/chemical-mime-data-0.1.94-rsvg-convert.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- configure.ac | 2 +-
- icons/hicolor/Makefile.am | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6f87a94..a503da4 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -102,7 +102,7 @@ if test "x$enable_convert" != "xyes" -a "x$CONVERT" = "xno" ; then
- [RSVG],
- [The 'rsvg' binary with path. Use it to define or override the location of 'rsvg'.]
- )
-- AC_PATH_PROG([RSVG], [rsvg], [no])
-+ AC_PATH_PROG([RSVG], [rsvg-convert], [no])
- AC_SUBST([RSVG])
- fi
-
-diff --git a/icons/hicolor/Makefile.am b/icons/hicolor/Makefile.am
-index ba0847a..f2e0a84 100644
---- a/icons/hicolor/Makefile.am
-+++ b/icons/hicolor/Makefile.am
-@@ -24,7 +24,7 @@ if BOOL_HICOLOR_THEME
- gzip -c $< > $@
- for size in $(icon_sizes) ; do \
- if test "x$(RSVG)" != "x" ; then \
-- $(RSVG) -w $${size} -h $${size} -f png $< $*_$${size}.png ; \
-+ $(RSVG) -w $${size} -h $${size} -f png $< --output $*_$${size}.png ; \
- else \
- $(CONVERT) $< -resize $${size}x$${size} $*_$${size}.png ; \
- fi \
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index fb8ba89eecb1..fe728e603e1d 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/netgen/files/netgen-1.3.10-tcl-bin-name.patch b/sci-electronics/netgen/files/netgen-1.3.10-tcl-bin-name.patch
deleted file mode 100644
index c0caf10361a1..000000000000
--- a/sci-electronics/netgen/files/netgen-1.3.10-tcl-bin-name.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- netgen-1.4.40/tcltk/Makefile
-+++ netgen-1.4.40/tcltk/Makefile
-@@ -42,8 +42,8 @@
- ${CP} $* $(DESTDIR)${TCLDIR}/$*
-
- $(DESTDIR)${BINDIR}/netgen.sh: netgen.sh
-- ${RM} $(DESTDIR)${BINDIR}/netgen.sh $(DESTDIR)${BINDIR}/netgen
-- ${CP} netgen.sh $(DESTDIR)${BINDIR}/netgen
-- (cd $(DESTDIR)${BINDIR}; chmod 0755 netgen)
-+ ${RM} $(DESTDIR)${BINDIR}/netgen.sh $(DESTDIR)${BINDIR}/netgen-tcl
-+ ${CP} netgen.sh $(DESTDIR)${BINDIR}/netgen-tcl
-+ (cd $(DESTDIR)${BINDIR}; chmod 0755 netgen-tcl)
-
- include ${NETGENDIR}/rules.mak
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 678b4567ae54..0c83079285ac 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/openblas/openblas-0.3.9-r1.ebuild b/sci-libs/openblas/openblas-0.3.9-r1.ebuild
index b0daf6becad6..391cd2524189 100644
--- a/sci-libs/openblas/openblas-0.3.9-r1.ebuild
+++ b/sci-libs/openblas/openblas-0.3.9-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV} -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="dynamic eselect-ldso index-64bit openmp pthread test"
REQUIRED_USE="?? ( openmp pthread )"
RESTRICT="!test? ( test )"
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7eec3dc4018b..3b7a05954a5a 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/biosdisk/Manifest b/sys-apps/biosdisk/Manifest
index ecfc5412c4ee..2dca2afd174f 100644
--- a/sys-apps/biosdisk/Manifest
+++ b/sys-apps/biosdisk/Manifest
@@ -1 +1,2 @@
DIST biosdisk-0_p20171116.tar.gz 712587 BLAKE2B f09a8c68f57cddb1949d369cfc18d1216c3e64612a7074c58e6c50c12682fce92a4d6295810d5358fac0340483387f14059811a5681ae4f37c7da8e40c34fec4 SHA512 27d99990d0e92f1295d2ddb949214946db681e7f80c6606b252473fe7b5b0d3254180b54cb26479c9014219f6b989aa6ba29e8a818f3801f9ccce4efd2f1c3b9
+DIST biosdisk-1.01.tar.gz 214715 BLAKE2B 1a42523d0ec713a895276e3ca3b383206bb841c59bf789eb2b869ce3ade6bfde1e96d47afb8874eec5efec1ef4d404c093a707e36d2d9ab785211fa62abb5782 SHA512 f1920a0eee0a1f8530488c5ccd3f37b36170150b7658658af55beb41c2084c66b6d6bded6e144e36dd9d74f963881c504d7869bbe5c8b57749bff4d918581537
diff --git a/sys-apps/biosdisk/biosdisk-1.01.ebuild b/sys-apps/biosdisk/biosdisk-1.01.ebuild
new file mode 100644
index 000000000000..f4ae904c895e
--- /dev/null
+++ b/sys-apps/biosdisk/biosdisk-1.01.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="FreeDOS based BIOS updating utility for Dell machines"
+HOMEPAGE="https://github.com/dell/biosdisk"
+SRC_URI="https://github.com/dell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ app-cdr/cdrtools
+ sys-boot/grub
+ sys-boot/syslinux
+"
+
+src_prepare() {
+ default
+
+ sed -e 's/biosdisk.8.gz/biosdisk.8/g' -e '/gzip/d' -i Makefile || die
+}
+
+src_install() {
+ default
+
+ keepdir /var/lib/biosdisk
+}
diff --git a/sys-apps/biosdisk/metadata.xml b/sys-apps/biosdisk/metadata.xml
index abf4a100a13d..b9de019cb593 100644
--- a/sys-apps/biosdisk/metadata.xml
+++ b/sys-apps/biosdisk/metadata.xml
@@ -1,12 +1,8 @@
-
+
-
- mattsch@gmail.com
- Matthew Schultz
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
+
+
+ dell/biosdisk
+
diff --git a/sys-apps/dbus/files/dbus.initd-r1 b/sys-apps/dbus/files/dbus.initd-r1
deleted file mode 100644
index bd3542381a7a..000000000000
--- a/sys-apps/dbus/files/dbus.initd-r1
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-description="An IPC message bus daemon"
-pidfile="/var/run/dbus.pid"
-command="/usr/bin/dbus-daemon"
-command_args="--system"
-
-dbus_socket="/var/run/dbus/system_bus_socket"
-
-depend() {
- need localmount
- after bootmisc
-}
-
-start_pre() {
- /usr/bin/dbus-uuidgen --ensure=/etc/machine-id
-
- # We need to test if /var/run/dbus exists, since script will fail if it does not
- checkpath -q -d /var/run/dbus
-}
-
-stop_post() {
- [ ! -S "${dbus_socket}" ] || rm -f "${dbus_socket}"
-}
-
-reload() {
- ebegin "Reloading D-BUS messagebus config"
- /usr/bin/dbus-send --print-reply --system --type=method_call \
- --dest=org.freedesktop.DBus \
- / org.freedesktop.DBus.ReloadConfig > /dev/null
- eend $?
-}
diff --git a/sys-apps/fwupd/fwupd-1.3.10.ebuild b/sys-apps/fwupd/fwupd-1.3.10.ebuild
index 008eaf67978e..d7daed583481 100644
--- a/sys-apps/fwupd/fwupd-1.3.10.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
REQUIRED_USE="${PYTHON_REQUIRED_USE}
^^ ( consolekit elogind minimal systemd )
diff --git a/sys-apps/unscd/unscd-0.53.ebuild b/sys-apps/unscd/unscd-0.53.ebuild
index d191aa03c5e6..82c32de88783 100644
--- a/sys-apps/unscd/unscd-0.53.ebuild
+++ b/sys-apps/unscd/unscd-0.53.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://busybox.net/~vda/unscd/nscd-${PV}.c"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
RDEPEND="sys-libs/glibc[nscd(+)]"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index acf280cc89ef..7807c349318d 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild
index f18c030a06c7..e7e08f381b4d 100644
--- a/sys-devel/gcc-config/gcc-config-9999.ebuild
+++ b/sys-devel/gcc-config/gcc-config-9999.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Utility to manage compilers"
HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="+native-symlinks"
+IUSE="+cc-wrappers +native-symlinks"
RDEPEND=">=sys-apps/gentoo-functions-0.10"
@@ -25,6 +25,7 @@ _emake() {
emake \
PV="${PV}" \
SUBLIBDIR="$(get_libdir)" \
+ USE_CC_WRAPPERS="$(usex cc-wrappers)" \
USE_NATIVE_LINKS="$(usex native-symlinks)" \
TOOLCHAIN_PREFIX="${CHOST}-" \
"$@"
diff --git a/sys-devel/gcc-config/metadata.xml b/sys-devel/gcc-config/metadata.xml
index 33e9604b0414..ecfb291141ed 100644
--- a/sys-devel/gcc-config/metadata.xml
+++ b/sys-devel/gcc-config/metadata.xml
@@ -6,6 +6,7 @@
Gentoo Toolchain Project
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 71751392d095..455fb53da006 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
index b4a3180e1b42..f85dd453f968 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.
mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
LICENSE="APSL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE=""
DEPEND="dev-libs/openssl"
RDEPEND="${DEPEND}"
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
index f567083d9d1c..130503b4b819 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 sparc ~x86"
IUSE="tcl tk"
DEPEND="
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-CVE-2017-0358.patch b/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-CVE-2017-0358.patch
deleted file mode 100644
index 1ce7e9cdae32..000000000000
--- a/sys-fs/ntfs3g/files/ntfs3g-2016.2.22-CVE-2017-0358.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/lowntfs-3g.c b/src/lowntfs-3g.c
-index 0bb38f97..c6d1dad3 100644
---- a/src/lowntfs-3g.c
-+++ b/src/lowntfs-3g.c
-@@ -3827,13 +3827,14 @@ static fuse_fstype load_fuse_module(void)
- struct stat st;
- pid_t pid;
- const char *cmd = "/sbin/modprobe";
-+ char *env = (char*)NULL;
- struct timespec req = { 0, 100000000 }; /* 100 msec */
- fuse_fstype fstype;
-
- if (!stat(cmd, &st) && !geteuid()) {
- pid = fork();
- if (!pid) {
-- execl(cmd, cmd, "fuse", NULL);
-+ execle(cmd, cmd, "fuse", NULL, &env);
- _exit(1);
- } else if (pid != -1)
- waitpid(pid, NULL, 0);
-diff --git a/src/ntfs-3g.c b/src/ntfs-3g.c
-index 268b0569..945fc0be 100644
---- a/src/ntfs-3g.c
-+++ b/src/ntfs-3g.c
-@@ -3612,13 +3612,14 @@ static fuse_fstype load_fuse_module(void)
- struct stat st;
- pid_t pid;
- const char *cmd = "/sbin/modprobe";
-+ char *env = (char*)NULL;
- struct timespec req = { 0, 100000000 }; /* 100 msec */
- fuse_fstype fstype;
-
- if (!stat(cmd, &st) && !geteuid()) {
- pid = fork();
- if (!pid) {
-- execl(cmd, cmd, "fuse", NULL);
-+ execle(cmd, cmd, "fuse", NULL, &env);
- _exit(1);
- } else if (pid != -1)
- waitpid(pid, NULL, 0);
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index b1a61a0a7e52..4ee94155948a 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/rt-sources/files/rt-sources-posix-printf.patch b/sys-kernel/rt-sources/files/rt-sources-posix-printf.patch
deleted file mode 100644
index 81ebcaf0eca9..000000000000
--- a/sys-kernel/rt-sources/files/rt-sources-posix-printf.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 651e54953b5d4ad103f0efa54fc6b380807fca3a Mon Sep 17 00:00:00 2001
-From: Thomas Schneider
-Date: Fri, 14 Oct 2016 21:29:49 +0200
-Subject: security/apparmor: Use POSIX-compatible "printf '%s'"
-
-When using a strictly POSIX-compliant shell, "-n #define ..." gets
-written into the file. Use "printf '%s'" to avoid this.
-
-Signed-off-by: Thomas Schneider
-Signed-off-by: John Johansen
----
- security/apparmor/Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-(limited to 'security/apparmor')
-
-diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
-index ad369a7..2ded2f1 100644
---- a/security/apparmor/Makefile
-+++ b/security/apparmor/Makefile
-@@ -20,7 +20,7 @@ cmd_make-caps = echo "static const char *const capability_names[] = {" > $@ ;\
- sed $< >>$@ -r -n -e '/CAP_FS_MASK/d' \
- -e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/[\2] = "\L\1",/p';\
- echo "};" >> $@ ;\
-- echo -n '\#define AA_FS_CAPS_MASK "' >> $@ ;\
-+ printf '%s' '\#define AA_FS_CAPS_MASK "' >> $@ ;\
- sed $< -r -n -e '/CAP_FS_MASK/d' \
- -e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/\L\1/p' | \
- tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
-@@ -56,7 +56,7 @@ cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \
- echo "static const int rlim_map[RLIM_NLIMITS] = {" >> $@ ;\
- sed -r -n "s/^\# ?define[ \t]+(RLIMIT_[A-Z0-9_]+).*/\1,/p" $< >> $@ ;\
- echo "};" >> $@ ; \
-- echo -n '\#define AA_FS_RLIMIT_MASK "' >> $@ ;\
-+ printf '%s' '\#define AA_FS_RLIMIT_MASK "' >> $@ ;\
- sed -r -n 's/^\# ?define[ \t]+RLIMIT_([A-Z0-9_]+).*/\L\1/p' $< | \
- tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
-
---
-cgit v1.1
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index a16f644afa14..177b538f3132 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -10,5 +10,5 @@ DIST patch-4.14.185.xz 3712388 BLAKE2B 2df7c0bfc4c99c2b41022aac9eb7bc57b56d0d5a2
DIST patch-4.19.129.xz 3156956 BLAKE2B 19c4d51c56d94b7d90f0b97f904fc704bb2bea1a3ce43461d195fcf959bec660fb6e1e57d86a9fea29e82199b151604b6a4ef2b76b8aba4a03eddf16f5da85de SHA512 114c3458cc754722a43e12659483d113564b62f3ca2262cea0cf8146d0c1d81ffb03454927a517feace0dba827bfbf246977cb73e632641fc3ddc4f73d53224b
DIST patch-4.4.228.xz 3213224 BLAKE2B 0bf40d9a212263afa7b13fe18e965a65b95b374eeb165190d1bd13525af5174bddbb42f920f5ae3a284e4a60f53064d6658a0fdf1b505b2c86ccd2f4a648e3be SHA512 67e35262691471f09afaf523d9ce9761daf2946bc1e9bafd2042dc71fdbc99868a3c89070bac8e495e78eabd0abcb11ad44fec7bc99c43b3bb177f00b9432914
DIST patch-4.9.228.xz 3513700 BLAKE2B a22a31f5abd139ff5d018a65bd186d373652f4b130b4254c3c570a57bb72c713ced9e937c2b2d678ceb475f5072dfcc756d8648edefa6962986d5b15c1554cb0 SHA512 59bc15bbfc6df40abc022537f7a7d25fbaca58881c12ddadfb0e2413f7306662b948947d77279473ab5590ea9b80cb6ca3e2648e04ae62279496cce2ff258b5b
-DIST patch-5.4.48.xz 1522196 BLAKE2B 25f048c646da904cd96d9b55728a631ff5b9d64185f23f66e2f6aa421fcc5898a5ad5afefb29259f259fcd806e237611e31ad0627e22bc26ccaadab0e136b753 SHA512 09378f5797055925405433e5972c9cc1bb4caaeb02546747feca0c896f11eac0750efbc0e8f35f8eb49fc0c4ae2911e50b1f9b7bbfa95b2010594067be2e684e
-DIST patch-5.7.5.xz 177072 BLAKE2B de264df317bbd065aca228e1b9d8dfb95a7196b96d7d4d58b61a02f0375fd145d82b83a25e7ef6218ce33b7c3d1173a1b7986bfc9b8ede48425ddac0dfb25f8a SHA512 1bd2edc70856d9661192f0857e90de5ba79cd01be2f360fba37f7886dae0a5ecbd93c0172d40d7e682aba48ef9b9ebbfd586f399187c15c794c08279970ca090
+DIST patch-5.4.49.xz 1591188 BLAKE2B 282e70be9df7fdc5c947f01708e9ab64e70d18a5f51a72826c3f3114e507f106084e1f7b7f88aa7f1c0625a945071ff15207a04f4d6323a360dce8dbf176f352 SHA512 41964ea710bfa1ee810ba5c6a916344de170f4e9be5d7eaeb9c2241c2857ff81fc54e3f0dbb3712829b953ce71bdd5f56c9d087f853562428ec967d776bfb473
+DIST patch-5.7.6.xz 315652 BLAKE2B 38d9bc03690e3460ce978f184c0929a3b7fe1fc9af16060709e9e2ac988ad32ebceecd71885b60898e62b1456c3af9dc8b762064426e7819b2064ea27d8b698a SHA512 9805544822c083a7a2806c25fec94b6f784071ec69ad3c852c39576a1a2ab7dc15c71b59d9e25abc6ac6cadfed8418f6a5871ea6e5c9b025c34c5cc9aa74862e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.48.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.49.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.48.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.49.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.7.5.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.7.6.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.7.5.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.7.6.ebuild
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 127837c87e34..55e9a383abce 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/editor/editor-0-r3.ebuild b/virtual/editor/editor-0-r3.ebuild
index 01364cc3f24b..ad5eea779a9f 100644
--- a/virtual/editor/editor-0-r3.ebuild
+++ b/virtual/editor/editor-0-r3.ebuild
@@ -35,7 +35,6 @@ RDEPEND="|| (
app-editors/ne
app-editors/neovim
app-editors/ng
- app-editors/nvi
app-editors/qemacs
app-editors/teco
app-editors/uemacs-pk
diff --git a/virtual/libc/libc-1-r1.ebuild b/virtual/libc/libc-1-r1.ebuild
index cfc0febb66cb..7c552ee86a80 100644
--- a/virtual/libc/libc-1-r1.ebuild
+++ b/virtual/libc/libc-1-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for the C library"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# explicitly depend on SLOT 2.2 of glibc, because it sets
# a different SLOT for cross-compiling
diff --git a/virtual/os-headers/os-headers-0-r2.ebuild b/virtual/os-headers/os-headers-0-r2.ebuild
index fbbcc6d19339..bdbd9e1b9178 100644
--- a/virtual/os-headers/os-headers-0-r2.ebuild
+++ b/virtual/os-headers/os-headers-0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
DESCRIPTION="Virtual for operating system headers"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# depend on SLOT 0 of linux-headers, because kernel-2.eclass
# sets a different SLOT for cross-building
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 1fc7566becac..a0589949e147 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index db4301de61f6..756d67e49b6d 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,16 +1 @@
-DIST chromedriver-bin-2.24.linux32.zip 3154004 BLAKE2B 6db98f434a5a71c7d76a7fa607c96e84a5358d0f1293a5e99838bcbd7f28846422ddb2d1128fb5602b02700b7bd7b61856903bd05047007dc4f2e41a5f8d6532 SHA512 36d853050c58bfc79e3b04e14f9c00cb3b5dad42cbc6a7433b06ef841184443750d714d7a5c80528e237831adf68ddb3f24540b9f19e6601e9e483e57f50cc7b
-DIST chromedriver-bin-2.24.linux64.zip 3116161 BLAKE2B b32b8f5191b65fde09cd6fb6fa753702444e7dd15dc8f9a335bd99f9ac36942c0e7eaf546db5b688f66fa0ce429c550a20a3059e554452a2b99bb4d86b387622 SHA512 ae1fa127560af1b8419c273f9e23253a19423276294cb920c87b0c209134244315c4d3878b9025589471d72056abb0087ef897f684e28d63b5fc71d628dd1791
-DIST chromedriver-bin-2.30.linux32.zip 3891104 BLAKE2B 653365b57013549c3190d4fe2cc427b1f98bd04cd28d64be64993a99e90e33c487fcf8f3a35830659ad2f98a97a15345f24fb278c724eea4cf2ead41a19cb3b3 SHA512 341a652a4dba85a4990b6366fe1a6b392d83c32f70ec04ec69afbc90932d223f16b1944b2709b80dc4399c9377523fd494aba0e70fa7c9e22fda1e5142778a4b
-DIST chromedriver-bin-2.30.linux64.zip 3864914 BLAKE2B d31a1ff9f0eba3384bb3e1598b448c3893d65be98876ad302891657e0eaa8684733303eca618e43226a3e6eb1fd212248188d20cfc97b5aefc91186009999420 SHA512 451d120fceda3a08bba77fbae8d99c87c0902e608006a7895882a06cdcb1614afe0b563fd1b2b2bdc3ac3fbc426b5d3141245ee4d00a0c4dad6911d9a94f5d1a
-DIST chromedriver-bin-2.35.linux64.zip 3721349 BLAKE2B 37abd16d3d2aea57dfff871f2cdcf3ea0c34ad50dd8ba98f2e166e541ebf6ea2ede641a10f7b3d6ff2114740f9aad3cda6e0fc19ab3708fca89b3ce96cb3639e SHA512 0da15aee65c7f13552a57cc77212206fcd9a76b3cb912d85807760d6fb44b122e850c72e36fa7f53355c5bfff038afeeec2181089d1507c59cd5e176fd415ae7
-DIST chromedriver-bin-2.40.linux64.zip 3860375 BLAKE2B b91d4cd05b390f5b0d175ab396838ed3d2ab0dd0a961c4d51268a85c1ffc0be077615126b9373dd7cf69add57f9eb56b5b494ecf55086a4b86cdbc50f1307275 SHA512 5d4fd5723b6245bb7ee722f0e206391b1baa5f1c558f7e79f54289ea3adab385537f569f84b6de2b4f02e38105416f3361b439349a180e3a764126ed2ad525a4
-DIST chromedriver-bin-2.41.linux64.zip 3944714 BLAKE2B 6f86f973c1768d549bbc57a6578459d5603424351240530a7bc3e20c201dd5a0323843e29201a6731f70cc9672c129ebcda7478539cf9875e6e9c14d7f30eca0 SHA512 328bd82d17f5d4238d3fd18b8848f4edc218014cba515972b75f1e4e866f1d729f6d56463b276f7afaf7965f0d36680c0238ae8ff8f9667bc6631e49ae9e7013
-DIST chromedriver-bin-74.0.3729.6.linux64.zip 5065988 BLAKE2B e4c6bc2530f2cf8d033677d18978d93fba9710ead098c5ed455584154b73e9d734db32d9b3fd7f5500f3f32d4403f34fa448b37d3b96d3aecfc11dd9ac7ce54a SHA512 1f61f4940b557c4d74e540ff11770b3182941a11cc34783c97beab1afb5eb53806c958721da1a8249cb6a88c6cf40e7064ac9f94e7da1970d9c23a1188873c5b
-DIST chromedriver-bin-76.0.3809.68.linux64.zip 5231218 BLAKE2B eb4bd1f6bfe8f137ba6314fdfe6c132a989266f75af1870b6dae3ed9bee70d8a8145794798d273f971fdce0b311523972eebf88cc4ddb391195fc1985abe12af SHA512 18be867e96fce752a1a2974ade8a0897b19d4a3e1b971e751193e33a01211a96e0f835785817151405e7d3d4138f86d8104544ca2b72925ba5e38a14b45c72dd
-DIST chromedriver-bin-77.0.3865.40.linux64.zip 5425800 BLAKE2B b1b0ef7e4a6822838874fe5fa4bf7e24ef01f720a8cd62b2c748af20a6fa74bc34473d3fff1ef553f21437fb2ed592c7245253b781810da8987e6d730c6c027f SHA512 6463e76f00ceee66fd8037b38e9ce5699b6ec83c8f2fa43cb0d417fb4d8d1c92cf85168beb1a23a90c20abf20dcfd66dfe235dfb690730a8fd548ca6236eb8f7
-DIST chromedriver-bin-78.0.3904.105.linux64.zip 5528166 BLAKE2B 02cb41da4f04dedc8bdb1d6137c7646f03ee07861a3f44b51ba6547768645e90d4acdc0898d272be8337ef99d12ec2dc838778750ecf5d354224340664adedcd SHA512 fdbf9112b6e9d2e2e1fdcc4960ff5ea3a8ec4181a5afb273d5cf647193a7e9e439dc9643767e006e647d823bae524892d7b111be68165a03e9a3edb94d5c97ec
-DIST chromedriver-bin-78.0.3904.70.linux64.zip 5527671 BLAKE2B 41c29c580ed00a23ea31bd536399eb850b4978bbfb132895baeef24e6cc53b0e0ab1ad8095fb5de9dba2a4a09dd3c7641d76f704a7ffb556fe11810af27cd6ec SHA512 ec5844a1eb788d5b6649178f22702fbfbe49533d061dede19179c97c0e578d4240ccfce0e0a7b9e82d618585c8f32c96e540f8ccdb295bac787e516e26bc3887
-DIST chromedriver-bin-79.0.3945.36.linux64.zip 4875160 BLAKE2B b5f91702ea415dd65e7b5807ace37dd2c27cf77733383f97e46d4e12234afcde1642b6a814088122a5e893124e6c6cbe117b3dfa2a7cc9c97dfa6948df5c5995 SHA512 78c11beb107f4775d40dd4f28f713d6f3228930a5647dd7a5a824a6c9902364f8267e40812b4ca8dc3b849cb5adc3fb6c810146b29d29ed85e6e55e13c86ded7
-DIST chromedriver-bin-80.0.3987.106.linux64.zip 4943146 BLAKE2B 7e5656fbd223f157702e0b31a52c5d9f9bf72b0bcff15dd40571f7b470efe591b46829b3cb5139d5d2ff94fac6e9829d444a33cb1427ffd02434a7c894d889d1 SHA512 afdffdffa3cdb685c1fe96e47ed625f5bc01b5fd180c201f6eafe120b6d11bb26c60bcfabf71a07d12213eec8e606d3dc52917b0830dc86fd384f30cd18c6229
-DIST chromedriver-bin-81.0.4044.69.linux64.zip 4956612 BLAKE2B 9d7bc8fe5f62e940c8b711bd7d7918de974b6c7731bb6cd7ba6597958c20a57acb333989ab47c8298786e168a03d7456007a34d9a85e20bbd033e7380deac957 SHA512 6dcb05d7fb117051caf3091501f708cbfc45adecb8f2591b7cb5664dbe4999e93542f878a6de8c116761c8fd2f53f4f2df3604704dd4e8dc33b973ed749e25ff
DIST chromedriver-bin-83.0.4103.39.linux64.zip 5222065 BLAKE2B 7d801205bcd0174d1d622b8e3c6c755f1dfae1fd4bf1bc225dbd05bd0d868c300d7bf442a39f29525d4af1f54c0f2e46b233d433d70523d48df15a30aa1a89f0 SHA512 9cb02938cef436dcf0b3f54e5ce668de86e9afc702a1903e2f35ecabcbd4c468f525ff3c6b079eb88b14c1a956bc070fa281fdf64d9d54027254f769c00d24f9
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.24-r1.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.24-r1.ebuild
deleted file mode 100644
index 20c77c77d886..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-2.24-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )
- x86? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux32.zip -> ${P}.linux32.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
- www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
- dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.30-r1.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.30-r1.ebuild
deleted file mode 100644
index 20c77c77d886..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-2.30-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )
- x86? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux32.zip -> ${P}.linux32.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
- www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
- dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.35-r1.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.35-r1.ebuild
deleted file mode 100644
index 2ddd7f88b05a..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-2.35-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
- www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
- dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.40.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.40.ebuild
deleted file mode 100644
index 2ddd7f88b05a..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-2.40.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
- www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
- dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-2.41.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-2.41.ebuild
deleted file mode 100644
index 2ddd7f88b05a..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-2.41.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
- www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
- dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-74.0.3729.6.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-74.0.3729.6.ebuild
deleted file mode 100644
index ebfd309b9915..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-74.0.3729.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
- www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
- dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-76.0.3809.68.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-76.0.3809.68.ebuild
deleted file mode 100644
index ebfd309b9915..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-76.0.3809.68.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
- www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
- dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-77.0.3865.40.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-77.0.3865.40.ebuild
deleted file mode 100644
index ebfd309b9915..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-77.0.3865.40.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
- www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
- dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.105.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.105.ebuild
deleted file mode 100644
index d784d5e28ea9..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.105.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="bindist mirror strip"
-
-BDEPEND="app-arch/unzip"
-
-RDEPEND="!www-client/chromium
- www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
- dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.70.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.70.ebuild
deleted file mode 100644
index ebfd309b9915..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-78.0.3904.70.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="!www-client/chromium
- www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
- dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-79.0.3945.36.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-79.0.3945.36.ebuild
deleted file mode 100644
index d784d5e28ea9..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-79.0.3945.36.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="bindist mirror strip"
-
-BDEPEND="app-arch/unzip"
-
-RDEPEND="!www-client/chromium
- www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
- dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-80.0.3987.106.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-80.0.3987.106.ebuild
deleted file mode 100644
index c96967a171b8..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-80.0.3987.106.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="bindist mirror strip"
-
-BDEPEND="app-arch/unzip"
-
-RDEPEND="!www-client/chromium
- www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
- dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-81.0.4044.69.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-81.0.4044.69.ebuild
deleted file mode 100644
index c96967a171b8..000000000000
--- a/www-apps/chromedriver-bin/chromedriver-bin-81.0.4044.69.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="WebDriver for Chrome"
-HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
-SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RESTRICT="bindist mirror strip"
-
-BDEPEND="app-arch/unzip"
-
-RDEPEND="!www-client/chromium
- www-client/google-chrome"
-
-S="${WORKDIR}"
-QA_PREBUILT="usr/bin/chromedriver"
-
-src_install()
-{
- dobin chromedriver
-}
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39-r1.ebuild
similarity index 93%
rename from www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39.ebuild
rename to www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39-r1.ebuild
index c96967a171b8..75e2c16479fe 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39-r1.ebuild
@@ -17,7 +17,7 @@ RESTRICT="bindist mirror strip"
BDEPEND="app-arch/unzip"
RDEPEND="!www-client/chromium
- www-client/google-chrome"
+ =www-client/google-chrome-$(ver_cut 1)*"
S="${WORKDIR}"
QA_PREBUILT="usr/bin/chromedriver"
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index e2020c8a1f28..ee07f34458ab 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1 +1,2 @@
DIST mediawiki-1.34.1.tar.gz 40346153 BLAKE2B 394c23e7d507aef6e47971e265b70826046e954b7f694f32a94d7c5358775e0ee8a17188de1f395fbb19457267650eaffd3586c0f73df8cfad721560d563cbfd SHA512 3a03ac696e2d5300faba0819ba0d876a21798c8dcdc64cc2792c6db0aa81d4feaced8dc133b6ca3e476c770bf51516b0a624cb336784ae3d2b51c8c0aa5987a0
+DIST mediawiki-1.34.2.tar.gz 40721102 BLAKE2B fbf7e8a19cd51e1dd3eab85442ce4e65ee9591bb4d2c6faa93ecbfc43e0b6cf88501a0027a7ba0f1adb55d9946de9958abcb14f9fb95b826ba674f1aa8306553 SHA512 ea95b46b746c0c180b5cb3b8a2263a2f94207eadbb1638c2113e97b1503c3f0a4d82a2107ce4cabca4790512b81564bda49defe30ac0fdb9bddf3230d6201f8b
diff --git a/www-apps/mediawiki/mediawiki-1.34.2.ebuild b/www-apps/mediawiki/mediawiki-1.34.2.ebuild
new file mode 100644
index 000000000000..32020160a1b1
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.34.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit webapp
+
+MY_BRANCH=$(ver_cut 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+RDEPEND="dev-lang/php[ctype,fileinfo,iconv,json,postgres?,session,ssl,unicode,xml,xmlreader]
+ imagemagick? ( virtual/imagemagick-tools )
+ !imagemagick? ( dev-lang/php[gd] )
+ mysql? ( dev-lang/php[mysql,mysqli] )
+ sqlite? (
+ dev-db/sqlite[fts3(+)]
+ dev-lang/php[pdo,sqlite]
+ )
+ virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_unpack() {
+ default
+
+ # remove lua binaries (bug #631554)
+ rm -fr "${S}"/extensions/Scribunto/includes/engines/LuaStandalone/binaries || die "Failed to remove lua binaries"
+}
+
+src_install() {
+ webapp_src_preinst
+
+ # First we install docs and then copy everything left into htdocs dir
+ # to avoid bugs like #236411.
+
+ # We ensure the directories are prepared for writing. The post-
+ # install instructions guide the user to enable the feature.
+ local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
+ dodoc ${DOCS} docs/*.txt
+ docinto databases
+ dodoc docs/databases/*
+ # Clean everything not used at the site...
+ rm -rf ${DOCS} COPYING tests docs || die
+ find . -name Makefile -delete || die
+ # and install
+ insinto "${MY_HTDOCSDIR}"
+ doins -r .
+
+ # If imagemagick is enabled then setup for image upload.
+ # We ensure the directory is prepared for writing.
+ if use imagemagick ; then
+ webapp_serverowned "${MY_HTDOCSDIR}"/images
+ fi
+
+ webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+ webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+ webapp_src_install
+}
+
+pkg_postinst() {
+ webapp_pkg_postinst
+
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ echo
+ elog "=== Consult the release notes ==="
+ elog "Before doing anything, stop and consult the release notes"
+ elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+ echo
+ elog "These detail bug fixes, new features and functionality, and any"
+ elog "particular points that may need to be noted during the upgrade procedure."
+ echo
+ ewarn "Back up existing files and the database before upgrade."
+ ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+ ewarn "provides an overview of the backup process."
+ echo
+ fi
+}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index b8134f48f9fe..39dab33f42b0 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/chromium-83.0.4103.116.ebuild b/www-client/chromium/chromium-83.0.4103.116.ebuild
index 8edd43680977..db11978df3cb 100644
--- a/www-client/chromium/chromium-83.0.4103.116.ebuild
+++ b/www-client/chromium/chromium-83.0.4103.116.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
IUSE="+closure-compile component-build cups cpu_flags_arm_neon +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
REQUIRED_USE="component-build? ( !suid )"
diff --git a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff b/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
deleted file mode 100644
index 83accf4c2d95..000000000000
--- a/www-client/elinks/files/elinks-0.10.4.conf-syscharset.diff
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/elinks-0.10.4.conf 2005-04-08 15:29:49.000000000 -0700
-+++ b/elinks-0.10.4-syscharset.conf 2006-11-04 00:26:26.000000000 -0800
-@@ -12,8 +12,6 @@
- # obsolete config.saving_style. You shouldn't touch it.
- set config.saving_style_w = 1
-
-- ## terminal.linux.charset
-- set terminal.linux.charset = "us-ascii"
- ## terminal.linux.transparency [0|1]
- set terminal.linux.transparency = 1
- ## terminal.linux.colors [0|1]
-@@ -29,8 +27,6 @@
- ## terminal.linux.type
- set terminal.linux.type = 2
-
-- ## terminal.vt100.charset
-- set terminal.vt100.charset = "us-ascii"
- ## terminal.vt100.transparency [0|1]
- set terminal.vt100.transparency = 1
- ## terminal.vt100.colors [0|1]
-@@ -46,8 +42,6 @@
- ## terminal.vt100.type
- set terminal.vt100.type = 1
-
-- ## terminal.vt110.charset
-- set terminal.vt110.charset = "us-ascii"
- ## terminal.vt110.transparency [0|1]
- set terminal.vt110.transparency = 1
- ## terminal.vt110.colors [0|1]
-@@ -63,8 +57,6 @@
- ## terminal.vt110.type
- set terminal.vt110.type = 1
-
-- ## terminal.xterm.charset
-- set terminal.xterm.charset = "us-ascii"
- ## terminal.xterm.transparency [0|1]
- set terminal.xterm.transparency = 1
- ## terminal.xterm.colors [0|1]
-@@ -80,8 +72,6 @@
- ## terminal.xterm.type
- set terminal.xterm.type = 1
-
-- ## terminal.xterm-color.charset
-- set terminal.xterm-color.charset = "us-ascii"
- ## terminal.xterm-color.transparency [0|1]
- set terminal.xterm-color.transparency = 1
- ## terminal.xterm-color.colors [0|1]
-@@ -96,8 +86,7 @@
- set terminal.xterm-color.m11_hack = 0
- ## terminal.xterm-color.type
- set terminal.xterm-color.type = 1
-- ## terminal.screen.charset
-- set terminal.screen.charset = "us-ascii"
-+
- ## terminal.screen.transparency [0|1]
- set terminal.screen.transparency = 1
- ## terminal.screen.colors [0|1]
-@@ -270,10 +259,6 @@
-
-
-
-- ## document.codepage.assume
-- # Default document codepage.
-- set document.codepage.assume = "ISO-8859-1"
--
- ## document.codepage.force_assumed [0|1]
- # Ignore charset info sent by server.
- set document.codepage.force_assumed = 0
-@@ -343,10 +328,6 @@
-
-
-
-- ## document.dump.codepage
-- # Codepage used in dump output.
-- set document.dump.codepage = "us-ascii"
--
- ## document.dump.width
- # Width of screen in characters when dumping a HTML document.
- set document.dump.width = 80
diff --git a/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch b/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch
deleted file mode 100644
index b48ddaeecc47..000000000000
--- a/www-client/elinks/files/elinks-0.12pre5-spidermonkey-callback.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp elinks-0.12pre5-orig/src/ecmascript/spidermonkey.c elinks-0.12pre5/src/ecmascript/spidermonkey.c
---- elinks-0.12pre5-orig/src/ecmascript/spidermonkey.c 2011-06-12 01:03:02.427000686 +0200
-+++ elinks-0.12pre5/src/ecmascript/spidermonkey.c 2011-06-12 01:03:31.368000736 +0200
-@@ -130,7 +130,7 @@ setup_safeguard(struct ecmascript_interp
- JSContext *ctx)
- {
- interpreter->exec_start = time(NULL);
-- JS_SetBranchCallback(ctx, safeguard);
-+ JS_SetOperationCallback(ctx, safeguard);
- }
-
-
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 01dbe8a60c36..c28fdf23ca1b 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/uwsgi/files/2.0.14-php-plugin.patch b/www-servers/uwsgi/files/2.0.14-php-plugin.patch
deleted file mode 100644
index f60a6553cfd1..000000000000
--- a/www-servers/uwsgi/files/2.0.14-php-plugin.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 6b332e6f7e6fc3c267a91ce5b5591684575ea271 Mon Sep 17 00:00:00 2001
-From: Damjan Georgievski
-Date: Thu, 13 Oct 2016 00:55:35 +0200
-Subject: [PATCH] fix issue #1380 - compiling with llvm/freebsd
-
----
- plugins/php/php_plugin.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/php/php_plugin.c b/plugins/php/php_plugin.c
-index 536ec1a..ef30180 100644
---- a/plugins/php/php_plugin.c
-+++ b/plugins/php/php_plugin.c
-@@ -232,7 +232,7 @@ static void sapi_uwsgi_register_variables(zval *track_vars_array TSRMLS_DC)
- size_t name_len = equal-usl->value;
- char *name = estrndup(usl->value, name_len);
- char *strval = equal+1;
-- zend_register_string_constant(name, name_len, strval, CONST_CS, 0);
-+ zend_register_string_constant(name, name_len, strval, CONST_CS, 0 TSRMLS_CC);
- }
- usl = usl->next;
- }
diff --git a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf b/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
deleted file mode 100644
index 85ede87b037b..000000000000
--- a/www-servers/uwsgi/files/42_mod_uwsgi-r2.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-
- LoadModule proxy_uwsgi_module modules/mod_proxy_uwsgi.so
-
-
- LoadModule uwsgi_module modules/mod_Ruwsgi.so
-
-
- LoadModule uwsgi_module modules/mod_uwsgi.so
-
diff --git a/www-servers/varnish/files/fix-build-x86.patch b/www-servers/varnish/files/fix-build-x86.patch
deleted file mode 100644
index acacd3b9d610..000000000000
--- a/www-servers/varnish/files/fix-build-x86.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-See https://bugs.gentoo.org/show_bug.cgi?id=620952
-
-From 54b5a09f00c027da280361b30d32a4ff309ba3ab Mon Sep 17 00:00:00 2001
-From: Poul-Henning Kamp
-Date: Tue, 28 Mar 2017 18:44:12 +0000
-Subject: [PATCH] Try to confuse GCC to not doing FP brain-damage.
-
-Fixes #1875 (maybe)
----
- bin/varnishd/mgt/mgt_param_tweak.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/varnishd/mgt/mgt_param_tweak.c b/bin/varnishd/mgt/mgt_param_tweak.c
-index 12a7a52ef..b26581e2e 100644
---- a/bin/varnishd/mgt/mgt_param_tweak.c
-+++ b/bin/varnishd/mgt/mgt_param_tweak.c
-@@ -52,7 +52,7 @@ static int
- tweak_generic_double(struct vsb *vsb, volatile double *dest,
- const char *arg, const char *min, const char *max, const char *fmt)
- {
-- double u, minv = 0, maxv = 0;
-+ volatile double u, minv = 0, maxv = 0;
-
- if (arg != NULL) {
- if (min != NULL) {
diff --git a/www-servers/varnish/files/varnish-5.2.0-fix-import.patch b/www-servers/varnish/files/varnish-5.2.0-fix-import.patch
deleted file mode 100644
index f83385a3f8e7..000000000000
--- a/www-servers/varnish/files/varnish-5.2.0-fix-import.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 17c92e43fda114bf5341e51d752e882238b8fe8c Mon Sep 17 00:00:00 2001
-From: Nils Goroll
-Date: Thu, 5 Oct 2017 13:39:23 +0200
-Subject: [PATCH] hack up vsctool to work with python 2 and 3
-
-StringIO does not exist any more in python3, yet requiring 2.7 would
-not pave the path forward, so try to be compatible with both.
-
-Works for me on Python 2.7.9 and Python 3.4
-
-I would appreciate if someone more fluent in serpentinous programming
-language reviewed and/or rewrote this.
----
- lib/libvcc/vsctool.py | 24 ++++++++++++++++++++----
- 1 file changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/lib/libvcc/vsctool.py b/lib/libvcc/vsctool.py
-index 854968e3b..829c6e518 100644
---- a/lib/libvcc/vsctool.py
-+++ b/lib/libvcc/vsctool.py
-@@ -37,7 +37,10 @@
- import json
- import sys
- import gzip
--import StringIO
-+try:
-+ import StringIO
-+except ImportError:
-+ import io
- import collections
- import struct
-
-@@ -54,9 +57,22 @@
- "format": [ "integer", FORMATS],
- }
-
-+# http://python3porting.com/problems.html#bytes-strings-and-unicode
-+if sys.version_info < (3,):
-+ def b(x):
-+ return x
-+else:
-+ import codecs
-+ def b(x):
-+ return codecs.latin_1_encode(x)[0]
-+
- def gzip_str(s):
-- out = StringIO.StringIO()
-- gzip.GzipFile(fileobj=out, mode="w").write(s)
-+ try:
-+ out = StringIO.StringIO()
-+ except NameError:
-+ out = io.BytesIO()
-+
-+ gzip.GzipFile(fileobj=out, mode="w").write(b(s))
- out.seek(4)
- out.write(struct.pack("
-Date: Fri, 24 Jan 2020 12:49:44 +0100
-Subject: [PATCH xserver] Fix building with `-fno-common`
-
-* GCC 10 will switch the default to `-fno-common`.
- https://gcc.gnu.org/PR85678
-
-Bug: https://bugs.gentoo.org/705880
-Signed-off-by: Matt Turner
----
- hw/dmx/config/dmxconfig.c | 2 +-
- hw/dmx/config/xdmxconfig.c | 2 +-
- hw/dmx/glxProxy/glxext.c | 2 --
- hw/xwayland/xwayland.c | 2 +-
- test/misc.c | 2 +-
- test/xi1/protocol-xchangedevicecontrol.c | 2 +-
- test/xi2/protocol-common.c | 2 ++
- test/xi2/protocol-common.h | 2 +-
- test/xi2/protocol-xigetclientpointer.c | 2 +-
- test/xi2/protocol-xigetselectedevents.c | 2 +-
- test/xi2/protocol-xipassivegrabdevice.c | 2 +-
- test/xi2/protocol-xiquerydevice.c | 2 +-
- test/xi2/protocol-xiquerypointer.c | 2 +-
- test/xi2/protocol-xiqueryversion.c | 2 +-
- test/xi2/protocol-xiselectevents.c | 2 +-
- test/xi2/protocol-xisetclientpointer.c | 2 +-
- test/xi2/protocol-xiwarppointer.c | 2 +-
- 17 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/hw/dmx/config/dmxconfig.c b/hw/dmx/config/dmxconfig.c
-index c1a9e1cf3..85bc0dbe4 100644
---- a/hw/dmx/config/dmxconfig.c
-+++ b/hw/dmx/config/dmxconfig.c
-@@ -72,7 +72,7 @@ typedef struct DMXConfigCmdStruct {
- DMXConfigList *xinputs;
- } DMXConfigCmd, *DMXConfigCmdPtr;
-
--DMXConfigEntryPtr dmxConfigEntry;
-+extern DMXConfigEntryPtr dmxConfigEntry;
- static DMXConfigCmd dmxConfigCmd;
-
- static int dmxDisplaysFromCommandLine;
-diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c
-index 49e4b5459..05d839688 100644
---- a/hw/dmx/config/xdmxconfig.c
-+++ b/hw/dmx/config/xdmxconfig.c
-@@ -65,7 +65,7 @@ extern FILE *yyin;
- #define DMX_CANVAS_WIDTH 400
- #define DMX_CANVAS_HEIGHT 500
-
--DMXConfigEntryPtr dmxConfigEntry;
-+extern DMXConfigEntryPtr dmxConfigEntry;
- static DMXConfigVirtualPtr dmxConfigCurrent, dmxConfigNewVirtual;
- static DMXConfigDisplayPtr dmxConfigCurrentDisplay, dmxConfigNewDisplay;
- static int dmxConfigGrabbed, dmxConfigGrabbedFine;
-diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c
-index 49848bbff..ca9780f99 100644
---- a/hw/dmx/glxProxy/glxext.c
-+++ b/hw/dmx/glxProxy/glxext.c
-@@ -47,8 +47,6 @@
- #include "extinit.h"
- #include "glx_extinit.h"
-
--int noGlxExtension;
--
- /*
- ** Forward declarations.
- */
-diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
-index feb1058b7..5fefa5923 100644
---- a/hw/xwayland/xwayland.c
-+++ b/hw/xwayland/xwayland.c
-@@ -40,7 +40,7 @@
-
- #ifdef XF86VIDMODE
- #include
--_X_EXPORT Bool noXFree86VidModeExtension;
-+extern _X_EXPORT Bool noXFree86VidModeExtension;
- #endif
-
- #ifdef XWL_HAS_GLAMOR
-diff --git a/test/misc.c b/test/misc.c
-index 3c669b677..f1f76cccd 100644
---- a/test/misc.c
-+++ b/test/misc.c
-@@ -33,7 +33,7 @@
-
- #include "tests-common.h"
-
--ScreenInfo screenInfo;
-+extern ScreenInfo screenInfo;
-
- static void
- dix_version_compare(void)
-diff --git a/test/xi1/protocol-xchangedevicecontrol.c b/test/xi1/protocol-xchangedevicecontrol.c
-index 57a15c407..54f1f67cb 100644
---- a/test/xi1/protocol-xchangedevicecontrol.c
-+++ b/test/xi1/protocol-xchangedevicecontrol.c
-@@ -37,7 +37,7 @@
-
- #include "protocol-common.h"
-
--ClientRec client_window;
-+extern ClientRec client_window;
- static ClientRec client_request;
-
- static void
-diff --git a/test/xi2/protocol-common.c b/test/xi2/protocol-common.c
-index 8cd85dd05..05dd3c4e7 100644
---- a/test/xi2/protocol-common.c
-+++ b/test/xi2/protocol-common.c
-@@ -45,6 +45,8 @@ static ClientRec server_client;
-
- void *global_userdata;
-
-+void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
-+
- int enable_GrabButton_wrap = 1;
- int enable_XISetEventMask_wrap = 1;
-
-diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h
-index 8490529ad..742ce348f 100644
---- a/test/xi2/protocol-common.h
-+++ b/test/xi2/protocol-common.h
-@@ -99,7 +99,7 @@ extern void *global_userdata;
- * The reply handler called from WriteToClient. Set this handler if you need
- * to check the reply values.
- */
--void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
-+extern void (*reply_handler) (ClientPtr client, int len, char *data, void *userdata);
-
- /**
- * The default screen used for the windows. Initialized by init_simple().
-diff --git a/test/xi2/protocol-xigetclientpointer.c b/test/xi2/protocol-xigetclientpointer.c
-index 9c38bd720..244e8438f 100644
---- a/test/xi2/protocol-xigetclientpointer.c
-+++ b/test/xi2/protocol-xigetclientpointer.c
-@@ -46,7 +46,7 @@ static struct {
- int win;
- } test_data;
-
--ClientRec client_window;
-+extern ClientRec client_window;
- static ClientRec client_request;
-
- static void
-diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c
-index 9a0fac5d4..b14100224 100644
---- a/test/xi2/protocol-xigetselectedevents.c
-+++ b/test/xi2/protocol-xigetselectedevents.c
-@@ -60,7 +60,7 @@ static struct {
- int mask_len;
- } test_data;
-
--ClientRec client_window;
-+extern ClientRec client_window;
-
- /* AddResource is called from XISetSEventMask, we don't need this */
- Bool
-diff --git a/test/xi2/protocol-xipassivegrabdevice.c b/test/xi2/protocol-xipassivegrabdevice.c
-index c703a1ee8..142bcecb7 100644
---- a/test/xi2/protocol-xipassivegrabdevice.c
-+++ b/test/xi2/protocol-xipassivegrabdevice.c
-@@ -41,7 +41,7 @@
-
- #include "protocol-common.h"
-
--ClientRec client_window;
-+extern ClientRec client_window;
- static ClientRec client_request;
-
- #define N_MODS 7
-diff --git a/test/xi2/protocol-xiquerydevice.c b/test/xi2/protocol-xiquerydevice.c
-index a068038fd..6ee8a80fc 100644
---- a/test/xi2/protocol-xiquerydevice.c
-+++ b/test/xi2/protocol-xiquerydevice.c
-@@ -54,7 +54,7 @@ struct test_data {
- int num_devices_in_reply;
- };
-
--ClientRec client_window;
-+extern ClientRec client_window;
-
- static void reply_XIQueryDevice_data(ClientPtr client, int len, char *data,
- void *closure);
-diff --git a/test/xi2/protocol-xiquerypointer.c b/test/xi2/protocol-xiquerypointer.c
-index ed75d7910..0f5a2b57a 100644
---- a/test/xi2/protocol-xiquerypointer.c
-+++ b/test/xi2/protocol-xiquerypointer.c
-@@ -41,7 +41,7 @@
-
- #include "protocol-common.h"
-
--ClientRec client_window;
-+extern ClientRec client_window;
- static ClientRec client_request;
- static void reply_XIQueryPointer_data(ClientPtr client, int len,
- char *data, void *closure);
-diff --git a/test/xi2/protocol-xiqueryversion.c b/test/xi2/protocol-xiqueryversion.c
-index 3ce758faa..c7ddbfc10 100644
---- a/test/xi2/protocol-xiqueryversion.c
-+++ b/test/xi2/protocol-xiqueryversion.c
-@@ -58,7 +58,7 @@ struct test_data {
- int minor_expected;
- };
-
--ClientRec client_window;
-+extern ClientRec client_window;
-
- static void
- reply_XIQueryVersion(ClientPtr client, int len, char *data, void *closure)
-diff --git a/test/xi2/protocol-xiselectevents.c b/test/xi2/protocol-xiselectevents.c
-index f136c23d0..06050ade7 100644
---- a/test/xi2/protocol-xiselectevents.c
-+++ b/test/xi2/protocol-xiselectevents.c
-@@ -62,7 +62,7 @@
-
- static unsigned char *data[4096 * 20]; /* the request data buffer */
-
--ClientRec client_window;
-+extern ClientRec client_window;
-
- int
- __real_XISetEventMask(DeviceIntPtr dev, WindowPtr win, ClientPtr client,
-diff --git a/test/xi2/protocol-xisetclientpointer.c b/test/xi2/protocol-xisetclientpointer.c
-index 6584bb9cc..ddc9f0000 100644
---- a/test/xi2/protocol-xisetclientpointer.c
-+++ b/test/xi2/protocol-xisetclientpointer.c
-@@ -48,7 +48,7 @@
-
- #include "protocol-common.h"
-
--ClientRec client_window;
-+extern ClientRec client_window;
- static ClientRec client_request;
-
- static void
-diff --git a/test/xi2/protocol-xiwarppointer.c b/test/xi2/protocol-xiwarppointer.c
-index 8484d54e5..e5c2f31ea 100644
---- a/test/xi2/protocol-xiwarppointer.c
-+++ b/test/xi2/protocol-xiwarppointer.c
-@@ -44,7 +44,7 @@
- static int expected_x = SPRITE_X;
- static int expected_y = SPRITE_Y;
-
--ClientRec client_window;
-+extern ClientRec client_window;
-
- /**
- * This function overrides the one in the screen rec.
---
-2.24.1
-
diff --git a/x11-base/xorg-server/xorg-server-1.20.7.ebuild b/x11-base/xorg-server/xorg-server-1.20.7.ebuild
deleted file mode 100644
index ded98b6f8b90..000000000000
--- a/x11-base/xorg-server/xorg-server-1.20.7.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-inherit xorg-3 multilib flag-o-matic
-EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/xserver.git"
-
-DESCRIPTION="X.Org X servers"
-SLOT="0/${PV}"
-if [[ ${PV} != 9999* ]]; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
-
-CDEPEND="libglvnd? (
- media-libs/libglvnd[X]
- !app-eselect/eselect-opengl
- !!x11-drivers/nvidia-drivers[-libglvnd(-)]
- )
- !libglvnd? ( >=app-eselect/eselect-opengl-1.3.0 )
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- >=x11-apps/iceauth-1.0.2
- >=x11-apps/rgb-1.0.3
- >=x11-apps/xauth-1.0.3
- x11-apps/xkbcomp
- >=x11-libs/libdrm-2.4.89
- >=x11-libs/libpciaccess-0.12.901
- >=x11-libs/libXau-1.0.4
- >=x11-libs/libXdmcp-1.0.2
- >=x11-libs/libXfont2-2.0.1
- >=x11-libs/libxkbfile-1.0.4
- >=x11-libs/libxshmfence-1.1
- >=x11-libs/pixman-0.27.2
- >=x11-libs/xtrans-1.3.5
- >=x11-misc/xbitmaps-1.0.1
- >=x11-misc/xkeyboard-config-2.4.1-r3
- dmx? (
- x11-libs/libXt
- >=x11-libs/libdmx-1.0.99.1
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXaw-1.0.4
- >=x11-libs/libXext-1.0.99.4
- >=x11-libs/libXfixes-5.0
- >=x11-libs/libXi-1.2.99.1
- >=x11-libs/libXmu-1.0.3
- x11-libs/libXrender
- >=x11-libs/libXres-1.0.3
- >=x11-libs/libXtst-1.0.99.2
- )
- kdrive? (
- >=x11-libs/libXext-1.0.5
- x11-libs/libXv
- )
- xephyr? (
- x11-libs/libxcb[xkb]
- x11-libs/xcb-util
- x11-libs/xcb-util-image
- x11-libs/xcb-util-keysyms
- x11-libs/xcb-util-renderutil
- x11-libs/xcb-util-wm
- )
- !minimal? (
- >=x11-libs/libX11-1.1.5
- >=x11-libs/libXext-1.0.5
- >=media-libs/mesa-18[X(+),egl,gbm]
- >=media-libs/libepoxy-1.5.4[X,egl(+)]
- )
- udev? ( virtual/libudev:= )
- unwind? ( sys-libs/libunwind )
- wayland? (
- >=dev-libs/wayland-1.3.0
- >=media-libs/libepoxy-1.5.4[egl(+)]
- >=dev-libs/wayland-protocols-1.18
- )
- >=x11-apps/xinit-1.3.3-r1
- systemd? (
- sys-apps/dbus
- sys-apps/systemd
- )
- elogind? (
- sys-apps/dbus
- sys-auth/elogind
- sys-auth/pambase[elogind]
- )
- "
-
-DEPEND="${CDEPEND}
- sys-devel/flex
- >=x11-base/xorg-proto-2018.4
- dmx? (
- doc? (
- || (
- www-client/links
- www-client/lynx
- www-client/w3m
- )
- )
- )"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-xserver )
-"
-
-PDEPEND="
- xorg? ( >=x11-base/xorg-drivers-$(ver_cut 1-2) )"
-
-REQUIRED_USE="!minimal? (
- || ( ${IUSE_SERVERS} )
- )
- elogind? ( udev )
- ?? ( elogind systemd )
- minimal? ( !wayland )
- xephyr? ( kdrive )"
-
-UPSTREAMED_PATCHES=(
- "${FILESDIR}"/${P}-Fix-building-with-fno-common.patch
-)
-
-PATCHES=(
- "${UPSTREAMED_PATCHES[@]}"
- "${FILESDIR}"/${PN}-1.12-unloadsubmodule.patch
- # needed for new eselect-opengl, bug #541232
- "${FILESDIR}"/${PN}-1.18-support-multiple-Files-sections.patch
-)
-
-pkg_setup() {
- if use wayland && use minimal; then
- ewarn "glamor is necessary for acceleration under Xwayland."
- ewarn "Performance may be unacceptable without it."
- ewarn "Build with USE=-minimal to enable glamor."
- fi
-
- # localstatedir is used for the log location; we need to override the default
- # from ebuild.sh
- # sysconfdir is used for the xorg.conf location; same applies
- # NOTE: fop is used for doc generating; and I have no idea if Gentoo
- # package it somewhere
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable ipv6)
- $(use_enable debug)
- $(use_enable dmx)
- $(use_enable kdrive)
- $(use_enable unwind libunwind)
- $(use_enable wayland xwayland)
- $(use_enable !minimal record)
- $(use_enable !minimal xfree86-utils)
- $(use_enable !minimal dri)
- $(use_enable !minimal dri2)
- $(use_enable !minimal dri3)
- $(use_enable !minimal glamor)
- $(use_enable !minimal glx)
- $(use_enable xcsecurity)
- $(use_enable xephyr)
- $(use_enable xnest)
- $(use_enable xorg)
- $(use_enable xvfb)
- $(use_enable udev config-udev)
- $(use_with doc doxygen)
- $(use_with doc xmlto)
- $(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind')
- $(use_with systemd systemd-daemon)
- $(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper')
- $(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid')
- --enable-libdrm
- --sysconfdir="${EPREFIX}"/etc/X11
- --localstatedir="${EPREFIX}"/var
- --with-fontrootdir="${EPREFIX}"/usr/share/fonts
- --with-xkb-output="${EPREFIX}"/var/lib/xkb
- --disable-config-hal
- --disable-linux-acpi
- --without-dtrace
- --without-fop
- --with-os-vendor=Gentoo
- --with-sha1=libcrypto
- )
-}
-
-src_configure() {
- # Needed since commit 2a1a96d956f4 ("glamor: Add a function to get the
- # driver name via EGL_MESA_query_driver") neglected to add autotools
- # support
- append-cflags -DGLAMOR_HAS_EGL_QUERY_DRIVER
-
- xorg-3_src_configure
-}
-
-src_install() {
- xorg-3_src_install
-
- server_based_install
-
- if ! use minimal && use xorg; then
- # Install xorg.conf.example into docs
- dodoc "${S}"/hw/xfree86/xorg.conf.example
- fi
-
- newinitd "${FILESDIR}"/xdm-setup.initd-1 xdm-setup
- newinitd "${FILESDIR}"/xdm.initd-11 xdm
- newconfd "${FILESDIR}"/xdm.confd-4 xdm
-
- # install the @x11-module-rebuild set for Portage
- insinto /usr/share/portage/config/sets
- newins "${FILESDIR}"/xorg-sets.conf xorg.conf
-
- find "${ED}"/var -type d -empty -delete || die
-}
-
-pkg_postinst() {
- if ! use minimal; then
- # sets up libGL and DRI2 symlinks if needed (ie, on a fresh install)
- if ! use libglvnd; then
- eselect opengl set xorg-x11 --use-old
- fi
- fi
-}
-
-pkg_postrm() {
- # Get rid of module dir to ensure opengl-update works properly
- if [[ -z ${REPLACED_BY_VERSION} && -e ${EROOT}/usr/$(get_libdir)/xorg/modules ]]; then
- rm -rf "${EROOT}"/usr/$(get_libdir)/xorg/modules
- fi
-}
-
-server_based_install() {
- if ! use xorg; then
- rm "${ED}"/usr/share/man/man1/Xserver.1x \
- "${ED}"/usr/$(get_libdir)/xserver/SecurityPolicy \
- "${ED}"/usr/$(get_libdir)/pkgconfig/xorg-server.pc \
- "${ED}"/usr/share/man/man1/Xserver.1x
- fi
-}
diff --git a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
index a7268b807957..8aae610d6d0e 100644
--- a/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
+++ b/x11-base/xorg-server/xorg-server-1.20.8-r1.ebuild
@@ -176,13 +176,13 @@ pkg_setup() {
)
if use systemd || use elogind; then
- XORG_CONFIGURE_OPTIONS+=(
+ XORG_CONFIGURE_OPTIONS+=(
"--enable-systemd-logind"
"--disable-install-setuid"
"$(use_enable suid suid-wrapper)"
)
else
- XORG_CONFIGURE_OPTIONS+=(
+ XORG_CONFIGURE_OPTIONS+=(
"--disable-systemd-logind"
"--disable-suid-wrapper"
"$(use_enable suid install-setuid)"
diff --git a/x11-base/xorg-server/xorg-server-9999.ebuild b/x11-base/xorg-server/xorg-server-9999.ebuild
index 252ce275e869..347f504c887c 100644
--- a/x11-base/xorg-server/xorg-server-9999.ebuild
+++ b/x11-base/xorg-server/xorg-server-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} != 9999* ]]; then
fi
IUSE_SERVERS="dmx kdrive wayland xephyr xnest xorg xvfb"
-IUSE="${IUSE_SERVERS} debug elogind ipv6 libressl +libglvnd minimal selinux +suid systemd +udev unwind xcsecurity"
+IUSE="${IUSE_SERVERS} debug +elogind ipv6 libressl +libglvnd minimal selinux suid systemd +udev unwind xcsecurity"
CDEPEND="libglvnd? (
media-libs/libglvnd[X]
@@ -162,10 +162,7 @@ pkg_setup() {
$(use_enable udev config-udev)
$(use_with doc doxygen)
$(use_with doc xmlto)
- $(usex !elogind $(use_enable systemd systemd-logind) '--enable-systemd-logind')
$(use_with systemd systemd-daemon)
- $(usex suid $(use_enable systemd suid-wrapper) '--disable-suid-wrapper')
- $(usex suid $(use_enable !systemd install-setuid) '--disable-install-setuid')
--enable-libdrm
--sysconfdir="${EPREFIX}"/etc/X11
--localstatedir="${EPREFIX}"/var
@@ -177,6 +174,20 @@ pkg_setup() {
--without-fop
--with-sha1=libcrypto
)
+
+ if use systemd || use elogind; then
+ XORG_CONFIGURE_OPTIONS+=(
+ "--enable-systemd-logind"
+ "--disable-install-setuid"
+ "$(use_enable suid suid-wrapper)"
+ )
+ else
+ XORG_CONFIGURE_OPTIONS+=(
+ "--disable-systemd-logind"
+ "--disable-suid-wrapper"
+ "$(use_enable suid install-setuid)"
+ )
+ fi
}
src_install() {
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 3eabd59e45cc..12e1c62c1ecd 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index a3c114bf58af..846b306da5ef 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -1,20 +1,32 @@
DIST NVIDIA-FreeBSD-x86-340.108.tar.gz 60616768 BLAKE2B 816d1b04aabb2853007dde1aaa31a71b9f42690a5a9e0f017668d79b262d7dc495d15729e276c5eb52c751d4e56841dad6d4f6322f07fce247dae2e51403ca2b SHA512 5384186412ba030768797e3c6db6945b35f86f3b58d632d2bd8e5d57f66c45ff4659fbe119f6b153e48053b21fe38f8cedf1009713d94049efce49df9f4a3196
DIST NVIDIA-FreeBSD-x86-390.132.tar.gz 64863740 BLAKE2B aa92a8968c81b64e2df637fd20116320431cc9b2acde4e71c5828c37ac124ed15f89074cf2ae1a3dc039d042f3bd87b27f8fe0a07f073e2cfac02871a79e7e72 SHA512 f11152e14ed3c0806df007559087a74f8841c382b19aceb00880f9d92fd549f256874223c987f6b167215c711bee8962d49f34eb047957885a57c1dd6f1eb27a
+DIST NVIDIA-FreeBSD-x86-390.138.tar.gz 65940848 BLAKE2B ea40a0289012425ee1fa1c74cb5963ac3d7e0992dc55255bb1c20fc8391fce772bf8ab97458047307211865c4e0239acad1196ec88c0259a9e6f70103c2888ec SHA512 32d66398af1edfd4b72a8e1e84ad8a3bcdb18d1c92f5cca5fcaca82d3ed73d40e55b403693a7896735b55a758ddf03437811f6ca7c082c8f85de9112da037713
DIST NVIDIA-FreeBSD-x86_64-340.108.tar.gz 61500286 BLAKE2B 6997395199b5105249c93c8b6b36d1f29cc7663f21d3a2ad4479f7a46822524c8a00bd2b310d7ee830208cf36f911c5f090d899de34801d5d2487a61370bb7da SHA512 70d5ae62fa0a018d4bb84f285c0850a0b9f760212d5468feac312c575cc018fac8c2686e70c3ef594337b6afaada3d4392126b63a517b6032d54d9af8b7533f3
DIST NVIDIA-FreeBSD-x86_64-390.132.tar.gz 64206643 BLAKE2B a95bc5bbb99c89b817692167946deddff1c131c54165e5958e0600432c59fa7ce06cfc6037f4bcf090232c8c25ae36e370e77594ca9a057565adc8e8ac231e72 SHA512 120bf1c5784ef2c74047780383ce5ba8997dc588bab7a5178afeca99fb3829f7b99651238348c9098d023eee1c7f94b5321e6fb4c6e542ece2af705fe33da863
+DIST NVIDIA-FreeBSD-x86_64-390.138.tar.gz 65280213 BLAKE2B 36d5651ceaf90cefcf9e844f8f5810ac42bebca2ca47318b27606c1401d8f343fc7b2619a5405dee9d5d64ec98379b0582f6d5fe5dd4df1269ba48332a6a5ec2 SHA512 fb61e19010826e5c2e403ecc12e19ee28517682599100804d74be92a9e3c6688b51dafa6c6703a5a0d080b0ca16495792fec3badf9cab959321cc401e72520a3
DIST NVIDIA-FreeBSD-x86_64-430.64.tar.gz 62723909 BLAKE2B f3e48bc38a3ec051a75c08845b45c0ba6b80bca31d7efd85f115e6244f9cdff70c68466f9139f69c645207d4cf61103432d75c943d3f3508811d405fba55d1b6 SHA512 498a3007c065d8b17f94024f6ca80ffbe3dca253fdb73c4a08babede821e52f8466523b402af350e961f153c5f732eb04160937fabef1f1be3846a0a4743b310
DIST NVIDIA-FreeBSD-x86_64-435.21.tar.gz 64153630 BLAKE2B fee655cc843c004ac0c1ec85b9417292016a013136e04ad047d2513edbdc7c732561d6bcc4603c658905972dce6618de49d4d6ac583e84fdf212cf45397b48c1 SHA512 2c160c06ca58e3009deb1ba4a4a28d39419e251ced3bfa9a442942f9cce17003d67e8a8bfa23036d3916cc0e66f4bff0fbedaae73db6f10b995235a56d7eba7c
+DIST NVIDIA-FreeBSD-x86_64-440.100.tar.gz 82523267 BLAKE2B 9d8eddcf3a58787a03fab207c197d722ff047f8bc840ea41e8d38815fbfab9e54759b9fbeaa26e3d147f54cb4a510eec421708d3bbb21197922f4dc175ed6df5 SHA512 96f57e1f308f0e5f00ef09a128e91a68ac55033893000e84cf4ff1a910a88798743c911b3effcc26c3f27ae224b733d8c2f87e9ec0596149f65ad7bcd71edbc5
DIST NVIDIA-FreeBSD-x86_64-440.82.tar.gz 82289126 BLAKE2B b8d0a0c235bbc7a1bdeb6cde2a3c72b4b54044e6d22cdf9c275640349051f9c1aa1ce358f47b10b0917d15f359ccec579f43caf8e4ec7a142192061b9e61a7b7 SHA512 88c7ce2f3786a364befd5690e973eb82b12421d0abbd16cf88e0727a137ce0099fe606b577d325185f3ee85bace89da745cae000d8d8665548a283b5bb397095
+DIST NVIDIA-FreeBSD-x86_64-450.51.tar.gz 82784766 BLAKE2B fbd0e71919b16db5957539c5b44a9d974e01d6ab42d5c292aaa4a4e06125d982e37607e28124ae63436eb1d3fcb1b7eb9e1e258b1644310d00d4eebf9fe17ae7 SHA512 0cba373609787e2cb341232a619b3d95bc6c4da8db27633f717ba5654e7717005089d6c2ef4801ff117e6f35f8fa522b600864cf440578cad9397b7f839e16fe
DIST NVIDIA-Linux-armv7l-gnueabihf-390.132.run 29084574 BLAKE2B 4727627de610928f0808c0213c9d359c5566900972ab9fbd3d0c58b36c0a1331799ceea22b4defdcfb81c3132f6124d8a6357de8124921eef608938afdc1380d SHA512 2f78a722ec31ceda86afc1831cb42d0eab8f8698b94c7fbc8569a6d34693b50e74453d5aaf3c0180f1fc2511b8c237ac635aceb24bcbea468f2a092cb44f98ee
+DIST NVIDIA-Linux-armv7l-gnueabihf-390.138.run 28540622 BLAKE2B 342852dd6fa371f86d19547d73edef582fe3f04cf4f6e9ec247767951180671ba46f3ed2ee7bab11b0cf2f8bb1eb846b1d7481d318789c14ce79b54fefe0f830 SHA512 e04b8aca202c1df305f7b67ec372322494fa7b77f27cbf04f240527dcac0ce3ffa5e0e9df36b52045ac13fbc2f84b5033784040884ed19072f66f41385d11b97
DIST NVIDIA-Linux-x86-340.108.run 38902892 BLAKE2B 67e3c336a1f3e953e0fbccf96177bef7e0674c32243856660e9203e7c5fd4ada12a5fa784cebc2150d2133bdb16c19109f9fc5c04d4a138bd519def80c43164c SHA512 cf122c4cf724737cc647bc3d115e853bfe17027d5070c5ed68caf78e0dab718e7345bf824d0e8b33489bf299957dab8ff249cb0f837c3d17b2bb60887afe2818
DIST NVIDIA-Linux-x86-390.132.run 48152101 BLAKE2B f1e76c2796d12476a35701607226483a34ee3b50a0c7dc03e3626e8cab4250b07c0f5aa238a0d5d5b65b79dc504963f2723089108281668b2f4fae03f4bf25c5 SHA512 12b0f80b4bbaebc984c7dbacd365795646c7697606242b05095ac61d69d89ab89fded47d583b4b99793ebcea9e38ec1e7b63dda1c2fdce53ab697cafcdbb3a85
+DIST NVIDIA-Linux-x86-390.138.run 49091672 BLAKE2B 465f025041aafdb03699babdb97380b73c2d7a0568bf2ffe4f3830974457d29eec28dbdf2742bfb1508f00eb6f5d4697f03726561b470b479eb9caa940113bdc SHA512 f6c1e388a6801f0557e34ce9094f99e1a87510c3c620f0ecd9959a6e3bb0a313a8b991c8da319d60531e6a1e2f098d94bc88b12b63c624930295f0e05bb4f9ae
DIST NVIDIA-Linux-x86_64-340.108.run 70165522 BLAKE2B 890d00ff2d1d1a602d7ce65e62d5c3fdb5d9096b61dbfa41e3348260e0c0cc068f92b32ee28a48404376e7a311e12ad1535c68d89e76a956ecabc4e452030f15 SHA512 7941b5496b2c17b06320d676a51ec2866c08a3d3dce9d7cf20464bc35ccb4616c398eb247d1f1e5039386aa73bb610a36937252ce4ad47959437938db8cf3c29
DIST NVIDIA-Linux-x86_64-390.132.run 82900057 BLAKE2B e94cc2493701e34c4dd2f0fc4f89501d6b1d3e44abf80af2eff20c19a22c1160ce322c25d2b5b13e212bf48fb41f94d3c1bb6f9251302e6c8facb687d807a3dc SHA512 bad3453472e8af9ef0681b82db75f9c53816a7d57ff2bf1facd2ea010e757bf7fd4fb907317471934a0cb56510eaf2a90503a3a86ec80b76afdacfa2b9ee6c13
+DIST NVIDIA-Linux-x86_64-390.138.run 83780873 BLAKE2B 5e6a9d77dd2b9de17d923198105a9227ffe2adbc1ed7c9dd5ef3cc810358f71ae47ce9615cbe04f36090f052082a2066772505fd763cbfdbce272f0fb7c25dc7 SHA512 2984fb8f5de598fd3031ebd928942ceb09fd26ae9e61b40b2d348e3174e172a932a1b2a5c2e5534f299b883ade323932be4fdcd26d6f7235a17f6f5a04fa792c
DIST NVIDIA-Linux-x86_64-430.64.run 111331457 BLAKE2B 59d8b739bc472810eb896ef620735b6f21ccfde653e08f248797720d21d75580dcea2448f17a5d1c32be393595d9dfedc48c81e96a8ea422c7f0d9eadf36ae1c SHA512 552bf1e8c4725258c07cbb0e000d0e407fba1b51207903f2b77c0d9fd8b15b629f791b20239f75a1aec85aa03cbcca90a1cb633090919cf0599054231f715250
DIST NVIDIA-Linux-x86_64-435.21.run 144387574 BLAKE2B e9afd6335182a28f5136dbef55195a2f2d8f768376ebc148190a0a82470a34d008ce04170ffc1aab36585605910c1300567a90443b5f58cb46ec3bff6ab9409c SHA512 e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270
+DIST NVIDIA-Linux-x86_64-440.100.run 144653408 BLAKE2B a62e6324f5ac6033c1c4b59486c86a6d4f81b240e5a7ddf9f861f9cfec4daedbe08ef3af6556c1cd4260a5a6fcd1b8bfed886ae617677d87c3a900d0e313267b SHA512 274b3a8e4c801b67a3f71f11da93134bc1a16a48bc85a6bf63265c00bb3fd8caf935dd23c85c40285a162e83c146bd5e34bb0b1d74fc34e7122bfc4c3a8c81e7
DIST NVIDIA-Linux-x86_64-440.82.run 142872609 BLAKE2B 3ebef17002a788f145b61fb8c921f120324eac036ff4c7b972913e30ed830339fc971fd352f5e59ee3bb1b4a7a159dcf3e35d2f33ee37357c3f177aa605307ea SHA512 d86ed2cd715c5a9aebdd11ee562cfa454dbafdb1b468004cbb93d37ee258623f11144cf30b8b14996a4e093cb3119edc36d13152893d735e3536f49c45e2cca3
+DIST NVIDIA-Linux-x86_64-450.51.run 140812490 BLAKE2B 927820fb30e0aac7d022acc82c969503e63be66045d7f10eee0af02b065251ecc4a0c95caef30cf0c2bb2e94de02f59b4469b26eaa801e67d6340184139b82ed SHA512 ddb63f28ddbfa9e5c1bacbd3a5e8d529072c98b09a54c745467ed3ce87e8d5ffef80e41848bb473104147554dbac7dd1d1283821ceef6de05d3a2f8538e2ca33
DIST nvidia-settings-340.108.tar.bz2 1550018 BLAKE2B 1acdfbcb0e7c02af33f5e86b9b140e356057efd9825fbc130971884ae76dd23765c2a0dbd00e1ac47bbff882f6d004e0a10c0195e6c6dce1408c72a00e0e6322 SHA512 d8b6dcbd3803af4da22cfffc039e1c050313f90b7ee86106a784863f7c203de9137ac2fee12aa800498cc56081dbe7e3aaa943c162037477ce97a07a237db41a
DIST nvidia-settings-390.132.tar.bz2 1109373 BLAKE2B cec60b7409f6d352afe3845a2ec65db96183d1fe009340fa3601166718f21b43bb08b63c5eaaaf4c266c7b16e7d374f6ecc00691763d5ae1b6902c8002da5bea SHA512 12553edc1a1ba9c3f578e0e921b25ec7114cbc80a55621cbd612a1bd85c9a518e221b30809058e4df5da6ae75ea7a1cd5c3d9c8f02a0898bc8c08ac9c22ccee3
+DIST nvidia-settings-390.138.tar.bz2 1109175 BLAKE2B 4171c12de0a6fb97b655567d4cc8b4e6fb92e340aae6d65f0a0583db159478fb11f8d5c4cf0fa5ef87098ec1582ccb896fec9f2bf81e4c748b8ff5ee5d73af6b SHA512 6c54ff039840098c23f2091b4c33ab2b712ff90c16829c568bc39c9375cb2f4fb677bb5ab90efcf2034b15a1d93d13f1fbb40dde1d90092073af7d9f3c16de97
DIST nvidia-settings-430.64.tar.bz2 1130931 BLAKE2B 032bbe8cdb7ec3b353e8f8ef33d0e86f4b4f3ef24b38de669e09173519149efe0aa55d5d30d0a0c6d2b8398d5ce38bbe4176df735501725475df4137d533e57d SHA512 fa82699610aa0f4709101e1a4e9e8147b133c85afb20ecb4506bfccf233e4f42dac26e53e2966f2137eb29190b5e4173b267167f5341b516fa1169785946e240
DIST nvidia-settings-435.21.tar.bz2 1131222 BLAKE2B 855f5c7667f4a5ec0f917fbb017d70ec6ee5e768f7087e77e54a66dea852c471bd1810a2163fb33204e5f381998a27a4254e0a5d2c73e2b6b624813ff8294f24 SHA512 8b408cc70118df3a138a99fe7fc14f6370d500b8ae26888b27b07de22f6fc6eebd65bd437d83ee82e18a1d8ee4cceec601c414b1947302ca808fff48165f31bb
+DIST nvidia-settings-440.100.tar.bz2 1129171 BLAKE2B bc8b28ae5743df50177c51a9269ef2b5d11c69dd9f30441179d81e42e7f77c54f327c87a7a5c6a410540bed35eb1ba0cc289b5b98a046deda376dccb29a8206b SHA512 4fe8fbbca1f805652235d898e8451ba89263c81f53e78da471b13ba0668d0d528d04d098b276df6fd2bf7ea7a219a3aa3c4d0bada0a483767c00c0654a5a8818
DIST nvidia-settings-440.82.tar.bz2 1128498 BLAKE2B cc26d83b8ac8d609919db15b462b98976ad063026c39fdf58de36ce26a5b9a9ed5aca8e966f5b61c231ab1f7324a5530fb9779fccb999f39f79252570d62cb79 SHA512 8f9b546f65a1bd17f6336df9e62b0d1403581d3f60276793a536ff39bf67038def1c2738545b24b04eb465860f0cb97b5b9688d7dfb759fda567c05b1cc651ff
+DIST nvidia-settings-450.51.tar.bz2 1056993 BLAKE2B a410593a3217023103c2c783c7a2ca0dee1c6a2af8dec1f0398159aa8192b307e4d27690b9987e879e863e7667b2d046f6128ca1634750863b58d4727b4d2a12 SHA512 6fd455c1910a3ff6105facc06ef65e29f88a0133794f27bf36b999cd513f5639a2c24c53bd5bca308730e6c66f10eda25d191bb815eee53d39b5632a1ce466e1
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
new file mode 100644
index 000000000000..fa5a1fc433dc
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.138.ebuild
@@ -0,0 +1,578 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+ nvidia-driver portability toolchain-funcs unpacker udev
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+ amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+ amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+ arm? ( ${NV_URI}Linux-x86-ARM/${PV}/${ARM_NV_PACKAGE}.run )
+ x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+ x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+ tools? (
+ https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+ )
+"
+
+EMULTILIB_PKG="true"
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+
+IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+ tools? ( X )
+ static-libs? ( tools )
+"
+
+COMMON="
+ driver? ( kernel_linux? ( acct-group/video ) )
+ kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+ tools? (
+ dev-libs/atk
+ dev-libs/glib:2
+ dev-libs/jansson
+ gtk3? (
+ x11-libs/gtk+:3
+ )
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf[X]
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXv
+ x11-libs/libXxf86vm
+ x11-libs/pango[X]
+ )
+ X? (
+ !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
+ libglvnd? (
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ !app-eselect/eselect-opengl
+ )
+ app-misc/pax-utils
+ )
+"
+DEPEND="
+ ${COMMON}
+ kernel_linux? ( virtual/linux-sources )
+ tools? ( sys-apps/dbus )
+"
+RDEPEND="
+ ${COMMON}
+ tools? ( !media-video/nvidia-settings )
+ uvm? ( >=virtual/opencl-3 )
+ wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+ X? (
+ =x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ )
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+NV_KV_MAX_PLUS="5.8"
+CONFIG_CHECK="!DEBUG_MUTEXES ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+
+pkg_pretend() {
+ use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+ nvidia-driver_check
+}
+
+pkg_setup() {
+ use x86 && CONFIG_CHECK+=" ~HIGHMEM"
+ nvidia-driver_check
+
+ # try to turn off distcc and ccache for people that have a problem with it
+ export DISTCC_DISABLE=1
+ export CCACHE_DISABLE=1
+
+ if use driver && use kernel_linux; then
+ MODULE_NAMES="nvidia(video:${S}/kernel)"
+ use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+ use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+ # This needs to run after MODULE_NAMES (so that the eclass checks
+ # whether the kernel supports loadable modules) but before BUILD_PARAMS
+ # is set (so that KV_DIR is populated).
+ linux-mod_pkg_setup
+
+ BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+ SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+ # linux-mod_src_compile calls set_arch_to_kernel, which
+ # sets the ARCH to x86 but NVIDIA's wrapping Makefile
+ # expects x86_64 or i386 and then converts it to x86
+ # later on in the build process
+ BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+ fi
+
+ if use kernel_linux && kernel_is lt 2 6 9; then
+ eerror "You must build this against 2.6.9 or higher kernels."
+ fi
+
+ # set variables to where files are in the package structure
+ if use kernel_FreeBSD; then
+ use x86-fbsd && S="${WORKDIR}/${X86_FBSD_NV_PACKAGE}"
+ use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+ NV_DOC="${S}/doc"
+ NV_OBJ="${S}/obj"
+ NV_SRC="${S}/src"
+ NV_MAN="${S}/x11/man"
+ NV_X11="${S}/obj"
+ NV_SOVER=1
+ elif use kernel_linux; then
+ NV_DOC="${S}"
+ NV_OBJ="${S}"
+ NV_SRC="${S}/kernel"
+ NV_MAN="${S}"
+ NV_X11="${S}"
+ NV_SOVER=${PV}
+ else
+ die "Could not determine proper NVIDIA package"
+ fi
+}
+
+src_prepare() {
+ local man_file
+ for man_file in "${NV_MAN}"/*1.gz; do
+ gunzip $man_file || die
+ done
+
+ if use tools; then
+ cp "${FILESDIR}"/nvidia-settings-fno-common.patch "${WORKDIR}" || die
+ cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+ sed -i \
+ -e "s:@PV@:${PV}:g" \
+ "${WORKDIR}"/nvidia-settings-fno-common.patch \
+ "${WORKDIR}"/nvidia-settings-linker.patch \
+ || die
+ eapply "${WORKDIR}"/nvidia-settings-fno-common.patch
+ eapply "${WORKDIR}"/nvidia-settings-linker.patch
+ fi
+
+ default
+
+ if ! [ -f nvidia_icd.json ]; then
+ cp nvidia_icd.json.template nvidia_icd.json || die
+ sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+ fi
+}
+
+src_compile() {
+ # This is already the default on Linux, as there's no toplevel Makefile, but
+ # on FreeBSD there's one and triggers the kernel module build, as we install
+ # it by itself, pass this.
+
+ cd "${NV_SRC}"
+ if use kernel_FreeBSD; then
+ MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+ elif use driver && use kernel_linux; then
+ BUILD_TARGETS=module linux-mod_src_compile \
+ KERNELRELEASE="${KV_FULL}" \
+ src="${KERNEL_DIR}"
+ fi
+
+ if use tools; then
+ emake -C "${S}"/nvidia-settings-${PV}/src \
+ AR="$(tc-getAR)" \
+ CC="$(tc-getCC)" \
+ DO_STRIP= \
+ LD="$(tc-getCC)" \
+ LIBDIR="$(get_libdir)" \
+ NVLD="$(tc-getLD)" \
+ NV_VERBOSE=1 \
+ RANLIB="$(tc-getRANLIB)" \
+ build-xnvctrl
+
+ emake -C "${S}"/nvidia-settings-${PV}/src \
+ CC="$(tc-getCC)" \
+ DO_STRIP= \
+ GTK3_AVAILABLE=$(usex gtk3 1 0) \
+ LD="$(tc-getCC)" \
+ LIBDIR="$(get_libdir)" \
+ NVLD="$(tc-getLD)" \
+ NVML_ENABLED=0 \
+ NV_USE_BUNDLED_LIBJANSSON=0 \
+ NV_VERBOSE=1
+ fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+ # Full path to library
+ nv_LIB="${1}"
+
+ # SOVER to use
+ nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+ # Where to install
+ nv_DEST="${2}"
+
+ # Get just the library name
+ nv_LIBNAME=$(basename "${nv_LIB}")
+
+ if [[ "${nv_DEST}" ]]; then
+ exeinto ${nv_DEST}
+ action="doexe"
+ else
+ nv_DEST="/usr/$(get_libdir)"
+ action="dolib.so"
+ fi
+
+ # Install the library
+ ${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+ # If the library has a SONAME and SONAME does not match the library name,
+ # then we need to create a symlink
+ if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+ dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
+ fi
+
+ dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
+}
+
+src_install() {
+ if use driver && use kernel_linux; then
+ linux-mod_src_install
+
+ # Add the aliases
+ # This file is tweaked with the appropriate video group in
+ # pkg_preinst, see bug #491414
+ insinto /etc/modprobe.d
+ newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
+ if use uvm; then
+ doins "${FILESDIR}"/nvidia-rmmod.conf
+ udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
+ else
+ sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+ > "${T}"/nvidia-rmmod.conf || die
+ doins "${T}"/nvidia-rmmod.conf
+ fi
+
+ # Ensures that our device nodes are created when not using X
+ exeinto "$(get_udevdir)"
+ newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+ udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+ elif use kernel_FreeBSD; then
+ if use x86-fbsd; then
+ insinto /boot/modules
+ doins "${S}/src/nvidia.kld"
+ fi
+
+ exeinto /boot/modules
+ doexe "${S}/src/nvidia.ko"
+ fi
+
+ # NVIDIA kernel <-> userspace driver config lib
+ donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+ # NVIDIA framebuffer capture library
+ donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+ # NVIDIA video encode/decode <-> CUDA
+ if use kernel_linux; then
+ donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+ donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+ fi
+
+ if use X; then
+ # Xorg DDX driver
+ insinto /usr/$(get_libdir)/xorg/modules/drivers
+ doins ${NV_X11}/nvidia_drv.so
+
+ # Xorg GLX driver
+ if use libglvnd; then
+ local extensions_dir="/usr/$(get_libdir)/extensions/nvidia"
+ else
+ local extensions_dir="/usr/$(get_libdir)/opengl/nvidia/extensions/"
+ fi
+ donvidia ${NV_X11}/libglx.so.${NV_SOVER} \
+ "${extensions_dir}"
+
+ # Xorg nvidia.conf
+ if has_version '>=x11-base/xorg-server-1.16'; then
+ insinto /usr/share/X11/xorg.conf.d
+ newins {,50-}nvidia-drm-outputclass.conf
+ fi
+
+ insinto /usr/share/glvnd/egl_vendor.d
+ doins ${NV_X11}/10_nvidia.json
+ fi
+
+ if use wayland; then
+ insinto /usr/share/egl/egl_external_platform.d
+ doins ${NV_X11}/10_nvidia_wayland.json
+ fi
+
+ # OpenCL ICD for NVIDIA
+ if use kernel_linux; then
+ insinto /etc/OpenCL/vendors
+ doins ${NV_OBJ}/nvidia.icd
+ fi
+
+ # Helper Apps
+ exeinto /opt/bin/
+
+ if use X; then
+ doexe ${NV_OBJ}/nvidia-xconfig
+
+ insinto /etc/vulkan/icd.d
+ doins nvidia_icd.json
+ fi
+
+ if use kernel_linux; then
+ doexe ${NV_OBJ}/nvidia-cuda-mps-control
+ doexe ${NV_OBJ}/nvidia-cuda-mps-server
+ doexe ${NV_OBJ}/nvidia-debugdump
+ doexe ${NV_OBJ}/nvidia-persistenced
+ doexe ${NV_OBJ}/nvidia-smi
+
+ # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+ doexe ${NV_OBJ}/nvidia-modprobe
+ fowners root:video /opt/bin/nvidia-modprobe
+ fperms 4710 /opt/bin/nvidia-modprobe
+ dosym /{opt,usr}/bin/nvidia-modprobe
+
+ doman nvidia-cuda-mps-control.1
+ doman nvidia-modprobe.1
+ doman nvidia-persistenced.1
+ newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+ newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+ newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+ fi
+
+ if use tools; then
+ emake -C "${S}"/nvidia-settings-${PV}/src/ \
+ DESTDIR="${D}" \
+ GTK3_AVAILABLE=$(usex gtk3 1 0) \
+ LIBDIR="${D}/usr/$(get_libdir)" \
+ NV_USE_BUNDLED_LIBJANSSON=0 \
+ NV_VERBOSE=1 \
+ PREFIX=/usr \
+ DO_STRIP= \
+ install
+
+ if use static-libs; then
+ dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+ insinto /usr/include/NVCtrl
+ doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+ fi
+
+ insinto /usr/share/nvidia/
+ doins nvidia-application-profiles-${PV}-key-documentation
+
+ insinto /etc/nvidia
+ newins \
+ nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+ # There is no icon in the FreeBSD tarball.
+ use kernel_FreeBSD || \
+ doicon ${NV_OBJ}/nvidia-settings.png
+
+ domenu "${FILESDIR}"/nvidia-settings.desktop
+
+ exeinto /etc/X11/xinit/xinitrc.d
+ newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+ fi
+
+ dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+ if has_multilib_profile && use multilib; then
+ local OABI=${ABI}
+ for ABI in $(get_install_abis); do
+ src_install-libs
+ done
+ ABI=${OABI}
+ unset OABI
+ else
+ src_install-libs
+ fi
+
+ is_final_abi || die "failed to iterate through all ABIs"
+
+ # Documentation
+ if use kernel_FreeBSD; then
+ dodoc "${NV_DOC}/README"
+ use X && doman "${NV_MAN}"/nvidia-xconfig.1
+ use tools && doman "${NV_MAN}"/nvidia-settings.1
+ else
+ # Docs
+ newdoc "${NV_DOC}/README.txt" README
+ dodoc "${NV_DOC}/NVIDIA_Changelog"
+ doman "${NV_MAN}"/nvidia-smi.1
+ use X && doman "${NV_MAN}"/nvidia-xconfig.1
+ use tools && doman "${NV_MAN}"/nvidia-settings.1
+ doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+ fi
+
+ readme.gentoo_create_doc
+
+ docinto html
+ dodoc -r ${NV_DOC}/html/*
+}
+
+src_install-libs() {
+ local inslibdir=$(get_libdir)
+ if use libglvnd; then
+ local GL_ROOT="/usr/$(get_libdir)"
+ else
+ local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+ fi
+ local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+ local nv_libdir="${NV_OBJ}"
+
+ if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+ nv_libdir="${NV_OBJ}"/32
+ fi
+
+ if use X; then
+ NV_GLX_LIBRARIES=(
+ "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+ "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+ "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+ "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+ "libOpenCL.so.1.0.0 ${CL_ROOT}"
+ "libcuda.so.${NV_SOVER}"
+ "libnvcuvid.so.${NV_SOVER}"
+ "libnvidia-compiler.so.${NV_SOVER}"
+ "libnvidia-eglcore.so.${NV_SOVER}"
+ "libnvidia-encode.so.${NV_SOVER}"
+ "libnvidia-fatbinaryloader.so.${NV_SOVER}"
+ "libnvidia-fbc.so.${NV_SOVER}"
+ "libnvidia-glcore.so.${NV_SOVER}"
+ "libnvidia-glsi.so.${NV_SOVER}"
+ "libnvidia-ifr.so.${NV_SOVER}"
+ "libnvidia-opencl.so.${NV_SOVER}"
+ "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+ "libvdpau_nvidia.so.${NV_SOVER}"
+ )
+ if ! use libglvnd; then
+ NV_GLX_LIBRARIES+=(
+ "libEGL.so.$(usex compat ${NV_SOVER} 1.1.0) ${GL_ROOT}"
+ "libGL.so.$(usex compat ${NV_SOVER} 1.7.0) ${GL_ROOT}"
+ "libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+ "libGLESv2.so.2.1.0 ${GL_ROOT}"
+ "libGLX.so.0 ${GL_ROOT}"
+ "libGLdispatch.so.0 ${GL_ROOT}"
+ "libOpenGL.so.0 ${GL_ROOT}"
+ )
+ fi
+
+ if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+ then
+ NV_GLX_LIBRARIES+=(
+ "libnvidia-egl-wayland.so.1.0.2"
+ )
+ fi
+
+ if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+ then
+ NV_GLX_LIBRARIES+=(
+ "libnvidia-wfb.so.${NV_SOVER}"
+ )
+ fi
+
+ if use kernel_FreeBSD; then
+ NV_GLX_LIBRARIES+=(
+ "libnvidia-tls.so.${NV_SOVER}"
+ )
+ fi
+
+ if use kernel_linux; then
+ NV_GLX_LIBRARIES+=(
+ "libnvidia-ml.so.${NV_SOVER}"
+ "tls/libnvidia-tls.so.${NV_SOVER}"
+ )
+ fi
+
+ for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+ donvidia "${nv_libdir}"/${NV_LIB}
+ done
+ fi
+}
+
+pkg_preinst() {
+ if use driver && use kernel_linux; then
+ linux-mod_pkg_preinst
+
+ local videogroup="$(getent group video | cut -d ':' -f 3)"
+ if [ -z "${videogroup}" ]; then
+ eerror "Failed to determine the video group gid"
+ die "Failed to determine the video group gid"
+ else
+ sed -i \
+ -e "s:PACKAGE:${PF}:g" \
+ -e "s:VIDEOGID:${videogroup}:" \
+ "${D}"/etc/modprobe.d/nvidia.conf || die
+ fi
+ fi
+
+ # Clean the dynamic libGL stuff's home to ensure
+ # we dont have stale libs floating around
+ if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+ rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+ fi
+ # Make sure we nuke the old nvidia-glx's env.d file
+ if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+ rm -f "${ROOT}"/etc/env.d/09nvidia
+ fi
+}
+
+pkg_postinst() {
+ use driver && use kernel_linux && linux-mod_pkg_postinst
+
+ # Switch to the nvidia implementation
+ if ! use libglvnd; then
+ use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+ fi
+
+ readme.gentoo_print_elog
+
+ if ! use X; then
+ elog "You have elected to not install the X.org driver. Along with"
+ elog "this the OpenGL libraries and VDPAU libraries were not"
+ elog "installed. Additionally, once the driver is loaded your card"
+ elog "and fan will run at max speed which may not be desirable."
+ elog "Use the 'nvidia-smi' init script to have your card and fan"
+ elog "speed scale appropriately."
+ elog
+ fi
+ if ! use tools; then
+ elog "USE=tools controls whether the nvidia-settings application"
+ elog "is installed. If you would like to use it, enable that"
+ elog "flag and re-emerge this ebuild. Optionally you can install"
+ elog "media-video/nvidia-settings"
+ elog
+ fi
+}
+
+pkg_prerm() {
+ if ! use libglvnd; then
+ use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+ fi
+}
+
+pkg_postrm() {
+ use driver && use kernel_linux && linux-mod_pkg_postrm
+ if ! use libglvnd; then
+ use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+ fi
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-440.100.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100.ebuild
new file mode 100644
index 000000000000..e6cc318cafaa
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-440.100.ebuild
@@ -0,0 +1,585 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+ nvidia-driver portability systemd toolchain-funcs unpacker udev
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+ amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+ amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+ tools? (
+ https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+ )
+"
+
+EMULTILIB_PKG="true"
+KEYWORDS="-* ~amd64"
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+
+IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+ tools? ( X )
+ static-libs? ( tools )
+"
+
+COMMON="
+ driver? ( kernel_linux? ( acct-group/video ) )
+ kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+ tools? (
+ dev-libs/atk
+ dev-libs/glib:2
+ dev-libs/jansson
+ gtk3? (
+ x11-libs/gtk+:3
+ )
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf[X]
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXv
+ x11-libs/libXxf86vm
+ x11-libs/pango[X]
+ )
+ X? (
+ !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
+ libglvnd? (
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ !app-eselect/eselect-opengl
+ )
+ app-misc/pax-utils
+ )
+"
+DEPEND="
+ ${COMMON}
+ kernel_linux? ( virtual/linux-sources )
+ tools? ( sys-apps/dbus )
+"
+RDEPEND="
+ ${COMMON}
+ tools? ( !media-video/nvidia-settings )
+ uvm? ( >=virtual/opencl-3 )
+ wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+ X? (
+ =x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ )
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+PATCHES=(
+ "${FILESDIR}"/${PN}-440.26-locale.patch
+)
+NV_KV_MAX_PLUS="5.8"
+CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+
+pkg_pretend() {
+ nvidia-driver_check
+}
+
+pkg_setup() {
+ nvidia-driver_check
+
+ # try to turn off distcc and ccache for people that have a problem with it
+ export DISTCC_DISABLE=1
+ export CCACHE_DISABLE=1
+
+ if use driver && use kernel_linux; then
+ MODULE_NAMES="nvidia(video:${S}/kernel)"
+ use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+ use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+ # This needs to run after MODULE_NAMES (so that the eclass checks
+ # whether the kernel supports loadable modules) but before BUILD_PARAMS
+ # is set (so that KV_DIR is populated).
+ linux-mod_pkg_setup
+
+ BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+ SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+ # linux-mod_src_compile calls set_arch_to_kernel, which
+ # sets the ARCH to x86 but NVIDIA's wrapping Makefile
+ # expects x86_64 or i386 and then converts it to x86
+ # later on in the build process
+ BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+ fi
+
+ if use kernel_linux && kernel_is lt 2 6 9; then
+ eerror "You must build this against 2.6.9 or higher kernels."
+ fi
+
+ # set variables to where files are in the package structure
+ if use kernel_FreeBSD; then
+ use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+ NV_DOC="${S}/doc"
+ NV_OBJ="${S}/obj"
+ NV_SRC="${S}/src"
+ NV_MAN="${S}/x11/man"
+ NV_X11="${S}/obj"
+ NV_SOVER=1
+ elif use kernel_linux; then
+ NV_DOC="${S}"
+ NV_OBJ="${S}"
+ NV_SRC="${S}/kernel"
+ NV_MAN="${S}"
+ NV_X11="${S}"
+ NV_SOVER=${PV}
+ else
+ die "Could not determine proper NVIDIA package"
+ fi
+}
+
+src_configure() {
+ tc-export AR CC LD
+
+ default
+}
+
+src_prepare() {
+ local man_file
+ for man_file in "${NV_MAN}"/*1.gz; do
+ gunzip $man_file || die
+ done
+
+ if use tools; then
+ cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+ sed -i \
+ -e "s:@PV@:${PV}:g" \
+ "${WORKDIR}"/nvidia-settings-linker.patch \
+ || die
+ eapply "${WORKDIR}"/nvidia-settings-linker.patch
+ fi
+
+ default
+
+ if ! [ -f nvidia_icd.json ]; then
+ cp nvidia_icd.json.template nvidia_icd.json || die
+ sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+ fi
+}
+
+src_compile() {
+ cd "${NV_SRC}"
+ if use kernel_FreeBSD; then
+ MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+ elif use driver && use kernel_linux; then
+ BUILD_TARGETS=module linux-mod_src_compile \
+ KERNELRELEASE="${KV_FULL}" \
+ src="${KERNEL_DIR}"
+ fi
+
+ if use tools; then
+ emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
+ DO_STRIP= \
+ LIBDIR="$(get_libdir)" \
+ NVLD="$(tc-getLD)" \
+ NV_VERBOSE=1 \
+ OUTPUTDIR=. \
+ RANLIB="$(tc-getRANLIB)"
+
+ emake -C "${S}"/nvidia-settings-${PV}/src \
+ DO_STRIP= \
+ GTK3_AVAILABLE=$(usex gtk3 1 0) \
+ LIBDIR="$(get_libdir)" \
+ NVLD="$(tc-getLD)" \
+ NVML_ENABLED=0 \
+ NV_USE_BUNDLED_LIBJANSSON=0 \
+ NV_VERBOSE=1 \
+ OUTPUTDIR=.
+ fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+ # Full path to library
+ nv_LIB="${1}"
+
+ # SOVER to use
+ nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+ # Where to install
+ nv_DEST="${2}"
+
+ # Get just the library name
+ nv_LIBNAME=$(basename "${nv_LIB}")
+
+ if [[ "${nv_DEST}" ]]; then
+ exeinto ${nv_DEST}
+ action="doexe"
+ else
+ nv_DEST="/usr/$(get_libdir)"
+ action="dolib.so"
+ fi
+
+ # Install the library
+ ${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+ # If the library has a SONAME and SONAME does not match the library name,
+ # then we need to create a symlink
+ if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+ dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
+ fi
+
+ dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
+}
+
+src_install() {
+ if use driver && use kernel_linux; then
+ linux-mod_src_install
+
+ # Add the aliases
+ # This file is tweaked with the appropriate video group in
+ # pkg_preinst, see bug #491414
+ insinto /etc/modprobe.d
+ newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
+
+ if use uvm; then
+ doins "${FILESDIR}"/nvidia-rmmod.conf
+ udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
+ else
+ sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+ > "${T}"/nvidia-rmmod.conf || die
+ doins "${T}"/nvidia-rmmod.conf
+ fi
+
+ # Ensures that our device nodes are created when not using X
+ exeinto "$(get_udevdir)"
+ newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+ udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+ elif use kernel_FreeBSD; then
+ if use x86-fbsd; then
+ insinto /boot/modules
+ doins "${S}/src/nvidia.kld"
+ fi
+
+ exeinto /boot/modules
+ doexe "${S}/src/nvidia.ko"
+ fi
+
+ # NVIDIA kernel <-> userspace driver config lib
+ donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+ # NVIDIA framebuffer capture library
+ donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+ # NVIDIA video encode/decode <-> CUDA
+ if use kernel_linux; then
+ donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+ donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+ fi
+
+ if use X; then
+ # Xorg DDX driver
+ insinto /usr/$(get_libdir)/xorg/modules/drivers
+ doins ${NV_X11}/nvidia_drv.so
+
+ # Xorg GLX driver
+ donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
+ /usr/$(get_libdir)/xorg/modules/extensions
+
+ # Xorg nvidia.conf
+ if has_version '>=x11-base/xorg-server-1.16'; then
+ insinto /usr/share/X11/xorg.conf.d
+ newins {,50-}nvidia-drm-outputclass.conf
+ fi
+
+ insinto /usr/share/glvnd/egl_vendor.d
+ doins ${NV_X11}/10_nvidia.json
+ fi
+
+ if use wayland; then
+ insinto /usr/share/egl/egl_external_platform.d
+ doins ${NV_X11}/10_nvidia_wayland.json
+ fi
+
+ # OpenCL ICD for NVIDIA
+ if use kernel_linux; then
+ insinto /etc/OpenCL/vendors
+ doins ${NV_OBJ}/nvidia.icd
+ fi
+
+ # Helper Apps
+ exeinto /opt/bin/
+
+ if use X; then
+ doexe ${NV_OBJ}/nvidia-xconfig
+
+ insinto /etc/vulkan/icd.d
+ doins nvidia_icd.json
+
+ insinto /etc/vulkan/implicit_layer.d
+ doins nvidia_layers.json
+ fi
+
+ if use kernel_linux; then
+ doexe ${NV_OBJ}/nvidia-cuda-mps-control
+ doexe ${NV_OBJ}/nvidia-cuda-mps-server
+ doexe ${NV_OBJ}/nvidia-debugdump
+ doexe ${NV_OBJ}/nvidia-persistenced
+ doexe ${NV_OBJ}/nvidia-smi
+
+ # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+ doexe ${NV_OBJ}/nvidia-modprobe
+ fowners root:video /opt/bin/nvidia-modprobe
+ fperms 4710 /opt/bin/nvidia-modprobe
+ dosym /{opt,usr}/bin/nvidia-modprobe
+
+ doman nvidia-cuda-mps-control.1
+ doman nvidia-modprobe.1
+ doman nvidia-persistenced.1
+ newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+ newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+ newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+ fi
+
+ if use tools; then
+ emake -C "${S}"/nvidia-settings-${PV}/src/ \
+ DESTDIR="${D}" \
+ DO_STRIP= \
+ GTK3_AVAILABLE=$(usex gtk3 1 0) \
+ LIBDIR="${D}/usr/$(get_libdir)" \
+ NV_USE_BUNDLED_LIBJANSSON=0 \
+ NV_VERBOSE=1 \
+ OUTPUTDIR=. \
+ PREFIX=/usr \
+ install
+
+ if use static-libs; then
+ dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+ insinto /usr/include/NVCtrl
+ doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+ fi
+
+ insinto /usr/share/nvidia/
+ doins nvidia-application-profiles-${PV}-key-documentation
+
+ insinto /etc/nvidia
+ newins \
+ nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+ # There is no icon in the FreeBSD tarball.
+ use kernel_FreeBSD || \
+ doicon ${NV_OBJ}/nvidia-settings.png
+
+ domenu "${FILESDIR}"/nvidia-settings.desktop
+
+ exeinto /etc/X11/xinit/xinitrc.d
+ newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+ fi
+
+ dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+ systemd_dounit *.service
+ dobin nvidia-sleep.sh
+ exeinto $(systemd_get_utildir)/system-sleep
+ doexe nvidia
+
+ if has_multilib_profile && use multilib; then
+ local OABI=${ABI}
+ for ABI in $(get_install_abis); do
+ src_install-libs
+ done
+ ABI=${OABI}
+ unset OABI
+ else
+ src_install-libs
+ fi
+
+ is_final_abi || die "failed to iterate through all ABIs"
+
+ # Documentation
+ if use kernel_FreeBSD; then
+ dodoc "${NV_DOC}/README"
+ use X && doman "${NV_MAN}"/nvidia-xconfig.1
+ use tools && doman "${NV_MAN}"/nvidia-settings.1
+ else
+ # Docs
+ newdoc "${NV_DOC}/README.txt" README
+ dodoc "${NV_DOC}/NVIDIA_Changelog"
+ doman "${NV_MAN}"/nvidia-smi.1
+ use X && doman "${NV_MAN}"/nvidia-xconfig.1
+ use tools && doman "${NV_MAN}"/nvidia-settings.1
+ doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+ fi
+
+ readme.gentoo_create_doc
+
+ docinto html
+ dodoc -r ${NV_DOC}/html/*
+}
+
+src_install-libs() {
+ local inslibdir=$(get_libdir)
+ if use libglvnd; then
+ local GL_ROOT="/usr/$(get_libdir)"
+ else
+ local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+ fi
+ local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+ local nv_libdir="${NV_OBJ}"
+
+ if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+ nv_libdir="${NV_OBJ}"/32
+ fi
+
+ if use X; then
+ NV_GLX_LIBRARIES=(
+ "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+ "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+ "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+ "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+ "libOpenCL.so.1.0.0 ${CL_ROOT}"
+ "libcuda.so.${NV_SOVER}"
+ "libnvcuvid.so.${NV_SOVER}"
+ "libnvidia-compiler.so.${NV_SOVER}"
+ "libnvidia-eglcore.so.${NV_SOVER}"
+ "libnvidia-encode.so.${NV_SOVER}"
+ "libnvidia-fatbinaryloader.so.${NV_SOVER}"
+ "libnvidia-fbc.so.${NV_SOVER}"
+ "libnvidia-glcore.so.${NV_SOVER}"
+ "libnvidia-glsi.so.${NV_SOVER}"
+ "libnvidia-glvkspirv.so.${NV_SOVER}"
+ "libnvidia-ifr.so.${NV_SOVER}"
+ "libnvidia-opencl.so.${NV_SOVER}"
+ "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+ "libvdpau_nvidia.so.${NV_SOVER}"
+ )
+ if ! use libglvnd; then
+ NV_GLX_LIBRARIES+=(
+ "libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}"
+ "libGL.so.1.7.0 ${GL_ROOT}"
+ "libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+ "libGLESv2.so.2.1.0 ${GL_ROOT}"
+ "libGLX.so.0 ${GL_ROOT}"
+ "libGLdispatch.so.0 ${GL_ROOT}"
+ "libOpenGL.so.0 ${GL_ROOT}"
+ )
+ fi
+
+ if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+ then
+ NV_GLX_LIBRARIES+=(
+ "libnvidia-egl-wayland.so.1.1.4"
+ )
+ fi
+
+ if use kernel_FreeBSD; then
+ NV_GLX_LIBRARIES+=(
+ "libnvidia-tls.so.${NV_SOVER}"
+ )
+ fi
+
+ if use kernel_linux; then
+ NV_GLX_LIBRARIES+=(
+ "libnvidia-ml.so.${NV_SOVER}"
+ "libnvidia-tls.so.${NV_SOVER}"
+ )
+ fi
+
+ if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+ then
+ NV_GLX_LIBRARIES+=(
+ "libnvidia-cbl.so.${NV_SOVER}"
+ "libnvidia-rtcore.so.${NV_SOVER}"
+ "libnvoptix.so.${NV_SOVER}"
+ )
+ fi
+
+ for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+ donvidia "${nv_libdir}"/${NV_LIB}
+ done
+ fi
+}
+
+pkg_preinst() {
+ if use driver && use kernel_linux; then
+ linux-mod_pkg_preinst
+
+ local videogroup="$(getent group video | cut -d ':' -f 3)"
+ if [ -z "${videogroup}" ]; then
+ eerror "Failed to determine the video group gid"
+ die "Failed to determine the video group gid"
+ else
+ sed -i \
+ -e "s:PACKAGE:${PF}:g" \
+ -e "s:VIDEOGID:${videogroup}:" \
+ "${D}"/etc/modprobe.d/nvidia.conf || die
+ fi
+ fi
+
+ # Clean the dynamic libGL stuff's home to ensure
+ # we dont have stale libs floating around
+ if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+ rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+ fi
+ # Make sure we nuke the old nvidia-glx's env.d file
+ if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+ rm -f "${ROOT}"/etc/env.d/09nvidia
+ fi
+}
+
+pkg_postinst() {
+ use driver && use kernel_linux && linux-mod_pkg_postinst
+
+ # Switch to the nvidia implementation
+ if ! use libglvnd; then
+ use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+ fi
+
+ readme.gentoo_print_elog
+
+ if ! use X; then
+ elog "You have elected to not install the X.org driver. Along with"
+ elog "this the OpenGL libraries and VDPAU libraries were not"
+ elog "installed. Additionally, once the driver is loaded your card"
+ elog "and fan will run at max speed which may not be desirable."
+ elog "Use the 'nvidia-smi' init script to have your card and fan"
+ elog "speed scale appropriately."
+ elog
+ fi
+ if ! use tools; then
+ elog "USE=tools controls whether the nvidia-settings application"
+ elog "is installed. If you would like to use it, enable that"
+ elog "flag and re-emerge this ebuild. Optionally you can install"
+ elog "media-video/nvidia-settings"
+ elog
+ fi
+
+ elog "To enable nvidia sleep services under systemd, run these commands:"
+ elog " systemctl enable nvidia-suspend.service"
+ elog " systemctl enable nvidia-hibernate.service"
+ elog " systemctl enable nvidia-resume.service"
+ elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
+ elog "suitable path in case the default of /tmp does not work for you"
+ elog "For more information see:"
+ elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
+}
+
+pkg_prerm() {
+ if ! use libglvnd; then
+ use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+ fi
+}
+
+pkg_postrm() {
+ use driver && use kernel_linux && linux-mod_pkg_postrm
+ if ! use libglvnd; then
+ use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+ fi
+}
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.51.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51.ebuild
new file mode 100644
index 000000000000..260e860f54a8
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.51.ebuild
@@ -0,0 +1,586 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop flag-o-matic linux-info linux-mod multilib-minimal \
+ nvidia-driver portability systemd toolchain-funcs unpacker udev
+
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+ARM_NV_PACKAGE="NVIDIA-Linux-armv7l-gnueabihf-${PV}"
+
+NV_URI="https://us.download.nvidia.com/XFree86/"
+SRC_URI="
+ amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+ amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+ tools? (
+ https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-${PV}.tar.bz2
+ )
+"
+
+EMULTILIB_PKG="true"
+KEYWORDS="-* ~amd64"
+LICENSE="GPL-2 NVIDIA-r2"
+SLOT="0/${PV%.*}"
+
+IUSE="compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X"
+REQUIRED_USE="
+ tools? ( X )
+ static-libs? ( tools )
+"
+
+COMMON="
+ driver? ( kernel_linux? ( acct-group/video ) )
+ kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+ tools? (
+ dev-libs/atk
+ dev-libs/glib:2
+ dev-libs/jansson
+ gtk3? (
+ x11-libs/gtk+:3
+ )
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf[X]
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/libXv
+ x11-libs/libXxf86vm
+ x11-libs/pango[X]
+ )
+ X? (
+ !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 )
+ libglvnd? (
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ !app-eselect/eselect-opengl
+ )
+ app-misc/pax-utils
+ )
+"
+DEPEND="
+ ${COMMON}
+ kernel_linux? ( virtual/linux-sources )
+ tools? ( sys-apps/dbus )
+"
+RDEPEND="
+ ${COMMON}
+ tools? ( !media-video/nvidia-settings )
+ uvm? ( >=virtual/opencl-3 )
+ wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+ X? (
+ =x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libvdpau-1.0[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ )
+ kernel_linux? ( net-libs/libtirpc )
+"
+QA_PREBUILT="opt/* usr/lib*"
+S=${WORKDIR}/
+PATCHES=(
+ "${FILESDIR}"/${PN}-440.26-locale.patch
+)
+NV_KV_MAX_PLUS="5.8"
+CONFIG_CHECK="!DEBUG_MUTEXES ~!I2C_NVIDIA_GPU ~!LOCKDEP ~MTRR ~SYSVIPC ~ZONE_DMA"
+
+pkg_pretend() {
+ nvidia-driver_check
+}
+
+pkg_setup() {
+ nvidia-driver_check
+
+ # try to turn off distcc and ccache for people that have a problem with it
+ export DISTCC_DISABLE=1
+ export CCACHE_DISABLE=1
+
+ if use driver && use kernel_linux; then
+ MODULE_NAMES="nvidia(video:${S}/kernel)"
+ use uvm && MODULE_NAMES+=" nvidia-uvm(video:${S}/kernel)"
+ use kms && MODULE_NAMES+=" nvidia-modeset(video:${S}/kernel) nvidia-drm(video:${S}/kernel)"
+
+ # This needs to run after MODULE_NAMES (so that the eclass checks
+ # whether the kernel supports loadable modules) but before BUILD_PARAMS
+ # is set (so that KV_DIR is populated).
+ linux-mod_pkg_setup
+
+ BUILD_PARAMS="IGNORE_CC_MISMATCH=yes V=1 SYSSRC=${KV_DIR} \
+ SYSOUT=${KV_OUT_DIR} CC=$(tc-getBUILD_CC) NV_VERBOSE=1"
+
+ # linux-mod_src_compile calls set_arch_to_kernel, which
+ # sets the ARCH to x86 but NVIDIA's wrapping Makefile
+ # expects x86_64 or i386 and then converts it to x86
+ # later on in the build process
+ BUILD_FIXES="ARCH=$(uname -m | sed -e 's/i.86/i386/')"
+ fi
+
+ if use kernel_linux && kernel_is lt 2 6 9; then
+ eerror "You must build this against 2.6.9 or higher kernels."
+ fi
+
+ # set variables to where files are in the package structure
+ if use kernel_FreeBSD; then
+ use amd64-fbsd && S="${WORKDIR}/${AMD64_FBSD_NV_PACKAGE}"
+ NV_DOC="${S}/doc"
+ NV_OBJ="${S}/obj"
+ NV_SRC="${S}/src"
+ NV_MAN="${S}/x11/man"
+ NV_X11="${S}/obj"
+ NV_SOVER=1
+ elif use kernel_linux; then
+ NV_DOC="${S}"
+ NV_OBJ="${S}"
+ NV_SRC="${S}/kernel"
+ NV_MAN="${S}"
+ NV_X11="${S}"
+ NV_SOVER=${PV}
+ else
+ die "Could not determine proper NVIDIA package"
+ fi
+}
+
+src_configure() {
+ tc-export AR CC LD
+
+ default
+}
+
+src_prepare() {
+ local man_file
+ for man_file in "${NV_MAN}"/*1.gz; do
+ gunzip $man_file || die
+ done
+
+ if use tools; then
+ cp "${FILESDIR}"/nvidia-settings-linker.patch "${WORKDIR}" || die
+ sed -i \
+ -e "s:@PV@:${PV}:g" \
+ "${WORKDIR}"/nvidia-settings-linker.patch \
+ || die
+ eapply "${WORKDIR}"/nvidia-settings-linker.patch
+ fi
+
+ default
+
+ if ! [ -f nvidia_icd.json ]; then
+ cp nvidia_icd.json.template nvidia_icd.json || die
+ sed -i -e 's:__NV_VK_ICD__:libGLX_nvidia.so.0:g' nvidia_icd.json || die
+ fi
+}
+
+src_compile() {
+ cd "${NV_SRC}"
+ if use kernel_FreeBSD; then
+ MAKE="$(get_bmake)" CFLAGS="-Wno-sign-compare" emake CC="$(tc-getCC)" \
+ LD="$(tc-getLD)" LDFLAGS="$(raw-ldflags)" || die
+ elif use driver && use kernel_linux; then
+ BUILD_TARGETS=module linux-mod_src_compile \
+ KERNELRELEASE="${KV_FULL}" \
+ src="${KERNEL_DIR}"
+ fi
+
+ if use tools; then
+ emake -C "${S}"/nvidia-settings-${PV}/src/libXNVCtrl \
+ DO_STRIP= \
+ LIBDIR="$(get_libdir)" \
+ NVLD="$(tc-getLD)" \
+ NV_VERBOSE=1 \
+ OUTPUTDIR=. \
+ RANLIB="$(tc-getRANLIB)"
+
+ emake -C "${S}"/nvidia-settings-${PV}/src \
+ DO_STRIP= \
+ GTK3_AVAILABLE=$(usex gtk3 1 0) \
+ LIBDIR="$(get_libdir)" \
+ NVLD="$(tc-getLD)" \
+ NVML_ENABLED=0 \
+ NV_USE_BUNDLED_LIBJANSSON=0 \
+ NV_VERBOSE=1 \
+ OUTPUTDIR=.
+ fi
+}
+
+# Install nvidia library:
+# the first parameter is the library to install
+# the second parameter is the provided soversion
+# the third parameter is the target directory if it is not /usr/lib
+donvidia() {
+ # Full path to library
+ nv_LIB="${1}"
+
+ # SOVER to use
+ nv_SOVER="$(scanelf -qF'%S#F' ${nv_LIB})"
+
+ # Where to install
+ nv_DEST="${2}"
+
+ # Get just the library name
+ nv_LIBNAME=$(basename "${nv_LIB}")
+
+ if [[ "${nv_DEST}" ]]; then
+ exeinto ${nv_DEST}
+ action="doexe"
+ else
+ nv_DEST="/usr/$(get_libdir)"
+ action="dolib.so"
+ fi
+
+ # Install the library
+ ${action} ${nv_LIB} || die "failed to install ${nv_LIBNAME}"
+
+ # If the library has a SONAME and SONAME does not match the library name,
+ # then we need to create a symlink
+ if [[ ${nv_SOVER} ]] && ! [[ "${nv_SOVER}" = "${nv_LIBNAME}" ]]; then
+ dosym ${nv_LIBNAME} ${nv_DEST}/${nv_SOVER}
+ fi
+
+ dosym ${nv_LIBNAME} ${nv_DEST}/${nv_LIBNAME/.so*/.so}
+}
+
+src_install() {
+ if use driver && use kernel_linux; then
+ linux-mod_src_install
+
+ # Add the aliases
+ # This file is tweaked with the appropriate video group in
+ # pkg_preinst, see bug #491414
+ insinto /etc/modprobe.d
+ newins "${FILESDIR}"/nvidia-430.conf nvidia.conf
+
+ if use uvm; then
+ doins "${FILESDIR}"/nvidia-rmmod.conf
+ udev_newrules "${FILESDIR}"/nvidia-uvm.udev-rule 99-nvidia-uvm.rules
+ else
+ sed -e 's|nvidia-uvm ||g' "${FILESDIR}"/nvidia-rmmod.conf \
+ > "${T}"/nvidia-rmmod.conf || die
+ doins "${T}"/nvidia-rmmod.conf
+ fi
+
+ # Ensures that our device nodes are created when not using X
+ exeinto "$(get_udevdir)"
+ newexe "${FILESDIR}"/nvidia-udev.sh-r1 nvidia-udev.sh
+ udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+ elif use kernel_FreeBSD; then
+ if use x86-fbsd; then
+ insinto /boot/modules
+ doins "${S}/src/nvidia.kld"
+ fi
+
+ exeinto /boot/modules
+ doexe "${S}/src/nvidia.ko"
+ fi
+
+ # NVIDIA kernel <-> userspace driver config lib
+ donvidia ${NV_OBJ}/libnvidia-cfg.so.${NV_SOVER}
+
+ # NVIDIA framebuffer capture library
+ donvidia ${NV_OBJ}/libnvidia-fbc.so.${NV_SOVER}
+
+ # NVIDIA video encode/decode <-> CUDA
+ if use kernel_linux; then
+ donvidia ${NV_OBJ}/libnvcuvid.so.${NV_SOVER}
+ donvidia ${NV_OBJ}/libnvidia-encode.so.${NV_SOVER}
+ fi
+
+ if use X; then
+ # Xorg DDX driver
+ insinto /usr/$(get_libdir)/xorg/modules/drivers
+ doins ${NV_X11}/nvidia_drv.so
+
+ # Xorg GLX driver
+ donvidia ${NV_X11}/libglxserver_nvidia.so.${NV_SOVER} \
+ /usr/$(get_libdir)/xorg/modules/extensions
+
+ # Xorg nvidia.conf
+ if has_version '>=x11-base/xorg-server-1.16'; then
+ insinto /usr/share/X11/xorg.conf.d
+ newins {,50-}nvidia-drm-outputclass.conf
+ fi
+
+ insinto /usr/share/glvnd/egl_vendor.d
+ doins ${NV_X11}/10_nvidia.json
+ fi
+
+ if use wayland; then
+ insinto /usr/share/egl/egl_external_platform.d
+ doins ${NV_X11}/10_nvidia_wayland.json
+ fi
+
+ # OpenCL ICD for NVIDIA
+ if use kernel_linux; then
+ insinto /etc/OpenCL/vendors
+ doins ${NV_OBJ}/nvidia.icd
+ fi
+
+ # Helper Apps
+ exeinto /opt/bin/
+
+ if use X; then
+ doexe ${NV_OBJ}/nvidia-xconfig
+
+ insinto /etc/vulkan/icd.d
+ doins nvidia_icd.json
+
+ insinto /etc/vulkan/implicit_layer.d
+ doins nvidia_layers.json
+ fi
+
+ if use kernel_linux; then
+ doexe ${NV_OBJ}/nvidia-cuda-mps-control
+ doexe ${NV_OBJ}/nvidia-cuda-mps-server
+ doexe ${NV_OBJ}/nvidia-debugdump
+ doexe ${NV_OBJ}/nvidia-persistenced
+ doexe ${NV_OBJ}/nvidia-smi
+
+ # install nvidia-modprobe setuid and symlink in /usr/bin (bug #505092)
+ doexe ${NV_OBJ}/nvidia-modprobe
+ fowners root:video /opt/bin/nvidia-modprobe
+ fperms 4710 /opt/bin/nvidia-modprobe
+ dosym /{opt,usr}/bin/nvidia-modprobe
+
+ doman nvidia-cuda-mps-control.1
+ doman nvidia-modprobe.1
+ doman nvidia-persistenced.1
+ newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+ newconfd "${FILESDIR}/nvidia-persistenced.conf" nvidia-persistenced
+ newinitd "${FILESDIR}/nvidia-persistenced.init" nvidia-persistenced
+ fi
+
+ if use tools; then
+ emake -C "${S}"/nvidia-settings-${PV}/src/ \
+ DESTDIR="${D}" \
+ DO_STRIP= \
+ GTK3_AVAILABLE=$(usex gtk3 1 0) \
+ LIBDIR="${D}/usr/$(get_libdir)" \
+ NV_USE_BUNDLED_LIBJANSSON=0 \
+ NV_VERBOSE=1 \
+ OUTPUTDIR=. \
+ PREFIX=/usr \
+ install
+
+ if use static-libs; then
+ dolib.a "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/libXNVCtrl.a
+
+ insinto /usr/include/NVCtrl
+ doins "${S}"/nvidia-settings-${PV}/src/libXNVCtrl/*.h
+ fi
+
+ insinto /usr/share/nvidia/
+ doins nvidia-application-profiles-${PV}-key-documentation
+
+ insinto /etc/nvidia
+ newins \
+ nvidia-application-profiles-${PV}-rc nvidia-application-profiles-rc
+
+ # There is no icon in the FreeBSD tarball.
+ use kernel_FreeBSD || \
+ doicon ${NV_OBJ}/nvidia-settings.png
+
+ domenu "${FILESDIR}"/nvidia-settings.desktop
+
+ exeinto /etc/X11/xinit/xinitrc.d
+ newexe "${FILESDIR}"/95-nvidia-settings-r1 95-nvidia-settings
+ fi
+
+ dobin ${NV_OBJ}/nvidia-bug-report.sh
+
+ systemd_dounit *.service
+ dobin nvidia-sleep.sh
+ exeinto $(systemd_get_utildir)/system-sleep
+ doexe nvidia
+
+ if has_multilib_profile && use multilib; then
+ local OABI=${ABI}
+ for ABI in $(get_install_abis); do
+ src_install-libs
+ done
+ ABI=${OABI}
+ unset OABI
+ else
+ src_install-libs
+ fi
+
+ is_final_abi || die "failed to iterate through all ABIs"
+
+ # Documentation
+ if use kernel_FreeBSD; then
+ dodoc "${NV_DOC}/README"
+ use X && doman "${NV_MAN}"/nvidia-xconfig.1
+ use tools && doman "${NV_MAN}"/nvidia-settings.1
+ else
+ # Docs
+ newdoc "${NV_DOC}/README.txt" README
+ dodoc "${NV_DOC}/NVIDIA_Changelog"
+ doman "${NV_MAN}"/nvidia-smi.1
+ use X && doman "${NV_MAN}"/nvidia-xconfig.1
+ use tools && doman "${NV_MAN}"/nvidia-settings.1
+ doman "${NV_MAN}"/nvidia-cuda-mps-control.1
+ fi
+
+ readme.gentoo_create_doc
+
+ docinto html
+ dodoc -r ${NV_DOC}/html/*
+}
+
+src_install-libs() {
+ local inslibdir=$(get_libdir)
+ if use libglvnd; then
+ local GL_ROOT="/usr/$(get_libdir)"
+ else
+ local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+ fi
+ local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+ local nv_libdir="${NV_OBJ}"
+
+ if use kernel_linux && has_multilib_profile && [[ ${ABI} == "x86" ]]; then
+ nv_libdir="${NV_OBJ}"/32
+ fi
+
+ if use X; then
+ NV_GLX_LIBRARIES=(
+ "libEGL_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+ "libGLESv1_CM_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+ "libGLESv2_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+ "libGLX_nvidia.so.${NV_SOVER} ${GL_ROOT}"
+ "libOpenCL.so.1.0.0 ${CL_ROOT}"
+ "libcuda.so.${NV_SOVER}"
+ "libnvcuvid.so.${NV_SOVER}"
+ "libnvidia-compiler.so.${NV_SOVER}"
+ "libnvidia-eglcore.so.${NV_SOVER}"
+ "libnvidia-encode.so.${NV_SOVER}"
+ "libnvidia-fbc.so.${NV_SOVER}"
+ "libnvidia-glcore.so.${NV_SOVER}"
+ "libnvidia-glsi.so.${NV_SOVER}"
+ "libnvidia-glvkspirv.so.${NV_SOVER}"
+ "libnvidia-ifr.so.${NV_SOVER}"
+ "libnvidia-opencl.so.${NV_SOVER}"
+ "libnvidia-ptxjitcompiler.so.${NV_SOVER}"
+ "libvdpau_nvidia.so.${NV_SOVER}"
+ )
+ if ! use libglvnd; then
+ NV_GLX_LIBRARIES+=(
+ "libEGL.so.$( [[ ${ABI} == "amd64" ]] && usex compat ${NV_SOVER} 1.1.0 || echo 1.1.0) ${GL_ROOT}"
+ "libGL.so.1.7.0 ${GL_ROOT}"
+ "libGLESv1_CM.so.1.2.0 ${GL_ROOT}"
+ "libGLESv2.so.2.1.0 ${GL_ROOT}"
+ "libGLX.so.0 ${GL_ROOT}"
+ "libGLdispatch.so.0 ${GL_ROOT}"
+ "libOpenGL.so.0 ${GL_ROOT}"
+ )
+ fi
+
+ if use wayland && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+ then
+ NV_GLX_LIBRARIES+=(
+ "libnvidia-egl-wayland.so.1.1.4"
+ )
+ fi
+
+ if use kernel_FreeBSD; then
+ NV_GLX_LIBRARIES+=(
+ "libnvidia-tls.so.${NV_SOVER}"
+ )
+ fi
+
+ if use kernel_linux; then
+ NV_GLX_LIBRARIES+=(
+ "libnvidia-ml.so.${NV_SOVER}"
+ "libnvidia-tls.so.${NV_SOVER}"
+ )
+ fi
+
+ if use kernel_linux && has_multilib_profile && [[ ${ABI} == "amd64" ]];
+ then
+ NV_GLX_LIBRARIES+=(
+ "libnvidia-cbl.so.${NV_SOVER}"
+ "libnvidia-ngx.so.${NV_SOVER}"
+ "libnvidia-rtcore.so.${NV_SOVER}"
+ "libnvoptix.so.${NV_SOVER}"
+ )
+ fi
+
+ for NV_LIB in "${NV_GLX_LIBRARIES[@]}"; do
+ donvidia "${nv_libdir}"/${NV_LIB}
+ done
+ fi
+}
+
+pkg_preinst() {
+ if use driver && use kernel_linux; then
+ linux-mod_pkg_preinst
+
+ local videogroup="$(getent group video | cut -d ':' -f 3)"
+ if [ -z "${videogroup}" ]; then
+ eerror "Failed to determine the video group gid"
+ die "Failed to determine the video group gid"
+ else
+ sed -i \
+ -e "s:PACKAGE:${PF}:g" \
+ -e "s:VIDEOGID:${videogroup}:" \
+ "${D}"/etc/modprobe.d/nvidia.conf || die
+ fi
+ fi
+
+ # Clean the dynamic libGL stuff's home to ensure
+ # we dont have stale libs floating around
+ if [ -d "${ROOT}"/usr/lib/opengl/nvidia ]; then
+ rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+ fi
+ # Make sure we nuke the old nvidia-glx's env.d file
+ if [ -e "${ROOT}"/etc/env.d/09nvidia ]; then
+ rm -f "${ROOT}"/etc/env.d/09nvidia
+ fi
+}
+
+pkg_postinst() {
+ use driver && use kernel_linux && linux-mod_pkg_postinst
+
+ # Switch to the nvidia implementation
+ if ! use libglvnd; then
+ use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+ fi
+
+ readme.gentoo_print_elog
+
+ if ! use X; then
+ elog "You have elected to not install the X.org driver. Along with"
+ elog "this the OpenGL libraries and VDPAU libraries were not"
+ elog "installed. Additionally, once the driver is loaded your card"
+ elog "and fan will run at max speed which may not be desirable."
+ elog "Use the 'nvidia-smi' init script to have your card and fan"
+ elog "speed scale appropriately."
+ elog
+ fi
+ if ! use tools; then
+ elog "USE=tools controls whether the nvidia-settings application"
+ elog "is installed. If you would like to use it, enable that"
+ elog "flag and re-emerge this ebuild. Optionally you can install"
+ elog "media-video/nvidia-settings"
+ elog
+ fi
+
+ elog "To enable nvidia sleep services under systemd, run these commands:"
+ elog " systemctl enable nvidia-suspend.service"
+ elog " systemctl enable nvidia-hibernate.service"
+ elog " systemctl enable nvidia-resume.service"
+ elog "Set the NVreg_TemporaryFilePath kernel module parameter to a"
+ elog "suitable path in case the default of /tmp does not work for you"
+ elog "For more information see:"
+ elog "${ROOT}/usr/share/doc/${PF}/html/powermanagement.html"
+}
+
+pkg_prerm() {
+ if ! use libglvnd; then
+ use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+ fi
+}
+
+pkg_postrm() {
+ use driver && use kernel_linux && linux-mod_pkg_postrm
+ if ! use libglvnd; then
+ use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+ fi
+}
diff --git a/x11-drivers/xf86-input-libinput/Manifest b/x11-drivers/xf86-input-libinput/Manifest
index dce167bc7c95..2c4387db222a 100644
--- a/x11-drivers/xf86-input-libinput/Manifest
+++ b/x11-drivers/xf86-input-libinput/Manifest
@@ -1,2 +1 @@
-DIST xf86-input-libinput-0.29.0.tar.bz2 377412 BLAKE2B 5d1c3f301decb89eafee7229efcddb670def39be4469e6d9913c2e2b73046a28c71daf61c6990899fe3124f4a68aa7151a83530956a3ce8b2f29407e40adfd5a SHA512 f19ef2e9e0c1336d8e0b17853e1fe0c66ecf50e7b10b10b6c5cbafc99323694597821e15e8e358419ef3c68d1009967fd2ec3760800c85adbb71ac3ecc99954b
DIST xf86-input-libinput-0.30.0.tar.bz2 378270 BLAKE2B 1c24f2e73897372ae00f4b660a4fb580f854d2ae177a638c9ed74626cafa81be48617767901e9efdd12a37ae4cdf34617e9136e118128503ecd6b75fc48be0c0 SHA512 823f80f7d53866f2f06c1fb7b2d64111bf807329acaaeda4a09413cdb5f3e3235c1dd4f99183aae75adf5a01503e40e35b4449b31f977afd842b4723b062c380
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.29.0.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.29.0.ebuild
deleted file mode 100644
index 54b208bc1858..000000000000
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.29.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info xorg-3
-
-DESCRIPTION="X.org input driver based on libinput"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/libinput-1.7.0:0="
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
-
-DOCS=( "README.md" )
-
-pkg_pretend() {
- CONFIG_CHECK="~TIMERFD"
- check_extra_config
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 33ad4f64f928..dc5b1e3c8f8f 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
index 3ce2039a5fe9..e31b21c01b32 100644
--- a/x11-libs/pixman/Manifest
+++ b/x11-libs/pixman/Manifest
@@ -1,2 +1 @@
-DIST pixman-0.38.4.tar.gz 897926 BLAKE2B 2c27069411e709391a1cc0af6c37acf2f06b4fad433a3197e24a0636d5d828ddbf1ca339d91470514d75e126452bc2300d14a2b862671bd11a8b85057d86b31c SHA512 b66dc23c0bc7327cb90085cbc14ccf96ad58001a927f23af24e0258ca13f32d4255535862f1efcf00e9e723410aa9f51edf26fb01c8cde49379d1225acf7b5af
DIST pixman-0.40.0.tar.xz 634752 BLAKE2B 29b71f5eb6c3df0318c7a6153c6abbce29748b0b578697916414a869a029635fe5e0bab06b8f701a764c95e475c115ed12eb4f93c751d234b5868f4c4196d7db SHA512 8a60edb113d68791b41bd90b761ff7b3934260cb3dada3234c9351416f61394e4157353bc4d61b8f6c2c619de470f6feefffb4935bfcf79d291ece6285de7270
diff --git a/x11-libs/pixman/pixman-0.38.4.ebuild b/x11-libs/pixman/pixman-0.38.4.ebuild
deleted file mode 100644
index e327798978a0..000000000000
--- a/x11-libs/pixman/pixman-0.38.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_REPO_URI="https://gitlab.freedesktop.org/pixman/pixman.git"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson multilib-minimal multiprocessing toolchain-funcs
-
-DESCRIPTION="Low-level pixel manipulation routines"
-HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
-if [[ ${PV} = 9999* ]]; then
- SRC_URI=""
-else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
- SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.gz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="altivec cpu_flags_arm_iwmmxt cpu_flags_arm_iwmmxt2 loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
-
-src_unpack() {
- default
- [[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
-multilib_src_configure() {
- local openmp=disabled
- tc-has-openmp && openmp=enabled
-
- local emesonargs=(
- $(meson_feature cpu_flags_arm_iwmmxt iwmmxt)
- $(meson_use cpu_flags_arm_iwmmxt2 iwmmxt2)
- $(meson_feature cpu_flags_x86_mmxext mmx)
- $(meson_feature cpu_flags_x86_sse2 sse2)
- $(meson_feature cpu_flags_x86_ssse3 ssse3)
- $(meson_feature altivec vmx)
- $(meson_feature neon neon)
- $(meson_feature loongson2f loongson-mmi)
- -Dgtk=disabled
- -Dlibpng=disabled
- -Dopenmp=$openmp # only used in unit tests
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_test() {
- export OMP_NUM_THREADS=$(makeopts_jobs)
- meson test -v -C "${BUILD_DIR}" -t 100
-}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 5279e9164d93..d192117ac0e3 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/lightdm-gtk-greeter/Manifest b/x11-misc/lightdm-gtk-greeter/Manifest
index 4e2dd430a776..2ac027d641ab 100644
--- a/x11-misc/lightdm-gtk-greeter/Manifest
+++ b/x11-misc/lightdm-gtk-greeter/Manifest
@@ -1,3 +1,3 @@
DIST lightdm-gentoo-patch-2.tar.gz 695543 BLAKE2B 62e21dd413b90053160f774663d89c81b3c9d8c4a040023f4ce50bf775a2f036e0be6ed16ae767eb5b04586a27fdbf41eb56f777340b2d56633738a126c3d575 SHA512 8d9bfdee71ab1871de33e134b11bba409cc493876e5ae9534956100ff6af6c8748b29de9082ecf8b771ccac4c8c2024e15e93332165171dfe93eb99c9a834274
-DIST lightdm-gtk-greeter-2.0.6.tar.gz 575668 BLAKE2B 6aa5e4db80f411b5a5e34c5ce332906a11d7755af71f617dfedf1658c60777ba732e0ed81a9d5e01c93e2a7fd74364dffc8043d640cd6ab91f3e604769863c01 SHA512 778215351a9140f164c67c75d69efc55b1edf97a493f42a14e2a40e322f738cba99534274d00198291454466fbf407efdc927479c4821d04e12d742feb31cc3a
DIST lightdm-gtk-greeter-2.0.7.tar.gz 580726 BLAKE2B 1cb2a92a9bda0e28b718cf033ad01e8a8a955600715c61bc5f27723a1b5f4a4624caa61bbe9bdca13064919116f5f08959db2622a5d6b097998d762ffd9cfc28 SHA512 62ad8d522db9aeea7bd0acc76c989a1d39e8be619847b294048530b2dfbebf5a5982f84daf1a5f49b0a8a7abe3234e1571fb5d4f5429b02867801015f30e4944
+DIST lightdm-gtk-greeter-2.0.8.tar.gz 583426 BLAKE2B ae06ebbc07efe5c0131c07b293671f24683699eb84f12222de8165428e935b98bbf9d1e107eaeca8f10e725a6a11c97d4f4c3d415ada0b0876b0b0a99f21d1ee SHA512 59cad69fd7f17b6a416944804be80f306ed51ee0c55826975c8564f432e8098043b677f6452e9afa290c6ef37ebdc632cd8b79e7a0a712a3407ddbf9f200b0db
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
similarity index 79%
rename from x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
rename to x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
index 47ae408d0447..8824bc8e07e2 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.6.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.8.ebuild
@@ -1,31 +1,32 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-inherit autotools gnome2-utils eapi7-ver
+inherit autotools xdg-utils
DESCRIPTION="LightDM GTK+ Greeter"
-HOMEPAGE="https://launchpad.net/lightdm-gtk-greeter"
-SRC_URI="https://launchpad.net/lightdm-gtk-greeter/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz
+HOMEPAGE="https://github.com/Xubuntu/lightdm-gtk-greeter"
+SRC_URI="https://github.com/Xubuntu/${PN}/releases/download/${P}/${P}.tar.gz
branding? ( https://dev.gentoo.org/~polynomial-c/dist/lightdm-gentoo-patch-2.tar.gz )"
LICENSE="GPL-3 LGPL-3
branding? ( CC-BY-3.0 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE="appindicator branding"
-COMMON_DEPEND="appindicator? ( dev-libs/libindicator:3 )
+DEPEND="appindicator? ( dev-libs/libindicator:3 )
x11-libs/gtk+:3
>=x11-misc/lightdm-1.2.2"
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
dev-util/intltool
+ dev-util/xfce4-dev-tools
sys-devel/gettext
- xfce-base/exo"
+"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
x11-themes/gnome-themes-standard
>=x11-themes/adwaita-icon-theme-3.14.1"
@@ -74,9 +75,9 @@ src_install() {
}
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index c45c52771cba..d4211aad442b 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -1,3 +1,2 @@
DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c4cd946aaaac0b5fa13aa27805fa17297112bfaabb1c5a34bd83d2ecdef2033b622dbd5e63914baacb8f6edf488a7396d26d9 SHA512 5c49239935b93d86cce68b577b43d1a56d8749ab5747029bfcfa67339697134be24ef29ba6c3d133b8c03e867864637c8eb61491a4b7f6bb1e56386ed66cb9be
-DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071
DIST lightdm-1.30.0.tar.xz 509220 BLAKE2B 5b6fcc6b955d7a7eb3a810a7e28707a812810d7f2568d6985a4411b1bf6f06b35ff721bd8a9388a85a4e4a64a39f5e30e86a9dbaa6d344e898ae49e9f39785ff SHA512 bca25a0aa73caf7d51e5882889a1707d2527470a170658c1be98ecfb96c8f85fd616494fc5bed658e744f91b9f8b0a98d2a0cf42f9c030242ae470c8a27145ce
diff --git a/x11-misc/lightdm/lightdm-1.28.0.ebuild b/x11-misc/lightdm/lightdm-1.28.0.ebuild
deleted file mode 100644
index 07340664b29f..000000000000
--- a/x11-misc/lightdm/lightdm-1.28.0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils
-
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="https://github.com/CanonicalLtd/lightdm"
-SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz
- mirror://gentoo/introspection-20110205.m4.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-IUSE="audit +gnome +gtk +introspection qt5 vala"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.44.0:2
- dev-libs/libxml2
- sys-libs/pam
- x11-libs/libX11
- >=x11-libs/libxklavier-5
- audit? ( sys-process/audit )
- gnome? ( sys-apps/accountsservice )
- introspection? ( >=dev-libs/gobject-introspection-1 )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- )
-"
-RDEPEND="${COMMON_DEPEND}
- >=sys-auth/pambase-20101024-r2"
-DEPEND="${COMMON_DEPEND}
- dev-util/gtk-doc-am
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig
- gnome? ( gnome-base/gnome-common )
- vala? ( $(vala_depend) )
-"
-PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
-
-DOCS=( NEWS )
-RESTRICT="test"
-REQUIRED_USE="vala? ( introspection )"
-
-src_prepare() {
- xdg_environment_reset
-
- sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
- sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
-
- einfo "Fixing the session-wrapper variable in lightdm.conf"
- sed -i -e \
- "/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
- data/lightdm.conf || die "Failed to fix lightdm.conf"
-
- # use correct version of qmake. bug #566950
- sed \
- -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
- -i configure.ac || die
-
- default
-
- # Remove bogus Makefile statement. This needs to go upstream
- sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
- if has_version dev-libs/gobject-introspection; then
- eautoreconf
- else
- AT_M4DIR=${WORKDIR} eautoreconf
- fi
-
- use vala && vala_src_prepare
-}
-
-src_configure() {
- # Set default values if global vars unset
- local _greeter _session _user
- _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
- _session=${LIGHTDM_SESSION:=gnome}
- _user=${LIGHTDM_USER:=root}
- # Let user know how lightdm is configured
- einfo "Gentoo configuration"
- einfo "Default greeter: ${_greeter}"
- einfo "Default session: ${_session}"
- einfo "Greeter user: ${_user}"
-
- use qt5 && append-cxxflags -std=c++11
-
- # also disable tests because libsystem.c does not build. Tests are
- # restricted so it does not matter anyway.
- local myeconfargs=(
- --localstatedir=/var
- --disable-static
- --disable-tests
- $(use_enable audit libaudit)
- $(use_enable introspection)
- --disable-liblightdm-qt
- $(use_enable qt5 liblightdm-qt5)
- $(use_enable vala)
- --with-user-session=${_session}
- --with-greeter-session=${_greeter}
- --with-greeter-user=${_user}
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- # Delete apparmor profiles because they only work with Ubuntu's
- # apparmor package. Bug #494426
- if [[ -d ${ED%/}/etc/apparmor.d ]]; then
- rm -r "${ED%/}/etc/apparmor.d" || die \
- "Failed to remove apparmor profiles"
- fi
-
- insinto /etc/${PN}
- doins data/{${PN},keys}.conf
- doins "${FILESDIR}"/Xsession
- fperms +x /etc/${PN}/Xsession
- # /var/lib/lightdm-data could be useful. Bug #522228
- dodir /var/lib/lightdm-data
-
- find "${ED}" \( -name '*.a' -o -name "*.la" \) -delete || die
- rm -rf "${ED%/}"/etc/init
-
- # Remove existing pam file. We will build a new one. Bug #524792
- rm -rf "${ED%/}"/etc/pam.d/${PN}{,-greeter}
- pamd_mimic system-local-login ${PN} auth account password session #372229
- pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
- dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
-
- readme.gentoo_create_doc
-
- systemd_dounit "${FILESDIR}/${PN}.service"
- keepdir /var/lib/${PN}-data
-}
-
-pkg_postinst() {
- systemd_reenable "${PN}.service"
-}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index c301462dae40..cf83163ae2fc 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/gentoo-xcursors/Manifest b/x11-themes/gentoo-xcursors/Manifest
index 374a6f11b48c..b0342143879d 100644
--- a/x11-themes/gentoo-xcursors/Manifest
+++ b/x11-themes/gentoo-xcursors/Manifest
@@ -1,2 +1 @@
-DIST gentoo-cursors-tad-0.3.1.tar.bz2 1196991 BLAKE2B 126c90b93e5071dbd68c4bb1188cc43b67c74fae5cc0d4b01c08ed0057f8421462116bbafc3862878d43d48591a507ae95d274b8ec0ea11954c3605753160a6b SHA512 b153d5860ec2167a57eba1073ec226fa7d49d256ba20ca4c18b2bac779e6944971253db51a4585d72439c4e5433464991f2e025aaa89b4a3793e15b8bd74cad9
DIST gentoo-xcursors-0.3.2.tar.gz 2035025 BLAKE2B 520dbb3f8fe77bc915bb60c81f2abf4fce1ee6fb349ae5064ff5d2fa10c0af7ba2dd00dc0b36f992c96169214c4ebd28dceb1ba069e638e5efab7088ba804fe6 SHA512 5ccbd2e8be7bda4da0578c5a08d967dded9dc4c9163eb96f629c0eaa548f2e46e85f7301de44d5be707cc63a988b925c9c222863da5bac9095dc5170ca9c4aea
diff --git a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.1.ebuild b/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.1.ebuild
deleted file mode 100644
index 1e4e92fead81..000000000000
--- a/x11-themes/gentoo-xcursors/gentoo-xcursors-0.3.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2005-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A high quality set of animated mouse cursors"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${PN/xcursors/cursors}-tad-${PV}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/cursors"
-
-src_install() {
- insinto /usr/share/cursors/xorg-x11
- doins -r *
-}
-
-pkg_postinst() {
- einfo "To use this set of cursors, edit or create the file ~/.Xdefaults"
- einfo "and add the following line (for example):"
- einfo "Xcursor.theme: gentoo"
- einfo ""
- einfo "You can change the size by adding a line like:"
- einfo "Xcursor.size: 48"
- einfo ""
- einfo "Also, to globally use this set of mouse cursors edit the file:"
- einfo " /usr/local/share/cursors/xorg-x11/default/index.theme"
- einfo "and change the line:"
- einfo " Inherits=[current setting]"
- einfo "to (for example)"
- einfo " Inherits=gentoo"
- einfo ""
- einfo "Note this will be overruled by a user's ~/.Xdefaults file."
- einfo ""
- ewarn "If you experience flickering, try setting the following line in"
- ewarn ""
- ewarn "the Device section of your xorg.conf file:"
- ewarn " Option \"HWCursor\" \"false\""
- einfo ""
- einfo "The three sets installed are gentoo, gentoo-silver and gentoo-blue."
-}