diff --git a/Manifest.files.gz b/Manifest.files.gz
index 062753095346..89af43dd466c 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 4558c1edebe0..b9a8e6d50f23 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/augeas/Manifest b/app-admin/augeas/Manifest
index 3cb9ad7a3fe3..dc5285fc8e54 100644
--- a/app-admin/augeas/Manifest
+++ b/app-admin/augeas/Manifest
@@ -1,2 +1,3 @@
DIST augeas-1.10.1.tar.gz 2289207 BLAKE2B 6e3cf750c4d3faf7dc472ec7bfe3c46f5babca294d2bd5169cca419c2f93e21bdd656bbc44b30ab66c00fb793df1aa045f60c1260963901773c334b9019eff0b SHA512 382e8ef6a5bd3d12d7d2e0d2987f39c04ff7df3f07cd68aa732bf266b89d5d59a85be63921a7ff70f9219dbc6bb8547f80528242caa9417e08a008d1721cb1d2
DIST augeas-1.11.0.tar.gz 2393675 BLAKE2B e7c50715fee892b47843f9be4ec9e88937c0ce10544b3e212d9c32a6151bbc36550d711ebec9db2a691e91cc6a2cd93696d807b440ab57a678ca6680426a4b03 SHA512 1b67bb7fcd9b560d3fe4a5c753d5e778db73caaab6e50367afd123eec107b65b73096913ac7d5170e85f5b63ff3522b2a6932b130e207ab22560dfc6e267b8a1
+DIST augeas-1.12.0.tar.gz 2429279 BLAKE2B cd90203fec1a81b114d95bb50e168b852923136f34c83974d3427cbedd4eb0d335d3952057507b38ded5c7011be2b56725565ea106cb32a0ca43b7c81250b29e SHA512 4f61d4abbf338e915dfae212560d39792674bc757f05f500afa80c6170abc214ffb99cab2cf5bbd1c2338d11a6909e5fc3ff7112a2246fca69f7b39ac283da40
diff --git a/app-admin/augeas/augeas-1.12.0.ebuild b/app-admin/augeas/augeas-1.12.0.ebuild
new file mode 100644
index 000000000000..b40ea12be532
--- /dev/null
+++ b/app-admin/augeas/augeas-1.12.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A library for changing configuration files"
+HOMEPAGE="http://augeas.net/"
+SRC_URI="http://download.augeas.net/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs test"
+
+RDEPEND="
+ dev-libs/libxml2
+ sys-libs/readline:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=app-doc/NaturalDocs-1.40
+ test? ( dev-lang/ruby )"
+
+PATCHES=(
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # selinux needs to implemented
+ econf \
+ --without-selinux \
+ $(use_enable static-libs static)
+}
+
+src_compile() {
+ addpredict /usr/share/NaturalDocs/Config/Languages.txt
+ addpredict /usr/share/NaturalDocs/Config/Topics.txt
+ default
+}
+
+src_install() {
+ default
+ use static-libs || find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 85d5941fa910..78ee30b53cf9 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1,2 +1 @@
-DIST entr-4.0.tar.gz 24758 BLAKE2B 6d57cb93d55bb362b8e771745c9333a5a5eaa156f36a7c9e7318d94f0056fc98b2071bcea7fd33b68ac1dc1d5332fc849e0ea89bc2582196acd51e1490fce96e SHA512 d803c27441448374a866636e0e592a8395488e162e2e8c031aafec3457d10041dc52e10d06cc1e209cd86f69ca021171ef105056206b9afe603a89958eef2707
-DIST entr-4.1.tar.gz 25265 BLAKE2B e90a50e7ac0917441db872fcc3b228bd2d16a77a7178810d004cb23510644843dbee1b9b47aedbe7b6b696501f994201f4eab404c6de950013c0b81b042382b0 SHA512 0a80aa9caa97f2603e43957b716bf5b5746cea8bfb2f2cc884aab8c97a34341d6223035fbb5d4bf86234ea1c9314c077cec9d59ba442a2730fcbd7151425a459
+DIST entr-4.2.tar.gz 25599 BLAKE2B e1bf4e54df7077219d213d994a26ea10517dc88db92194d68acaa3a01e80ea3e81334b0b24bb39654da1d220b7175ab4088f583c46f9007e93e5da7fc7fe1c04 SHA512 67fc4eea415a5deffb59b493f17aa577746217c2cda6b5645d22541be6cc10ed949bb6e37bd46bc6e5cfd951f7ff611eb927be6f5d43db381437d3d1eb6f7968
diff --git a/app-admin/entr/entr-4.1.ebuild b/app-admin/entr/entr-4.1.ebuild
deleted file mode 100644
index 829cf311603a..000000000000
--- a/app-admin/entr/entr-4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs vcs-snapshot
-
-DESCRIPTION="Run arbitrary commands when files change"
-HOMEPAGE="http://entrproject.org"
-SRC_URI="http://entrproject.org/code/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-IUSE="test"
-
-src_configure() {
- sh configure || die
- sed -i -e 's#\(^PREFIX \).*#\1\?= /usr#' Makefile.bsd || die
-}
-
-src_compile() {
- export CC=$(tc-getCC)
- default
-}
-
-src_test() {
- export CC=$(tc-getCC)
- default
-}
diff --git a/app-admin/entr/entr-4.0.ebuild b/app-admin/entr/entr-4.2.ebuild
similarity index 93%
rename from app-admin/entr/entr-4.0.ebuild
rename to app-admin/entr/entr-4.2.ebuild
index 829cf311603a..be89649663dc 100644
--- a/app-admin/entr/entr-4.0.ebuild
+++ b/app-admin/entr/entr-4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/app-admin/fleet/Manifest b/app-admin/fleet/Manifest
deleted file mode 100644
index 9baad0eeb4ad..000000000000
--- a/app-admin/fleet/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST fleet-1.0.0.tar.gz 4865693 BLAKE2B 33991c25ff2f7bf4307a9a3d2a6274b08a358d8041f641eb33b68946a2e682caae8b20643ac2735f447398cd305b9e3a77370ad6fc2ebe26b12c2f290a03e1e6 SHA512 77f38b605e37499e31effd82c3c4f0efd6adda73e9ded86db68efcd19a34bdc44b9f6f88b7fc94f7ea4f55b2027a1270d3c87897bf12b121614384a91bd9a3cf
diff --git a/app-admin/fleet/files/fleet.service b/app-admin/fleet/files/fleet.service
deleted file mode 100644
index 1f44fe9df62c..000000000000
--- a/app-admin/fleet/files/fleet.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=fleet daemon
-Wants=etcd.service
-
-Wants=fleet.socket
-After=fleet.socket
-
-[Service]
-ExecStart=/usr/bin/fleetd
-Restart=always
-RestartSec=10s
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/fleet/files/fleet.socket b/app-admin/fleet/files/fleet.socket
deleted file mode 100644
index 4fc446e8fe37..000000000000
--- a/app-admin/fleet/files/fleet.socket
+++ /dev/null
@@ -1,2 +0,0 @@
-[Socket]
-ListenStream=/var/run/fleet.sock
diff --git a/app-admin/fleet/fleet-1.0.0.ebuild b/app-admin/fleet/fleet-1.0.0.ebuild
deleted file mode 100644
index 9f43c632f33a..000000000000
--- a/app-admin/fleet/fleet-1.0.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGO_PN="github.com/coreos/fleet"
-
-inherit systemd vcs-snapshot
-
-DESCRIPTION="A Distributed init System"
-HOMEPAGE="https://github.com/coreos/fleet"
-SRC_URI="https://github.com/coreos/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc examples test"
-
-DEPEND="
- >=dev-lang/go-1.5:=
- test? ( dev-go/go-tools )
-"
-RDEPEND=""
-
-src_compile() {
- ./build || die 'Build failed'
-}
-
-src_test() {
- ./test || die 'Tests failed'
-}
-
-src_install() {
- dobin "${S}"/bin/fleetd
- dobin "${S}"/bin/fleetctl
-
- systemd_dounit "${FILESDIR}"/fleet.service
- systemd_dounit "${FILESDIR}"/fleet.socket
-
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
-
- insinto /etc/${PN}
- newins "${PN}".conf.sample "${PN}".conf
-}
diff --git a/app-admin/fleet/fleet-9999.ebuild b/app-admin/fleet/fleet-9999.ebuild
deleted file mode 100644
index 07945ac690b8..000000000000
--- a/app-admin/fleet/fleet-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit git-r3 systemd
-
-EGIT_REPO_URI="https://github.com/coreos/fleet.git"
-
-DESCRIPTION="A Distributed init System"
-HOMEPAGE="https://github.com/coreos/fleet"
-SRC_URI=""
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc examples test"
-
-DEPEND=">=dev-lang/go-1.3:=
- test? ( dev-go/go-tools )"
-RDEPEND=""
-
-src_compile() {
- ./build || die 'Build failed'
-}
-
-src_test() {
- ./test || die 'Tests failed'
-}
-
-src_install() {
- dobin "${S}"/bin/fleetd
- dobin "${S}"/bin/fleetctl
-
- systemd_dounit "${FILESDIR}"/fleet.service
- systemd_dounit "${FILESDIR}"/fleet.socket
-
- dodoc README.md
- use doc && dodoc -r Documentation
- use examples && dodoc -r examples
-
- insinto /etc/${PN}
- newins "${PN}".conf.sample "${PN}".conf
-}
diff --git a/app-admin/fleet/metadata.xml b/app-admin/fleet/metadata.xml
deleted file mode 100644
index f9232c26e479..000000000000
--- a/app-admin/fleet/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
- coreos/fleet
-
-
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 10f66a07e88d..842df903db90 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -1,5 +1,6 @@
DIST mongo-tools-3.4.16.tar.gz 4697191 BLAKE2B 2e9a0e7dc8016d3e7d7c7f8d0cf80a97d3d199603c0b8b791df5a0d79d418ffaa232eee694047a7ca11fa7623023b4123becd437cfe3dec11e26cd525720bcad SHA512 b40c6dee75d860de1da73faf79f5f68c098ce7c80681486c66fff04a937474dcede91c7be907a8e36033b3898f7499e8f53271944c0df3360756c27361efb6f5
-DIST mongo-tools-3.6.10.tar.gz 4731097 BLAKE2B dffd18bbcb5a1d869cd3a00b40be7c83d12c2146944044c8d873eba409b9fcb0ce0595c01cd61a6b0405dfce685b8dde7c285380150906d4d38d3de9b42962bf SHA512 3e9808c6b275566215f8c2ce033a6259d373e8b63db5e981cc28235d757404b3209a64dd9aa8a98d9290c5c1da137a1bf9bc48629b278cb27ca28be681e86efc
DIST mongo-tools-3.6.11.tar.gz 4731680 BLAKE2B 88558a26d2552848121d984e4b963acafe9e56b37a3d393bacdcd8c0f71a29e2082845ad6d648c3c4800bd47514d339d1f1e984e339a48572ecb5f6f31d9166d SHA512 2291cb963965a59a89bac35a760ce49b4b835d1447065d558c4b254aae5fe38f7ebe4c9d7a67aa475e06be95c45f8529922c6fb0b78d41bc07d1a83f3a564192
+DIST mongo-tools-3.6.12.tar.gz 4990846 BLAKE2B a2b649df03ba17175d95b0fb7be94e446a0cda8dd45111a41f6f74ee5498b853d9fd361f683d4db558197a1951fc79056b516cff6fcd32cc32877744456b67e3 SHA512 948e49719c958e8b7cd1c27b9d413df6d032189801180540ee86b927d5dd53ab4b8906e5cc7880163ecc6abf11daebfc2fb96fcf8fcfd3e0b1f8c8fedaf54558
DIST mongo-tools-3.6.8.tar.gz 4723878 BLAKE2B a1693024d60f69d25c268eaaa30a478b1e4c0042c5fb7a3fd6252ed00aef2fee3fba94516fe825165a1a57887ed38e4fbce488c48ddd4f45349f0b7a1b244020 SHA512 359e8ce2d847d005d48ff12bc2e8af73213d81cd1521d2b5b5ac94792468218248bebbe808e1bd8fd49234eab8480608f294c1b63f317aed58f456b84ef17dcf
DIST mongo-tools-4.0.6.tar.gz 10879606 BLAKE2B 9a7656ba1486df4b36ceb527735ad46864d7a04f2d0451fb4e04bbbdc09c3bb0ec922aa5daa584b93e123e1c3764c0ebef96a3566dd0d6b646a627d769645619 SHA512 d6185d7442a593d29db78889c55aba53e070bedd522d78d8c0bf52bb27f26c5fee6d010457f65774ea36a2e6d5280f38c95433ff76ed53ed9d74b1c811198cb7
+DIST mongo-tools-4.0.8.tar.gz 11134459 BLAKE2B 4f47fcb0037ab0317a3e774ce8411c8add07218ea076d0b54f5aed3d76ca72e739b61c76bee505df52f1c916c1d77a683bd890a409d1d814e9b2389e37f1ee9b SHA512 9e6886038b8c28d50cbec9f76869aceb79eb3214868bca367a6f7a74c346ff5da8d0ee4567bb6c17436860679ca97add3e24e6ba69a6a8d5764c0e1bc5b04813
diff --git a/app-admin/mongo-tools/mongo-tools-3.6.10.ebuild b/app-admin/mongo-tools/mongo-tools-3.6.12.ebuild
similarity index 100%
rename from app-admin/mongo-tools/mongo-tools-3.6.10.ebuild
rename to app-admin/mongo-tools/mongo-tools-3.6.12.ebuild
diff --git a/app-admin/mongo-tools/mongo-tools-4.0.8.ebuild b/app-admin/mongo-tools/mongo-tools-4.0.8.ebuild
new file mode 100644
index 000000000000..092d770686fb
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-4.0.8.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+DEPEND="dev-lang/go:=
+ net-libs/libpcap
+ sasl? ( dev-libs/cyrus-sasl )
+ ssl? ( dev-libs/openssl:0= )"
+
+# Do not complain about CFLAGS etc since go projects do not use them.
+QA_FLAGS_IGNORED='.*'
+
+EGO_PN="github.com/mongodb/mongo-tools"
+S="${WORKDIR}/src/${EGO_PN}"
+
+src_unpack() {
+ mkdir -p "${S%/*}" || die
+ default
+ mv ${MY_P} "${S}" || die
+}
+
+src_prepare() {
+ default
+
+ # allow building with go 1.12 #678924
+ sed -i 's/_Ctype_struct_/C.struct_/' vendor/github.com/google/gopacket/pcap/pcap.go || die
+}
+
+src_compile() {
+ local myconf=()
+
+ if use sasl; then
+ myconf+=(sasl)
+ fi
+
+ if use ssl; then
+ myconf+=(ssl)
+ fi
+
+ # build pie to avoid text relocations wrt #582854
+ local buildmode="pie"
+
+ # skip on ppc64 wrt #610984
+ if use ppc64; then
+ buildmode="default"
+ fi
+
+ mkdir -p bin || die
+ for i in bsondump mongostat mongofiles mongoexport mongoimport mongorestore mongodump mongotop mongoreplay; do
+ echo "Building $i"
+ GOROOT="$(go env GOROOT)" GOPATH="${WORKDIR}" go build -buildmode="${buildmode}" -o "bin/$i" \
+ -ldflags "-X ${EGO_PN}/common/options.VersionStr=${PV}" --tags "${myconf[*]}" "$i/main/$i.go" || die
+ done
+}
+
+src_install() {
+ dobin bin/*
+}
diff --git a/app-admin/pwman3/Manifest b/app-admin/pwman3/Manifest
index 66153c9bb7b4..6612c190c892 100644
--- a/app-admin/pwman3/Manifest
+++ b/app-admin/pwman3/Manifest
@@ -1 +1,2 @@
+DIST pwman3-0.10.0.tar.gz 75726 BLAKE2B ba7331bd3d36ac23d9151a5ebd4a343e2d8c523ba8b324850139a9ba4af8404ddf23380b3eaef523251e8f4137c5c56b6ab509c3927690fc612962ff872ea820 SHA512 a6dc24b2e1405a91f35a9a9155dde5409e35ce733bacee8858930d82443c09b8017e2701bc8c45688483b6c40554e4d6266f6cd21dc6f205b13f96e7de4f57c2
DIST pwman3-0.9.11.tar.gz 74364 BLAKE2B 9544b692e8853b7fb8e1b4d51093e72e04f8d82888a9278c94aaa27716026b348bb16f0fa9c52af2144395a4ffb242c8a48fc34252890e68477d2e3a70ea4a88 SHA512 2aa5a7b4d810d1bbc6aea34b728f89190570cbfbedc33f45cc1aa4d737ebbb9e993d2d372b44f956d5cdbc07f911f289fd77d7df167100e820455650f5b3e46a
diff --git a/app-admin/pwman3/pwman3-0.10.0.ebuild b/app-admin/pwman3/pwman3-0.10.0.ebuild
new file mode 100644
index 000000000000..c63d60465f40
--- /dev/null
+++ b/app-admin/pwman3/pwman3-0.10.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_5 python3_6 )
+PYTHON_REQ_USE="sqlite?"
+inherit distutils-r1
+
+DESCRIPTION="A lightweight password-manager with multiple database backends"
+HOMEPAGE="https://pwman3.github.io"
+SRC_URI="https://github.com/pwman3/pwman3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="mongodb mysql postgres +sqlite test"
+
+CDEPEND="
+ >=dev-python/cryptography-2.3[${PYTHON_USEDEP}]
+ >=dev-python/colorama-0.3.0[${PYTHON_USEDEP}]
+ "
+
+DEPEND="
+ ${CDEPEND}
+ test? ( dev-python/pexpect[${PYTHON_USEDEP}] )
+ "
+
+RDEPEND="
+ ${CDEPEND}
+ mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
+ mysql? ( dev-python/pymysql[${PYTHON_USEDEP}] )
+ postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )
+ "
+
+python_test() {
+ esetup.py test
+}
diff --git a/app-admin/pwman3/pwman3-0.9.11.ebuild b/app-admin/pwman3/pwman3-0.9.11.ebuild
index 5c508edb053c..ba9a62305684 100644
--- a/app-admin/pwman3/pwman3-0.9.11.ebuild
+++ b/app-admin/pwman3/pwman3-0.9.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 579b99443256..26c3674d61bf 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -1 +1,2 @@
DIST terraform-0.11.12.tar.gz 10907800 BLAKE2B d6d3c0a25b994be9b61e250a35adae55ed6cea0cc2166ea62774940292d9e881f16b66b88b19d5fd2c64d19bdefb82b58c79c54d8c641e1ad2970ef9a463c4c8 SHA512 2163cbc13a2bd37b7dace0a4ee2b3da4ee212038f9d6e11b83e509a794cf8d854040c366a099c9560a149157c6951b1f9d1698b4c47bd11a4fa96c4521e93414
+DIST terraform-0.11.13.tar.gz 10906645 BLAKE2B dafdc1acddd4ea97b41cc5899a541701731fce7b13b914c0859fe148b10b5c8ac877d71b665e8d80a65f376bb09fb8ae6fd0e0263ff711a156ca48119522f89d SHA512 1c16f20d1a65c763f1091ff2d20e0752e62903e07a12d41dd722e5c4c989f477da7d64901336d7536ed1693d5c82f4548ae5a643edae85b4e83325fc8c81b245
diff --git a/app-admin/terraform/terraform-0.11.12.ebuild b/app-admin/terraform/terraform-0.11.12.ebuild
index 7fbea19820fc..a70144a8d83f 100644
--- a/app-admin/terraform/terraform-0.11.12.ebuild
+++ b/app-admin/terraform/terraform-0.11.12.ebuild
@@ -15,9 +15,10 @@ LICENSE="MPL-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
+
DEPEND=">=dev-lang/go-1.11.0"
-DOCS="README.md CHANGELOG.md"
+DOCS=( README.md CHANGELOG.md )
src_compile() {
cd "src/${EGO_PN}" || die
@@ -28,9 +29,9 @@ src_compile() {
src_install() {
dobin terraform
- pushd "src/${EGO_PN}" || die
+ pushd "src/${EGO_PN}" >/dev/null || die
einstalldocs
- popd || die
+ popd >/dev/null || die
}
pkg_postinst() {
diff --git a/app-admin/terraform/terraform-0.11.13.ebuild b/app-admin/terraform/terraform-0.11.13.ebuild
new file mode 100644
index 000000000000..ae68474b0f4d
--- /dev/null
+++ b/app-admin/terraform/terraform-0.11.13.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+
+EGO_PN="github.com/hashicorp/${PN}"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+DEPEND=">=dev-lang/go-1.11.0"
+
+DOCS=( README.md CHANGELOG.md )
+
+src_compile() {
+ cd "src/${EGO_PN}" || die
+ GOPATH="${S}" GOCACHE="${T}/go-cache" go build \
+ -v -work -o "${S}/${PN}" ./ || die
+}
+
+src_install() {
+ dobin terraform
+
+ pushd "src/${EGO_PN}" >/dev/null || die
+ einstalldocs
+ popd >/dev/null || die
+}
+
+pkg_postinst() {
+ elog "If you would like to install shell completions please run:"
+ elog " terraform -install-autocomplete"
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 8850d3b529e5..60e57a6fe457 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/cabextract/cabextract-1.8.ebuild b/app-arch/cabextract/cabextract-1.8.ebuild
index 5990d8ff13fe..8e267080674b 100644
--- a/app-arch/cabextract/cabextract-1.8.ebuild
+++ b/app-arch/cabextract/cabextract-1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.cabextract.org.uk/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="extras"
RDEPEND="extras? ( dev-lang/perl )"
diff --git a/app-arch/cksfv/cksfv-1.3.14-r1.ebuild b/app-arch/cksfv/cksfv-1.3.14-r1.ebuild
new file mode 100644
index 000000000000..4793e5b02741
--- /dev/null
+++ b/app-arch/cksfv/cksfv-1.3.14-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="SFV checksum utility (simple file verification)"
+HOMEPAGE="http://zakalwe.fi/~shd/foss/cksfv/"
+SRC_URI="http://zakalwe.fi/~shd/foss/cksfv/files/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~amd64-linux ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-linux"
+
+src_configure() {
+ # note: not an autoconf configure script
+ ./configure \
+ --compiler="$(tc-getCC)" \
+ --prefix="${EPREFIX}"/usr \
+ --package-prefix="${D}" \
+ --bindir="${EPREFIX}"/usr/bin \
+ --mandir="${EPREFIX}"/usr/share/man || die
+}
diff --git a/app-arch/cksfv/cksfv-1.3.14.ebuild b/app-arch/cksfv/cksfv-1.3.14.ebuild
index 52041fde4aa9..09c200e889a3 100644
--- a/app-arch/cksfv/cksfv-1.3.14.ebuild
+++ b/app-arch/cksfv/cksfv-1.3.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -9,7 +9,7 @@ DESCRIPTION="SFV checksum utility (simple file verification)"
HOMEPAGE="http://zakalwe.fi/~shd/foss/cksfv/"
SRC_URI="http://zakalwe.fi/~shd/foss/cksfv/files/${P}.tar.bz2"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
diff --git a/app-arch/createrepo/Manifest b/app-arch/createrepo/Manifest
deleted file mode 100644
index 34c776fcfa3e..000000000000
--- a/app-arch/createrepo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST createrepo-0.10.4.tar.gz 71186 BLAKE2B ddd15305c6861e9872bf55683035c311a22aea062d27ba4e06bbe4e09598c85fbbaf4b874cbbd1e4c521610a7faa4097a7062ac52752ab2916c14ffca70a817d SHA512 28858d7d886e1132d001bb1bd847657502eb132133e39a4d19a4c8a080728c6b6f344283bc6ee21ce8def5b7980cbca7ed78299adeb71ce1012751268f6740ec
diff --git a/app-arch/createrepo/createrepo-0.10.4-r1.ebuild b/app-arch/createrepo/createrepo-0.10.4-r1.ebuild
deleted file mode 100644
index 39a64af2e0b2..000000000000
--- a/app-arch/createrepo/createrepo-0.10.4-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='xml'
-
-inherit python-single-r1 bash-completion-r1
-
-DESCRIPTION="Creates a common rpm-metadata repository"
-HOMEPAGE="http://createrepo.baseurl.org/"
-SRC_URI="http://createrepo.baseurl.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/urlgrabber-2.9.0[${PYTHON_USEDEP}]
- >=app-arch/rpm-4.1.1[python,${PYTHON_USEDEP}]
- dev-libs/libxml2[python,${PYTHON_USEDEP}]
- >=app-arch/deltarpm-3.6_pre20110223[python,${PYTHON_USEDEP}]
- dev-python/backports-lzma[${PYTHON_USEDEP}]
- >=sys-apps/yum-3.4.3
- ${PYTHON_DEPS}"
-DEPEND="${PYTHON_DEPS}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.10.3-ten-changelog-limit.patch"
- "${FILESDIR}/${P}-lzma.patch"
-)
-
-pkg_setup() {
- python-single-r1_pkg_setup
- python_export PYTHON_SITEDIR
-}
-
-src_install() {
- emake install \
- DESTDIR="${ED}" \
- PYTHON=true \
- compdir="$(get_bashcompdir)" \
- PKGDIR="${PYTHON_SITEDIR}/${PN}"
- einstalldocs
- python_fix_shebang "${ED}"
- python_optimize
- python_optimize "${ED}/usr/share/createrepo"
-}
diff --git a/app-arch/createrepo/files/createrepo-0.10.3-ten-changelog-limit.patch b/app-arch/createrepo/files/createrepo-0.10.3-ten-changelog-limit.patch
deleted file mode 100644
index e6de1e11002f..000000000000
--- a/app-arch/createrepo/files/createrepo-0.10.3-ten-changelog-limit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/createrepo/__init__.py 2011-01-26 12:14:30.000000000 -0500
-+++ b/createrepo/__init__.py 2011-01-26 12:34:17.291441719 -0500
-@@ -96,7 +96,7 @@
- self.mdtimestamp = 0
- self.directory = None
- self.directories = []
-- self.changelog_limit = None # needs to be an int or None
-+ self.changelog_limit = 10 # needs to be an int or None
- self.unique_md_filenames = True
- self.additional_metadata = {} # dict of 'type':'filename'
- self.revision = str(int(time.time()))
diff --git a/app-arch/createrepo/files/createrepo-0.10.4-lzma.patch b/app-arch/createrepo/files/createrepo-0.10.4-lzma.patch
deleted file mode 100644
index 2bae50c0a8a6..000000000000
--- a/app-arch/createrepo/files/createrepo-0.10.4-lzma.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/createrepo/utils.py b/createrepo/utils.py
-index b0d92ec..1220c7c 100644
---- a/createrepo/utils.py
-+++ b/createrepo/utils.py
-@@ -25,7 +25,8 @@ from gzip import write32u, FNAME
- from yum import misc
- _available_compression = ['gz', 'bz2']
- try:
-- import lzma
-+ import backports.lzma
-+ lzma = backports.lzma
- _available_compression.append('xz')
- except ImportError:
- lzma = None
diff --git a/app-arch/createrepo/metadata.xml b/app-arch/createrepo/metadata.xml
deleted file mode 100644
index cf9a9e94265f..000000000000
--- a/app-arch/createrepo/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- alonbl@gentoo.org
- Alon Bar-Lev
-
-
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index 03b20a1bef65..19d61336686b 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,2 +1 @@
-DIST engrampa-1.18.3.tar.xz 1427036 BLAKE2B 816155b7e2a0583263959d77bb5079a3d69ade087cac39e8e9c2c77901d0bfcbdb63a87ec9ed7cf92d2e580ae810d3e46641d690d87c1af7db6f6dca6627dfbc SHA512 6a3872ed9ec1e9d2779842d30c352c5068608913f9261a875b707951a45ff3122df2f4a4ed4da10c4f8a4617cc1d7aae4635b3f1234052793c4a6baa765d80f8
DIST engrampa-1.22.0.tar.xz 1358552 BLAKE2B 542bb963d232dd75eba6102926e2cf31b52cab16eb890039609cf6ec44e86a7d6bf49ee04da316bb46e49d9c012c1f100e4acb20541cb8f46e245946f83cbac8 SHA512 7b4c3b85184c1530ec72eba174ee571cc14490c88f5fef1232acd4197f1020107f5172d6d4271753f9f6fcfadcf049273095b3dfbcef6fdd25a51ad8d2e17382
diff --git a/app-arch/engrampa/engrampa-1.18.3.ebuild b/app-arch/engrampa/engrampa-1.18.3.ebuild
deleted file mode 100644
index 46a8bb99de0c..000000000000
--- a/app-arch/engrampa/engrampa-1.18.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja magic packagekit"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.32.0:2
- >=dev-libs/json-glib-0.14:0
- x11-libs/gdk-pixbuf:2
- x11-libs/pango:0
- virtual/libintl:0
- caja? ( >=mate-base/caja-1.17.1 )
- >=x11-libs/gtk+-3.14:3[X]
- magic? ( sys-apps/file )
- packagekit? ( app-admin/packagekit-base )
- !!app-arch/mate-file-archiver"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-src_configure() {
- mate_src_configure \
- --disable-run-in-place \
- $(use_enable caja caja-actions) \
- $(use_enable magic) \
- $(use_enable packagekit)
-}
-
-pkg_postinst() {
- mate_pkg_postinst
-
- elog ""
- elog "${PN} is a frontend for several archiving utilities. If you want a"
- elog "particular achive format supported install the relevant package."
- elog
- elog "For example:"
- elog " 7-zip : emerge app-arch/p7zip"
- elog " ace : emerge app-arch/unace"
- elog " arj : emerge app-arch/arj"
- elog " cpio : emerge app-arch/cpio"
- elog " deb : emerge app-arch/dpkg"
- elog " iso : emerge app-cdr/cdrtools"
- elog " jar,zip : emerge app-arch/zip or emerge app-arch/unzip"
- elog " lha : emerge app-arch/lha"
- elog " lzma : emerge app-arch/xz-utils"
- elog " lzop : emerge app-arch/lzop"
- elog " rar : emerge app-arch/unrar"
- elog " rpm : emerge app-arch/rpm"
- elog " unstuff : emerge app-arch/stuffit"
- elog " zoo : emerge app-arch/zoo"
-}
diff --git a/app-arch/engrampa/engrampa-1.22.0.ebuild b/app-arch/engrampa/engrampa-1.22.0.ebuild
index f1260b9b27e0..cfd188048c75 100644
--- a/app-arch/engrampa/engrampa-1.22.0.ebuild
+++ b/app-arch/engrampa/engrampa-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Engrampa archive manager for MATE"
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index 25011058c328..7341beaba4ab 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/borgbackup/borgbackup-1.1.9.ebuild b/app-backup/borgbackup/borgbackup-1.1.9.ebuild
index f4df6c1d6de5..850e42f523b2 100644
--- a/app-backup/borgbackup/borgbackup-1.1.9.ebuild
+++ b/app-backup/borgbackup/borgbackup-1.1.9.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
app-arch/lz4
virtual/acl
dev-python/llfuse[${PYTHON_USEDEP}]
- <=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
+ =dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
dev-python/pyzmq[${PYTHON_USEDEP}]
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index f91305bcad2b..6fdd7802590b 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index 84a85890ba1f..e3fff5368efc 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1 +1,2 @@
DIST acme.sh-2.7.9.tar.gz 110323 BLAKE2B 244afad17ddf17fa95a11d5af7943a153ed37e67ef304511787767a5d769f9cd22fb66875d637f2d536cce8942e4feee0c442af8349a32a91940b1fbbc2e879c SHA512 24374783ca52835b400b84316ffab5e9066805362f02082f8ef409e21ca590d837b3dd11401633947f9fcc98dc977b0e8b6076d5deecd02b38478f257500a052
+DIST acme.sh-2.8.0.tar.gz 127638 BLAKE2B b5ef10c40da4b77c7f1f3175b7cac0cc19bff135959416a97b3e8443cf13bb92d9e0b86837fd3834351412a19f25e92a4ffa146815c146f2e91cd94bcbc655a8 SHA512 99f86866f7bd1426e9a8b31dd09206685ad4aa01a3d723d366681aae4ea2087f9437496e0b3da947766931493c9d94305da1906eadc7005373327342ca94ce23
diff --git a/app-crypt/acme-sh/acme-sh-2.8.0.ebuild b/app-crypt/acme-sh/acme-sh-2.8.0.ebuild
new file mode 100644
index 000000000000..27d064cd38cc
--- /dev/null
+++ b/app-crypt/acme-sh/acme-sh-2.8.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="An ACME Shell script"
+HOMEPAGE="https://github.com/Neilpang/acme.sh"
+SRC_URI="https://github.com/Neilpang/${MY_PN}/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="net-misc/curl
+ || ( dev-libs/libressl dev-libs/openssl:0 )
+ || ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+ || ( net-misc/socat www-servers/apache:2 www-servers/nginx )
+ virtual/cron"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ einstalldocs
+ newdoc dnsapi/README.md README-dnsapi.md
+ newdoc deploy/README.md README-deploy.md
+
+ keepdir /etc/acme-sh
+ doenvd "${FILESDIR}"/99acme-sh
+ insinto /etc/bash/bashrc.d
+ doins "${FILESDIR}"/acme.sh
+
+ exeinto /usr/share/acme.sh
+ doexe acme.sh
+ insinto /usr/share/acme.sh/dnsapi
+ doins -r dnsapi/*.sh
+ insinto /usr/share/acme.sh/deploy
+ doins -r deploy/*.sh
+
+ dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
+}
diff --git a/app-crypt/acme-sh/acme-sh-9999.ebuild b/app-crypt/acme-sh/acme-sh-9999.ebuild
index 23935922162c..aa72ab18cd53 100644
--- a/app-crypt/acme-sh/acme-sh-9999.ebuild
+++ b/app-crypt/acme-sh/acme-sh-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,8 +18,8 @@ IUSE=""
RDEPEND="net-misc/curl
|| ( dev-libs/libressl dev-libs/openssl:0 )
- || ( net-analyzer/netcat6 net-analyzer/openbsd-netcat )
- || ( net-misc/socat www-servers/apache:2 www-servers/nginx:0 )
+ || ( net-analyzer/netcat net-analyzer/openbsd-netcat )
+ || ( net-misc/socat www-servers/apache:2 www-servers/nginx )
virtual/cron"
src_install() {
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 433ea6872826..bf926aabc749 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 416cf8039ee8..b59acb949c19 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,2 +1 @@
-DIST pluma-1.18.3.tar.xz 3355188 BLAKE2B d53f381aa9c74cad0df82ccc73aaab9f87347cb8e3886471a2531bdd4d49a84ee97a50f2333b2e375f9bc2a634c25dc69b36659dcb589ace716e523a9d0b4544 SHA512 62ad57a8d7626e34c15610e121869ee9b06a2498acb40ec0a60839ca0273d146bd59682d352c3e98d892460c444c5442d32673c2f63897bb8c3e9e595e771dc1
DIST pluma-1.22.0.tar.xz 3235612 BLAKE2B a0cda23a6ee73e562cb32c3f1430590042248b6a6e7cbf021103db507450b2a594506f3d8283eeed08e2ba5006ff51376eb6db5e94ea5ac9d5707b29e0efc2c4 SHA512 7c74c2ce0a89ec3813c936449d3114957e7b319433875ef567ecc508a28a1d3ddc3d0da418b2eb1278b6dc9dbaa3c75a279524f5a061b5aecb52955edcf28f51
diff --git a/app-editors/pluma/pluma-1.18.3.ebuild b/app-editors/pluma/pluma-1.18.3.ebuild
deleted file mode 100644
index 3e8abed509f2..000000000000
--- a/app-editors/pluma/pluma-1.18.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+introspection spell"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-COMMON_DEPEND="dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libpeas-1.2.0[gtk]
- >=dev-libs/libxml2-2.5:2
- x11-libs/cairo:0
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14.0:3[introspection?]
- >=x11-libs/gtksourceview-3.0.0:3.0
- x11-libs/libICE:0
- x11-libs/libX11:0
- >=x11-libs/libSM-1.0
- x11-libs/pango:0
- virtual/libintl:0
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- spell? (
- >=app-text/enchant-1.2:0
- >=app-text/iso-codes-0.35:0
- )
- !!app-editors/mate-text-editor"
-
-RDEPEND="${PYTHON_DEPS}
- ${COMMON_DEPEND}
- >=mate-base/mate-desktop-1.9[introspection?]"
-
-DEPEND="${COMMON_DEPEND}
- ~app-text/docbook-xml-dtd-4.1.2
- app-text/rarian:0
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- >=sys-devel/libtool-2.2.6:2
- >=sys-devel/gettext-0.17:*
- virtual/pkgconfig:*"
-
-src_configure() {
- mate_src_configure \
- $(use_enable introspection) \
- $(use_enable spell)
-}
-
-src_test() {
- # FIXME: This should be handled at eclass level.
- "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
- unset DBUS_SESSION_BUS_ADDRESS
-
- GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-editors/pluma/pluma-1.22.0.ebuild b/app-editors/pluma/pluma-1.22.0.ebuild
index 2fd22a3c6112..cf7016392b87 100644
--- a/app-editors/pluma/pluma-1.22.0.ebuild
+++ b/app-editors/pluma/pluma-1.22.0.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python2_7 )
inherit mate python-single-r1 virtualx
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Pluma text editor for the MATE desktop"
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index a8244e738e96..4500c3e83ecd 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
index 0d2eaac25e1b..579f39cb3711 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r8.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
http://downloads.ganeti.org/releases/${SERIES}/${MY_P}.tar.gz
mirror://debian/pool/main/g/ganeti-${SERIES}/ganeti-${SERIES}_${PV}-${DEBIAN_PATCH}.debian.tar.xz
"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
PATCHES=(
"${FILESDIR}"/ganeti-2.15-use-balloon-device.patch
"${WORKDIR}"/debian/patches/do-not-backup-export-dir.patch
diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
index 8fe09f145e0f..9150a04e8c80 100644
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,22 +18,18 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}"
-STRIP_MASK="usr/libexec/xen/bin/grub-x86_64-xen.bin"
-QA_EXECSTACK="usr/libexec/xen/bin/grub-x86_64-xen.bin"
-QA_WX_LOAD="usr/libexec/xen/bin/grub-x86_64-xen.bin"
-QA_PRESTRIPPED="usr/libexec/xen/bin/grub-x86_64-xen.bin"
-RESTRICT="test"
+RESTRICT="binchecks strip test"
src_configure() {
:
}
src_compile() {
- cat > "${S}/grub-bootstrap.cfg" <<- EOF
+ cat > "${S}/grub-bootstrap.cfg" <<- EOF || die
normal (memdisk)/grub.cfg
EOF
- cat > "${S}/grub.cfg" <<- EOF
+ cat > "${S}/grub.cfg" <<- EOF || die
if search -s -f /boot/xen/pvboot-x86_64.elf ; then
echo "Chainloading (${root})/boot/xen/pvboot-x86_64.elf"
multiboot "/boot/xen/pvboot-x86_64.elf"
diff --git a/app-emulation/wine-staging/Manifest b/app-emulation/wine-staging/Manifest
index 17edfaefdf42..57d912afecc0 100644
--- a/app-emulation/wine-staging/Manifest
+++ b/app-emulation/wine-staging/Manifest
@@ -2,13 +2,13 @@ DIST gentoo-wine-patches-20180120.tar.xz 58672 BLAKE2B 84d621075b65475cec41a0642
DIST gentoo-wine-patches-20190316.tar.xz 58848 BLAKE2B 76e66749638589dd6d6eceb4b78690483d14353597a4e47fe9e5325d8bdb2bceff66040c110f63b8bae698bc5838c280c048ff7375ba2ed8cc387cbe0422c79a SHA512 de2cf844ae686144c3f95f0a360c7fa8a62185500758f994b5a65836798bdc3092138dcd9c36d0267a6fcfdc13585258d31b281244a97b45965f40e0f2b29eda
DIST wine-3.20.tar.xz 21541928 BLAKE2B 9183dacd1c6ec15ae5283eca3d17db5a869bcba9a93800a422f0dea5d9cfb5d3124a3e942e8b6487cd4ba31cfeacdd66de39128dd66d64e1226d265eae922d3a SHA512 fb66d1d4b427f46dd048b13e53bcd15a5eaeb19039221fe98ec771140c33b3c245a974e52242eab5731ffa0de15f5932204032fe24f86e1a313ff8f11da59cc4
DIST wine-3.21.tar.xz 21573872 BLAKE2B 54d8733b19f1377f856c9496f6263eef1916e03caf82c6fcfa39b3e7bec1fecd87466dc92f3739d704a9161a32d9ee680b2cc5e5cdf27a582dc1d89d0b1a6639 SHA512 dd64a6778bf1b848c8fe14dc26cfca21f6c1c92714ca1b2e932a28560a2adc1f69aa1b2cba250f49a5df4f91a4accde677a2afaf960c200d3998eac1957b5c6b
-DIST wine-4.2.tar.xz 21724960 BLAKE2B d3c4381265e5086a17582c28fd4d19c84ed8e9839d039d5f2eba32efcc09ae6dad2a25fa375042d98d35de30065eaa0095e36bb8fbca608ec74abc654bae5196 SHA512 408a846e92a0222f64ddd3c4d2c2a71b387ce51749e346c1fbca1fd57db910fa18dc6bb4ce0a350bef81e13be77c6b2d74537f7a1c0dcbb0e6d4c19d1ade288c
DIST wine-4.3.tar.xz 21764500 BLAKE2B dd94b710f2be20ce3225fb58e0a20f0ee46e59834dc77383e262620faa64597c41625382237c39563b3bb67b1850cca2460ca147e2c5ee3052f0fdfdee067ec5 SHA512 45c0519f8f2873ef65e1761d518a7148f3aa54c0e993a41a60849c01c8df17386d57edd83308cff289300adc6a8e3fc5918fb12513f5b85a88e556b420479e83
DIST wine-4.4.tar.xz 21805668 BLAKE2B cf973240a3f2a1ad1cac8690cdc5cd86be428220395d90bfe3b15567e6a2be0bb78e5828de3b77b617827122f5b0bb1dfeeef351102ca001722340ceaeb5625e SHA512 6678c9b0e086bdc9fab9f9fd2517226352b49f846bbae7be6000bb60db2f302aad49622192077b45880d45ad33ba4d82bfe3403fb82a1e65159f1352b40933de
DIST wine-4.5.tar.xz 21879868 BLAKE2B fc2bc13fefac97570a67a1c48a0144c1194896f779803efc0c3229fc234f128f53c78cadb1d47d28ec6772ecea73831c8850322e537aa1af62b537b7856ecae5 SHA512 261420efdf14595715cff5bb6a61223b0f2090b89dc05dca8c053a8a81abc3018715d41db50769a0f0488c658efc0742ac0f577b578e69eace70be4e463131dd
+DIST wine-4.6.tar.xz 21940848 BLAKE2B 1dbac3b3e6d74b99123a0954015343514d0135a26cffe86499f8fbdfadd04205edfcd0635562519b73397519f298abe7e18693fa1433aa05255b2435a2eedb1a SHA512 b5d8568de0256bdd9f3fcaef725c8daa90d028838fd490f75d7f08a7c538103a957a4fd03857a8fbbdf1de6acb7237b183dad24d6057be50dae12af227cd2c98
DIST wine-staging-3.20.tar.gz 9950555 BLAKE2B ee66217b708287bd95d61e23fb92009d927a75556f22e89b9c5af66cb6c6445f77a1c3153da168da92ebac58606843c4639f1a99bd5089941595181f390980f0 SHA512 4b92e53e84046d99c3f7ec5e0d0d7e62fdb767b1c44e23605125744686439fe62991c8adea941950b390a01d251ecbb79f3b329cfe5a1b1fbc76c5372283579d
DIST wine-staging-3.21.tar.gz 9945982 BLAKE2B 988927c644e9abf472c42021cae39f38cdae24b397072fb53dc803da32bc80e8b6256554d787db0b6bffafac4104a9abf4ab8fa6e78fd0a308bf8906d658a65d SHA512 17f8194954a420d1424d564ba9ad5e6d4dd574dc38da4895d5b6740c1990f8655cb573bd57c77ace2c78c71da4782b511a5ac937ca1f0fc958e3c925abaeefde
-DIST wine-staging-4.2.tar.gz 9850260 BLAKE2B 938d12bb44acef2920c6a47978f170cab532ddd785de394dddc95cc359b301e0db26a3ec9aa08abaf03542b59a97c16dfebb3bf5e4c9ddc9bed829200e529bb9 SHA512 2fb66bdeab084231983569d3884211a4d269a48bd6b25ba2e7c7e83d2dc98a205bd92dfc67c09528d57192086571d3f4f6c988c522b25aade1d525b74e662f2e
DIST wine-staging-4.3.tar.gz 9888763 BLAKE2B 095f2789f601822e34b7f9d0a078bd433aa2861e7cc55d5b74520bfedc2c88064bbffa3a73bcea170c4e4fb96e9eaa50f0cb927aba2cc6d1f12480bacfa49968 SHA512 9fd89c54200cf7c8e8a7f978fb6b34c89ece755976789f5c5c361ffb8d2882f14260c81ab8ac14ad140e41d807adbbaba05381a31b0177492aa222ef2fe04e4d
DIST wine-staging-4.4.tar.gz 9882230 BLAKE2B 705841e14abf3e3e65ae4b64ac2613f42f0e8caf32258ef6fc7e78b5410038c7cc766293488bb110e1f4c2c06d6b55b4cd3e59acea7e0f15c3bb6304e427f891 SHA512 4ddeddac2e2de9afd95ded71edb47f3eac15d1ca94254481e5369d6b69e401471b00ba16747621eb2d0f7d92c0558590f6efe89b3ea15012d9d3d45553d49196
DIST wine-staging-4.5.tar.gz 9859696 BLAKE2B 3d6ea22659fe45fe6cbe0f292737d4238e9f32b307b1750debfcb628a72b1dfc8a486c644a78c2d0285a206d13644ecc3bd26a307e61f78cc118219bf3395ec6 SHA512 fda32b26de79bd3bbff6b1ab2249d7ff8adc7e8da2753271e8dae4f84bc71764ea6d1a887cc643e0ff70b217bd75fefebd3eb1bd4b6faace9a36399878998029
+DIST wine-staging-4.6.tar.gz 9937386 BLAKE2B 105f1e040b03835ea59100cde609ed005970ccdcc37ede775f13df73a50f19a8b192f17500e3658759eabe3dc0e529d0b658c218f7fd87cae72994806fd4dfe2 SHA512 4b44cbdeffc8042c22d485c3d440894287793652734b7a791269a2f45ea10ceb81ce8c8bd302c55f62b04c127344532772ce2078d99835d22afa0088e153a888
diff --git a/app-emulation/wine-staging/wine-staging-4.2.ebuild b/app-emulation/wine-staging/wine-staging-4.6.ebuild
similarity index 96%
rename from app-emulation/wine-staging/wine-staging-4.2.ebuild
rename to app-emulation/wine-staging/wine-staging-4.6.ebuild
index 708d1c91e80a..1fa673641c44 100644
--- a/app-emulation/wine-staging/wine-staging-4.2.ebuild
+++ b/app-emulation/wine-staging/wine-staging-4.6.ebuild
@@ -26,7 +26,7 @@ S="${WORKDIR}/${MY_P}"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}"
-GWP_V="20180120"
+GWP_V="20190316"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
DESCRIPTION="Free implementation of Windows(tm) on Unix, with Wine-Staging patchset"
@@ -44,7 +44,7 @@ fi
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -72,6 +72,7 @@ COMMON_DEPEND="
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
@@ -129,7 +130,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.7.5 )
+ mono? ( app-emulation/wine-mono:4.8.0 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
@@ -163,7 +164,7 @@ usr/share/applications/wine-uninstaller.desktop
usr/share/applications/wine-winecfg.desktop"
PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+ "${PATCHDIR}/patches/${MY_PN}-4.4-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
@@ -355,6 +356,7 @@ src_prepare() {
local STAGING_EXCLUDE=""
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
+ use faudio && STAGING_EXCLUDE="${STAGING_EXCLUDE} -W xaudio2-revert -W xaudio2_CommitChanges -W xaudio2_7-WMA_support -W xaudio2_7-CreateFX-FXEcho"
# Launch wine-staging patcher in a subshell, using eapply as a backend, and gitapply.sh as a backend for binary patches
ebegin "Running Wine-Staging patch installer"
@@ -441,6 +443,7 @@ multilib_src_configure() {
$(use_with cups)
$(use_with ncurses curses)
$(use_with udisks dbus)
+ $(use_with faudio)
$(use_with ffmpeg)
$(use_with fontconfig)
$(use_with ssl gnutls)
diff --git a/app-emulation/wine-vanilla/Manifest b/app-emulation/wine-vanilla/Manifest
index dfaf633ba9d7..dd25263f6787 100644
--- a/app-emulation/wine-vanilla/Manifest
+++ b/app-emulation/wine-vanilla/Manifest
@@ -5,7 +5,7 @@ DIST wine-3.0.4.tar.xz 20556944 BLAKE2B 122c06e38cae9f9d2358908d0d325ed4e0dc3d1b
DIST wine-3.20.tar.xz 21541928 BLAKE2B 9183dacd1c6ec15ae5283eca3d17db5a869bcba9a93800a422f0dea5d9cfb5d3124a3e942e8b6487cd4ba31cfeacdd66de39128dd66d64e1226d265eae922d3a SHA512 fb66d1d4b427f46dd048b13e53bcd15a5eaeb19039221fe98ec771140c33b3c245a974e52242eab5731ffa0de15f5932204032fe24f86e1a313ff8f11da59cc4
DIST wine-3.21.tar.xz 21573872 BLAKE2B 54d8733b19f1377f856c9496f6263eef1916e03caf82c6fcfa39b3e7bec1fecd87466dc92f3739d704a9161a32d9ee680b2cc5e5cdf27a582dc1d89d0b1a6639 SHA512 dd64a6778bf1b848c8fe14dc26cfca21f6c1c92714ca1b2e932a28560a2adc1f69aa1b2cba250f49a5df4f91a4accde677a2afaf960c200d3998eac1957b5c6b
DIST wine-4.0.tar.xz 21644692 BLAKE2B 9c426ef2249c16e908a3617c2844d8b12a2df843721338b1cfb69459815b902cfa0ddf3d74c09dc900fb2ceb003e54d97a7c0afaac51a9caab7d21beb82e26c3 SHA512 7607fa7a3d5f7bcd3d8c4c9e7bb6e1987466110bbfc672782ebe57c6d9da348c58e76abf40b0a70c725dfd703163db6e194ee0e3db11a47b6b60e225163308dd
-DIST wine-4.2.tar.xz 21724960 BLAKE2B d3c4381265e5086a17582c28fd4d19c84ed8e9839d039d5f2eba32efcc09ae6dad2a25fa375042d98d35de30065eaa0095e36bb8fbca608ec74abc654bae5196 SHA512 408a846e92a0222f64ddd3c4d2c2a71b387ce51749e346c1fbca1fd57db910fa18dc6bb4ce0a350bef81e13be77c6b2d74537f7a1c0dcbb0e6d4c19d1ade288c
DIST wine-4.3.tar.xz 21764500 BLAKE2B dd94b710f2be20ce3225fb58e0a20f0ee46e59834dc77383e262620faa64597c41625382237c39563b3bb67b1850cca2460ca147e2c5ee3052f0fdfdee067ec5 SHA512 45c0519f8f2873ef65e1761d518a7148f3aa54c0e993a41a60849c01c8df17386d57edd83308cff289300adc6a8e3fc5918fb12513f5b85a88e556b420479e83
DIST wine-4.4.tar.xz 21805668 BLAKE2B cf973240a3f2a1ad1cac8690cdc5cd86be428220395d90bfe3b15567e6a2be0bb78e5828de3b77b617827122f5b0bb1dfeeef351102ca001722340ceaeb5625e SHA512 6678c9b0e086bdc9fab9f9fd2517226352b49f846bbae7be6000bb60db2f302aad49622192077b45880d45ad33ba4d82bfe3403fb82a1e65159f1352b40933de
DIST wine-4.5.tar.xz 21879868 BLAKE2B fc2bc13fefac97570a67a1c48a0144c1194896f779803efc0c3229fc234f128f53c78cadb1d47d28ec6772ecea73831c8850322e537aa1af62b537b7856ecae5 SHA512 261420efdf14595715cff5bb6a61223b0f2090b89dc05dca8c053a8a81abc3018715d41db50769a0f0488c658efc0742ac0f577b578e69eace70be4e463131dd
+DIST wine-4.6.tar.xz 21940848 BLAKE2B 1dbac3b3e6d74b99123a0954015343514d0135a26cffe86499f8fbdfadd04205edfcd0635562519b73397519f298abe7e18693fa1433aa05255b2435a2eedb1a SHA512 b5d8568de0256bdd9f3fcaef725c8daa90d028838fd490f75d7f08a7c538103a957a4fd03857a8fbbdf1de6acb7237b183dad24d6057be50dae12af227cd2c98
diff --git a/app-emulation/wine-vanilla/wine-vanilla-4.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-4.6.ebuild
similarity index 96%
rename from app-emulation/wine-vanilla/wine-vanilla-4.2.ebuild
rename to app-emulation/wine-vanilla/wine-vanilla-4.6.ebuild
index bb002c1e3be8..b1a8313b6930 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-4.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-4.6.ebuild
@@ -24,18 +24,18 @@ else
fi
S="${WORKDIR}/${MY_P}"
-GWP_V="20180120"
+GWP_V="20190316"
PATCHDIR="${WORKDIR}/gentoo-wine-patches"
DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets"
HOMEPAGE="https://www.winehq.org/"
SRC_URI="${SRC_URI}
- https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
+ https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-${GWP_V}.tar.xz
"
LICENSE="LGPL-2.1"
SLOT="${PV}"
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
X? ( truetype )
elibc_glibc? ( threads )
@@ -59,6 +59,7 @@ COMMON_DEPEND="
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
+ faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
@@ -108,7 +109,7 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/wine:0
dos? ( >=games-emulation/dosbox-0.74_p20160629 )
gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] )
- mono? ( app-emulation/wine-mono:4.7.5 )
+ mono? ( app-emulation/wine-mono:4.8.0 )
perl? (
dev-lang/perl
dev-perl/XML-Simple
@@ -138,7 +139,7 @@ usr/share/applications/wine-uninstaller.desktop
usr/share/applications/wine-winecfg.desktop"
PATCHES=(
- "${PATCHDIR}/patches/${MY_PN}-1.5.26-winegcc.patch" #260726
+ "${PATCHDIR}/patches/${MY_PN}-4.4-winegcc.patch" #260726
"${PATCHDIR}/patches/${MY_PN}-1.9.5-multilib-portage.patch" #395615
"${PATCHDIR}/patches/${MY_PN}-1.6-memset-O3.patch" #480508
"${PATCHDIR}/patches/${MY_PN}-2.0-multislot-apploader.patch" #310611
@@ -374,6 +375,7 @@ multilib_src_configure() {
$(use_with cups)
$(use_with ncurses curses)
$(use_with udisks dbus)
+ $(use_with faudio)
$(use_with fontconfig)
$(use_with ssl gnutls)
$(use_enable gecko mshtml)
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 4129dd03f202..f52576f125d1 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 481c23a33909..d40cb87dad2d 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,4 +1,3 @@
DIST portage-utils-0.62.tar.xz 527216 BLAKE2B ac8331b74998ddb86db55a937992447bccf60611cc259ceb5fe79918c1a43b6dc4633e4ad64462e2df5c39e8d8aa193bd57ab24dcd714e088357eb3cb177e972 SHA512 71b2888cef1bf7549c3829cc7d4bbe2e99a711434bae4fb78c55b9c37815b61623518f19ab87db30f533d771398933c085640dc7c8ffcedf87a70ac702a52fa1
-DIST portage-utils-0.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bfbbee01c482c496d89d2f7be988ef894e0b3c7cb64337216144644a48ee3213fc1683ae6d75091e471189a4550b8c71 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7
DIST portage-utils-0.73.tar.xz 1585564 BLAKE2B b743f459770ebceaa86cc47b0a9d0172ee495bbe2930cd57c2909d3ac2d7c1672447e84240245e1b98922004f4f34418d75b39c7e1550a34a07b964b7ecbcc8d SHA512 d35af62e3b6551c5224a3afb89ebf2e08cf42de266389c3423782c19fcfe8934433a4554ea5ed629de495a66371f0220c479fa84f24d68655211b8538e18d105
DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
deleted file mode 100644
index 1a7cb5264db2..000000000000
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit toolchain-funcs
-
-DESCRIPTION="small and fast portage helper tools written in C"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Portage-utils"
-SRC_URI="mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-RDEPEND="dev-libs/iniparser:0"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- static? ( dev-libs/iniparser:0[static-libs] )"
-
-src_prepare() {
- # bug #638970, caused by gemato writing Manifest.gz files in
- # metadata/md5-cache dir, unlike hashgen
- sed -i -e '/find [.] -mindepth/s/-type f/-type f ! -name "Manifest.*"/' \
- tests/atom_explode/dotest || die
-}
-
-src_configure() {
- # Avoid slow configure+gnulib+make if on an up-to-date Linux system
- if use prefix || ! use kernel_linux || \
- has_version ' $indexpath");
- #system ("$viewer -dump http://www.dewn.com/rfc/rfc-index.txt > $indexpath");
-- system ("$viewer -dump http://ftp.isi.edu/in-notes/rfc-index.txt > $indexpath");
-+ #system ("$viewer -dump http://ftp.isi.edu/in-notes/rfc-index.txt > $indexpath");
-+ system ("$viewer -dump http://www.ietf.org/rfc/rfc-index.txt > $indexpath");
- $indexlength=numlines($indexpath); print "new lines \t= $indexlength\t$indexpath\n";
- exit }
-
diff --git a/app-text/rfcutil/files/rfc-3.2.3-paths.patch b/app-text/rfcutil/files/rfc-3.2.3-paths.patch
deleted file mode 100644
index 8d61bdbf3889..000000000000
--- a/app-text/rfcutil/files/rfc-3.2.3-paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/rfc-3.2.3/rfc-3.2.3
-+++ b/rfc-3.2.3/rfc-3.2.3
-@@ -36,8 +36,8 @@
-
- # These make it avail for all users if you can't
- # run it as root. (full path, not ~/ )
--$indexpath="/usr/local/etc/rfc-index";
--$servpath="/usr/local/etc/nmap-services";
-+$indexpath="@GENTOO_PORTAGE_EPREFIX@/var/cache/rfc/rfc-index";
-+$servpath="@GENTOO_PORTAGE_EPREFIX@/etc/nmap-services";
-
- ####################################
- ## add as many urls as you please ##
-@@ -46,7 +46,7 @@
- !http://www.faqs.org/rfcs/
- http://www.isi.edu/in-notes/
- http://www.cis.ohio-state.edu/htbin/rfc/
-- /local/path/to/rfcs/); #MAKE SURE you have the trailing slashes
-+ @GENTOO_PORTAGE_EPREFIX@/var/cache/rfc/rfcs/); #MAKE SURE you have the trailing slashes
- # URLs beginning with an ! are treated as HTML and not text
-
- #######################
diff --git a/app-text/rfcutil/metadata.xml b/app-text/rfcutil/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-text/rfcutil/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/app-text/rfcutil/rfcutil-3.2.3-r2.ebuild b/app-text/rfcutil/rfcutil-3.2.3-r2.ebuild
deleted file mode 100644
index 2706c02ec2ab..000000000000
--- a/app-text/rfcutil/rfcutil-3.2.3-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils prefix
-
-MY_PN="rfc"
-MY_P="${MY_PN}-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="return all related RFCs based upon a number or a search string"
-HOMEPAGE="http://www.dewn.com/rfc/"
-SRC_URI="http://www.dewn.com/rfc/${MY_P}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND="dev-lang/perl
- || ( www-client/lynx virtual/w3m )"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${MY_P}-paths.patch \
- "${FILESDIR}"/${MY_P}-index.patch
- eprefixify ${MY_P}
-}
-
-src_install() {
- newbin ${MY_P} ${MY_PN}
- doman ${MY_PN}.1
- dodoc CHANGELOG KNOWN_BUGS README
- keepdir /var/cache/rfc
-}
-
-pkg_postinst() {
- elog "Gaarde suggests you make a cron.monthly to run the following:"
- elog " ${EPREFIX}/usr/bin/rfc -i"
-}
-
-pkg_prerm() {
- rm -f "${EROOT}"/var/cache/rfc/*
-}
diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
index 7fb4774e82b1..f74fe7aa8539 100644
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ b/app-text/t1utils/t1utils-1.41-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools
DESCRIPTION="Type 1 Font utilities"
SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
LICENSE="BSD"
IUSE=""
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index f938b4c7fd09..50db6384b1f9 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index e3aa34dcfbda..8973a8e60e3d 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,5 +1,6 @@
DIST mongodb-src-r3.4.16.tar.gz 40093657 BLAKE2B 7123444dbdd0b2ad3adfb3391e0177d33c1b6c6a4ea83027821c564faad047a736e52926bc15c58bef59c18282436e913fd3bc9963705e030da01356f83ea367 SHA512 e22eb1fe2a832fed8305200614988c5ecfd619cee44fe2263bffa151732c0e26584084e64065dbc65152be6e5c1767a538193770359bea92f3703c72239075db
-DIST mongodb-src-r3.6.10.tar.gz 40562421 BLAKE2B c4fbb9e9586350503df84b344e5c0e05176e681f50a0e96551f157c81c85b71e45c235f0788c1886aa5b6b79fa452afa1a6e8de4acfbfe4c4a0ae62379599f86 SHA512 e0833885a2b1fc14d99749304bd83931a9016039fa32826f9961653601975474f37003eb40fbe8cc5b09644ea447cdc59ccf63110b527d51d4c772cfff88804f
DIST mongodb-src-r3.6.11.tar.gz 40581959 BLAKE2B 86244472ce8cff5180d8833a3415dd8a43fb5c76545034822989d5be90f45ed0ef1d43cb726be1e53241255491a7a516e6f90b1c1218ad10cf4ead4557311088 SHA512 e74af9f2f40ab0e2c20b135db3f0ce17825cfe5da912ff8edb2902226abb662a6cf87038ea57df73b06b4961ba71aa78fffd542153eb30c4ea2729d642b1091d
+DIST mongodb-src-r3.6.12.tar.gz 40847074 BLAKE2B 45cc0ec4858fa4c17fb86449e6feaf11df32fd55f8a642031ce9be967127d608842cdc64e0a335af67ab3942a233d905b0778782e54dfe4c5d2ad58b828745ca SHA512 173112a05234e06ef4b6c26a092b285b4d12618b3f131fc2b73bd152c11ec42db11cb003566efefce0c98df87a520d0515a3bb1982ffdb27827cd032b1bb3f68
DIST mongodb-src-r3.6.8.tar.gz 40428295 BLAKE2B cc02f73cfb49fb38ccabaad5a02610ce73fc41895ce944e48669e254bcbc70c8872a1bd7f8e04371fae4fcd9af2466fd8550367dd1d1da5cee50b86fc5023bf2 SHA512 c981f3269be3bafb59aa89d36c39a801fd7007b60db6c09b4616a559aaf8e50b34cabbdac2b59f23552c0a5112913fba468f7e2ed9a5f4daa3702dcffdf34999
DIST mongodb-src-r4.0.6.tar.gz 49511958 BLAKE2B c372bb858528cb825db4edf11db636ad71c63148b84838f64cefe886b37631482c1e22eb99dfc557c3f51706d1d2f61b893bfd301cdeb8772a2d85ad75f8f48c SHA512 72e04154cf221833522bb0c2cc99acc2a86d20e2dcbf1f8c6ff0a870edf7b2529a55b6821c664805c00c12a311ae374a276ef1e3ccea1ed84fb125bb8726906a
+DIST mongodb-src-r4.0.8.tar.gz 49841488 BLAKE2B ed7c21e92f549337335acee41bdbabcfbfd47667dcec8744b13afde72b515df81952eaadb7bce70a663116f53ec554b927e188c000dd4ab126aabd2aaa503e76 SHA512 c109fb89e17ff4b6dbc045205f72379d647abc3b5abc9cf09db139629e9a3d67dfa8611ab87d37dbe1b8ddc90cd40613b5f762dfe13104dc50fd039ac0444b4b
diff --git a/dev-db/mongodb/mongodb-3.6.10.ebuild b/dev-db/mongodb/mongodb-3.6.12.ebuild
similarity index 100%
rename from dev-db/mongodb/mongodb-3.6.10.ebuild
rename to dev-db/mongodb/mongodb-3.6.12.ebuild
diff --git a/dev-db/mongodb/mongodb-4.0.8.ebuild b/dev-db/mongodb/mongodb-4.0.8.ebuild
new file mode 100644
index 000000000000..bb2a9fb04dc3
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.0.8.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-single-r1 scons-utils systemd toolchain-funcs user
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug kerberos libressl lto mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+ >=dev-cpp/yaml-cpp-0.5.3:=
+ >=dev-libs/boost-1.60:=[threads(+)]
+ >=dev-libs/libpcre-8.41[cxx]
+ dev-libs/snowball-stemmer
+ net-libs/libpcap
+ >=sys-libs/zlib-1.2.11:=
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+ mms-agent? ( app-admin/mms-agent )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-python/cheetah[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ virtual/python-typing[${PYTHON_USEDEP}]
+ sys-libs/ncurses:0=
+ sys-libs/readline:0=
+ debug? ( dev-util/valgrind )
+ test? (
+ dev-python/pymongo[${PYTHON_USEDEP}]
+ )"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+ "${FILESDIR}/${PN}-3.6.1-fix-scons.patch"
+ "${FILESDIR}/${PN}-4.0.0-no-compass.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_pretend() {
+ if [[ -n ${REPLACING_VERSIONS} ]]; then
+ if ver_test "$REPLACING_VERSIONS" -lt 3.6; then
+ ewarn "To upgrade from a version earlier than the 3.6-series, you must"
+ ewarn "successively upgrade major releases until you have upgraded"
+ ewarn "to 3.6-series. Then upgrade to 4.0 series."
+ else
+ ewarn "Be sure to set featureCompatibilityVersion to 3.6 before upgrading."
+ fi
+ fi
+}
+
+pkg_setup() {
+ enewgroup mongodb
+ enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # remove bundled libs
+ rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*} || die
+
+ # remove compass
+ rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+ # https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+ # --use-system-icu fails tests
+ # --use-system-tcmalloc is strongly NOT recommended:
+ scons_opts=(
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+
+ --disable-warnings-as-errors
+ --use-system-boost
+ --use-system-pcre
+ --use-system-snappy
+ --use-system-stemmer
+ --use-system-yaml
+ --use-system-zlib
+ )
+
+ use debug && scons_opts+=( --dbg=on )
+ use kerberos && scons_opts+=( --use-sasl-client )
+ use lto && scons_opts+=( --lto=on )
+ use ssl && scons_opts+=( --ssl )
+
+ # respect mongoDB upstream's basic recommendations
+ # see bug #536688 and #526114
+ if ! use debug; then
+ filter-flags '-m*'
+ filter-flags '-O?'
+ fi
+
+ default
+}
+
+src_compile() {
+ escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+ "${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+src_install() {
+ escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+ newinitd "${FILESDIR}/mongos.initd-r3" mongos
+ newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+ newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ # see bug #526114
+ pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+ local x
+ for x in /var/{lib,log}/${PN}; do
+ diropts -m0750 -o mongodb -g mongodb
+ keepdir "${x}"
+ done
+}
+
+pkg_postinst() {
+ ewarn "Make sure to read the release notes and follow the upgrade process:"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+ ewarn " https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-db/redis/metadata.xml b/dev-db/redis/metadata.xml
index 96eae677a075..d0450c61b48e 100644
--- a/dev-db/redis/metadata.xml
+++ b/dev-db/redis/metadata.xml
@@ -1,9 +1,6 @@
-
- ultrabug@gentoo.org
-
robbat2@gentoo.org
diff --git a/dev-db/rqlite/rqlite-4.4.0.ebuild b/dev-db/rqlite/rqlite-4.4.0.ebuild
index f77d97d23605..70fc7453fecf 100644
--- a/dev-db/rqlite/rqlite-4.4.0.ebuild
+++ b/dev-db/rqlite/rqlite-4.4.0.ebuild
@@ -45,6 +45,12 @@ src_compile() {
-v -work -x ${EGO_BUILD_FLAGS} ${EGO_PN}/cmd/... || die
}
+src_test() {
+ GOPATH="${WORKDIR}/${P}" \
+ GOBIN="${WORKDIR}/${P}/bin" \
+ go test -v ./... || die
+}
+
src_install() {
dobin "${WORKDIR}/${P}/bin"/${PN}{,d}
dodoc -r *.md DOC
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c4747a422722..5ad12568762e 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/echo2/Manifest b/dev-java/echo2/Manifest
deleted file mode 100644
index ffe2a9a84fe9..000000000000
--- a/dev-java/echo2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST NextApp_Echo2-2.1.1.tgz 5372814 BLAKE2B 3c16154bee1f32ee06d6fa0dca4c6108a3b7cd5be9d689aaff8102815e8f63d7efc2e3a12d9e4637f5fafe98ad6df36be1d9006e0f31db9d05a11b1470b7dfce SHA512 bad6d9a6411c6a6fe24edbd88960a5e1179f65e95a26e51610eb0b601e3941dcc82b052a385c6fd429291c524bb722a081f39bf3704b7b403ad98582c8273f26
diff --git a/dev-java/echo2/echo2-2.1.1.ebuild b/dev-java/echo2/echo2-2.1.1.ebuild
deleted file mode 100644
index 02b9fb84f2da..000000000000
--- a/dev-java/echo2/echo2-2.1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-
-JAVA_PKG_IUSE="doc source"
-inherit java-pkg-2 java-ant-2
-
-MY_PN="NextApp_Echo2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Echo2 is the next-generation of the Echo Web Framework"
-HOMEPAGE="http://www.nextapp.com/platform/echo2/echo/"
-SRC_URI="http://download.nextapp.com/downloads/echo2/${PV}/${MY_PN}.tgz -> ${MY_P}.tgz"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-SLOT="2.1"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEP="java-virtuals/servlet-api:2.4"
-
-DEPEND=">=virtual/jdk-1.4
- ${COMMON_DEP}"
-
-RDEPEND=">=virtual/jre-1.4
- ${COMMON_DEP}"
-
-S=${WORKDIR}/${MY_PN}/
-
-java_prepare() {
- rm -rfv BinaryLibraries || die
- echo "servlet.lib.jar=$(java-pkg_getjars servlet-api-2.4)" >> SourceCode/ant.properties || die
-}
-
-src_compile() {
- cd SourceCode || die
- eant dist $(use_doc doc.public)
-}
-
-src_install() {
- java-pkg_dojar SourceCode/dist/lib/*.jar
- use doc && {
- cp Documentation/api/public/*.html SourceCode/javadoc/public
- java-pkg_dojavadoc SourceCode/javadoc/public
- }
- use source && java-pkg_dosrc SourceCode/src
- dodoc ReadMe.txt || die "dodoc failed"
-}
diff --git a/dev-java/echo2/metadata.xml b/dev-java/echo2/metadata.xml
deleted file mode 100644
index 952a4b9b605c..000000000000
--- a/dev-java/echo2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- java@gentoo.org
- Java
-
-
diff --git a/dev-java/xerces/xerces-2.11.0-r1.ebuild b/dev-java/xerces/xerces-2.11.0-r2.ebuild
similarity index 92%
rename from dev-java/xerces/xerces-2.11.0-r1.ebuild
rename to dev-java/xerces/xerces-2.11.0-r2.ebuild
index 5a696217d556..e0289d295c87 100644
--- a/dev-java/xerces/xerces-2.11.0-r1.ebuild
+++ b/dev-java/xerces/xerces-2.11.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
IUSE=""
# they are missing from the upstream tarball"
@@ -31,7 +31,7 @@ RDEPEND="
DEPEND="
${CDEPEND}
>=virtual/jdk-1.6
- >=dev-java/xjavac-20110814:1"
+ dev-java/xjavac:1"
S="${WORKDIR}/${PN}-${SRC_PV}"
diff --git a/dev-java/xerces/xerces-2.11.0.ebuild b/dev-java/xerces/xerces-2.11.0.ebuild
deleted file mode 100644
index ec1b7dadb09a..000000000000
--- a/dev-java/xerces/xerces-2.11.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit eutils versionator java-pkg-2 java-ant-2
-
-DIST_PN="Xerces-J"
-SRC_PV="$(replace_all_version_separators _ )"
-DESCRIPTION="The next generation of high performance, fully compliant XML parsers"
-HOMEPAGE="http://xml.apache.org/xerces2-j/index.html"
-SRC_URI="mirror://apache/${PN}/j/${DIST_PN}-src.${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# they are missing from the upstream tarball"
-RESTRICT="test"
-
-COMMON_DEP="
- dev-java/xml-commons-external:1.4
- >=dev-java/xml-commons-resolver-1.2:0"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.4"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.4
- >=dev-java/xjavac-20110814:1"
-
-S="${WORKDIR}/${PN}-${SRC_PV}"
-
-java_prepare() {
- epatch "${FILESDIR}/${P}-build.xml.patch"
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
-
-EANT_ANT_TASKS="xjavac-1"
-EANT_GENTOO_CLASSPATH="xml-commons-resolver,xml-commons-external-1.4"
-EANT_DOC_TARGET="javadocs"
-# known small bug - javadocs use custom taglets, which come as bundled jar in
-# xerces-J-tools.${PV}.tar.gz. Should find the taglets source instead.
-EANT_EXTRA_ARGS="-Dadditional.param="
-
-src_install() {
- java-pkg_dojar build/xercesImpl.jar
-
- dodoc README NOTICE
- dohtml Readme.html
-
- use doc && java-pkg_dojavadoc build/docs/javadocs/xerces2
- use examples && java-pkg_doexamples samples
- use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/xjavac/Manifest b/dev-java/xjavac/Manifest
index b838a9c8716a..5df3da88841d 100644
--- a/dev-java/xjavac/Manifest
+++ b/dev-java/xjavac/Manifest
@@ -1,2 +1 @@
DIST xjavac-2.4.0.tar.gz 2472 BLAKE2B 4693c2fa74a2951909ff6dc55638e7f3de19fecf82bcfeba0abfeaff82f941ea9d02dde3de969e850da9c5bfc98684b0a34be391d6db6c3fe12de0a734137afd SHA512 6a12c605f6f455f20981214d1ce8ed752070ae2b268e9279692a3b05921c84857636055d9c4d7b1de92bafbaa4b528f36983dc2eca0ca883a7fa340320e503a0
-DIST xjavac-20110814.tar.gz 2217 BLAKE2B 2a2faa87f958c1a089ae600798eca190c7784f5343887fd6236447e433f500bf134f9241dfd98aca4a1a0223811f9a426c0f7a3c73c4b7c4fd6c682e30561cd3 SHA512 f4c5aa437d135a8495c926387df68df8f47878e206ea8f279a7c3e8e32561dbac5a8c8002f77a2bf03863f42475cad5068e3c1031121b64b32fb4d15242c3b3e
diff --git a/dev-java/xjavac/files/xjavac-20041208-build.xml b/dev-java/xjavac/files/xjavac-20041208-build.xml
deleted file mode 100644
index 5c9a466ca8e8..000000000000
--- a/dev-java/xjavac/files/xjavac-20041208-build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dev-java/xjavac/xjavac-2.4.0.ebuild b/dev-java/xjavac/xjavac-2.4.0.ebuild
index 8198e0008d8d..b5095e081fb6 100644
--- a/dev-java/xjavac/xjavac-2.4.0.ebuild
+++ b/dev-java/xjavac/xjavac-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND="dev-java/ant-core:0"
diff --git a/dev-java/xjavac/xjavac-20110814.ebuild b/dev-java/xjavac/xjavac-20110814.ebuild
deleted file mode 100644
index 9478e4db552b..000000000000
--- a/dev-java/xjavac/xjavac-20110814.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The implementation of the javac compiler for IBM JDK 1.4 (needed for xerces-2)"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-#Note that the tarball has xjavac-ibm-1_5.patch already applied (not in upstream)
-IUSE=""
-HOMEPAGE="http://cvs.apache.org/viewcvs.cgi/xml-xerces/java/tools/src/XJavac.java"
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=">=virtual/jdk-1.4
- >=dev-java/ant-core-1.7"
-
-java_prepare() {
- cp "${FILESDIR}/${PN}-20041208-build.xml" ./build.xml || die "failed to cp build.xml"
-}
-
-src_compile() {
- eant jar -Dclasspath=$(java-pkg_getjars ant-core)
-}
-
-src_install() {
- java-pkg_dojar dist/${PN}.jar
-}
diff --git a/dev-java/zemberek/Manifest b/dev-java/zemberek/Manifest
deleted file mode 100644
index 6c225f699825..000000000000
--- a/dev-java/zemberek/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST zemberek-2.1.1-nolibs-src.zip 1196289 BLAKE2B c8ddc242e8f6bb63ecaff586b2a1f051ca928ab31033881dc2d76e1c9a0c2e0ac1648bbd77fa6eae6d84054b64d78495446369acd72ed97ce67cb87f4d7e305b SHA512 e97342271294504a0e9df7bbc60f68beed137311254f5cc6d7558befa106737b75b0dcb7a86033f506eda3783d98ba2788cf5da69497f18861dd8cd79bb27955
diff --git a/dev-java/zemberek/files/zemberek-2.1.1-classpathfix.patch b/dev-java/zemberek/files/zemberek-2.1.1-classpathfix.patch
deleted file mode 100644
index fa6c572c1cbf..000000000000
--- a/dev-java/zemberek/files/zemberek-2.1.1-classpathfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur zemberek-2.1.1-nolibs-src/build.xml zemberek-2.1.1-nolibs-src_patched/build.xml
---- zemberek-2.1.1-nolibs-src/build.xml 2008-09-01 23:07:28.000000000 +0300
-+++ zemberek-2.1.1-nolibs-src_patched/build.xml 2009-04-23 23:03:01.000000000 +0300
-@@ -42,7 +42,7 @@
-
-
-
--
-+
-
-
-
diff --git a/dev-java/zemberek/metadata.xml b/dev-java/zemberek/metadata.xml
deleted file mode 100644
index 804d6e9e3ad2..000000000000
--- a/dev-java/zemberek/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- java@gentoo.org
-
-
- zemberek
- ahmetaa/zemberek-nlp
-
-
diff --git a/dev-java/zemberek/zemberek-2.1.1.ebuild b/dev-java/zemberek/zemberek-2.1.1.ebuild
deleted file mode 100644
index 50f66f788140..000000000000
--- a/dev-java/zemberek/zemberek-2.1.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-JAVA_PKG_IUSE="source doc test"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Zemberek NLP library"
-HOMEPAGE="https://github.com/ahmetaa/zemberek-nlp"
-SRC_URI="https://${PN}.googlecode.com/files/${P}-nolibs-src.zip"
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-LANGS="tr tk"
-
-S=${WORKDIR}/${P}-nolibs-src
-
-IUSE="l10n_tk +l10n_tr"
-
-RDEPEND=">=virtual/jre-1.5"
-
-DEPEND=">=virtual/jdk-1.5
- test?
- (
- dev-java/junit:4
- dev-java/ant-junit4
- dev-java/hamcrest-core
- )
- app-arch/unzip"
-
-java_prepare() {
- use test && java-pkg_jarfrom --build-only --into lib/gelistirme junit-4 junit.jar
- # Added hamcrest-core as a workaround
- # Issue spotted by Markus Meier
- # See https://bugs.gentoo.org/show_bug.cgi?id=253753#c3
- use test && java-pkg_jarfrom --build-only --into lib/gelistirme hamcrest-core
- epatch "${FILESDIR}"/${P}-classpathfix.patch
-}
-
-src_compile() {
- local anttargs langs="" jar
- for jar in ${LANGS}; do
- use l10n_${jar} && langs+=" ${jar}"
- done
- for jar in cekirdek demo ${langs}; do
- anttargs="${anttargs} jar-${jar}"
- done
- eant ${anttargs} $(use_doc javadocs)
-}
-
-src_install() {
- local sourcetrees="" langs="" jar
- for jar in ${LANGS}; do
- use l10n_${jar} && langs+=" ${jar}"
- done
- for jar in cekirdek demo ${langs}; do
- java-pkg_newjar dagitim/jar/zemberek-${jar}-${PV}.jar zemberek2-${jar}.jar
- sourcetrees="${sourcetrees} src/${jar}/net"
- done
- use source && java-pkg_dosrc ${sourcetrees}
- use doc && java-pkg_dojavadoc build/java-docs/api
- java-pkg_dolauncher zemberek-demo --main net.zemberek.demo.DemoMain
- dodoc dokuman/lisanslar/* || die
- dodoc surumler.txt || die
-}
-
-src_test() {
- ANT_TASKS="ant-junit4" eant unit-test
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 0c2ac87e8e15..d4e29f4d010f 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/rust/files/1.34.0-doc-build-fix.patch b/dev-lang/rust/files/1.34.0-doc-build-fix.patch
new file mode 100644
index 000000000000..52b8d6ea7f73
--- /dev/null
+++ b/dev-lang/rust/files/1.34.0-doc-build-fix.patch
@@ -0,0 +1,442 @@
+From 9efc93c96dd6746460cef916d307b72ba21a7fd0 Mon Sep 17 00:00:00 2001
+From: Mark Rousskov
+Date: Sun, 3 Mar 2019 09:29:59 -0700
+Subject: [PATCH 1/2] Tools built by the bootstrap compiler must be built by it
+
+This avoids building compilers that we don't need -- most tools will work
+just fine with the downloaded compiler.
+---
+ src/bootstrap/doc.rs | 6 ++-
+ src/bootstrap/test.rs | 10 ++--
+ src/bootstrap/tool.rs | 104 +++++++++++++++++++++++++++---------------
+ 3 files changed, 78 insertions(+), 42 deletions(-)
+
+diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
+index e0ad0422a6ce..621e3a95473e 100644
+--- a/src/bootstrap/doc.rs
++++ b/src/bootstrap/doc.rs
+@@ -883,7 +883,11 @@ impl Step for ErrorIndex {
+ builder.info(&format!("Documenting error index ({})", target));
+ let out = builder.doc_out(target);
+ t!(fs::create_dir_all(&out));
+- let mut index = builder.tool_cmd(Tool::ErrorIndex);
++ let compiler = builder.compiler(2, builder.config.build);
++ let mut index = tool::ErrorIndex::command(
++ builder,
++ compiler,
++ );
+ index.arg("html");
+ index.arg(out.join("error-index.html"));
+
+diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
+index 51412f79c3d0..5abf9d699784 100644
+--- a/src/bootstrap/test.rs
++++ b/src/bootstrap/test.rs
+@@ -414,7 +414,6 @@ impl Step for Miri {
+
+ #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+ pub struct CompiletestTest {
+- stage: u32,
+ host: Interned,
+ }
+
+@@ -427,16 +426,14 @@ impl Step for CompiletestTest {
+
+ fn make_run(run: RunConfig<'_>) {
+ run.builder.ensure(CompiletestTest {
+- stage: run.builder.top_stage,
+ host: run.target,
+ });
+ }
+
+ /// Runs `cargo test` for compiletest.
+ fn run(self, builder: &Builder<'_>) {
+- let stage = self.stage;
+ let host = self.host;
+- let compiler = builder.compiler(stage, host);
++ let compiler = builder.compiler(0, host);
+
+ let mut cargo = tool::prepare_tool_cargo(builder,
+ compiler,
+@@ -1426,7 +1423,10 @@ impl Step for ErrorIndex {
+ t!(fs::create_dir_all(&dir));
+ let output = dir.join("error-index.md");
+
+- let mut tool = builder.tool_cmd(Tool::ErrorIndex);
++ let mut tool = tool::ErrorIndex::command(
++ builder,
++ builder.compiler(compiler.stage, builder.config.build),
++ );
+ tool.arg("markdown")
+ .arg(&output)
+ .env("CFG_BUILD", &builder.config.build)
+diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
+index fc1a17d54667..4f2aa0b795dc 100644
+--- a/src/bootstrap/tool.rs
++++ b/src/bootstrap/tool.rs
+@@ -250,9 +250,9 @@ pub fn prepare_tool_cargo(
+ cargo
+ }
+
+-macro_rules! tool {
++macro_rules! bootstrap_tool {
+ ($(
+- $name:ident, $path:expr, $tool_name:expr, $mode:expr
++ $name:ident, $path:expr, $tool_name:expr
+ $(,llvm_tools = $llvm:expr)*
+ $(,is_external_tool = $external:expr)*
+ ;
+@@ -266,10 +266,7 @@ macro_rules! tool {
+
+ impl Tool {
+ pub fn get_mode(&self) -> Mode {
+- let mode = match self {
+- $(Tool::$name => $mode,)+
+- };
+- mode
++ Mode::ToolBootstrap
+ }
+
+ /// Whether this tool requires LLVM to run
+@@ -282,27 +279,15 @@ macro_rules! tool {
+
+ impl<'a> Builder<'a> {
+ pub fn tool_exe(&self, tool: Tool) -> PathBuf {
+- let stage = self.tool_default_stage(tool);
+ match tool {
+ $(Tool::$name =>
+ self.ensure($name {
+- compiler: self.compiler(stage, self.config.build),
++ compiler: self.compiler(0, self.config.build),
+ target: self.config.build,
+ }),
+ )+
+ }
+ }
+-
+- pub fn tool_default_stage(&self, tool: Tool) -> u32 {
+- // Compile the error-index in the same stage as rustdoc to avoid
+- // recompiling rustdoc twice if we can. Otherwise compile
+- // everything else in stage0 as there's no need to rebootstrap
+- // everything.
+- match tool {
+- Tool::ErrorIndex if self.top_stage >= 2 => self.top_stage,
+- _ => 0,
+- }
+- }
+ }
+
+ $(
+@@ -321,7 +306,8 @@ macro_rules! tool {
+
+ fn make_run(run: RunConfig<'_>) {
+ run.builder.ensure($name {
+- compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
++ // snapshot compiler
++ compiler: run.builder.compiler(0, run.builder.config.build),
+ target: run.target,
+ });
+ }
+@@ -331,7 +317,7 @@ macro_rules! tool {
+ compiler: self.compiler,
+ target: self.target,
+ tool: $tool_name,
+- mode: $mode,
++ mode: Mode::ToolBootstrap,
+ path: $path,
+ is_optional_tool: false,
+ source_type: if false $(|| $external)* {
+@@ -347,21 +333,67 @@ macro_rules! tool {
+ }
+ }
+
+-tool!(
+- Rustbook, "src/tools/rustbook", "rustbook", Mode::ToolBootstrap;
+- ErrorIndex, "src/tools/error_index_generator", "error_index_generator", Mode::ToolRustc;
+- UnstableBookGen, "src/tools/unstable-book-gen", "unstable-book-gen", Mode::ToolBootstrap;
+- Tidy, "src/tools/tidy", "tidy", Mode::ToolBootstrap;
+- Linkchecker, "src/tools/linkchecker", "linkchecker", Mode::ToolBootstrap;
+- CargoTest, "src/tools/cargotest", "cargotest", Mode::ToolBootstrap;
+- Compiletest, "src/tools/compiletest", "compiletest", Mode::ToolBootstrap, llvm_tools = true;
+- BuildManifest, "src/tools/build-manifest", "build-manifest", Mode::ToolBootstrap;
+- RemoteTestClient, "src/tools/remote-test-client", "remote-test-client", Mode::ToolBootstrap;
+- RustInstaller, "src/tools/rust-installer", "fabricate", Mode::ToolBootstrap,
+- is_external_tool = true;
+- RustdocTheme, "src/tools/rustdoc-themes", "rustdoc-themes", Mode::ToolBootstrap;
++bootstrap_tool!(
++ Rustbook, "src/tools/rustbook", "rustbook";
++ UnstableBookGen, "src/tools/unstable-book-gen", "unstable-book-gen";
++ Tidy, "src/tools/tidy", "tidy";
++ Linkchecker, "src/tools/linkchecker", "linkchecker";
++ CargoTest, "src/tools/cargotest", "cargotest";
++ Compiletest, "src/tools/compiletest", "compiletest", llvm_tools = true;
++ BuildManifest, "src/tools/build-manifest", "build-manifest";
++ RemoteTestClient, "src/tools/remote-test-client", "remote-test-client";
++ RustInstaller, "src/tools/rust-installer", "fabricate", is_external_tool = true;
++ RustdocTheme, "src/tools/rustdoc-themes", "rustdoc-themes";
+ );
+
++#[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
++pub struct ErrorIndex {
++ pub compiler: Compiler,
++}
++
++impl ErrorIndex {
++ pub fn command(builder: &Builder<'_>, compiler: Compiler) -> Command {
++ let mut cmd = Command::new(builder.ensure(ErrorIndex {
++ compiler
++ }));
++ add_lib_path(
++ vec![PathBuf::from(&builder.sysroot_libdir(compiler, compiler.host))],
++ &mut cmd,
++ );
++ cmd
++ }
++}
++
++impl Step for ErrorIndex {
++ type Output = PathBuf;
++
++ fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
++ run.path("src/tools/error_index_generator")
++ }
++
++ fn make_run(run: RunConfig<'_>) {
++ // Compile the error-index in the same stage as rustdoc to avoid
++ // recompiling rustdoc twice if we can.
++ let stage = if run.builder.top_stage >= 2 { run.builder.top_stage } else { 0 };
++ run.builder.ensure(ErrorIndex {
++ compiler: run.builder.compiler(stage, run.builder.config.build),
++ });
++ }
++
++ fn run(self, builder: &Builder<'_>) -> PathBuf {
++ builder.ensure(ToolBuild {
++ compiler: self.compiler,
++ target: self.compiler.host,
++ tool: "error_index_generator",
++ mode: Mode::ToolRustc,
++ path: "src/tools/error_index_generator",
++ is_optional_tool: false,
++ source_type: SourceType::InTree,
++ extra_features: Vec::new(),
++ }).expect("expected to build -- essential tool")
++ }
++}
++
+ #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+ pub struct RemoteTestServer {
+ pub compiler: Compiler,
+@@ -625,7 +657,7 @@ impl<'a> Builder<'a> {
+ /// `host`.
+ pub fn tool_cmd(&self, tool: Tool) -> Command {
+ let mut cmd = Command::new(self.tool_exe(tool));
+- let compiler = self.compiler(self.tool_default_stage(tool), self.config.build);
++ let compiler = self.compiler(0, self.config.build);
+ self.prepare_tool_cmd(compiler, tool, &mut cmd);
+ cmd
+ }
+@@ -637,7 +669,7 @@ impl<'a> Builder<'a> {
+ fn prepare_tool_cmd(&self, compiler: Compiler, tool: Tool, cmd: &mut Command) {
+ let host = &compiler.host;
+ let mut lib_paths: Vec = vec![
+- if compiler.stage == 0 && tool != Tool::ErrorIndex {
++ if compiler.stage == 0 {
+ self.build.rustc_snapshot_libdir()
+ } else {
+ PathBuf::from(&self.sysroot_libdir(compiler, compiler.host))
+
+From 03718ed67a7b8fd57fc27316ec57ac3bc0f13d06 Mon Sep 17 00:00:00 2001
+From: Mark Rousskov
+Date: Sun, 3 Mar 2019 09:50:56 -0700
+Subject: [PATCH 2/2] Permit getting stage 0 rustdoc
+
+This allows us to e.g. test compiletest, including doctests, in stage 0
+without building a fresh compiler and rustdoc.
+---
+ src/bootstrap/builder.rs | 15 +++++++--------
+ src/bootstrap/dist.rs | 2 +-
+ src/bootstrap/doc.rs | 8 ++++----
+ src/bootstrap/test.rs | 8 ++++----
+ src/bootstrap/tool.rs | 8 +++++---
+ 5 files changed, 21 insertions(+), 20 deletions(-)
+
+diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
+index 7e6c0a9f52aa..f8b7f25a7543 100644
+--- a/src/bootstrap/builder.rs
++++ b/src/bootstrap/builder.rs
+@@ -668,20 +668,19 @@ impl<'a> Builder<'a> {
+ .map(|entry| entry.path())
+ }
+
+- pub fn rustdoc(&self, host: Interned) -> PathBuf {
+- self.ensure(tool::Rustdoc { host })
++ pub fn rustdoc(&self, compiler: Compiler) -> PathBuf {
++ self.ensure(tool::Rustdoc { compiler })
+ }
+
+- pub fn rustdoc_cmd(&self, host: Interned) -> Command {
++ pub fn rustdoc_cmd(&self, compiler: Compiler) -> Command {
+ let mut cmd = Command::new(&self.out.join("bootstrap/debug/rustdoc"));
+- let compiler = self.compiler(self.top_stage, host);
+ cmd.env("RUSTC_STAGE", compiler.stage.to_string())
+ .env("RUSTC_SYSROOT", self.sysroot(compiler))
+ // Note that this is *not* the sysroot_libdir because rustdoc must be linked
+ // equivalently to rustc.
+ .env("RUSTDOC_LIBDIR", self.rustc_libdir(compiler))
+ .env("CFG_RELEASE_CHANNEL", &self.config.channel)
+- .env("RUSTDOC_REAL", self.rustdoc(host))
++ .env("RUSTDOC_REAL", self.rustdoc(compiler))
+ .env("RUSTDOC_CRATE_VERSION", self.rust_version())
+ .env("RUSTC_BOOTSTRAP", "1");
+
+@@ -689,7 +688,7 @@ impl<'a> Builder<'a> {
+ cmd.env_remove("MAKEFLAGS");
+ cmd.env_remove("MFLAGS");
+
+- if let Some(linker) = self.linker(host) {
++ if let Some(linker) = self.linker(compiler.host) {
+ cmd.env("RUSTC_TARGET_LINKER", linker);
+ }
+ cmd
+@@ -751,7 +750,7 @@ impl<'a> Builder<'a> {
+ // This is the intended out directory for compiler documentation.
+ my_out = self.compiler_doc_out(target);
+ }
+- let rustdoc = self.rustdoc(compiler.host);
++ let rustdoc = self.rustdoc(compiler);
+ self.clear_if_dirty(&my_out, &rustdoc);
+ } else if cmd != "test" {
+ match mode {
+@@ -897,7 +896,7 @@ impl<'a> Builder<'a> {
+ .env(
+ "RUSTDOC_REAL",
+ if cmd == "doc" || cmd == "rustdoc" || (cmd == "test" && want_rustdoc) {
+- self.rustdoc(compiler.host)
++ self.rustdoc(compiler)
+ } else {
+ PathBuf::from("/path/to/nowhere/rustdoc/not/required")
+ },
+diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
+index 2dae3f9135d8..3045cda125ee 100644
+--- a/src/bootstrap/dist.rs
++++ b/src/bootstrap/dist.rs
+@@ -479,7 +479,7 @@ impl Step for Rustc {
+ t!(fs::create_dir_all(image.join("bin")));
+ builder.cp_r(&src.join("bin"), &image.join("bin"));
+
+- builder.install(&builder.rustdoc(compiler.host), &image.join("bin"), 0o755);
++ builder.install(&builder.rustdoc(compiler), &image.join("bin"), 0o755);
+
+ // Copy runtime DLLs needed by the compiler
+ if libdir != "bin" {
+diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
+index 621e3a95473e..ae329286486d 100644
+--- a/src/bootstrap/doc.rs
++++ b/src/bootstrap/doc.rs
+@@ -335,7 +335,7 @@ fn invoke_rustdoc(
+ let footer = builder.src.join("src/doc/footer.inc");
+ let version_info = out.join("version_info.html");
+
+- let mut cmd = builder.rustdoc_cmd(compiler.host);
++ let mut cmd = builder.rustdoc_cmd(compiler);
+
+ let out = out.join("book");
+
+@@ -415,7 +415,7 @@ impl Step for Standalone {
+ }
+
+ let html = out.join(filename).with_extension("html");
+- let rustdoc = builder.rustdoc(compiler.host);
++ let rustdoc = builder.rustdoc(compiler);
+ if up_to_date(&path, &html) &&
+ up_to_date(&footer, &html) &&
+ up_to_date(&favicon, &html) &&
+@@ -425,7 +425,7 @@ impl Step for Standalone {
+ continue
+ }
+
+- let mut cmd = builder.rustdoc_cmd(compiler.host);
++ let mut cmd = builder.rustdoc_cmd(compiler);
+ cmd.arg("--html-after-content").arg(&footer)
+ .arg("--html-before-content").arg(&version_info)
+ .arg("--html-in-header").arg(&favicon)
+@@ -824,7 +824,7 @@ impl Step for Rustdoc {
+ builder.ensure(Rustc { stage, target });
+
+ // Build rustdoc.
+- builder.ensure(tool::Rustdoc { host: compiler.host });
++ builder.ensure(tool::Rustdoc { compiler: compiler });
+
+ // Symlink compiler docs to the output directory of rustdoc documentation.
+ let out_dir = builder.stage_out(compiler, Mode::ToolRustc)
+diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
+index 5abf9d699784..6b9960c355c5 100644
+--- a/src/bootstrap/test.rs
++++ b/src/bootstrap/test.rs
+@@ -177,7 +177,7 @@ impl Step for Cargotest {
+ cmd.arg(&builder.initial_cargo)
+ .arg(&out_dir)
+ .env("RUSTC", builder.rustc(compiler))
+- .env("RUSTDOC", builder.rustdoc(compiler.host)),
++ .env("RUSTDOC", builder.rustdoc(compiler)),
+ );
+ }
+ }
+@@ -560,7 +560,7 @@ impl Step for RustdocTheme {
+ builder.sysroot_libdir(self.compiler, self.compiler.host),
+ )
+ .env("CFG_RELEASE_CHANNEL", &builder.config.channel)
+- .env("RUSTDOC_REAL", builder.rustdoc(self.compiler.host))
++ .env("RUSTDOC_REAL", builder.rustdoc(self.compiler))
+ .env("RUSTDOC_CRATE_VERSION", builder.rust_version())
+ .env("RUSTC_BOOTSTRAP", "1");
+ if let Some(linker) = builder.linker(self.compiler.host) {
+@@ -995,7 +995,7 @@ impl Step for Compiletest {
+ || (mode == "ui" && is_rustdoc_ui)
+ {
+ cmd.arg("--rustdoc-path")
+- .arg(builder.rustdoc(compiler.host));
++ .arg(builder.rustdoc(compiler));
+ }
+
+ cmd.arg("--src-base")
+@@ -1451,7 +1451,7 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) ->
+ }
+
+ builder.info(&format!("doc tests for: {}", markdown.display()));
+- let mut cmd = builder.rustdoc_cmd(compiler.host);
++ let mut cmd = builder.rustdoc_cmd(compiler);
+ builder.add_rust_test_threads(&mut cmd);
+ cmd.arg("--test");
+ cmd.arg(markdown);
+diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
+index 4f2aa0b795dc..5fb83caac06c 100644
+--- a/src/bootstrap/tool.rs
++++ b/src/bootstrap/tool.rs
+@@ -430,7 +430,9 @@ impl Step for RemoteTestServer {
+
+ #[derive(Debug, Copy, Clone, Hash, PartialEq, Eq)]
+ pub struct Rustdoc {
+- pub host: Interned,
++ /// This should only ever be 0 or 2.
++ /// We sometimes want to reference the "bootstrap" rustdoc, which is why this option is here.
++ pub compiler: Compiler,
+ }
+
+ impl Step for Rustdoc {
+@@ -444,12 +446,12 @@ impl Step for Rustdoc {
+
+ fn make_run(run: RunConfig<'_>) {
+ run.builder.ensure(Rustdoc {
+- host: run.host,
++ compiler: run.builder.compiler(run.builder.top_stage, run.host),
+ });
+ }
+
+ fn run(self, builder: &Builder<'_>) -> PathBuf {
+- let target_compiler = builder.compiler(builder.top_stage, self.host);
++ let target_compiler = self.compiler;
+ if target_compiler.stage == 0 {
+ if !target_compiler.is_snapshot(builder) {
+ panic!("rustdoc in stage 0 must be snapshot rustdoc");
diff --git a/dev-lang/rust/rust-1.34.0-r1.ebuild b/dev-lang/rust/rust-1.34.0-r1.ebuild
index 7a082deb1503..fd69e01c52bb 100644
--- a/dev-lang/rust/rust-1.34.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.34.0-r1.ebuild
@@ -82,7 +82,10 @@ REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
x86? ( cpu_flags_x86_sse2 )
"
-PATCHES=( "${FILESDIR}"/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch )
+PATCHES=(
+ "${FILESDIR}"/0001-llvm-cmake-Add-additional-headers-only-if-they-exist.patch
+ "${FILESDIR}"/1.34.0-doc-build-fix.patch
+)
S="${WORKDIR}/${MY_P}-src"
@@ -232,21 +235,21 @@ src_install() {
env DESTDIR="${D}" "${EPYTHON}" ./x.py install -v || die
- mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
- mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
- mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
- mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
- mv "${D}/usr/bin/cargo" "${D}/usr/bin/cargo-${PV}" || die
+ mv "${ED}/usr/bin/rustc" "${ED}/usr/bin/rustc-${PV}" || die
+ mv "${ED}/usr/bin/rustdoc" "${ED}/usr/bin/rustdoc-${PV}" || die
+ mv "${ED}/usr/bin/rust-gdb" "${ED}/usr/bin/rust-gdb-${PV}" || die
+ mv "${ED}/usr/bin/rust-lldb" "${ED}/usr/bin/rust-lldb-${PV}" || die
+ mv "${ED}/usr/bin/cargo" "${ED}/usr/bin/cargo-${PV}" || die
if use clippy; then
- mv "${D}/usr/bin/clippy-driver" "${D}/usr/bin/clippy-driver-${PV}" || die
- mv "${D}/usr/bin/cargo-clippy" "${D}/usr/bin/cargo-clippy-${PV}" || die
+ mv "${ED}/usr/bin/clippy-driver" "${ED}/usr/bin/clippy-driver-${PV}" || die
+ mv "${ED}/usr/bin/cargo-clippy" "${ED}/usr/bin/cargo-clippy-${PV}" || die
fi
if use rls; then
- mv "${D}/usr/bin/rls" "${D}/usr/bin/rls-${PV}" || die
+ mv "${ED}/usr/bin/rls" "${ED}/usr/bin/rls-${PV}" || die
fi
if use rustfmt; then
- mv "${D}/usr/bin/rustfmt" "${D}/usr/bin/rustfmt-${PV}" || die
- mv "${D}/usr/bin/cargo-fmt" "${D}/usr/bin/cargo-fmt-${PV}" || die
+ mv "${ED}/usr/bin/rustfmt" "${ED}/usr/bin/rustfmt-${PV}" || die
+ mv "${ED}/usr/bin/cargo-fmt" "${ED}/usr/bin/cargo-fmt-${PV}" || die
fi
# Copy shared library versions of standard libraries for all targets
@@ -258,9 +261,9 @@ src_install() {
fi
abi_libdir=$(get_abi_LIBDIR ${v##*.})
rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
- mkdir -p "${D}/usr/${abi_libdir}"
- cp "${D}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \
- "${D}/usr/${abi_libdir}" || die
+ mkdir -p "${ED}/usr/${abi_libdir}"
+ cp "${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/lib"/*.so \
+ "${ED}/usr/${abi_libdir}" || die
done
dodoc COPYRIGHT
@@ -268,11 +271,12 @@ src_install() {
# FIXME:
# Really not sure if that env is needed, specailly LDPATH
cat <<-EOF > "${T}"/50${P}
- LDPATH="/usr/$(get_libdir)/${P}"
- MANPATH="/usr/share/${P}/man"
+ LDPATH="${EPREFIX}/usr/$(get_libdir)/${P}"
+ MANPATH="${EPREFIX}/usr/share/${P}/man"
EOF
doenvd "${T}"/50${P}
+ # note: eselect-rust adds EROOT to all paths below
cat <<-EOF > "${T}/provider-${P}"
/usr/bin/rustdoc
/usr/bin/rust-gdb
diff --git a/dev-lang/vala/vala-0.36.18.ebuild b/dev-lang/vala/vala-0.36.18.ebuild
index 4eb2ef502e28..b1535e0e1ee2 100644
--- a/dev-lang/vala/vala-0.36.18.ebuild
+++ b/dev-lang/vala/vala-0.36.18.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1"
SLOT="0.36"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-lang/vala/vala-0.40.14.ebuild b/dev-lang/vala/vala-0.40.14.ebuild
index 83784bf0a955..07ab9c96049d 100644
--- a/dev-lang/vala/vala-0.40.14.ebuild
+++ b/dev-lang/vala/vala-0.40.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1"
SLOT="0.40"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
IUSE="test valadoc"
RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 813b79e375b1..97245ad146e5 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild b/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
index 29f9dfb72665..ac621115d48c 100644
--- a/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
+++ b/dev-libs/boost-mpl-cartesian_product/boost-mpl-cartesian_product-20161205.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ inherit vcs-snapshot toolchain-funcs
COMMIT="aeb0266b3a89f32c390dff51cb73a454d5d7a745"
DESCRIPTION="an extension to the Boost.MPL library"
-HOMEPAGE="http://www.organicvectory.com/index.php?option=com_content&view=article&id=75:boostmplcartesianproduct&catid=42:boost&Itemid=78"
+HOMEPAGE="https://github.com/quinoacomputing/BoostMPLCartesianProduct"
SRC_URI="https://github.com/quinoacomputing/BoostMPLCartesianProduct/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="Boost-1.0"
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 19a425758e86..2b2ef1bcd319 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -2,3 +2,4 @@ DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6a
DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 9ab1fe396b10ab85d7e4084ec7abb8d785ecd892c8f51aea5a401cb565b111c256533364fe028da74ed376534889f43c5ccbdcd703cd236526ae66a064220765 SHA512 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
DIST boost_1_67_0.tar.bz2 87336566 BLAKE2B 85ea00fc2197b1bbfc35d69427c87f23ea43d7592f1c9ce66e2afcde8476bdec86f6debdac815b23de59f4665a8e0c7f1519ab66a31d39df629723bc45710058 SHA512 82bf33d7d2c3db109c9d1f12d40bc2d364c8c95262386f906ccd1a71cd71433bcc01829e968b4a13a5003cf0b50cbdf0b435a1d76530cea7bb05725c327411e8
+DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
diff --git a/dev-libs/boost/boost-1.70.0.ebuild b/dev-libs/boost/boost-1.70.0.ebuild
new file mode 100644
index 000000000000..68a0140f7781
--- /dev/null
+++ b/dev-libs/boost/boost-1.70.0.ebuild
@@ -0,0 +1,330 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit flag-o-matic multiprocessing python-r1 toolchain-funcs multilib-minimal
+
+MY_P="${PN}_$(ver_rs 1- _)"
+MAJOR_V="$(ver_cut 1-2)"
+
+DESCRIPTION="Boost Libraries for C++"
+HOMEPAGE="https://www.boost.org/"
+SRC_URI="https://downloads.sourceforge.net/project/boost/${PN}/${PV}/${MY_P}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0/${PV}" # ${PV} instead ${MAJOR_V} due to bug 486122
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt"
+IUSE="bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd"
+REQUIRED_USE="
+ mpi? ( threads )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+# the tests will never fail because these are not intended as sanity
+# tests at all. They are more a way for upstream to check their own code
+# on new compilers. Since they would either be completely unreliable
+# (failing for no good reason) or completely useless (never failing)
+# there is no point in having them in the ebuild to begin with.
+RESTRICT="test"
+
+RDEPEND="
+ !app-admin/eselect-boost
+ bzip2? ( app-arch/bzip2:=[${MULTILIB_USEDEP}] )
+ icu? ( >=dev-libs/icu-3.6:=[${MULTILIB_USEDEP}] )
+ !icu? ( virtual/libiconv[${MULTILIB_USEDEP}] )
+ lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] )
+ mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP},cxx,threads] )
+ python? (
+ ${PYTHON_DEPS}
+ numpy? ( >=dev-python/numpy-1.14.5[${PYTHON_USEDEP}] )
+ )
+ zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ =dev-util/boost-build-${MAJOR_V}*"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.48.0-disable_icu_rpath.patch
+ "${FILESDIR}"/${PN}-1.69.0-context-x32.patch
+ "${FILESDIR}"/${PN}-1.56.0-build-auto_index-tool.patch
+)
+
+python_bindings_needed() {
+ multilib_is_native_abi && use python
+}
+
+tools_needed() {
+ multilib_is_native_abi && use tools
+}
+
+create_user-config.jam() {
+ local user_config_jam="${BUILD_DIR}"/user-config.jam
+ if [[ -s ${user_config_jam} ]]; then
+ einfo "${user_config_jam} already exists, skipping configuration"
+ return
+ else
+ einfo "Creating configuration in ${user_config_jam}"
+ fi
+
+ local compiler compiler_version compiler_executable="$(tc-getCXX)"
+ if [[ ${CHOST} == *-darwin* ]]; then
+ compiler="darwin"
+ compiler_version="$(gcc-fullversion)"
+ else
+ compiler="gcc"
+ compiler_version="$(gcc-version)"
+ fi
+
+ if use mpi; then
+ local mpi_configuration="using mpi ;"
+ fi
+
+ cat > "${user_config_jam}" <<- __EOF__ || die
+ using ${compiler} : ${compiler_version} : ${compiler_executable} : "${CFLAGS}" "${CXXFLAGS}" "${LDFLAGS}" ;
+ ${mpi_configuration}
+ __EOF__
+
+ if python_bindings_needed; then
+ append_to_user_config() {
+ local py_config
+ if tc-is-cross-compiler; then
+ py_config="using python : ${EPYTHON#python} : : ${ESYSROOT}/usr/include/${EPYTHON} : ${ESYSROOT}/usr/$(get_libdir) ;"
+ else
+ py_config="using python : ${EPYTHON#python} : ${PYTHON} : $(python_get_includedir) ;"
+ fi
+ echo "${py_config}" >> "${user_config_jam}" || die
+ }
+ python_foreach_impl append_to_user_config
+ fi
+
+ if python_bindings_needed && use numpy; then
+ einfo "Enabling support for NumPy extensions in Boost.Python"
+ else
+ einfo "Disabling support for NumPy extensions in Boost.Python"
+
+ # Boost.Build does not allow for disabling of numpy
+ # extensions, thereby leading to automagic numpy
+ # https://github.com/boostorg/python/issues/111#issuecomment-280447482
+ sed \
+ -e 's/\[ unless \[ python\.numpy \] : no \]/no/g' \
+ -i "${BUILD_DIR}"/libs/python/build/Jamfile || die
+ fi
+}
+
+pkg_setup() {
+ # Bail out on unsupported build configuration, bug #456792
+ if [[ -f "${EROOT}/etc/site-config.jam" ]]; then
+ if ! grep -q 'gentoo\(debug\|release\)' "${EROOT}/etc/site-config.jam"; then
+ eerror "You are using custom ${EROOT}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+ eerror "Boost can not be built in such configuration."
+ eerror "Please, either remove this file or add targets from ${EROOT}/usr/share/boost-build/site-config.jam to it."
+ die "Unsupported target in ${EROOT}/etc/site-config.jam"
+ fi
+ fi
+}
+
+src_prepare() {
+ default
+
+ # Do not try to build missing 'wave' tool, bug #522682
+ # Upstream bugreport - https://svn.boost.org/trac/boost/ticket/10507
+ sed -i -e 's:wave/build//wave::' tools/Jamfile.v2 || die
+
+ multilib_copy_sources
+}
+
+ejam() {
+ create_user-config.jam
+
+ local b2_opts=( "--user-config=${BUILD_DIR}/user-config.jam" )
+ if python_bindings_needed; then
+ append_to_b2_opts() {
+ b2_opts+=( python="${EPYTHON#python}" )
+ }
+ python_foreach_impl append_to_b2_opts
+ else
+ b2_opts+=( --without-python )
+ fi
+ b2_opts+=( "$@" )
+
+ echo b2 "${b2_opts[@]}" >&2
+ b2 "${b2_opts[@]}"
+}
+
+src_configure() {
+ # Workaround for too many parallel processes requested, bug #506064
+ [[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
+
+ OPTIONS=(
+ $(usex debug gentoodebug gentoorelease)
+ "-j$(makeopts_jobs)"
+ -q
+ -d+2
+ pch=off
+ $(usex icu "-sICU_PATH=${EPREFIX}/usr" '--disable-icu boost.locale.icu=off')
+ $(usex mpi '' '--without-mpi')
+ $(usex nls '' '--without-locale')
+ $(usex context '' '--without-context --without-coroutine --without-fiber')
+ $(usex threads '' '--without-thread')
+ --boost-build="${EPREFIX}"/usr/share/boost-build
+ --prefix="${ED}/usr"
+ --layout=system
+ # CMake has issues working with multiple python impls,
+ # disable cmake config generation for the time being
+ # https://github.com/boostorg/python/issues/262#issuecomment-483069294
+ --no-cmake-config
+ # building with threading=single is currently not possible
+ # https://svn.boost.org/trac/boost/ticket/7105
+ threading=multi
+ link=$(usex static-libs shared,static shared)
+ # this seems to be the only way to disable compression algorithms
+ # https://www.boost.org/doc/libs/1_70_0/libs/iostreams/doc/installation.html#boost-build
+ -sNO_BZIP2=$(usex bzip2 0 1)
+ -sNO_LZMA=$(usex lzma 0 1)
+ -sNO_ZLIB=$(usex zlib 0 1)
+ -sNO_ZSTD=$(usex zstd 0 1)
+ )
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ # We need to add the prefix, and in two cases this exceeds, so prepare
+ # for the largest possible space allocation.
+ append-ldflags -Wl,-headerpad_max_install_names
+ fi
+
+ # bug 298489
+ if use ppc || use ppc64; then
+ [[ $(gcc-version) > 4.3 ]] && append-flags -mno-altivec
+ fi
+
+ # Use C++14 globally as of 1.62
+ append-cxxflags -std=c++14
+}
+
+multilib_src_compile() {
+ ejam "${OPTIONS[@]}" || die
+
+ if tools_needed; then
+ pushd tools >/dev/null || die
+ ejam \
+ "${OPTIONS[@]}" \
+ || die "Building of Boost tools failed"
+ popd >/dev/null || die
+ fi
+}
+
+multilib_src_install_all() {
+ if ! use numpy; then
+ rm -r "${ED}"/usr/include/boost/python/numpy* || die
+ fi
+
+ if ! use python; then
+ rm -r "${ED}"/usr/include/boost/{python*,mpi/python*,parameter/aux_/python,parameter/python*} || die
+ fi
+
+ if ! use nls; then
+ rm -r "${ED}"/usr/include/boost/locale || die
+ fi
+
+ if ! use context; then
+ rm -r "${ED}"/usr/include/boost/context || die
+ rm -r "${ED}"/usr/include/boost/coroutine{,2} || die
+ rm "${ED}"/usr/include/boost/asio/spawn.hpp || die
+ fi
+
+ if use doc; then
+ # find extraneous files that shouldn't be installed
+ # as part of the documentation and remove them.
+ find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+ find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+ find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
+
+ docinto html
+ dodoc *.{htm,html,png,css}
+ dodoc -r doc libs more tools
+
+ # To avoid broken links
+ dodoc LICENSE_1_0.txt
+
+ dosym ../../../../include/boost /usr/share/doc/${PF}/html/boost
+ fi
+}
+
+multilib_src_install() {
+ ejam \
+ "${OPTIONS[@]}" \
+ --includedir="${ED}/usr/include" \
+ --libdir="${ED}/usr/$(get_libdir)" \
+ install || die "Installation of Boost libraries failed"
+
+ pushd "${ED}/usr/$(get_libdir)" >/dev/null || die
+
+ local ext=$(get_libname)
+ if use threads; then
+ local f
+ for f in *${ext}; do
+ dosym ${f} /usr/$(get_libdir)/${f/${ext}/-mt${ext}}
+ done
+ fi
+
+ popd >/dev/null || die
+
+ if tools_needed; then
+ dobin dist/bin/*
+
+ insinto /usr/share
+ doins -r dist/share/boostbook
+ fi
+
+ # boost's build system truely sucks for not having a destdir. Because for
+ # this reason we are forced to build with a prefix that includes the
+ # DESTROOT, dynamic libraries on Darwin end messed up, referencing the
+ # DESTROOT instread of the actual EPREFIX. There is no way out of here
+ # but to do it the dirty way of manually setting the right install_names.
+ if [[ ${CHOST} == *-darwin* ]]; then
+ einfo "Working around completely broken build-system(tm)"
+ local d
+ for d in "${ED}"/usr/lib/*.dylib; do
+ if [[ -f ${d} ]]; then
+ # fix the "soname"
+ ebegin " correcting install_name of ${d#${ED}}"
+ install_name_tool -id "/${d#${D}}" "${d}"
+ eend $?
+ # fix references to other libs
+ refs=$(otool -XL "${d}" | \
+ sed -e '1d' -e 's/^\t//' | \
+ grep "^libboost_" | \
+ cut -f1 -d' ')
+ local r
+ for r in ${refs}; do
+ ebegin " correcting reference to ${r}"
+ install_name_tool -change \
+ "${r}" \
+ "${EPREFIX}/usr/lib/${r}" \
+ "${d}"
+ eend $?
+ done
+ fi
+ done
+ fi
+}
+
+pkg_preinst() {
+ # Yai for having symlinks that are nigh-impossible to remove without
+ # resorting to dirty hacks like these. Removes lingering symlinks
+ # from the slotted versions.
+ local symlink
+ for symlink in "${EROOT}/usr/include/boost" "${EROOT}/usr/share/boostbook"; do
+ if [[ -L ${symlink} ]]; then
+ rm -f "${symlink}" || die
+ fi
+ done
+
+ # some ancient installs still have boost cruft lying around
+ # for unknown reasons, causing havoc for reverse dependencies
+ # Bug: 607734
+ rm -rf "${EROOT}"/usr/include/boost-1_[3-5]? || die
+}
diff --git a/dev-libs/boost/files/boost-1.69.0-context-x32.patch b/dev-libs/boost/files/boost-1.69.0-context-x32.patch
new file mode 100644
index 000000000000..9ee3d545d618
--- /dev/null
+++ b/dev-libs/boost/files/boost-1.69.0-context-x32.patch
@@ -0,0 +1,38 @@
+--- a/libs/context/src/asm/jump_i386_sysv_elf_gas.S
++++ b/libs/context/src/asm/jump_i386_sysv_elf_gas.S
+@@ -24,6 +24,10 @@
+ * *
+ ****************************************************************************************/
+
++#ifdef __x86_64__
++#include "jump_x86_64_sysv_elf_gas.S"
++#else
++
+ .file "jump_i386_sysv_elf_gas.S"
+ .text
+ .globl jump_fcontext
+@@ -81,3 +85,5 @@
+
+ /* Mark that we don't need executable stack. */
+ .section .note.GNU-stack,"",%progbits
++
++#endif
+--- a/libs/context/src/asm/make_i386_sysv_elf_gas.S
++++ b/libs/context/src/asm/make_i386_sysv_elf_gas.S
+@@ -24,6 +24,10 @@
+ * *
+ ****************************************************************************************/
+
++#ifdef __x86_64__
++#include "make_x86_64_sysv_elf_gas.S"
++#else
++
+ .file "make_i386_sysv_elf_gas.S"
+ .text
+ .globl make_fcontext
+@@ -105,3 +109,5 @@
+
+ /* Mark that we don't need executable stack. */
+ .section .note.GNU-stack,"",%progbits
++
++#endif
diff --git a/dev-libs/boost/metadata.xml b/dev-libs/boost/metadata.xml
index 4f85afb6e3f1..aa525f6bd815 100644
--- a/dev-libs/boost/metadata.xml
+++ b/dev-libs/boost/metadata.xml
@@ -17,6 +17,8 @@
Build multi-thread-compatible libraries instead of single-threaded only.
Build libboost_locale. This library requires compatible C library interfaces, which might not be provided by uClibc or other embedded libraries.
Install the full API documentation documentation. This takes over 200MB of extra disk space.
+ Optionally build NumPy extensions when Boost.Python is enabled
+ Enable zstd compression support in Boost.Iostreams
boost
diff --git a/dev-libs/double-conversion/Manifest b/dev-libs/double-conversion/Manifest
index 73582e8f656b..50fee14e1ea8 100644
--- a/dev-libs/double-conversion/Manifest
+++ b/dev-libs/double-conversion/Manifest
@@ -1 +1,2 @@
DIST double-conversion-3.0.3.tar.gz 7019705 BLAKE2B 65d7729b55dbb9fd0cf31b258738f3e9f3350b4ecf0204d3d2d23de24cb24651788e844aa1a10d6ec452ca6484c43ed1d218d434fc18be7bb1f15bf8ba97102a SHA512 3a8e956da485195753508c90cd6fa3d9fde42103291a8e65a0d95488faa02e98dddff21935625519c0ce49d8911d66d0773ddf6012264094f3edd851b461f62b
+DIST double-conversion-3.1.4.tar.gz 7022872 BLAKE2B 270f318e6b37205ab3da3ccf5c598ca7a02dc2e728a5d8e3467523bc8f21039651bea3f70aeb9f8579505812d63181de9d1e8106997795a79efeb663e1bc22d7 SHA512 715a34ace2ff74b79d80a8c003c16cfbf958ebc92264e28cc572e1a12a786e1df9678abb46f032c2be387495e1a3d02957b12fa4a245ec6cfe19ca637519ac3c
diff --git a/dev-libs/double-conversion/double-conversion-3.1.4.ebuild b/dev-libs/double-conversion/double-conversion-3.1.4.ebuild
new file mode 100644
index 000000000000..82f78b5b2f8d
--- /dev/null
+++ b/dev-libs/double-conversion/double-conversion-3.1.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multibuild
+
+DESCRIPTION="Binary-decimal and decimal-binary conversion routines for IEEE doubles"
+HOMEPAGE="https://github.com/google/double-conversion"
+SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+IUSE="static-libs test"
+
+PATCHES=(
+ "${FILESDIR}/0001-CMake-install-to-correct-lib-dir.patch"
+)
+
+pkg_setup() {
+ MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=( -DBUILD_TESTING=$(usex test) )
+ if [[ ${MULTIBUILD_VARIANT} = shared ]]; then
+ mycmakeargs+=( -DBUILD_SHARED_LIBS=ON )
+ fi
+ if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+ mycmakeargs+=( -DBUILD_SHARED_LIBS=OFF )
+ fi
+
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_test
+}
+
+src_install() {
+ myinstall() {
+ [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_install
+ [[ ${MULTIBUILD_VARIANT} = static-libs ]] && \
+ dolib.a ${BUILD_DIR}/libdouble-conversion.a
+ }
+
+ multibuild_foreach_variant myinstall
+}
diff --git a/dev-libs/double-conversion/files/0001-CMake-install-to-correct-lib-dir.patch b/dev-libs/double-conversion/files/0001-CMake-install-to-correct-lib-dir.patch
new file mode 100644
index 000000000000..3dbbfafec111
--- /dev/null
+++ b/dev-libs/double-conversion/files/0001-CMake-install-to-correct-lib-dir.patch
@@ -0,0 +1,63 @@
+From 0d65c903c600d983eabfa5be793fa60c346d8303 Mon Sep 17 00:00:00 2001
+From: Jason Zaman
+Date: Sun, 14 Apr 2019 16:38:10 +0800
+Subject: [PATCH] CMake: install to correct lib dir
+
+64-bit libraries should be installed in /usr/lib64, not in /usr/lib/
+Make the destination lib dir configurable.
+
+Commit e13e72e17692f5dc0036460d734c637b563f3ac7 removed
+include(GNUInstallDirs) and ${CMAKE_INSTALL_LIBDIR} which broke
+installing on 64-bit systems.
+
+Signed-off-by: Jason Zaman
+---
+ CMakeLists.txt | 15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d9f4be8..2a06c71 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,12 +40,13 @@ endif()
+ ####
+ # Installation (https://github.com/forexample/package-example)
+
++include(GNUInstallDirs)
++
+ # Layout. This works for all platforms:
+ # * /lib/cmake/
+ # * /lib/
+ # * /include/
+-set(config_install_dir "lib/cmake/${PROJECT_NAME}")
+-set(include_install_dir "include")
++set(config_install_dir "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}")
+
+ set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
+
+@@ -81,17 +82,17 @@ configure_package_config_file(
+ install(
+ TARGETS double-conversion
+ EXPORT "${targets_export_name}"
+- LIBRARY DESTINATION "lib"
+- ARCHIVE DESTINATION "lib"
+- RUNTIME DESTINATION "bin"
+- INCLUDES DESTINATION "${include_install_dir}"
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+ )
+
+ # Headers:
+ # * double-conversion/*.h -> /include/double-conversion/*.h
+ install(
+ FILES ${headers}
+- DESTINATION "${include_install_dir}/double-conversion"
++ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/double-conversion"
+ )
+
+ # Config
+--
+2.21.0
+
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 529da403e65f..0fd2d28f7f96 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -6,6 +6,7 @@ DIST libbson-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b1284be7ef0
DIST libbson-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f
DIST libbson-1.13.0.tar.gz 5734887 BLAKE2B ce5c78dde31edc753a6678e90889a0da7129cd1fcf1dce7222df4d25ca109b1bfbb545c755abf8e4cc39dd40dde7ba4c50dd51dcfc67c970e2b8eb278bd543fc SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
DIST libbson-1.13.1.tar.gz 5740487 BLAKE2B 92184df6f15f951564a7df14d8ec52eb0199a49af102d44c8fb7678db82a41f915c984e95f5301f533dde63139221cb6e161fa5053b9fcc33080abe1095d9c35 SHA512 454670a145a5f2272daa5ca88f2e7d7e42c9b7df62dfc29b3c4b602ef8f819a740890c40872fa47dc411cc5ef9a34b55a6feea3657a802a5be378c4dbe79f42d
+DIST libbson-1.14.0.tar.gz 6573651 BLAKE2B 0b1157473554a5aa49e61cf1c85dc7b1f1917581e661a4295876d4c93e72137b4c7c04e1b7545ba7272706499dbe868a36f1c888d2d07a8176f1c4dc01f9fa5f SHA512 99ca4001341d044a8ffc02a5d7175d40f8a998bdaad15a668a7db0558fa616ec18152faeda6da7f28b34c5d2cf4b649180c9390d2229e1342b6c4f6742816994
DIST libbson-1.3.5.tar.gz 4547720 BLAKE2B e5e258344aea0969ac74d88d040a464b72d460a13776c5c8c639e569ed3208fabd2641e850bf035c6889b466ddcc33d487da0aeab58f308bee7446b5fd0a31a1 SHA512 b55ae1d424f786aabed6567a77cd09aa26c74ab0a09392e88faef8c156b1650c026f86f245bc8431a0ebcf404c4f80eb1b22e978a24289d32692c84375a66596
DIST libbson-1.3.6.tar.gz 4546329 BLAKE2B fa9102cd02e40e0ddb7518d34502f6ff63109b91af18a2285422530dae8c6cc04041b7589f340f2e6ed7a80e2474fea2684001b7ced5e8c911d4ba51e1a6edcc SHA512 a7da914ed0f03212d4fb01879543f0b2c7629923e33200fe30335a9a90a1082ffa2566c7a556b90a6c7ffbef5665a45ec67f87ffff2a5fcb89830769b1df5130
DIST libbson-1.6.2.tar.gz 4835257 BLAKE2B ebe20a6c9ac8a4fcbd8e838d1a7cd319a6b31956690aa2dfca2be42eaafb646405ea01fe2bf20b2dc21bf933c0eafc330fd45409f7c902a7bf0c0641cfe0891d SHA512 f95f5bb829cff3aac6c1d95a159e38396d8fccef66d3026dac8085ba13ec376274cddeb92277d711ac4d40cafd8b89b73e9a9d1cf29e22f7f79aa9422c69488b
diff --git a/dev-libs/libbson/files/libbson-1.14.0-no-docs.patch b/dev-libs/libbson/files/libbson-1.14.0-no-docs.patch
new file mode 100644
index 000000000000..d33fba105ab0
--- /dev/null
+++ b/dev-libs/libbson/files/libbson-1.14.0-no-docs.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3371dae..a6edf0f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -380,10 +380,6 @@ if (ENABLE_MONGOC)
+
+ endif ()
+
+-install (FILES COPYING NEWS README.rst THIRD_PARTY_NOTICES
+- DESTINATION ${CMAKE_INSTALL_DATADIR}/mongo-c-driver
+-)
+-
+ if (ENABLE_UNINSTALL)
+ if (WIN32)
+ if (ENABLE_MONGOC)
diff --git a/dev-libs/libbson/libbson-1.14.0.ebuild b/dev-libs/libbson/libbson-1.14.0.ebuild
new file mode 100644
index 000000000000..a21a401d4d66
--- /dev/null
+++ b/dev-libs/libbson/libbson-1.14.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Library routines related to building,parsing and iterating BSON documents"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/mongo-c-driver-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="examples static-libs"
+
+DEPEND="dev-python/sphinx"
+
+PATCHES=( "${FILESDIR}/libbson-1.14.0-no-docs.patch" )
+
+S="${WORKDIR}/mongo-c-driver-${PV}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_BSON=ON
+ -DENABLE_EXAMPLES=OFF
+ -DENABLE_MAN_PAGES=ON
+ -DENABLE_MONGOC=OFF
+ -DENABLE_TESTS=OFF
+ -DENABLE_STATIC="$(usex static-libs ON OFF)"
+ -DENABLE_UNINSTALL=OFF
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ if use examples; then
+ docinto examples
+ dodoc src/libbson/examples/*.c
+ fi
+
+ cmake-utils_src_install
+}
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index d3bff7f2104c..64f6382d94be 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -1,3 +1,2 @@
-DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
DIST libgcrypt-1.8.3.tar.bz2 2989166 BLAKE2B 3443883c3e8d005be6cbdc91589b8b287226f26eb59536e1a32512004af739a64a3817ac38fa1132fdfc3424c21ca49c81db93535a23d590a5dc4f4518f3cce1 SHA512 8c873204303f173dd3f49817a81035c1d504b2fc885965c9bc074a6e3fb108ceb6dca366d85e840a40712a6890fc325018ea9b8c1b7b8804c51c44b296cb96a0
DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch b/dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch
deleted file mode 100644
index 1d4f650b6c7a..000000000000
--- a/dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-The version taken from GnuPG 1.4 assumes any cross-compiled package have
-prefixed underscores, which is not the case; by using libtool's own macro,
-we can avoid the whole issue.
-
-diff --git a/configure.ac b/configure.ac
-index ab160c3..6df49bf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -886,7 +886,7 @@ fi
- #
- # Setup assembler stuff.
- #
--GNUPG_SYS_SYMBOL_UNDERSCORE()
-+LT_SYS_SYMBOL_USCORE
- AC_ARG_ENABLE(mpi-path,
- AC_HELP_STRING([--enable-mpi-path=EXTRA_PATH],
- [prepend EXTRA_PATH to list of CPU specific optimizations]),
-diff --git a/mpi/config.links b/mpi/config.links
-index 7e910ee..9696828 100644
---- a/mpi/config.links
-+++ b/mpi/config.links
-@@ -291,7 +291,7 @@ fi
-
- # Make sysdep.h
- echo '/* created by config.links - do not edit */' >./mpi/sysdep.h
--if test x$ac_cv_sys_symbol_underscore = xyes; then
-+if test x$sys_symbol_underscore = xyes; then
- cat <>./mpi/sysdep.h
- #if __STDC__
- #define C_SYMBOL_NAME(name) _##name
---
-1.7.6.1
-
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.5.4-clang-arm.patch b/dev-libs/libgcrypt/files/libgcrypt-1.5.4-clang-arm.patch
deleted file mode 100644
index ab5d844552af..000000000000
--- a/dev-libs/libgcrypt/files/libgcrypt-1.5.4-clang-arm.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-fix from upstream
-
-From e67c67321ce240c93dd0fa2b21c649c0a8e233f7 Mon Sep 17 00:00:00 2001
-From: Jussi Kivilinna
-Date: Tue, 22 Oct 2013 17:07:53 +0300
-Subject: [PATCH] mpi: allow building with clang on ARM
-
-* mpi/longlong.h [__arm__] (add_ssaaaa, sub_ddmmss, umul_ppmm)
-(count_leading_zeros): Do not cast assembly output arguments.
-[__arm__] (umul_ppmm): Remove the extra '%' ahead of assembly comment.
-[_ARM_ARCH >= 4] (umul_ppmm): Use correct inputs and outputs instead of
-registers.
---
-
-Signed-off-by: Jussi Kivilinna
----
- mpi/longlong.h | 27 +++++++++++++--------------
- 1 file changed, 13 insertions(+), 14 deletions(-)
-
-diff --git a/mpi/longlong.h b/mpi/longlong.h
-index c2ab9c5..8c8260e 100644
---- a/mpi/longlong.h
-+++ b/mpi/longlong.h
-@@ -188,8 +188,8 @@ extern UDItype __udiv_qrnnd ();
- #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
- __asm__ ("adds %1, %4, %5\n" \
- "adc %0, %2, %3" \
-- : "=r" ((USItype)(sh)), \
-- "=&r" ((USItype)(sl)) \
-+ : "=r" ((sh)), \
-+ "=&r" ((sl)) \
- : "%r" ((USItype)(ah)), \
- "rI" ((USItype)(bh)), \
- "%r" ((USItype)(al)), \
-@@ -197,15 +197,15 @@ extern UDItype __udiv_qrnnd ();
- #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
- __asm__ ("subs %1, %4, %5\n" \
- "sbc %0, %2, %3" \
-- : "=r" ((USItype)(sh)), \
-- "=&r" ((USItype)(sl)) \
-+ : "=r" ((sh)), \
-+ "=&r" ((sl)) \
- : "r" ((USItype)(ah)), \
- "rI" ((USItype)(bh)), \
- "r" ((USItype)(al)), \
- "rI" ((USItype)(bl)))
- #if defined __ARM_ARCH_2__ || defined __ARM_ARCH_3__
- #define umul_ppmm(xh, xl, a, b) \
-- __asm__ ("%@ Inlined umul_ppmm\n" \
-+ __asm__ ("@ Inlined umul_ppmm\n" \
- "mov %|r0, %2, lsr #16 @ AAAA\n" \
- "mov %|r2, %3, lsr #16 @ BBBB\n" \
- "bic %|r1, %2, %|r0, lsl #16 @ aaaa\n" \
-@@ -218,20 +218,19 @@ extern UDItype __udiv_qrnnd ();
- "addcs %|r2, %|r2, #65536\n" \
- "adds %1, %|r1, %|r0, lsl #16\n" \
- "adc %0, %|r2, %|r0, lsr #16" \
-- : "=&r" ((USItype)(xh)), \
-- "=r" ((USItype)(xl)) \
-+ : "=&r" ((xh)), \
-+ "=r" ((xl)) \
- : "r" ((USItype)(a)), \
- "r" ((USItype)(b)) \
- : "r0", "r1", "r2")
- #else
- #define umul_ppmm(xh, xl, a, b) \
-- __asm__ ("%@ Inlined umul_ppmm\n" \
-- "umull %r1, %r0, %r2, %r3" \
-- : "=&r" ((USItype)(xh)), \
-- "=r" ((USItype)(xl)) \
-+ __asm__ ("@ Inlined umul_ppmm\n" \
-+ "umull %1, %0, %2, %3" \
-+ : "=&r" ((xh)), \
-+ "=r" ((xl)) \
- : "r" ((USItype)(a)), \
-- "r" ((USItype)(b)) \
-- : "r0", "r1")
-+ "r" ((USItype)(b)))
- #endif
- #define UMUL_TIME 20
- #define UDIV_TIME 100
---
-2.4.4
-
diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild
deleted file mode 100644
index fd156e85c490..000000000000
--- a/dev-libs/libgcrypt/libgcrypt-1.5.6-r101.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune multilib-minimal
-
-DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
-HOMEPAGE="http://www.gnupg.org/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="11/11" # subslot = soname major version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
- !dev-libs/libgcrypt:0/11"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.0-uscore.patch
- "${FILESDIR}"/${PN}-multilib-syspath.patch
- "${FILESDIR}"/${PN}-1.5.4-clang-arm.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --disable-padlock-support # bug 201917
- --disable-dependency-tracking
- --enable-noexecstack
- --disable-O-flag-munging
-
- # disabled due to various applications requiring privileges
- # after libgcrypt drops them (bug #468616)
- --without-capabilities
-
- # http://trac.videolan.org/vlc/ticket/620
- # causes bus-errors on sparc64-solaris
- $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
- $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- rm -r "${ED%/}"/usr/{bin,include,lib*/*.so,share} || die
-}
-
-multilib_src_install_all() {
- default
- prune_libtool_files
-}
diff --git a/dev-libs/libgnome-games-support/libgnome-games-support-1.4.3.ebuild b/dev-libs/libgnome-games-support/libgnome-games-support-1.4.3.ebuild
index 94c833c4449b..a11da8121a77 100644
--- a/dev-libs/libgnome-games-support/libgnome-games-support-1.4.3.ebuild
+++ b/dev-libs/libgnome-games-support/libgnome-games-support-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgnome-games-support/"
LICENSE="LGPL-3+"
SLOT="1/3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
RDEPEND="
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index 2b88023a24c6..fb7b39fdb9de 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,2 +1 @@
-DIST libmateweather-1.18.2.tar.xz 3455940 BLAKE2B 15cb57c0202c1117f203bd9550c86d255404984e9163a7f79b8f81a0c436ff6bf9e1945536a15078ad479c9379798966337b6b8851ec84384ccc08c352d06260 SHA512 9b0f9b11f0c9b472a13adc1cfd26076dffd278e0154efa4248f8cc4a999250c88c761985b9a18978a7581e5459232fe2314181ae26a1c7c4fd4c80b536827504
DIST libmateweather-1.22.0.tar.xz 3386920 BLAKE2B 312bd8cd12a1d51216b9509b2badaccb23779f1c7c314ecf02c9789837fa619d6029e97bf06f9fd320ba590936888d51fe178cffbb7dca87eb167ed4fbf3eabb SHA512 43371fc615dda2b9042633a63ac4c1fb0b1ea43b20c783e443b0f57e10ad8fddedbd593f03bd6c942729f0a9c80484266fe1ef900d128fa4b02f80d6a80ae9bd
diff --git a/dev-libs/libmateweather/libmateweather-1.18.2.ebuild b/dev-libs/libmateweather/libmateweather-1.18.2.ebuild
deleted file mode 100644
index 3d4109ffd671..000000000000
--- a/dev-libs/libmateweather/libmateweather-1.18.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE library to access weather information from online services"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2.6:2
- >=net-libs/libsoup-2.34:2.4
- >=sys-libs/timezone-data-2010k:0
- x11-libs/gdk-pixbuf:2
- virtual/libintl:0
- >=x11-libs/gtk+-3.0:3"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- >=sys-devel/libtool-2.2.6:2
- virtual/pkgconfig:*"
-
-src_configure() {
- mate_src_configure \
- --enable-locations-compression \
- --disable-all-translations-in-one-xml
-}
diff --git a/dev-libs/libmateweather/libmateweather-1.22.0.ebuild b/dev-libs/libmateweather/libmateweather-1.22.0.ebuild
index b18cfadd7ef9..e3a5753eeca6 100644
--- a/dev-libs/libmateweather/libmateweather-1.22.0.ebuild
+++ b/dev-libs/libmateweather/libmateweather-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="MATE library to access weather information from online services"
diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
index 71b876c663db..9e5c990c74f5 100644
--- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
+++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}-src.tar.gz"
LICENSE="MIT"
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
IUSE=""
DEPEND="dev-util/netsurf-buildsystem"
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 57acfd97ec72..9ecf336d91ec 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -8,6 +8,7 @@ DIST mongo-c-driver-1.11.0.tar.gz 5681593 BLAKE2B 43f70943cc7f1a9f6285c71136b128
DIST mongo-c-driver-1.12.0.tar.gz 5708175 BLAKE2B 113db7ec95f8e9b65433fc20def7224ee8d54c9ddb14cfc68ccf7ccb1995808f4c4c372806e85e1c8bb8b8541bb8b8b5236fd06d7605b78a4bbcee6560642bec SHA512 e4688da8a94fc499893b6001fc444b97fc05c89672fd9700bf30c6af7f1bbb02b1a658aa74470e0e5d5e72bc28a5753aa7dcda14dba7e75fbce0b4bb94b7373f
DIST mongo-c-driver-1.13.0.tar.gz 5734887 BLAKE2B ce5c78dde31edc753a6678e90889a0da7129cd1fcf1dce7222df4d25ca109b1bfbb545c755abf8e4cc39dd40dde7ba4c50dd51dcfc67c970e2b8eb278bd543fc SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
DIST mongo-c-driver-1.13.1.tar.gz 5740487 BLAKE2B 92184df6f15f951564a7df14d8ec52eb0199a49af102d44c8fb7678db82a41f915c984e95f5301f533dde63139221cb6e161fa5053b9fcc33080abe1095d9c35 SHA512 454670a145a5f2272daa5ca88f2e7d7e42c9b7df62dfc29b3c4b602ef8f819a740890c40872fa47dc411cc5ef9a34b55a6feea3657a802a5be378c4dbe79f42d
+DIST mongo-c-driver-1.14.0.tar.gz 6573651 BLAKE2B 0b1157473554a5aa49e61cf1c85dc7b1f1917581e661a4295876d4c93e72137b4c7c04e1b7545ba7272706499dbe868a36f1c888d2d07a8176f1c4dc01f9fa5f SHA512 99ca4001341d044a8ffc02a5d7175d40f8a998bdaad15a668a7db0558fa616ec18152faeda6da7f28b34c5d2cf4b649180c9390d2229e1342b6c4f6742816994
DIST mongo-c-driver-1.3.5.tar.gz 5860804 BLAKE2B a55de56d285638f21caff06446e3c0c19a5b8722a2ed69fdf046c35973c9bedcc1686065e4355db28afc83c1415872eee2972a6fb3f21647d2cafce12706adc0 SHA512 23844ffe20580998308aa9c8409afcb87dccde874077eefc6806b705e5de5743846ba0513f3a3fe83147fc47842ab8c7438ad1de5f3f55b81586b9e19046aabf
DIST mongo-c-driver-1.6.2.tar.gz 6907818 BLAKE2B 7922a50ba58d92d2954eb5c2ccb02fd3b70861bd26516fd12fe6bdf79a926799fbc3a367e1c24a57932870726aa5abc1d264215ea964a56bc318ab0f413afc60 SHA512 b3fe08a31bc83707a4d94f8ea2742fc9b17d024d6c2f92b49cfc4fe012e58cd441c9f0fa4bae9f4205fca44b2a0d8c6d5bc32a05fc9ede9bab0011839a1394af
DIST mongo-c-driver-1.8.2.tar.gz 7308675 BLAKE2B ca82c2824486cee78b164d1fdfcf1de062804f0f8637a36ec197efe434ae23a387ec0e6b2e4aa3e9c8bb2434a3cef48fecd17fc4b159a92ad86b8b940b17598a SHA512 af23601ba33694d80acdb890c1b85a354fda966491c4bbfb341a884bcd6314886e405efa3a09e47398adf8dbfdeb1b05ae8b022a72f04a66265bfaeddb661f76
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-enable-tests.patch
new file mode 100644
index 000000000000..76202b5e387a
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-enable-tests.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c0e01a8..3371dae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -163,7 +163,6 @@ if (ENABLE_BSON STREQUAL SYSTEM)
+ message ("-- libbson include path \"${BSON_INCLUDE_DIRS}\"")
+ message ("-- libbson libraries \"${BSON_LIBRARIES}\"")
+ message ("-- disabling test-libmongoc since using system libbson")
+- SET (ENABLE_TESTS OFF)
+
+ if (ENABLE_STATIC MATCHES "ON|AUTO")
+ find_package (libbson-static-1.0
+diff --git a/src/libbson/tests/test-bson.c b/src/libbson/tests/test-bson.c
+index 95356fa..9f9aea3 100644
+--- a/src/libbson/tests/test-bson.c
++++ b/src/libbson/tests/test-bson.c
+@@ -17,7 +17,7 @@
+
+ #include
+ #include
+-#include
++#include "bson/bson-private.h"
+ #include
+ #include
+
diff --git a/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-no-docs.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-no-docs.patch
new file mode 100644
index 000000000000..d33fba105ab0
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.14.0-no-docs.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3371dae..a6edf0f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -380,10 +380,6 @@ if (ENABLE_MONGOC)
+
+ endif ()
+
+-install (FILES COPYING NEWS README.rst THIRD_PARTY_NOTICES
+- DESTINATION ${CMAKE_INSTALL_DATADIR}/mongo-c-driver
+-)
+-
+ if (ENABLE_UNINSTALL)
+ if (WIN32)
+ if (ENABLE_MONGOC)
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild
new file mode 100644
index 000000000000..eaea5a9fc5ac
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.14.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="Client library written in C for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-c-driver"
+SRC_URI="https://github.com/mongodb/mongo-c-driver/releases/download/${PV}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~s390 ~x86"
+IUSE="debug examples icu libressl sasl ssl static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="app-arch/snappy:=
+ >=dev-libs/libbson-${PV}
+ dev-python/sphinx
+ sys-libs/zlib:=
+ icu? ( dev-libs/icu:= )
+ sasl? ( dev-libs/cyrus-sasl:= )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )"
+DEPEND="${RDEPEND}
+ test? (
+ dev-db/mongodb
+ dev-libs/libbson[static-libs]
+ )"
+
+# No tests on x86 because tests require dev-db/mongodb which don't support
+# x86 anymore (bug #645994)
+RESTRICT="x86? ( test )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.13.1-drop-failing-test.patch" # one test fails
+ "${FILESDIR}/${PN}-1.14.0-enable-tests.patch" # enable tests with system libbson
+ "${FILESDIR}/${PN}-1.14.0-no-docs.patch"
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # copy private headers for tests since we don't build libbson
+ if use test; then
+ mkdir -p src/libbson/tests/bson || die
+ for f in bson-context-private.h bson-iso8601-private.h bson-private.h; do
+ cp -v src/libbson/src/bson/${f} src/libbson/tests/bson/ || die
+ done
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
+ -DENABLE_BSON=SYSTEM
+ -DENABLE_EXAMPLES=OFF
+ -DENABLE_ICU="$(usex icu ON OFF)"
+ -DENABLE_MAN_PAGES=ON
+ -DENABLE_MONGOC=ON
+ -DENABLE_SNAPPY=SYSTEM
+ -DENABLE_ZLIB=SYSTEM
+ -DENABLE_SASL="$(usex sasl CYRUS OFF)"
+ -DENABLE_SSL="$(usex ssl $(usex libressl LIBRESSL OPENSSL) OFF)"
+ -DENABLE_STATIC="$(usex static-libs ON OFF)"
+ -DENABLE_TESTS="$(usex test ON OFF)"
+ -DENABLE_TRACING="$(usex debug ON OFF)"
+ -DENABLE_UNINSTALL=OFF
+ )
+
+ cmake-utils_src_configure
+}
+
+# FEATURES="test" USE="static-libs" emerge dev-libs/mongo-c-driver
+src_test() {
+ local PORT=27099
+ mongod --port ${PORT} --bind_ip 127.0.0.1 --nounixsocket --fork \
+ --dbpath="${T}" --logpath="${T}/mongod.log" || die
+ MONGOC_TEST_URI="mongodb://[127.0.0.1]:${PORT}" ../mongo-c-driver-${PV}_build/src/libmongoc/test-libmongoc || die
+ kill $(<"${T}/mongod.lock")
+}
+
+src_install() {
+ if use examples; then
+ docinto examples
+ dodoc src/libmongoc/examples/*.c
+ fi
+
+ cmake-utils_src_install
+}
diff --git a/dev-libs/opensc/opensc-0.19.0-r2.ebuild b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
index 8c2f9ff2b4d0..07d46225f4bb 100644
--- a/dev-libs/opensc/opensc-0.19.0-r2.ebuild
+++ b/dev-libs/opensc/opensc-0.19.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib"
RDEPEND="zlib? ( sys-libs/zlib )
diff --git a/dev-libs/vala-common/vala-common-0.40.14.ebuild b/dev-libs/vala-common/vala-common-0.40.14.ebuild
index add7d40d2a28..0a8d986da471 100644
--- a/dev-libs/vala-common/vala-common-0.40.14.ebuild
+++ b/dev-libs/vala-common/vala-common-0.40.14.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
IUSE=""
# Previously ${PN} was part of dev-lang/vala
diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 2c30fde70a94..4bf9e5840dc1 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,2 +1,2 @@
DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
-DIST weston-5.0.0.tar.xz 1467496 BLAKE2B 514bc4c4f09dc8bc5b068c66cf14b86687bee1e691f7dfcb251a5ae7fe02389b48626ed02c97eff9334b43e227ea8b83beef48c53a83b4691f59a65af53ad61d SHA512 b6f97eca014ea47f3de0c5ddd89712f896cd66423d0eb499e1d88d35aab616cef1e735ebb8e0cefd8b60085314b6ec3d56b39d7c4776188bb56d58efc84a52cf
+DIST weston-6.0.0.tar.xz 1517032 BLAKE2B 598c525598f877715320d8b468618595d1f7b10ed56aa82c3535b05c369216d1a938d32354e3a8cc9077a0d910d0dbfdcf504fb687c73942d8ad92b13a124bd2 SHA512 127ab64b689f202acca4d9461e4decfd42357e4bbb63493af257b3b20b693a8ab4207b3c6b97663cefeed200505aad5f32b6a064db2e53fa1e201877613b394f
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index c976a4437cfc..c98075bd2fed 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -7,9 +7,11 @@
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index 7ea30d69198d..0d5d07ad8146 100644
Binary files a/games-board/Manifest.gz and b/games-board/Manifest.gz differ
diff --git a/games-board/gnome-mines/gnome-mines-3.30.1.1.ebuild b/games-board/gnome-mines/gnome-mines-3.30.1.1.ebuild
index 29612f247e1e..caeeeed425b8 100644
--- a/games-board/gnome-mines/gnome-mines-3.30.1.1.ebuild
+++ b/games-board/gnome-mines/gnome-mines-3.30.1.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Mines"
LICENSE="GPL-3+ CC-BY-SA-3.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
RDEPEND="
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 9a2f5c4dfbba..d07ee96ca7d3 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
index 858b3bcc36b5..80cf8306ba46 100644
--- a/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
+++ b/games-engines/scummvm/scummvm-2.0.0-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=7
inherit desktop flag-o-matic toolchain-funcs xdg
DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
-HOMEPAGE="http://scummvm.sourceforge.net/"
-SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
+HOMEPAGE="https://www.scummvm.org/"
+SRC_URI="https://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
SLOT="0"
@@ -43,7 +43,7 @@ S="${WORKDIR}/${P/_/}"
PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" )
src_prepare() {
- default
+ xdg_src_prepare
# -g isn't needed for nasm here
sed -i \
@@ -96,15 +96,3 @@ src_install() {
default
doicon -s scalable icons/scummvm.svg
}
-
-pkg_preinst() {
- xdg_pkg_preinst
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git a/games-engines/scummvm/scummvm-2.0.0.ebuild b/games-engines/scummvm/scummvm-2.0.0.ebuild
deleted file mode 100644
index b4df47b76af2..000000000000
--- a/games-engines/scummvm/scummvm-2.0.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils flag-o-matic gnome2-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="Reimplementation of the SCUMM game engine used in Lucasarts adventures"
-HOMEPAGE="http://scummvm.sourceforge.net/"
-SRC_URI="http://scummvm.org/frs/scummvm/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype unsupported vorbis zlib"
-RESTRICT="test" # it only looks like there's a test there #77507
-
-RDEPEND=">=media-libs/libsdl2-2.0.0[sound,joystick,video]
- zlib? ( sys-libs/zlib )
- jpeg? ( virtual/jpeg:0 )
- png? ( media-libs/libpng:0 )
- vorbis? ( media-libs/libogg media-libs/libvorbis )
- theora? ( media-libs/libtheora )
- aac? ( media-libs/faad2 )
- alsa? ( media-libs/alsa-lib )
- mp3? ( media-libs/libmad )
- mpeg2? ( media-libs/libmpeg2 )
- flac? ( media-libs/flac )
- opengl? ( virtual/opengl )
- truetype? ( media-libs/freetype:2 )
- fluidsynth? ( media-sound/fluidsynth )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- truetype? ( virtual/pkgconfig )
- x86? ( dev-lang/nasm )"
-
-S="${WORKDIR}/${P/_/}"
-
-PATCHES=( "${FILESDIR}/${PN}-2.0.0-freetype_pkgconfig.patch" )
-
-src_prepare() {
- default
-
- # -g isn't needed for nasm here
- sed -i \
- -e '/NASMFLAGS/ s/-g//' \
- configure || die
- sed -i \
- -e '/INSTALL.*doc/d' \
- -e '/INSTALL.*\/pixmaps/d' \
- -e 's/-s //' \
- ports.mk || die
-}
-
-src_configure() {
- use x86 && append-ldflags -Wl,-z,noexecstack
-
- # NOT AN AUTOCONF SCRIPT SO DONT CALL ECONF
- SDL_CONFIG="sdl2-config" \
- ./configure \
- --backend=sdl \
- --host=${CHOST} \
- --enable-verbose-build \
- --prefix=/usr \
- --libdir="/usr/$(get_libdir)" \
- --opengl-mode=$(usex opengl auto none) \
- $(use_enable aac faad) \
- $(use_enable alsa) \
- $(use_enable debug) \
- $(use_enable !debug release-mode) \
- $(use_enable flac) \
- $(usex fluidsynth '' --disable-fluidsynth) \
- $(use_enable jpeg) \
- $(use_enable mp3 mad) \
- $(use_enable mpeg2) \
- $(use_enable png) \
- $(use_enable theora theoradec) \
- $(use_enable truetype freetype2) \
- $(usex unsupported --enable-all-engines '') \
- $(use_enable vorbis) \
- $(use_enable zlib) \
- $(use_enable x86 nasm) \
- ${myconf} ${EXTRA_ECONF} || die
-}
-
-src_compile() {
- emake AR="$(tc-getAR) cru" RANLIB=$(tc-getRANLIB)
-}
-
-src_install() {
- default
- doicon -s scalable icons/scummvm.svg
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/games-mud/Manifest.gz b/games-mud/Manifest.gz
index b77a5434f9de..2382b2841ad2 100644
Binary files a/games-mud/Manifest.gz and b/games-mud/Manifest.gz differ
diff --git a/games-mud/circlemud/circlemud-3.1.ebuild b/games-mud/circlemud/circlemud-3.1.ebuild
index a0b3a10589f9..6d8c1775da96 100644
--- a/games-mud/circlemud/circlemud-3.1.ebuild
+++ b/games-mud/circlemud/circlemud-3.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils games
DESCRIPTION="a multi-user dungeon game system server"
-HOMEPAGE="http://www.circlemud.org/"
-SRC_URI="http://www.circlemud.org/pub/CircleMUD/3.x/circle-${PV}.tar.bz2"
+HOMEPAGE="https://www.circlemud.org/"
+SRC_URI="https://www.circlemud.org/pub/CircleMUD/3.x/circle-${PV}.tar.bz2"
LICENSE="circlemud"
SLOT="0"
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 76a20e2d8670..374d8daf8e8a 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/pingus/pingus-0.7.6-r1.ebuild b/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
deleted file mode 100644
index e23d02f4dafb..000000000000
--- a/games-puzzle/pingus/pingus-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit scons-utils toolchain-funcs flag-o-matic xdg-utils
-
-DESCRIPTION="free Lemmings clone"
-HOMEPAGE="https://pingus.seul.org"
-SRC_URI="https://pingus.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="opengl music"
-
-RDEPEND="media-libs/libsdl[joystick,opengl?,video]
- media-libs/sdl-image[png]
- media-libs/sdl-mixer
- music? ( media-libs/sdl-mixer[mod] )
- opengl? ( virtual/opengl )
- media-libs/libpng:0=
- dev-libs/boost:="
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-noopengl.patch
- "${FILESDIR}"/${P}-gcc47.patch
- "${FILESDIR}"/${P}-echo-e.patch
- "${FILESDIR}"/${P}-gcc7.patch
-)
-
-src_prepare() {
- default
- strip-flags
-}
-
-src_compile() {
- escons \
- CXX="$(tc-getCXX)" \
- CCFLAGS="${CXXFLAGS}" \
- LINKFLAGS="${LDFLAGS}" \
- with_opengl=$(usex opengl 1 0)
-}
-
-src_install() {
- emake install-exec install-data \
- DESTDIR="${D}" \
- PREFIX="/usr"
- doman doc/man/pingus.6
- doicon data/images/icons/pingus.svg
- make_desktop_entry ${PN} Pingus
- dodoc AUTHORS NEWS README TODO
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index d91605b067f4..896881698fa0 100644
Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index ce8d9856e027..ca086346f8dd 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,4 +1,4 @@
DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone_soup-0.22.0.tar.xz 29263688 BLAKE2B e0a4d6953677583fafe1fce037d4d484c821b4d8782c63fa90b6b4f5db3df7b8fd4c5e843740517a7c2321f864df2a346fcd9bc69a1446c74685afc239d1fc55 SHA512 e8daa0f66a5212b116ce997b30b8f0f9ef01cef7e1213a1b6fe17c800d44fa7e318624902ce638dee79027ffaa3a4af8a10f6552de756a2045b5919d817498bd
DIST stone_soup-0.23.0.tar.xz 29899848 BLAKE2B 138f3c9fe1ad395d05d0654ea42788c6312e92839c6b92edfa538123b8b566f62d263862b05c6da64d589938c820b876e12475b0eeb16af7dd2e3f62c441eecb SHA512 6b53b5d670130aac451d09fe842e7654f61c131d126b34ed729d4542e9d2cbe2beaa6cd5f0b2bb78744ae6c643040996e39db8b0b3840c8946e442aaff54ff58
+DIST stone_soup-0.23.2.tar.xz 30157732 BLAKE2B 5d264fa33abeb2254efbdef461774c987f65ef28160d43d90848b77d46a8f0e63c4e59a9cb7257257551a08c509e53758d72acbb0edf5a0e8b70e5d3ca09ea14 SHA512 61ccb0ac262a798e7c06fdb5e821c9885a690e082c33f6255358561929d6800b272106632279d27320e8ae240d903e2002f59d908d5db4841065a5cfa97bbee8
diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index 68e84b34cc48..ec38a399560c 100644
--- a/games-roguelike/stone-soup/metadata.xml
+++ b/games-roguelike/stone-soup/metadata.xml
@@ -1,6 +1,10 @@
+
+ stasibear@gentoo.org
+ Erik Mackdanz
+
games@gentoo.org
Gentoo Games Project
diff --git a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
similarity index 83%
rename from games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
rename to games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
index 92ce93f41ce3..9ac6df9654a4 100644
--- a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.23.2.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-## TODO
-# add sound support (no sound files)
+# TODO
+# - attempt +test, linked bug claims to be fixed
-EAPI=6
+EAPI=7
VIRTUALX_REQUIRED="manual"
-inherit eutils gnome2-utils toolchain-funcs eapi7-ver
+inherit desktop eutils xdg-utils toolchain-funcs
MY_P="stone_soup-${PV}"
DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
@@ -24,14 +24,14 @@ SRC_URI="
LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug luajit ncurses test +tiles"
+IUSE="debug ncurses sound test +tiles"
# test is broken
# see https://crawl.develz.org/mantis/view.php?id=6121
RESTRICT="test"
RDEPEND="
dev-db/sqlite:3
- luajit? ( >=dev-lang/luajit-2.0.0 )
+ =dev-lang/lua-5.1*:0=
sys-libs/zlib
!ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
ncurses? ( sys-libs/ncurses:0 )
@@ -39,19 +39,25 @@ RDEPEND="
media-fonts/dejavu
media-libs/freetype:2
media-libs/libpng:0
- media-libs/libsdl2[X,opengl,video]
+ sound? (
+ media-libs/libsdl2[X,opengl,sound,video]
+ media-libs/sdl2-mixer
+ )
+ !sound? ( media-libs/libsdl2[X,opengl,video] )
media-libs/sdl2-image[png]
virtual/glu
virtual/opengl
)"
DEPEND="${RDEPEND}
dev-lang/perl
+ dev-python/pyyaml
sys-devel/flex
- virtual/pkgconfig
- virtual/yacc
tiles? (
sys-libs/ncurses:0
- )"
+ )
+ virtual/pkgconfig
+ virtual/yacc
+ "
S=${WORKDIR}/${MY_P}/source
S_TEST=${WORKDIR}/${MY_P}_test/source
@@ -65,12 +71,10 @@ pkg_setup() {
ewarn "selected, choosing ncurses only."
ewarn "Note that you can also enable both."
fi
-}
-
-src_prepare() {
- default
- rm -r contrib/{fonts,freetype,libpng,pcre,sdl2,sdl2-image,sdl2-mixer,sqlite,zlib} || die
+ if use sound && use !tiles ; then
+ ewarn "Sound support is only available with tiles."
+ fi
}
src_compile() {
@@ -79,10 +83,11 @@ src_compile() {
# leave DATADIR at the top
myemakeargs=(
$(usex debug "FULLDEBUG=y DEBUG=y" "")
- $(usex luajit "" "BUILD_LUA=yes") # luajit is not bundled
+ BUILD_LUA=
AR="$(tc-getAR)"
CFOPTIMIZE=''
CFOTHERS="${CXXFLAGS}"
+ CONTRIBS=
DATADIR="/usr/share/${PN}"
GCC="$(tc-getCC)"
GXX="$(tc-getCXX)"
@@ -91,8 +96,9 @@ src_compile() {
PKGCONFIG="$(tc-getPKG_CONFIG)"
RANLIB="$(tc-getRANLIB)"
SAVEDIR="~/.crawl"
+ SOUND=$(usex sound "y" "")
STRIP=touch
- USE_LUAJIT=$(usex luajit "yes" "")
+ USE_LUAJIT=
V=1
prefix="/usr"
)
@@ -116,6 +122,8 @@ src_install() {
# don't relocate docs, needed at runtime
rm -rf "${D}/usr/share/${PN}"/docs/license
+ doman "${WORKDIR}/${MY_P}"/docs/crawl.6
+
# icons and menu for graphical build
if use tiles ; then
doicon -s 48 "${DISTDIR}"/${PN}.png
@@ -124,12 +132,8 @@ src_install() {
fi
}
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
pkg_postinst() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
if use tiles && use ncurses ; then
elog "Since you have enabled both tiles and ncurses frontends"
@@ -139,5 +143,5 @@ pkg_postinst() {
}
pkg_postrm() {
- gnome2_icon_cache_update
+ xdg_icon_cache_update
}
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index ea022e2459f5..ceca21d5ecfe 100644
Binary files a/games-rpg/Manifest.gz and b/games-rpg/Manifest.gz differ
diff --git a/games-rpg/wastesedge/wastesedge-0.3.5-r1.ebuild b/games-rpg/wastesedge/wastesedge-0.3.5-r1.ebuild
index 2f28fcfac7b9..380732ee9982 100644
--- a/games-rpg/wastesedge/wastesedge-0.3.5-r1.ebuild
+++ b/games-rpg/wastesedge/wastesedge-0.3.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 )
inherit eutils python-single-r1
DESCRIPTION="role playing game to showcase the adonthell engine"
-HOMEPAGE="http://adonthell.linuxgames.com/"
+HOMEPAGE="http://adonthell.nongnu.org/download/"
SRC_URI="https://savannah.nongnu.org/download/adonthell/${PN}-src-${PV}.tar.gz"
LICENSE="GPL-2"
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index 04f5ea24537b..0da975023bf9 100644
Binary files a/games-strategy/Manifest.gz and b/games-strategy/Manifest.gz differ
diff --git a/games-strategy/freecol/files/commons-cli-1.3.patch b/games-strategy/freecol/files/commons-cli-1.3.patch
new file mode 100644
index 000000000000..84fc6e5064c1
--- /dev/null
+++ b/games-strategy/freecol/files/commons-cli-1.3.patch
@@ -0,0 +1,22 @@
+From: Markus Koschany
+Date: Sun, 20 Dec 2015 18:49:11 +0100
+Subject: commons-cli 1.3
+
+Forwarded: not-needed
+---
+ src/net/sf/freecol/FreeCol.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/net/sf/freecol/FreeCol.java b/src/net/sf/freecol/FreeCol.java
+index d05ae3d..99b9cdc 100644
+--- a/src/net/sf/freecol/FreeCol.java
++++ b/src/net/sf/freecol/FreeCol.java
+@@ -426,7 +426,7 @@ public final class FreeCol {
+ private static void handleArgs(String[] args) {
+ Options options = new Options();
+ final String help = Messages.message("cli.help");
+- final File dummy = new File("dummy");
++ final Class dummy = null;
+ final String argDirectory = Messages.message("cli.arg.directory");
+
+ // Help options.
diff --git a/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch b/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch
index c087193eb8c5..770279b69030 100644
--- a/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch
+++ b/games-strategy/freecol/files/freecol-0.11.6-gentoo.patch
@@ -1,27 +1,18 @@
---- build.xml.orig 2015-12-09 21:10:08.272361404 -0500
-+++ build.xml 2015-12-09 21:11:26.189663216 -0500
-@@ -36,12 +36,11 @@
-
-
-
--
--
-+
-
--
-+
-
--
-+
-
-
-
-@@ -162,7 +161,7 @@
+diff -Naur a/build.xml b/build.xml
+--- a/build.xml 2015-10-17 07:54:48.000000000 +0100
++++ b/build.xml 2019-04-13 21:51:21.679100596 +0100
+@@ -162,14 +162,9 @@
-
-
-
+- jarfile="Freecol.jar">
+-
+-
+
+
+
+-
+
+
+
diff --git a/games-strategy/freecol/freecol-0.11.6-r1.ebuild b/games-strategy/freecol/freecol-0.11.6-r1.ebuild
new file mode 100644
index 000000000000..fad44bf0d1eb
--- /dev/null
+++ b/games-strategy/freecol/freecol-0.11.6-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop java-pkg-2 java-ant-2
+
+DESCRIPTION="An open source clone of the game Colonization"
+HOMEPAGE="http://www.freecol.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Rightly or wrongly, jogg and jorbis are bundled within Cortado but we
+# don't have packages for them anyway.
+
+CP_DEPEND="
+ dev-java/commons-cli:1
+ dev-java/cortado:0
+ dev-java/miglayout:0
+"
+
+DEPEND=">=virtual/jdk-1.8
+ app-arch/unzip
+ ${CP_DEPEND}"
+
+RDEPEND=">=virtual/jre-1.8
+ ${CP_DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+ "${FILESDIR}"/commons-cli-1.3.patch
+ "${FILESDIR}"/${P}-gentoo.patch
+)
+
+JAVA_ANT_REWRITE_CLASSPATH=true
+EANT_BUILD_TARGET=package
+
+src_prepare() {
+ default
+ rm -v jars/* || die
+ java-pkg-2_src_prepare
+}
+
+src_install() {
+ local datadir=/usr/share/${PN}
+
+ java-pkg_dojar FreeCol.jar
+ java-pkg_dolauncher ${PN} \
+ --pwd ${datadir} \
+ --main net.sf.freecol.FreeCol \
+ --java_args -Xmx512M
+
+ insinto ${datadir}
+ doins -r data schema
+
+ doicon data/${PN}.png
+ make_desktop_entry ${PN} FreeCol
+
+ dodoc README
+}
diff --git a/games-strategy/freecol/freecol-0.11.6.ebuild b/games-strategy/freecol/freecol-0.11.6.ebuild
deleted file mode 100644
index 8d7df3ab2726..000000000000
--- a/games-strategy/freecol/freecol-0.11.6.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils java-pkg-2 java-ant-2 games
-
-DESCRIPTION="An open source clone of the game Colonization"
-HOMEPAGE="http://www.freecol.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEP="dev-java/jsr173
- dev-java/wstx:3.2
- dev-java/commons-cli:1
- dev-java/cortado
- dev-java/miglayout"
-DEPEND=">=virtual/jdk-1.8
- app-arch/unzip
- ${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.8
- ${COMMON_DEP}"
-
-S=${WORKDIR}/${PN}
-
-java_prepare() {
- # jorbis isn't in portage yet
- rm jars/{commons-cli-1.1,cortado-0.6.0,miglayout-core-4.2,miglayout-swing-4.2}.jar || die
- epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_prepare() {
- java-pkg-2_src_prepare
-}
-
-src_configure() {
- java-ant-2_src_configure
-}
-
-src_compile() {
- EANT_BUILD_TARGET=package
- EANT_EXTRA_ARGS="
- -Dstax.jar=$(java-pkg_getjars jsr173)
- -Dwoodstox.jar=$(java-pkg_getjars wstx-3.2)
- -Dcli.jar=$(java-pkg_getjars commons-cli-1)
- -Dmiglayout.jar=$(java-pkg_getjars miglayout)
- -Dcortado.jar=$(java-pkg_getjars cortado)
- "
- java-pkg-2_src_compile
-}
-
-src_install() {
- java-pkg_jarinto "${GAMES_DATADIR}"/${PN}
- java-pkg_dojar FreeCol.jar
- java-pkg_dolauncher ${PN} \
- -into "${GAMES_PREFIX}" \
- --pwd "${GAMES_DATADIR}"/${PN} \
- --jar FreeCol.jar \
- --java_args -Xmx512M
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r data schema
- doicon data/${PN}.png
- make_desktop_entry ${PN} FreeCol
- dodoc README
- prepgamesdirs
-}
-
-pkg_setup() {
- games_pkg_setup
- java-pkg-2_pkg_setup
-}
-
-pkg_preinst() {
- games_pkg_preinst
- java-pkg-2_pkg_preinst
-}
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index af0ef226cf25..7fc6b901fb98 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,2 +1 @@
-DIST wesnoth-1.14.5.tar.gz 489848620 BLAKE2B abbf1ae2bb20cfdd2575f5e21eea7db9b32f0a9c7e85101652206477f3dca8ae0aefbf4b0a252c4522565c08900b0a04d39fd5eadb5feb49168dc95db732e50e SHA512 115c7fda3ef77079d871aeae4bc448bf8de1829d7723179f634db10f23ab8c15d2d92c5a36c11aa8dc79fb8f914e95f06143565e2ae950947da35af5f71e1b6e
DIST wesnoth-1.14.6.tar.gz 491891860 BLAKE2B e15512eefbb7b118ec80a5612c23edce41555fc2869b652d4799bc052f26592852a2b4d1cb76dee3203d8a26c18c4cf9de58dea1ee81403b9881642e902cf2f3 SHA512 f29b78605f5e3c2e9af8884925b43a262d6fce469bf30a4697e2c8bef8a49d0fea17bd6dc1a3e78113a50e6f21e29aedb5ee26ff2b0493371120f8c64b894096
diff --git a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild b/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
deleted file mode 100644
index 4cd3506d2b9c..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.14.5.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils user
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org
- https://github.com/wesnoth/wesnoth"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE="dbus dedicated doc fribidi libressl nls openmp server"
-
-RDEPEND="
- >=dev-libs/boost-1.50:=[nls,threads,icu]
- >=media-libs/libsdl2-2.0.4:0[joystick,video,X]
- !dedicated? (
- dev-libs/glib:2
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- >=media-libs/fontconfig-2.4.1
- >=media-libs/sdl2-image-2.0.0[jpeg,png]
- >=media-libs/sdl2-mixer-2.0.0[vorbis]
- >=media-libs/sdl2-ttf-2.0.12
- media-libs/libvorbis
- >=x11-libs/pango-1.22.0
- >=x11-libs/cairo-1.10.0
- sys-libs/readline:0=
- dbus? ( sys-apps/dbus )
- fribidi? ( dev-libs/fribidi )
- )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig
- x11-libs/libX11
-"
-
-pkg_setup() {
- if use openmp; then
- tc-has-openmp || die "Please switch to an openmp compatible compiler"
- fi
-
- enewgroup ${PN}
- enewuser ${PN} -1 /bin/bash -1 ${PN}
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- if ! use doc ; then
- sed -i \
- -e '/manual/d' \
- doc/CMakeLists.txt || die
- fi
-
- # respect LINGUAS (bug #483316)
- if [[ ${LINGUAS+set} ]] ; then
- local langs
- for lang in $(cat po/LINGUAS)
- do
- has $lang $LINGUAS && langs+="$lang "
- done
- echo "$langs" > po/LINGUAS || die
- fi
-}
-
-src_configure() {
- filter-flags -ftracer -fomit-frame-pointer
- if [[ $(gcc-major-version) -eq 3 ]] ; then
- filter-flags -fstack-protector
- append-flags -fno-stack-protector
- fi
-
- # Work around eclass
- append-flags -UNDEBUG
-
- if use dedicated || use server ; then
- mycmakeargs=(
- -DENABLE_CAMPAIGN_SERVER="ON"
- -DENABLE_SERVER="ON"
- -DSERVER_UID="${PN}"
- -DSERVER_GID="${PN}"
- -DFIFO_DIR="/run/wesnothd"
- )
- else
- mycmakeargs=(
- -DENABLE_CAMPAIGN_SERVER="OFF"
- -DENABLE_SERVER="OFF"
- )
- fi
- mycmakeargs+=(
- -Wno-dev
- -DENABLE_GAME="$(usex !dedicated)"
- -DENABLE_DESKTOP_ENTRY="$(usex !dedicated)"
- -DENABLE_NLS="$(usex nls)"
- -DENABLE_NOTIFICATIONS="$(usex dbus)"
- -DENABLE_FRIBIDI="$(usex fribidi)"
- -DENABLE_OMP="$(usex openmp)"
- -DENABLE_STRICT_COMPILATION="OFF"
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- local DOCS=( README.md changelog.md )
- cmake-utils_src_install
- if use dedicated || use server; then
- rmdir "${ED%/}/run/wesnothd" || die
- newinitd "${FILESDIR}"/wesnothd.rc-r1 wesnothd
- fi
-}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index d0719f697043..f407a705e6e1 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/files/gnome-shell-extensions-topicons-plus-22-exit-stacktrace.patch b/gnome-extra/gnome-shell-extensions-topicons-plus/files/gnome-shell-extensions-topicons-plus-22-exit-stacktrace.patch
new file mode 100644
index 000000000000..17082b4ac4fd
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/files/gnome-shell-extensions-topicons-plus-22-exit-stacktrace.patch
@@ -0,0 +1,62 @@
+From e883e62a36c342bdf2e31af9d328b10f4ce61112 Mon Sep 17 00:00:00 2001
+From: Martin Wilck
+Date: Tue, 19 Mar 2019 09:39:36 +0100
+Subject: [PATCH] Fix shell stack trace when removing icon
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This fixes stacktraces like this when an application with a tray icon exits:
+
+Mar 19 09:09:53 apollon.suse.de gnome-shell[6868]: Object Shell.TrayIcon (0x5588a424ef80), has been already deallocated — impossible to access it. This might be caused by the object having been destroyed from C code using something such as destroy(), dispose(), or remove() vfuncs.
+Mar 19 09:09:53 apollon.suse.de gnome-shell[6868]: clutter_actor_destroy: assertion 'CLUTTER_IS_ACTOR (self)' failed
+Mar 19 09:09:53 apollon.suse.de org.gnome.Shell.desktop[6868]: == Stack trace for context 0x5588a17911b0 ==
+Mar 19 09:09:53 apollon.suse.de org.gnome.Shell.desktop[6868]: #0 5588a2b96d60 i /home/mwilck/.local/share/gnome-shell/extensions/TopIcons@phocean.net/extension.js:127 (7feca5a061f0 @ 92)
+---
+ extension.js | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/extension.js b/extension.js
+index 113b8ef..58a0433 100644
+--- a/extension.js
++++ b/extension.js
+@@ -31,6 +31,7 @@ const PanelMenu = imports.ui.panelMenu;
+ const ExtensionUtils = imports.misc.extensionUtils;
+ const Me = ExtensionUtils.getCurrentExtension();
+ const Convenience = Me.imports.convenience;
++const Config = imports.misc.config;
+
+ let settings = null;
+ let tray = null;
+@@ -118,7 +119,8 @@ function onTrayIconRemoved(o, icon) {
+ let parent = icon.get_parent();
+ if (parent)
+ parent.destroy();
+- icon.destroy();
++ if (!parent || !versionAtLeast('3.30', Config.PACKAGE_VERSION))
++ icon.destroy();
+ icons.splice(icons.indexOf(icon), 1);
+
+ if (icons.length === 0)
+@@ -389,3 +391,21 @@ function setSpacing() {
+ iconsBoxLayout.set_style('spacing: ' + boxLayoutSpacing + 'px; margin_top: 2px; margin_bottom: 2px;');
+
+ }
++
++// Code copied from PanelOSD extension (GPL 2.0)
++function versionAtLeast(atleast, current) {
++ let currentArray = current.split('.');
++ let major = currentArray[0];
++ let minor = currentArray[1];
++ let point = currentArray[2];
++ let atleastArray = atleast.split('.');
++ if ((atleastArray[0] < major) ||
++ (atleastArray[0] == major &&
++ atleastArray[1] < minor) ||
++ (atleastArray[0] == major &&
++ atleastArray[1] == minor) &&
++ (atleastArray[2] == undefined ||
++ atleastArray[2] <= point))
++ return true;
++ return false;
++}
diff --git a/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22-r1.ebuild b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22-r1.ebuild
new file mode 100644
index 000000000000..66bb954bfdbe
--- /dev/null
+++ b/gnome-extra/gnome-shell-extensions-topicons-plus/gnome-shell-extensions-topicons-plus-22-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit vcs-snapshot
+
+DESCRIPTION="Moves legacy tray icons to top panel"
+HOMEPAGE="https://extensions.gnome.org/extension/1031/topicons/"
+SRC_URI="https://github.com/phocean/TopIcons-plus/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# glib for glib-compile-schemas at build time, needed at runtime anyways
+COMMON_DEPEND="
+ dev-libs/glib:2
+"
+RDEPEND="${COMMON_DEPEND}
+ app-eselect/eselect-gnome-shell-extensions
+ >=gnome-base/gnome-shell-3.16
+"
+DEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+ # https://github.com/phocean/TopIcons-plus/commit/e883e62a36c342bdf2e31af9d328b10f4ce61112
+ "${FILESDIR}"/${P}-exit-stacktrace.patch
+)
+
+#src_compile() {
+ # It redoes this with "make install" later due to a dumb Makefile, so don't bother
+ #make build
+#}
+
+src_install() {
+ # TODO: Figure out if we can get the schemas to standard location, in a way that works properly runtime too
+ make install INSTALL_PATH="${ED}usr/share/gnome-shell/extensions/"
+ rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/README.md" || die
+ # Assuming it needs only compiled gettext catalogs at runtime
+ rm "${ED}/usr/share/gnome-shell/extensions/TopIcons@phocean.net/locale"/*/LC_MESSAGES/*.po || die
+ dodoc README.md
+}
+
+pkg_postinst() {
+ ebegin "Updating list of installed extensions"
+ eselect gnome-shell-extensions update
+ eend $?
+}
diff --git a/gnome-extra/pch-session/Manifest b/gnome-extra/pch-session/Manifest
index 9dfdf3a5c609..fc8c4dbaf25f 100644
--- a/gnome-extra/pch-session/Manifest
+++ b/gnome-extra/pch-session/Manifest
@@ -1 +1 @@
-DIST pch-session-3.30.0.tar.bz2 8865 BLAKE2B ee6b0b3a621f609a89392c21fd03dfd14679b2007a135b85795963170ceae49ea913f5ba587e56e0c8ff44efef1602e91da4648379c4412a6c21c5ae6f3fa21d SHA512 3994d7dbd7587fc8d65e1f561cc5f522ac68c86578b97279239fcc2e535e2c4a7f179793312d66cd8c3e7876d8d217e98a22b2f50eb79c54343117dc1c3afaaa
+DIST pch-session-3.30.0.1.tar.bz2 8854 BLAKE2B 55e90c00d3637d21b80ec87db96561a43d4f770ffcc6d90c7c83189ab979565cbeada0dfb64cb3d10d72c6f4e40466345db2023b930971bb6b784a0f7c469551 SHA512 dbb6a28cc1cff37992f717285476b73201a5d96de682fa2e91774f644bd8870cbd6444f768c1395b81a8ba0fe36e60404343251a66d339ae6acfc2a7f47127f9
diff --git a/gnome-extra/pch-session/pch-session-3.30.0.ebuild b/gnome-extra/pch-session/pch-session-3.30.0.1.ebuild
similarity index 100%
rename from gnome-extra/pch-session/pch-session-3.30.0.ebuild
rename to gnome-extra/pch-session/pch-session-3.30.0.1.ebuild
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 1ff373e11c9a..427e516c09e7 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
index f1b22e9d8da2..fe66e419387e 100644
--- a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
+++ b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
IUSE="spf +reports static-libs"
DEPEND="reports? ( dev-perl/DBI )
diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index c30e90359e2f..181f3c4f5ea9 100644
Binary files a/mate-base/Manifest.gz and b/mate-base/Manifest.gz differ
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 249bcb902ee0..26f5ee12bd5d 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,2 +1 @@
-DIST caja-1.18.5.tar.xz 3528228 BLAKE2B c39d7ef97de44c3f57fe622f71291e607cb17b10bebb20e19885413d67d0fccc6e5733739c836b0babbf45c51a0026f1559e7c1ed9656be0ee6b960363474773 SHA512 44bc85e33937f1816cddd78bf72db38b4b43e549cb2680b5d73d252699e9b5d1aace27271729ae310cb9d4f892474164140782713a6fa9f408c78c1b4f0edd73
DIST caja-1.22.0.tar.xz 3562792 BLAKE2B 2f2a1d909e5e5a333228326b34daf8b5f461c836d2b132a78d53f93b14ab9ade5f39159adcb2ddb729838eca3eecdac1c0d3b98a875769bce942cd38cf88b664 SHA512 ca97a1e81cc7b061bb331d7a4574c76831dbff50bdc9ba0a162675def7278cf5dadb37aacb0e1e37a0ac2cf60df73f98353aaa36fa0e69a0097017eed5d325b6
diff --git a/mate-base/caja/caja-1.18.5.ebuild b/mate-base/caja/caja-1.18.5.ebuild
deleted file mode 100644
index 0bef8b734e92..000000000000
--- a/mate-base/caja/caja-1.18.5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate virtualx
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="+introspection +mate packagekit xmp"
-
-COMMON_DEPEND="dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libxml2-2.4.7:2
- gnome-base/dconf:0
- >=gnome-base/gvfs-1.10.1:0[udisks]
- >=mate-base/mate-desktop-1.17.0:0
- >=media-libs/libexif-0.6.14:0
- virtual/libintl:0
- x11-libs/cairo:0
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.0:3[introspection?]
- >=x11-libs/libnotify-0.7.0:0
- x11-libs/libICE:0
- x11-libs/libSM:0
- x11-libs/libX11:0
- x11-libs/libXext:0
- x11-libs/libXft:0
- x11-libs/libXrender:0
- >=x11-libs/pango-1.1.2:0
- introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
- packagekit? ( app-admin/packagekit-base )
- xmp? ( >=media-libs/exempi-1.99.5:2 )
- !!mate-base/mate-file-manager"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-lang/perl-5:0=
- dev-util/gdbus-codegen:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# TODO: Test fails because Caja is not merged yet:
-# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
-RESTRICT="test"
-
-src_prepare() {
- # Remove unnecessary CFLAGS.
- sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
- configure.ac eel/Makefile.am || die
-
- mate_src_prepare
-}
-
-src_configure() {
- mate_src_configure \
- --disable-update-mimedb \
- $(use_enable introspection) \
- $(use_enable packagekit) \
- $(use_enable xmp)
-}
-
-src_test() {
- unset SESSION_MANAGER
- unset DBUS_SESSION_BUS_ADDRESS
-
- Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
- mate_pkg_postinst
-
- elog "Caja can use gstreamer to preview audio files. Just make sure"
- elog "to have the necessary plugins available to play the media type you"
- elog "want to preview."
-}
diff --git a/mate-base/caja/caja-1.22.0.ebuild b/mate-base/caja/caja-1.22.0.ebuild
index 950c9b46a39d..606cd126e0bb 100644
--- a/mate-base/caja/caja-1.22.0.ebuild
+++ b/mate-base/caja/caja-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate virtualx
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Caja file manager for the MATE desktop"
diff --git a/mate-base/libmatekbd/libmatekbd-1.22.0.ebuild b/mate-base/libmatekbd/libmatekbd-1.22.0.ebuild
index 8d08f75b22a0..b1f2113381e3 100644
--- a/mate-base/libmatekbd/libmatekbd-1.22.0.ebuild
+++ b/mate-base/libmatekbd/libmatekbd-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="MATE keyboard configuration library"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.18.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.18.ebuild
deleted file mode 100644
index 4b7605128b22..000000000000
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.18.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
- MATE_BRANCH=9999
-else
- inherit versionator
- MATE_BRANCH="$(get_version_component_range 1-2)"
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Meta package for MATE panel applets"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI=""
-
-LICENSE="metapackage"
-SLOT="0"
-IUSE="appindicator sensors"
-
-DEPEND=""
-RDEPEND="=mate-base/mate-applets-${MATE_BRANCH}*
- appindicator? ( =mate-extra/mate-indicator-applet-${MATE_BRANCH}* )
- sensors? ( =mate-extra/mate-sensors-applet-${MATE_BRANCH}* )
-"
diff --git a/mate-base/mate-applets-meta/mate-applets-meta-1.22.0.ebuild b/mate-base/mate-applets-meta/mate-applets-meta-1.22.0.ebuild
index e580bc128343..45432c8cc728 100644
--- a/mate-base/mate-applets-meta/mate-applets-meta-1.22.0.ebuild
+++ b/mate-base/mate-applets-meta/mate-applets-meta-1.22.0.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
else
inherit eapi7-ver
MATE_BRANCH="$(ver_cut 1-2)"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Meta package for MATE panel applets"
diff --git a/mate-base/mate-applets/Manifest b/mate-base/mate-applets/Manifest
index 141439074725..23517a152f8b 100644
--- a/mate-base/mate-applets/Manifest
+++ b/mate-base/mate-applets/Manifest
@@ -1,2 +1 @@
-DIST mate-applets-1.18.2.tar.xz 7163260 BLAKE2B 58d057d1eded3ef26f33e133f86459a75df2903906f27df555640aaf51ca381e8f57b0b4fe6ed7b2d679e08d2a595fc85a6b0d9c4ad51d3ac01552e2875e00bb SHA512 6644a7dfde1dbf65c38cd3a0f52f862e096030f0b9f324f1fbfc34b6167c04b51071f01c322c3c8382e74843332c877b1340fe2129417d6cf9207c32ef2f70be
DIST mate-applets-1.22.0.tar.xz 7739668 BLAKE2B dc3768d2f5eb987907f1ffb1a049dff990140c66c51427dc9095298be92b17b2b1e9695f3c35dae73433e1e50d05477e94aad1697b2bf15706515c16150096d7 SHA512 2f3e17414171ec5ab6967b76b1291d99783c3091b51127788f99148f46d5f2068edf7d890c3ebca1a59c29cbda4a06be11c852e5e88d4dc58e9981d906c9e34c
diff --git a/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch b/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch
deleted file mode 100644
index 3f4f4fa519f1..000000000000
--- a/mate-base/mate-applets/files/mate-applets-1.16.0-cpupower-4.7.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index b49d127..6b87389 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -411,6 +411,8 @@ fi
- AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
- AC_SUBST(LIBCPUFREQ_LIBS)
-
-+AC_CHECK_HEADERS([cpupower.h])
-+
- build_cpufreq_applet=no
-
- if test x$disable_cpufreq = xno; then
-diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-index 4fa9d4c..ba52fde 100644
---- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
-+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
-@@ -19,12 +19,16 @@
- * Authors : Carlos García Campos
- */
-
-+#include
-+
- #include
- #include
-
- #include
--#include
- #include
-+#ifdef HAVE_CPUPOWER_H
-+#include
-+#endif
- #include "cpufreq-monitor-libcpufreq.h"
- #include "cpufreq-utils.h"
-
-@@ -111,7 +115,7 @@
- /* Check whether it failed because
- * cpu is not online.
- */
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
-+#ifndef HAVE_CPUPOWER_H
- if (!cpufreq_cpu_exists (cpu)) {
- #else
- if (cpupower_is_cpu_online (cpu)) {
diff --git a/mate-base/mate-applets/mate-applets-1.18.2.ebuild b/mate-base/mate-applets/mate-applets-1.18.2.ebuild
deleted file mode 100644
index fff5a4222fc3..000000000000
--- a/mate-base/mate-applets/mate-applets-1.18.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Applets for the MATE Desktop and Panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X ipv6 policykit +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- dev-libs/atk:0
- >=dev-libs/dbus-glib-0.74:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libmateweather-1.17.0
- >=dev-libs/libxml2-2.5:2
- dev-python/pygobject:3
- >=gnome-base/libgtop-2.12.0:2=
- >=gnome-extra/gucharmap-3.0:2.90
- >=mate-base/mate-panel-1.17.0
- >=net-wireless/wireless-tools-28_pre9:0
- >=sys-apps/dbus-1.1.2:0
- sys-power/cpupower
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14:3
- x11-libs/gtksourceview:3.0
- >=x11-libs/libnotify-0.7:0
- x11-libs/libX11:0
- >=x11-libs/libwnck-3.0:3
- x11-libs/pango:0
- virtual/libintl:0
- policykit? ( >=sys-auth/polkit-0.97:0 )
- upower? (
- >=sys-power/upower-0.9.23
- )
- !!net-analyzer/mate-netspeed"
-
-RDEPEND="${COMMON_DEPEND}
- >=mate-base/mate-settings-daemon-1.6"
-
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.3
- app-text/rarian:0
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- >=dev-util/intltool-0.50.1:*
- dev-libs/libxslt:0
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-PATCHES=( "${FILESDIR}/${PN}-1.16.0-cpupower-4.7.patch" )
-
-src_configure() {
- mate_src_configure \
- --libexecdir=/usr/libexec/mate-applets \
- --with-cpufreq-lib=cpupower \
- $(use_with X x) \
- $(use_with upower) \
- $(use_enable ipv6) \
- $(use_enable policykit polkit)
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- emake check
-}
-
-src_install() {
- python_fix_shebang invest-applet
- mate_src_install
-
- local APPLETS="accessx-status battstat charpick command cpufreq drivemount
- geyes invest-applet mateweather multiload netspeed stickynotes
- timerapplet trashapplet"
-
- for applet in ${APPLETS}; do
- docinto ${applet}
-
- for d in AUTHORS ChangeLog NEWS README README.themes TODO; do
- [ -s ${applet}/${d} ] && dodoc ${applet}/${d}
- done
- done
-}
diff --git a/mate-base/mate-applets/mate-applets-1.22.0.ebuild b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
index 1a1b62dec8c9..79f7b2082756 100644
--- a/mate-base/mate-applets/mate-applets-1.22.0.ebuild
+++ b/mate-base/mate-applets/mate-applets-1.22.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Applets for the MATE Desktop and Panel"
diff --git a/mate-base/mate-common/Manifest b/mate-base/mate-common/Manifest
index 942b91606a67..1d212c14e757 100644
--- a/mate-base/mate-common/Manifest
+++ b/mate-base/mate-common/Manifest
@@ -1,2 +1 @@
-DIST mate-common-1.18.0.tar.xz 72608 BLAKE2B 7a280f440de8964ac725582f545c7ae15152c0fef21897dcacb820d539f74fb3aec1d87e9c75e98bc6053bf3db6a69daf2eca3cf2de0cbc8a32d65a62c43187e SHA512 cdc8d39a78ebb1a0fb0d8179814ce59691006a21cb10d78b818cf62a8f42c89d01c9126e93b5fa3b7ac27adce52d3a2512ac2fb63c41e6c5a698a767e9176563
DIST mate-common-1.22.0.tar.xz 73448 BLAKE2B 7796423fd70732c063759e509c13a62fdc5c68e07768776b25ecbec7d06ca8bc68fad947287306ede99f5993a8def3b5f25a4560d3fa7677083a28c64d2c4288 SHA512 3887634081c126c6c23f560ca256ae83edbc5f77f0fc0128c2aaa2b5652672ec6f21ca29b0b44802b03c5dfd53bf0da860093ec73c46fba58f7be12a1db1d2a3
diff --git a/mate-base/mate-common/mate-common-1.18.0.ebuild b/mate-base/mate-common/mate-common-1.18.0.ebuild
deleted file mode 100644
index e04018d3f05a..000000000000
--- a/mate-base/mate-common/mate-common-1.18.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate-desktop.org
-
-if [[ ${PV} == 9999 ]]; then
- inherit autotools
-else
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Common files for development of MATE packages"
-LICENSE="GPL-3"
-SLOT="0"
-
-src_prepare() {
- default
- if [[ ${PV} == 9999 ]]; then
- eautoreconf
- fi
-}
-
-src_install() {
- mv doc-build/README README.doc-build \
- || die "Failed to rename doc-build/README."
-
- default
-
- dodoc doc/usage.txt
-}
diff --git a/mate-base/mate-common/mate-common-1.22.0.ebuild b/mate-base/mate-common/mate-common-1.22.0.ebuild
index 9692272ccbe5..212f79eb6cf8 100644
--- a/mate-base/mate-common/mate-common-1.22.0.ebuild
+++ b/mate-base/mate-common/mate-common-1.22.0.ebuild
@@ -8,7 +8,7 @@ inherit mate-desktop.org
if [[ ${PV} == 9999 ]]; then
inherit autotools
else
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Common files for development of MATE packages"
diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest
index 8243750cba47..7be5e5bd6874 100644
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@@ -1,2 +1 @@
-DIST mate-control-center-1.18.2.tar.xz 1351644 BLAKE2B 30c093b11f3cbf32e3590368001d8d929b8f611c4efd58f6332a70905ef028b8e573e41cbb20b5342ad2b0f459327d9665c4db77104bf49b2b8be4935adc232c SHA512 0acc6d775aa26dd0265ddab80317b2ddd2f027394b55574e29e6ad233b8711bc0984803f76f2cbaeed2bfd2b4397cd5143d5540908f5078080a1749290dac7ab
DIST mate-control-center-1.22.0.tar.xz 1524084 BLAKE2B e0d7beb9fb358d6e60d6847fb6ee9e295793f856d25b0acf865efc360eefd446fa3f5a22d51121cd0fe675e01509b2612602587d4583b8835ec8e7157b795923 SHA512 3b2b88458848862a4c819d54104e9394817b29feb3d05117fe69441023ec5e6c922012395f24b5f70c9f9dbf6f8044f769840ec9996b1495441c4cb690f68371
diff --git a/mate-base/mate-control-center/mate-control-center-1.18.2.ebuild b/mate-base/mate-control-center/mate-control-center-1.18.2.ebuild
deleted file mode 100644
index a16f1929ab70..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.18.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE Desktop configuration tool"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="appindicator debug"
-
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/dbus-glib-0.73:0
- >=dev-libs/glib-2.36:2
- dev-libs/libxml2:2
- >=gnome-base/dconf-0.13.4:0
- >=gnome-base/librsvg-2.0:2
- >=mate-base/libmatekbd-1.17.0
- >=mate-base/mate-desktop-1.17.0
- >=mate-base/caja-1.17.0
- >=mate-base/mate-menus-1.1.0
- >=mate-base/mate-settings-daemon-1.17.0
- >=media-libs/fontconfig-1:1.0
- media-libs/freetype:2
- media-libs/libcanberra:0[gtk3]
- >=sys-apps/dbus-1:0
- x11-apps/xmodmap:0
- x11-libs/cairo:0
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14:3
- x11-libs/libX11:0
- x11-libs/libXScrnSaver:0
- x11-libs/libXcursor:0
- x11-libs/libXext:0
- >=x11-libs/libXi-1.5:0
- x11-libs/libXrandr:0
- x11-libs/libXrender:0
- x11-libs/libXxf86misc:0
- >=x11-libs/libxklavier-4:0
- x11-libs/pango:0
- >=x11-wm/marco-1.17.0
- virtual/libintl:0
- appindicator? ( dev-libs/libappindicator:3 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/rarian:0
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- dev-util/desktop-file-utils:0
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*
- x11-base/xorg-proto"
-
-src_configure() {
- mate_src_configure \
- --disable-update-mimedb \
- $(use_enable appindicator) \
- $(use_enable debug)
-}
diff --git a/mate-base/mate-control-center/mate-control-center-1.22.0.ebuild b/mate-base/mate-control-center/mate-control-center-1.22.0.ebuild
index 2ca490b4945a..dca36e43fd8f 100644
--- a/mate-base/mate-control-center/mate-control-center-1.22.0.ebuild
+++ b/mate-base/mate-control-center/mate-control-center-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="The MATE Desktop configuration tool"
diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
index 611216c84816..b86c7237f338 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -1,2 +1 @@
-DIST mate-desktop-1.18.0.tar.xz 827332 BLAKE2B e5a0439c768a388a76f1bd2a7ba819d92fd020565d63d4b412c5edac54c28493e83d9fa9c5b9f7c82dd5d76338f257e7cb8db7318d7743f6101098f20d47db5c SHA512 0490e9810009923fa315e7f191103bc797c37f4417cf41bf317c55d26f7b52a848a65c28dde6903a861694c131ca52f3ed0be05cbbf6b2dd1cb216539f513220
DIST mate-desktop-1.22.0.tar.xz 962580 BLAKE2B 0bc3418ab25fd9f30e216a5b845722327449f8d05944c028b4cb967acd6415ca9c3c560856485f34e90752c9a3263ba093e1eb69daaea2586c6371ad4c4ee22f SHA512 3950249c0bc026163da7f38a6fd5551c0e1e863e298e9d2ca224679b6c802d1deaf12e16ea873a2ea0539a7989a523d0495fb0dc4c556857203c0b04ab6edf7a
diff --git a/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild b/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild
deleted file mode 100644
index 1583d2db932b..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.18.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug +introspection startup-notification"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.36:2
- >=gnome-base/dconf-0.13.4:0
- x11-libs/cairo:0
- x11-libs/libX11:0
- >=x11-libs/libXrandr-1.3:0
- virtual/libintl:0
- >=x11-libs/gtk+-3.0:3[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
- startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40:*
- sys-devel/gettext:*
- virtual/pkgconfig:*
- x11-base/xorg-proto"
-
-src_configure() {
- mate_src_configure \
- --enable-mate-about \
- $(use_with X x) \
- $(use_enable debug) \
- $(use_enable introspection) \
- $(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild b/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild
index 5046efd1706f..5bb00164ee03 100644
--- a/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild
+++ b/mate-base/mate-desktop/mate-desktop-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
diff --git a/mate-base/mate-menus/Manifest b/mate-base/mate-menus/Manifest
index ef8b98977966..f25e4993d83d 100644
--- a/mate-base/mate-menus/Manifest
+++ b/mate-base/mate-menus/Manifest
@@ -1,2 +1 @@
-DIST mate-menus-1.18.1.tar.xz 359768 BLAKE2B c57095e772610c56a02a5b6b1405c5ccc11cb590ea959efa14bd0ffb5cafbe3a678f8a681e39ae9cf607225f57becfc520ec483e6451f07b7f9e80418496502b SHA512 bfd010735acd3447700a4732da16728d429ca8ba559c6bfc6edfdaea52f4e40552882bb09615fc4f040730bffac7614bb74fe18aee3ab8ee1684dad40a82d572
DIST mate-menus-1.22.0.tar.xz 355948 BLAKE2B f65bd45c4c7c04f11f9228499991d7c2dfa60a3e74e4cbfcffc3a02f09e8e6cad6b4b4adb6d9227a4e893bad9dc032afc6cce8098ea62fd133ef836cbe9abdf2 SHA512 7ca02c1bb89c83b6b331fc2e8878862fa8f02f5cd52b297aa44b36dd5c2d1ee1ffeb1641d63a10bd4deb99f63ded9c3b890a05ab7f7faf32d7f895b0a2f68d70
diff --git a/mate-base/mate-menus/mate-menus-1.18.1.ebuild b/mate-base/mate-menus/mate-menus-1.18.1.ebuild
deleted file mode 100644
index e549475bddf7..000000000000
--- a/mate-base/mate-menus/mate-menus-1.18.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-IUSE="debug +introspection python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
- virtual/libintl:0
- introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
- python? (
- dev-python/pygtk:2[${PYTHON_USEDEP}]
- ${PYTHON_DEPS}
- )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-src_prepare() {
- mate_src_prepare
- use python && python_copy_sources
-}
-
-src_configure() {
- # Do NOT compile with --disable-debug/--enable-debug=no as it disables API
- # usage checks.
- mate_py_cond_func_wrap mate_src_configure \
- --enable-debug=$(usex debug yes minimum) \
- $(use_enable python) \
- $(use_enable introspection)
-}
-
-src_compile() {
- mate_py_cond_func_wrap default
-}
-
-src_test() {
- mate_py_cond_func_wrap emake check
-}
-
-src_install() {
- mate_py_cond_func_wrap mate_src_install
-
- exeinto /etc/X11/xinit/xinitrc.d/
- doexe "${FILESDIR}/10-xdg-menu-mate"
-}
-
-pkg_postinst() {
- mate_pkg_postinst
- einfo "Due to upstream bug"
- einfo "https://github.com/mate-desktop/mate-menus/issues/2,"
- einfo "it is highly recommended to run the following command"
- einfo "once you have logged in to your desktop for the first time:"
- einfo "cd ~/.config/menus && ln -s {,mate-}applications-merged"
-}
diff --git a/mate-base/mate-menus/mate-menus-1.22.0.ebuild b/mate-base/mate-menus/mate-menus-1.22.0.ebuild
index 02319461b199..c7d1f30030ec 100644
--- a/mate-base/mate-menus/mate-menus-1.22.0.ebuild
+++ b/mate-base/mate-menus/mate-menus-1.22.0.ebuild
@@ -8,7 +8,7 @@ GNOME2_LA_PUNT="yes"
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="MATE menu system, implementing the F.D.O cross-desktop spec"
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
index bdbee217e306..cfc5af62b3fd 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -1,2 +1 @@
-DIST mate-panel-1.18.7.tar.xz 1943216 BLAKE2B c811a299d612e11827f6531f3093addfeeb5a8f18449f76dba0f70233f072bd2666bb4cd8b39111da298fbdd966f5b7f21b37ce3fe4870129da0563faabc5a2f SHA512 6de91f16f5ade7873d2baf3d813bd77304723f27629474fdf37aa9c590b5fcb31452f5b117b52926dd53a38e9f8edd964c654fd29c8271131c6901eec46b5a31
DIST mate-panel-1.22.0.tar.xz 2251040 BLAKE2B 6a4da6080cec2fc7858c711fa0a2c7497f4d03a1e22394f481925be32b17f7905920d4155ca75b9bf0d6bbf4af078aac77abc99e6d5a22e84bf453e2290ba032 SHA512 078c6dcdc17970a7a7fab9a218eaf2c8cd6c4074c0c23ff4ce7ccf57e007d0afcbe797be4ad4c9d2c16d9033cc554cc5a979ec61dc721514db939a5e60de456b
diff --git a/mate-base/mate-panel/mate-panel-1.18.7.ebuild b/mate-base/mate-panel/mate-panel-1.18.7.ebuild
deleted file mode 100644
index 40616e1e1392..000000000000
--- a/mate-base/mate-panel/mate-panel-1.18.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X +introspection"
-
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/dbus-glib-0.80:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libmateweather-1.17.0
- dev-libs/libxml2:2
- >=gnome-base/dconf-0.13.4:0
- >=gnome-base/librsvg-2.36.2:2
- >=mate-base/mate-desktop-1.17.0
- >=mate-base/mate-menus-1.10.0
- >=sys-apps/dbus-1.1.2:0
- >=x11-libs/cairo-1:0
- >=x11-libs/gdk-pixbuf-2.7.1:2
- >=x11-libs/gtk+-3.20:3[introspection?]
- x11-libs/libICE:0
- x11-libs/libSM:0
- >=x11-libs/libwnck-3.0:3[introspection?]
- x11-libs/libX11:0
- >=x11-libs/pango-1.15.4:0[introspection?]
- x11-libs/libXau:0
- >=x11-libs/libXrandr-1.3:0
- virtual/libintl:0
- introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/yelp-tools:0
- >=dev-lang/perl-5:0=
- dev-util/gdbus-codegen:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-src_configure() {
- mate_src_configure \
- --libexecdir=/usr/libexec/mate-applets \
- --disable-deprecation-flags \
- $(use_with X x) \
- $(use_enable introspection)
-}
diff --git a/mate-base/mate-panel/mate-panel-1.22.0.ebuild b/mate-base/mate-panel/mate-panel-1.22.0.ebuild
index 84610067f793..f844c383f222 100644
--- a/mate-base/mate-panel/mate-panel-1.22.0.ebuild
+++ b/mate-base/mate-panel/mate-panel-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="The MATE panel"
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index 583bf9a9957d..e648f5d89752 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -1,2 +1 @@
-DIST mate-session-manager-1.18.2.tar.xz 570336 BLAKE2B d1fd8f6a037fa38833d4aae05dcc9ed98ff192c712819342a77d19fb00e09febaa90fd0396048a3cee64ea424c6a72e8ae90f067d61929ef524825c97d500f8e SHA512 e3d3e2524cd0d00930b5c6b81134b969555f00550d23a357d426a6f0d475884ce6ab16be365fd5e95801dd53c250069ad091dec6c93f2ab70818460fbef4765e
DIST mate-session-manager-1.22.0.tar.xz 603016 BLAKE2B 5d7064756b7d7d2ca4fdebf18319dc8a8d8eca6ed31c5e8e37e503c7099a0d541186028d6b4e174bff1ce9ca727a374e9597498b2ca6d5494dc74f21fec0baeb SHA512 7e5e21e37c7ac55ca7d71302edef9aabeccf39233aec9edfe93a2fdcd4150d039e8121adecebb3d0a4a707eccef0c7afa1b54c5b52b57853242964c7506eeb9a
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.18.2-r1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.18.2-r1.ebuild
deleted file mode 100644
index 8945b342d69f..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.18.2-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="MATE session manager"
-HOMEPAGE="http://mate-desktop.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd +xtrans"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
- >=dev-libs/glib-2.36:2
- dev-libs/libxslt
- sys-apps/dbus
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14:3
- x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXext
- x11-libs/libXrender
- x11-libs/libXtst
- x11-libs/pango
- virtual/libintl
- elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) )
- systemd? ( sys-apps/systemd )
- !systemd? ( >=sys-auth/consolekit-0.9.2 )
- xtrans? ( x11-libs/xtrans )"
-
-RDEPEND="${COMMON_DEPEND}
- x11-apps/xdpyinfo
- x11-misc/xdg-user-dirs
- x11-misc/xdg-user-dirs-gtk
- gnome-keyring? ( gnome-base/gnome-keyring )"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40:*
- >=dev-lang/perl-5
- >=sys-devel/gettext-0.10.40:*
- virtual/pkgconfig:*
- != $GLI
-
- AC_PATH_PROG([PYTHON], [python])
-
--AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
-+AC_PATH_PROG([RST2MAN], [rst2man.py], [python rst2man.py])
- AC_SUBST(RST2MAN)
-
- # define module checking macro
diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
index a84a8d5ec583..2bd09063353a 100644
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@@ -1,2 +1 @@
-DIST caja-extensions-1.18.2.tar.xz 410704 BLAKE2B e13dde75bf616463f34d41df0b3be28d283383bd3ef56e24ce6cc0f319f0a7fea1b8dd75076582a78157c076de26f72235fe7b6f445f150547944a072b62038e SHA512 cbc3e6c02cdf93aa98e17232b9cdc9579355e2a31ea9421e6829eb2ba6fe50c7d6ba33b737f1286c9b0730a8781e8c060140ea47b216ef60b0bbaafabc9d836d
DIST caja-extensions-1.22.0.tar.xz 444704 BLAKE2B d14f14e2ab18e9e6ea9c039d675e2948c309d470b1532e0585915f324bcf52a8e8425fdf0b6e725014e8813eefad77300172843c2118d098811b2b349d218fd1 SHA512 19fd287123b8d2ba67b636066e9f8910aadd47d375eb1d52136d9b808b48abacade81dde490ce3edb6fc4a9d2ddfd39d9abf294a58aed8bcaf620c1eff03e761
diff --git a/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild b/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild
deleted file mode 100644
index 5b174d4edf6e..000000000000
--- a/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Several Caja extensions"
-LICENSE="GPL-2"
-SLOT="0"
-
-SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="image-converter +open-terminal share +wallpaper xattr ${SENDTO}"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
- >=mate-base/caja-1.17.1
- virtual/libintl:0
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14:3
- gajim? (
- >=dev-libs/dbus-glib-0.60:0
- >=sys-apps/dbus-1:0
- )
- open-terminal? ( >=mate-base/mate-desktop-1.17.0 )
- pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
- upnp? ( >=net-libs/gupnp-0.13:0= )
- xattr? ( sys-apps/attr )"
-
-RDEPEND="${COMMON_DEPEND}
- cdr? ( >=app-cdr/brasero-2.32.1:0= )
- gajim? ( net-im/gajim:0 )
- image-converter? (
- || (
- media-gfx/imagemagick
- media-gfx/graphicsmagick[imagemagick]
- )
- )
- pidgin? ( net-im/pidgin )"
-
-DEPEND="${COMMON_DEPEND}
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.18:*
- sys-devel/gettext:*
- virtual/pkgconfig:*
- !!mate-extra/mate-file-manager-open-terminal
- !!mate-extra/mate-file-manager-sendto
- !!mate-extra/mate-file-manager-image-converter
- !!mate-extra/mate-file-manager-share"
-
-src_configure() {
- local sendto_plugins="removable-devices"
- use cdr && sendto_plugins+=",caja-burn"
- use mail && sendto_plugins+=",emailclient"
- use pidgin && sendto_plugins+=",pidgin"
- use gajim && sendto_plugins+=",gajim"
- use upnp && sendto_plugins+=",upnp"
-
- mate_src_configure \
- --enable-sendto \
- --with-sendto-plugins=${sendto_plugins}\
- --disable-gksu \
- $(use_enable image-converter) \
- $(use_enable open-terminal) \
- $(use_enable share) \
- $(use_enable wallpaper) \
- $(use_enable xattr xattr-tags)
-}
diff --git a/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild b/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
index 88f85a98d2ed..bc91725a62bf 100644
--- a/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
+++ b/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Several Caja extensions"
diff --git a/mate-extra/mate-calc/Manifest b/mate-extra/mate-calc/Manifest
index de2c7c17c80b..7675ee11c7bc 100644
--- a/mate-extra/mate-calc/Manifest
+++ b/mate-extra/mate-calc/Manifest
@@ -1,2 +1 @@
-DIST mate-calc-1.18.1.tar.xz 727752 BLAKE2B 0659bd85c66186eead2e8999535a2980a4c35dc66f5443583b55ddfe06e2779ef351be22eabbd6a05c32085b3cdd638520770f40befbbe846c76b6cd1abd5944 SHA512 d9c95386427ebcb8c1525804f2b7f0f6b91c52a15bc90ff9c688d13bce07f97ed0db032a5e252a9a11ccbd6c04b66d3d74baf1c6bb27b6807506243b27ad25e5
DIST mate-calc-1.22.0.tar.xz 623312 BLAKE2B ae40278e455c520649db9fb4f48aedb2dec3b9abc48175a9f0111bbc57b7aac289d20d8dc1703a7b6545351e75e0ae641432ce6227f5ae0a8de5cbed68120581 SHA512 a0d72a17dc9e7e97ef36cb2f089db126b1f91790d6a34ae829ef9cea87e82b025ba106f08e8c677352e72423a6670a3bf8751eecc67444cd8cea8dc8f3cf6728
diff --git a/mate-extra/mate-calc/mate-calc-1.18.1.ebuild b/mate-extra/mate-calc/mate-calc-1.18.1.ebuild
deleted file mode 100644
index b6f772ca3557..000000000000
--- a/mate-extra/mate-calc/mate-calc-1.18.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Calculator for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- dev-libs/libxml2:2
- >=x11-libs/gtk+-3.14:3
- x11-libs/pango:0"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools:0
- >=dev-util/intltool-0.35.0:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
diff --git a/mate-extra/mate-calc/mate-calc-1.22.0.ebuild b/mate-extra/mate-calc/mate-calc-1.22.0.ebuild
index ac780df7881c..da47eafc3691 100644
--- a/mate-extra/mate-calc/mate-calc-1.22.0.ebuild
+++ b/mate-extra/mate-calc/mate-calc-1.22.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Calculator for MATE"
diff --git a/mate-extra/mate-indicator-applet/Manifest b/mate-extra/mate-indicator-applet/Manifest
index e2598037a7e0..5cf4df830a3d 100644
--- a/mate-extra/mate-indicator-applet/Manifest
+++ b/mate-extra/mate-indicator-applet/Manifest
@@ -1,2 +1 @@
-DIST mate-indicator-applet-1.18.1.tar.xz 318464 BLAKE2B 989b84e2135ff3307a731b3eff981aea40002cbbd9b9e6ba61053a24e681fe3a3005b55ecf6dd027adf97d2bbfe3a12c0bdfdee2aac4860bac10fe3c03a4d681 SHA512 990cf60ff0b0a3e53f6ebc94abbdc15ce7b55258935763fb2d294a06c725e98e4b3389117e8fd04a9d1ce0ba691bc891542fd12c1ab58b29d99352a8369265d0
DIST mate-indicator-applet-1.22.0.tar.xz 339564 BLAKE2B 0655ced0b24cc681ebd8e66b0749c9d98f9bc361830431bb408158ab174d5ea27aa022344cc667e37405ae693b52ed5c20e5b5ecec01b484c1928df36e1673d0 SHA512 6e1dd133a521f247ecb648b3ffa542e326f504fd3b0719a74099e83ac1dfa9fd4d7676af284f89f69d6684e5640f240930bb0fb43bcf7d59472786adf4c3200c
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.1.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.1.ebuild
deleted file mode 100644
index a590981bc241..000000000000
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.18.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate versionator
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE indicator applet"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="
- >=dev-libs/libindicator-0.4:3
- >=mate-base/mate-panel-1.17.0
- >=x11-libs/gtk+-3.14:3"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.35.0
- virtual/pkgconfig"
diff --git a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild
index cf28e6636754..ed3d14dae04e 100644
--- a/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild
+++ b/mate-extra/mate-indicator-applet/mate-indicator-applet-1.22.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit mate eapi7-ver
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm x86"
fi
DESCRIPTION="MATE indicator applet"
diff --git a/mate-extra/mate-media/Manifest b/mate-extra/mate-media/Manifest
index 6e06d971bd13..d67388a60505 100644
--- a/mate-extra/mate-media/Manifest
+++ b/mate-extra/mate-media/Manifest
@@ -1,2 +1 @@
-DIST mate-media-1.18.2.tar.xz 496148 BLAKE2B 5588c3c9d72ca73d7956db4e90b0989b040be59e85f2d93b740c085098cd4e643b0848d53015e7d8dc4da528edf4b7cb90dbf7c7d30e6ec3a7c898190ca90565 SHA512 bfd5933e95aac233354b0124919213cd6aba9f062eb4f240ff2df80447091473d2789ee87960fa00d5672c31daf3ac32b81a190f43f6cb32ca92fc8b6768fb38
DIST mate-media-1.22.0.tar.xz 504312 BLAKE2B b91e3f22a082ca924459e89b0b3b9b98d9a17fb1a13c56ed78d723f34545bafaa560505ca2c373ebde9c04459ffe7f1945e8802d96f2737cc6ec2783d946eb35 SHA512 1c1751ebb0c848cece0e2fc10240832dff317dfcc08aa6721fe00feaf2cff907c700f5e0debd5a236078a199b9d65d59124ffca7a04f61d425d16b1adb02fc1f
diff --git a/mate-extra/mate-media/mate-media-1.18.2.ebuild b/mate-extra/mate-media/mate-media-1.18.2.ebuild
deleted file mode 100644
index 49f7221c1c72..000000000000
--- a/mate-extra/mate-media/mate-media-1.18.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Multimedia related programs for the MATE desktop"
-LICENSE="LGPL-2 GPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND=">=dev-libs/glib-2.36.0:2
- dev-libs/libxml2:2
- >=mate-base/mate-panel-1.17.0
- >=mate-base/mate-desktop-1.17.0
- >=media-libs/libcanberra-0.13:0[gtk3]
- >=media-libs/libmatemixer-1.10.0
- x11-libs/cairo:0
- >=x11-libs/gtk+-3.14:3
- x11-libs/pango:0
- virtual/libintl:0"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.35.0:*
- sys-devel/gettext:*
- virtual/pkgconfig:*
- !!> /etc/portage/package.use"
- echo
- fi
-
- readme.gentoo_print_elog
-}
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
index cea71578dfcb..92449016a7c4 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.22.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit mate readme.gentoo-r1
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Replaces xscreensaver, integrating with the MATE desktop"
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index 6e20ea2058ec..ade43c73b58d 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,2 +1 @@
-DIST mate-sensors-applet-1.18.3.tar.xz 385728 BLAKE2B 42a38121db367788af906aec08261512b8aa96ad3782c1aca0d29b8371a598855ee0d7a3c63306929d45e4d58fb01e117efd91b4bd6b104c49790ff8e73c292f SHA512 39e23839eebe460a99d002d6f897d3053a6940cb33a24c923790e976b72be7a260cd06be326abbb3917b85b6b6fa779cc5f1c06dbf9c19c45ec3f1bf6a93a96e
DIST mate-sensors-applet-1.22.0.tar.xz 511876 BLAKE2B 6e2008d60a5530ab233da0fe67a38fea2abfba0d745386d82d44e21e59a5d7a08e7f97390f3b8e3df16699c8b69bf1f9c3d4762b45f4652838672c57ec91bf34 SHA512 f756fdff4dd8fe824fbe41956411ca1e6ce251fc1d43276c7244a8a806e91bacc283c412b831935136682971509e23c08538264963af31488bee15ce5644d5cb
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.18.3.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.18.3.ebuild
deleted file mode 100644
index 62ee356d61a6..000000000000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.18.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="MATE panel applet to display readings from hardware sensors"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+dbus hddtemp libnotify lm_sensors video_cards_nvidia"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
- >=mate-base/mate-panel-1.17.0
- >=x11-libs/cairo-1.0.4:0
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14:3
- virtual/libintl:0
- hddtemp? (
- dbus? (
- >=dev-libs/dbus-glib-0.80:0
- >=dev-libs/libatasmart-0.16:0 )
- !dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) )
- libnotify? ( >=x11-libs/libnotify-0.7:0 )
- lm_sensors? ( sys-apps/lm_sensors:0 )
- video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/rarian:0
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )"
-
-src_configure() {
- local udisks
-
- if use hddtemp && use dbus; then
- udisks="--enable-udisks"
- else
- udisks="--disable-udisks"
- fi
-
- mate_src_configure \
- --disable-static \
- --without-aticonfig \
- $(use_enable libnotify) \
- $(use_with lm_sensors libsensors) \
- $(use_with video_cards_nvidia nvidia) \
- ${udisks}
-}
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild
index 1bbeca988faf..7df62276db70 100644
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm x86"
fi
DESCRIPTION="MATE panel applet to display readings from hardware sensors"
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0.ebuild
deleted file mode 100644
index 9af3b881d01f..000000000000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.22.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE panel applet to display readings from hardware sensors"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+dbus hddtemp libnotify lm_sensors video_cards_nvidia"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
- >=mate-base/mate-panel-1.17.0
- >=x11-libs/cairo-1.0.4
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.22:3
- virtual/libintl
- hddtemp? (
- dbus? (
- >=dev-libs/dbus-glib-0.80
- >=dev-libs/libatasmart-0.16 )
- !dbus? ( >=app-admin/hddtemp-0.3_beta13 ) )
- libnotify? ( >=x11-libs/libnotify-0.7 )
- lm_sensors? ( sys-apps/lm_sensors )
- video_cards_nvidia? ( || (
- >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
- ) )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/rarian
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )"
-
-src_configure() {
- local udisks
-
- if use hddtemp && use dbus; then
- udisks="--enable-udisks"
- else
- udisks="--disable-udisks"
- fi
-
- mate_src_configure \
- --disable-static \
- --without-aticonfig \
- $(use_enable libnotify) \
- $(use_with lm_sensors libsensors) \
- $(use_with video_cards_nvidia nvidia) \
- ${udisks}
-}
diff --git a/mate-extra/mate-system-monitor/Manifest b/mate-extra/mate-system-monitor/Manifest
index 9f7e57a766db..f2c51a98c413 100644
--- a/mate-extra/mate-system-monitor/Manifest
+++ b/mate-extra/mate-system-monitor/Manifest
@@ -1,2 +1 @@
-DIST mate-system-monitor-1.18.1.tar.xz 2159100 BLAKE2B babac7ad0dc3a3bccf5c6d4567bee0c95aad1f5fffdb1d6d566316f4712a345e7083c8032c19b6615a9f9d06fbbe8b89357407b897206f3131294b7d2305b45d SHA512 47dd2ba46cd6fbd1beef2e6f0a93332c7142f701d18f6894b4986134c557f63f3e2bed382af17cc5bf45693b556a91ccab36fde940126fdceb5834d4cea08356
DIST mate-system-monitor-1.22.0.tar.xz 2190688 BLAKE2B 83ab7dfbc0033f094896c663790c1200e71a498d3a813a82c94593e6c6434942b2afd0fa1c3067452a46e0e1829a9239f1c145a315b9de2c2853c9f4f50618ef SHA512 6f97f934626b49320ea0dbb4e14743c4f33b12a85671b69465f689765f3003f00e51685b616e34a482c3ec0ca09ca4e13cbdb2e3eb4719c0d1fc7b25b24436a7
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.18.1.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.18.1.ebuild
deleted file mode 100644
index 2421673a931a..000000000000
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.18.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE System Monitor"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="systemd"
-
-COMMON_DEPEND="
- >=dev-cpp/glibmm-2.26:2
- >=dev-cpp/gtkmm-3.8:3.0
- >=dev-libs/glib-2.36:2
- dev-libs/libsigc++:2
- >=dev-libs/libxml2-2:2
- >=gnome-base/libgtop-2.23.1:2=
- >=gnome-base/librsvg-2.35:2
- x11-libs/cairo:0
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14:3
- >=x11-libs/libwnck-3.0:3
- virtual/libintl:0
- systemd? ( sys-apps/systemd )"
-
-RDEPEND="${COMMON_DEPEND}
- >=sys-auth/polkit-0.97:0"
-
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools:0
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- >=sys-devel/autoconf-2.63:*
- virtual/pkgconfig:*"
-
-src_configure() {
- mate_src_configure \
- $(use_enable systemd)
-}
-
-pkg_postinst() {
- mate_pkg_postinst
-
- einfo "${PN} may run commands with escalated privileges using"
- einfo "x11-libs/gksu."
-}
diff --git a/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild
index 2df1fb376d25..f65311fcd605 100644
--- a/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild
+++ b/mate-extra/mate-system-monitor/mate-system-monitor-1.22.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="The MATE System Monitor"
diff --git a/mate-extra/mate-user-guide/Manifest b/mate-extra/mate-user-guide/Manifest
index 89183e58aad3..3d1552670b84 100644
--- a/mate-extra/mate-user-guide/Manifest
+++ b/mate-extra/mate-user-guide/Manifest
@@ -1,2 +1 @@
-DIST mate-user-guide-1.18.0.tar.xz 8375200 BLAKE2B 2e77dbdf713a86dc5b2208de49053c99606d98fa0ca431c91b5d0ee47dc01e63be14e2b5112246baeb64f04c8df93601d1f3d2e24e6120eddac36512a4e38bcf SHA512 023b6ee04764e8a6004ac1cba69427af33be22228d475666cfacd4aa2ef4b61df4c9e269e003345a7073ef5eb7b783850e4efd5b41356052e3b69860d6df054a
DIST mate-user-guide-1.22.0.tar.xz 8859936 BLAKE2B c8993835e064614de989046ae225e1e323d792e7592f6afe0980d74950a0c2ff64791dafb1f8a80be8514bd338ec3d5fdb7307dc9d3d366b847ebbd7761e3158 SHA512 faf82569d8289f13d31c0c3a548692194f4938dc341b5a2214ccd3bba1fafaa6b5446cc5455ade391e7172268354cf2088c2a119aee96d3d42e71ee4c094dd14
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.18.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.18.0.ebuild
deleted file mode 100644
index d784ff1efef2..000000000000
--- a/mate-extra/mate-user-guide/mate-user-guide-1.18.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="User documentation for MATE Desktop"
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-
-COMMON_DEPEND="virtual/libintl:0"
-
-RDEPEND="${COMMON_DEPEND}
- gnome-extra/yelp"
-
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.40:*
- app-text/yelp-tools
- sys-devel/gettext:*
- virtual/pkgconfig:*
- !!mate-base/mate-desktop[user-guide]"
diff --git a/mate-extra/mate-user-guide/mate-user-guide-1.22.0.ebuild b/mate-extra/mate-user-guide/mate-user-guide-1.22.0.ebuild
index f1e2c40e91b5..409f442d36fd 100644
--- a/mate-extra/mate-user-guide/mate-user-guide-1.22.0.ebuild
+++ b/mate-extra/mate-user-guide/mate-user-guide-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm x86"
fi
DESCRIPTION="User documentation for MATE Desktop"
diff --git a/mate-extra/mate-user-share/Manifest b/mate-extra/mate-user-share/Manifest
index a07f4e73ab01..b72fbcc1e8d9 100644
--- a/mate-extra/mate-user-share/Manifest
+++ b/mate-extra/mate-user-share/Manifest
@@ -1,2 +1 @@
-DIST mate-user-share-1.18.0.tar.xz 919404 BLAKE2B fc81dbe17a0ed57eb7baaa385fe786d73a5d64171e51735de061c9c7fbe69f0174f984d75ae39e7b0dcd7bf5562655cf599f394ab7ed50bba520b8472da1111f SHA512 581a53efc115b3b2bac455d828bb689c79bc2a0c5bf3fb2a560ae7eb153b6a8c9589695ca540bb759498c0dc21e016f634a0aabf8e9863c42c5ae7712c91d058
DIST mate-user-share-1.22.0.tar.xz 927068 BLAKE2B a37d3a886ec3cad4427ccff94c00ce2d2412607f16aacf0a8ae4096f0c63c61f07f10cbd902d3a62d74f2a172b3dcbd5575f5c027045a9d31bdf4cffce4a8de2 SHA512 151532ebe031a973e8825d86c9a315697f5930f89d78960946da3ba135238e3130c59018d04cf9dc8d343ff1613e51254701bbf8e23a9881733ecbb7e6fb9f18
diff --git a/mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild
deleted file mode 100644
index 41b9177bfed6..000000000000
--- a/mate-extra/mate-user-share/mate-user-share-1.18.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate multilib
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Personal file sharing for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X"
-
-COMMON_DEPEND="
- >=dev-libs/dbus-glib-0.70:0
- >=dev-libs/glib-2.15.2:2
- >=mate-base/caja-1.17.1
- media-libs/libcanberra:0[gtk3]
- >=sys-apps/dbus-1.1.1:0
- >=x11-libs/gdk-pixbuf-2:2
- >=x11-libs/gtk+-3.14:3
- x11-libs/libX11:0
- x11-libs/pango:0
- >=x11-libs/libnotify-0.7:0
- virtual/libintl:0"
-
-RDEPEND="${COMMON_DEPEND}
- >=www-apache/mod_dnssd-0.6:0
- >=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]"
-
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/yelp-tools:0
- >=dev-util/intltool-0.35:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-src_configure() {
- mate_src_configure \
- --with-httpd=apache2 \
- --with-modules-path=/usr/$(get_libdir)/apache2/modules/ \
- --disable-bluetooth \
- $(use_with X x)
-}
diff --git a/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild b/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
index 80932af77200..aa87a8dc105f 100644
--- a/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
+++ b/mate-extra/mate-user-share/mate-user-share-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm x86"
fi
DESCRIPTION="Personal file sharing for the MATE desktop"
diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
index 4714a8eb079f..e3fec4a73bae 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,2 +1 @@
-DIST mate-utils-1.18.3.tar.xz 6449580 BLAKE2B e8a892d0f924b37da82a8eb233c24b41609831d84fc706ac0082c05cfc0564ca150e6cbd350af8be48acf1e314253e4afe8123bcf4af189a344b3c51e6ccf7d2 SHA512 c9d80e037d32784b3d376aebe23abc6709e14d1df6f293f43c1fc7978f7903ac8b0fc159cebebb3d8dc471df210469b5dcc5dfebdc906ade30a2c7e8f7ca764a
DIST mate-utils-1.22.0.tar.xz 7300112 BLAKE2B 8a613b6dcb99e652ad6b44bd64ad9b2f9c809713b5fb904059b64234b51e2a06b2290dcf14d7dde82e8011be2ca395fe74d87bcae5b903b196d55bb50e8fdf07 SHA512 248c6e4108900768a4e8b272d20ac9b2d70e8bf77375f4669a099f4d8386c2e8affeafb772d209f00906f96f20d7ee347167ef4837186f44d8aaad85ef855f70
diff --git a/mate-extra/mate-utils/mate-utils-1.18.3.ebuild b/mate-extra/mate-utils/mate-utils-1.18.3.ebuild
deleted file mode 100644
index b870194cc0bd..000000000000
--- a/mate-extra/mate-utils/mate-utils-1.18.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug ipv6 test"
-
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=gnome-base/libgtop-2.12:2=
- >=media-libs/libcanberra-0.4:0[gtk3]
- sys-libs/zlib:0
- x11-libs/cairo:0
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-3.14:3
- x11-libs/libICE:0
- x11-libs/libSM:0
- x11-libs/libX11:0
- x11-libs/libXext:0
- x11-libs/pango:0
- applet? ( >=mate-base/mate-panel-1.17.0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/rarian:0
- >=app-text/scrollkeeper-dtd-1:1.0
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*
- x11-base/xorg-proto"
-
-src_prepare() {
- # Make apps visible in all DEs.
- LC_ALL=C find . -iname '*.desktop.in*' -exec \
- sed -e '/OnlyShowIn/d' -i {} + || die
-
- mate_src_prepare
-}
-
-src_configure() {
- mate_src_configure \
- --disable-maintainer-flags \
- --enable-zlib \
- --enable-debug=$(usex debug yes minimum) \
- $(use_with X x) \
- $(use_enable applet gdict-applet) \
- $(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild b/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
index 9c0062d42625..c252fd672cdb 100644
--- a/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
+++ b/mate-extra/mate-utils/mate-utils-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Utilities for the MATE desktop"
diff --git a/media-fonts/Manifest.gz b/media-fonts/Manifest.gz
index 9d8465a13976..f118b96e5ff6 100644
Binary files a/media-fonts/Manifest.gz and b/media-fonts/Manifest.gz differ
diff --git a/media-fonts/corefonts/corefonts-1-r7.ebuild b/media-fonts/corefonts/corefonts-1-r7.ebuild
index 8d8fe311f903..47289fa29b14 100644
--- a/media-fonts/corefonts/corefonts-1-r7.ebuild
+++ b/media-fonts/corefonts/corefonts-1-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,7 +18,7 @@ SRC_URI="mirror://gentoo/EUupdate.EXE
LICENSE="MSttfEULA"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="X tahoma"
DEPEND="app-arch/cabextract"
diff --git a/media-fonts/tex-gyre/tex-gyre-2.005.ebuild b/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
index ab1480b234b5..d929c0188c21 100644
--- a/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
+++ b/media-fonts/tex-gyre/tex-gyre-2.005.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/whole/tg-${PV}otf.zip"
LICENSE="|| ( GFL LPPL-1.3c )" # legally equivalent
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa x86"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa x86"
S=${WORKDIR}
FONT_SUFFIX="otf"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 19026327c5dc..20c4712bdd04 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index d41f965c22bb..f2377114ffc4 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,2 +1 @@
-DIST eom-1.18.3.tar.xz 2198324 BLAKE2B efdee3c56fec54342184ae75f7ecb3ebda0227ab0586b2cfcd8c1b793e1b9ae2fdea79202c8b3e0bcb45d9cd5c0eaf6ad51d59b5508126d9160806bf4b7c8239 SHA512 64244d5f8c354c53e479027f38c359e38c1dba3cc937440e1af6e4a05f54fc4a65327311998575b90055b5e65bd0dc24dae81e40e0f82b99b3e41c44685d5188
DIST eom-1.22.0.tar.xz 2171992 BLAKE2B 5fc1dc872dabd6c7e06c3df778ed1616ecd66487a7ffae94744b299d54df840623759fb559727db1e4e6089021f26a21568bf4682c33fdd434bc2e0924c9a698 SHA512 1e086d1e2a0adc02978ffb45a4636e9b614a52d53a7a821af4050029f3fa3a774c29c2d43b5f2e0c58a100311eccc34e9424caf44e7e2139b4fa8d695b77cea0
diff --git a/media-gfx/eom/eom-1.18.3.ebuild b/media-gfx/eom/eom-1.18.3.ebuild
deleted file mode 100644
index 8b4d2d8201bc..000000000000
--- a/media-gfx/eom/eom-1.18.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif +introspection jpeg lcms svg tiff xmp"
-
-COMMON_DEPEND="
- dev-libs/atk:0
- >=dev-libs/glib-2.36:2
- >=dev-libs/libpeas-1.2.0[gtk]
- >=dev-libs/libxml2-2:2
- gnome-base/dconf:0
- >=mate-base/mate-desktop-1.17.0
- sys-libs/zlib:0
- x11-libs/cairo:0
- >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
- >=x11-libs/gtk+-3.14:3[introspection?]
- x11-libs/libX11:0
- >=x11-misc/shared-mime-info-0.20:0
- virtual/libintl:0
- dbus? ( >=dev-libs/dbus-glib-0.71:0 )
- exif? (
- >=media-libs/libexif-0.6.14:0
- virtual/jpeg:0
- )
- introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
- jpeg? ( virtual/jpeg:0 )
- lcms? ( media-libs/lcms:2 )
- svg? ( >=gnome-base/librsvg-2.36.2:2 )
- xmp? ( >=media-libs/exempi-1.99.5:2 )
- !!media-gfx/mate-image-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/yelp-tools:0
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.50.1:*
- sys-devel/gettext:*
- virtual/pkgconfig:*"
-
-src_configure() {
- mate_src_configure \
- $(use_enable debug) \
- $(use_enable introspection) \
- $(use_with X x) \
- $(use_with dbus) \
- $(use_with exif libexif) \
- $(use_with jpeg libjpeg) \
- $(use_with lcms cms) \
- $(use_with svg librsvg) \
- $(use_with xmp)
-}
diff --git a/media-gfx/eom/eom-1.22.0.ebuild b/media-gfx/eom/eom-1.22.0.ebuild
index e6779fb6b7d2..c0f71f634ca6 100644
--- a/media-gfx/eom/eom-1.22.0.ebuild
+++ b/media-gfx/eom/eom-1.22.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="The MATE image viewer"
diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.36.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.36.ebuild
index 3b3fc7c8d30d..59c2b130c53d 100644
--- a/media-gfx/imagemagick/imagemagick-7.0.8.36.ebuild
+++ b/media-gfx/imagemagick/imagemagick-7.0.8.36.ebuild
@@ -13,7 +13,7 @@ else
MY_PV="$(ver_rs 3 '-')"
MY_P="ImageMagick-${MY_PV}"
SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="A collection of tools and libraries for many image formats"
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 34d43169925c..5514700d29d4 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/aribb24/aribb24-1.0.3-r2.ebuild b/media-libs/aribb24/aribb24-1.0.3-r2.ebuild
index 33746cda604e..722db73a6ba6 100644
--- a/media-libs/aribb24/aribb24-1.0.3-r2.ebuild
+++ b/media-libs/aribb24/aribb24-1.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nkoriyama/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
RDEPEND="media-libs/libpng:0=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/media-libs/freeimage/Manifest b/media-libs/freeimage/Manifest
index 79302f32dcf7..d7eb8ba5764f 100644
--- a/media-libs/freeimage/Manifest
+++ b/media-libs/freeimage/Manifest
@@ -1,2 +1,4 @@
DIST FreeImage3154.pdf 1007480 BLAKE2B 801d39c4b7eeab833c7225c2d53a3a0e8e9d2a91ea3f7173047705c8b750706f3a4a9ac60f7ba9d5e8150b548bd5add242e9e40f498c57ad9e5a623972bbb239 SHA512 cebde5e2609c9a0c06b4e07e1c595d7d6714895095cd9935f59c8b2ff9b34116248f5453b41f469f6242d87cae79be82d59f6a9ec0f75b1ea3df61ac1f651b28
DIST FreeImage3154.zip 5513923 BLAKE2B 376b00faaae2c10c9eb36f89726a022734e109ca7ca11951c9e6525f21d2a7ee305ec195be29a272ecb7935ba5d0b61f3d84f26a6aec5f7a9229d5e47cd665bb SHA512 0db9eb7d0ed8e08e10ff4fa274c4484541ca119c3d437a85fdc3b2d9232bf14a7877c79b1e62c8c99278d7020a9f623c161f2342475f3ee526233404138112cc
+DIST FreeImage3180.pdf 1665541 BLAKE2B 5d40ee6fa0a1e73df0cc961edbd70a2835ef88fb540f123fd81f2bb826d4c949d2a60dfe3fc02406ce632a389935abac0d471c963c9803b8c2aece2b48afb003 SHA512 632f68b14f7a5916a1b95bbf86c268d0afe786a2537472301bb002254aa3195f046efb41f073133633211e985e90edbb99285ab6f42bc55501c756292a3c4c03
+DIST FreeImage3180.zip 7415716 BLAKE2B b695271f4e80eb304eccde66e38b5095eceae51fbe0dd97df69c55f364f8440d8c97139b8edc2f01c400f5c53a7336fdfab1e28aa3ea04f485901d5def443d25 SHA512 9d9cc7e2d57552c3115e277aeb036e0455204d389026b17a3f513da5be1fd595421655488bb1ec2f76faebed66049119ca55e26e2a6d37024b3fb7ef36ad4818
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-disable-plugin-G3.patch b/media-libs/freeimage/files/freeimage-3.18.0-disable-plugin-G3.patch
new file mode 100644
index 000000000000..a541bfa9464e
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-disable-plugin-G3.patch
@@ -0,0 +1,56 @@
+From d07a573fa1e0593e6af4f59e7bef15b78a8edfca Mon Sep 17 00:00:00 2001
+From: Patrick Nicolas
+Date: Tue, 13 Nov 2018 20:48:39 +0100
+Subject: [PATCH 4/4] disable plugin G3
+
+---
+ Makefile.srcs | 3 ---
+ Source/FreeImage/Plugin.cpp | 3 ---
+ fipMakefile.srcs | 3 ---
+ 3 files changed, 9 deletions(-)
+
+diff --git a/Makefile.srcs b/Makefile.srcs
+index a306aae..dac3ec2 100644
+--- a/Makefile.srcs
++++ b/Makefile.srcs
+@@ -37,9 +37,6 @@ SRCS-yes += \
+ SRCS-$(USE_EXR) += \
+ Source/FreeImage/PluginEXR.cpp \
+
+-SRCS-$(USE_TIFF) += \
+- Source/FreeImage/PluginG3.cpp \
+-
+ SRCS-yes += \
+ Source/FreeImage/PluginGIF.cpp \
+ Source/FreeImage/PluginHDR.cpp \
+diff --git a/Source/FreeImage/Plugin.cpp b/Source/FreeImage/Plugin.cpp
+index 7768a32..43d8b6d 100644
+--- a/Source/FreeImage/Plugin.cpp
++++ b/Source/FreeImage/Plugin.cpp
+@@ -273,9 +273,6 @@ FreeImage_Initialise(BOOL load_local_plugins_only) {
+ s_plugins->AddNode(InitDDS);
+ s_plugins->AddNode(InitGIF);
+ s_plugins->AddNode(InitHDR);
+-#ifdef USE_TIFF
+- s_plugins->AddNode(InitG3);
+-#endif
+ s_plugins->AddNode(InitSGI);
+ #ifdef USE_EXR
+ s_plugins->AddNode(InitEXR);
+diff --git a/fipMakefile.srcs b/fipMakefile.srcs
+index 74c9ec0..8a48b67 100644
+--- a/fipMakefile.srcs
++++ b/fipMakefile.srcs
+@@ -37,9 +37,6 @@ SRCS-yes += \
+ SRCS-$(USE_EXR) += \
+ Source/FreeImage/PluginEXR.cpp \
+
+-SRCS-$(USE_TIFF) += \
+- Source/FreeImage/PluginG3.cpp \
+-
+ SRCS-yes += \
+ Source/FreeImage/PluginGIF.cpp \
+ Source/FreeImage/PluginHDR.cpp \
+--
+2.19.1
+
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-libjpeg9.patch b/media-libs/freeimage/files/freeimage-3.18.0-libjpeg9.patch
new file mode 100644
index 000000000000..fe344229520f
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-libjpeg9.patch
@@ -0,0 +1,24 @@
+Bug: https://bugs.gentoo.org/647422
+Upstream Patch: https://sourceforge.net/p/freeimage/patches/130/
+
+diff -Naur a/Source/FreeImage.h b/Source/FreeImage.h
+--- a/Source/FreeImage.h 2018-03-24 23:24:11.066695395 -0400
++++ b/Source/FreeImage.h 2018-03-24 23:26:35.945391182 -0400
+@@ -117,12 +117,17 @@
+ #ifndef _WINDOWS_
+ #define _WINDOWS_
+
++#if JPEG_LIB_VERSION < 90
++
+ #ifndef FALSE
+ #define FALSE 0
+ #endif
+ #ifndef TRUE
+ #define TRUE 1
+ #endif
++
++#endif
++
+ #ifndef NULL
+ #define NULL 0
+ #endif
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-raw.patch b/media-libs/freeimage/files/freeimage-3.18.0-raw.patch
new file mode 100644
index 000000000000..94accaba9695
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-raw.patch
@@ -0,0 +1,15 @@
+Index: FreeImage/Source/FreeImage.h
+===================================================================
+--- FreeImage.orig/Source/FreeImage.h
++++ FreeImage/Source/FreeImage.h
+@@ -155,8 +155,10 @@ typedef uint8_t BYTE;
+ typedef uint16_t WORD;
+ typedef uint32_t DWORD;
+ typedef int32_t LONG;
++#ifndef _LIBRAW_TYPES_H
+ typedef int64_t INT64;
+ typedef uint64_t UINT64;
++#endif
+ #else
+ // MS is not C99 ISO compliant
+ typedef long BOOL;
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-remove-jpeg-transform.patch b/media-libs/freeimage/files/freeimage-3.18.0-remove-jpeg-transform.patch
new file mode 100644
index 000000000000..fb79cf7b5135
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-remove-jpeg-transform.patch
@@ -0,0 +1,82 @@
+From cb27fc742dd0b569f9ffe91a99ebeb5f077971da Mon Sep 17 00:00:00 2001
+From: Patrick Nicolas
+Date: Tue, 13 Nov 2018 20:27:59 +0100
+Subject: [PATCH 2/4] remove jpeg transform
+
+---
+ Makefile.srcs | 7 -------
+ Source/FreeImage.h | 2 ++
+ fipMakefile.srcs | 8 --------
+ 3 files changed, 2 insertions(+), 15 deletions(-)
+
+diff --git a/Makefile.srcs b/Makefile.srcs
+index cb41903..a306aae 100644
+--- a/Makefile.srcs
++++ b/Makefile.srcs
+@@ -141,17 +141,10 @@ SRCS-yes += \
+ Source/FreeImageToolkit/CopyPaste.cpp \
+ Source/FreeImageToolkit/Display.cpp \
+ Source/FreeImageToolkit/Flip.cpp \
+-
+-SRCS-$(USE_JPEG) += \
+- Source/FreeImageToolkit/JPEGTransform.cpp \
+-
+-SRCS-yes += \
+ Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
+ Source/FreeImageToolkit/Rescale.cpp \
+ Source/FreeImageToolkit/Resize.cpp \
+
+-SRCS-$(USE_JPEG) += \
+- Source/transupp.c
+ SRCS = $(SRCS-yes)
+
+ INCLS = Dist/FreeImage.h \
+diff --git a/Source/FreeImage.h b/Source/FreeImage.h
+index 12182cd..ac4e6a0 100644
+--- a/Source/FreeImage.h
++++ b/Source/FreeImage.h
+@@ -1089,6 +1089,7 @@ DLL_API const char* DLL_CALLCONV FreeImage_TagToString(FREE_IMAGE_MDMODEL model,
+ // JPEG lossless transformation routines
+ // --------------------------------------------------------------------------
+
++#if 0 // not supported on Gentoo
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransform(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE));
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, BOOL perfect FI_DEFAULT(TRUE));
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGCrop(const char *src_file, const char *dst_file, int left, int top, int right, int bottom);
+@@ -1097,6 +1098,7 @@ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformFromHandle(FreeImageIO* src_io,
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombined(const char *src_file, const char *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedU(const wchar_t *src_file, const wchar_t *dst_file, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
+ DLL_API BOOL DLL_CALLCONV FreeImage_JPEGTransformCombinedFromMemory(FIMEMORY* src_stream, FIMEMORY* dst_stream, FREE_IMAGE_JPEG_OPERATION operation, int* left, int* top, int* right, int* bottom, BOOL perfect FI_DEFAULT(TRUE));
++#endif
+
+
+ // --------------------------------------------------------------------------
+diff --git a/fipMakefile.srcs b/fipMakefile.srcs
+index e58f046..74c9ec0 100644
+--- a/fipMakefile.srcs
++++ b/fipMakefile.srcs
+@@ -141,11 +141,6 @@ SRCS-yes += \
+ Source/FreeImageToolkit/CopyPaste.cpp \
+ Source/FreeImageToolkit/Display.cpp \
+ Source/FreeImageToolkit/Flip.cpp \
+-
+-SRCS-$(USE_JPEG) += \
+- Source/FreeImageToolkit/JPEGTransform.cpp \
+-
+-SRCS-yes += \
+ Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
+ Source/FreeImageToolkit/Rescale.cpp \
+ Source/FreeImageToolkit/Resize.cpp \
+@@ -157,9 +152,6 @@ SRCS-yes += \
+ Wrapper/FreeImagePlus/src/fipWinImage.cpp \
+ Wrapper/FreeImagePlus/src/FreeImagePlus.cpp
+
+-SRCS-$(USE_JPEG) += \
+- Source/transupp.c
+-
+ SRCS = $(SRCS-yes)
+ INCLUDE = -I. \
+ -ISource \
+--
+2.19.1
+
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-rename-jpeg_read_icc_profile.patch b/media-libs/freeimage/files/freeimage-3.18.0-rename-jpeg_read_icc_profile.patch
new file mode 100644
index 000000000000..982d00747c59
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-rename-jpeg_read_icc_profile.patch
@@ -0,0 +1,34 @@
+From 27c02a3ed6196b4b0bab5524f2825da58a76d706 Mon Sep 17 00:00:00 2001
+From: Patrick Nicolas
+Date: Tue, 13 Nov 2018 20:28:51 +0100
+Subject: [PATCH 3/4] rename jpeg_read_icc_profile
+
+---
+ Source/FreeImage/PluginJPEG.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp
+index dd97e63..569f71e 100644
+--- a/Source/FreeImage/PluginJPEG.cpp
++++ b/Source/FreeImage/PluginJPEG.cpp
+@@ -507,7 +507,7 @@ marker_is_icc(jpeg_saved_marker_ptr marker) {
+ return FALSE. You might want to issue an error message instead.
+ */
+ static BOOL
+-jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) {
++_jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) {
+ jpeg_saved_marker_ptr marker;
+ int num_markers = 0;
+ int seq_no;
+@@ -749,7 +749,7 @@ read_markers(j_decompress_ptr cinfo, FIBITMAP *dib) {
+ BYTE *icc_profile = NULL;
+ unsigned icc_length = 0;
+
+- if( jpeg_read_icc_profile(cinfo, &icc_profile, &icc_length) ) {
++ if( _jpeg_read_icc_profile(cinfo, &icc_profile, &icc_length) ) {
+ // copy ICC profile data
+ FreeImage_CreateICCProfile(dib, icc_profile, icc_length);
+ // clean up
+--
+2.19.1
+
diff --git a/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch b/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch
new file mode 100644
index 000000000000..ad2e4961e440
--- /dev/null
+++ b/media-libs/freeimage/files/freeimage-3.18.0-unbundling.patch
@@ -0,0 +1,724 @@
+From 03a713e62529d1bcb45aedf767c7cb33ddd6e1a7 Mon Sep 17 00:00:00 2001
+From: Patrick Nicolas
+Date: Tue, 13 Nov 2018 19:40:58 +0100
+Subject: [PATCH 1/4] unbundling
+
+diff --git a/Makefile.fip b/Makefile.fip
+index b59c419..c6b82bb 100644
+--- a/Makefile.fip
++++ b/Makefile.fip
+@@ -11,7 +11,26 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+
+-LIBRARIES = -lstdc++
++PKG_CONFIG ?= pkg-config
++
++USE_EXR ?= yes
++USE_JPEG ?= yes
++USE_JPEG2K ?= yes
++USE_MNG ?= yes
++USE_PNG ?= yes
++USE_TIFF ?= yes
++USE_RAW ?= yes
++USE_WEBP ?= yes
++
++LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
++LIBRARIES-$(USE_EXR) += $(shell $(PKG_CONFIG) --libs OpenEXR)
++LIBRARIES-$(USE_JPEG) += -ljpeg
++LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjp2)
++LIBRARIES-$(USE_MNG) += -lmng
++LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng)
++LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
++LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw)
++LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp)
+
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+@@ -68,16 +87,18 @@ $(STATICLIB): $(MODULES)
+ $(AR) r $@ $(MODULES)
+
+ $(SHAREDLIB): $(MODULES)
+- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
+
+ install:
+ install -d $(INCDIR) $(INSTALLDIR)
+- install -m 644 -o root -g root $(HEADER) $(INCDIR)
+- install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
+- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++ install -m 644 $(HEADER) $(INCDIR)
++ install -m 644 $(HEADERFIP) $(INCDIR)
++ifneq ($(STATICLIB),)
++ install -m 644 $(STATICLIB) $(INSTALLDIR)
++endif
++ install -m 755 $(SHAREDLIB) $(INSTALLDIR)
+ ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
++ ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
+
+ clean:
+ rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
+diff --git a/Makefile.gnu b/Makefile.gnu
+index 92f6358..345f0db 100644
+--- a/Makefile.gnu
++++ b/Makefile.gnu
+@@ -11,7 +11,26 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
+ # Converts cr/lf to just lf
+ DOS2UNIX = dos2unix
+
+-LIBRARIES = -lstdc++
++PKG_CONFIG ?= pkg-config
++
++USE_EXR ?= yes
++USE_JPEG ?= yes
++USE_JPEG2K ?= yes
++USE_MNG ?= yes
++USE_PNG ?= yes
++USE_TIFF ?= yes
++USE_RAW ?= yes
++USE_WEBP ?= yes
++
++LIBRARIES-yes = $(shell $(PKG_CONFIG) --libs zlib)
++LIBRARIES-$(USE_EXR) += $(shell $(PKG_CONFIG) --libs OpenEXR)
++LIBRARIES-$(USE_JPEG) += -ljpeg
++LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjp2)
++LIBRARIES-$(USE_MNG) += -lmng
++LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng)
++LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
++LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw)
++LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp)
+
+ MODULES = $(SRCS:.c=.o)
+ MODULES := $(MODULES:.cpp=.o)
+@@ -67,13 +86,15 @@ $(STATICLIB): $(MODULES)
+ $(AR) r $@ $(MODULES)
+
+ $(SHAREDLIB): $(MODULES)
+- $(CC) -s -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES)
++ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(VERLIBNAME) $(LDFLAGS) -o $@ $(MODULES) $(LIBRARIES-yes)
+
+ install:
+ install -d $(INCDIR) $(INSTALLDIR)
+- install -m 644 -o root -g root $(HEADER) $(INCDIR)
+- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
+- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
++ install -m 644 $(HEADER) $(INCDIR)
++ifneq ($(STATICLIB),)
++ install -m 644 $(STATICLIB) $(INSTALLDIR)
++endif
++ install -m 755 $(SHAREDLIB) $(INSTALLDIR)
+ ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
+ ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
+ # ldconfig
+diff --git a/Makefile.srcs b/Makefile.srcs
+index de25754..cb41903 100644
+--- a/Makefile.srcs
++++ b/Makefile.srcs
+@@ -1,6 +1,15 @@
++USE_EXR ?= yes
++USE_JPEG ?= yes
++USE_JPEG2K ?= yes
++USE_MNG ?= yes
++USE_PNG ?= yes
++USE_TIFF ?= yes
++USE_RAW ?= yes
++USE_WEBP ?= yes
++
+ VER_MAJOR = 3
+ VER_MINOR = 18.0
+-SRCS = \
++SRCS-yes = \
+ Source/FreeImage/BitmapAccess.cpp \
+ Source/FreeImage/ColorLookup.cpp \
+ Source/FreeImage/ConversionRGBA16.cpp \
+@@ -12,39 +21,80 @@ SRCS = \
+ Source/FreeImage/LFPQuantizer.cpp \
+ Source/FreeImage/MemoryIO.cpp \
+ Source/FreeImage/PixelAccess.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ Source/FreeImage/J2KHelper.cpp \
++
++SRCS-$(USE_MNG) += \
+ Source/FreeImage/MNGHelper.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/Plugin.cpp \
+ Source/FreeImage/PluginBMP.cpp \
+ Source/FreeImage/PluginCUT.cpp \
+ Source/FreeImage/PluginDDS.cpp \
++
++SRCS-$(USE_EXR) += \
+ Source/FreeImage/PluginEXR.cpp \
++
++SRCS-$(USE_TIFF) += \
+ Source/FreeImage/PluginG3.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/PluginGIF.cpp \
+ Source/FreeImage/PluginHDR.cpp \
+ Source/FreeImage/PluginICO.cpp \
+ Source/FreeImage/PluginIFF.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ Source/FreeImage/PluginJ2K.cpp \
++
++SRCS-$(USE_MNG) += \
+ Source/FreeImage/PluginJNG.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ Source/FreeImage/PluginJP2.cpp \
++
++SRCS-$(USE_JPEG) += \
+ Source/FreeImage/PluginJPEG.cpp \
+- Source/FreeImage/PluginJXR.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/PluginKOALA.cpp \
++
++SRCS-$(USE_MNG) += \
+ Source/FreeImage/PluginMNG.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/PluginPCD.cpp \
+ Source/FreeImage/PluginPCX.cpp \
+ Source/FreeImage/PluginPFM.cpp \
+ Source/FreeImage/PluginPICT.cpp \
++
++SRCS-$(USE_PNG) += \
+ Source/FreeImage/PluginPNG.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/PluginPNM.cpp \
+ Source/FreeImage/PluginPSD.cpp \
+ Source/FreeImage/PluginRAS.cpp \
++
++SRCS-$(USE_RAW) += \
+ Source/FreeImage/PluginRAW.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/PluginSGI.cpp \
+ Source/FreeImage/PluginTARGA.cpp \
++
++SRCS-$(USE_TIFF) += \
+ Source/FreeImage/PluginTIFF.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/PluginWBMP.cpp \
++
++SRCS-$(USE_WEBP) += \
+ Source/FreeImage/PluginWebP.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/PluginXBM.cpp \
+ Source/FreeImage/PluginXPM.cpp \
+ Source/FreeImage/PSDParser.cpp \
+@@ -78,7 +128,11 @@ SRCS = \
+ Source/Metadata/IPTC.cpp \
+ Source/Metadata/TagConversion.cpp \
+ Source/Metadata/TagLib.cpp \
++
++SRCS-$(USE_TIFF) += \
+ Source/Metadata/XTIFF.cpp \
++
++SRCS-yes += \
+ Source/FreeImageToolkit/Background.cpp \
+ Source/FreeImageToolkit/BSplineRotate.cpp \
+ Source/FreeImageToolkit/Channels.cpp \
+@@ -87,11 +141,19 @@ SRCS = \
+ Source/FreeImageToolkit/CopyPaste.cpp \
+ Source/FreeImageToolkit/Display.cpp \
+ Source/FreeImageToolkit/Flip.cpp \
++
++SRCS-$(USE_JPEG) += \
+ Source/FreeImageToolkit/JPEGTransform.cpp \
++
++SRCS-yes += \
+ Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
+ Source/FreeImageToolkit/Rescale.cpp \
+ Source/FreeImageToolkit/Resize.cpp \
+
++SRCS-$(USE_JPEG) += \
++ Source/transupp.c
++SRCS = $(SRCS-yes)
++
+ INCLS = Dist/FreeImage.h \
+ Examples/OpenGL/TextureManager/TextureManager.h \
+ Examples/Plugin/PluginCradle.h \
+@@ -117,7 +179,18 @@ INCLS = Dist/FreeImage.h \
+ Wrapper/FreeImagePlus/test/fipTest.h \
+ TestAPI/TestSuite.h
+
+-INCLUDE = -I. \
++INCLUDE-yes = -I. \
+ -ISource \
+ -ISource/Metadata \
+ -ISource/FreeImageToolkit \
++
++INCLUDE-yes += $(shell $(PKG_CONFIG) --cflags-only-I zlib)
++INCLUDE-$(USE_EXR) += -DUSE_EXR $(shell $(PKG_CONFIG) --cflags-only-I OpenEXR)
++INCLUDE-$(USE_JPEG) += -DUSE_JPEG
++INCLUDE-$(USE_JPEG2K) += -DUSE_JPEG2K $(shell $(PKG_CONFIG) --cflags-only-I libopenjp2)
++INCLUDE-$(USE_MNG) += -DUSE_MNG
++INCLUDE-$(USE_PNG) += -DUSE_PNG $(shell $(PKG_CONFIG) --cflags-only-I libpng)
++INCLUDE-$(USE_TIFF) += -DUSE_TIFF $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 IlmBase)
++INCLUDE-$(USE_RAW) += -DUSE_RAW $(shell $(PKG_CONFIG) --cflags-only-I libraw)
++INCLUDE-$(USE_WEBP) += -DUSE_WEBP $(shell $(PKG_CONFIG) --cflags-only-I libwebp)
++INCLUDE = $(INCLUDE-yes)
+diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp
+index 1776c3b..538f1c5 100644
+--- a/Source/FreeImage/J2KHelper.cpp
++++ b/Source/FreeImage/J2KHelper.cpp
+@@ -21,7 +21,7 @@
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include
+ #include "J2KHelper.h"
+
+ // --------------------------------------------------------------------------
+diff --git a/Source/FreeImage/Plugin.cpp b/Source/FreeImage/Plugin.cpp
+index 11e7294..7768a32 100644
+--- a/Source/FreeImage/Plugin.cpp
++++ b/Source/FreeImage/Plugin.cpp
+@@ -238,23 +238,33 @@ FreeImage_Initialise(BOOL load_local_plugins_only) {
+ */
+ s_plugins->AddNode(InitBMP);
+ s_plugins->AddNode(InitICO);
++#ifdef USE_JPEG
+ s_plugins->AddNode(InitJPEG);
++#endif
++#ifdef USE_MNG
+ s_plugins->AddNode(InitJNG);
++#endif
+ s_plugins->AddNode(InitKOALA);
+ s_plugins->AddNode(InitIFF);
++#ifdef USE_MNG
+ s_plugins->AddNode(InitMNG);
++#endif
+ s_plugins->AddNode(InitPNM, NULL, "PBM", "Portable Bitmap (ASCII)", "pbm", "^P1");
+ s_plugins->AddNode(InitPNM, NULL, "PBMRAW", "Portable Bitmap (RAW)", "pbm", "^P4");
+ s_plugins->AddNode(InitPCD);
+ s_plugins->AddNode(InitPCX);
+ s_plugins->AddNode(InitPNM, NULL, "PGM", "Portable Greymap (ASCII)", "pgm", "^P2");
+ s_plugins->AddNode(InitPNM, NULL, "PGMRAW", "Portable Greymap (RAW)", "pgm", "^P5");
++#ifdef USE_PNG
+ s_plugins->AddNode(InitPNG);
++#endif
+ s_plugins->AddNode(InitPNM, NULL, "PPM", "Portable Pixelmap (ASCII)", "ppm", "^P3");
+ s_plugins->AddNode(InitPNM, NULL, "PPMRAW", "Portable Pixelmap (RAW)", "ppm", "^P6");
+ s_plugins->AddNode(InitRAS);
+ s_plugins->AddNode(InitTARGA);
++#ifdef USE_TIFF
+ s_plugins->AddNode(InitTIFF);
++#endif
+ s_plugins->AddNode(InitWBMP);
+ s_plugins->AddNode(InitPSD);
+ s_plugins->AddNode(InitCUT);
+@@ -263,16 +273,26 @@ FreeImage_Initialise(BOOL load_local_plugins_only) {
+ s_plugins->AddNode(InitDDS);
+ s_plugins->AddNode(InitGIF);
+ s_plugins->AddNode(InitHDR);
++#ifdef USE_TIFF
+ s_plugins->AddNode(InitG3);
++#endif
+ s_plugins->AddNode(InitSGI);
++#ifdef USE_EXR
+ s_plugins->AddNode(InitEXR);
++#endif
++#ifdef USE_JPEG2K
+ s_plugins->AddNode(InitJ2K);
+ s_plugins->AddNode(InitJP2);
++#endif
+ s_plugins->AddNode(InitPFM);
+ s_plugins->AddNode(InitPICT);
++#ifdef USE_RAW
+ s_plugins->AddNode(InitRAW);
++#endif
++#ifdef USE_WEBP
+ s_plugins->AddNode(InitWEBP);
+-#if !(defined(_MSC_VER) && (_MSC_VER <= 1310))
++#endif
++#if 0
+ s_plugins->AddNode(InitJXR);
+ #endif // unsupported by MS Visual Studio 2003 !!!
+
+diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp
+index b286430..faa8037 100644
+--- a/Source/FreeImage/PluginEXR.cpp
++++ b/Source/FreeImage/PluginEXR.cpp
+@@ -28,16 +28,16 @@
+ #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning)
+ #endif
+
+-#include "../OpenEXR/IlmImf/ImfIO.h"
+-#include "../OpenEXR/Iex/Iex.h"
+-#include "../OpenEXR/IlmImf/ImfOutputFile.h"
+-#include "../OpenEXR/IlmImf/ImfInputFile.h"
+-#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
+-#include "../OpenEXR/IlmImf/ImfChannelList.h"
+-#include "../OpenEXR/IlmImf/ImfRgba.h"
+-#include "../OpenEXR/IlmImf/ImfArray.h"
+-#include "../OpenEXR/IlmImf/ImfPreviewImage.h"
+-#include "../OpenEXR/Half/half.h"
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
++#include
+
+
+ // ==========================================================
+diff --git a/Source/FreeImage/PluginG3.cpp b/Source/FreeImage/PluginG3.cpp
+index 0a083b4..b3a9bd7 100644
+--- a/Source/FreeImage/PluginG3.cpp
++++ b/Source/FreeImage/PluginG3.cpp
+@@ -20,7 +20,7 @@
+ // Use at your own risk!
+ // ==========================================================
+
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+diff --git a/Source/FreeImage/PluginJ2K.cpp b/Source/FreeImage/PluginJ2K.cpp
+index b8bcfc8..621a903 100644
+--- a/Source/FreeImage/PluginJ2K.cpp
++++ b/Source/FreeImage/PluginJ2K.cpp
+@@ -21,7 +21,7 @@
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include
+ #include "J2KHelper.h"
+
+ // ==========================================================
+diff --git a/Source/FreeImage/PluginJP2.cpp b/Source/FreeImage/PluginJP2.cpp
+index 742fe2c..c57f626 100644
+--- a/Source/FreeImage/PluginJP2.cpp
++++ b/Source/FreeImage/PluginJP2.cpp
+@@ -21,7 +21,7 @@
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibOpenJPEG/openjpeg.h"
++#include
+ #include "J2KHelper.h"
+
+ // ==========================================================
+diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp
+index 8db177d..dd97e63 100644
+--- a/Source/FreeImage/PluginJPEG.cpp
++++ b/Source/FreeImage/PluginJPEG.cpp
+@@ -35,11 +35,15 @@ extern "C" {
+ #undef FAR
+ #include
+
+-#include "../LibJPEG/jinclude.h"
+-#include "../LibJPEG/jpeglib.h"
+-#include "../LibJPEG/jerror.h"
++#include
++#include
++#include
++#include
++#include
+ }
+
++#define SIZEOF(object) ((size_t) sizeof(object))
++
+ #include "FreeImage.h"
+ #include "Utilities.h"
+
+diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp
+index 661f160..504fafe 100644
+--- a/Source/FreeImage/PluginPNG.cpp
++++ b/Source/FreeImage/PluginPNG.cpp
+@@ -40,8 +40,8 @@
+
+ // ----------------------------------------------------------
+
+-#include "../ZLib/zlib.h"
+-#include "../LibPNG/png.h"
++#include
++#include
+
+ // ----------------------------------------------------------
+
+diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp
+index e9bd5bf..680e634 100644
+--- a/Source/FreeImage/PluginRAW.cpp
++++ b/Source/FreeImage/PluginRAW.cpp
+@@ -19,7 +19,7 @@
+ // Use at your own risk!
+ // ==========================================================
+
+-#include "../LibRawLite/libraw/libraw.h"
++#include
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
+index 67fab0b..36f99e8 100644
+--- a/Source/FreeImage/PluginTIFF.cpp
++++ b/Source/FreeImage/PluginTIFF.cpp
+@@ -37,9 +37,9 @@
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+ #include "../Metadata/FreeImageTag.h"
+-#include "../OpenEXR/Half/half.h"
++#include
+
+ #include "FreeImageIO.h"
+ #include "PSDParser.h"
+diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp
+index 7c9f62f..c401447 100644
+--- a/Source/FreeImage/PluginWebP.cpp
++++ b/Source/FreeImage/PluginWebP.cpp
+@@ -24,9 +24,9 @@
+
+ #include "../Metadata/FreeImageTag.h"
+
+-#include "../LibWebP/src/webp/decode.h"
+-#include "../LibWebP/src/webp/encode.h"
+-#include "../LibWebP/src/webp/mux.h"
++#include
++#include
++#include
+
+ // ==========================================================
+ // Plugin Interface
+diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp
+index 3ab6d32..7e32110 100644
+--- a/Source/FreeImage/ZLibInterface.cpp
++++ b/Source/FreeImage/ZLibInterface.cpp
+@@ -19,10 +19,10 @@
+ // Use at your own risk!
+ // ==========================================================
+
+-#include "../ZLib/zlib.h"
++#include
+ #include "FreeImage.h"
+ #include "Utilities.h"
+-#include "../ZLib/zutil.h" /* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
++#define OS_CODE 0x03
+
+ /**
+ Compresses a source buffer into a target buffer, using the ZLib library.
+diff --git a/Source/FreeImageToolkit/JPEGTransform.cpp b/Source/FreeImageToolkit/JPEGTransform.cpp
+index 6f9ba8e..988d777 100644
+--- a/Source/FreeImageToolkit/JPEGTransform.cpp
++++ b/Source/FreeImageToolkit/JPEGTransform.cpp
+@@ -26,10 +26,11 @@ extern "C" {
+ #undef FAR
+ #include
+
+-#include "../LibJPEG/jinclude.h"
+-#include "../LibJPEG/jpeglib.h"
+-#include "../LibJPEG/jerror.h"
+-#include "../LibJPEG/transupp.h"
++#include
++#include
++#include
++#include
++#include "transupp.h"
+ }
+
+ #include "FreeImage.h"
+diff --git a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp
+index d5be902..7f2be42 100644
+--- a/Source/Metadata/XTIFF.cpp
++++ b/Source/Metadata/XTIFF.cpp
+@@ -29,7 +29,7 @@
+ #pragma warning (disable : 4786) // identifier was truncated to 'number' characters
+ #endif
+
+-#include "../LibTIFF4/tiffiop.h"
++#include "tiffiop.h"
+
+ #include "FreeImage.h"
+ #include "Utilities.h"
+diff --git a/Source/tiffiop.h b/Source/tiffiop.h
+index 2fe7556..1642582 100644
+--- a/Source/tiffiop.h
++++ b/Source/tiffiop.h
+@@ -28,7 +28,10 @@
+ * ``Library-private'' definitions.
+ */
+
+-#include "tif_config.h"
++#include
++#define HAVE_SEARCH_H
++#define HAVE_FCNTL_H
++#define HAVE_SNPRINTF
+
+ #ifdef HAVE_FCNTL_H
+ # include
+diff --git a/Source/transupp.c b/Source/transupp.c
+index d10f57b..d50216c 100644
+--- a/Source/transupp.c
++++ b/Source/transupp.c
+@@ -15,8 +15,7 @@
+ /* Although this file really shouldn't have access to the library internals,
+ * it's helpful to let it call jround_up() and jcopy_block_row().
+ */
+-#define JPEG_INTERNALS
+-
++#include
+ #include "jinclude.h"
+ #include "jpeglib.h"
+ #include "transupp.h" /* My own external interface */
+diff --git a/fipMakefile.srcs b/fipMakefile.srcs
+index d271b4b..e58f046 100644
+--- a/fipMakefile.srcs
++++ b/fipMakefile.srcs
+@@ -1,6 +1,15 @@
++USE_EXR ?= yes
++USE_JPEG ?= yes
++USE_JPEG2K ?= yes
++USE_MNG ?= yes
++USE_PNG ?= yes
++USE_TIFF ?= yes
++USE_RAW ?= yes
++USE_WEBP ?= yes
++
+ VER_MAJOR = 3
+ VER_MINOR = 18.0
+-SRCS = \
++SRCS-yes = \
+ Source/FreeImage/BitmapAccess.cpp \
+ Source/FreeImage/ColorLookup.cpp \
+ Source/FreeImage/ConversionRGBA16.cpp \
+@@ -12,39 +21,80 @@ SRCS = \
+ Source/FreeImage/LFPQuantizer.cpp \
+ Source/FreeImage/MemoryIO.cpp \
+ Source/FreeImage/PixelAccess.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ Source/FreeImage/J2KHelper.cpp \
++
++SRCS-$(USE_MNG) += \
+ Source/FreeImage/MNGHelper.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/Plugin.cpp \
+ Source/FreeImage/PluginBMP.cpp \
+ Source/FreeImage/PluginCUT.cpp \
+ Source/FreeImage/PluginDDS.cpp \
++
++SRCS-$(USE_EXR) += \
+ Source/FreeImage/PluginEXR.cpp \
++
++SRCS-$(USE_TIFF) += \
+ Source/FreeImage/PluginG3.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/PluginGIF.cpp \
+ Source/FreeImage/PluginHDR.cpp \
+ Source/FreeImage/PluginICO.cpp \
+ Source/FreeImage/PluginIFF.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ Source/FreeImage/PluginJ2K.cpp \
++
++SRCS-$(USE_MNG) += \
+ Source/FreeImage/PluginJNG.cpp \
++
++SRCS-$(USE_JPEG2K) += \
+ Source/FreeImage/PluginJP2.cpp \
++
++SRCS-$(USE_JPEG) += \
+ Source/FreeImage/PluginJPEG.cpp \
+- Source/FreeImage/PluginJXR.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/PluginKOALA.cpp \
++
++SRCS-$(USE_MNG) += \
+ Source/FreeImage/PluginMNG.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/PluginPCD.cpp \
+ Source/FreeImage/PluginPCX.cpp \
+ Source/FreeImage/PluginPFM.cpp \
+ Source/FreeImage/PluginPICT.cpp \
++
++SRCS-$(USE_PNG) += \
+ Source/FreeImage/PluginPNG.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/PluginPNM.cpp \
+ Source/FreeImage/PluginPSD.cpp \
+ Source/FreeImage/PluginRAS.cpp \
++
++SRCS-$(USE_RAW) += \
+ Source/FreeImage/PluginRAW.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/PluginSGI.cpp \
+ Source/FreeImage/PluginTARGA.cpp \
++
++SRCS-$(USE_TIFF) += \
+ Source/FreeImage/PluginTIFF.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/PluginWBMP.cpp \
++
++SRCS-$(USE_WEBP) += \
+ Source/FreeImage/PluginWebP.cpp \
++
++SRCS-yes += \
+ Source/FreeImage/PluginXBM.cpp \
+ Source/FreeImage/PluginXPM.cpp \
+ Source/FreeImage/PSDParser.cpp \
+@@ -78,7 +128,11 @@ SRCS = \
+ Source/Metadata/IPTC.cpp \
+ Source/Metadata/TagConversion.cpp \
+ Source/Metadata/TagLib.cpp \
++
++SRCS-$(USE_TIFF) += \
+ Source/Metadata/XTIFF.cpp \
++
++SRCS-yes += \
+ Source/FreeImageToolkit/Background.cpp \
+ Source/FreeImageToolkit/BSplineRotate.cpp \
+ Source/FreeImageToolkit/Channels.cpp \
+@@ -87,7 +141,11 @@ SRCS = \
+ Source/FreeImageToolkit/CopyPaste.cpp \
+ Source/FreeImageToolkit/Display.cpp \
+ Source/FreeImageToolkit/Flip.cpp \
++
++SRCS-$(USE_JPEG) += \
+ Source/FreeImageToolkit/JPEGTransform.cpp \
++
++SRCS-yes += \
+ Source/FreeImageToolkit/MultigridPoissonSolver.cpp \
+ Source/FreeImageToolkit/Rescale.cpp \
+ Source/FreeImageToolkit/Resize.cpp \
+@@ -98,6 +156,11 @@ SRCS = \
+ Wrapper/FreeImagePlus/src/fipTag.cpp \
+ Wrapper/FreeImagePlus/src/fipWinImage.cpp \
+ Wrapper/FreeImagePlus/src/FreeImagePlus.cpp
++
++SRCS-$(USE_JPEG) += \
++ Source/transupp.c
++
++SRCS = $(SRCS-yes)
+ INCLUDE = -I. \
+ -ISource \
+ -ISource/Metadata \
+--
+2.19.1
+
diff --git a/media-libs/freeimage/freeimage-3.18.0.ebuild b/media-libs/freeimage/freeimage-3.18.0.ebuild
new file mode 100644
index 000000000000..fa58c6fc2f75
--- /dev/null
+++ b/media-libs/freeimage/freeimage-3.18.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils toolchain-funcs
+
+MY_PN=FreeImage
+MY_PV=${PV//.}
+MY_P=${MY_PN}${MY_PV}
+
+DESCRIPTION="Image library supporting many formats"
+HOMEPAGE="http://freeimage.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
+ mirror://sourceforge/${PN}/${MY_P}.pdf"
+
+LICENSE="|| ( GPL-2 FIPL-1.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
+
+# The tiff/ilmbase isn't a typo. The TIFF plugin cheats and
+# uses code from it to handle 16bit<->float conversions.
+RDEPEND="
+ sys-libs/zlib
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:2= )
+ mng? ( media-libs/libmng:= )
+ openexr? ( media-libs/openexr:= )
+ png? ( media-libs/libpng:0= )
+ raw? ( media-libs/libraw:= )
+ tiff? (
+ media-libs/ilmbase:=
+ media-libs/tiff:0
+ )
+ webp? ( media-libs/libwebp:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ app-arch/unzip
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}
+
+DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.18.0-unbundling.patch
+ "${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
+ "${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch
+ "${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch
+ "${FILESDIR}"/${PN}-3.18.0-raw.patch
+ "${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch
+)
+
+src_prepare() {
+ pushd Source >/dev/null || die
+ cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
+ cp LibTIFF4/{tiffiop,tif_dir}.h . || die
+ rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
+ popd >/dev/null || die
+
+ edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
+ sed -i \
+ -e "s:/./:/:g" \
+ -e "s: ./: :g" \
+ -e 's: Source: \\\n\tSource:g' \
+ -e 's: Wrapper: \\\n\tWrapper:g' \
+ -e 's: Examples: \\\n\tExamples:g' \
+ -e 's: TestAPI: \\\n\tTestAPI:g' \
+ -e 's: -ISource: \\\n\t-ISource:g' \
+ -e 's: -IWrapper: \\\n\t-IWrapper:g' \
+ -e 's:INCLS:\nINCLS:g' \
+ Makefile.srcs fipMakefile.srcs || die
+ sed -i \
+ -e "/LibJPEG/d" \
+ -e "/LibJXR/d" \
+ -e "/LibPNG/d" \
+ -e "/LibTIFF/d" \
+ -e "/Source\/ZLib/d" \
+ -e "/LibOpenJPEG/d" \
+ -e "/OpenEXR/d" \
+ -e "/LibRawLite/d" \
+ -e "/LibMNG/d" \
+ -e "/LibWebP/d" \
+ -e "/LibJXR/d" \
+ Makefile.srcs fipMakefile.srcs || die
+
+ default
+}
+
+foreach_make() {
+ local m
+ for m in Makefile.{gnu,fip} ; do
+ emake -f ${m} \
+ USE_EXR=$(usex openexr) \
+ USE_JPEG=$(usex jpeg) \
+ USE_JPEG2K=$(usex jpeg2k) \
+ USE_MNG=$(usex mng) \
+ USE_PNG=$(usex png) \
+ USE_TIFF=$(usex tiff) \
+ USE_RAW=$(usex raw) \
+ USE_WEBP=$(usex webp) \
+ $(usex static-libs '' STATICLIB=) \
+ "$@"
+ done
+}
+
+src_compile() {
+ tc-export AR PKG_CONFIG
+ foreach_make \
+ CXX="$(tc-getCXX) -fPIC" \
+ CC="$(tc-getCC) -fPIC" \
+ ${MY_PN}
+}
+
+src_install() {
+ foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED%/}"/usr/$(get_libdir)
+ einstalldocs
+}
diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 5a8a8c494566..197ebe8778da 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,2 +1,3 @@
DIST glm-0.9.9.2.tar.gz 4572279 BLAKE2B 8b9ade542989b3f73f1a80403b73b5c04c5d64ae259891a6b41564eb7b4417876d527ea8440352f2feec6480ec926ca877a4849c4e75c6ece3692d24d87c942a SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
DIST glm-0.9.9.4.tar.gz 4578404 BLAKE2B 4c0bb64bb477ca46d45b4d25d7d992a39a82a7d745d4564dfac04c7f6e31ea0741b33d2d6c7832580e6f51f62a2efe269a9601c10d87f1e68b333e71e20c3d02 SHA512 50e4784fcd5f1da4ae27830948ffe4b412ec53447b89d30c6dcc2b4e0f9ec05cca4b07461d3d8a339eb103fae8dac325fabc87607b5397122ce2021d6e15a1a1
+DIST glm-0.9.9.5.tar.gz 4578601 BLAKE2B 9ce4dc7e638a651f958e2e0e1bfa0da121aefc382579838bfd810952bb8f4253e17caa6d743de713c86a4e8bd5f1afa38f8162e5f2d98ab141d94574d1103d40 SHA512 3b329acf5144aab1c0f47f8045d34e097699bd6685118ad8322c5ce23afdcb44ba2bb07e49301db06355b8eef7d4340b72251d55e113b533740d1e6ef6609911
diff --git a/media-libs/glm/glm-0.9.9.5.ebuild b/media-libs/glm/glm-0.9.9.5.ebuild
new file mode 100644
index 000000000000..169bf319fadf
--- /dev/null
+++ b/media-libs/glm/glm-0.9.9.5.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="OpenGL Mathematics"
+HOMEPAGE="http://glm.g-truc.net/"
+SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( HappyBunny MIT )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
+
+RDEPEND="virtual/opengl"
+
+src_configure() {
+ if use test; then
+ local mycmakeargs=(
+ -DGLM_TEST_ENABLE=ON
+ -DGLM_TEST_ENABLE_SIMD_SSE2="$(usex cpu_flags_x86_sse2 ON OFF)"
+ -DGLM_TEST_ENABLE_SIMD_SSE3="$(usex cpu_flags_x86_sse3 ON OFF)"
+ -DGLM_TEST_ENABLE_SIMD_AVX="$(usex cpu_flags_x86_avx ON OFF)"
+ -DGLM_TEST_ENABLE_SIMD_AVX2="$(usex cpu_flags_x86_avx2 ON OFF)"
+ )
+ fi
+
+ cmake-utils_src_configure
+}
diff --git a/media-libs/graphene/graphene-1.8.6.ebuild b/media-libs/graphene/graphene-1.8.6.ebuild
index ee623381f0f2..23d769e5cd9d 100644
--- a/media-libs/graphene/graphene-1.8.6.ebuild
+++ b/media-libs/graphene/graphene-1.8.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ebassi/graphene/releases/download/${PV}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
IUSE="cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test"
RDEPEND="
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
index c67fdc2692fa..1843a1f8dc2a 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.4-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="amd64 arm ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86"
# For OpenGL we have three separate concepts, with a list of possibilities in each:
# * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index a6b4ab1d997b..f0f4a53f1b2e 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1 +1,2 @@
DIST libbluray-1.0.2.tar.bz2 733058 BLAKE2B 6428b3cb8a2339e2c2d7f86663d6917d8484b858fb03aaf3bda6824181d072050625d37280cf011574c07316ef83103b334f654de1a6219e3a33343532cfe986 SHA512 e1360ad08aa6cc67a80efa81a09004faebbe31105f1961494f82f655e3e7378b198ee3bc534b0d0c2bfec726939b11b545cc8bbfa30794fc647432dadf71089b
+DIST libbluray-1.1.1.tar.bz2 746034 BLAKE2B 031d9c4f5ed85cb9128ec6f9b0c4232e889578ca03e131024ce2bc7049ff7990ef1936aa5a525266f8d5402e58d9c2a92b14338259c37dfaebb50c6b9745ca1e SHA512 0a3bcef06d2a58c51c3d46934c32941ec0606dc9b71fe36f72a6e34ab8113cf72cfb6e2fdd51f23e0a44ccd404323f5ac5c666aa1d839ae16cc775267cbce839
diff --git a/media-libs/libbluray/files/libbluray-jars.patch b/media-libs/libbluray/files/libbluray-jars.patch
new file mode 100644
index 000000000000..f313bf22a210
--- /dev/null
+++ b/media-libs/libbluray/files/libbluray-jars.patch
@@ -0,0 +1,46 @@
+diff -Naur a/Makefile.am b/Makefile.am
+--- a/Makefile.am 2019-04-05 09:34:16.000000000 +0100
++++ b/Makefile.am 2019-04-14 20:30:19.570385252 +0100
+@@ -239,10 +239,10 @@
+ awt_src = java-$(BDJ_TYPE)
+ endif
+
+-jardir=$(datadir)/java/
++jardir=$(datadir)/libbluray/lib/
+ jar_DATA = \
+- $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar \
+- $(top_builddir)/.libs/libbluray-awt-$(BDJ_TYPE)-$(VERSION).jar
++ $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-gentoo.jar \
++ $(top_builddir)/.libs/libbluray-awt-$(BDJ_TYPE)-gentoo.jar
+
+ $(jar_DATA): all-local
+
+@@ -253,13 +253,13 @@
+ -Dsrc_awt=:$(awt_src) \
+ $(java_versions) \
+ -Dbootclasspath="$(BDJ_BOOTCLASSPATH)" \
+- -Dversion='$(BDJ_TYPE)-$(VERSION)'
++ -Dversion='$(BDJ_TYPE)-gentoo'
+
+ clean-local:
+ ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \
+ -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \
+ -Ddist='$(abs_builddir)/.libs' \
+- -Dversion='$(BDJ_TYPE)-$(VERSION)' \
++ -Dversion='$(BDJ_TYPE)-gentoo' \
+ clean
+ endif
+
+diff -Naur a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
+--- a/src/libbluray/bdj/bdj.c 2019-04-05 09:34:16.000000000 +0100
++++ b/src/libbluray/bdj/bdj.c 2019-04-14 20:21:01.927193454 +0100
+@@ -22,6 +22,9 @@
+ #include "config.h"
+ #endif
+
++#undef VERSION
++#define VERSION "gentoo"
++
+ #include "bdj.h"
+
+ #include "native/register_native.h"
diff --git a/media-libs/libbluray/libbluray-1.1.1.ebuild b/media-libs/libbluray/libbluray-1.1.1.ebuild
new file mode 100644
index 000000000000..4a5301a677de
--- /dev/null
+++ b/media-libs/libbluray/libbluray-1.1.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ "${PV#9999}" != "${PV}" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.videolan.org/git/libbluray.git"
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+ SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
+fi
+
+inherit autotools java-pkg-opt-2 flag-o-matic multilib-minimal
+
+DESCRIPTION="Blu-ray playback libraries"
+HOMEPAGE="https://www.videolan.org/developers/libbluray.html"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml"
+
+COMMON_DEPEND="
+ xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
+ fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
+ truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
+ bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
+ java? ( >=virtual/jre-1.6 )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ java? ( >=virtual/jdk-1.6 )
+"
+BDEPEND="
+ java? (
+ >=virtual/jdk-1.6
+ dev-java/ant-core
+ )
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-jars.patch
+)
+
+DOCS=(
+ ChangeLog
+ README.txt
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ use java || unset JDK_HOME # Bug #621992.
+
+ ECONF_SOURCE="${S}" econf \
+ --disable-optimizations \
+ $(multilib_native_use_enable utils examples) \
+ $(multilib_native_use_enable java bdjava-jar) \
+ $(use_with fontconfig) \
+ $(use_with truetype freetype) \
+ $(use_enable static-libs static) \
+ $(use_with xml libxml2)
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+ multilib_is_native_abi || return
+
+ use utils &&
+ find .libs/ -type f -executable ! -name "${PN}.*" \
+ $(use java || echo '! -name bdj_test') -exec dobin {} +
+
+ use java &&
+ java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index 811597459685..4a5301a677de 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
if [[ "${PV#9999}" != "${PV}" ]] ; then
inherit git-r3
@@ -33,6 +33,9 @@ RDEPEND="
"
DEPEND="
${COMMON_DEPEND}
+ java? ( >=virtual/jdk-1.6 )
+"
+BDEPEND="
java? (
>=virtual/jdk-1.6
dev-java/ant-core
@@ -40,24 +43,23 @@ DEPEND="
virtual/pkgconfig
"
-DOCS=( ChangeLog README.txt )
+PATCHES=(
+ "${FILESDIR}"/${PN}-jars.patch
+)
+
+DOCS=(
+ ChangeLog
+ README.txt
+)
src_prepare() {
default
- unset JDK_HOME #621992
- if use java ; then
- export JDK_HOME="$(java-config -g JAVA_HOME)"
-
- # don't install a duplicate jar file
- sed -i '/^jar_DATA/d' Makefile.am || die
-
- java-pkg-opt-2_src_prepare
- fi
-
eautoreconf
}
multilib_src_configure() {
+ use java || unset JDK_HOME # Bug #621992.
+
ECONF_SOURCE="${S}" econf \
--disable-optimizations \
$(multilib_native_use_enable utils examples) \
@@ -70,18 +72,14 @@ multilib_src_configure() {
multilib_src_install() {
emake DESTDIR="${D}" install
+ multilib_is_native_abi || return
- if multilib_is_native_abi && use utils; then
- cd .libs/ || die
- dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
- if use java; then
- dobin bdj_test
- fi
- fi
+ use utils &&
+ find .libs/ -type f -executable ! -name "${PN}.*" \
+ $(use java || echo '! -name bdj_test') -exec dobin {} +
- if multilib_is_native_abi && use java; then
- java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}{,-awt}-j2se-*.jar
- fi
+ use java &&
+ java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
}
multilib_src_install_all() {
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
index 66e04eac3df1..006ee9d4936a 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://imagemagick/delegates/${P/_p/-}.tar.bz2"
LICENSE="Flashpix"
SLOT="0/1"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
IUSE="static-libs"
S=${WORKDIR}/${P/_p/-}
diff --git a/media-libs/liblqr/liblqr-0.4.2-r1.ebuild b/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
index bf017cd79899..a069cc95cc5e 100644
--- a/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
+++ b/media-libs/liblqr/liblqr-0.4.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://liblqr.wikidot.com/local--files/en:download-page/${PN}-1-${PV}.t
LICENSE="|| ( GPL-3 LGPL-3 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd"
RDEPEND="dev-libs/glib:2"
DEPEND="${RDEPEND}
diff --git a/media-libs/libmatemixer/Manifest b/media-libs/libmatemixer/Manifest
index ae14352b968a..649068104bc3 100644
--- a/media-libs/libmatemixer/Manifest
+++ b/media-libs/libmatemixer/Manifest
@@ -1,2 +1 @@
-DIST libmatemixer-1.18.0.tar.xz 418772 BLAKE2B f37689b9929ac659c6f314f2d5751beff18304575680985f4e3b24b3032237464d2ab32e4675ca3bbb0be796d90ecca47d49925a4a6105bf50907722c4505765 SHA512 254d1ff74f036d813f9ec2b983b86a730fec0d1f2009e7d22a9d779e509aec92409225cec5ff1f7c747c468c5e40affaa67130df4bb7087d5ee61036359b4407
DIST libmatemixer-1.22.0.tar.xz 432592 BLAKE2B 36f16c0ed516dea05368ae5b4f287cce275844b547fb7eebe7fb0604d0fddce72649dcac1c16475539dc5199f5d310b8bd19f165efd4bfa5c4f1bf31c1141df7 SHA512 6eaa006142601c077ac70739e637273288a4b9713dfc4179341c4832ae4e3b362e92104e150132ee274224d6c5dc057d812b7e1814e49a7690581de6d81e0db8
diff --git a/media-libs/libmatemixer/libmatemixer-1.18.0.ebuild b/media-libs/libmatemixer/libmatemixer-1.18.0.ebuild
deleted file mode 100644
index 07c33e23c573..000000000000
--- a/media-libs/libmatemixer/libmatemixer-1.18.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Mixer library for MATE Desktop"
-LICENSE="LGPL-2 GPL-2"
-SLOT="0"
-
-IUSE="+alsa oss pulseaudio"
-
-COMMON_DEPEND="
- >=dev-libs/glib-2.36:2
- sys-devel/gettext:*
- alsa? ( >=media-libs/alsa-lib-1.0.5 )
- pulseaudio? ( >=media-sound/pulseaudio-2.0.0:0[alsa?,glib] )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- dev-util/gtk-doc
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.35.0:*
- virtual/pkgconfig:*"
-
-src_configure() {
- mate_src_configure \
- --disable-null \
- $(use_enable alsa) \
- $(use_enable oss) \
- $(use_enable pulseaudio)
-}
diff --git a/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild b/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild
index bc08d21212ed..3bb4a5033c0c 100644
--- a/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild
+++ b/media-libs/libmatemixer/libmatemixer-1.22.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit mate
if [[ ${PV} != 9999 ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
DESCRIPTION="Mixer library for MATE Desktop"
diff --git a/media-libs/libraw/libraw-0.19.2.ebuild b/media-libs/libraw/libraw-0.19.2.ebuild
index 90016d4f6965..e173c4608942 100644
--- a/media-libs/libraw/libraw-0.19.2.ebuild
+++ b/media-libs/libraw/libraw-0.19.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
LICENSE="LGPL-2.1 CDDL"
SLOT="0/19" # subslot = libraw soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="examples jpeg jpeg2k +lcms openmp"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
index 76de7e12caaf..a2ec38710435 100644
--- a/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r7.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A library for reading vector images in Microsoft's Windows Metafile
HOMEPAGE="https://wvware.sourceforge.net/"
SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
LICENSE="LGPL-2"
SLOT="0"
IUSE="debug doc expat X"
diff --git a/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild b/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
index bae36037133c..f5121d8801b8 100644
--- a/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
+++ b/media-libs/lsp-plugins/lsp-plugins-1.1.7-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
else
SRC_URI="https://github.com/sadko4u/lsp-plugins/archive/${P}.tar.gz"
S="${WORKDIR}/${PN}-${P}"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
LICENSE="LGPL-3"
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 45661e534e34..0db1b0e8f60c 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,3 +1,4 @@
DIST vulkan-layers-1.1.101.tar.gz 1036750 BLAKE2B 5c59ade7826f382cfb5e56e0aa1498686e1035e69b4d51f36ffdfc179b36323850d1004759941dfaa6ae8e6a25cc909d041e840a589d102f82086f339bfaa1c6 SHA512 d962483ab7149d436ac1bafb65d26ae965e147b7bd0dfd610b35cd54598ee84cb961c472d824a33964b117a14f224c984cf73764aef4de787de13b0a1ad29c4a
+DIST vulkan-layers-1.1.106.tar.gz 1151285 BLAKE2B 763654d76c0c9d139ab922b2319df8becef5357c140ade3ba5d99cdbf6c7440b156048970202c2735bed4cb7de213d6647e492fa608023c91cf94a4b0353b4b9 SHA512 caf2c54c89aee2760747fc03f6d3e7742687f86aed5f05e1e8beffac35b114fd61af761bf95593f7cbdb3f9dbc92f570916af1225c7cdce3c16ba81024dc2027
DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a
DIST vulkan-layers-1.1.92.0.tar.gz 955136 BLAKE2B 8a039c17a231cda732aafd947c01a658c72932048307b81777254236eb6a2945e287cd098c2ee1fa264c21477b30e48ba83bfd0af4fb5f5bcb0adc502cc45a03 SHA512 09b32635bf26cdf3c1f18e57f7c7348a72c25de37c7afe03c0508cf5d3c6f39779d4a819eb92b2bf4f9300d80e757e8aaf9ec2164d7fd9f523f2926a497c08f6
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
new file mode 100644
index 000000000000..a2c0097a38c9
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.106.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
+ EGIT_SUBMODULES=()
+ inherit git-r3
+else
+ EGIT_COMMIT="21638dfbe1f15091659a722a805c9020e87ddf49"
+ KEYWORDS="~amd64 ~x86"
+ SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="X wayland"
+
+DEPEND="${PYTHON_DEPS}
+ >=dev-util/glslang-7.11.3113:=[${MULTILIB_USEDEP}]
+ >=dev-util/spirv-tools-2019.1-r1:=[${MULTILIB_USEDEP}]
+ >=dev-util/vulkan-headers-1.1.106
+ wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+ X? (
+ x11-libs/libX11:=[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+ )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_SKIP_RPATH=True
+ -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+ -DBUILD_WSI_XCB_SUPPORT=$(usex X)
+ -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+ -DBUILD_TESTS=False
+ -DGLSLANG_INSTALL_DIR="/usr"
+ -DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
+ )
+ cmake-utils_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 1074eb79739b..ee901d1aabdb 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -25,9 +25,9 @@ SLOT="0"
IUSE="X wayland"
DEPEND="${PYTHON_DEPS}
- >=dev-util/glslang-7.10.2984:=[${MULTILIB_USEDEP}]
+ >=dev-util/glslang-7.11.3113:=[${MULTILIB_USEDEP}]
>=dev-util/spirv-tools-2019.1-r1:=[${MULTILIB_USEDEP}]
- >=dev-util/vulkan-headers-1.1.92.0
+ >=dev-util/vulkan-headers-1.1.106
wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
X? (
x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 41c05f4b83bf..ee74b0b3d9b4 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,3 +1,4 @@
DIST vulkan-loader-1.1.101.tar.gz 1346567 BLAKE2B a116df430606e4d94a94c5b307319e4f0d366353f1949c27f5dc3bcbd9997bb97e7d7dc13f141c0423ab162706399a45693da5dc5ed7e6802cc65ec55c711724 SHA512 b26a9389a90cd833c7b18a50766ee0d54ad52aa252d33eb1760ebef38305559664974198a84b0ddbe92950fffc8d2a136c23acff40f73d3cbbd183bc75489a10
+DIST vulkan-loader-1.1.106.tar.gz 1347960 BLAKE2B cfce908571d7033cfaeb1491847b3b1d2032a073cd824e0368402840dfc49ff223023b2d5b2de66f2df63bca7a526c94ab8e11d27d3c1d47b43042659ac38052 SHA512 b5c0f50644f6f026d309af41a232373052ba926c969ce4e5eacdb0accd997906f673bdb3c73b98593ca90e656d444ebd40a7e26a48470b64dea6e9f0c88cfe22
DIST vulkan-loader-1.1.82.0.tar.gz 1342427 BLAKE2B 4b2c589e2c1edaa29e13e892cc839f2d7af5bbadf7dda3f50eca2543c1877af175e9640545b886ffe3e8b1c51373502ee272829ddb15c07629ea08ece697e5b9 SHA512 624e493454e622e29bc0de5fdf1c425691b3c98f317660847e95aee6bc42dafa0b4d8caa9de52e8f3229b7e743afa475485cd3affbdb295e16ba49d30d1eb19e
DIST vulkan-loader-1.1.92.1.tar.gz 1346712 BLAKE2B 60d29c38e72ff234261a3e75934d44de08c334c475e715066c210844ea672f0e2db3ebc8826df7d72392e3c2a0bbd0604b8770c0b35ddd8f72ed875234bae15d SHA512 c29d1fb43a2bdd0f291860dee0ffe7ec23a34c9431aeb76a46f8df0ec2f70601ccd3e96280f94d881f5550e3c9f07fe478f94eebcfd2aaf123045c7281313aac
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.106.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.106.ebuild
new file mode 100644
index 000000000000..4482ec9aaf25
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.106.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Loader.git"
+ EGIT_SUBMODULES=()
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~x86"
+ EGIT_COMMIT="1df2ebd329df1ece1a5ed485573ea58e5bc6ff97"
+ SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+DEPEND="${PYTHON_DEPS}
+ >=dev-util/vulkan-headers-1.1.106
+ wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+ X? (
+ x11-libs/libX11:=[${MULTILIB_USEDEP}]
+ x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+ )"
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_SKIP_RPATH=True
+ -DBUILD_TESTS=False
+ -DBUILD_LOADER=True
+ -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+ -DBUILD_WSI_XCB_SUPPORT=$(usex X)
+ -DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+ -DVULKAN_HEADERS_INSTALL_DIR="/usr"
+ )
+ cmake-utils_src_configure
+}
+
+multilib_src_install() {
+ keepdir /etc/vulkan/icd.d
+
+ cmake-utils_src_install
+}
+
+pkg_postinst() {
+ einfo "USE=demos has been dropped as per upstream packaging"
+ einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 83d678a93fe2..5296809c9d31 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -26,7 +26,7 @@ IUSE="layers wayland X"
PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
DEPEND="${PYTHON_DEPS}
- >=dev-util/vulkan-headers-1.1.92.0
+ >=dev-util/vulkan-headers-1.1.106
wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
X? (
x11-libs/libX11:=[${MULTILIB_USEDEP}]
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 967ab870ff5d..559626750332 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.3.ebuild b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.3.ebuild
index 66631dcef76d..7b3362629eec 100644
--- a/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.3.ebuild
+++ b/media-plugins/gst-plugins-chromaprint/gst-plugins-chromaprint-1.14.3.ebuild
@@ -7,7 +7,7 @@ GST_ORG_MODULE=gst-plugins-bad
inherit gstreamer
DESCRIPTION="Calculate Chromaprint fingerprint from audio files for GStreamer"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
RDEPEND="media-libs/chromaprint[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 6b4509b15371..ba9b2687de46 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
index b4574b4a73c9..1a358dd52c2c 100644
--- a/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
+++ b/media-sound/lilypond/lilypond-2.19.80-r1.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" = "9999" ]]; then
EGIT_REPO_URI="git://git.sv.gnu.org/lilypond.git"
else
SRC_URI="http://download.linuxaudio.org/lilypond/sources/v${PV:0:4}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~hppa x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa x86"
fi
DESCRIPTION="GNU Music Typesetter"
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 4802e3ae7f41..932ddcf2a373 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,5 +1,3 @@
DIST pulseeffects-3.2.3.tar.gz 648968 BLAKE2B aef2aaacacc41020c5f14582c91b53ba84f3e56d7cf4a13a955769ff80796ae21cbc0ecad9b2c3e24985a6a6daf86888c3a8c6e2387b917860336e73fa8c0d6b SHA512 802068c867b9708e7503e0beb65fb5aaf9ff4916b98048634a443f701864db00e5401de42ff58ed3e5fe9430af6caae74efe8f0b1b0e3e2c9d48dcb7c7e6a400
DIST pulseeffects-4.4.7.tar.gz 1082596 BLAKE2B 3265507191f5fca405282d8bdf9cf078023e80d2ca8f3a8bb999f7828f5220ca61b68ce01dc80e2d066a0d759b83229eabd523aff71106bd4024067afd1a8220 SHA512 243bd23d107f22a2a4b5934fb67bc5c059f278f2ec824814791ea24429e8d53844ffd71c9c21c35209261f4a0a4633827362bfd43355437a10944bbfd9a25421
-DIST pulseeffects-4.5.5.tar.gz 1783582 BLAKE2B 4c2154fad61705811d2e2135bdacc7f1e31d499ea65fbbb044896ba37cfde9ef4cd925fe7cc390c5611fb294d57a7297c7e54c76b3d69505c9b595d47259ad9a SHA512 fe45097bcd5aa9754c612c52cfba7d06d14185e18a75e5ae2a257733159f0288897e4f60d147e164f4bcafcd23978e23a006753b2b26e26613809863895cfab5
-DIST pulseeffects-4.5.6.tar.gz 1822218 BLAKE2B def674bb35970ceb2a440acac20ebd5c406ae1691b58e8e8cdee3f0eacc7077daf989bcd94a962a1ef1054bc81f68108fd445adebb32a96940a91306025d72a2 SHA512 c18e4b52c4eff15db40c398b0a60b7b2e7a069142552a9801d0a580f52145d8b13b4507a9d37aa49919bbdc144b85b3f02e140aca671d9dedfb521ed34dbc99e
-DIST pulseeffects-4.5.8.tar.gz 1826469 BLAKE2B fd19eb0c96b478eefd3d21c94887c8403d3b3c26b9e9e3850782565655994c25f45ccd4a4a119bc16b2299f299578a09499279b927ba9a5dc7a605b27c847dbf SHA512 4fbe59e034051b29e34eb3afba2db84a789c4f0ada8e26ee341f855c16417be7d29445bb8b5119796bc333a76714c2f450358c7d6ee1852420934b91c7ba86b2
+DIST pulseeffects-4.5.9.tar.gz 1830876 BLAKE2B 3b80e26eb7b3593f0636d4c3a86ddb05c4c08ec446983d8f521828a4a004b42011ca12cbed6fefe3a0df7d1347197abcee89d5786020a61ed28c3277668d8e57 SHA512 aa47b546f13ef29d03c907dfeeba0ecb531ba07bb5bbb7bc49399bceb75583c58c9e188557c1d77c02b8b50e5cac9562b6fc882750c14d755ec0d294e8b60105
diff --git a/media-sound/pulseeffects/pulseeffects-4.5.5.ebuild b/media-sound/pulseeffects/pulseeffects-4.5.5.ebuild
deleted file mode 100644
index dc0c6cb447c7..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.5.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
- inherit git-r3
- SRC_URI=""
- EGIT_REPO_URI="${HOMEPAGE}"
-else
- SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
- >=dev-libs/boost-1.41
- >=dev-cpp/glibmm-2.56.0
- >=dev-cpp/gtkmm-3.20:3.0
- >=dev-libs/glib-2.56:2
- >=dev-libs/libsigc++-2.10:2
- >=x11-libs/gtk+-3.18:3
- >=media-libs/lilv-0.24.2-r1
- media-libs/lsp-plugins[lv2]
- >=media-libs/gstreamer-1.12.0:1.0
- >=media-libs/gst-plugins-good-1.12.0:1.0
- >=media-libs/gst-plugins-bad-1.12.0:1.0
- bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
- >=media-plugins/gst-plugins-ladspa-1.12.0:1.0
- >=media-plugins/gst-plugins-lv2-1.12.0:1.0
- >=media-plugins/gst-plugins-pulse-1.12.0:1.0
- calf? ( >=media-plugins/calf-0.90.0[lv2] )
- mda-lv2? ( media-plugins/mda-lv2 )
- rubberband? ( media-libs/rubberband )
- >=media-libs/zita-convolver-3.0.0
- media-libs/libebur128
- media-sound/pulseaudio
- sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
- ${RDEPEND}
- dev-libs/appstream-glib
- sys-devel/gettext
-"
-BDEPEND="
- >=sys-devel/gcc-7.3.0
- dev-util/itstool
- virtual/pkgconfig
-"
-
-pkg_postinst(){
- gnome2_gconf_install
- gnome2_schemas_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm(){
- gnome2_gconf_uninstall
- gnome2_schemas_update
- gnome2_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.5.6.ebuild b/media-sound/pulseeffects/pulseeffects-4.5.6.ebuild
deleted file mode 100644
index dc0c6cb447c7..000000000000
--- a/media-sound/pulseeffects/pulseeffects-4.5.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
-HOMEPAGE="https://github.com/wwmm/pulseeffects"
-
-if [[ ${PV} == *9999 ]];then
- inherit git-r3
- SRC_URI=""
- EGIT_REPO_URI="${HOMEPAGE}"
-else
- SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf mda-lv2 rubberband"
-
-#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
-RDEPEND="
- >=dev-libs/boost-1.41
- >=dev-cpp/glibmm-2.56.0
- >=dev-cpp/gtkmm-3.20:3.0
- >=dev-libs/glib-2.56:2
- >=dev-libs/libsigc++-2.10:2
- >=x11-libs/gtk+-3.18:3
- >=media-libs/lilv-0.24.2-r1
- media-libs/lsp-plugins[lv2]
- >=media-libs/gstreamer-1.12.0:1.0
- >=media-libs/gst-plugins-good-1.12.0:1.0
- >=media-libs/gst-plugins-bad-1.12.0:1.0
- bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
- >=media-plugins/gst-plugins-ladspa-1.12.0:1.0
- >=media-plugins/gst-plugins-lv2-1.12.0:1.0
- >=media-plugins/gst-plugins-pulse-1.12.0:1.0
- calf? ( >=media-plugins/calf-0.90.0[lv2] )
- mda-lv2? ( media-plugins/mda-lv2 )
- rubberband? ( media-libs/rubberband )
- >=media-libs/zita-convolver-3.0.0
- media-libs/libebur128
- media-sound/pulseaudio
- sys-apps/dbus"
-# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
-# and sys-devel/gettext depends reasoning
-DEPEND="
- ${RDEPEND}
- dev-libs/appstream-glib
- sys-devel/gettext
-"
-BDEPEND="
- >=sys-devel/gcc-7.3.0
- dev-util/itstool
- virtual/pkgconfig
-"
-
-pkg_postinst(){
- gnome2_gconf_install
- gnome2_schemas_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm(){
- gnome2_gconf_uninstall
- gnome2_schemas_update
- gnome2_icon_cache_update
-}
diff --git a/media-sound/pulseeffects/pulseeffects-4.5.8.ebuild b/media-sound/pulseeffects/pulseeffects-4.5.9.ebuild
similarity index 98%
rename from media-sound/pulseeffects/pulseeffects-4.5.8.ebuild
rename to media-sound/pulseeffects/pulseeffects-4.5.9.ebuild
index c45904327f5b..4955ae913cd9 100644
--- a/media-sound/pulseeffects/pulseeffects-4.5.8.ebuild
+++ b/media-sound/pulseeffects/pulseeffects-4.5.9.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]];then
EGIT_REPO_URI="${HOMEPAGE}"
else
SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
fi
LICENSE="GPL-3"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 260ea6dae670..fa18d12a4d41 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/makemkv/Manifest b/media-video/makemkv/Manifest
index 855556eb569f..7bd283fd9d3b 100644
--- a/media-video/makemkv/Manifest
+++ b/media-video/makemkv/Manifest
@@ -1,2 +1,2 @@
-DIST makemkv-bin-1.14.2.tar.gz 9332443 BLAKE2B ef569688aa2134b0549d2474798ca8f50a99eebb42fd45f68502d06fe1334bd9a94abb5f9ca550948db707dd6e7746a9e8e0fdea1a149ab71fb5ae931ffb9a35 SHA512 1c1eb7c5dc7d2db5518823cd2996b427bbe3a38b25e615355d37c75dcda55263b7fbf554abfa7d3e65733707117150cfc408ab678438d868d67afeb9e4021e2d
-DIST makemkv-oss-1.14.2.tar.gz 4384065 BLAKE2B dee07ffc86f95ebbae47d7e56c5b9637462e06e7d75ce93019e7ae7d2845c19b7dee24537bfab38d512e047640803d7df07fd4b3d92ebece553dd3a0c35f16a7 SHA512 cbbe7afa4fcad7e1d21d41badb01c7b4a5a6bb6239d45994d3c405291a0cf651cbd0bbd63ed30884db228457968d17a83ab25dae932a23d3b3aede7ee90437e5
+DIST makemkv-bin-1.14.3.tar.gz 9117659 BLAKE2B ddc6d080a06adf2b3f8728623a11c9a7fa6392770ca472b62d172bfdf78b433ab7947f4a463ab5a8ea8d9ed7ac4d4f1a1d63572ca694274728751b75c8fb3855 SHA512 28c0b252898ba42e0c8b1fcf9440e464c7d1fb183e95faa7bcb906e0e0a299598d0264fcf8c04960c9f6609fe5a4ce0109e8ab7a9438ae205accae4c99433f09
+DIST makemkv-oss-1.14.3.tar.gz 4384183 BLAKE2B c5e96ebd06d8d2f0f83bf94344d31a8259cabe8af278307dd856b891f9cd11be8bfe4622c0824ccec5968360a68ada2b088fb71651a5c789fa55297b58d27b20 SHA512 bb83f7cafba072012a532cf4ea12e3cf6c640d2a020c65979247a4931abbd75a9c0407dd52a3013ab280bf5ded3a105a5306f9d06dfa108d0102259053e63f9c
diff --git a/media-video/makemkv/makemkv-1.14.2.ebuild b/media-video/makemkv/makemkv-1.14.3.ebuild
similarity index 98%
rename from media-video/makemkv/makemkv-1.14.2.ebuild
rename to media-video/makemkv/makemkv-1.14.3.ebuild
index 72c2f91d17cd..f9518dd45e3a 100644
--- a/media-video/makemkv/makemkv-1.14.2.ebuild
+++ b/media-video/makemkv/makemkv-1.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/media-video/pitivi/pitivi-0.999.ebuild b/media-video/pitivi/pitivi-0.999.ebuild
index 86a22b44d63a..31b2f82b652c 100644
--- a/media-video/pitivi/pitivi-0.999.ebuild
+++ b/media-video/pitivi/pitivi-0.999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.pitivi.org"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="v4l test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 10e6fb629762..72eb29849d21 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 a0fbd7675505..8ffc9cfb0c24 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Apr 2019 20:08:45 +0000
+Mon, 15 Apr 2019 04:38:43 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a0fbd7675505..8ffc9cfb0c24 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Apr 2019 20:08:45 +0000
+Mon, 15 Apr 2019 04:38:43 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 65875d878c09..eb85fae6b421 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 7bcc80cc0dc8..b3250552c9e6 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/augeas-1.12.0 b/metadata/md5-cache/app-admin/augeas-1.12.0
new file mode 100644
index 000000000000..6c9f2ec90b55
--- /dev/null
+++ b/metadata/md5-cache/app-admin/augeas-1.12.0
@@ -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-libs/libxml2 sys-libs/readline:= virtual/pkgconfig >=app-doc/NaturalDocs-1.40 test? ( dev-lang/ruby )
+DESCRIPTION=A library for changing configuration files
+EAPI=7
+HOMEPAGE=http://augeas.net/
+IUSE=static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libxml2 sys-libs/readline:=
+SLOT=0
+SRC_URI=http://download.augeas.net/augeas-1.12.0.tar.gz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=0998b9252f5942e437a3b4a690cadd07
diff --git a/metadata/md5-cache/app-admin/entr-4.0 b/metadata/md5-cache/app-admin/entr-4.0
deleted file mode 100644
index 88686cb005e4..000000000000
--- a/metadata/md5-cache/app-admin/entr-4.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure test unpack
-DESCRIPTION=Run arbitrary commands when files change
-EAPI=6
-HOMEPAGE=http://entrproject.org
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
-LICENSE=ISC
-SLOT=0
-SRC_URI=http://entrproject.org/code/entr-4.0.tar.gz
-_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-snapshot b77011b62e2053c646ad720defe6d921
-_md5_=9e85ef5aefa662a0bbf7fab013ad350b
diff --git a/metadata/md5-cache/app-admin/entr-4.1 b/metadata/md5-cache/app-admin/entr-4.2
similarity index 79%
rename from metadata/md5-cache/app-admin/entr-4.1
rename to metadata/md5-cache/app-admin/entr-4.2
index 2796e4034648..69e158fcf607 100644
--- a/metadata/md5-cache/app-admin/entr-4.1
+++ b/metadata/md5-cache/app-admin/entr-4.2
@@ -6,6 +6,6 @@ IUSE=test
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd
LICENSE=ISC
SLOT=0
-SRC_URI=http://entrproject.org/code/entr-4.1.tar.gz
+SRC_URI=http://entrproject.org/code/entr-4.2.tar.gz
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-snapshot b77011b62e2053c646ad720defe6d921
-_md5_=9e85ef5aefa662a0bbf7fab013ad350b
+_md5_=d9f71bc1e6c8353020d9f11ea136fb4e
diff --git a/metadata/md5-cache/app-admin/fleet-1.0.0 b/metadata/md5-cache/app-admin/fleet-1.0.0
deleted file mode 100644
index 3c9608810d9a..000000000000
--- a/metadata/md5-cache/app-admin/fleet-1.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.5:= test? ( dev-go/go-tools ) virtual/pkgconfig
-DESCRIPTION=A Distributed init System
-EAPI=5
-HOMEPAGE=https://github.com/coreos/fleet
-IUSE=doc examples test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/coreos/fleet/archive/v1.0.0.tar.gz -> fleet-1.0.0.tar.gz
-_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-snapshot b77011b62e2053c646ad720defe6d921
-_md5_=290b209788c8409023a71ec64a58b5c1
diff --git a/metadata/md5-cache/app-admin/fleet-9999 b/metadata/md5-cache/app-admin/fleet-9999
deleted file mode 100644
index 4709fea60a76..000000000000
--- a/metadata/md5-cache/app-admin/fleet-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install test unpack
-DEPEND=>=dev-lang/go-1.3:= test? ( dev-go/go-tools ) >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
-DESCRIPTION=A Distributed init System
-EAPI=5
-HOMEPAGE=https://github.com/coreos/fleet
-IUSE=doc examples test
-LICENSE=Apache-2.0
-SLOT=0
-_eclasses_=git-r3 0d4635eeb5a96cd5315597a47eba25c9 multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=cb4dc1f9e22f693eb1aea9724150bd3a
diff --git a/metadata/md5-cache/app-admin/mongo-tools-3.6.10 b/metadata/md5-cache/app-admin/mongo-tools-3.6.12
similarity index 78%
rename from metadata/md5-cache/app-admin/mongo-tools-3.6.10
rename to metadata/md5-cache/app-admin/mongo-tools-3.6.12
index d34daa42ddd0..7ee17639fb30 100644
--- a/metadata/md5-cache/app-admin/mongo-tools-3.6.10
+++ b/metadata/md5-cache/app-admin/mongo-tools-3.6.12
@@ -7,5 +7,5 @@ IUSE=sasl ssl
KEYWORDS=~amd64
LICENSE=Apache-2.0
SLOT=0
-SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.6.10.tar.gz -> mongo-tools-3.6.10.tar.gz
+SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.6.12.tar.gz -> mongo-tools-3.6.12.tar.gz
_md5_=7706679c3ab0ced48d2dd3c8982860c9
diff --git a/metadata/md5-cache/app-admin/mongo-tools-4.0.8 b/metadata/md5-cache/app-admin/mongo-tools-4.0.8
new file mode 100644
index 000000000000..90ee961e825b
--- /dev/null
+++ b/metadata/md5-cache/app-admin/mongo-tools-4.0.8
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=dev-lang/go:= net-libs/libpcap sasl? ( dev-libs/cyrus-sasl ) ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=7
+HOMEPAGE=https://www.mongodb.com
+IUSE=sasl ssl
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/mongodb/mongo-tools/archive/r4.0.8.tar.gz -> mongo-tools-4.0.8.tar.gz
+_md5_=7706679c3ab0ced48d2dd3c8982860c9
diff --git a/metadata/md5-cache/app-admin/pwman3-0.10.0 b/metadata/md5-cache/app-admin/pwman3-0.10.0
new file mode 100644
index 000000000000..9c8803f67618
--- /dev/null
+++ b/metadata/md5-cache/app-admin/pwman3-0.10.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/cryptography-2.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/colorama-0.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pexpect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A lightweight password-manager with multiple database backends
+EAPI=6
+HOMEPAGE=https://pwman3.github.io
+IUSE=mongodb mysql postgres +sqlite test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=>=dev-python/cryptography-2.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/colorama-0.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] mongodb? ( dev-python/pymongo[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( dev-python/pymysql[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( dev-python/psycopg[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/pwman3/pwman3/archive/v0.10.0.tar.gz -> pwman3-0.10.0.tar.gz
+_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=ec468fea2cf1b783513e377ffafcb6b3
diff --git a/metadata/md5-cache/app-admin/pwman3-0.9.11 b/metadata/md5-cache/app-admin/pwman3-0.9.11
index e436a58b6c94..518dfecbad9f 100644
--- a/metadata/md5-cache/app-admin/pwman3-0.9.11
+++ b/metadata/md5-cache/app-admin/pwman3-0.9.11
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/pwman3/pwman3/archive/v0.9.11.tar.gz -> pwman3-0.9.11.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=c287eb821f06bcc68731303eafd6bb98
+_md5_=8f2105d3c4df1fc3b9fff510d3ee0632
diff --git a/metadata/md5-cache/app-admin/terraform-0.11.12 b/metadata/md5-cache/app-admin/terraform-0.11.12
index 3b64cd975133..4921b2c7dc53 100644
--- a/metadata/md5-cache/app-admin/terraform-0.11.12
+++ b/metadata/md5-cache/app-admin/terraform-0.11.12
@@ -9,4 +9,4 @@ RESTRICT=strip
SLOT=0
SRC_URI=https://github.com/hashicorp/terraform/archive/v0.11.12.tar.gz -> terraform-0.11.12.tar.gz
_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b
-_md5_=f01ec0c7e10d90dbb345f65bd7a60fb5
+_md5_=413f1f559cfc518110974aa8ccd28ad6
diff --git a/metadata/md5-cache/app-admin/terraform-0.11.13 b/metadata/md5-cache/app-admin/terraform-0.11.13
new file mode 100644
index 000000000000..730b261cb638
--- /dev/null
+++ b/metadata/md5-cache/app-admin/terraform-0.11.13
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst unpack
+DEPEND=>=dev-lang/go-1.11.0 >=dev-lang/go-1.10
+DESCRIPTION=A tool for building, changing, and combining infrastructure safely
+EAPI=6
+HOMEPAGE=https://www.terraform.io/
+KEYWORDS=~amd64
+LICENSE=MPL-2.0
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/hashicorp/terraform/archive/v0.11.13.tar.gz -> terraform-0.11.13.tar.gz
+_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b
+_md5_=009a1280096ac5ed7cc42d657455c5b1
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 7210ec2dd089..a576f593ec67 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/cabextract-1.8 b/metadata/md5-cache/app-arch/cabextract-1.8
index 04aa6117d275..cd8f9de056be 100644
--- a/metadata/md5-cache/app-arch/cabextract-1.8
+++ b/metadata/md5-cache/app-arch/cabextract-1.8
@@ -3,10 +3,10 @@ DESCRIPTION=Extracts files from Microsoft cabinet archive files
EAPI=7
HOMEPAGE=https://www.cabextract.org.uk/
IUSE=extras
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-3
RDEPEND=extras? ( dev-lang/perl )
SLOT=0
SRC_URI=https://www.cabextract.org.uk/cabextract-1.8.tar.gz
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=d6c8178193eac21baba999125f9d5f50
+_md5_=50a6d46c4dfee51df03d041d4b20ece4
diff --git a/metadata/md5-cache/app-arch/cksfv-1.3.14 b/metadata/md5-cache/app-arch/cksfv-1.3.14
index 983093c1e7f4..e0707c005393 100644
--- a/metadata/md5-cache/app-arch/cksfv-1.3.14
+++ b/metadata/md5-cache/app-arch/cksfv-1.3.14
@@ -3,8 +3,8 @@ DESCRIPTION=SFV checksum utility (simple file verification)
EAPI=4
HOMEPAGE=http://zakalwe.fi/~shd/foss/cksfv/
KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
+LICENSE=GPL-2+
SLOT=0
SRC_URI=http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-1.3.14.tar.bz2
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=76f72d83ae47e837767ad42ac9905de6
+_md5_=43c21826fe67334b44f97563d6b0f232
diff --git a/metadata/md5-cache/app-arch/cksfv-1.3.14-r1 b/metadata/md5-cache/app-arch/cksfv-1.3.14-r1
new file mode 100644
index 000000000000..7fb1bd8b3881
--- /dev/null
+++ b/metadata/md5-cache/app-arch/cksfv-1.3.14-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure
+DESCRIPTION=SFV checksum utility (simple file verification)
+EAPI=7
+HOMEPAGE=http://zakalwe.fi/~shd/foss/cksfv/
+KEYWORDS=~alpha ~amd64 ~amd64-linux ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-linux
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=http://zakalwe.fi/~shd/foss/cksfv/files/cksfv-1.3.14.tar.bz2
+_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=7e2f2a9d81c3fdc05a68e3d91696b5cf
diff --git a/metadata/md5-cache/app-arch/createrepo-0.10.4-r1 b/metadata/md5-cache/app-arch/createrepo-0.10.4-r1
deleted file mode 100644
index c31f5479fa46..000000000000
--- a/metadata/md5-cache/app-arch/createrepo-0.10.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Creates a common rpm-metadata repository
-EAPI=7
-HOMEPAGE=http://createrepo.baseurl.org/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-python/urlgrabber-2.9.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-arch/rpm-4.1.1[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-arch/deltarpm-3.6_pre20110223[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=sys-apps/yum-3.4.3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://createrepo.baseurl.org/download/createrepo-0.10.4.tar.gz
-_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb multilib b2f01ad412baf81650c23fcf0975fa33 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=6ad4c36b428118664a84a16ebd2696e8
diff --git a/metadata/md5-cache/app-arch/engrampa-1.18.3 b/metadata/md5-cache/app-arch/engrampa-1.18.3
deleted file mode 100644
index 93a3f8dea468..000000000000
--- a/metadata/md5-cache/app-arch/engrampa-1.18.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.17.1 ) >=x11-libs/gtk+-3.14:3[X] magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=Engrampa archive manager for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja magic packagekit
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.17.1 ) >=x11-libs/gtk+-3.14:3[X] magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/engrampa-1.18.3.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=9ed8ef30a3b3772686a3a3b7019a45a0
diff --git a/metadata/md5-cache/app-arch/engrampa-1.22.0 b/metadata/md5-cache/app-arch/engrampa-1.22.0
index 17bbfeee7eb4..cf784a96dec6 100644
--- a/metadata/md5-cache/app-arch/engrampa-1.22.0
+++ b/metadata/md5-cache/app-arch/engrampa-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Engrampa archive manager for MATE
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=caja magic packagekit
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/json-glib-0.14 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[X] x11-libs/pango caja? ( >=mate-base/caja-1.17.1 ) magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/engrampa-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=894fde80c4d5b5528bf00d1adc2928e2
+_md5_=e48632c322309cf38624a50ec4e0e505
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index c5ebd14e6690..2c47de52cf6d 100644
Binary files a/metadata/md5-cache/app-backup/Manifest.gz and b/metadata/md5-cache/app-backup/Manifest.gz differ
diff --git a/metadata/md5-cache/app-backup/borgbackup-1.1.9 b/metadata/md5-cache/app-backup/borgbackup-1.1.9
index 54c7c1992e48..288e56ec0f47 100644
--- a/metadata/md5-cache/app-backup/borgbackup-1.1.9
+++ b/metadata/md5-cache/app-backup/borgbackup-1.1.9
@@ -1,15 +1,15 @@
BDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools_scm[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/msgpack-0.6.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+DEPEND=dev-python/setuptools_scm[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/msgpack-0.5.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
DESCRIPTION=Deduplicating backup program with compression and authenticated encryption
EAPI=7
HOMEPAGE=https://borgbackup.readthedocs.io/
IUSE=libressl python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=BSD
-RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] <=dev-python/msgpack-0.6.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=!!app-office/borg app-arch/lz4 virtual/acl dev-python/llfuse[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/msgpack-0.5.6[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyzmq[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/b/borgbackup/borgbackup-1.1.9.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=b34e51e996d05a1b4e996a8fd1a98b56
+_md5_=713eb4a62e1c740b2340c87f0045a727
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 9097f0059678..6d5d8fc26358 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/acme-sh-2.8.0 b/metadata/md5-cache/app-crypt/acme-sh-2.8.0
new file mode 100644
index 000000000000..119bf6e3d59d
--- /dev/null
+++ b/metadata/md5-cache/app-crypt/acme-sh-2.8.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=An ACME Shell script
+EAPI=7
+HOMEPAGE=https://github.com/Neilpang/acme.sh
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-misc/curl || ( dev-libs/libressl dev-libs/openssl:0 ) || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) || ( net-misc/socat www-servers/apache:2 www-servers/nginx ) virtual/cron
+SLOT=0
+SRC_URI=https://github.com/Neilpang/acme.sh/archive/2.8.0.tar.gz -> acme.sh-2.8.0.tar.gz
+_md5_=53a38c343ea1ac6b67161c844c5d64d1
diff --git a/metadata/md5-cache/app-crypt/acme-sh-9999 b/metadata/md5-cache/app-crypt/acme-sh-9999
index 14de674934ea..ef1059f38fb4 100644
--- a/metadata/md5-cache/app-crypt/acme-sh-9999
+++ b/metadata/md5-cache/app-crypt/acme-sh-9999
@@ -4,7 +4,7 @@ DESCRIPTION=An ACME Shell script
EAPI=7
HOMEPAGE=https://github.com/Neilpang/acme.sh
LICENSE=GPL-3
-RDEPEND=net-misc/curl || ( dev-libs/libressl dev-libs/openssl:0 ) || ( net-analyzer/netcat6 net-analyzer/openbsd-netcat ) || ( net-misc/socat www-servers/apache:2 www-servers/nginx:0 ) virtual/cron
+RDEPEND=net-misc/curl || ( dev-libs/libressl dev-libs/openssl:0 ) || ( net-analyzer/netcat net-analyzer/openbsd-netcat ) || ( net-misc/socat www-servers/apache:2 www-servers/nginx ) virtual/cron
SLOT=0
_eclasses_=git-r3 0d4635eeb5a96cd5315597a47eba25c9
-_md5_=1d79a607dc8b8177c191b6747cb82aca
+_md5_=bbe6561dceef16d6eca564de75c39924
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 971df58dba72..039d590fb2e2 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/pluma-1.18.3 b/metadata/md5-cache/app-editors/pluma-1.18.3
deleted file mode 100644
index 9e1b5e664f72..000000000000
--- a/metadata/md5-cache/app-editors/pluma-1.18.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) !!app-editors/mate-text-editor ~app-text/docbook-xml-dtd-4.1.2 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* >=sys-devel/libtool-2.2.6:2 >=sys-devel/gettext-0.17:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Pluma text editor for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+introspection spell python_targets_python2_7 test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14.0:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[introspection?]
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/pluma-1.18.3.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=ecc48a51dc1816b11853f1c4cd599c5c
diff --git a/metadata/md5-cache/app-editors/pluma-1.22.0 b/metadata/md5-cache/app-editors/pluma-1.22.0
index 3bcd7047f467..b9f62cfd9641 100644
--- a/metadata/md5-cache/app-editors/pluma-1.22.0
+++ b/metadata/md5-cache/app-editors/pluma-1.22.0
@@ -4,7 +4,7 @@ DESCRIPTION=Pluma text editor for the MATE desktop
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=+introspection spell python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2.5:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0 x11-libs/libICE x11-libs/libX11 >=x11-libs/libSM-1.0 x11-libs/pango virtual/libintl introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) spell? ( >=app-text/enchant-1.2 >=app-text/iso-codes-0.35 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[introspection?]
REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/pluma-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=add219a578eb8943dcc2ae58c6090716
+_md5_=e3cd0184b57822d5ede80f99cc5b59cf
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index d47e93c8579d..6540fd7693e1 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/ganeti-2.15.2-r8 b/metadata/md5-cache/app-emulation/ganeti-2.15.2-r8
index 80c7694fd564..d2e2b5480053 100644
--- a/metadata/md5-cache/app-emulation/ganeti-2.15.2-r8
+++ b/metadata/md5-cache/app-emulation/ganeti-2.15.2-r8
@@ -5,11 +5,11 @@ DESCRIPTION=Ganeti is a virtual server management software tool
EAPI=7
HOMEPAGE=http://www.ganeti.org/
IUSE=drbd experimental haskell-daemons htools ipv6 kvm lxc monitoring multiple-users rbd syslog test xen restricted-commands python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=GPL-2
RDEPEND=dev-libs/openssl:0 dev-python/paramiko[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyopenssl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pycurl[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/ipaddr[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/bitarray[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/fdsend[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] || ( net-misc/iputils[arping] net-analyzer/arping ) net-analyzer/fping net-misc/bridge-utils net-misc/curl[ssl] net-misc/openssh net-misc/socat sys-apps/iproute2 >=sys-fs/lvm2-2.02.181 >=sys-apps/baselayout-2.0 >=dev-lang/ghc-8.0:0= =dev-haskell/mtl-2.1.1:0= >=dev-haskell/old-time-1.1.0.0:0= >=dev-haskell/random-1.0.1.1:0= haskell-daemons? ( >=dev-haskell/text-0.11.1.13:0= ) >=dev-haskell/transformers-0.3.0.0:0= >=dev-haskell/attoparsec-0.10.1.1:0= =dev-haskell/base64-bytestring-1.0.0.1:0= =dev-haskell/crypto-4.2.4:0= =dev-haskell/curl-1.3.7:0= =dev-haskell/hinotify-0.3.2:0= =dev-haskell/hslogger-1.1.4:0= =dev-haskell/json-0.5:0= >=dev-haskell/lens-3.10:0= >=dev-haskell/lifted-base-0.2.0.3:0= =dev-haskell/monad-control-1.0.1.0:0= =dev-haskell/network-2.3.0.13:0= =dev-haskell/parallel-3.2.0.2:3= =dev-haskell/temporary-1.1.2.3:0= =dev-haskell/regex-pcre-0.94.2:0= =dev-haskell/transformers-base-0.4:0= =dev-haskell/utf8-string-0.3.7:0= >=dev-haskell/zlib-0.5.3.3:0= =dev-haskell/psqueue-1.1:0= =dev-haskell/snap-core-1.0.1:0= =dev-haskell/snap-server-1.0.1:0= =dev-haskell/case-insensitive-0.4.0.1 dev-haskell/vector:0= xen? ( >=app-emulation/xen-3.0 ) kvm? ( dev-python/psutil app-emulation/qemu ) lxc? ( app-emulation/lxc ) drbd? ( sys-cluster/drbd-utils ) rbd? ( sys-cluster/ceph ) ipv6? ( net-misc/ndisc6 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ipv6(+)?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] !app-emulation/ganeti-htools
REQUIRED_USE=|| ( kvm xen lxc ) test? ( ipv6 ) kvm? ( || ( amd64 x86 ) ) python_targets_python2_7
SLOT=0
SRC_URI=http://downloads.ganeti.org/releases/2.15/ganeti-2.15.2.tar.gz mirror://debian/pool/main/g/ganeti-2.15/ganeti-2.15_2.15.2-11.debian.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 bash-completion-r1 47a7402d95930413ce25ba8d857339bb libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073
-_md5_=0026a1def93392d356f82a766459b09a
+_md5_=ba9cc6507d95d9e38bc012414ddb7cbc
diff --git a/metadata/md5-cache/app-emulation/grub-xen-host-1.0 b/metadata/md5-cache/app-emulation/grub-xen-host-1.0
index 4f0133fadff1..0546b4394633 100644
--- a/metadata/md5-cache/app-emulation/grub-xen-host-1.0
+++ b/metadata/md5-cache/app-emulation/grub-xen-host-1.0
@@ -6,6 +6,6 @@ HOMEPAGE=https://blog.xenproject.org/2015/01/07/using-grub-2-as-a-bootloader-for
KEYWORDS=amd64
LICENSE=BSD-2
RDEPEND=sys-boot/grub:2=[grub_platforms_xen] app-emulation/xen-tools:=
-RESTRICT=test
+RESTRICT=binchecks strip test
SLOT=0
-_md5_=0b8f13ec2a3cae4ff0e3b123895f511a
+_md5_=c783786b09d59b2a6387131ad59df5f1
diff --git a/metadata/md5-cache/app-emulation/wine-staging-4.2 b/metadata/md5-cache/app-emulation/wine-staging-4.2
deleted file mode 100644
index 23bddd4164f4..000000000000
--- a/metadata/md5-cache/app-emulation/wine-staging-4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( 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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.5 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=4.2
-SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.2.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v4.2.tar.gz -> wine-staging-4.2.tar.gz )
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf gnome2-utils 532371cfcba45b2ab0d2950547c97d95 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 pax-utils e85f015e815dd463b0c206d781ef45a5 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=fa59b504574a60c7c9b0fe87d190729b
diff --git a/metadata/md5-cache/app-emulation/wine-staging-4.6 b/metadata/md5-cache/app-emulation/wine-staging-4.6
new file mode 100644
index 000000000000..8c4bf58febfe
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-staging-4.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) staging? ( dev-lang/perl dev-perl/XML-Simple ) xinerama? ( 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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, with Wine-Staging patchset
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ffmpeg? ( >=media-video/ffmpeg-4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) staging? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) themes? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/cairo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/gtk+:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( x11-libs/libva[X,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.8.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) ffmpeg? ( staging ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) themes? ( staging ) vaapi? ( staging ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=4.6
+SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.6.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20190316.tar.xz staging? ( https://github.com/wine-staging/wine-staging/archive/v4.6.tar.gz -> wine-staging-4.6.tar.gz )
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf gnome2-utils 532371cfcba45b2ab0d2950547c97d95 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 pax-utils e85f015e815dd463b0c206d781ef45a5 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=02693081260a032c49fedbdd84541271
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-4.2 b/metadata/md5-cache/app-emulation/wine-vanilla-4.2
deleted file mode 100644
index a1d4cb446b8a..000000000000
--- a/metadata/md5-cache/app-emulation/wine-vanilla-4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
-DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( 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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
-EAPI=6
-HOMEPAGE=https://www.winehq.org/
-IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
-KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.7.5 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
-REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
-RESTRICT=test
-SLOT=4.2
-SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.2.tar.xz https://dev.gentoo.org/~np-hardass/distfiles/wine/gentoo-wine-patches-20180120.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf gnome2-utils 532371cfcba45b2ab0d2950547c97d95 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 pax-utils e85f015e815dd463b0c206d781ef45a5 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=38e8001c3938a59c0633c6a837cb02e4
diff --git a/metadata/md5-cache/app-emulation/wine-vanilla-4.6 b/metadata/md5-cache/app-emulation/wine-vanilla-4.6
new file mode 100644
index 000000000000..21d222d381e6
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/wine-vanilla-4.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare prerm pretend setup test unpack
+DEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex >=sys-kernel/linux-headers-2.6 virtual/pkgconfig virtual/yacc X? ( x11-base/xorg-proto ) prelink? ( sys-devel/prelink ) xinerama? ( 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 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Free implementation of Windows(tm) on Unix, without external patchsets
+EAPI=6
+HOMEPAGE=https://www.winehq.org/
+IUSE=+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks v4l vkd3d vulkan +X +xcomposite xinerama +xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 test
+KEYWORDS=-* ~amd64 ~x86 ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/libXcursor[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXxf86vm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) capi? ( net-libs/libcapi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cups? ( net-print/cups:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) faudio? ( app-emulation/faudio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( media-libs/fontconfig:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gphoto2? ( media-libs/libgphoto2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( media-sound/gsm:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gstreamer? ( media-libs/gstreamer:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-plugins/gst-plugins-meta:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( virtual/krb5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( media-libs/lcms:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ldap? ( net-nds/openldap:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netapi? ( net-fs/samba[netapi(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nls? ( sys-devel/gettext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) odbc? ( dev-db/unixODBC:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( media-libs/openal:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) osmesa? ( >=media-libs/mesa-13[osmesa,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcap? ( net-libs/libpcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) scanner? ( media-gfx/sane-backends:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( net-libs/gnutls:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( virtual/libudev:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udisks? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vkd3d? ( app-emulation/vkd3d[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vulkan? ( media-libs/vulkan-loader[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcomposite? ( x11-libs/libXcomposite[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xinerama? ( x11-libs/libXinerama[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libxslt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) app-emulation/wine-desktop-common >app-eselect/eselect-wine-0.3 !app-emulation/wine:0 dos? ( >=games-emulation/dosbox-0.74_p20160629 ) gecko? ( app-emulation/wine-gecko:2.47[abi_x86_32?,abi_x86_64?] ) mono? ( app-emulation/wine-mono:4.8.0 ) perl? ( dev-lang/perl dev-perl/XML-Simple ) pulseaudio? ( realtime? ( sys-auth/rtkit ) ) samba? ( >=net-fs/samba-3.0.25[winbind] ) selinux? ( sec-policy/selinux-wine ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) osmesa? ( opengl ) test? ( abi_x86_32 ) vkd3d? ( vulkan )
+RESTRICT=test
+SLOT=4.6
+SRC_URI=https://dl.winehq.org/wine/source/4.x/wine-4.6.tar.xz https://dev.gentoo.org/~sarnex/distfiles/wine/gentoo-wine-patches-20190316.tar.xz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf gnome2-utils 532371cfcba45b2ab0d2950547c97d95 l10n 97f2753e3f1f3753d53d856c7c0bbb0b libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 pax-utils e85f015e815dd463b0c206d781ef45a5 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=03c48ac6cc293f93e964ef30df270149
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 81e769c28796..8aef12f8e9e2 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.64 b/metadata/md5-cache/app-portage/portage-utils-0.64
deleted file mode 100644
index 6d27220f8c53..000000000000
--- a/metadata/md5-cache/app-portage/portage-utils-0.64
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure prepare
-DEPEND=dev-libs/iniparser:0 app-arch/xz-utils static? ( dev-libs/iniparser:0[static-libs] )
-DESCRIPTION=small and fast portage helper tools written in C
-EAPI=5
-HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
-IUSE=nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-libs/iniparser:0
-SLOT=0
-SRC_URI=mirror://gentoo/portage-utils-0.64.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.64.tar.xz
-_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=8258c0ecdb191eca2114a5b0b1cc4961
diff --git a/metadata/md5-cache/app-portage/portage-utils-9999 b/metadata/md5-cache/app-portage/portage-utils-9999
new file mode 100644
index 000000000000..97e1e3998903
--- /dev/null
+++ b/metadata/md5-cache/app-portage/portage-utils-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure prepare unpack
+DEPEND=dev-libs/iniparser:0 app-arch/xz-utils static? ( dev-libs/iniparser:0[static-libs] ) >=dev-vcs/git-1.8.2.1[curl] >=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=Small and fast Portage helper tools written in C
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
+IUSE=nls static
+LICENSE=GPL-2
+RDEPEND=dev-libs/iniparser:0
+SLOT=0
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 git-r3 0d4635eeb5a96cd5315597a47eba25c9 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=6eb712073d5aca5e4fbc0a8d02e12353
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 00dabe0410e1..964e2bfc8098 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/asciidoc-8.6.10 b/metadata/md5-cache/app-text/asciidoc-8.6.10
index 59364f1378a3..c2e6248af8e7 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.10
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.10
@@ -4,11 +4,11 @@ DESCRIPTION=A plain text human readable/writable document format
EAPI=6
HOMEPAGE=http://asciidoc.org/
IUSE=examples graphviz highlight test python_targets_pypy python_targets_python2_7 python_single_target_pypy python_single_target_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] graphviz? ( media-gfx/graphviz ) highlight? ( || ( dev-util/source-highlight dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] app-text/highlight ) )
REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 )
SLOT=0
SRC_URI=https://github.com/asciidoc/asciidoc/archive/8.6.10.tar.gz -> asciidoc-8.6.10.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=0477ceeb5e4ed9b460cd2b0b013cde28
+_md5_=cc961ec4d1bba75f90f735ffc24d158d
diff --git a/metadata/md5-cache/app-text/atril-1.18.3 b/metadata/md5-cache/app-text/atril-1.18.3
deleted file mode 100644
index ca60cd03e1e6..000000000000
--- a/metadata/md5-cache/app-text/atril-1.18.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3[introspection?] x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.17.1[introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax >=net-libs/webkit-gtk-2.4.3:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/rarian:0 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=Atril document viewer for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3[introspection?] x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.17.1[introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax >=net-libs/webkit-gtk-2.4.3:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer
-REQUIRED_USE=t1lib? ( dvi )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/atril-1.18.3.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=73a4c1b3064b982b4a8c22803247fe58
diff --git a/metadata/md5-cache/app-text/atril-1.22.0 b/metadata/md5-cache/app-text/atril-1.22.0
index d749bad5014f..1dd8a49ead27 100644
--- a/metadata/md5-cache/app-text/atril-1.22.0
+++ b/metadata/md5-cache/app-text/atril-1.22.0
@@ -4,7 +4,7 @@ DESCRIPTION=Atril document viewer for MATE
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libICE >=x11-libs/libSM-1:0 x11-libs/libX11 >=x11-libs/cairo-1.9.10 x11-libs/pango caja? ( >=mate-base/caja-1.17.1[introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax >=net-libs/webkit-gtk-2.4.3:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1 ) !!app-text/mate-document-viewer
REQUIRED_USE=t1lib? ( dvi )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/atril-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=120387c9cef1f06e56d1c36b783a559c
+_md5_=4e3c7be75f189232aae3a11bd03dcd51
diff --git a/metadata/md5-cache/app-text/blogc-0.15.1 b/metadata/md5-cache/app-text/blogc-0.16.0
similarity index 80%
rename from metadata/md5-cache/app-text/blogc-0.15.1
rename to metadata/md5-cache/app-text/blogc-0.16.0
index c548c6c97beb..694bb1086a49 100644
--- a/metadata/md5-cache/app-text/blogc-0.15.1
+++ b/metadata/md5-cache/app-text/blogc-0.16.0
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=git? ( dev-vcs/git ) !dev-vcs/blogc-git-receiver !www-servers/blogc-runserver
SLOT=0
-SRC_URI=https://github.com/blogc/blogc/releases/download/v0.15.1/blogc-0.15.1.tar.xz
+SRC_URI=https://github.com/blogc/blogc/releases/download/v0.16.0/blogc-0.16.0.tar.xz
_md5_=728a43cf652b4ac908a08e5cb5e9b991
diff --git a/metadata/md5-cache/app-text/dvipng-1.15-r1 b/metadata/md5-cache/app-text/dvipng-1.15-r1
index d1c1ae263dc1..80063b33c398 100644
--- a/metadata/md5-cache/app-text/dvipng-1.15-r1
+++ b/metadata/md5-cache/app-text/dvipng-1.15-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Translate DVI files into PNG or GIF graphics
EAPI=6
HOMEPAGE=http://dvipng.sourceforge.net/
IUSE=truetype test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=LGPL-3+ Texinfo-manual
RDEPEND=>=dev-libs/kpathsea-6.2.1:= media-libs/gd:2=[jpeg,png] media-libs/libpng:0= virtual/latex-base sys-libs/zlib truetype? ( >=media-libs/freetype-2.1.5 )
SLOT=0
SRC_URI=mirror://sourceforge/dvipng/dvipng-1.15.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9ba66a30851c0c84403fa828dd09d2a6
+_md5_=e42d2b34877343b38bde3926b3055d54
diff --git a/metadata/md5-cache/app-text/rfcutil-3.2.3-r2 b/metadata/md5-cache/app-text/rfcutil-3.2.3-r2
deleted file mode 100644
index e7680c6ead5d..000000000000
--- a/metadata/md5-cache/app-text/rfcutil-3.2.3-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm
-DESCRIPTION=return all related RFCs based upon a number or a search string
-EAPI=4
-HOMEPAGE=http://www.dewn.com/rfc/
-KEYWORDS=amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=freedist
-RDEPEND=dev-lang/perl || ( www-client/lynx virtual/w3m )
-SLOT=0
-SRC_URI=http://www.dewn.com/rfc/rfc-3.2.3.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bebf750080169430340170c479caf6a3
diff --git a/metadata/md5-cache/app-text/t1utils-1.41-r2 b/metadata/md5-cache/app-text/t1utils-1.41-r2
index 841fed5782e0..f5c70bd8a236 100644
--- a/metadata/md5-cache/app-text/t1utils-1.41-r2
+++ b/metadata/md5-cache/app-text/t1utils-1.41-r2
@@ -3,10 +3,10 @@ DEPEND=>=app-portage/elt-patches-20170815 !
DESCRIPTION=Type 1 Font utilities
EAPI=6
HOMEPAGE=http://www.lcdf.org/type/#t1utils
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=!=app-admin/mongo-tools-3.6.10 )
+PDEPEND=tools? ( >=app-admin/mongo-tools-3.6.12 )
RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
SLOT=0
-SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.10.tar.gz
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.6.12.tar.gz
_eclasses_=check-reqs 2c6f909675083dce8430b648bf737cb0 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils e85f015e815dd463b0c206d781ef45a5 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f scons-utils 741000d14c0b59263aac3f3cf6e39909 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073
_md5_=e62189cf21b0913a64e0e3152b7813db
diff --git a/metadata/md5-cache/dev-db/mongodb-4.0.8 b/metadata/md5-cache/dev-db/mongodb-4.0.8
new file mode 100644
index 000000000000..89d0bdce11dd
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-4.0.8
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/scons-2.5.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/cheetah[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] virtual/python-typing[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind ) test? ( dev-python/pymongo[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=7
+HOMEPAGE=https://www.mongodb.com
+IUSE=debug kerberos libressl lto mms-agent ssl test +tools python_targets_python2_7
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 SSPL-1
+PDEPEND=tools? ( >=app-admin/mongo-tools-4.0.8 )
+RDEPEND=>=app-arch/snappy-1.1.3 >=dev-cpp/yaml-cpp-0.5.3:= >=dev-libs/boost-1.60:=[threads(+)] >=dev-libs/libpcre-8.41[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
+SLOT=0
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.0.8.tar.gz
+_eclasses_=check-reqs 2c6f909675083dce8430b648bf737cb0 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils e85f015e815dd463b0c206d781ef45a5 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f scons-utils 741000d14c0b59263aac3f3cf6e39909 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073
+_md5_=372b5300412d88c97c0317b1258920e7
diff --git a/metadata/md5-cache/dev-db/rqlite-4.4.0 b/metadata/md5-cache/dev-db/rqlite-4.4.0
index d3aae2c3fd69..d7d148b2e528 100644
--- a/metadata/md5-cache/dev-db/rqlite-4.4.0
+++ b/metadata/md5-cache/dev-db/rqlite-4.4.0
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install unpack
+DEFINED_PHASES=compile install test unpack
DEPEND=>=dev-lang/go-1.10
DESCRIPTION=Replicated SQLite using the Raft consensus protocol
EAPI=6
@@ -9,4 +9,4 @@ RESTRICT=strip
SLOT=0
SRC_URI=https://github.com/rqlite/rqlite/archive/v4.4.0.tar.gz -> rqlite-4.4.0.tar.gz https://github.com/Bowery/prompt/archive/8a1d5376df1cbec3468f2138fecc44dd8b48e342.tar.gz -> github.com-Bowery-prompt-8a1d5376df1cbec3468f2138fecc44dd8b48e342.tar.gz https://github.com/armon/go-metrics/archive/f0300d1749da6fa982027e449ec0c7a145510c3c.tar.gz -> github.com-armon-go-metrics-f0300d1749da6fa982027e449ec0c7a145510c3c.tar.gz https://github.com/boltdb/bolt/archive/fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5.tar.gz -> github.com-boltdb-bolt-fd01fc79c553a8e99d512a07e8e0c63d4a3ccfc5.tar.gz https://github.com/hashicorp/go-immutable-radix/archive/27df80928bb34bb1b0d6d0e01b9e679902e7a6b5.tar.gz -> github.com-hashicorp-go-immutable-radix-27df80928bb34bb1b0d6d0e01b9e679902e7a6b5.tar.gz https://github.com/hashicorp/go-msgpack/archive/2e9170ac1d8fb32e1e645d8364e4d8f21b530bb3.tar.gz -> github.com-hashicorp-go-msgpack-2e9170ac1d8fb32e1e645d8364e4d8f21b530bb3.tar.gz https://github.com/hashicorp/golang-lru/archive/20f1fb78b0740ba8c3cb143a61e86ba5c8669768.tar.gz -> github.com-hashicorp-golang-lru-20f1fb78b0740ba8c3cb143a61e86ba5c8669768.tar.gz https://github.com/labstack/gommon/archive/34167a09256a4fcb5d26dd88d02b7b353d86838a.tar.gz -> github.com-labstack-gommon-34167a09256a4fcb5d26dd88d02b7b353d86838a.tar.gz https://github.com/mattn/go-colorable/archive/efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz -> github.com-mattn-go-colorable-efa589957cd060542a26d2dd7832fd6a6c6c3ade.tar.gz https://github.com/mattn/go-isatty/archive/3fb116b820352b7f0c281308a4d6250c22d94e27.tar.gz -> github.com-mattn-go-isatty-3fb116b820352b7f0c281308a4d6250c22d94e27.tar.gz https://github.com/mattn/go-sqlite3/archive/3fa1c550ffa69b74dc4bfd5109b4e218f32c87cf.tar.gz -> github.com-mattn-go-sqlite3-3fa1c550ffa69b74dc4bfd5109b4e218f32c87cf.tar.gz https://github.com/mkideal/cli/archive/a48c2cee5b5ee91096961d344681edc2083b9422.tar.gz -> github.com-mkideal-cli-a48c2cee5b5ee91096961d344681edc2083b9422.tar.gz https://github.com/mkideal/pkg/archive/3e188c9e7ecc83d0fe7040a9161ce3c67885470d.tar.gz -> github.com-mkideal-pkg-3e188c9e7ecc83d0fe7040a9161ce3c67885470d.tar.gz https://github.com/golang/crypto/archive/64072686203f69e3fd20143576b27200f18ab0fa.tar.gz -> github.com-golang-crypto-64072686203f69e3fd20143576b27200f18ab0fa.tar.gz https://github.com/golang/sys/archive/054c452bb702e465e95ce8e7a3d9a6cf0cd1188d.tar.gz -> github.com-golang-sys-054c452bb702e465e95ce8e7a3d9a6cf0cd1188d.tar.gz
_eclasses_=golang-base c57d2c3f9e1a02d0feb8b87c7b689892 golang-vcs-snapshot 12177e83bede6f7fb87eae383864b40b
-_md5_=cae2c6bad93af1184c51c9cbcf27e3eb
+_md5_=5efee45becb6beded0e3fb156bca7f2c
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 0696c15e37f0..1c4abdf3ffc9 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/echo2-2.1.1 b/metadata/md5-cache/dev-java/echo2-2.1.1
deleted file mode 100644
index e72af01360cd..000000000000
--- a/metadata/md5-cache/dev-java/echo2-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Echo2 is the next-generation of the Echo Web Framework
-EAPI=2
-HOMEPAGE=http://www.nextapp.com/platform/echo2/echo/
-IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=|| ( MPL-1.1 GPL-2 LGPL-2.1 )
-RDEPEND=>=virtual/jre-1.4 java-virtuals/servlet-api:2.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=2.1
-SRC_URI=http://download.nextapp.com/downloads/echo2/2.1.1/NextApp_Echo2.tgz -> NextApp_Echo2-2.1.1.tgz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=16fe0a4aec19e36d40f4249fcf655219
diff --git a/metadata/md5-cache/dev-java/xerces-2.11.0 b/metadata/md5-cache/dev-java/xerces-2.11.0
deleted file mode 100644
index 0896a33e303a..000000000000
--- a/metadata/md5-cache/dev-java/xerces-2.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0 >=virtual/jdk-1.4 >=dev-java/xjavac-20110814:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=The next generation of high performance, fully compliant XML parsers
-EAPI=4
-HOMEPAGE=http://xml.apache.org/xerces2-j/index.html
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0 >=virtual/jre-1.4 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2
-SRC_URI=mirror://apache/xerces/j/Xerces-J-src.2.11.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=9ffd2e1270002799b5efc9fb82976770
diff --git a/metadata/md5-cache/dev-java/xerces-2.11.0-r1 b/metadata/md5-cache/dev-java/xerces-2.11.0-r2
similarity index 82%
rename from metadata/md5-cache/dev-java/xerces-2.11.0-r1
rename to metadata/md5-cache/dev-java/xerces-2.11.0-r2
index f21a29d3b7fc..c1d9a235ba02 100644
--- a/metadata/md5-cache/dev-java/xerces-2.11.0-r1
+++ b/metadata/md5-cache/dev-java/xerces-2.11.0-r2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0 >=virtual/jdk-1.6 >=dev-java/xjavac-20110814:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0 >=virtual/jdk-1.6 dev-java/xjavac:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
DESCRIPTION=The next generation of high performance, fully compliant XML parsers
EAPI=5
HOMEPAGE=http://xml.apache.org/xerces2-j/index.html
IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
LICENSE=Apache-2.0
RDEPEND=dev-java/xml-commons-external:1.4 >=dev-java/xml-commons-resolver-1.2:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
RESTRICT=test
SLOT=2
SRC_URI=mirror://apache/xerces/j/Xerces-J-src.2.11.0.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=85d990900febad61cf21d82754404cfb
+_md5_=350e5787661c59ed079e486b8c344611
diff --git a/metadata/md5-cache/dev-java/xjavac-2.4.0 b/metadata/md5-cache/dev-java/xjavac-2.4.0
index b5eeccf55462..e6b2cfe7b616 100644
--- a/metadata/md5-cache/dev-java/xjavac-2.4.0
+++ b/metadata/md5-cache/dev-java/xjavac-2.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Xerses Java Parser
EAPI=6
HOMEPAGE=https://xerces.apache.org/xerces-j
IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=Apache-2.0
RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
SLOT=1
SRC_URI=https://dev.gentoo.org/~monsieurp/packages/xjavac-2.4.0.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-pkg-simple 3e71074eb6884746b37b70b2c9c881f4 java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=a4f8620c34baefae37d4e8ce28170af5
+_md5_=d927757fb811b18c98d235048a5779ad
diff --git a/metadata/md5-cache/dev-java/xjavac-20110814 b/metadata/md5-cache/dev-java/xjavac-20110814
deleted file mode 100644
index 5a2e965cb106..000000000000
--- a/metadata/md5-cache/dev-java/xjavac-20110814
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.4 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=The implementation of the javac compiler for IBM JDK 1.4 (needed for xerces-2)
-EAPI=2
-HOMEPAGE=http://cvs.apache.org/viewcvs.cgi/xml-xerces/java/tools/src/XJavac.java
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jdk-1.4 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=1
-SRC_URI=mirror://gentoo/xjavac-20110814.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=1d596313effae982234c69f9242e6ab4
diff --git a/metadata/md5-cache/dev-java/zemberek-2.1.1 b/metadata/md5-cache/dev-java/zemberek-2.1.1
deleted file mode 100644
index 6d3957a3d736..000000000000
--- a/metadata/md5-cache/dev-java/zemberek-2.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 test? ( dev-java/junit:4 dev-java/ant-junit4 dev-java/hamcrest-core ) app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Zemberek NLP library
-EAPI=2
-HOMEPAGE=https://github.com/ahmetaa/zemberek-nlp
-IUSE=l10n_tk +l10n_tr elibc_FreeBSD source doc test elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
-LICENSE=MPL-1.1
-RDEPEND=>=virtual/jre-1.5 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=https://zemberek.googlecode.com/files/zemberek-2.1.1-nolibs-src.zip
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=7234b9c38acfc6f5a307114b81f236c2
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index f56858220bce..ae3f306d01b8 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/rust-1.34.0-r1 b/metadata/md5-cache/dev-lang/rust-1.34.0-r1
index 8249c65f8ad3..0cf9d717e2a7 100644
--- a/metadata/md5-cache/dev-lang/rust-1.34.0-r1
+++ b/metadata/md5-cache/dev-lang/rust-1.34.0-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
SLOT=stable/1.34
SRC_URI=https://static.rust-lang.org/dist/rustc-1.34.0-src.tar.xz -> rustc-1.34.0-src.tar.xz amd64? ( https://static.rust-lang.org/dist/rust-1.33.0-x86_64-unknown-linux-gnu.tar.xz ) arm? ( https://static.rust-lang.org/dist/rust-1.33.0-arm-unknown-linux-gnueabi.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-arm-unknown-linux-gnueabihf.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-armv7-unknown-linux-gnueabihf.tar.xz ) arm64? ( https://static.rust-lang.org/dist/rust-1.33.0-aarch64-unknown-linux-gnu.tar.xz ) mips? ( https://static.rust-lang.org/dist/rust-1.33.0-mips-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-mipsel-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-mips64-unknown-linux-gnuabi64.tar.xz ) ppc? ( https://static.rust-lang.org/dist/rust-1.33.0-powerpc-unknown-linux-gnu.tar.xz ) ppc64? ( https://static.rust-lang.org/dist/rust-1.33.0-powerpc64-unknown-linux-gnu.tar.xz https://static.rust-lang.org/dist/rust-1.33.0-powerpc64le-unknown-linux-gnu.tar.xz ) s390? ( https://static.rust-lang.org/dist/rust-1.33.0-s390x-unknown-linux-gnu.tar.xz ) x86? ( https://static.rust-lang.org/dist/rust-1.33.0-i686-unknown-linux-gnu.tar.xz )
_eclasses_=check-reqs 2c6f909675083dce8430b648bf737cb0 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf llvm f36be95c5bfae7bc8c82a966d3c8324f ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f rust-toolchain e68df44640df5d971dcf4e0c7de60517 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ca56c1e5462fe677a86307941dd42fa
+_md5_=383e2b208d4fb598639cab378d3e08b1
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.18 b/metadata/md5-cache/dev-lang/vala-0.36.18
index a93fd69e4a64..f3bccd11ee41 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.18
+++ b/metadata/md5-cache/dev-lang/vala-0.36.18
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Projects/Vala
IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
LICENSE=LGPL-2.1
RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.18
SLOT=0.36
SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.18.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=402ed746b92917117967a8868bb49d27
+_md5_=033fdfc84f979b5cb0eba9f33c7bc3bf
diff --git a/metadata/md5-cache/dev-lang/vala-0.40.14 b/metadata/md5-cache/dev-lang/vala-0.40.14
index cf32fa3c7fac..3f0781ac1f50 100644
--- a/metadata/md5-cache/dev-lang/vala-0.40.14
+++ b/metadata/md5-cache/dev-lang/vala-0.40.14
@@ -4,10 +4,10 @@ DESCRIPTION=Compiler for the GObject type system
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Projects/Vala
IUSE=test valadoc
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux
LICENSE=LGPL-2.1
RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/vala-common-0.40.14 valadoc? ( >=media-gfx/graphviz-2.16 )
SLOT=0.40
SRC_URI=mirror://gnome/sources/vala/0.40/vala-0.40.14.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=e2e15f67b27604bdc03c436dd335d411
+_md5_=64af1f6bf5f2066112449c42acb882b5
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b96afbdb18e6..1a4e79bb4494 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/boost-1.70.0 b/metadata/md5-cache/dev-libs/boost-1.70.0
new file mode 100644
index 000000000000..2409a2438339
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/boost-1.70.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!app-admin/eselect-boost bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] numpy? ( >=dev-python/numpy-1.14.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) =dev-util/boost-build-1.70*
+DESCRIPTION=Boost Libraries for C++
+EAPI=7
+HOMEPAGE=https://www.boost.org/
+IUSE=bzip2 context debug doc icu lzma +nls mpi numpy python static-libs +threads tools zlib zstd python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris ~x86-winnt
+LICENSE=Boost-1.0
+RDEPEND=!app-admin/eselect-boost bzip2? ( app-arch/bzip2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( >=dev-libs/icu-3.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !icu? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( app-arch/xz-utils:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,cxx,threads] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] numpy? ( >=dev-python/numpy-1.14.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) ) zlib? ( sys-libs/zlib:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=mpi? ( threads ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+RESTRICT=test
+SLOT=0/1.70.0
+SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.70.0/boost_1_70_0.tar.bz2
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=f60b83b24d7a3782c1b0a283f445265e
diff --git a/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205 b/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205
index de4aca323651..3bc7578aebd6 100644
--- a/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205
+++ b/metadata/md5-cache/dev-libs/boost-mpl-cartesian_product-20161205
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install test unpack
DEPEND=dev-libs/boost
DESCRIPTION=an extension to the Boost.MPL library
EAPI=6
-HOMEPAGE=http://www.organicvectory.com/index.php?option=com_content&view=article&id=75:boostmplcartesianproduct&catid=42:boost&Itemid=78
+HOMEPAGE=https://github.com/quinoacomputing/BoostMPLCartesianProduct
IUSE=test
KEYWORDS=~amd64 ~x86
LICENSE=Boost-1.0
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/boost
SLOT=0
SRC_URI=https://github.com/quinoacomputing/BoostMPLCartesianProduct/archive/aeb0266b3a89f32c390dff51cb73a454d5d7a745.tar.gz -> boost-mpl-cartesian_product-20161205.tar.gz
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-snapshot b77011b62e2053c646ad720defe6d921
-_md5_=c527e49ce1fd5ec3d58f8d1f58a52ca3
+_md5_=9769a48eec63c22a80980a98f14f80ac
diff --git a/metadata/md5-cache/dev-libs/double-conversion-3.1.4 b/metadata/md5-cache/dev-libs/double-conversion-3.1.4
new file mode 100644
index 000000000000..3a1dc1bc63c1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/double-conversion-3.1.4
@@ -0,0 +1,12 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=Binary-decimal and decimal-binary conversion routines for IEEE doubles
+EAPI=7
+HOMEPAGE=https://github.com/google/double-conversion
+IUSE=static-libs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+SLOT=0/2
+SRC_URI=https://github.com/google/double-conversion/archive/v3.1.4.tar.gz -> double-conversion-3.1.4.tar.gz
+_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=3a53a721b3a88735dde21ec7a3003f4f
diff --git a/metadata/md5-cache/dev-libs/libbson-1.14.0 b/metadata/md5-cache/dev-libs/libbson-1.14.0
new file mode 100644
index 000000000000..3fdbd893c7c2
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libbson-1.14.0
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/sphinx
+DESCRIPTION=Library routines related to building,parsing and iterating BSON documents
+EAPI=7
+HOMEPAGE=https://github.com/mongodb/mongo-c-driver/tree/master/src/libbson
+IUSE=examples static-libs
+KEYWORDS=~amd64 ~hppa ~ppc ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.14.0/mongo-c-driver-1.14.0.tar.gz -> libbson-1.14.0.tar.gz
+_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=6a0294f3021e76259cf3f4967427ca32
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.5.6-r101 b/metadata/md5-cache/dev-libs/libgcrypt-1.5.6-r101
deleted file mode 100644
index a2569ae6df1d..000000000000
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.5.6-r101
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libgcrypt:0/11 >=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=General purpose crypto library based on the code used in GnuPG
-EAPI=6
-HOMEPAGE=http://www.gnupg.org/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1 MIT
-RDEPEND=>=dev-libs/libgpg-error-1.12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !dev-libs/libgcrypt:0/11
-SLOT=11/11
-SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.5.6.tar.bz2
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=5cb5c7d2992e5ab8fc3552257b099530
diff --git a/metadata/md5-cache/dev-libs/libgnome-games-support-1.4.3 b/metadata/md5-cache/dev-libs/libgnome-games-support-1.4.3
index af17c56149c9..d17252f299ff 100644
--- a/metadata/md5-cache/dev-libs/libgnome-games-support-1.4.3
+++ b/metadata/md5-cache/dev-libs/libgnome-games-support-1.4.3
@@ -3,10 +3,10 @@ DEPEND=>=sys-devel/gettext-0.19.8 virtual/pkgconfig >=app-portage/elt-patches-20
DESCRIPTION=Library for code common to Gnome games
EAPI=6
HOMEPAGE=https://git.gnome.org/browse/libgnome-games-support/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=LGPL-3+
RDEPEND=dev-libs/libgee:0.8= >=dev-libs/glib-2.40:2 >=x11-libs/gtk+-3.19.2:3
SLOT=1/3
SRC_URI=mirror://gnome/sources/libgnome-games-support/1.4/libgnome-games-support-1.4.3.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=794998d2715a70921d6d111f36822303
+_md5_=8192f52f33dead7ecc8ed7ef355744de
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.18.2 b/metadata/md5-cache/dev-libs/libmateweather-1.18.2
deleted file mode 100644
index 9457ad0b11f4..000000000000
--- a/metadata/md5-cache/dev-libs/libmateweather-1.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.34:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 >=x11-libs/gtk+-3.0:3 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* sys-devel/gettext:* >=sys-devel/libtool-2.2.6:2 virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=MATE library to access weather information from online services
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.34:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 >=x11-libs/gtk+-3.0:3
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/libmateweather-1.18.2.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=ff7f4a7f3164d7a06b5e20381b70563d
diff --git a/metadata/md5-cache/dev-libs/libmateweather-1.22.0 b/metadata/md5-cache/dev-libs/libmateweather-1.22.0
index e28974aeb524..f560c8003a93 100644
--- a/metadata/md5-cache/dev-libs/libmateweather-1.22.0
+++ b/metadata/md5-cache/dev-libs/libmateweather-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=MATE library to access weather information from online services
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.6:2 >=net-libs/libsoup-2.34:2.4 >=sys-libs/timezone-data-2010k:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 >=x11-libs/gtk+-3.0:3
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/libmateweather-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=7ce7dd4cce532a9e1065ab472d4304e2
+_md5_=ddd54dc8270440ecf5f3a766726826bb
diff --git a/metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1-r1 b/metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1-r1
index e4fce3c14dff..ee3439c24095 100644
--- a/metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1-r1
+++ b/metadata/md5-cache/dev-libs/libutf8proc-2.2.0_p1-r1
@@ -3,9 +3,9 @@ DEPEND=dev-util/netsurf-buildsystem
DESCRIPTION=mapping tool for UTF-8 strings
EAPI=7
HOMEPAGE=http://www.netsurf-browser.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86
LICENSE=MIT
SLOT=0/2.2.0_p1
SRC_URI=https://download.netsurf-browser.org/libs/releases/libutf8proc-2.2.0-1-src.tar.gz
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=bfd92c76d637273130713071df022db2
+_md5_=e8eeaf5605fec3cd84397749de8c15cd
diff --git a/metadata/md5-cache/dev-libs/mongo-c-driver-1.14.0 b/metadata/md5-cache/dev-libs/mongo-c-driver-1.14.0
new file mode 100644
index 000000000000..297d92c9708f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mongo-c-driver-1.14.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/snappy:= >=dev-libs/libbson-1.14.0 dev-python/sphinx sys-libs/zlib:= icu? ( dev-libs/icu:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) test? ( dev-db/mongodb dev-libs/libbson[static-libs] )
+DESCRIPTION=Client library written in C for MongoDB
+EAPI=7
+HOMEPAGE=https://github.com/mongodb/mongo-c-driver
+IUSE=debug examples icu libressl sasl ssl static-libs test
+KEYWORDS=~amd64 ~hppa ~s390 ~x86
+LICENSE=Apache-2.0
+RDEPEND=app-arch/snappy:= >=dev-libs/libbson-1.14.0 dev-python/sphinx sys-libs/zlib:= icu? ( dev-libs/icu:= ) sasl? ( dev-libs/cyrus-sasl:= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+REQUIRED_USE=test? ( static-libs )
+RESTRICT=x86? ( test )
+SLOT=0
+SRC_URI=https://github.com/mongodb/mongo-c-driver/releases/download/1.14.0/mongo-c-driver-1.14.0.tar.gz -> mongo-c-driver-1.14.0.tar.gz
+_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=5e064147c9ad2e5a8b3b81ad62e20a61
diff --git a/metadata/md5-cache/dev-libs/opensc-0.19.0-r2 b/metadata/md5-cache/dev-libs/opensc-0.19.0-r2
index 6553dea4b5cc..dc0dd47be750 100644
--- a/metadata/md5-cache/dev-libs/opensc-0.19.0-r2
+++ b/metadata/md5-cache/dev-libs/opensc-0.19.0-r2
@@ -5,11 +5,11 @@ DESCRIPTION=Libraries and applications to access smartcards
EAPI=7
HOMEPAGE=https://github.com/OpenSC/OpenSC/wiki
IUSE=ctapi doc libressl openct notify +pcsc-lite readline secure-messaging ssl test zlib
-KEYWORDS=~alpha amd64 ~arm hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=LGPL-2.1
RDEPEND=zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-2.7.0:0= ) ) openct? ( >=dev-libs/openct-0.5.0 ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 ) notify? ( dev-libs/glib:2= )
REQUIRED_USE=pcsc-lite? ( !openct !ctapi ) openct? ( !pcsc-lite !ctapi ) ctapi? ( !pcsc-lite !openct ) || ( pcsc-lite openct ctapi )
SLOT=0
SRC_URI=https://github.com/OpenSC/OpenSC/releases/download/0.19.0/opensc-0.19.0.tar.gz
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=31c0783fa0017d44f469287179dd830e
+_md5_=01aee4916d6ab7d19043b4bda5c89c74
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.40.14 b/metadata/md5-cache/dev-libs/vala-common-0.40.14
index 9fcce91ecc0e..cc92c1cd8edb 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.40.14
+++ b/metadata/md5-cache/dev-libs/vala-common-0.40.14
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
DESCRIPTION=Build infrastructure for packages that use Vala
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Projects/Vala
-KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
LICENSE=LGPL-2.1
RDEPEND=!=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.12.0 >=dev-libs/wayland-protocols-1.13 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) dbus? ( >=sys-apps/dbus-1.6 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-1.1.0:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor ) 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
-DESCRIPTION=Wayland reference compositor
-EAPI=6
-HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
-IUSE=colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT CC-BY-SA-3.0
-RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.12.0 >=dev-libs/wayland-protocols-1.13 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) dbus? ( >=sys-apps/dbus-1.6 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-1.1.0:= ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
-REQUIRED_USE=drm? ( gles2 ) screen-sharing? ( rdp ) systemd? ( dbus ) test? ( headless xwayland ) wayland-compositor? ( gles2 )
-SLOT=0
-SRC_URI=https://wayland.freedesktop.org/releases/weston-5.0.0.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=37bcfe5942c8e58c69b2fbdc1d9fbb20
diff --git a/metadata/md5-cache/dev-libs/weston-6.0.0 b/metadata/md5-cache/dev-libs/weston-6.0.0
new file mode 100644
index 000000000000..d3258c304f92
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/weston-6.0.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.17 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+DESCRIPTION=Wayland reference compositor
+EAPI=7
+HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
+IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT CC-BY-SA-3.0
+RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.17 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+REQUIRED_USE=drm? ( gles2 ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
+SLOT=0
+SRC_URI=https://wayland.freedesktop.org/releases/weston-6.0.0.tar.xz
+_eclasses_=meson e53acc5913e5581a8a71be22731d8f36 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=c11a9000c015e0d754a6881ef712baf8
diff --git a/metadata/md5-cache/dev-libs/weston-9999 b/metadata/md5-cache/dev-libs/weston-9999
index 64d2647f9679..394a71726ce0 100644
--- a/metadata/md5-cache/dev-libs/weston-9999
+++ b/metadata/md5-cache/dev-libs/weston-9999
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile configure install test unpack
-DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.17 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-1.1.0:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor ) virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.17 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
DESCRIPTION=Wayland reference compositor
-EAPI=6
+EAPI=7
HOMEPAGE=https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston
-IUSE=colord +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland
+IUSE=colord +desktop +drm editor examples fbdev fullscreen +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland
LICENSE=MIT CC-BY-SA-3.0
-RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.17 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-1.1.0:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
-REQUIRED_USE=drm? ( gles2 ) screen-sharing? ( rdp ) test? ( headless xwayland ) wayland-compositor? ( gles2 )
+RDEPEND=>=dev-libs/libinput-0.8.0 >=dev-libs/wayland-1.17.0 >=dev-libs/wayland-protocols-1.17 lcms? ( media-libs/lcms:2 ) media-libs/libpng:0= webp? ( media-libs/libwebp:0= ) jpeg? ( virtual/jpeg:0= ) >=x11-libs/cairo-1.11.3 >=x11-libs/libdrm-2.4.68 >=x11-libs/libxkbcommon-0.5.0 >=x11-libs/pixman-0.25.2 x11-misc/xkeyboard-config fbdev? ( >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) colord? ( >=x11-misc/colord-0.1.27 ) drm? ( >=media-libs/mesa-17.1[gbm] >=sys-libs/mtdev-1.1.0 >=virtual/udev-136 ) editor? ( x11-libs/pango ) gles2? ( media-libs/mesa[gles2,wayland] ) rdp? ( >=net-misc/freerdp-2.0.0_rc2:= ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) systemd? ( sys-auth/pambase[systemd] >=sys-apps/dbus-1.6 >=sys-apps/systemd-209[pam] ) launch? ( sys-auth/pambase ) X? ( >=x11-libs/libxcb-1.9 x11-libs/libX11 ) xwayland? ( x11-base/xorg-server[wayland] x11-libs/cairo[xcb] >=x11-libs/libxcb-1.9 x11-libs/libXcursor )
+REQUIRED_USE=drm? ( gles2 ) screen-sharing? ( rdp ) test? ( desktop headless xwayland ) wayland-compositor? ( gles2 ) || ( drm fbdev headless rdp wayland-compositor X )
SLOT=0
-_eclasses_=git-r3 0d4635eeb5a96cd5315597a47eba25c9 meson e53acc5913e5581a8a71be22731d8f36 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=47aa1158a1f7e5defd7ac621224d1e61
+_eclasses_=git-r3 0d4635eeb5a96cd5315597a47eba25c9 meson e53acc5913e5581a8a71be22731d8f36 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=57669036846f88d991f1b73e3b508aa9
diff --git a/metadata/md5-cache/dev-perl/Devel-NYTProf-6.60.0 b/metadata/md5-cache/dev-perl/Devel-NYTProf-6.60.0
index 5d724289bf14..e6170322f8bc 100644
--- a/metadata/md5-cache/dev-perl/Devel-NYTProf-6.60.0
+++ b/metadata/md5-cache/dev-perl/Devel-NYTProf-6.60.0
@@ -4,10 +4,10 @@ DESCRIPTION=Powerful feature-rich perl source code profiler
EAPI=6
HOMEPAGE=https://metacpan.org/release/Devel-NYTProf
IUSE=test examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=>=dev-perl/File-Which-1.90.0 virtual/perl-Getopt-Long dev-perl/JSON-MaybeXS virtual/perl-Scalar-List-Utils virtual/perl-XSLoader sys-libs/zlib dev-lang/perl:=
SLOT=0
SRC_URI=mirror://cpan/authors/id/T/TI/TIMB/Devel-NYTProf-6.06.tar.gz
_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5
-_md5_=ccaca475ac50a9e4c839dbfba10c064a
+_md5_=dc78531d8e2c7f39e748f9d373bd1e64
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 9257f07c497a..cd6464797db3 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index e4da89c6c343..fdd058775544 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/swoole-4.2.13 b/metadata/md5-cache/dev-php/swoole-4.2.13
index f8ed5c37c3d9..40ec72fbda7e 100644
--- a/metadata/md5-cache/dev-php/swoole-4.2.13
+++ b/metadata/md5-cache/dev-php/swoole-4.2.13
@@ -5,7 +5,7 @@ DESCRIPTION=Event-driven asynchronous & concurrent & coroutine networking engine
EAPI=7
HOMEPAGE=https://www.swoole.co.uk
IUSE=debug http2 libressl mysql sockets ssl php_targets_php7-1 php_targets_php7-2 php_targets_php7-3
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=dev-libs/libaio dev-libs/boost:0= dev-libs/libpcre http2? ( net-libs/nghttp2:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php7-1? ( dev-lang/php:7.1[cli,sockets?] ) php_targets_php7-2? ( dev-lang/php:7.2[cli,sockets?] ) php_targets_php7-3? ( dev-lang/php:7.3[cli,sockets?] ) mysql? ( php_targets_php7-1? ( dev-lang/php:7.1[mysql,mysqli(+)] ) php_targets_php7-2? ( dev-lang/php:7.2[mysql,mysqli(+)] ) php_targets_php7-3? ( dev-lang/php:7.3[mysql,mysqli(+)] ) ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 )
REQUIRED_USE=|| ( php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
@@ -13,4 +13,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://pecl.php.net/get/swoole-4.2.13.tgz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 637effc08278f9652b9c14911810c5cf toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=743229f1f5fedf3320d66af541778f24
+_md5_=129fcfd4bb25b4ba3bbe2258d2a1a072
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 1598d804545c..44e0d06dfc4e 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/absl-py-0.7.1 b/metadata/md5-cache/dev-python/absl-py-0.7.1
new file mode 100644
index 000000000000..0996cd92869f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/absl-py-0.7.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DESCRIPTION=Abseil Python Common Libraries
+EAPI=7
+HOMEPAGE=https://github.com/abseil/abseil-py
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=https://github.com/abseil/abseil-py/archive/pypi-v0.7.1.tar.gz -> absl-py-0.7.1.tar.gz
+_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=e3c5e21daae361d6808c5f3f70fbe9e0
diff --git a/metadata/md5-cache/dev-python/click-7.0 b/metadata/md5-cache/dev-python/click-7.0
index 729725a4aa92..be31b65614ad 100644
--- a/metadata/md5-cache/dev-python/click-7.0
+++ b/metadata/md5-cache/dev-python/click-7.0
@@ -5,11 +5,11 @@ DESCRIPTION=A Python package for creating beautiful command line interfaces
EAPI=7
HOMEPAGE=https://palletsprojects.com/p/click/ https://pypi.org/project/click/
IUSE=doc examples test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86
LICENSE=BSD
RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=https://github.com/pallets/click/archive/7.0.tar.gz -> click-7.0.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=8b8e216edef7adc4a2fc12dba41538ec
+_md5_=78fe4ee4d858d334036fc8a1b7e8222c
diff --git a/metadata/md5-cache/dev-python/ldappool-1.0 b/metadata/md5-cache/dev-python/ldappool-1.0
deleted file mode 100644
index e2d00745a8df..000000000000
--- a/metadata/md5-cache/dev-python/ldappool-1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A connection pool for python-ldap
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/python-ldap[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/l/ldappool/ldappool-1.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=bb4efce07ab0fadc80d98272e4f6d6d1
diff --git a/metadata/md5-cache/dev-python/ldappool-2.0.0 b/metadata/md5-cache/dev-python/ldappool-2.0.0
deleted file mode 100644
index 425a693f7067..000000000000
--- a/metadata/md5-cache/dev-python/ldappool-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A connection pool for python-ldap
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=python_targets_python2_7 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pyldap-2.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/l/ldappool/ldappool-2.0.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=7d1137794fadfa14adf9219fb935addd
diff --git a/metadata/md5-cache/dev-python/ldappool-2.1.0 b/metadata/md5-cache/dev-python/ldappool-2.1.0
deleted file mode 100644
index a8732e03eba8..000000000000
--- a/metadata/md5-cache/dev-python/ldappool-2.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A connection pool for python-ldap
-EAPI=5
-HOMEPAGE=https://launchpad.net/oslo
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pyldap-2.4.20[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/l/ldappool/ldappool-2.1.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=d62d8396d3298cf320b3cecc29d73e52
diff --git a/metadata/md5-cache/dev-python/ldappool-2.4.1 b/metadata/md5-cache/dev-python/ldappool-2.4.1
index a9aa2b3d95aa..87e6faa11343 100644
--- a/metadata/md5-cache/dev-python/ldappool-2.4.1
+++ b/metadata/md5-cache/dev-python/ldappool-2.4.1
@@ -5,11 +5,11 @@ DESCRIPTION=A connection pool for python-ldap
EAPI=7
HOMEPAGE=https://launchpad.net/oslo
IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
LICENSE=Apache-2.0
RDEPEND=>=dev-python/python-ldap-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/prettytable-0.7.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] =dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/l/ldappool/ldappool-2.4.1.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=a6f58eb57d6ab3752e9b400137a55885
+_md5_=1aa72739333bac48c3cac32d5f01c0c6
diff --git a/metadata/md5-cache/dev-python/nose2-0.6.5 b/metadata/md5-cache/dev-python/nose2-0.6.5
index 8d271135477d..56ee86b006d7 100644
--- a/metadata/md5-cache/dev-python/nose2-0.6.5
+++ b/metadata/md5-cache/dev-python/nose2-0.6.5
@@ -4,11 +4,11 @@ DESCRIPTION=nose2 is the next generation of nicer testing for Python
EAPI=5
HOMEPAGE=https://github.com/nose-devs/nose2
IUSE=doc python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=BSD
RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cov-core-1.12[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/nose-devs/nose2/archive/0.6.5.tar.gz -> nose2-0.6.5.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=484fba01dc1e9bfd8cf8764eff601c05
+_md5_=6cbb4455daed03a22c82dca1e14fe0e5
diff --git a/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2 b/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
index 4698db07f63b..12e9eb66b03d 100644
--- a/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
+++ b/metadata/md5-cache/dev-python/pallets-sphinx-themes-1.1.2
@@ -5,11 +5,11 @@ DESCRIPTION=Sphinx themes for Pallets and related projects
EAPI=7
HOMEPAGE=https://github.com/pallets/pallets-sphinx-themes
IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~x86
LICENSE=BSD
RDEPEND=dev-python/jinja[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/packaging[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=https://github.com/pallets/pallets-sphinx-themes/archive/1.1.2.tar.gz -> pallets-sphinx-themes-1.1.2.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=17383a8d337e818b49d09eaae693f2a1
+_md5_=c02bda3daa11a2a4b032479a3266afdc
diff --git a/metadata/md5-cache/dev-python/pyasn1-0.4.2 b/metadata/md5-cache/dev-python/pyasn1-0.4.2
index cf81be049a67..2a4d0cdb2c2e 100644
--- a/metadata/md5-cache/dev-python/pyasn1-0.4.2
+++ b/metadata/md5-cache/dev-python/pyasn1-0.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=ASN.1 library for Python
EAPI=6
HOMEPAGE=http://snmplabs.com/pyasn1/
IUSE=doc python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
LICENSE=BSD-2
RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/p/pyasn1/pyasn1-0.4.2.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=3e39d596972f81772a0cdf548bbbad90
+_md5_=23cbe8c3dea921f04ad7dbd5c36b3fa3
diff --git a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1 b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1
index 85ba85607724..f5d0a9336092 100644
--- a/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1
+++ b/metadata/md5-cache/dev-python/pyasn1-modules-0.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=pyasn1 modules
EAPI=6
HOMEPAGE=http://snmplabs.com/pyasn1/ https://github.com/etingof/pyasn1-modules/
IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux
LICENSE=BSD
RDEPEND=>=dev-python/pyasn1-0.4.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/p/pyasn1-modules/pyasn1-modules-0.2.1.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=131b3f6ffa8d860a6e9e5f941d61a5e3
+_md5_=62fc05984a93ecab598ae5aa08f39fbc
diff --git a/metadata/md5-cache/dev-python/pyliblzma-0.5.3-r1 b/metadata/md5-cache/dev-python/pyliblzma-0.5.3-r1
deleted file mode 100644
index 4ee863a7458d..000000000000
--- a/metadata/md5-cache/dev-python/pyliblzma-0.5.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/xz-utils virtual/pkgconfig dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python bindings for liblzma
-EAPI=5
-HOMEPAGE=https://launchpad.net/pyliblzma https://pypi.org/project/pyliblzma/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~ppc64 ~ppc ~x86
-LICENSE=LGPL-3
-RDEPEND=app-arch/xz-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyliblzma/pyliblzma-0.5.3.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=c2132d4a98e46d7fb2abf26aba9dc81c
diff --git a/metadata/md5-cache/dev-python/pysaml2-4.0.2-r3 b/metadata/md5-cache/dev-python/pysaml2-4.0.2-r3
deleted file mode 100644
index 1c03a6eb48c0..000000000000
--- a/metadata/md5-cache/dev-python/pysaml2-4.0.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Python implementation of SAML Version 2 to be used in a WSGI environment
-EAPI=6
-HOMEPAGE=https://github.com/rohe/pysaml2
-IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/repoze-who[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pycrypto-2.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pysaml2/pysaml2-4.0.2.tar.gz
-_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=f2ac4dcbe8812ca225488975b2cf823d
diff --git a/metadata/md5-cache/dev-python/python-caja-1.18.1 b/metadata/md5-cache/dev-python/python-caja-1.18.1
deleted file mode 100644
index c76788f33a7a..000000000000
--- a/metadata/md5-cache/dev-python/python-caja-1.18.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/glib:2 dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=mate-base/caja-1.17.1[introspection] x11-libs/gtk+:3 dev-util/gtk-doc dev-util/gtk-doc-am virtual/pkgconfig:* doc? ( app-text/docbook-xml-dtd:4.1.2 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=Python bindings for the Caja file manager
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/glib:2 dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=mate-base/caja-1.17.1[introspection] x11-libs/gtk+:3
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/python-caja-1.18.1.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=db37836a5c145c2810a29b181a30b913
diff --git a/metadata/md5-cache/dev-python/python-caja-1.22.0 b/metadata/md5-cache/dev-python/python-caja-1.22.0
index 47b16f813469..2bc32299d50f 100644
--- a/metadata/md5-cache/dev-python/python-caja-1.22.0
+++ b/metadata/md5-cache/dev-python/python-caja-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Python bindings for the Caja file manager
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
LICENSE=GPL-2
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/glib-2.50:2 dev-python/pygobject:3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=mate-base/caja-1.17.1[introspection] >=x11-libs/gtk+-3.22:3
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/python-caja-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=2ab06a89ebc3f1e34cfc951955cd5edd
+_md5_=0df66b3830f884b3d1f68842e716a937
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.1.0-r1 b/metadata/md5-cache/dev-python/python-ldap-3.1.0-r1
index ed0e219310cf..230f84b33183 100644
--- a/metadata/md5-cache/dev-python/python-ldap-3.1.0-r1
+++ b/metadata/md5-cache/dev-python/python-ldap-3.1.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Various LDAP-related Python modules
EAPI=7
HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/
IUSE=doc examples sasl ssl test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-solaris
LICENSE=PSF-2
RDEPEND=!dev-python/pyldap >=dev-python/pyasn1-0.3.7[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >net-nds/openldap-2.4.11:=[sasl?,ssl?] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/p/python-ldap/python-ldap-3.1.0.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=96dd580b75ff47166809afc12bfb3a94
+_md5_=7b7d68b50013913e4e69696711f804a5
diff --git a/metadata/md5-cache/dev-python/scandir-1.7 b/metadata/md5-cache/dev-python/scandir-1.10.0
similarity index 65%
rename from metadata/md5-cache/dev-python/scandir-1.7
rename to metadata/md5-cache/dev-python/scandir-1.10.0
index 7683da5f3637..4c426e160c53 100644
--- a/metadata/md5-cache/dev-python/scandir-1.7
+++ b/metadata/md5-cache/dev-python/scandir-1.10.0
@@ -1,14 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=A better directory iterator and faster os.walk()
-EAPI=6
+EAPI=7
HOMEPAGE=https://github.com/benhoyt/scandir
IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 arm arm64 ppc ppc64 x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD
RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
-SRC_URI=mirror://pypi/s/scandir/scandir-1.7.tar.gz
-_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=b32338c5471a404a2cc12d29f3d9be69
+SRC_URI=mirror://pypi/s/scandir/scandir-1.10.0.tar.gz
+_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=936fc96ee768dff8821e936fad5aa92c
diff --git a/metadata/md5-cache/dev-python/scandir-1.8 b/metadata/md5-cache/dev-python/scandir-1.8
deleted file mode 100644
index 9f500c06c44c..000000000000
--- a/metadata/md5-cache/dev-python/scandir-1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A better directory iterator and faster os.walk()
-EAPI=6
-HOMEPAGE=https://github.com/benhoyt/scandir
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/s/scandir/scandir-1.8.tar.gz
-_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=772b2089d6e0bf49af045c349abfe902
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.2.18 b/metadata/md5-cache/dev-python/sqlalchemy-1.2.18
index 88276c0c99ee..523ea74119bc 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.2.18
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.2.18
@@ -5,11 +5,11 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
EAPI=7
HOMEPAGE=http://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
IUSE=doc examples +sqlite test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
LICENSE=MIT
RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.2.18.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=26ac010eea13a8bd325c587a0c014274
+_md5_=f578559a3f769ce03dc396b6a3147745
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.12.0 b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.12.0
index 9352e36b31ad..e1fd224032f4 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.12.0
+++ b/metadata/md5-cache/dev-python/sqlalchemy-migrate-0.12.0
@@ -5,11 +5,11 @@ DESCRIPTION=SQLAlchemy Schema Migration Tools
EAPI=7
HOMEPAGE=https://pypi.org/project/sqlalchemy-migrate/
IUSE=doc python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86
LICENSE=MIT
RDEPEND=>=dev-python/sqlalchemy-0.9.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-sqlparse[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tempita-0.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/s/sqlalchemy-migrate/sqlalchemy-migrate-0.12.0.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=64a3cd6c97caeeb5477afdae1a8cc5b6
+_md5_=4253dfd9ad0a9210df01246ca424e8dd
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 6a5fe090eef6..2928c1f7736a 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.2 b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.2
index d8b2cf16005b..54d1383cc1d9 100644
--- a/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.2
+++ b/metadata/md5-cache/dev-ruby/ruby2ruby-2.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=Generates readable ruby from ParseTree
EAPI=6
HOMEPAGE=https://github.com/seattlerb/ruby2ruby
IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby23] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby23] !=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby24] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby24] !=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby25] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby25] !=dev-ruby/sexp_processor-4.6.0:4[ruby_targets_ruby26] >=dev-ruby/ruby_parser-3.1:3[ruby_targets_ruby26] !=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby23] !=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby24] !=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby25] !=dev-ruby/sexp_processor-4.9.0:4[ruby_targets_ruby26] !=dev-texlive/texlive-basic-2017 >=app-text/texlive-core-2017
SLOT=0
SRC_URI=mirror://gentoo/texlive-module-automata-2017.tar.xz mirror://gentoo/texlive-module-bbcard-2017.tar.xz mirror://gentoo/texlive-module-blockdraw_mp-2017.tar.xz mirror://gentoo/texlive-module-bpolynomial-2017.tar.xz mirror://gentoo/texlive-module-cmarrows-2017.tar.xz mirror://gentoo/texlive-module-drv-2017.tar.xz mirror://gentoo/texlive-module-dviincl-2017.tar.xz mirror://gentoo/texlive-module-emp-2017.tar.xz mirror://gentoo/texlive-module-epsincl-2017.tar.xz mirror://gentoo/texlive-module-expressg-2017.tar.xz mirror://gentoo/texlive-module-exteps-2017.tar.xz mirror://gentoo/texlive-module-featpost-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto-2017.tar.xz mirror://gentoo/texlive-module-garrigues-2017.tar.xz mirror://gentoo/texlive-module-gmp-2017.tar.xz mirror://gentoo/texlive-module-hatching-2017.tar.xz mirror://gentoo/texlive-module-latexmp-2017.tar.xz mirror://gentoo/texlive-module-mcf2graph-2017.tar.xz mirror://gentoo/texlive-module-metago-2017.tar.xz mirror://gentoo/texlive-module-metaobj-2017.tar.xz mirror://gentoo/texlive-module-metaplot-2017.tar.xz mirror://gentoo/texlive-module-metapost-2017.tar.xz mirror://gentoo/texlive-module-metauml-2017.tar.xz mirror://gentoo/texlive-module-mfpic-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode-2017.tar.xz mirror://gentoo/texlive-module-mp3d-2017.tar.xz mirror://gentoo/texlive-module-mparrows-2017.tar.xz mirror://gentoo/texlive-module-mpattern-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics-2017.tar.xz mirror://gentoo/texlive-module-mptrees-2017.tar.xz mirror://gentoo/texlive-module-piechartmp-2017.tar.xz mirror://gentoo/texlive-module-repere-2017.tar.xz mirror://gentoo/texlive-module-roex-2017.tar.xz mirror://gentoo/texlive-module-roundrect-2017.tar.xz mirror://gentoo/texlive-module-shapes-2017.tar.xz mirror://gentoo/texlive-module-slideshow-2017.tar.xz mirror://gentoo/texlive-module-splines-2017.tar.xz mirror://gentoo/texlive-module-suanpan-2017.tar.xz mirror://gentoo/texlive-module-textpath-2017.tar.xz mirror://gentoo/texlive-module-threeddice-2017.tar.xz mirror://gentoo/texlive-module-collection-metapost-2017.tar.xz doc? ( mirror://gentoo/texlive-module-automata.doc-2017.tar.xz mirror://gentoo/texlive-module-bbcard.doc-2017.tar.xz mirror://gentoo/texlive-module-blockdraw_mp.doc-2017.tar.xz mirror://gentoo/texlive-module-bpolynomial.doc-2017.tar.xz mirror://gentoo/texlive-module-cmarrows.doc-2017.tar.xz mirror://gentoo/texlive-module-drv.doc-2017.tar.xz mirror://gentoo/texlive-module-dviincl.doc-2017.tar.xz mirror://gentoo/texlive-module-emp.doc-2017.tar.xz mirror://gentoo/texlive-module-epsincl.doc-2017.tar.xz mirror://gentoo/texlive-module-expressg.doc-2017.tar.xz mirror://gentoo/texlive-module-exteps.doc-2017.tar.xz mirror://gentoo/texlive-module-featpost.doc-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto.doc-2017.tar.xz mirror://gentoo/texlive-module-garrigues.doc-2017.tar.xz mirror://gentoo/texlive-module-gmp.doc-2017.tar.xz mirror://gentoo/texlive-module-hatching.doc-2017.tar.xz mirror://gentoo/texlive-module-latexmp.doc-2017.tar.xz mirror://gentoo/texlive-module-mcf2graph.doc-2017.tar.xz mirror://gentoo/texlive-module-metago.doc-2017.tar.xz mirror://gentoo/texlive-module-metaobj.doc-2017.tar.xz mirror://gentoo/texlive-module-metaplot.doc-2017.tar.xz mirror://gentoo/texlive-module-metapost.doc-2017.tar.xz mirror://gentoo/texlive-module-metauml.doc-2017.tar.xz mirror://gentoo/texlive-module-mfpic.doc-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode.doc-2017.tar.xz mirror://gentoo/texlive-module-mp3d.doc-2017.tar.xz mirror://gentoo/texlive-module-mparrows.doc-2017.tar.xz mirror://gentoo/texlive-module-mpattern.doc-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames.doc-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics.doc-2017.tar.xz mirror://gentoo/texlive-module-mptrees.doc-2017.tar.xz mirror://gentoo/texlive-module-piechartmp.doc-2017.tar.xz mirror://gentoo/texlive-module-repere.doc-2017.tar.xz mirror://gentoo/texlive-module-roundrect.doc-2017.tar.xz mirror://gentoo/texlive-module-shapes.doc-2017.tar.xz mirror://gentoo/texlive-module-slideshow.doc-2017.tar.xz mirror://gentoo/texlive-module-splines.doc-2017.tar.xz mirror://gentoo/texlive-module-suanpan.doc-2017.tar.xz mirror://gentoo/texlive-module-textpath.doc-2017.tar.xz mirror://gentoo/texlive-module-threeddice.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-emp.source-2017.tar.xz mirror://gentoo/texlive-module-expressg.source-2017.tar.xz mirror://gentoo/texlive-module-feynmp-auto.source-2017.tar.xz mirror://gentoo/texlive-module-gmp.source-2017.tar.xz mirror://gentoo/texlive-module-mfpic.source-2017.tar.xz mirror://gentoo/texlive-module-mfpic4ode.source-2017.tar.xz mirror://gentoo/texlive-module-mpcolornames.source-2017.tar.xz mirror://gentoo/texlive-module-mpgraphics.source-2017.tar.xz mirror://gentoo/texlive-module-roex.source-2017.tar.xz mirror://gentoo/texlive-module-roundrect.source-2017.tar.xz mirror://gentoo/texlive-module-shapes.source-2017.tar.xz mirror://gentoo/texlive-module-splines.source-2017.tar.xz )
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 texlive-common 9a9339b2c296eb12e91ef1d8e9a4c6d3 texlive-module c6dd73e22a31d5054b9808ccb0779117 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=49a2dcea1b6709ffa0eae79d40b90249
+_md5_=a60c884b3351dc34c984df4f528049a5
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 799ef39ecdd2..44aa7c28b494 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/boost-build-1.70.0 b/metadata/md5-cache/dev-util/boost-build-1.70.0
new file mode 100644
index 000000000000..78c6766ca274
--- /dev/null
+++ b/metadata/md5-cache/dev-util/boost-build-1.70.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] )
+DESCRIPTION=A system for large project software construction, simple to use and powerful
+EAPI=7
+HOMEPAGE=https://boostorg.github.io/build/
+IUSE=examples python test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=Boost-1.0
+RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) !=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
REQUIRED_USE=python_targets_python2_7
+RESTRICT=strip
SLOT=0
SRC_URI=http://coccinelle.lip6.fr/distrib/coccinelle-1.0.5.tgz
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8a031fd88c63b44dc98000061e103fe6
+_md5_=9cfa32b7202043522acc271ea8fff11e
diff --git a/metadata/md5-cache/dev-util/coccinelle-1.0.6 b/metadata/md5-cache/dev-util/coccinelle-1.0.6
index 3775a23dc909..cef007be4390 100644
--- a/metadata/md5-cache/dev-util/coccinelle-1.0.6
+++ b/metadata/md5-cache/dev-util/coccinelle-1.0.6
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt(+)?] dev-ml/menhir:=[ocamlopt?] dev-ml/camlp4:=[ocamlopt?] dev-ml/parmap:=[ocamlopt?] emacs? ( virtual/emacs ) ocaml? ( dev-ml/findlib:= ) pcre? ( dev-ml/pcre-ocaml:=[ocamlopt(+)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
REQUIRED_USE=python_targets_python2_7
+RESTRICT=strip
SLOT=0
SRC_URI=http://coccinelle.lip6.fr/distrib/coccinelle-1.0.6.tgz
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5699c094bfb3dc2ba124479977373f21
+_md5_=bf2082a140b8ff9b12e76b6f1e113f93
diff --git a/metadata/md5-cache/dev-util/glslang-7.11.3113 b/metadata/md5-cache/dev-util/glslang-7.11.3113
new file mode 100644
index 000000000000..6718d2dc26f7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/glslang-7.11.3113
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator
+EAPI=6
+HOMEPAGE=https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/
+IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/glslang/archive/7.11.3113.tar.gz -> glslang-7.11.3113.tar.gz
+_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=23d20fe02e37dba9be0a72947a99d0f3
diff --git a/metadata/md5-cache/dev-util/meson-0.49.2 b/metadata/md5-cache/dev-util/meson-0.49.2
index d800b5f29e69..b0af306018af 100644
--- a/metadata/md5-cache/dev-util/meson-0.49.2
+++ b/metadata/md5-cache/dev-util/meson-0.49.2
@@ -4,7 +4,7 @@ DESCRIPTION=Open source build system
EAPI=6
HOMEPAGE=http://mesonbuild.com/
IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
LICENSE=Apache-2.0
RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/m/meson/meson-0.49.2.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=a28ac9ec5287ceb5c03798f39ce86216
+_md5_=64f2cdbc178e427017979207e746ecec
diff --git a/metadata/md5-cache/dev-util/netsurf-buildsystem-1.7-r1 b/metadata/md5-cache/dev-util/netsurf-buildsystem-1.7-r1
index 7386a9142d88..af356bfac249 100644
--- a/metadata/md5-cache/dev-util/netsurf-buildsystem-1.7-r1
+++ b/metadata/md5-cache/dev-util/netsurf-buildsystem-1.7-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Build system used for netsurf and its libs
EAPI=7
HOMEPAGE=https://www.netsurf-browser.org
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~m68k-mint
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~m68k-mint
LICENSE=MIT
SLOT=0
SRC_URI=https://download.netsurf-browser.org/libs/releases/buildsystem-1.7.tar.gz
-_md5_=8b3c2cc983ce05977933f1d4e217d8d6
+_md5_=fad204967a0990870b049976cd24289a
diff --git a/metadata/md5-cache/dev-util/staruml-bin-2.8.1 b/metadata/md5-cache/dev-util/staruml-bin-2.8.1
deleted file mode 100644
index ec40e1111cfb..000000000000
--- a/metadata/md5-cache/dev-util/staruml-bin-2.8.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=A sophisticated software modeler
-EAPI=6
-HOMEPAGE=http://staruml.io/
-KEYWORDS=~amd64 ~x86
-LICENSE=StarUML-EULA
-RDEPEND=dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libgcrypt:11 dev-libs/nss dev-libs/nspr gnome-base/gconf media-libs/fontconfig media-libs/freetype media-libs/alsa-lib net-print/cups x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libX11 x11-libs/pango virtual/libudev
-RESTRICT=bindist mirror splitdebug
-SLOT=0
-SRC_URI=amd64? ( http://staruml.io/download/release/v2.8.1/StarUML-v2.8.1-64-bit.deb ) x86? ( http://staruml.io/download/release/v2.8.1/StarUML-v2.8.1-32-bit.deb )
-_eclasses_=unpacker 3cd8bad0d31e525cd26be1bfa4e61631
-_md5_=f88703aaea0c8ba5f68dceb137f9216d
diff --git a/metadata/md5-cache/dev-util/trinity-1.8 b/metadata/md5-cache/dev-util/trinity-1.9
similarity index 51%
rename from metadata/md5-cache/dev-util/trinity-1.8
rename to metadata/md5-cache/dev-util/trinity-1.9
index 82b2352dfbdc..e190a50e6e68 100644
--- a/metadata/md5-cache/dev-util/trinity-1.8
+++ b/metadata/md5-cache/dev-util/trinity-1.9
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile configure install
+DEFINED_PHASES=compile install prepare
DEPEND=>=sys-kernel/linux-headers-4.8
DESCRIPTION=A Linux system call fuzz tester
EAPI=7
-HOMEPAGE=http://codemonkey.org.uk/projects/trinity/
+HOMEPAGE=http://codemonkey.org.uk/projects/trinity/ https://github.com/kernelslacker/trinity/
IUSE=examples
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
SLOT=0
-SRC_URI=http://codemonkey.org.uk/projects/trinity/trinity-1.8.tar.xz
+SRC_URI=http://codemonkey.org.uk/projects/trinity/trinity-1.9.tar.xz
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=8755f434e4b58a102a01afe1f9372e49
+_md5_=6d7454f965f62536408f1514badedbe7
diff --git a/metadata/md5-cache/dev-util/trinity-9999 b/metadata/md5-cache/dev-util/trinity-9999
index f57341649e91..d2c882eb186f 100644
--- a/metadata/md5-cache/dev-util/trinity-9999
+++ b/metadata/md5-cache/dev-util/trinity-9999
@@ -1,6 +1,6 @@
BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile install prepare unpack
-DEPEND=sys-kernel/linux-headers
+DEPEND=>=sys-kernel/linux-headers-4.8
DESCRIPTION=A Linux system call fuzz tester
EAPI=7
HOMEPAGE=http://codemonkey.org.uk/projects/trinity/ https://github.com/kernelslacker/trinity/
@@ -8,4 +8,4 @@ IUSE=examples
LICENSE=GPL-2
SLOT=0
_eclasses_=git-r3 0d4635eeb5a96cd5315597a47eba25c9 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=21d5d2e0a3642e4be74c0cde55ed7f5a
+_md5_=478679b7d8b191aaa9b5f4f00a16e763
diff --git a/metadata/md5-cache/dev-util/igprof-5.9.11 b/metadata/md5-cache/dev-util/vulkan-headers-1.1.106
similarity index 64%
rename from metadata/md5-cache/dev-util/igprof-5.9.11
rename to metadata/md5-cache/dev-util/vulkan-headers-1.1.106
index 51ef557a4ac5..f59cf35c7b5f 100644
--- a/metadata/md5-cache/dev-util/igprof-5.9.11
+++ b/metadata/md5-cache/dev-util/vulkan-headers-1.1.106
@@ -1,13 +1,11 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libpcre sys-libs/libunwind sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Ignominous Profiler for analysing application memory and performance
-EAPI=5
-HOMEPAGE=http://igprof.org
-IUSE=debug
+DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Vulkan Header files and API registry
+EAPI=6
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Headers
KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libpcre sys-libs/libunwind
+LICENSE=Apache-2.0
SLOT=0
-SRC_URI=https://github.com/ktf/igprof/archive/v5.9.11.tar.gz -> igprof-5.9.11.tar.gz
+SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/08cbb5458f692d4778806775f65eb3dc642ddbbf.tar.gz -> vulkan-headers-1.1.106.tar.gz
_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=a7ba20399daffa91067452579381dba6
+_md5_=89e8dbf2f21bf1971f74b20bcd776678
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-1.1.106 b/metadata/md5-cache/dev-util/vulkan-tools-1.1.106
new file mode 100644
index 000000000000..539252727c11
--- /dev/null
+++ b/metadata/md5-cache/dev-util/vulkan-tools-1.1.106
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 ) cube? ( dev-util/glslang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/vulkan-headers-1.1.106 media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS
+EAPI=6
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
+IUSE=+cube +vulkaninfo X wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+REQUIRED_USE=|| ( X wayland ) vulkaninfo? ( X )
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/2abb69904b9ad017d39d3da1e7fc3dec1a584cd8.tar.gz -> vulkan-tools-1.1.106.tar.gz
+_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=00f45375cddf7996cb841f5a43b6286f
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-9999 b/metadata/md5-cache/dev-util/vulkan-tools-9999
index 0c37b364231c..95c7b9c7889b 100644
--- a/metadata/md5-cache/dev-util/vulkan-tools-9999
+++ b/metadata/md5-cache/dev-util/vulkan-tools-9999
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 ) cube? ( dev-util/glslang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/vulkan-headers-1.1.101 media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 ) cube? ( dev-util/glslang:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-util/vulkan-headers-1.1.106 media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,wayland?,X?] wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS
EAPI=6
HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
REQUIRED_USE=|| ( X wayland ) vulkaninfo? ( X )
SLOT=0
_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf git-r3 0d4635eeb5a96cd5315597a47eba25c9 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=7e2d76edbcde1d9f8e086d3e1b6af7d2
+_md5_=c4af53730dba5d54ad4b598a109bcd8e
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index a7de0e32464e..ee0885cc54a1 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/hub-2.11.1 b/metadata/md5-cache/dev-vcs/hub-2.11.1
new file mode 100644
index 000000000000..94943566f392
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/hub-2.11.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=>=dev-lang/go-1.5.1:=
+DESCRIPTION=Command-line wrapper for git that makes you better at GitHub
+EAPI=7
+HOMEPAGE=https://github.com/github/hub
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-vcs/git-1.7.3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/github/hub/archive/v2.11.1.tar.gz -> hub-2.11.1.tar.gz https://github.com/github/hub/releases/download/v2.11.1/hub-linux-amd64-2.11.1.tgz
+_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=638a5fce417e86ba5e95899205bc6f88
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.11.1 b/metadata/md5-cache/dev-vcs/subversion-1.11.1
index e527f8b386ea..e786112f59d7 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.11.1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Advanced version control system
EAPI=6
HOMEPAGE=https://subversion.apache.org/
IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=Subversion GPL-2
RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
SLOT=0
SRC_URI=mirror://apache/subversion/subversion-1.11.1.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 bash-completion-r1 47a7402d95930413ce25ba8d857339bb db-use 501a5d0963e0d17f30260023f292ae8e depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-single e6530f43a549f120f9396ccb852288f5 ruby-utils 10cec86289e60f4b0d731b2e4b545e5d toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=4dfbadbf28d795a6babc1cb01337e87a
+_md5_=6f4aad533df2ce77f93399dc97b63cc5
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index cf214f3d4d26..68f614dea5d7 100644
Binary files a/metadata/md5-cache/games-arcade/Manifest.gz and b/metadata/md5-cache/games-arcade/Manifest.gz differ
diff --git a/metadata/md5-cache/games-arcade/commandergenius-1.8.3 b/metadata/md5-cache/games-arcade/commandergenius-1.8.3
deleted file mode 100644
index 497c549f0010..000000000000
--- a/metadata/md5-cache/games-arcade/commandergenius-1.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=media-libs/libsdl2[X,opengl?,sound,video] media-libs/sdl2-image opengl? ( virtual/opengl ) tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) dev-libs/boost virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Open Source Commander Keen clone (needs original game files)
-EAPI=5
-HOMEPAGE=http://clonekeenplus.sourceforge.net
-IUSE=opengl tremor
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/libsdl2[X,opengl?,sound,video] media-libs/sdl2-image opengl? ( virtual/opengl ) tremor? ( media-libs/tremor ) !tremor? ( media-libs/libvorbis ) games-misc/games-envd
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://github.com/gerstrong/Commander-Genius/archive/v183release.tar.gz -> commandergenius-1.8.3.tar.gz
-_eclasses_=base 2ec5c64f5de125f0c65a927c4c128fef cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf games be6b136152d095d3e15031e2c725eb3f ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=23f052c8f78301470e9d8b09cbd31950
diff --git a/metadata/md5-cache/games-arcade/commandergenius-2.3.3 b/metadata/md5-cache/games-arcade/commandergenius-2.3.3
new file mode 100644
index 000000000000..00ae18d9a8a9
--- /dev/null
+++ b/metadata/md5-cache/games-arcade/commandergenius-2.3.3
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=media-libs/libsdl2[opengl?,video] media-libs/sdl2-image media-libs/sdl2-mixer[vorbis] sys-libs/zlib[minizip] downloader? ( net-misc/curl ) opengl? ( virtual/opengl ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) dev-libs/boost
+DESCRIPTION=Open Source Commander Keen clone (needs original game files)
+EAPI=7
+HOMEPAGE=http://clonekeenplus.sourceforge.net
+IUSE=+downloader opengl +python python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsdl2[opengl?,video] media-libs/sdl2-image media-libs/sdl2-mixer[vorbis] sys-libs/zlib[minizip] downloader? ( net-misc/curl ) opengl? ( virtual/opengl ) python? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://gitlab.com/Dringgstein/Commander-Genius/-/archive/v2.3.3/Commander-Genius-v2.3.3.tar.bz2
+_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=63d62657aba4b8dd8afa2f1d2ae25b35
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index 41ea1e00eab6..b0b9d755bf65 100644
Binary files a/metadata/md5-cache/games-board/Manifest.gz and b/metadata/md5-cache/games-board/Manifest.gz differ
diff --git a/metadata/md5-cache/games-board/gnome-mines-3.30.1.1 b/metadata/md5-cache/games-board/gnome-mines-3.30.1.1
index d4c9eaf1bf27..f3a45cb9b3d7 100644
--- a/metadata/md5-cache/games-board/gnome-mines-3.30.1.1
+++ b/metadata/md5-cache/games-board/gnome-mines-3.30.1.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8 >=x11-libs/gtk+-3.12:3 dev-lib
DESCRIPTION=Clear hidden mines from a minefield
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Apps/Mines
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=GPL-3+ CC-BY-SA-3.0
RDEPEND=>=dev-libs/glib-2.40:2 dev-libs/libgee:0.8 >=x11-libs/gtk+-3.12:3 dev-libs/libgnome-games-support:1= >=gnome-base/librsvg-2.32.0:2
SLOT=0
SRC_URI=mirror://gnome/sources/gnome-mines/3.30/gnome-mines-3.30.1.1.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2-utils 532371cfcba45b2ab0d2950547c97d95 ltprune 2729691420b6deeda2a90b1f1183fb55 meson e53acc5913e5581a8a71be22731d8f36 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vala a94a0fb4c35fe91774bb72ec8f3c861f vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=a590af90869bd22f10cd5369b4f157e8
+_md5_=53d47aea3a3e152f9b49b5f34d3f03cb
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 1e67e58b8aec..c22bdb9720f4 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/scummvm-2.0.0 b/metadata/md5-cache/games-engines/scummvm-2.0.0
deleted file mode 100644
index f199ac15e359..000000000000
--- a/metadata/md5-cache/games-engines/scummvm-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] zlib? ( sys-libs/zlib ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) theora? ( media-libs/libtheora ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) flac? ( media-libs/flac ) opengl? ( virtual/opengl ) truetype? ( media-libs/freetype:2 ) fluidsynth? ( media-sound/fluidsynth ) app-arch/xz-utils truetype? ( virtual/pkgconfig ) x86? ( dev-lang/nasm )
-DESCRIPTION=Reimplementation of the SCUMM game engine used in Lucasarts adventures
-EAPI=6
-HOMEPAGE=http://scummvm.sourceforge.net/
-IUSE=aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype unsupported vorbis zlib
-KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception
-RDEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] zlib? ( sys-libs/zlib ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) theora? ( media-libs/libtheora ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) flac? ( media-libs/flac ) opengl? ( virtual/opengl ) truetype? ( media-libs/freetype:2 ) fluidsynth? ( media-sound/fluidsynth )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://scummvm.org/frs/scummvm/2.0.0/scummvm-2.0.0.tar.xz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf gnome2-utils 532371cfcba45b2ab0d2950547c97d95 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=77d778d47f4f99317578b32dc57d9de7
diff --git a/metadata/md5-cache/games-engines/scummvm-2.0.0-r1 b/metadata/md5-cache/games-engines/scummvm-2.0.0-r1
index edbe9e550df1..a23868b07f69 100644
--- a/metadata/md5-cache/games-engines/scummvm-2.0.0-r1
+++ b/metadata/md5-cache/games-engines/scummvm-2.0.0-r1
@@ -3,13 +3,13 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
DEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] zlib? ( sys-libs/zlib:= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) theora? ( media-libs/libtheora ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) flac? ( media-libs/flac ) opengl? ( virtual/opengl ) truetype? ( media-libs/freetype:2 ) fluidsynth? ( media-sound/fluidsynth ) dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Reimplementation of the SCUMM game engine used in Lucasarts adventures
EAPI=7
-HOMEPAGE=http://scummvm.sourceforge.net/
+HOMEPAGE=https://www.scummvm.org/
IUSE=aac alsa debug flac fluidsynth jpeg mpeg2 mp3 opengl png theora truetype unsupported vorbis zlib
KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
LICENSE=GPL-2+ LGPL-2.1 BSD GPL-3-with-font-exception
RDEPEND=>=media-libs/libsdl2-2.0.0[sound,joystick,video] zlib? ( sys-libs/zlib:= ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) theora? ( media-libs/libtheora ) aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) mp3? ( media-libs/libmad ) mpeg2? ( media-libs/libmpeg2 ) flac? ( media-libs/flac ) opengl? ( virtual/opengl ) truetype? ( media-libs/freetype:2 ) fluidsynth? ( media-sound/fluidsynth )
RESTRICT=test
SLOT=0
-SRC_URI=http://scummvm.org/frs/scummvm/2.0.0/scummvm-2.0.0.tar.xz
+SRC_URI=https://scummvm.org/frs/scummvm/2.0.0/scummvm-2.0.0.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=ac256b8215a8423e51b789e39b382aa2
+_md5_=a298e478292e484e772824171845f4b5
diff --git a/metadata/md5-cache/games-mud/Manifest.gz b/metadata/md5-cache/games-mud/Manifest.gz
index c46cd0932b27..af7b20aa0c0c 100644
Binary files a/metadata/md5-cache/games-mud/Manifest.gz and b/metadata/md5-cache/games-mud/Manifest.gz differ
diff --git a/metadata/md5-cache/games-mud/circlemud-3.1 b/metadata/md5-cache/games-mud/circlemud-3.1
index 2ab80e686ba6..00a44340127d 100644
--- a/metadata/md5-cache/games-mud/circlemud-3.1
+++ b/metadata/md5-cache/games-mud/circlemud-3.1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
DEPEND=dev-libs/openssl:0=
DESCRIPTION=a multi-user dungeon game system server
EAPI=5
-HOMEPAGE=http://www.circlemud.org/
+HOMEPAGE=https://www.circlemud.org/
KEYWORDS=~amd64 ~x86
LICENSE=circlemud
RDEPEND=dev-libs/openssl:0= games-misc/games-envd
SLOT=0
-SRC_URI=http://www.circlemud.org/pub/CircleMUD/3.x/circle-3.1.tar.bz2
+SRC_URI=https://www.circlemud.org/pub/CircleMUD/3.x/circle-3.1.tar.bz2
_eclasses_=base 2ec5c64f5de125f0c65a927c4c128fef desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 games be6b136152d095d3e15031e2c725eb3f ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=138159cc4bf6fe5b176fccdbdcef80d4
+_md5_=4fa4a877750965dcc13f959c8c4f03f9
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index ac71eb006a19..966264443a2e 100644
Binary files a/metadata/md5-cache/games-puzzle/Manifest.gz and b/metadata/md5-cache/games-puzzle/Manifest.gz differ
diff --git a/metadata/md5-cache/games-puzzle/pingus-0.7.6-r1 b/metadata/md5-cache/games-puzzle/pingus-0.7.6-r1
deleted file mode 100644
index 7932b4afc55a..000000000000
--- a/metadata/md5-cache/games-puzzle/pingus-0.7.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND=media-libs/libsdl[joystick,opengl?,video] media-libs/sdl-image[png] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) opengl? ( virtual/opengl ) media-libs/libpng:0= dev-libs/boost:= virtual/pkgconfig dev-util/scons[python_targets_python2_7]
-DESCRIPTION=free Lemmings clone
-EAPI=6
-HOMEPAGE=https://pingus.seul.org
-IUSE=opengl music
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/libsdl[joystick,opengl?,video] media-libs/sdl-image[png] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) opengl? ( virtual/opengl ) media-libs/libpng:0= dev-libs/boost:=
-SLOT=0
-SRC_URI=https://pingus.googlecode.com/files/pingus-0.7.6.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 scons-utils 741000d14c0b59263aac3f3cf6e39909 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=89179850ecbbacbeb05ba54e67934123
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index b9747d61199f..dddf6dd232e1 100644
Binary files a/metadata/md5-cache/games-roguelike/Manifest.gz and b/metadata/md5-cache/games-roguelike/Manifest.gz differ
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.22.0 b/metadata/md5-cache/games-roguelike/stone-soup-0.22.0
deleted file mode 100644
index e33c7035b54e..000000000000
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.22.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl ) dev-lang/perl sys-devel/flex virtual/pkgconfig virtual/yacc tiles? ( sys-libs/ncurses:0 )
-DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
-EAPI=6
-HOMEPAGE=http://crawl.develz.org/wordpress/
-IUSE=debug luajit ncurses test +tiles
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
-RDEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://crawl.develz.org/release/0.22/stone_soup-0.22.0.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=2d32d3eb1ffb509ab47b40af0da777b9
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.23.2 b/metadata/md5-cache/games-roguelike/stone-soup-0.23.2
new file mode 100644
index 000000000000..b5ccd42bc319
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.23.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm setup
+DEPEND=dev-db/sqlite:3 =dev-lang/lua-5.1*:0= sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl ) dev-lang/perl dev-python/pyyaml sys-devel/flex tiles? ( sys-libs/ncurses:0 ) virtual/pkgconfig virtual/yacc
+DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
+EAPI=7
+HOMEPAGE=http://crawl.develz.org/wordpress/
+IUSE=debug ncurses sound test +tiles
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
+RDEPEND=dev-db/sqlite:3 =dev-lang/lua-5.1*:0= sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 sound? ( media-libs/libsdl2[X,opengl,sound,video] media-libs/sdl2-mixer ) !sound? ( media-libs/libsdl2[X,opengl,video] ) media-libs/sdl2-image[png] virtual/glu virtual/opengl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://crawl.develz.org/release/0.23/stone_soup-0.23.2.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eutils 6e6c2737b59a4b982de6fb3ecefd87f8 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=027445217cbdbc10e6052b9d76ebf772
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index a46dfeeed186..63e2c20c9696 100644
Binary files a/metadata/md5-cache/games-rpg/Manifest.gz and b/metadata/md5-cache/games-rpg/Manifest.gz differ
diff --git a/metadata/md5-cache/games-rpg/wastesedge-0.3.5-r1 b/metadata/md5-cache/games-rpg/wastesedge-0.3.5-r1
index 7ba997d1f0e9..60519efacd03 100644
--- a/metadata/md5-cache/games-rpg/wastesedge-0.3.5-r1
+++ b/metadata/md5-cache/games-rpg/wastesedge-0.3.5-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install setup
DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=games-rpg/adonthell-0.3.5-r2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] nls? ( virtual/libintl ) nls? ( sys-devel/gettext )
DESCRIPTION=role playing game to showcase the adonthell engine
EAPI=6
-HOMEPAGE=http://adonthell.linuxgames.com/
+HOMEPAGE=http://adonthell.nongnu.org/download/
IUSE=nls python_targets_python2_7
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -12,4 +12,4 @@ RESTRICT=userpriv
SLOT=0
SRC_URI=https://savannah.nongnu.org/download/adonthell/wastesedge-src-0.3.5.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4958f7b5f934a283ae2eeb3e487a0689
+_md5_=a3390aec220ecadebb29bf7bb19d6280
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index d7e2b04fe32f..6c5b23cefa39 100644
Binary files a/metadata/md5-cache/games-strategy/Manifest.gz and b/metadata/md5-cache/games-strategy/Manifest.gz differ
diff --git a/metadata/md5-cache/games-strategy/freecol-0.11.6 b/metadata/md5-cache/games-strategy/freecol-0.11.6
deleted file mode 100644
index b7708c5ae64b..000000000000
--- a/metadata/md5-cache/games-strategy/freecol-0.11.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=virtual/jdk-1.8 app-arch/unzip dev-java/jsr173 dev-java/wstx:3.2 dev-java/commons-cli:1 dev-java/cortado dev-java/miglayout >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=An open source clone of the game Colonization
-EAPI=5
-HOMEPAGE=http://www.freecol.org/
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=>=virtual/jre-1.8 dev-java/jsr173 dev-java/wstx:3.2 dev-java/commons-cli:1 dev-java/cortado dev-java/miglayout >=dev-java/java-config-2.2.0-r3 games-misc/games-envd
-SLOT=0
-SRC_URI=mirror://sourceforge/freecol/freecol-0.11.6-src.zip
-_eclasses_=base 2ec5c64f5de125f0c65a927c4c128fef desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 games be6b136152d095d3e15031e2c725eb3f java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=25e048e64cca192c37301c3c19802b42
diff --git a/metadata/md5-cache/games-strategy/freecol-0.11.6-r1 b/metadata/md5-cache/games-strategy/freecol-0.11.6-r1
new file mode 100644
index 000000000000..fbd60d2cdfda
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/freecol-0.11.6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 app-arch/unzip dev-java/commons-cli:1 dev-java/cortado:0 dev-java/miglayout:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=An open source clone of the game Colonization
+EAPI=7
+HOMEPAGE=http://www.freecol.org/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=virtual/jre-1.8 dev-java/commons-cli:1 dev-java/cortado:0 dev-java/miglayout:0 >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=mirror://sourceforge/freecol/freecol-0.11.6-src.zip
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d java-ant-2 6505e8068920164179b7e3926220c89f java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 dd352559d0e143500ec878acc74da909 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=3c30e10550a74e31fbb27d1bcc40c282
diff --git a/metadata/md5-cache/games-strategy/wesnoth-1.14.5 b/metadata/md5-cache/games-strategy/wesnoth-1.14.5
deleted file mode 100644
index 729b4450da76..000000000000
--- a/metadata/md5-cache/games-strategy/wesnoth-1.14.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) ) sys-devel/gettext virtual/pkgconfig x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Battle for Wesnoth - A fantasy turn-based strategy game
-EAPI=6
-HOMEPAGE=http://www.wesnoth.org https://github.com/wesnoth/wesnoth
-IUSE=dbus dedicated doc fribidi libressl nls openmp server
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/boost-1.50:=[nls,threads,icu] >=media-libs/libsdl2-2.0.4:0[joystick,video,X] !dedicated? ( dev-libs/glib:2 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=media-libs/fontconfig-2.4.1 >=media-libs/sdl2-image-2.0.0[jpeg,png] >=media-libs/sdl2-mixer-2.0.0[vorbis] >=media-libs/sdl2-ttf-2.0.12 media-libs/libvorbis >=x11-libs/pango-1.22.0 >=x11-libs/cairo-1.10.0 sys-libs/readline:0= dbus? ( sys-apps/dbus ) fribidi? ( dev-libs/fribidi ) )
-SLOT=0
-SRC_URI=https://github.com/wesnoth/wesnoth/archive/1.14.5.tar.gz -> wesnoth-1.14.5.tar.gz
-_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=47e11e035f05af713d0b2953adec06f1
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 3a0110b6cf8d..1ce6a2e427b3 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-22-r1 b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-22-r1
new file mode 100644
index 000000000000..1135a3192135
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/gnome-shell-extensions-topicons-plus-22-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst unpack
+DEPEND=dev-libs/glib:2
+DESCRIPTION=Moves legacy tray icons to top panel
+EAPI=6
+HOMEPAGE=https://extensions.gnome.org/extension/1031/topicons/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-libs/glib:2 app-eselect/eselect-gnome-shell-extensions >=gnome-base/gnome-shell-3.16
+SLOT=0
+SRC_URI=https://github.com/phocean/TopIcons-plus/archive/v22.tar.gz -> gnome-shell-extensions-topicons-plus-22.tar.gz
+_eclasses_=vcs-snapshot b77011b62e2053c646ad720defe6d921
+_md5_=b4ab1420afbc8161c4abfb7ce4256a6c
diff --git a/metadata/md5-cache/gnome-extra/pch-session-3.30.0 b/metadata/md5-cache/gnome-extra/pch-session-3.30.0.1
similarity index 95%
rename from metadata/md5-cache/gnome-extra/pch-session-3.30.0
rename to metadata/md5-cache/gnome-extra/pch-session-3.30.0.1
index ae91c284c4d6..b8032bf8ece6 100644
--- a/metadata/md5-cache/gnome-extra/pch-session-3.30.0
+++ b/metadata/md5-cache/gnome-extra/pch-session-3.30.0.1
@@ -6,6 +6,6 @@ KEYWORDS=~amd64
LICENSE=GPL-2
RDEPEND=>=gnome-base/gnome-shell-3.30 gnome-extra/gnome-shell-extensions gnome-extra/gnome-shell-extension-dash-to-panel gnome-extra/gnome-shell-extension-desktop-icons gnome-extra/gnome-shell-extension-gsconnect gnome-extra/gnome-shell-extensions-topicons-plus
SLOT=0
-SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/3.30.0/pch-session-3.30.0.tar.bz2
+SRC_URI=https://gitlab.com/pachoramos/pch-session/-/archive/3.30.0.1/pch-session-3.30.0.1.tar.bz2
_eclasses_=gnome2-utils 532371cfcba45b2ab0d2950547c97d95 xdg-utils 14d00d009167652b1fa363e55effe213
_md5_=25ce6feabad90b7e705c42e708c95de1
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index 037348155bbc..593c509b3643 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2 b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2
index 81eb16b2c079..62c154bc57ee 100644
--- a/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2
+++ b/metadata/md5-cache/mail-filter/opendmarc-1.3.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Open source DMARC implementation
EAPI=6
HOMEPAGE=http://www.trusteddomain.org/opendmarc/
IUSE=spf +reports static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd
LICENSE=BSD
RDEPEND=reports? ( dev-perl/DBI ) || ( mail-filter/libmilter mail-mta/sendmail ) reports? ( dev-perl/DBD-mysql dev-perl/HTTP-Message dev-perl/Switch ) spf? ( mail-filter/libspf2 )
SLOT=0
SRC_URI=mirror://sourceforge/opendmarc/opendmarc-1.3.2.tar.gz
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073
-_md5_=12a675264fa735896dbd6b1942488a3d
+_md5_=fbac0b70801abec13699d118615cbda2
diff --git a/metadata/md5-cache/mate-base/Manifest.gz b/metadata/md5-cache/mate-base/Manifest.gz
index 3ab23a2a73e1..ffead2e1cc73 100644
Binary files a/metadata/md5-cache/mate-base/Manifest.gz and b/metadata/md5-cache/mate-base/Manifest.gz differ
diff --git a/metadata/md5-cache/mate-base/caja-1.18.5 b/metadata/md5-cache/mate-base/caja-1.18.5
deleted file mode 100644
index 6cef568d78ed..000000000000
--- a/metadata/md5-cache/mate-base/caja-1.18.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf:0 >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.17.0:0 >=media-libs/libexif-0.6.14:0 virtual/libintl:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/libnotify-0.7.0:0 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!mate-base/mate-file-manager >=dev-lang/perl-5:0= dev-util/gdbus-codegen:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.40.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Caja file manager for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+introspection +mate packagekit xmp test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-PDEPEND=mate? ( >=x11-themes/mate-icon-theme-1.18 )
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf:0 >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.17.0:0 >=media-libs/libexif-0.6.14:0 virtual/libintl:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/libnotify-0.7.0:0 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!mate-base/mate-file-manager
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/caja-1.18.5.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=fb73d59ae1a5e1a5403f2951d6b072eb
diff --git a/metadata/md5-cache/mate-base/caja-1.22.0 b/metadata/md5-cache/mate-base/caja-1.22.0
index 0e2e61d652c6..a8c187a358f8 100644
--- a/metadata/md5-cache/mate-base/caja-1.22.0
+++ b/metadata/md5-cache/mate-base/caja-1.22.0
@@ -4,7 +4,7 @@ DESCRIPTION=Caja file manager for the MATE desktop
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=+introspection +mate packagekit xmp test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2 LGPL-2 FDL-1.1
PDEPEND=mate? ( >=x11-themes/mate-icon-theme-1.22 )
RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.17.3:0 >=media-libs/libexif-0.6.14:0 virtual/libintl x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3[introspection?] >=x11-libs/libnotify-0.7.0:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender >=x11-libs/pango-1.1.2 introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!mate-base/mate-file-manager
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/caja-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=3a8eba205d4b0eaae85ea49fa20592b6
+_md5_=0786870f02333f237a3c865539b02d8b
diff --git a/metadata/md5-cache/mate-base/libmatekbd-1.22.0 b/metadata/md5-cache/mate-base/libmatekbd-1.22.0
index e872a0e31d1e..2de95b18cf95 100644
--- a/metadata/md5-cache/mate-base/libmatekbd-1.22.0
+++ b/metadata/md5-cache/mate-base/libmatekbd-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=MATE keyboard configuration library
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=X +introspection test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=LGPL-2
RDEPEND=>=dev-libs/glib-2.50:2 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.24:2 x11-libs/libX11 >=x11-libs/libxklavier-5.2:0[introspection?] x11-libs/pango virtual/libintl >=x11-libs/gtk+-3.22:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/libmatekbd-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=588e81e611df61860ed3d9a5ed91052f
+_md5_=cab9936196737aa21031338d37c17d8b
diff --git a/metadata/md5-cache/mate-base/mate-1.18 b/metadata/md5-cache/mate-base/mate-1.18
deleted file mode 100644
index 4373f7d3eb5e..000000000000
--- a/metadata/md5-cache/mate-base/mate-1.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst
-DESCRIPTION=Meta ebuild for MATE, a traditional desktop environment
-EAPI=6
-HOMEPAGE=http://mate-desktop.org
-IUSE=+base -bluetooth help +notification +themes +extras
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=metapackage
-PDEPEND=notification? ( =x11-misc/mate-notification-daemon-1.18*:0 ) virtual/notification-daemon:0
-RDEPEND==mate-base/mate-desktop-1.18*:0 =mate-base/mate-menus-1.18*:0 =mate-base/mate-panel-1.18*:0 =mate-base/mate-session-manager-1.18*:0 =mate-base/mate-settings-daemon-1.18*:0 =x11-wm/marco-1.18*:0 base? ( =mate-base/caja-1.18*:0 =mate-base/mate-applets-meta-1.18*:0 =mate-base/mate-control-center-1.18*:0 =mate-extra/mate-media-1.18*:0 =x11-misc/mozo-1.18*:0 =x11-terms/mate-terminal-1.18*:0 ) bluetooth? ( net-wireless/blueman:0 ) themes? ( =x11-themes/mate-backgrounds-1.18*:0 =x11-themes/mate-icon-theme-1.18*:0 >=x11-themes/mate-themes-meta-3:0 ) extras? ( =app-arch/engrampa-1.18*:0 =app-editors/pluma-1.18*:0 =app-text/atril-1.18*:0 =mate-extra/caja-extensions-1.18*:0 =mate-extra/mate-calc-1.18*:0 =mate-extra/mate-netbook-1.18*:0 =mate-extra/mate-power-manager-1.18*:0 =mate-extra/mate-screensaver-1.18*:0 =mate-extra/mate-system-monitor-1.18*:0 =mate-extra/mate-utils-1.18*:0 =media-gfx/eom-1.18*:0 sys-apps/gnome-disk-utility:0 ) help? ( gnome-extra/yelp:0 =mate-extra/mate-user-guide-1.18*:0 )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f versionator 2352c3fc97241f6a02042773c8287748
-_md5_=71dcd430f6e7054319bb7336f64b862f
diff --git a/metadata/md5-cache/mate-base/mate-1.22 b/metadata/md5-cache/mate-base/mate-1.22
index 359a47076a70..e12b65b038c8 100644
--- a/metadata/md5-cache/mate-base/mate-1.22
+++ b/metadata/md5-cache/mate-base/mate-1.22
@@ -3,10 +3,10 @@ DESCRIPTION=Meta ebuild for MATE, a traditional desktop environment
EAPI=6
HOMEPAGE=http://mate-desktop.org
IUSE=+base -bluetooth help +notification +themes +extras
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=metapackage
PDEPEND=notification? ( =x11-misc/mate-notification-daemon-1.22* ) virtual/notification-daemon:0
RDEPEND==mate-base/mate-desktop-1.22* =mate-base/mate-menus-1.22* =mate-base/mate-panel-1.22* =mate-base/mate-session-manager-1.22* =mate-base/mate-settings-daemon-1.22* =x11-wm/marco-1.22* base? ( =mate-base/caja-1.22* =mate-base/mate-applets-meta-1.22* =mate-base/mate-control-center-1.22* =mate-extra/mate-media-1.22* =x11-misc/mozo-1.22* =x11-terms/mate-terminal-1.22* ) bluetooth? ( net-wireless/blueman ) themes? ( =x11-themes/mate-backgrounds-1.22* =x11-themes/mate-icon-theme-1.22* >=x11-themes/mate-themes-meta-3 ) extras? ( =app-arch/engrampa-1.22* =app-editors/pluma-1.22* =app-text/atril-1.22* =mate-extra/caja-extensions-1.22* =mate-extra/mate-calc-1.22* =mate-extra/mate-netbook-1.22* =mate-extra/mate-power-manager-1.22* =mate-extra/mate-screensaver-1.22* =mate-extra/mate-system-monitor-1.22* =mate-extra/mate-utils-1.22* =media-gfx/eom-1.22* sys-apps/gnome-disk-utility ) help? ( gnome-extra/yelp =mate-extra/mate-user-guide-1.22* )
SLOT=0
_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446
-_md5_=3b1a811d78e754b030319b15bef201b9
+_md5_=e11a3cc25b2b06695b661f0c8ac29135
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.18.2 b/metadata/md5-cache/mate-base/mate-applets-1.18.2
deleted file mode 100644
index 4bcf4fc90194..000000000000
--- a/metadata/md5-cache/mate-base/mate-applets-1.18.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.17.0 >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.12.0:2= >=gnome-extra/gucharmap-3.0:2.90 >=mate-base/mate-panel-1.17.0 >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/gtksourceview:3.0 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 >=x11-libs/libwnck-3.0:3 x11-libs/pango:0 virtual/libintl:0 policykit? ( >=sys-auth/polkit-0.97:0 ) upower? ( >=sys-power/upower-0.9.23 ) !!net-analyzer/mate-netspeed app-text/docbook-xml-dtd:4.3 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* dev-libs/libxslt:0 sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=Applets for the MATE Desktop and Panel
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X ipv6 policykit +upower python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/atk:0 >=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.17.0 >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.12.0:2= >=gnome-extra/gucharmap-3.0:2.90 >=mate-base/mate-panel-1.17.0 >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2:0 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/gtksourceview:3.0 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 >=x11-libs/libwnck-3.0:3 x11-libs/pango:0 virtual/libintl:0 policykit? ( >=sys-auth/polkit-0.97:0 ) upower? ( >=sys-power/upower-0.9.23 ) !!net-analyzer/mate-netspeed >=mate-base/mate-settings-daemon-1.6
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-applets-1.18.2.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=d901ecea60315290ad8ac64b35ed2737
diff --git a/metadata/md5-cache/mate-base/mate-applets-1.22.0 b/metadata/md5-cache/mate-base/mate-applets-1.22.0
index f6d79df3d2cf..c563a05f6bb5 100644
--- a/metadata/md5-cache/mate-base/mate-applets-1.22.0
+++ b/metadata/md5-cache/mate-base/mate-applets-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Applets for the MATE Desktop and Panel
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=X ipv6 policykit +upower
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2 FDL-1.1 LGPL-2
RDEPEND=dev-libs/atk >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.50:2 >=dev-libs/libmateweather-1.17.0 >=dev-libs/libxml2-2.5:2 dev-python/pygobject:3 >=gnome-base/libgtop-2.12.0:2= >=gnome-extra/gucharmap-3.0:2.90 >=mate-base/mate-panel-1.17.0 >=net-wireless/wireless-tools-28_pre9:0 >=sys-apps/dbus-1.1.2 sys-power/cpupower x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/gtksourceview:3.0 >=x11-libs/libnotify-0.7 x11-libs/libX11 >=x11-libs/libwnck-3.0:3 x11-libs/pango virtual/libintl policykit? ( >=sys-auth/polkit-0.97:0 ) upower? ( >=sys-power/upower-0.9.23 ) !!net-analyzer/mate-netspeed >=mate-base/mate-settings-daemon-1.6
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-applets-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=1245e7a42cd29bea0593a90b2420ca3f
+_md5_=8e1108492a8e8807806c5ef0dedac646
diff --git a/metadata/md5-cache/mate-base/mate-applets-meta-1.18 b/metadata/md5-cache/mate-base/mate-applets-meta-1.18
deleted file mode 100644
index 70d8d5ec8da6..000000000000
--- a/metadata/md5-cache/mate-base/mate-applets-meta-1.18
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for MATE panel applets
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-IUSE=appindicator sensors
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=metapackage
-RDEPEND==mate-base/mate-applets-1.18* appindicator? ( =mate-extra/mate-indicator-applet-1.18* ) sensors? ( =mate-extra/mate-sensors-applet-1.18* )
-SLOT=0
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f versionator 2352c3fc97241f6a02042773c8287748
-_md5_=111511f09df243b7584a099c8ba56bbe
diff --git a/metadata/md5-cache/mate-base/mate-applets-meta-1.22.0 b/metadata/md5-cache/mate-base/mate-applets-meta-1.22.0
index 5763800d8ddb..a1c9d267e3d5 100644
--- a/metadata/md5-cache/mate-base/mate-applets-meta-1.22.0
+++ b/metadata/md5-cache/mate-base/mate-applets-meta-1.22.0
@@ -3,9 +3,9 @@ DESCRIPTION=Meta package for MATE panel applets
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
IUSE=appindicator sensors
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=metapackage
RDEPEND==mate-base/mate-applets-1.22* appindicator? ( =mate-extra/mate-indicator-applet-1.22* ) sensors? ( =mate-extra/mate-sensors-applet-1.22* )
SLOT=0
_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446
-_md5_=565fe3b04a3d7d9af45aa65475d6746e
+_md5_=87df06378f011999c8fc5cb86a8ba362
diff --git a/metadata/md5-cache/mate-base/mate-common-1.18.0 b/metadata/md5-cache/mate-base/mate-common-1.18.0
deleted file mode 100644
index cf8175c4cbe5..000000000000
--- a/metadata/md5-cache/mate-base/mate-common-1.18.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Common files for development of MATE packages
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-common-1.18.0.tar.xz
-_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f mate-desktop.org e10ab79a4595873541dc4897c7b19724 versionator 2352c3fc97241f6a02042773c8287748
-_md5_=5881919614ad5af7fb6387e0966bae06
diff --git a/metadata/md5-cache/mate-base/mate-common-1.22.0 b/metadata/md5-cache/mate-base/mate-common-1.22.0
index e9ba469c4d6e..997570ea9b23 100644
--- a/metadata/md5-cache/mate-base/mate-common-1.22.0
+++ b/metadata/md5-cache/mate-base/mate-common-1.22.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
DESCRIPTION=Common files for development of MATE packages
EAPI=6
HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-3
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-common-1.22.0.tar.xz
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f mate-desktop.org e10ab79a4595873541dc4897c7b19724 versionator 2352c3fc97241f6a02042773c8287748
-_md5_=e7f2f3801240fe8c1492798c8a7d91a2
+_md5_=a9a8baa94543fc647a2f98081bd1b9f6
diff --git a/metadata/md5-cache/mate-base/mate-control-center-1.18.2 b/metadata/md5-cache/mate-base/mate-control-center-1.18.2
deleted file mode 100644
index 8407071e5f99..000000000000
--- a/metadata/md5-cache/mate-base/mate-control-center-1.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.73:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.17.0 >=mate-base/caja-1.17.0 >=mate-base/mate-menus-1.1.0 >=mate-base/mate-settings-daemon-1.17.0 >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 media-libs/libcanberra:0[gtk3] >=sys-apps/dbus-1:0 x11-apps/xmodmap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libX11:0 x11-libs/libXScrnSaver:0 x11-libs/libXcursor:0 x11-libs/libXext:0 >=x11-libs/libXi-1.5:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-wm/marco-1.17.0 virtual/libintl:0 appindicator? ( dev-libs/libappindicator:3 ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/desktop-file-utils:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=The MATE Desktop configuration tool
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=appindicator debug
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.73:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.17.0 >=mate-base/caja-1.17.0 >=mate-base/mate-menus-1.1.0 >=mate-base/mate-settings-daemon-1.17.0 >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 media-libs/libcanberra:0[gtk3] >=sys-apps/dbus-1:0 x11-apps/xmodmap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libX11:0 x11-libs/libXScrnSaver:0 x11-libs/libXcursor:0 x11-libs/libXext:0 >=x11-libs/libXi-1.5:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-wm/marco-1.17.0 virtual/libintl:0 appindicator? ( dev-libs/libappindicator:3 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-control-center-1.18.2.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=5ca399fe77bbcca016857abfa8f7f8b0
diff --git a/metadata/md5-cache/mate-base/mate-control-center-1.22.0 b/metadata/md5-cache/mate-base/mate-control-center-1.22.0
index 42d061ada463..b117397dc32e 100644
--- a/metadata/md5-cache/mate-base/mate-control-center-1.22.0
+++ b/metadata/md5-cache/mate-base/mate-control-center-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=The MATE Desktop configuration tool
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=appindicator debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/atk >=dev-libs/dbus-glib-0.73 >=dev-libs/glib-2.50:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.21.2 >=mate-base/caja-1.20.0 >=mate-base/mate-menus-1.1.0 >=mate-base/mate-settings-daemon-1.21.2 >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 media-libs/libcanberra:0[gtk3] >=sys-apps/dbus-1 x11-apps/xmodmap x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcursor x11-libs/libXext >=x11-libs/libXi-1.5 x11-libs/libXrandr x11-libs/libXrender x11-libs/libXxf86misc >=x11-libs/libxklavier-4 x11-libs/pango >=x11-wm/marco-1.17.0 virtual/libintl appindicator? ( dev-libs/libappindicator:3 )
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-control-center-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=1a3b42262424b78ec4a4ed3d149ef589
+_md5_=ff6f44a75692a6965159b448bf4163ef
diff --git a/metadata/md5-cache/mate-base/mate-desktop-1.18.0 b/metadata/md5-cache/mate-base/mate-desktop-1.18.0
deleted file mode 100644
index 3b0d2e6b270b..000000000000
--- a/metadata/md5-cache/mate-base/mate-desktop-1.18.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/cairo:0 x11-libs/libX11:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 >=x11-libs/gtk+-3.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 ) app-text/docbook-xml-dtd:4.1.2 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.40:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=Libraries for the MATE desktop that are not part of the UI
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug +introspection startup-notification
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/cairo:0 x11-libs/libX11:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 >=x11-libs/gtk+-3.0:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-desktop-1.18.0.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=a293af79276b2fc22272d05e9e77ebf0
diff --git a/metadata/md5-cache/mate-base/mate-desktop-1.22.0 b/metadata/md5-cache/mate-base/mate-desktop-1.22.0
index f461fb076ed4..65e5cb94414e 100644
--- a/metadata/md5-cache/mate-base/mate-desktop-1.22.0
+++ b/metadata/md5-cache/mate-base/mate-desktop-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Libraries for the MATE desktop that are not part of the UI
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=X debug +introspection startup-notification
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2 FDL-1.1 LGPL-2
RDEPEND=>=dev-libs/glib-2.50:2 >=gnome-base/dconf-0.13.4 x11-libs/cairo x11-libs/libX11 >=x11-libs/libXrandr-1.3 virtual/libintl >=x11-libs/gtk+-3.22:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 )
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-desktop-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=9cbb76ff676189a33d03145d31522418
+_md5_=16d9d1d5bdb95148e777bcebbad1e8b4
diff --git a/metadata/md5-cache/mate-base/mate-menus-1.18.1 b/metadata/md5-cache/mate-base/mate-menus-1.18.1
deleted file mode 100644
index cd21ec9ddfb8..000000000000
--- a/metadata/md5-cache/mate-base/mate-menus-1.18.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/glib-2.36.0:2 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) python? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-util/intltool-0.40:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=MATE menu system, implementing the F.D.O cross-desktop spec
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=debug +introspection python python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=>=dev-libs/glib-2.36.0:2 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) python? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-menus-1.18.1.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=6835ce98de9bae1d99c9ee669167a259
diff --git a/metadata/md5-cache/mate-base/mate-menus-1.22.0 b/metadata/md5-cache/mate-base/mate-menus-1.22.0
index 7485fe5c6beb..d60e88bc8cc6 100644
--- a/metadata/md5-cache/mate-base/mate-menus-1.22.0
+++ b/metadata/md5-cache/mate-base/mate-menus-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=MATE menu system, implementing the F.D.O cross-desktop spec
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=debug +introspection
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2 LGPL-2
RDEPEND=>=dev-libs/glib-2.50:2 virtual/libintl introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-menus-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=856ed2b36f32078520d54bb522a7d212
+_md5_=ce8c4604e4b861441c32b1cdeaa06791
diff --git a/metadata/md5-cache/mate-base/mate-panel-1.18.7 b/metadata/md5-cache/mate-base/mate-panel-1.18.7
deleted file mode 100644
index e9410bd87b7c..000000000000
--- a/metadata/md5-cache/mate-base/mate-panel-1.18.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.17.0 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.36.2:2 >=mate-base/mate-desktop-1.17.0 >=mate-base/mate-menus-1.10.0 >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 >=x11-libs/gtk+-3.20:3[introspection?] x11-libs/libICE:0 x11-libs/libSM:0 >=x11-libs/libwnck-3.0:3[introspection?] x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] x11-libs/libXau:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=dev-lang/perl-5:0= dev-util/gdbus-codegen:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=The MATE panel
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X +introspection
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.17.0 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.36.2:2 >=mate-base/mate-desktop-1.17.0 >=mate-base/mate-menus-1.10.0 >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 >=x11-libs/gtk+-3.20:3[introspection?] x11-libs/libICE:0 x11-libs/libSM:0 >=x11-libs/libwnck-3.0:3[introspection?] x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] x11-libs/libXau:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-panel-1.18.7.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=ca1a95ab4a52e57c5a7b4bdfac78d7e9
diff --git a/metadata/md5-cache/mate-base/mate-panel-1.22.0 b/metadata/md5-cache/mate-base/mate-panel-1.22.0
index d6a46dcc296a..f463e299dd93 100644
--- a/metadata/md5-cache/mate-base/mate-panel-1.22.0
+++ b/metadata/md5-cache/mate-base/mate-panel-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=The MATE panel
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=X +introspection
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2 FDL-1.1 LGPL-2
RDEPEND=dev-libs/atk >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.50:2 >=dev-libs/libmateweather-1.17.0 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4 >=gnome-base/librsvg-2.36.2:2 >=mate-base/mate-desktop-1.17.0 >=mate-base/mate-menus-1.21.0 >=sys-apps/dbus-1.1.2 >=x11-libs/cairo-1 >=x11-libs/gdk-pixbuf-2.7.1:2 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libICE x11-libs/libSM >=x11-libs/libwnck-3.0:3[introspection?] x11-libs/libX11 >=x11-libs/pango-1.15.4:0[introspection?] x11-libs/libXau >=x11-libs/libXrandr-1.3 virtual/libintl introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-panel-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=afce6150f58479f5bec944beae2bad29
+_md5_=a0a013354c8680c39b284e4326801f71
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.18.2-r1 b/metadata/md5-cache/mate-base/mate-session-manager-1.18.2-r1
deleted file mode 100644
index 08a6630519e7..000000000000
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.18.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=MATE session manager
-EAPI=6
-HOMEPAGE=http://mate-desktop.org/
-IUSE=debug elibc_FreeBSD gnome-keyring ipv6 systemd +xtrans
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-session-manager-1.18.2.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=f4fffe2a488bc4f6bb146aab2b1d7cbf
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.22.0 b/metadata/md5-cache/mate-base/mate-session-manager-1.22.0
index 099b1f0fcc4e..3a1ac820baa3 100644
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.22.0
+++ b/metadata/md5-cache/mate-base/mate-session-manager-1.22.0
@@ -4,11 +4,11 @@ DESCRIPTION=MATE session manager
EAPI=6
HOMEPAGE=http://mate-desktop.org/
IUSE=debug elibc_FreeBSD elogind gnome-keyring ipv6 systemd +xtrans
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2 LGPL-2 FDL-1.1
RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.50:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) !elogind? ( >=sys-auth/consolekit-0.9.2 ) ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring ) !=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=gnome-base/dconf-0.13.4:0 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.17.0 media-libs/fontconfig:1.0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5.2:0 virtual/libintl:0 libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( >=media-libs/libmatemixer-1.10:0[pulseaudio] >=media-sound/pulseaudio-0.9.15:0 ) smartcard? ( >=dev-libs/nss-3.11.2:0 ) sound? ( >=media-libs/libmatemixer-1.10:0 media-libs/libcanberra:0[gtk3] ) >=dev-util/intltool-0.50.1:0 sys-devel/gettext:0 virtual/pkgconfig:0 x11-base/xorg-proto >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=MATE Settings Daemon
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug libnotify policykit pulseaudio smartcard +sound
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=gnome-base/dconf-0.13.4:0 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.17.0 media-libs/fontconfig:1.0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5.2:0 virtual/libintl:0 libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( >=media-libs/libmatemixer-1.10:0[pulseaudio] >=media-sound/pulseaudio-0.9.15:0 ) smartcard? ( >=dev-libs/nss-3.11.2:0 ) sound? ( >=media-libs/libmatemixer-1.10:0 media-libs/libcanberra:0[gtk3] )
-REQUIRED_USE=pulseaudio? ( sound )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-settings-daemon-1.18.2.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=c1e14029fe2279076925ca51484a503d
diff --git a/metadata/md5-cache/mate-base/mate-settings-daemon-1.22.0 b/metadata/md5-cache/mate-base/mate-settings-daemon-1.22.0
index 8d016b4b2c79..78b6fb31900e 100644
--- a/metadata/md5-cache/mate-base/mate-settings-daemon-1.22.0
+++ b/metadata/md5-cache/mate-base/mate-settings-daemon-1.22.0
@@ -4,11 +4,11 @@ DESCRIPTION=MATE Settings Daemon
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=X debug libnotify policykit pulseaudio smartcard +sound
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2 LGPL-2.1
RDEPEND=>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.50:2 >=gnome-base/dconf-0.13.4 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.21.1 media-libs/fontconfig:1.0 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXi x11-libs/libXext x11-libs/libXxf86misc >=x11-libs/libxklavier-5.2 virtual/libintl libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-1.1.2 >=sys-auth/polkit-0.97 ) pulseaudio? ( >=media-libs/libmatemixer-1.10[pulseaudio] >=media-sound/pulseaudio-0.9.15 ) smartcard? ( >=dev-libs/nss-3.11.2 ) sound? ( >=media-libs/libmatemixer-1.10 media-libs/libcanberra[gtk3] )
REQUIRED_USE=pulseaudio? ( sound )
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-settings-daemon-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=2e49611fad2c1cd01291996d7e747944
+_md5_=1735694b4e2296bd0322319ba9b934f9
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index 503ec51c2766..1a942672ad8a 100644
Binary files a/metadata/md5-cache/mate-extra/Manifest.gz and b/metadata/md5-cache/mate-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/mate-extra/caja-dropbox-1.18.0 b/metadata/md5-cache/mate-extra/caja-dropbox-1.18.0
deleted file mode 100644
index 59e82ba7f888..000000000000
--- a/metadata/md5-cache/mate-extra/caja-dropbox-1.18.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=mate-base/caja-1.17.1 media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libXinerama:0 x11-libs/pango:0 dev-python/docutils:0 virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=Store, Sync and Share Files Online
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=debug python_targets_python2_7 kernel_linux
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=mate-base/caja-1.17.1 media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libXinerama:0 x11-libs/pango:0 net-misc/dropbox:0
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/caja-dropbox-1.18.0.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=9db8f8cbc9e38e47c4caf0528abd1a5a
diff --git a/metadata/md5-cache/mate-extra/caja-dropbox-1.22.0-r1 b/metadata/md5-cache/mate-extra/caja-dropbox-1.22.0-r1
index 807beb44d809..7a1e83f60bd3 100644
--- a/metadata/md5-cache/mate-extra/caja-dropbox-1.22.0-r1
+++ b/metadata/md5-cache/mate-extra/caja-dropbox-1.22.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Store, Sync and Share Files Online
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=debug python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 kernel_linux
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 dev-python/pygobject:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] >=mate-base/caja-1.19.1 media-libs/fontconfig:1.0 media-libs/freetype:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libXinerama x11-libs/pango net-misc/dropbox
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/caja-dropbox-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=390daa6f240176355624c210ce6373d9
+_md5_=5d0108b0dcc90b5bd4a2a090a6f35c20
diff --git a/metadata/md5-cache/mate-extra/caja-extensions-1.18.2 b/metadata/md5-cache/mate-extra/caja-extensions-1.18.2
deleted file mode 100644
index 5ec0b395f8ca..000000000000
--- a/metadata/md5-cache/mate-extra/caja-extensions-1.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/caja-1.17.1 virtual/libintl:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 gajim? ( >=dev-libs/dbus-glib-0.60:0 >=sys-apps/dbus-1:0 ) open-terminal? ( >=mate-base/mate-desktop-1.17.0 ) pidgin? ( >=dev-libs/dbus-glib-0.60:0 ) upnp? ( >=net-libs/gupnp-0.13:0= ) xattr? ( sys-apps/attr ) dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.18:* sys-devel/gettext:* virtual/pkgconfig:* !!mate-extra/mate-file-manager-open-terminal !!mate-extra/mate-file-manager-sendto !!mate-extra/mate-file-manager-image-converter !!mate-extra/mate-file-manager-share >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=Several Caja extensions
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=image-converter +open-terminal share +wallpaper xattr cdr gajim +mail pidgin upnp
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/caja-1.17.1 virtual/libintl:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 gajim? ( >=dev-libs/dbus-glib-0.60:0 >=sys-apps/dbus-1:0 ) open-terminal? ( >=mate-base/mate-desktop-1.17.0 ) pidgin? ( >=dev-libs/dbus-glib-0.60:0 ) upnp? ( >=net-libs/gupnp-0.13:0= ) xattr? ( sys-apps/attr ) cdr? ( >=app-cdr/brasero-2.32.1:0= ) gajim? ( net-im/gajim:0 ) image-converter? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) pidgin? ( net-im/pidgin )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/caja-extensions-1.18.2.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=2add5c62dfc0716a3d603c9d066d4749
diff --git a/metadata/md5-cache/mate-extra/caja-extensions-1.22.0 b/metadata/md5-cache/mate-extra/caja-extensions-1.22.0
index c47875edc4f8..224ab4d2bee7 100644
--- a/metadata/md5-cache/mate-extra/caja-extensions-1.22.0
+++ b/metadata/md5-cache/mate-extra/caja-extensions-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Several Caja extensions
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=image-converter +open-terminal share +wallpaper xattr cdr gajim +mail pidgin upnp
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.50:2 >=mate-base/caja-1.21.3 virtual/libintl x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 gajim? ( >=dev-libs/dbus-glib-0.60 >=sys-apps/dbus-1 ) open-terminal? ( >=mate-base/mate-desktop-1.17.0 ) pidgin? ( >=dev-libs/dbus-glib-0.60 ) upnp? ( >=net-libs/gupnp-0.13:= ) xattr? ( sys-apps/attr ) cdr? ( >=app-cdr/brasero-2.32.1:= ) gajim? ( net-im/gajim ) image-converter? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) pidgin? ( net-im/pidgin )
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/caja-extensions-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=55d26740f7229e35dd5522189bbf6b2a
+_md5_=b9e7ad69d295315a19fc1c122b49360f
diff --git a/metadata/md5-cache/mate-extra/mate-calc-1.18.1 b/metadata/md5-cache/mate-extra/mate-calc-1.18.1
deleted file mode 100644
index b3abd8f6ff13..000000000000
--- a/metadata/md5-cache/mate-extra/mate-calc-1.18.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.14:3 x11-libs/pango:0 app-text/yelp-tools:0 >=dev-util/intltool-0.35.0:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=Calculator for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.14:3 x11-libs/pango:0
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-calc-1.18.1.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=cec2033fb73476e2a50591e600f6854f
diff --git a/metadata/md5-cache/mate-extra/mate-calc-1.22.0 b/metadata/md5-cache/mate-extra/mate-calc-1.22.0
index b912ceb5a45b..1581e3df9a64 100644
--- a/metadata/md5-cache/mate-extra/mate-calc-1.22.0
+++ b/metadata/md5-cache/mate-extra/mate-calc-1.22.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.
DESCRIPTION=Calculator for MATE
EAPI=6
HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 dev-libs/libxml2:2 >=x11-libs/gtk+-3.22:3 x11-libs/pango
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-calc-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=ef00c1b0d3c2ec1e435c016ae678c839
+_md5_=81d41920ca8977ebd45491c8c04fb766
diff --git a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.18.1 b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.18.1
deleted file mode 100644
index a8f6ad993a38..000000000000
--- a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.18.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/libindicator-0.4:3 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.14:3 >=dev-util/intltool-0.35.0 virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=MATE indicator applet
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=>=dev-libs/libindicator-0.4:3 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.14:3
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-indicator-applet-1.18.1.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=d207ef6b089992537f7d4b4b1bbcd8ef
diff --git a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.22.0 b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.22.0
index ebfd26279379..8661fac83c48 100644
--- a/metadata/md5-cache/mate-extra/mate-indicator-applet-1.22.0
+++ b/metadata/md5-cache/mate-extra/mate-indicator-applet-1.22.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libindicator-0.4:3 >=mate-base/mate-panel-1.17.0 >=x11-libs/gt
DESCRIPTION=MATE indicator applet
EAPI=6
HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
LICENSE=GPL-2 FDL-1.1 LGPL-2
RDEPEND=>=dev-libs/libindicator-0.4:3 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.22:3
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-indicator-applet-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=d5378e1459b7143d8d3c3724bfbcfbe0
+_md5_=00b9f8d4d890a382dc9885bbf6425422
diff --git a/metadata/md5-cache/mate-extra/mate-media-1.18.2 b/metadata/md5-cache/mate-extra/mate-media-1.18.2
deleted file mode 100644
index 7a6c5ce42d36..000000000000
--- a/metadata/md5-cache/mate-extra/mate-media-1.18.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36.0:2 dev-libs/libxml2:2 >=mate-base/mate-panel-1.17.0 >=mate-base/mate-desktop-1.17.0 >=media-libs/libcanberra-0.13:0[gtk3] >=media-libs/libmatemixer-1.10.0 x11-libs/cairo:0 >=x11-libs/gtk+-3.14:3 x11-libs/pango:0 virtual/libintl:0 >=dev-util/intltool-0.35.0:* sys-devel/gettext:* virtual/pkgconfig:* !!=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=Multimedia related programs for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2 GPL-2 FDL-1.1
-RDEPEND=>=dev-libs/glib-2.36.0:2 dev-libs/libxml2:2 >=mate-base/mate-panel-1.17.0 >=mate-base/mate-desktop-1.17.0 >=media-libs/libcanberra-0.13:0[gtk3] >=media-libs/libmatemixer-1.10.0 x11-libs/cairo:0 >=x11-libs/gtk+-3.14:3 x11-libs/pango:0 virtual/libintl:0
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-media-1.18.2.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=a0fd812751d3f4b8d1a4e73223c26ead
diff --git a/metadata/md5-cache/mate-extra/mate-media-1.22.0 b/metadata/md5-cache/mate-extra/mate-media-1.22.0
index 0033157e6863..3ec1e1b02504 100644
--- a/metadata/md5-cache/mate-extra/mate-media-1.22.0
+++ b/metadata/md5-cache/mate-extra/mate-media-1.22.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.50:2 dev-libs/libxml2:2 >=mate-base/mate-panel-1.17.0 >
DESCRIPTION=Multimedia related programs for the MATE desktop
EAPI=6
HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=LGPL-2 GPL-2 FDL-1.1
RDEPEND=>=dev-libs/glib-2.50:2 dev-libs/libxml2:2 >=mate-base/mate-panel-1.17.0 >=mate-base/mate-desktop-1.17.0 >=media-libs/libcanberra-0.13[gtk3] >=media-libs/libmatemixer-1.10.0 x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/pango virtual/libintl
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-media-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=8022bcc9faac1be46b69ac4a3a6ec9be
+_md5_=4beae3c74dfe79c1b7e1f1c5dfa74e7f
diff --git a/metadata/md5-cache/mate-extra/mate-netbook-1.18.2 b/metadata/md5-cache/mate-extra/mate-netbook-1.18.2
deleted file mode 100644
index 6f6342c0bc29..000000000000
--- a/metadata/md5-cache/mate-extra/mate-netbook-1.18.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.14:3 x11-libs/libfakekey:0 x11-libs/libwnck:3 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/cairo:0 virtual/libintl:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=MATE utilities for netbooks
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.14:3 x11-libs/libfakekey:0 x11-libs/libwnck:3 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/cairo:0 virtual/libintl:0
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-netbook-1.18.2.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=3b45bc46660da0f8239c168d3dfe0e40
diff --git a/metadata/md5-cache/mate-extra/mate-netbook-1.22.0 b/metadata/md5-cache/mate-extra/mate-netbook-1.22.0
index 55c8ea22bb87..aa1ec23ac875 100644
--- a/metadata/md5-cache/mate-extra/mate-netbook-1.22.0
+++ b/metadata/md5-cache/mate-extra/mate-netbook-1.22.0
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/glib-2.50:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.22
DESCRIPTION=MATE utilities for netbooks
EAPI=6
HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-3
RDEPEND=>=dev-libs/glib-2.50:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/gtk+-3.22:3 x11-libs/libfakekey x11-libs/libwnck:3 x11-libs/libXtst x11-libs/libX11 x11-libs/cairo virtual/libintl
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-netbook-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=40cf0e46c1d68fd7649bf7d74f84c64f
+_md5_=bdee8c680cce5366a1ae936393170477
diff --git a/metadata/md5-cache/mate-extra/mate-polkit-1.18.2 b/metadata/md5-cache/mate-extra/mate-polkit-1.18.2
deleted file mode 100644
index c32f723af175..000000000000
--- a/metadata/md5-cache/mate-extra/mate-polkit-1.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=sys-auth/polkit-0.102:0[introspection?] x11-libs/gdk-pixbuf:2[introspection?] virtual/libintl:0 >=x11-libs/gtk+-3.14.0:3[introspection?] appindicator? ( dev-libs/libappindicator:3 ) introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35:* sys-devel/gettext:* >=sys-devel/libtool-2.2.6 virtual/pkgconfig:* !=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=A MATE specific DBUS service that is used to bring up authentication dialogs
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=accountsservice appindicator debug examples +introspection
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=sys-auth/polkit-0.102:0[introspection?] x11-libs/gdk-pixbuf:2[introspection?] virtual/libintl:0 >=x11-libs/gtk+-3.14.0:3[introspection?] appindicator? ( dev-libs/libappindicator:3 ) introspection? ( >=dev-libs/gobject-introspection-0.6.2:= ) accountsservice? ( sys-apps/accountsservice:0[introspection?] )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-polkit-1.18.2.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=6ced843da0b202eb8acec5df6e45af2e
diff --git a/metadata/md5-cache/mate-extra/mate-polkit-1.22.0 b/metadata/md5-cache/mate-extra/mate-polkit-1.22.0
index d90eecd66b62..e44a0f2c5eaa 100644
--- a/metadata/md5-cache/mate-extra/mate-polkit-1.22.0
+++ b/metadata/md5-cache/mate-extra/mate-polkit-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=A MATE specific DBUS service that is used to bring up authentication
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=accountsservice appindicator
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=LGPL-2
RDEPEND=>=dev-libs/glib-2.36:2 >=sys-auth/polkit-0.102 x11-libs/gdk-pixbuf:2 virtual/libintl:0 >=x11-libs/gtk+-3.14.0:3 appindicator? ( dev-libs/libappindicator:3 ) accountsservice? ( sys-apps/accountsservice )
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-polkit-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=a44a49490c35b255c05f1dd90eb4d2ce
+_md5_=26ad08d824208aee3247da005b4353d4
diff --git a/metadata/md5-cache/mate-extra/mate-power-manager-1.18.1 b/metadata/md5-cache/mate-extra/mate-power-manager-1.18.1
deleted file mode 100644
index e700e8eab06b..000000000000
--- a/metadata/md5-cache/mate-extra/mate-power-manager-1.18.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 >=media-libs/libcanberra-0.10:0[gtk3] >=sys-apps/dbus-1:0 >=x11-apps/xrandr-1.3:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.11:2 >=x11-libs/gtk+-3.14:3 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXrandr:0 >=x11-libs/libnotify-0.7:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.17.0 ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) >=sys-power/upower-0.9.23:= systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) app-text/docbook-xml-dtd:4.3 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=A session daemon for MATE that makes it easy to manage your laptop or desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+applet gnome-keyring policykit systemd test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 >=media-libs/libcanberra-0.10:0[gtk3] >=sys-apps/dbus-1:0 >=x11-apps/xrandr-1.3:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.11:2 >=x11-libs/gtk+-3.14:3 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXrandr:0 >=x11-libs/libnotify-0.7:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.17.0 ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) >=sys-power/upower-0.9.23:= systemd? ( sys-apps/systemd ) !systemd? ( >=sys-auth/consolekit-0.9.2 ) policykit? ( >=mate-extra/mate-polkit-1.6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-power-manager-1.18.1.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=5a7f9e6a4fd2e1182a96a29309f5c4e4
diff --git a/metadata/md5-cache/mate-extra/mate-power-manager-1.22.0 b/metadata/md5-cache/mate-extra/mate-power-manager-1.22.0
index 639b60ef7496..8c31fb3fab4e 100644
--- a/metadata/md5-cache/mate-extra/mate-power-manager-1.22.0
+++ b/metadata/md5-cache/mate-extra/mate-power-manager-1.22.0
@@ -4,7 +4,7 @@ DESCRIPTION=A session daemon for MATE that makes it easy to manage your laptop o
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=+applet elogind gnome-keyring policykit systemd test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.50:2 >=media-libs/libcanberra-0.10:0[gtk3] >=sys-apps/dbus-1 >=x11-apps/xrandr-1.3 >=x11-libs/cairo-1 >=x11-libs/gdk-pixbuf-2.11:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr >=x11-libs/libnotify-0.7:0 x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3 ) >=sys-power/upower-0.9.23:= policykit? ( >=mate-extra/mate-polkit-1.6 ) systemd? ( sys-apps/systemd ) !systemd? ( elogind? ( sys-auth/elogind ) !elogind? ( >=sys-auth/consolekit-0.9.2 ) )
REQUIRED_USE=?? ( elogind systemd )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-power-manager-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=2483047e72d32005e83c11375f3216ee
+_md5_=8cbba7747a036dc01a772727b7b0cf2a
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.18.2 b/metadata/md5-cache/mate-extra/mate-screensaver-1.18.2
deleted file mode 100644
index 928aee95c8b1..000000000000
--- a/metadata/md5-cache/mate-extra/mate-screensaver-1.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.17.0 >=mate-base/mate-menus-1.10.0 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 >=x11-libs/gtk+-3.14:3 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=Replaces xscreensaver, integrating with the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug consolekit kernel_linux libnotify opengl pam systemd
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.17.0 >=mate-base/mate-menus-1.10.0 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 >=x11-libs/gtk+-3.14:3 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!=mate-base/mate-session-manager-1.6
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-screensaver-1.18.2.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=4cfa3f5bffc989c8dafe762ba2683a40
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.22.0 b/metadata/md5-cache/mate-extra/mate-screensaver-1.22.0
index 7376cb8a6571..6211c9456025 100644
--- a/metadata/md5-cache/mate-extra/mate-screensaver-1.22.0
+++ b/metadata/md5-cache/mate-extra/mate-screensaver-1.22.0
@@ -4,11 +4,11 @@ DESCRIPTION=Replaces xscreensaver, integrating with the MATE desktop
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=X debug consolekit elogind kernel_linux libnotify opengl pam systemd
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.50:2 gnome-base/dconf >=mate-base/libmatekbd-1.17.0 >=mate-base/mate-desktop-1.17.0 >=mate-base/mate-menus-1.10.0 >=sys-apps/dbus-0.30 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1 x11-libs/cairo >=x11-libs/gtk+-3.22:3 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm x11-libs/libxklavier x11-libs/pango virtual/libintl consolekit? ( sys-auth/consolekit ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl ) pam? ( gnome-base/gnome-keyring virtual/pam ) !pam? ( kernel_linux? ( sys-apps/shadow ) ) elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd:= ) !!=mate-base/mate-session-manager-1.6
REQUIRED_USE=?? ( elogind systemd )
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-screensaver-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=dd061882219e4f299ed821a9c2e85f3d
+_md5_=addcc9d62dd2e885ce536d0fcfb93ef9
diff --git a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.18.3 b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.18.3
deleted file mode 100644
index 4baed7ba2840..000000000000
--- a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.18.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 virtual/libintl:0 hddtemp? ( dbus? ( >=dev-libs/dbus-glib-0.80:0 >=dev-libs/libatasmart-0.16:0 ) !dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) lm_sensors? ( sys-apps/lm_sensors:0 ) video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=MATE panel applet to display readings from hardware sensors
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+dbus hddtemp libnotify lm_sensors video_cards_nvidia
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-PDEPEND=hddtemp? ( dbus? ( sys-fs/udisks:0 ) )
-RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 virtual/libintl:0 hddtemp? ( dbus? ( >=dev-libs/dbus-glib-0.80:0 >=dev-libs/libatasmart-0.16:0 ) !dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) lm_sensors? ( sys-apps/lm_sensors:0 ) video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-sensors-applet-1.18.3.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=141e2b18ab97797a51dadaa224bcff5c
diff --git a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.22.0 b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.22.0
deleted file mode 100644
index 06d984a99975..000000000000
--- a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.22.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.50:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/cairo-1.0.4 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl hddtemp? ( dbus? ( >=dev-libs/dbus-glib-0.80 >=dev-libs/libatasmart-0.16 ) !dbus? ( >=app-admin/hddtemp-0.3_beta13 ) ) libnotify? ( >=x11-libs/libnotify-0.7 ) lm_sensors? ( sys-apps/lm_sensors ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] ) ) app-text/rarian >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.22
-DESCRIPTION=MATE panel applet to display readings from hardware sensors
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+dbus hddtemp libnotify lm_sensors video_cards_nvidia
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-PDEPEND=hddtemp? ( dbus? ( sys-fs/udisks:0 ) )
-RDEPEND=>=dev-libs/glib-2.50:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/cairo-1.0.4 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl hddtemp? ( dbus? ( >=dev-libs/dbus-glib-0.80 >=dev-libs/libatasmart-0.16 ) !dbus? ( >=app-admin/hddtemp-0.3_beta13 ) ) libnotify? ( >=x11-libs/libnotify-0.7 ) lm_sensors? ( sys-apps/lm_sensors ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-sensors-applet-1.22.0.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=a360c49eb185cb2d748cc31d36ba291e
diff --git a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.22.0-r1 b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.22.0-r1
index 4fb02cd44aca..7d78b502ed3c 100644
--- a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.22.0-r1
+++ b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.22.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=MATE panel applet to display readings from hardware sensors
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=+dbus hddtemp libnotify lm_sensors video_cards_nvidia
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
LICENSE=GPL-2
PDEPEND=hddtemp? ( dbus? ( sys-fs/udisks:2 ) )
RDEPEND=>=dev-libs/glib-2.50:2 >=mate-base/mate-panel-1.17.0 >=x11-libs/cairo-1.0.4 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 virtual/libintl hddtemp? ( >=app-admin/hddtemp-0.3_beta13 ) libnotify? ( >=x11-libs/libnotify-0.7 ) lm_sensors? ( sys-apps/lm_sensors ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] ) )
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-sensors-applet-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=273040322edc4abef7f5104c22868464
+_md5_=68152186d7c656c15cf7040f0fceabc8
diff --git a/metadata/md5-cache/mate-extra/mate-system-monitor-1.18.1 b/metadata/md5-cache/mate-extra/mate-system-monitor-1.18.1
deleted file mode 100644
index 9a19ab301d28..000000000000
--- a/metadata/md5-cache/mate-extra/mate-system-monitor-1.18.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-cpp/glibmm-2.26:2 >=dev-cpp/gtkmm-3.8:3.0 >=dev-libs/glib-2.36:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2:2 >=gnome-base/libgtop-2.23.1:2= >=gnome-base/librsvg-2.35:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 >=x11-libs/libwnck-3.0:3 virtual/libintl:0 systemd? ( sys-apps/systemd ) app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* >=sys-devel/autoconf-2.63:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=The MATE System Monitor
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=systemd
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-cpp/glibmm-2.26:2 >=dev-cpp/gtkmm-3.8:3.0 >=dev-libs/glib-2.36:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2:2 >=gnome-base/libgtop-2.23.1:2= >=gnome-base/librsvg-2.35:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 >=x11-libs/libwnck-3.0:3 virtual/libintl:0 systemd? ( sys-apps/systemd ) >=sys-auth/polkit-0.97:0
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-system-monitor-1.18.1.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=fa82ccb739fc82fae31c1951450204d1
diff --git a/metadata/md5-cache/mate-extra/mate-system-monitor-1.22.0 b/metadata/md5-cache/mate-extra/mate-system-monitor-1.22.0
index 3e0b11d55d3d..d02aa83e4953 100644
--- a/metadata/md5-cache/mate-extra/mate-system-monitor-1.22.0
+++ b/metadata/md5-cache/mate-extra/mate-system-monitor-1.22.0
@@ -4,11 +4,11 @@ DESCRIPTION=The MATE System Monitor
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=elogind systemd
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=>=dev-cpp/glibmm-2.26:2 >=dev-cpp/gtkmm-3.8:3.0 >=dev-libs/glib-2.50:2 dev-libs/libsigc++:2 >=dev-libs/libxml2-2:2 >=gnome-base/libgtop-2.23.1:2= >=gnome-base/librsvg-2.35:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.0:3 virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) >=sys-auth/polkit-0.97:0
REQUIRED_USE=?? ( elogind systemd )
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-system-monitor-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=4a642977719683076f3e251727f248e7
+_md5_=a7d7a4f80ed0b941ba6fc1b7c7068885
diff --git a/metadata/md5-cache/mate-extra/mate-user-guide-1.18.0 b/metadata/md5-cache/mate-extra/mate-user-guide-1.18.0
deleted file mode 100644
index 46ae809842bd..000000000000
--- a/metadata/md5-cache/mate-extra/mate-user-guide-1.18.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=virtual/libintl:0 >=dev-util/intltool-0.40:* app-text/yelp-tools sys-devel/gettext:* virtual/pkgconfig:* !!mate-base/mate-desktop[user-guide] >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=User documentation for MATE Desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2 LGPL-2
-RDEPEND=virtual/libintl:0 gnome-extra/yelp
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-user-guide-1.18.0.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=0a59c9948a8cddf7c6518b17a2779816
diff --git a/metadata/md5-cache/mate-extra/mate-user-guide-1.22.0 b/metadata/md5-cache/mate-extra/mate-user-guide-1.22.0
index 8a08f6f1f652..7c12dfbd8d3b 100644
--- a/metadata/md5-cache/mate-extra/mate-user-guide-1.22.0
+++ b/metadata/md5-cache/mate-extra/mate-user-guide-1.22.0
@@ -3,10 +3,10 @@ DEPEND=virtual/libintl:0 >=dev-util/intltool-0.40 app-text/yelp-tools sys-devel/
DESCRIPTION=User documentation for MATE Desktop
EAPI=6
HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
LICENSE=GPL-2 LGPL-2
RDEPEND=virtual/libintl:0 gnome-extra/yelp
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-user-guide-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=41bd32c00d82d6fb22d0e65d6df19e8d
+_md5_=375b2d54c8d54c4d2369c7672b168dbd
diff --git a/metadata/md5-cache/mate-extra/mate-user-share-1.18.0 b/metadata/md5-cache/mate-extra/mate-user-share-1.18.0
deleted file mode 100644
index c1de25e5f2af..000000000000
--- a/metadata/md5-cache/mate-extra/mate-user-share-1.18.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.15.2:2 >=mate-base/caja-1.17.1 media-libs/libcanberra:0[gtk3] >=sys-apps/dbus-1.1.1:0 >=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-3.14:3 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/libnotify-0.7:0 virtual/libintl:0 app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=dev-util/intltool-0.35:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=Personal file sharing for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.15.2:2 >=mate-base/caja-1.17.1 media-libs/libcanberra:0[gtk3] >=sys-apps/dbus-1.1.1:0 >=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-3.14:3 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/libnotify-0.7:0 virtual/libintl:0 >=www-apache/mod_dnssd-0.6:0 >=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-user-share-1.18.0.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=55e8dd40978f3a48aa209d7f3a39f885
diff --git a/metadata/md5-cache/mate-extra/mate-user-share-1.22.0 b/metadata/md5-cache/mate-extra/mate-user-share-1.22.0
index 85371c0481b6..e52a4fb1bb86 100644
--- a/metadata/md5-cache/mate-extra/mate-user-share-1.22.0
+++ b/metadata/md5-cache/mate-extra/mate-user-share-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Personal file sharing for the MATE desktop
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=X
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/dbus-glib-0.70 >=dev-libs/glib-2.50:2 >=mate-base/caja-1.17.1 media-libs/libcanberra[gtk3] >=sys-apps/dbus-1.1.1 >=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-3.22:3 x11-libs/libX11 x11-libs/pango >=x11-libs/libnotify-0.7 virtual/libintl >=www-apache/mod_dnssd-0.6 >=www-servers/apache-2.2:2[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile]
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-user-share-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=518c2206a2b4915bd953620d5cd04b16
+_md5_=7e533ce86c9ef1c5795282cf30d07980
diff --git a/metadata/md5-cache/mate-extra/mate-utils-1.18.3 b/metadata/md5-cache/mate-extra/mate-utils-1.18.3
deleted file mode 100644
index 621344f4073d..000000000000
--- a/metadata/md5-cache/mate-extra/mate-utils-1.18.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= >=media-libs/libcanberra-0.4:0[gtk3] sys-libs/zlib:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.17.0 ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=Utilities for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X applet debug ipv6 test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= >=media-libs/libcanberra-0.4:0[gtk3] sys-libs/zlib:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.17.0 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-utils-1.18.3.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=4059b895d8eca463c15d00cd65f9bdd4
diff --git a/metadata/md5-cache/mate-extra/mate-utils-1.22.0 b/metadata/md5-cache/mate-extra/mate-utils-1.22.0
index 15f2cb4380eb..4dbdffd742b7 100644
--- a/metadata/md5-cache/mate-extra/mate-utils-1.22.0
+++ b/metadata/md5-cache/mate-extra/mate-utils-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Utilities for the MATE desktop
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=X applet debug ipv6 test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=gnome-base/libgtop-2.12:2= >=media-libs/libcanberra-0.4[gtk3] sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/pango applet? ( >=mate-base/mate-panel-1.17.0 )
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-utils-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=6eaa8f190bc6fbda73d2c6421b46de56
+_md5_=2968e10298332ee341b93b6d03286a91
diff --git a/metadata/md5-cache/media-fonts/Manifest.gz b/metadata/md5-cache/media-fonts/Manifest.gz
index c1c2356ff003..0c1d7c34e0df 100644
Binary files a/metadata/md5-cache/media-fonts/Manifest.gz and b/metadata/md5-cache/media-fonts/Manifest.gz differ
diff --git a/metadata/md5-cache/media-fonts/corefonts-1-r7 b/metadata/md5-cache/media-fonts/corefonts-1-r7
index 290c0f9657f7..6008e618f656 100644
--- a/metadata/md5-cache/media-fonts/corefonts-1-r7
+++ b/metadata/md5-cache/media-fonts/corefonts-1-r7
@@ -4,9 +4,9 @@ DESCRIPTION=Microsoft's TrueType core fonts
EAPI=5
HOMEPAGE=http://corefonts.sourceforge.net/
IUSE=X tahoma X
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MSttfEULA
SLOT=0
SRC_URI=mirror://gentoo/EUupdate.EXE mirror://sourceforge/corefonts/andale32.exe mirror://sourceforge/corefonts/arialb32.exe mirror://sourceforge/corefonts/comic32.exe mirror://sourceforge/corefonts/courie32.exe mirror://sourceforge/corefonts/georgi32.exe mirror://sourceforge/corefonts/impact32.exe mirror://sourceforge/corefonts/webdin32.exe mirror://sourceforge/corefonts/wd97vwr32.exe
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 font d4df4f26ea28a5f7037dbbd6d17cc49f ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a382b53e6d6b434d1f54d53b3f595c52
+_md5_=9cbea266051064e9e2bbcda2f122493a
diff --git a/metadata/md5-cache/media-fonts/tex-gyre-2.005 b/metadata/md5-cache/media-fonts/tex-gyre-2.005
index fd31c48a6d45..b9b92c294588 100644
--- a/metadata/md5-cache/media-fonts/tex-gyre-2.005
+++ b/metadata/md5-cache/media-fonts/tex-gyre-2.005
@@ -4,9 +4,9 @@ DESCRIPTION=Extensive remake of freely available URW fonts
EAPI=5
HOMEPAGE=http://www.gust.org.pl/projects/e-foundry/tex-gyre
IUSE=X
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa x86
+KEYWORDS=alpha amd64 ~arm arm64 ~hppa x86
LICENSE=|| ( GFL LPPL-1.3c )
SLOT=0
SRC_URI=http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-2.005otf.zip
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 font d4df4f26ea28a5f7037dbbd6d17cc49f ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b52ba604cb109c5f1e8234d0fe6cbfc2
+_md5_=e5f6c3cf43588e5c442c72aac99cbd1c
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index db034b5594b7..9799f10e250c 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/eom-1.18.3 b/metadata/md5-cache/media-gfx/eom-1.18.3
deleted file mode 100644
index cf6ed4003276..000000000000
--- a/metadata/md5-cache/media-gfx/eom-1.18.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2:2 gnome-base/dconf:0 >=mate-base/mate-desktop-1.17.0 sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?] >=x11-libs/gtk+-3.14:3[introspection?] x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=The MATE image viewer
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug dbus exif +introspection jpeg lcms svg tiff xmp
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libpeas-1.2.0[gtk] >=dev-libs/libxml2-2:2 gnome-base/dconf:0 >=mate-base/mate-desktop-1.17.0 sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?] >=x11-libs/gtk+-3.14:3[introspection?] x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/eom-1.18.3.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=cc8ac04b4150da428ccacfd87afad19f
diff --git a/metadata/md5-cache/media-gfx/eom-1.22.0 b/metadata/md5-cache/media-gfx/eom-1.22.0
index 583a7c078265..e697c0f78b20 100644
--- a/metadata/md5-cache/media-gfx/eom-1.22.0
+++ b/metadata/md5-cache/media-gfx/eom-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=The MATE image viewer
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=X debug exif +introspection jpeg lcms svg tiff xmp
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=dev-libs/libpeas-1.8.0[gtk] >=dev-libs/libxml2-2:2 gnome-base/dconf >=mate-base/mate-desktop-1.17.0 sys-libs/zlib x11-libs/cairo >=x11-libs/gdk-pixbuf-2.30:2[introspection?,jpeg?,tiff?] >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 >=x11-misc/shared-mime-info-0.20 virtual/libintl exif? ( >=media-libs/libexif-0.6.14 virtual/jpeg:0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/eom-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=c790e2ebdfe80f9521ec34e8124fd38b
+_md5_=4da68bf05b8615e77894861dbf539993
diff --git a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.36 b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.36
index 7b3f96981300..dbbb1b99949e 100644
--- a/metadata/md5-cache/media-gfx/imagemagick-7.0.8.36
+++ b/metadata/md5-cache/media-gfx/imagemagick-7.0.8.36
@@ -4,11 +4,11 @@ DESCRIPTION=A collection of tools and libraries for many image formats
EAPI=6
HOMEPAGE=https://www.imagemagick.org/
IUSE=bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=imagemagick
RDEPEND=dev-libs/libltdl:0 bzip2? ( app-arch/bzip2 ) corefonts? ( media-fonts/corefonts ) djvu? ( app-text/djvu ) fftw? ( sci-libs/fftw:3.0 ) fontconfig? ( media-libs/fontconfig ) fpx? ( >=media-libs/libfpx-1.3.0-r1 ) graphviz? ( media-gfx/graphviz ) heif? ( media-libs/libheif:= ) jbig? ( >=media-libs/jbigkit-2:= ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) lcms? ( media-libs/lcms:2= ) lqr? ( media-libs/liblqr ) opencl? ( virtual/opencl ) openexr? ( media-libs/openexr:0= ) pango? ( x11-libs/pango ) perl? ( >=dev-lang/perl-5.8.8:0= ) png? ( media-libs/libpng:0= ) postscript? ( app-text/ghostscript-gpl ) raw? ( media-libs/libraw:= ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:0= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt ) xml? ( dev-libs/libxml2:= ) lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib:= )
REQUIRED_USE=corefonts? ( truetype ) test? ( corefonts )
SLOT=0/7.0.8.36
SRC_URI=mirror://imagemagick/ImageMagick-7.0.8-36.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 perl-functions f2e3420aed32cf1abe33b4129b842636 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=420390044739e471040e927db22d30d7
+_md5_=4c6fa48b18fc88f0226aa066c02ae78b
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 3b0958a3ad07..850a945337c3 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/aribb24-1.0.3-r2 b/metadata/md5-cache/media-libs/aribb24-1.0.3-r2
index e113fda71294..bd4006c55a4f 100644
--- a/metadata/md5-cache/media-libs/aribb24-1.0.3-r2
+++ b/metadata/md5-cache/media-libs/aribb24-1.0.3-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Library for decoding ARIB STD-B24 subtitles
EAPI=7
HOMEPAGE=https://github.com/nkoriyama/aribb24
IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
LICENSE=LGPL-3
RDEPEND=media-libs/libpng:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0
SRC_URI=https://github.com/nkoriyama/aribb24/archive/v1.0.3.tar.gz -> aribb24-1.0.3.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=50385357fa138768afed5098a8baaf84
+_md5_=9971fee0114a4aec2ace34c9b0d5bda0
diff --git a/metadata/md5-cache/media-libs/freeimage-3.18.0 b/metadata/md5-cache/media-libs/freeimage-3.18.0
new file mode 100644
index 000000000000..ac51140325ed
--- /dev/null
+++ b/metadata/md5-cache/media-libs/freeimage-3.18.0
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install prepare
+DEPEND=sys-libs/zlib jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) mng? ( media-libs/libmng:= ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/ilmbase:= media-libs/tiff:0 ) webp? ( media-libs/libwebp:= )
+DESCRIPTION=Image library supporting many formats
+EAPI=7
+HOMEPAGE=http://freeimage.sourceforge.net/
+IUSE=jpeg jpeg2k mng openexr png raw static-libs tiff webp
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=|| ( GPL-2 FIPL-1.0 )
+RDEPEND=sys-libs/zlib jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) mng? ( media-libs/libmng:= ) openexr? ( media-libs/openexr:= ) png? ( media-libs/libpng:0= ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/ilmbase:= media-libs/tiff:0 ) webp? ( media-libs/libwebp:= )
+SLOT=0
+SRC_URI=mirror://sourceforge/freeimage/FreeImage3180.zip mirror://sourceforge/freeimage/FreeImage3180.pdf
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=ad0be71677808395dd0eecdd1b66d3a9
diff --git a/metadata/md5-cache/media-libs/glm-0.9.9.5 b/metadata/md5-cache/media-libs/glm-0.9.9.5
new file mode 100644
index 000000000000..7a84dda367f3
--- /dev/null
+++ b/metadata/md5-cache/media-libs/glm-0.9.9.5
@@ -0,0 +1,13 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenGL Mathematics
+EAPI=7
+HOMEPAGE=http://glm.g-truc.net/
+IUSE=test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=|| ( HappyBunny MIT )
+RDEPEND=virtual/opengl
+SLOT=0
+SRC_URI=https://github.com/g-truc/glm/archive/0.9.9.5.tar.gz -> glm-0.9.9.5.tar.gz
+_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=09f6d0e6508ccf476a68cd7998639e5f
diff --git a/metadata/md5-cache/media-libs/graphene-1.8.6 b/metadata/md5-cache/media-libs/graphene-1.8.6
index 10cd7593d5ce..7f7523677984 100644
--- a/metadata/md5-cache/media-libs/graphene-1.8.6
+++ b/metadata/md5-cache/media-libs/graphene-1.8.6
@@ -5,10 +5,10 @@ DESCRIPTION=A thin layer of types for graphic libraries
EAPI=7
HOMEPAGE=https://ebassi.github.io/graphene/
IUSE=cpu_flags_arm_neon cpu_flags_x86_sse2 doc +introspection test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
LICENSE=MIT
RDEPEND=>=dev-libs/glib-2.30.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( dev-libs/gobject-introspection:= )
SLOT=0
SRC_URI=https://github.com/ebassi/graphene/releases/download/1.8.6/graphene-1.8.6.tar.xz
_eclasses_=meson e53acc5913e5581a8a71be22731d8f36 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=ed757fe2c2ba47d1531980e7ab8b8b82
+_md5_=593bc918b4fcad9b93ae7cae2a7ca2a7
diff --git a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1 b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1
index 957d604281fd..b24fb1aba132 100644
--- a/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1
+++ b/metadata/md5-cache/media-libs/gst-plugins-base-1.14.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Basepack of plugins for gstreamer
EAPI=6
HOMEPAGE=https://gstreamer.freedesktop.org/
IUSE=alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 nls
-KEYWORDS=amd64 arm ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm ~arm64 ppc ppc64 ~sparc x86
LICENSE=GPL-2+ LGPL-2+
RDEPEND=app-text/iso-codes >=dev-libs/glib-2.40.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.14.4:1.0[introspection?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) introspection? ( >=dev-libs/gobject-introspection-1.31.1:= ) ivorbis? ( >=media-libs/tremor-0_pre20130223[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ogg? ( >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) orc? ( >=dev-lang/orc-0.4.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pango? ( >=x11-libs/pango-1.36.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,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_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gles2? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] egl? ( x11-libs/libdrm ) gbm? ( >=dev-libs/libgudev-147[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libdrm-2.4.55[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=media-libs/graphene-1.4.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/jpeg:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
REQUIRED_USE=ivorbis? ( ogg ) theora? ( ogg ) vorbis? ( ogg ) opengl? ( || ( egl X ) || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) ) gles2? ( egl || ( gbm wayland X ) wayland? ( egl ) gbm? ( egl ) )
SLOT=1.0
SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.14.4.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf gstreamer b64f69d32993abccfc229979742cc360 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=6a9ccda4ecd36556d75c0b3638a6321b
+_md5_=b22a9bccfbca99b62e347e91cc393bcb
diff --git a/metadata/md5-cache/media-libs/libbluray-1.1.1 b/metadata/md5-cache/media-libs/libbluray-1.1.1
new file mode 100644
index 000000000000..f3e86aa86bb4
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libbluray-1.1.1
@@ -0,0 +1,14 @@
+BDEPEND=java? ( >=virtual/jdk-1.6 dev-java/ant-core ) 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=compile configure install preinst prepare setup test
+DEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Blu-ray playback libraries
+EAPI=7
+HOMEPAGE=https://www.videolan.org/developers/libbluray.html
+IUSE=aacs bdplus +fontconfig java static-libs +truetype utils +xml elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-2.1
+RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacs? ( >=media-libs/libaacs-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bdplus? ( media-libs/libbdplus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/2
+SRC_URI=https://downloads.videolan.org/pub/videolan/libbluray/1.1.1/libbluray-1.1.1.tar.bz2
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=e47faf5bf6c1275d8fb9729d2aca9721
diff --git a/metadata/md5-cache/media-libs/libbluray-9999 b/metadata/md5-cache/media-libs/libbluray-9999
index 59281a7cd3f7..03ac0c2f8434 100644
--- a/metadata/md5-cache/media-libs/libbluray-9999
+++ b/metadata/md5-cache/media-libs/libbluray-9999
@@ -1,11 +1,12 @@
+BDEPEND=java? ( >=virtual/jdk-1.6 dev-java/ant-core ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=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 preinst prepare setup test unpack
-DEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.6 dev-java/ant-core ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] >=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 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=Blu-ray playback libraries
-EAPI=6
+EAPI=7
HOMEPAGE=https://www.videolan.org/developers/libbluray.html
IUSE=aacs bdplus +fontconfig java static-libs +truetype utils +xml elibc_FreeBSD java abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
LICENSE=LGPL-2.1
RDEPEND=xml? ( >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) aacs? ( >=media-libs/libaacs-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bdplus? ( media-libs/libbdplus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0/2
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf git-r3 0d4635eeb5a96cd5315597a47eba25c9 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=022447801acdb487252cb6184f116c7d
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf git-r3 0d4635eeb5a96cd5315597a47eba25c9 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=e47faf5bf6c1275d8fb9729d2aca9721
diff --git a/metadata/md5-cache/media-libs/libfpx-1.3.1_p10 b/metadata/md5-cache/media-libs/libfpx-1.3.1_p10
index 4d3ac013b3bf..485940c93487 100644
--- a/metadata/md5-cache/media-libs/libfpx-1.3.1_p10
+++ b/metadata/md5-cache/media-libs/libfpx-1.3.1_p10
@@ -4,9 +4,9 @@ DESCRIPTION=A library for manipulating FlashPIX images
EAPI=6
HOMEPAGE=http://www.i3a.org/
IUSE=static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=Flashpix
SLOT=0/1
SRC_URI=mirror://imagemagick/delegates/libfpx-1.3.1-10.tar.bz2
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f142d9eb5f967d507fe9a94a3c750cf8
+_md5_=aa707701cd94d3e131e44f6106facf3b
diff --git a/metadata/md5-cache/media-libs/liblqr-0.4.2-r1 b/metadata/md5-cache/media-libs/liblqr-0.4.2-r1
index b62428775791..2288a1f06f88 100644
--- a/metadata/md5-cache/media-libs/liblqr-0.4.2-r1
+++ b/metadata/md5-cache/media-libs/liblqr-0.4.2-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 virtual/pkgconfig
DESCRIPTION=An easy to use C/C++ seam carving library
EAPI=5
HOMEPAGE=http://liblqr.wikidot.com/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd
LICENSE=|| ( GPL-3 LGPL-3 )
RDEPEND=dev-libs/glib:2
SLOT=0
SRC_URI=http://liblqr.wikidot.com/local--files/en:download-page/liblqr-1-0.4.2.tar.bz2
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=51ee1a61e8c29296d775e6032cef919a
+_md5_=92a67d2b1f3aef78d7d5f04e7d77423d
diff --git a/metadata/md5-cache/media-libs/libmatemixer-1.18.0 b/metadata/md5-cache/media-libs/libmatemixer-1.18.0
deleted file mode 100644
index 4712d699b61e..000000000000
--- a/metadata/md5-cache/media-libs/libmatemixer-1.18.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 sys-devel/gettext:* alsa? ( >=media-libs/alsa-lib-1.0.5 ) pulseaudio? ( >=media-sound/pulseaudio-2.0.0:0[alsa?,glib] ) app-text/docbook-xml-dtd:4.1.2 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.35.0:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=Mixer library for MATE Desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+alsa oss pulseaudio
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2 GPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 sys-devel/gettext:* alsa? ( >=media-libs/alsa-lib-1.0.5 ) pulseaudio? ( >=media-sound/pulseaudio-2.0.0:0[alsa?,glib] )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/libmatemixer-1.18.0.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=d76c1d8ccdc4ce8f007358e5fa13823f
diff --git a/metadata/md5-cache/media-libs/libmatemixer-1.22.0 b/metadata/md5-cache/media-libs/libmatemixer-1.22.0
index 7c75aa67123a..56b08fa92257 100644
--- a/metadata/md5-cache/media-libs/libmatemixer-1.22.0
+++ b/metadata/md5-cache/media-libs/libmatemixer-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Mixer library for MATE Desktop
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=+alsa oss pulseaudio
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=LGPL-2 GPL-2
RDEPEND=>=dev-libs/glib-2.50:2 sys-devel/gettext:* alsa? ( >=media-libs/alsa-lib-1.0.5 ) pulseaudio? ( >=media-sound/pulseaudio-5.0.0:0[alsa?,glib] )
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/libmatemixer-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=9085836d5d559a96835cd5a00a5f3c26
+_md5_=f3ef1a8b533a757b7250074dced4f41a
diff --git a/metadata/md5-cache/media-libs/libraw-0.19.2 b/metadata/md5-cache/media-libs/libraw-0.19.2
index c8f411db3690..d4932c81f650 100644
--- a/metadata/md5-cache/media-libs/libraw-0.19.2
+++ b/metadata/md5-cache/media-libs/libraw-0.19.2
@@ -5,10 +5,10 @@ DESCRIPTION=LibRaw is a library for reading RAW files obtained from digital phot
EAPI=7
HOMEPAGE=https://www.libraw.org/ https://github.com/LibRaw/LibRaw
IUSE=examples jpeg jpeg2k +lcms openmp abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1 CDDL
RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lcms? ( >=media-libs/lcms-2.5:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0/19
SRC_URI=https://www.libraw.org/data/LibRaw-0.19.2.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=1d93d865997ec1f93a726ae3b8f39118
+_md5_=b1000c46c2d632d9e2078c9f4d3793b2
diff --git a/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r7 b/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r7
index 0cfe85bb6582..fb1d1fc62369 100644
--- a/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r7
+++ b/metadata/md5-cache/media-libs/libwmf-0.2.8.4-r7
@@ -4,10 +4,10 @@ DESCRIPTION=A library for reading vector images in Microsoft's Windows Metafile
EAPI=6
HOMEPAGE=https://wvware.sourceforge.net/
IUSE=debug doc expat X
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
LICENSE=LGPL-2
RDEPEND=app-text/ghostscript-gpl media-fonts/urw-fonts media-libs/freetype:2= media-libs/libpng:0= sys-libs/zlib:= x11-libs/gdk-pixbuf:2[X?] virtual/jpeg:0= expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2= ) X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXpm )
SLOT=0
SRC_URI=mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=97a23f34144106a868736c7cc7494281
+_md5_=8621d6bd558e49e6ff05c571796a0be5
diff --git a/metadata/md5-cache/media-libs/lsp-plugins-1.1.7-r1 b/metadata/md5-cache/media-libs/lsp-plugins-1.1.7-r1
index b92033515de3..2d19261b82da 100644
--- a/metadata/md5-cache/media-libs/lsp-plugins-1.1.7-r1
+++ b/metadata/md5-cache/media-libs/lsp-plugins-1.1.7-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Linux Studio Plugins
EAPI=7
HOMEPAGE=https://lsp-plug.in
IUSE=doc jack ladspa +lv2
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-3
RDEPEND=dev-libs/expat media-libs/libsndfile doc? ( dev-lang/php:* ) jack? ( virtual/jack x11-libs/cairo[X] ) ladspa? ( media-libs/ladspa-sdk ) lv2? ( media-libs/lv2 x11-libs/cairo[X] )
REQUIRED_USE=|| ( jack ladspa lv2 )
SLOT=0
SRC_URI=https://github.com/sadko4u/lsp-plugins/archive/lsp-plugins-1.1.7.tar.gz
-_md5_=f35bff986dcd7e31ccb5549bd4a943c8
+_md5_=5d3e43faeddc30f3d8c470db63520c84
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-1.1.106 b/metadata/md5-cache/media-libs/vulkan-layers-1.1.106
new file mode 100644
index 000000000000..47ec640fb3aa
--- /dev/null
+++ b/metadata/md5-cache/media-libs/vulkan-layers-1.1.106
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 ) >=dev-util/glslang-7.11.3113:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/spirv-tools-2019.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/vulkan-headers-1.1.106 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Vulkan Validation Layers
+EAPI=6
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
+IUSE=X wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/21638dfbe1f15091659a722a805c9020e87ddf49.tar.gz -> vulkan-layers-1.1.106.tar.gz
+_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=2ca8d1e726b8526d525110e722ef8b0a
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-9999 b/metadata/md5-cache/media-libs/vulkan-layers-9999
index 8e8adace1893..cc65e385cec0 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-9999
+++ b/metadata/md5-cache/media-libs/vulkan-layers-9999
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 ) >=dev-util/glslang-7.10.2984:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/spirv-tools-2019.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/vulkan-headers-1.1.92.0 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 ) >=dev-util/glslang-7.11.3113:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/spirv-tools-2019.1-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/vulkan-headers-1.1.106 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=Vulkan Validation Layers
EAPI=6
HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
@@ -7,4 +7,4 @@ IUSE=X wayland abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_m
LICENSE=Apache-2.0
SLOT=0
_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf git-r3 0d4635eeb5a96cd5315597a47eba25c9 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=aebc6edb756ca4ed819409f30c8b4f95
+_md5_=3b05b082ec78b23a7ed6c8e6f4bd0009
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.1.106 b/metadata/md5-cache/media-libs/vulkan-loader-1.1.106
new file mode 100644
index 000000000000..2ddb018ccda7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/vulkan-loader-1.1.106
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 ) >=dev-util/vulkan-headers-1.1.106 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
+EAPI=6
+HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
+IUSE=layers wayland X abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+PDEPEND=layers? ( media-libs/vulkan-layers:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=https://github.com/KhronosGroup/Vulkan-Loader/archive/1df2ebd329df1ece1a5ed485573ea58e5bc6ff97.tar.gz -> vulkan-loader-1.1.106.tar.gz
+_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=0aa624238f35cf6fca1638954ec7d2b2
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-9999 b/metadata/md5-cache/media-libs/vulkan-loader-9999
index 2fe3b81d4cba..ad5ce9b6cc0a 100644
--- a/metadata/md5-cache/media-libs/vulkan-loader-9999
+++ b/metadata/md5-cache/media-libs/vulkan-loader-9999
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 ) >=dev-util/vulkan-headers-1.1.92.0 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 ) >=dev-util/vulkan-headers-1.1.106 wayland? ( dev-libs/wayland:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXrandr:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=Vulkan Installable Client Driver (ICD) Loader
EAPI=6
HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
PDEPEND=layers? ( media-libs/vulkan-layers:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0
_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf git-r3 0d4635eeb5a96cd5315597a47eba25c9 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=3123734f5007d57de751827248d764da
+_md5_=785a7d863ebd384c575f2100474474c5
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 2df00b365a69..f953cd93204e 100644
Binary files a/metadata/md5-cache/media-plugins/Manifest.gz and b/metadata/md5-cache/media-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.3 b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.3
index 633e8175fa68..249b90be4ad2 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.3
@@ -4,11 +4,11 @@ DESCRIPTION=Calculate Chromaprint fingerprint from audio files for GStreamer
EAPI=6
HOMEPAGE=https://gstreamer.freedesktop.org/
IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=media-libs/chromaprint[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.38.2-r1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gstreamer-1.2.4-r1:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/gst-plugins-bad-1.14.3:1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
RESTRICT=test
SLOT=1.0
SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.14.3.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gstreamer b64f69d32993abccfc229979742cc360 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=e0382a91cbd3eded77ddae26da42e166
+_md5_=708dc5eac875e124cee0ce18553ad8eb
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index d362eb5154ac..efb009a18f9f 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/lilypond-2.19.80-r1 b/metadata/md5-cache/media-sound/lilypond-2.19.80-r1
index e766a5fa3add..e216be0fb072 100644
--- a/metadata/md5-cache/media-sound/lilypond-2.19.80-r1
+++ b/metadata/md5-cache/media-sound/lilypond-2.19.80-r1
@@ -4,7 +4,7 @@ DESCRIPTION=GNU Music Typesetter
EAPI=6
HOMEPAGE=http://lilypond.org/
IUSE=debug emacs guile2 profile vim-syntax python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 ~hppa x86
+KEYWORDS=amd64 ~arm arm64 ~hppa x86
LICENSE=GPL-3 FDL-1.3
RDEPEND=>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2:12=[deprecated,regex] media-fonts/tex-gyre media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) guile2? ( >=dev-scheme/guile-2:12 ) !guile2? ( >=dev-scheme/guile-1.8.2:12=[deprecated,regex] =dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://download.linuxaudio.org/lilypond/sources/v2.19/lilypond-2.19.80.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=4ed5b541881e58a699bd1b8332b1ee77
+_md5_=28ecc7164a8f30f81547fd1f839b39b6
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.5.5 b/metadata/md5-cache/media-sound/pulseeffects-4.5.5
deleted file mode 100644
index f7ea697c3893..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-4.5.5
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 media-libs/lsp-plugins[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
-DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
-EAPI=7
-HOMEPAGE=https://github.com/wwmm/pulseeffects
-IUSE=bs2b calf mda-lv2 rubberband
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 media-libs/lsp-plugins[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
-SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.5.5.tar.gz -> pulseeffects-4.5.5.tar.gz
-_eclasses_=gnome2-utils 532371cfcba45b2ab0d2950547c97d95 meson e53acc5913e5581a8a71be22731d8f36 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=61972d814c97ddba309251a1a61942a4
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.5.6 b/metadata/md5-cache/media-sound/pulseeffects-4.5.6
deleted file mode 100644
index 0a5127cbb4be..000000000000
--- a/metadata/md5-cache/media-sound/pulseeffects-4.5.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=sys-devel/gcc-7.3.0 dev-util/itstool virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 media-libs/lsp-plugins[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus dev-libs/appstream-glib sys-devel/gettext
-DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio
-EAPI=7
-HOMEPAGE=https://github.com/wwmm/pulseeffects
-IUSE=bs2b calf mda-lv2 rubberband
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 media-libs/lsp-plugins[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
-SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.5.6.tar.gz -> pulseeffects-4.5.6.tar.gz
-_eclasses_=gnome2-utils 532371cfcba45b2ab0d2950547c97d95 meson e53acc5913e5581a8a71be22731d8f36 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=61972d814c97ddba309251a1a61942a4
diff --git a/metadata/md5-cache/media-sound/pulseeffects-4.5.8 b/metadata/md5-cache/media-sound/pulseeffects-4.5.9
similarity index 93%
rename from metadata/md5-cache/media-sound/pulseeffects-4.5.8
rename to metadata/md5-cache/media-sound/pulseeffects-4.5.9
index 78ec0b865ebe..adce276763dc 100644
--- a/metadata/md5-cache/media-sound/pulseeffects-4.5.8
+++ b/metadata/md5-cache/media-sound/pulseeffects-4.5.9
@@ -5,10 +5,10 @@ DESCRIPTION=Limiter, compressor, reverberation, equalizer auto volume effects fo
EAPI=7
HOMEPAGE=https://github.com/wwmm/pulseeffects
IUSE=bs2b calf mda-lv2 rubberband
-KEYWORDS=~amd64
+KEYWORDS=amd64
LICENSE=GPL-3
RDEPEND=>=dev-libs/boost-1.41 >=dev-cpp/glibmm-2.56.0 >=dev-cpp/gtkmm-3.20:3.0 >=dev-libs/glib-2.56:2 >=dev-libs/libsigc++-2.10:2 >=x11-libs/gtk+-3.18:3 >=media-libs/lilv-0.24.2-r1 >=media-libs/lsp-plugins-1.1.7[lv2] >=media-libs/gstreamer-1.12.0:1.0 >=media-libs/gst-plugins-good-1.12.0:1.0 >=media-libs/gst-plugins-bad-1.12.0:1.0 bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 ) >=media-plugins/gst-plugins-ladspa-1.12.0:1.0 >=media-plugins/gst-plugins-lv2-1.12.0:1.0 >=media-plugins/gst-plugins-pulse-1.12.0:1.0 calf? ( >=media-plugins/calf-0.90.0[lv2] ) mda-lv2? ( media-plugins/mda-lv2 ) rubberband? ( media-libs/rubberband ) >=media-libs/zita-convolver-3.0.0 media-libs/libebur128 media-sound/pulseaudio sys-apps/dbus
SLOT=0
-SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.5.8.tar.gz -> pulseeffects-4.5.8.tar.gz
+SRC_URI=https://github.com/wwmm/pulseeffects/archive/v4.5.9.tar.gz -> pulseeffects-4.5.9.tar.gz
_eclasses_=gnome2-utils 532371cfcba45b2ab0d2950547c97d95 meson e53acc5913e5581a8a71be22731d8f36 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=e54e1978186be1965c60f916b25fbcc5
+_md5_=0d995f1c9474dbdd983731a7ac06f14e
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index fcce4ae97caf..d132a8682809 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/makemkv-1.14.2 b/metadata/md5-cache/media-video/makemkv-1.14.3
similarity index 89%
rename from metadata/md5-cache/media-video/makemkv-1.14.2
rename to metadata/md5-cache/media-video/makemkv-1.14.3
index 7404e7449de2..55bd4c99acf0 100644
--- a/metadata/md5-cache/media-video/makemkv-1.14.2
+++ b/metadata/md5-cache/media-video/makemkv-1.14.3
@@ -8,6 +8,6 @@ KEYWORDS=-* ~amd64 ~x86
LICENSE=LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl
RDEPEND=sys-libs/glibc dev-libs/expat dev-libs/openssl:0=[-bindist(-)] sys-libs/zlib gui? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) !libav? ( >=media-video/ffmpeg-1.0.0:0= ) libav? ( >=media-video/libav-0.8.9:0= ) media-video/ccextractor net-misc/wget
SLOT=0
-SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.14.2.tar.gz http://www.makemkv.com/download/makemkv-bin-1.14.2.tar.gz
+SRC_URI=http://www.makemkv.com/download/makemkv-oss-1.14.3.tar.gz http://www.makemkv.com/download/makemkv-bin-1.14.3.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf gnome2-utils 532371cfcba45b2ab0d2950547c97d95 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=0f01c4eb84cd99ddbdb92272a72ceb19
+_md5_=73c32a4bc45aebc7823088856937a66d
diff --git a/metadata/md5-cache/media-video/pitivi-0.999 b/metadata/md5-cache/media-video/pitivi-0.999
index 2962eb325095..095e16dc9040 100644
--- a/metadata/md5-cache/media-video/pitivi-0.999
+++ b/metadata/md5-cache/media-video/pitivi-0.999
@@ -5,11 +5,11 @@ DESCRIPTION=A non-linear video editor using the GStreamer multimedia framework
EAPI=7
HOMEPAGE=http://www.pitivi.org
IUSE=v4l test python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6 test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=LGPL-2.1
RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pycairo-1.10[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=x11-libs/cairo-1.10 >=media-libs/gstreamer-1.14.2:1.0[introspection] >=media-plugins/gst-transcoder-1.8.2-r1 >=dev-libs/glib-2.30.0:2 >=dev-libs/gobject-introspection-1.34:= dev-python/dbus-python[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/gst-python-1.4:1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/matplotlib[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/numpy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pygobject-3.8:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-base/librsvg:= >=media-libs/gsound-1.0 >=media-libs/gstreamer-editing-services-1.14.2:1.0[introspection] >=media-libs/gst-plugins-base-1.14.2:1.0[introspection] >=media-libs/gst-plugins-bad-1.14.2:1.0[gtk] >=media-libs/gst-plugins-good-1.14.2:1.0 >=media-plugins/gst-plugins-libav-1.14.2:1.0 >=media-plugins/gst-plugins-gdkpixbuf-1.14.2:1.0 >=x11-libs/libnotify-0.7[introspection] x11-libs/libwnck:3[introspection] >=x11-libs/gtk+-3.20.0:3[introspection] v4l? ( >=media-plugins/gst-plugins-v4l2-1.14.2:1.0 )
REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://gnome/sources/pitivi/0.999/pitivi-0.999.tar.xz
_eclasses_=gnome.org 532d56d07b9eace4831aaa817d2b756a meson e53acc5913e5581a8a71be22731d8f36 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=31920ed247a16eca9726c60f4cf373e5
+_md5_=4dfbe65bf044cf63ac2f910f31dc6189
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 242f9c3edf26..fcf8aef3f7d8 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/dietsniff-0.4 b/metadata/md5-cache/net-analyzer/dietsniff-0.4
deleted file mode 100644
index f5b3be11318a..000000000000
--- a/metadata/md5-cache/net-analyzer/dietsniff-0.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DEPEND=dev-libs/libowfat dev-libs/dietlibc
-DESCRIPTION=small and static packet sniffer based on dietlibc and libowfat
-EAPI=4
-HOMEPAGE=https://github.com/hynek/dietsniff
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://github.com/hynek/dietsniff/tarball/a80c0e64b3 -> dietsniff-0.4.tar.gz
-_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-snapshot b77011b62e2053c646ad720defe6d921
-_md5_=c102f1d3a9bcf3b6a772ed0a687e155c
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index cb39e867f21d..4214e95d1963 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/proftpd-1.3.6-r3 b/metadata/md5-cache/net-ftp/proftpd-1.3.6-r3
index 6514d88f8f1e..bff695fa9953 100644
--- a/metadata/md5-cache/net-ftp/proftpd-1.3.6-r3
+++ b/metadata/md5-cache/net-ftp/proftpd-1.3.6-r3
@@ -4,7 +4,7 @@ DESCRIPTION=An advanced and very configurable FTP server
EAPI=6
HOMEPAGE=http://www.proftpd.org/ http://www.castaglia.org/proftpd/ http://www.thrallingpenguin.com/resources/mod_clamav.htm http://gssmod.sourceforge.net/
IUSE=acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap libressl log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique_id vroot xinetd
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( dev-db/mysql-connector-c:0= ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pam? ( virtual/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) sodium? ( dev-libs/libsodium:0= ) sqlite? ( dev-db/sqlite:3 ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftp ) virtual/tmpfiles
REQUIRED_USE=ban? ( ctrls ) msg? ( ctrls ) sftp? ( ssl ) shaper? ( ctrls )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.6.tar.gz case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-0.11rc.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.6.tar.gz ) msg? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-msg-0.4.1.tar.gz ) vroot? ( https://github.com/Castaglia/proftpd-mod_vroot/archive/v0.9.4.tar.gz -> mod_vroot-0.9.4.tar.gz )
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f tmpfiles a6dd0427ea9c68067a0a7fe2236b457f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=1a38e180c9a76c02df9211fe1404edfc
+_md5_=a99e9a9ed335cbc231ce9bd07729afaa
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index b7064d5113a2..50ab3728ed3d 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/gajim-1.0.3 b/metadata/md5-cache/net-im/gajim-1.0.3
index bf173b191b6f..5dd6db032457 100644
--- a/metadata/md5-cache/net-im/gajim-1.0.3
+++ b/metadata/md5-cache/net-im/gajim-1.0.3
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://www.gajim.org/downloads/1.0/gajim-1.0.3.tar.bz2
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=e3fc3c1df8116c616ae0a74138dc2cf0
+_md5_=cb64794af77ed79bec812fc75085ada2
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-1.23.2 b/metadata/md5-cache/net-im/signal-desktop-bin-1.23.2-r1
similarity index 86%
rename from metadata/md5-cache/net-im/signal-desktop-bin-1.23.2
rename to metadata/md5-cache/net-im/signal-desktop-bin-1.23.2-r1
index 97f3d8705192..22fcba101b87 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.23.2
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.23.2-r1
@@ -4,8 +4,8 @@ EAPI=6
HOMEPAGE=https://signal.org/ https://github.com/WhisperSystems/Signal-Desktop
KEYWORDS=-* ~amd64
LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZLIB APSL-2 icu Artistic-2 LGPL-2.1
-RDEPEND=dev-libs/nss gnome-base/gconf:2 media-libs/mesa net-print/cups x11-libs/gtk+:3[X] x11-libs/libXScrnSaver x11-libs/libXtst
+RDEPEND=dev-libs/nss media-libs/mesa net-print/cups x11-libs/gtk+:3[X] x11-libs/libXScrnSaver x11-libs/libXtst
SLOT=0
SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.23.2_amd64.deb
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 pax-utils e85f015e815dd463b0c206d781ef45a5 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=3686767ca21cdfbe1cf1bb8df1e4291d
+_md5_=93fe0f2d0ac4d922ef7d54a32ef1d608
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 387e2d4b0ac2..c7e7271da3ab 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/libesmtp-1.0.6-r2 b/metadata/md5-cache/net-libs/libesmtp-1.0.6-r2
index a3237d83c4a6..061ed0e7f211 100644
--- a/metadata/md5-cache/net-libs/libesmtp-1.0.6-r2
+++ b/metadata/md5-cache/net-libs/libesmtp-1.0.6-r2
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) >=app-portage/elt-patches-20170815
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=app-portage/elt-patches-20170815
DESCRIPTION=lib that implements the client side of the SMTP protocol
EAPI=5
HOMEPAGE=http://brianstafford.info/libesmtp/
IUSE=debug libressl ntlm ssl static-libs threads
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
LICENSE=LGPL-2.1 GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
SLOT=0
SRC_URI=http://brianstafford.info/libesmtp/libesmtp-1.0.6.tar.bz2
_eclasses_=libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=8fbbac850ec261e58f547f151f204c2c
+_md5_=9cc6017518f71944ef5664b454b729db
diff --git a/metadata/md5-cache/net-libs/libesmtp-1.0.6-r3 b/metadata/md5-cache/net-libs/libesmtp-1.0.6-r3
index fbc5ad566e3f..ec42aa76ea26 100644
--- a/metadata/md5-cache/net-libs/libesmtp-1.0.6-r3
+++ b/metadata/md5-cache/net-libs/libesmtp-1.0.6-r3
@@ -1,14 +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=configure install prepare
-DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
+DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
DESCRIPTION=lib that implements the client side of the SMTP protocol
EAPI=7
HOMEPAGE=http://brianstafford.info/libesmtp/
IUSE=debug libressl ntlm ssl static-libs threads
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
LICENSE=LGPL-2.1 GPL-2
-RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
+RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
SLOT=0
SRC_URI=http://brianstafford.info/libesmtp/libesmtp-1.0.6.tar.bz2
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=5ff6dbe5810838fb17fe9bbea533752e
+_md5_=5493ef63af88b9ae2d4b81d984b45f37
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 734f8e0697be..0f024a7dcc19 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/casync-2_p20190407 b/metadata/md5-cache/net-misc/casync-2_p20190407
index 993ccb51e946..f7c825f3677c 100644
--- a/metadata/md5-cache/net-misc/casync-2_p20190407
+++ b/metadata/md5-cache/net-misc/casync-2_p20190407
@@ -1,13 +1,15 @@
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=app-arch/xz-utils app-arch/zstd dev-libs/openssl:0 net-misc/curl virtual/acl fuse? ( sys-fs/fuse:0 ) selinux? ( sys-libs/libselinux ) udev? ( virtual/libudev ) virtual/pkgconfig man? ( dev-python/sphinx ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+BDEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install test
+DEPEND=app-arch/xz-utils:= app-arch/zstd:= dev-libs/openssl:0= net-misc/curl:= virtual/acl:= fuse? ( sys-fs/fuse:0= ) selinux? ( sys-libs/libselinux:= ) udev? ( virtual/libudev:= ) virtual/pkgconfig man? ( dev-python/sphinx )
DESCRIPTION=Content-Addressable Data Synchronization Tool
-EAPI=6
+EAPI=7
HOMEPAGE=https://github.com/systemd/casync
IUSE=+fuse +udev man selinux test
KEYWORDS=~amd64
-LICENSE=LGPL-2.1
-RDEPEND=app-arch/xz-utils app-arch/zstd dev-libs/openssl:0 net-misc/curl virtual/acl fuse? ( sys-fs/fuse:0 ) selinux? ( sys-libs/libselinux ) udev? ( virtual/libudev )
+LICENSE=LGPL-2.1+
+RDEPEND=app-arch/xz-utils:= app-arch/zstd:= dev-libs/openssl:0= net-misc/curl:= virtual/acl:= fuse? ( sys-fs/fuse:0= ) selinux? ( sys-libs/libselinux:= ) udev? ( virtual/libudev:= )
+RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/systemd/casync/archive/6d185a540c54195a919d4b44f9bf28c341da3bf1.tar.gz -> casync-2_p20190407.tar.gz
-_eclasses_=meson e53acc5913e5581a8a71be22731d8f36 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-snapshot b77011b62e2053c646ad720defe6d921
-_md5_=2d1dce7c9318b86d65264e6237a90f61
+_eclasses_=meson e53acc5913e5581a8a71be22731d8f36 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=f0217de4b47ff5e1cab86b8fc04352ab
diff --git a/metadata/md5-cache/net-misc/modemmanager-1.8.2-r1 b/metadata/md5-cache/net-misc/modemmanager-1.8.2-r1
index b977a7b1ea71..d32e1f29634b 100644
--- a/metadata/md5-cache/net-misc/modemmanager-1.8.2-r1
+++ b/metadata/md5-cache/net-misc/modemmanager-1.8.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Modem and mobile broadband management libraries
EAPI=6
HOMEPAGE=https://www.freedesktop.org/wiki/Software/ModemManager/
IUSE=elogind +introspection mbim policykit +qmi systemd +udev vala
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86
LICENSE=GPL-2+
RDEPEND=>=dev-libs/glib-2.36.0:2 udev? ( >=virtual/libgudev-230:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) mbim? ( >=net-libs/libmbim-1.16.0 ) policykit? ( >=sys-auth/polkit-0.106[introspection] ) qmi? ( >=net-libs/libqmi-1.20.0:= ) elogind? ( sys-auth/elogind ) systemd? ( >=sys-apps/systemd-209 )
REQUIRED_USE=?? ( elogind systemd ) vala? ( introspection )
SLOT=0/1
SRC_URI=https://www.freedesktop.org/software/ModemManager/ModemManager-1.8.2.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 udev 7752f306eec7b286d00bdb47b763e7ac user 8bd74731cafdcdad8f7a63637302e073 vala a94a0fb4c35fe91774bb72ec8f3c861f vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=c80f124172d9006250e1cff4f3d6fde2
+_md5_=b1e41eda6923dee71f6b7d65949c052d
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.6.14 b/metadata/md5-cache/net-misc/rabbitmq-server-3.6.14
index d744600f121f..702aef0237a5 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.6.14
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.6.14
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install preinst setup
DEPEND=>=dev-lang/erlang-18[ssl] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto dev-libs/libxslt || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig
DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
EAPI=6
-HOMEPAGE=http://www.rabbitmq.com/
+HOMEPAGE=https://www.rabbitmq.com/
KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=GPL-2 MPL-1.1
RDEPEND=>=dev-lang/erlang-18[ssl]
SLOT=0
-SRC_URI=http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.14/rabbitmq-server-3.6.14.tar.xz
+SRC_URI=https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.14/rabbitmq-server-3.6.14.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fc628d3d219856f29b879a532206ecfc
+_md5_=1abdb035cc27241fe6f765cc905270b2
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.6.9 b/metadata/md5-cache/net-misc/rabbitmq-server-3.6.9
index edad1560b7ab..8ab96b0c45ac 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.6.9
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.6.9
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile install preinst setup
DEPEND=>=dev-lang/erlang-18[ssl] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto dev-libs/libxslt || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig
DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
EAPI=5
-HOMEPAGE=http://www.rabbitmq.com/
+HOMEPAGE=https://www.rabbitmq.com/
KEYWORDS=amd64 ~arm64 x86
LICENSE=GPL-2 MPL-1.1
RDEPEND=>=dev-lang/erlang-18[ssl]
SLOT=0
-SRC_URI=http://www.rabbitmq.com/releases/rabbitmq-server/v3.6.9/rabbitmq-server-3.6.9.tar.xz
+SRC_URI=https://www.rabbitmq.com/releases/rabbitmq-server/v3.6.9/rabbitmq-server-3.6.9.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c569ca9e5deec8e63de6daeef64b485
+_md5_=f0dc55398761fb08d46110acb504cb9a
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.10 b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.10
index 8ebd2ad139ed..0c2196771411 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.10
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.10
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile install preinst setup
DEPEND=>=dev-lang/erlang-19.3[ssl,smp] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto >=dev-lang/elixir-1.6.6 =dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
EAPI=7
-HOMEPAGE=http://www.rabbitmq.com/
+HOMEPAGE=https://www.rabbitmq.com/
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 MPL-1.1
RDEPEND=>=dev-lang/erlang-19.3[ssl,smp]
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.7.10/rabbitmq-server-3.7.10.tar.xz
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073
-_md5_=e504d4c9ab6810eb9d1d4dec5fd2fa58
+_md5_=2e75549219168a8dd25b86a8925b1424
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.11 b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.11
index 13b8d08ae5c6..d801c618462f 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.11
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.11
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile install preinst setup
DEPEND=>=dev-lang/erlang-20.3[ssl,smp] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto >=dev-lang/elixir-1.6.6 =dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
EAPI=7
-HOMEPAGE=http://www.rabbitmq.com/
+HOMEPAGE=https://www.rabbitmq.com/
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 MPL-1.1
RDEPEND=>=dev-lang/erlang-20.3[ssl,smp]
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.7.11/rabbitmq-server-3.7.11.tar.xz
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073
-_md5_=1ccd2f8a9749b597323045fd6f4d5beb
+_md5_=eef6d6bcd283ab6abfab38bc8f944889
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.13 b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.13
index f8d47e405b8f..b37beadba6f4 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.13
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.13
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile install preinst setup
DEPEND=>=dev-lang/erlang-21.0[ssl] =dev-lang/elixir-1.6.6 dev-libs/libxslt || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
EAPI=7
-HOMEPAGE=http://www.rabbitmq.com/
+HOMEPAGE=https://www.rabbitmq.com/
KEYWORDS=amd64 x86
LICENSE=GPL-2 MPL-1.1
RDEPEND=>=dev-lang/erlang-21.0[ssl] =dev-lang/erlang-19.3[ssl] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto =dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) virtual/pkgconfig
DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
EAPI=6
-HOMEPAGE=http://www.rabbitmq.com/
+HOMEPAGE=https://www.rabbitmq.com/
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 MPL-1.1
RDEPEND=>=dev-lang/erlang-19.3[ssl]
@@ -10,4 +10,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.7.3/rabbitmq-server-3.7.3.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4b0e99bb78559180b53d0b750a0bf4d6
+_md5_=e50d1e55f3bd02db9c63ea4b14bdd345
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.9 b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.9
index ecc260870017..bdc1c57323ff 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.7.9
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.7.9
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile install preinst setup
DEPEND=>=dev-lang/erlang-19.3[ssl] app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto >=dev-lang/elixir-1.6.6 =dev-lang/python-2.7.5-r2:2.7 dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) )
DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang
EAPI=7
-HOMEPAGE=http://www.rabbitmq.com/
+HOMEPAGE=https://www.rabbitmq.com/
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 MPL-1.1
RDEPEND=>=dev-lang/erlang-19.3[ssl]
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/rabbitmq/rabbitmq-server/releases/download/v3.7.9/rabbitmq-server-3.7.9.tar.xz
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073
-_md5_=11eabf826c7d523bf6d445e0d1b23b58
+_md5_=2d69ef39da5fad23c75418ca1fd3a434
diff --git a/metadata/md5-cache/net-misc/wget-1.20.3 b/metadata/md5-cache/net-misc/wget-1.20.3
index 59f9a9e3c13a..c325290c0c8a 100644
--- a/metadata/md5-cache/net-misc/wget-1.20.3
+++ b/metadata/md5-cache/net-misc/wget-1.20.3
@@ -4,11 +4,11 @@ DESCRIPTION=Network utility to retrieve files from the WWW
EAPI=6
HOMEPAGE=https://www.gnu.org/software/wget/
IUSE=debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~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? ( idn? ( >=net-dns/libidn2-0.14:= ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
SLOT=0
SRC_URI=mirror://gnu/wget/wget-1.20.3.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=429d1162328d33fc74b85fdcef4a6709
+_md5_=f148857b5b5ea90e73da0c38acbd4dea
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 8145762d0ec4..f5bb9671628a 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2 b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2
index 43c598574140..5986c884f05a 100644
--- a/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2
+++ b/metadata/md5-cache/net-wireless/gnome-bluetooth-3.28.2
@@ -4,10 +4,10 @@ DESCRIPTION=Bluetooth graphical utilities integrated with GNOME
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Projects/GnomeBluetooth
IUSE=gtk-doc +introspection
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
LICENSE=GPL-2+ LGPL-2.1+ FDL-1.1+
RDEPEND=>=x11-libs/gtk+-3.12:3[introspection?] media-libs/libcanberra[gtk3] >=x11-libs/libnotify-0.7.0 virtual/libudev >=dev-libs/glib-2.38:2 introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) virtual/udev >=net-wireless/bluez-5
SLOT=2/13
SRC_URI=mirror://gnome/sources/gnome-bluetooth/3.28/gnome-bluetooth-3.28.2.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2-utils 532371cfcba45b2ab0d2950547c97d95 ltprune 2729691420b6deeda2a90b1f1183fb55 meson e53acc5913e5581a8a71be22731d8f36 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 udev 7752f306eec7b286d00bdb47b763e7ac user 8bd74731cafdcdad8f7a63637302e073 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=ca99fbdc052efd4bfc60422c4bf7a678
+_md5_=0a440a4aaa32a650c1d1f4a01f131bb1
diff --git a/metadata/md5-cache/net-wireless/iwd-0.14 b/metadata/md5-cache/net-wireless/iwd-0.14
index df40d837bd90..9eff66e2ac7d 100644
--- a/metadata/md5-cache/net-wireless/iwd-0.14
+++ b/metadata/md5-cache/net-wireless/iwd-0.14
@@ -4,10 +4,10 @@ DESCRIPTION=Wireless daemon for linux
EAPI=6
HOMEPAGE=https://git.kernel.org/pub/scm/network/wireless/iwd.git/
IUSE=+client +monitor ofono wired cpu_flags_x86_aes cpu_flags_x86_ssse3 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~x86
LICENSE=GPL-2
RDEPEND=sys-apps/dbus client? ( sys-libs/readline:0= )
SLOT=0
SRC_URI=https://www.kernel.org/pub/linux/network/wireless/iwd-0.14.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=633fbe1079a95487c0985033b3ac24ed
+_md5_=0a3dcd2bcbfe4411e01d3605d75fa28a
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 85aa881f48ed..3a965d8f95a7 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/fftw-3.3.8 b/metadata/md5-cache/sci-libs/fftw-3.3.8
index d53ba8cb3500..bcec33451fa9 100644
--- a/metadata/md5-cache/sci-libs/fftw-3.3.8
+++ b/metadata/md5-cache/sci-libs/fftw-3.3.8
@@ -4,10 +4,10 @@ DESCRIPTION=Fast C library for the Discrete Fourier Transform
EAPI=6
HOMEPAGE=http://www.fftw.org/
IUSE=altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=GPL-2+
RDEPEND=mpi? ( >=virtual/mpi-2.0-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fortran? ( virtual/fortran )
SLOT=3.0/3
SRC_URI=http://www.fftw.org/fftw-3.3.8.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf fortran-2 f75a2d9321053acf424991e805f32ede ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cbf580c0df02f5e80199088716b2837f
+_md5_=1fcca0e0b467bd7ac73d6bc558ebdcbc
diff --git a/metadata/md5-cache/sci-libs/libsc-2.2 b/metadata/md5-cache/sci-libs/libsc-2.2
new file mode 100644
index 000000000000..c4ffa90c6c53
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/libsc-2.2
@@ -0,0 +1,15 @@
+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=configure install prepare pretend
+DEPEND=dev-lang/lua:* sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] ) virtual/pkgconfig
+DESCRIPTION=Support for parallel scientific applications
+EAPI=7
+HOMEPAGE=http://www.p4est.org/
+IUSE=debug examples mpi openmp romio static-libs threads
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-lang/lua:* sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio?] )
+REQUIRED_USE=romio? ( mpi )
+SLOT=0
+SRC_URI=https://github.com/cburstedde/libsc/archive/v2.2.tar.gz -> libsc-2.2.tar.gz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=6e63e465a932099c376debd720d462b7
diff --git a/metadata/md5-cache/sci-libs/p4est-2.0 b/metadata/md5-cache/sci-libs/p4est-2.0
index c2ffbb9bb82c..b8e967684c33 100644
--- a/metadata/md5-cache/sci-libs/p4est-2.0
+++ b/metadata/md5-cache/sci-libs/p4est-2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=romio? ( mpi )
SLOT=0
SRC_URI=https://github.com/cburstedde/p4est/archive/v2.0.tar.gz -> p4est-2.0.tar.gz https://github.com/cburstedde/libsc/archive/v2.0.tar.gz -> libsc-2.0.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9ebe8a4288927ab86b8892240d323912
+_md5_=46249008525c342996954a748c1eacf8
diff --git a/metadata/md5-cache/sci-libs/p4est-2.2 b/metadata/md5-cache/sci-libs/p4est-2.2
new file mode 100644
index 000000000000..b27004d2f3eb
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/p4est-2.2
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare pretend
+DEPEND=~sci-libs/libsc-2.2[mpi=,openmp=,romio=,static-libs=,threads=] dev-lang/lua:* sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] ) sys-devel/automake:1.11 virtual/pkgconfig
+DESCRIPTION=Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees
+EAPI=7
+HOMEPAGE=http://www.p4est.org/
+IUSE=debug doc examples mpi openmp romio static-libs threads +vtk-binary
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=~sci-libs/libsc-2.2[mpi=,openmp=,romio=,static-libs=,threads=] dev-lang/lua:* sys-apps/util-linux virtual/blas virtual/lapack mpi? ( virtual/mpi[romio=] )
+REQUIRED_USE=romio? ( mpi )
+SLOT=0
+SRC_URI=https://github.com/cburstedde/p4est/archive/v2.2.tar.gz -> p4est-2.2.tar.gz https://github.com/cburstedde/libsc/archive/v2.2.tar.gz -> libsc-2.2.tar.gz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=71871752f2c7614cb2bc7279d208cdb1
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index b03c8a0cdc82..0d30f3b96655 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/install-xattr-0.6 b/metadata/md5-cache/sys-apps/install-xattr-0.7
similarity index 97%
rename from metadata/md5-cache/sys-apps/install-xattr-0.6
rename to metadata/md5-cache/sys-apps/install-xattr-0.7
index be5cb5f98131..4977fe074f64 100644
--- a/metadata/md5-cache/sys-apps/install-xattr-0.6
+++ b/metadata/md5-cache/sys-apps/install-xattr-0.7
@@ -5,6 +5,6 @@ HOMEPAGE=https://dev.gentoo.org/~blueness/install-xattr/
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE=GPL-3
SLOT=0
-SRC_URI=https://dev.gentoo.org/~blueness/install-xattr/install-xattr-0.6.tar.bz2
+SRC_URI=https://dev.gentoo.org/~blueness/install-xattr/install-xattr-0.7.tar.bz2
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
_md5_=43418194ebd428f8eafa4ba33004afd0
diff --git a/metadata/md5-cache/sys-apps/inxi-2.3.37 b/metadata/md5-cache/sys-apps/inxi-2.3.37
deleted file mode 100644
index 6729463ed876..000000000000
--- a/metadata/md5-cache/sys-apps/inxi-2.3.37
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=The CLI inxi collects and prints hardware and system information
-EAPI=6
-HOMEPAGE=https://github.com/smxi/inxi
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=GPL-3
-RDEPEND=sys-apps/pciutils sys-apps/usbutils
-SLOT=0
-SRC_URI=https://github.com/smxi/inxi/tarball/2b4e89b21ffd06e888d89a38aaedb797ecea4403 -> inxi-2.3.37.tar.gz
-_md5_=3f30984d9ecee7a1ff9d283abf2c2fed
diff --git a/metadata/md5-cache/sys-apps/smartmontools-7.0-r1 b/metadata/md5-cache/sys-apps/smartmontools-7.0-r1
index e8ce7be83f72..450cb1d4332d 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-7.0-r1
+++ b/metadata/md5-cache/sys-apps/smartmontools-7.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Tools to monitor storage systems to provide advanced warning of disk
EAPI=6
HOMEPAGE=https://www.smartmontools.org
IUSE=caps +daemon selinux static systemd update_drivedb
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
LICENSE=GPL-2
RDEPEND=caps? ( static? ( sys-libs/libcap-ng[static-libs] ) !static? ( sys-libs/libcap-ng ) ) kernel_FreeBSD? ( sys-freebsd/freebsd-lib[usb] ) selinux? ( sys-libs/libselinux ) daemon? ( virtual/mailx ) selinux? ( sec-policy/selinux-smartmon ) systemd? ( sys-apps/systemd ) update_drivedb? ( app-crypt/gnupg || ( net-misc/curl net-misc/wget www-client/lynx dev-vcs/subversion ) )
REQUIRED_USE=( caps? ( daemon ) )
SLOT=0
SRC_URI=mirror://sourceforge/smartmontools/smartmontools-7.0.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=873ae1b86fc87b3069ddc3b9614a560b
+_md5_=8760f45d590b3e193dbf71ce18817614
diff --git a/metadata/md5-cache/sys-apps/texinfo-6.6-r1 b/metadata/md5-cache/sys-apps/texinfo-6.6-r1
index a635508392c3..a63e6cbba201 100644
--- a/metadata/md5-cache/sys-apps/texinfo-6.6-r1
+++ b/metadata/md5-cache/sys-apps/texinfo-6.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU info program and utilities
EAPI=6
HOMEPAGE=https://www.gnu.org/software/texinfo/
IUSE=nls static
-KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=GPL-3
RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl )
SLOT=0
SRC_URI=mirror://gnu/texinfo/texinfo-6.6.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3122e29ec9154e873ae925b1e609f54e
+_md5_=b3cc562ca18dce7f9515a788b61882af
diff --git a/metadata/md5-cache/sys-apps/yum-3.4.3_p20170619 b/metadata/md5-cache/sys-apps/yum-3.4.3_p20170619
deleted file mode 100644
index 44d007fd9d18..000000000000
--- a/metadata/md5-cache/sys-apps/yum-3.4.3_p20170619
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DEPEND=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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/rpm[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sqlitecachec[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyliblzma[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/intltool test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) virtual/pkgconfig
-DESCRIPTION=automatic updater and package installer/remover for rpm systems
-EAPI=6
-HOMEPAGE=http://yum.baseurl.org/
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~ppc64 ~ppc ~x86
-LICENSE=GPL-2
-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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-arch/rpm[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/sqlitecachec[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyliblzma[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/urlgrabber[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/yum-3.4.3_p20170619.tar.gz
-_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=2463349769c70153692abd225634b44d
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 73ea9bef10a5..a6429c14392d 100644
Binary files a/metadata/md5-cache/sys-auth/Manifest.gz and b/metadata/md5-cache/sys-auth/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-auth/keystone-14.0.1 b/metadata/md5-cache/sys-auth/keystone-14.0.1
deleted file mode 100644
index 5f5dcae42f1b..000000000000
--- a/metadata/md5-cache/sys-auth/keystone-14.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=The Openstack authentication, authorization, and service catalog
-EAPI=6
-HOMEPAGE=https://launchpad.net/keystone
-IUSE=+sqlite ldap memcached mongo mysql postgres test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-restful-0.3.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/scrypt-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauthlib-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pysaml2-4.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ldap? ( >=dev-python/pyldap-2.4.20[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ldappool-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-14.0.1 https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-14.0.1 https://tarballs.openstack.org/keystone/keystone-14.0.1.tar.gz
-_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=2ffd817913b034094b16e09fa2c8abe4
diff --git a/metadata/md5-cache/sys-auth/keystone-14.1.0 b/metadata/md5-cache/sys-auth/keystone-14.1.0-r1
similarity index 90%
rename from metadata/md5-cache/sys-auth/keystone-14.1.0
rename to metadata/md5-cache/sys-auth/keystone-14.1.0-r1
index e78f6ff50e65..9b77a03235f4 100644
--- a/metadata/md5-cache/sys-auth/keystone-14.1.0
+++ b/metadata/md5-cache/sys-auth/keystone-14.1.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The Openstack authentication, authorization, and service catalog
EAPI=6
HOMEPAGE=https://launchpad.net/keystone
IUSE=+sqlite ldap memcached mongo mysql postgres test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 x86
LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-restful-0.3.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/scrypt-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.38.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauthlib-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pysaml2-4.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ldap? ( >=dev-python/pyldap-2.4.20[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ldappool-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-restful-0.3.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/scrypt-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.38.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauthlib-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pysaml2-4.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ldap? ( >=dev-python/python-ldap-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ldappool-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-14.1.0 https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-14.1.0 https://tarballs.openstack.org/keystone/keystone-14.1.0.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=056edc37ebadd6987f27aa7ad09f7a65
+_md5_=dddc0231a235ed41e68915e17a794e6b
diff --git a/metadata/md5-cache/sys-auth/keystone-2018.2.9999 b/metadata/md5-cache/sys-auth/keystone-2018.2.9999
index a3839eafdb9e..9ff48c6c814f 100644
--- a/metadata/md5-cache/sys-auth/keystone-2018.2.9999
+++ b/metadata/md5-cache/sys-auth/keystone-2018.2.9999
@@ -5,9 +5,9 @@ EAPI=6
HOMEPAGE=https://launchpad.net/keystone
IUSE=+sqlite ldap memcached mongo mysql postgres test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-restful-0.3.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/scrypt-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.36.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauthlib-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pysaml2-4.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ldap? ( >=dev-python/pyldap-2.4.20[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ldappool-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pbr-2.1.0 >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/Babel-2.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/webob-1.7.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/routes-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-1.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/flask-restful-0.3.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cryptography-2.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( >=dev-python/pymysql-0.7.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.7[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/sqlalchemy-1.1.8[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/sqlalchemy-migrate-0.11.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.20.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/passlib-1.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/python-keystoneclient-3.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/keystonemiddleware-4.17.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/bcrypt-3.1.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/scrypt-0.8.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-cache-1.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-concurrency-3.26.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-config-5.2.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-context-2.21.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-messaging-5.29.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-db-4.27.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-i18n-3.15.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-log-3.38.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-middleware-3.31.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-policy-1.30.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-serialization-1.18.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/oslo-serialization-1.19.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oslo-utils-3.33.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/oauthlib-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pysaml2-4.5.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jsonschema-2.6.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ldap? ( >=dev-python/python-ldap-3.0.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/ldappool-2.3.1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-2018.2.9999 https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-2018.2.9999
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 git-r3 0d4635eeb5a96cd5315597a47eba25c9 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=f5aab8587188b6d8c1fa2cc524e6ed51
+_md5_=3a24d360b42f2333f6d2fcf60889eb4b
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 56d5a4af42ec..4361b638127f 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/io-scheduler-udev-rules-0-r1 b/metadata/md5-cache/sys-block/io-scheduler-udev-rules-1
similarity index 92%
rename from metadata/md5-cache/sys-block/io-scheduler-udev-rules-0-r1
rename to metadata/md5-cache/sys-block/io-scheduler-udev-rules-1
index 228a58e46351..75a0c83399c4 100644
--- a/metadata/md5-cache/sys-block/io-scheduler-udev-rules-0-r1
+++ b/metadata/md5-cache/sys-block/io-scheduler-udev-rules-1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=virtual/udev
SLOT=0
-SRC_URI=https://gitlab.com/pachoramos/io-scheduler-udev-rules/-/archive/0/io-scheduler-udev-rules-0.tar.bz2
+SRC_URI=https://gitlab.com/pachoramos/io-scheduler-udev-rules/-/archive/1/io-scheduler-udev-rules-1.tar.bz2
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9 udev 7752f306eec7b286d00bdb47b763e7ac
_md5_=cfcd634685502c43ee4c8ddc3813ce7b
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index be50ef39036a..2f24fdb3d50b 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/quik-2.1.6 b/metadata/md5-cache/sys-boot/quik-2.1.6
deleted file mode 100644
index db9f855e97fe..000000000000
--- a/metadata/md5-cache/sys-boot/quik-2.1.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prerm unpack
-DEPEND=app-arch/rpm2targz
-DESCRIPTION=OldWorld PowerMac Bootloader
-EAPI=0
-HOMEPAGE=http://penguinppc.org/bootloaders/quik/
-KEYWORDS=-* ppc
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.shiner.info/files/Yellow%20Dog%20Linux%204/quik/quik-2.1-6.ydl4.src.rpm
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 mount-boot 1e82d96b7a7dcb483b412497a90bb646 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b72bb740e8db818e1065916292f3779a
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 9700300f5b71..e544a3135328 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1 b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
index 4aa99293ab50..c0c1e45a6904 100644
--- a/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
+++ b/metadata/md5-cache/sys-cluster/cluster-glue-1.0.12-r1
@@ -1,13 +1,13 @@
DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=!=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
+DEPEND=!=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=Library pack for Heartbeat / Pacemaker
EAPI=6
HOMEPAGE=http://www.linux-ha.org/wiki/Cluster_Glue
IUSE=doc ipmilan libnet static-libs
KEYWORDS=~amd64 ~hppa ~x86
LICENSE=GPL-2
-RDEPEND=!=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) qemu-block? ( dev-libs/glib:2 ) systemtap? ( dev-util/systemtap ) tiering? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio dev-libs/openssl:=[-bindist] dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux virtual/acl virtual/pkgconfig sys-devel/bison sys-devel/flex test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr ) >=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=GlusterFS is a powerful network/cluster filesystem
-EAPI=6
-HOMEPAGE=https://www.gluster.org/
-IUSE=bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86
-LICENSE=|| ( GPL-2 LGPL-3+ )
-RDEPEND=bd-xlator? ( sys-fs/lvm2 ) !elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) qemu-block? ( dev-libs/glib:2 ) systemtap? ( dev-util/systemtap ) tiering? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio dev-libs/openssl:=[-bindist] dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux
-REQUIRED_USE=georeplication? ( python_targets_python2_7 ) glupy? ( python_targets_python2_7 ) ipv6? ( libtirpc )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/4.0/4.0.0/glusterfs-4.0.0.tar.gz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 estack 43ddf5aaffa7a8d0482df54d25a66a1f libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073 versionator 2352c3fc97241f6a02042773c8287748
-_md5_=5b6e5a029a12ad29adc8161165c91c14
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-4.0.2 b/metadata/md5-cache/sys-cluster/glusterfs-4.0.2
deleted file mode 100644
index d9ea24a3f197..000000000000
--- a/metadata/md5-cache/sys-cluster/glusterfs-4.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=bd-xlator? ( sys-fs/lvm2 ) !elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) qemu-block? ( dev-libs/glib:2 ) systemtap? ( dev-util/systemtap ) tiering? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio dev-libs/openssl:=[-bindist] dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux virtual/acl virtual/pkgconfig sys-devel/bison sys-devel/flex test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr ) >=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=GlusterFS is a powerful network/cluster filesystem
-EAPI=6
-HOMEPAGE=https://www.gluster.org/
-IUSE=bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2 LGPL-3+ )
-RDEPEND=bd-xlator? ( sys-fs/lvm2 ) !elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) qemu-block? ( dev-libs/glib:2 ) systemtap? ( dev-util/systemtap ) tiering? ( dev-db/sqlite:3 ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio dev-libs/openssl:=[-bindist] dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux
-REQUIRED_USE=georeplication? ( python_targets_python2_7 ) glupy? ( python_targets_python2_7 ) ipv6? ( libtirpc )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/4.0/4.0.2/glusterfs-4.0.2.tar.gz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 estack 43ddf5aaffa7a8d0482df54d25a66a1f libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073 versionator 2352c3fc97241f6a02042773c8287748
-_md5_=039f635e12bfb6aa5d82904e160e4ff9
diff --git a/metadata/md5-cache/sys-cluster/glusterfs-6.0 b/metadata/md5-cache/sys-cluster/glusterfs-6.0
new file mode 100644
index 000000000000..b884de386ab7
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/glusterfs-6.0
@@ -0,0 +1,16 @@
+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 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DEPEND=!elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux virtual/acl virtual/pkgconfig sys-devel/bison sys-devel/flex test? ( >=dev-util/cmocka-1.0.1 app-benchmarks/dbench dev-vcs/git net-fs/nfs-utils virtual/perl-Test-Harness dev-libs/yajl sys-fs/xfsprogs sys-apps/attr )
+DESCRIPTION=GlusterFS is a powerful network/cluster filesystem
+EAPI=7
+HOMEPAGE=https://www.gluster.org/
+IUSE=debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( GPL-2 LGPL-3+ )
+RDEPEND=!elibc_glibc? ( sys-libs/argp-standalone ) emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0:0 ) georeplication? ( python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* ) libtirpc? ( net-libs/libtirpc:= ) !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) ) xml? ( dev-libs/libxml2 ) sys-libs/readline:= dev-libs/libaio !libressl? ( dev-libs/openssl:=[-bindist] ) libressl? ( dev-libs/libressl:= ) dev-libs/userspace-rcu:= net-libs/rpcsvc-proto sys-apps/util-linux
+REQUIRED_USE=georeplication? ( ^^ ( python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) ) ipv6? ( libtirpc )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://download.gluster.org/pub/gluster/glusterfs/6/6.0/glusterfs-6.0.tar.gz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 elisp-common 23f47b2e1de7abf387105eddd1318738 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073
+_md5_=5715b67716bf9ddba38214cde0774752
diff --git a/metadata/md5-cache/sys-cluster/heat-12.0.0 b/metadata/md5-cache/sys-cluster/heat-12.0.0
index 76b2563de15b..2f887a6d54ee 100644
--- a/metadata/md5-cache/sys-cluster/heat-12.0.0
+++ b/metadata/md5-cache/sys-cluster/heat-12.0.0
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_t
SLOT=0
SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.stein -> heat.conf.sample-12.0.0 https://tarballs.openstack.org/heat/openstack-heat-12.0.0.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 linux-info 953c3b1c472dcadbf62098a9301327f2 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073
-_md5_=700f8406720d84ccae7462249819b564
+_md5_=a24837f23881617b8cd726a017921560
diff --git a/metadata/md5-cache/sys-cluster/keepalived-2.0.15 b/metadata/md5-cache/sys-cluster/keepalived-2.0.15
new file mode 100644
index 000000000000..4c4fae93f941
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/keepalived-2.0.15
@@ -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 virtual/pkgconfig
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libnl:= dev-libs/openssl:= dev-libs/popt net-libs/libnfnetlink sys-apps/iproute2 regex? ( >=dev-libs/libpcre2-8 ) dbus? ( sys-apps/dbus dev-libs/glib:2 ) json? ( dev-libs/json-c:= ) snmp? ( net-analyzer/net-snmp ) >=sys-kernel/linux-headers-4.4
+DESCRIPTION=A strong & robust keepalive facility to the Linux Virtual Server project
+EAPI=7
+HOMEPAGE=http://www.keepalived.org/
+IUSE=+bfd dbus debug -json regex snmp
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libnl:= dev-libs/openssl:= dev-libs/popt net-libs/libnfnetlink sys-apps/iproute2 regex? ( >=dev-libs/libpcre2-8 ) dbus? ( sys-apps/dbus dev-libs/glib:2 ) json? ( dev-libs/json-c:= ) snmp? ( net-analyzer/net-snmp )
+SLOT=0
+SRC_URI=http://www.keepalived.org/software/keepalived-2.0.15.tar.gz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=1d035b7fb2e28e9fb2490a6f4f32858e
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 54a34911d267..ded87d885956 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/b43-firmware-5.100.138 b/metadata/md5-cache/sys-firmware/b43-firmware-5.100.138
index 50c7f674f9cd..8a98263c7d43 100644
--- a/metadata/md5-cache/sys-firmware/b43-firmware-5.100.138
+++ b/metadata/md5-cache/sys-firmware/b43-firmware-5.100.138
@@ -3,9 +3,9 @@ DEPEND=>=net-wireless/b43-fwcutter-015
DESCRIPTION=broadcom firmware for b43 LP PHY and >=linux-3.2
EAPI=5
HOMEPAGE=http://linuxwireless.org/en/users/Drivers/b43
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=amd64 ppc ~x86
LICENSE=Broadcom
RESTRICT=binchecks strip bindist
SLOT=b43
SRC_URI=http://www.lwfinger.com/b43-firmware/broadcom-wl-5.100.138.tar.bz2
-_md5_=99bc9003d6e3ffccffa594cfe38c1196
+_md5_=5bb44ef7d366b4731f3089b23100d0f0
diff --git a/metadata/md5-cache/sys-firmware/b43legacy-firmware-3.130.20.0 b/metadata/md5-cache/sys-firmware/b43legacy-firmware-3.130.20.0
index f2e71ada8f3a..28c485b08a72 100644
--- a/metadata/md5-cache/sys-firmware/b43legacy-firmware-3.130.20.0
+++ b/metadata/md5-cache/sys-firmware/b43legacy-firmware-3.130.20.0
@@ -3,9 +3,9 @@ DEPEND=>=net-wireless/b43-fwcutter-012
DESCRIPTION=broadcom firmware for b43legacy/bcm43xx
EAPI=5
HOMEPAGE=http://linuxwireless.org/en/users/Drivers/b43
-KEYWORDS=~amd64 ppc ~x86
+KEYWORDS=amd64 ppc ~x86
LICENSE=Broadcom
RESTRICT=binchecks bindist strip
SLOT=0
SRC_URI=http://downloads.openwrt.org/sources/wl_apsta-3.130.20.0.o
-_md5_=4a0fa0fc8e359e7cdd52e7db10659cea
+_md5_=ad646cd4d6135ba7354bbb64ef904ac1
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index ba2f8c33e96b..b469a7dfa424 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/squashfs-tools-4.3_p7 b/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p7
index e85d9d576d66..6b335dd2d898 100644
--- a/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p7
+++ b/metadata/md5-cache/sys-fs/squashfs-tools-4.3_p7
@@ -4,10 +4,10 @@ DESCRIPTION=tools to create and extract Squashfs filesystems
EAPI=7
HOMEPAGE=http://squashfs.sourceforge.net
IUSE=debug lz4 lzma lzo static xattr +xz
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86
LICENSE=GPL-2
RDEPEND=!static? ( sys-libs/zlib !xz? ( !lzo? ( sys-libs/zlib ) ) lz4? ( app-arch/lz4 ) lzma? ( app-arch/xz-utils ) lzo? ( dev-libs/lzo ) xattr? ( sys-apps/attr ) xz? ( app-arch/xz-utils ) )
SLOT=0
SRC_URI=mirror://sourceforge/squashfs/squashfs4.3.tar.gz mirror://debian/pool/main/s/squashfs-tools/squashfs-tools_4.3-7.debian.tar.xz
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=82e6c16d0d4a080afd7b479cafc6ca3b
+_md5_=b9e6572f046f4da9b36579e7ee3bfe35
diff --git a/metadata/md5-cache/sys-fs/udev-242 b/metadata/md5-cache/sys-fs/udev-242
new file mode 100644
index 000000000000..aa2ccc2353dd
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/udev-242
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !=dev-util/intltool-0.50 >=dev-util/meson-0.40.0 dev-util/ninja >=sys-apps/coreutils-8.16 virtual/os-headers virtual/pkgconfig >=sys-kernel/linux-headers-3.9 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=Linux dynamic and persistent device naming support (aka userspace devfs)
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl +kmod selinux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1 MIT GPL-2
+PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
+RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !=net-dns/libidn2-2.0.5 vanilla? ( !sys-libs/timezone-data )
@@ -11,4 +11,4 @@ RESTRICT=strip
SLOT=2.2
SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/glibc-9999-patches-11.tar.xz multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20180511.tar.xz )
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf git-r3 0d4635eeb5a96cd5315597a47eba25c9 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f5dc6a39a88ee0613ebf99c8e45534f8
+_md5_=2817c4b10ef0baeab1e9754eb5af5b6c
diff --git a/metadata/md5-cache/sys-libs/libapparmor-2.13.2 b/metadata/md5-cache/sys-libs/libapparmor-2.13.2
index 30136ebc9854..5f2f46b04871 100644
--- a/metadata/md5-cache/sys-libs/libapparmor-2.13.2
+++ b/metadata/md5-cache/sys-libs/libapparmor-2.13.2
@@ -4,7 +4,7 @@ DESCRIPTION=Library to support AppArmor userspace utilities
EAPI=6
HOMEPAGE=https://gitlab.com/apparmor/apparmor/wikis/home
IUSE=doc +perl +python static-libs python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
LICENSE=LGPL-2.1
RDEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://launchpad.net/apparmor/2.13/2.13.2/+download/apparmor-2.13.2.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=e0e65be098d794b78adbedd1bfe2ab2f
+_md5_=833b18ee50a054136e7be8c167b3dcd1
diff --git a/metadata/md5-cache/sys-libs/musl-1.1.22 b/metadata/md5-cache/sys-libs/musl-1.1.22
index 604e87902e43..db3dec43f843 100644
--- a/metadata/md5-cache/sys-libs/musl-1.1.22
+++ b/metadata/md5-cache/sys-libs/musl-1.1.22
@@ -3,9 +3,9 @@ DESCRIPTION=Light, fast and simple C library focused on standards-conformance an
EAPI=6
HOMEPAGE=http://www.musl-libc.org/
IUSE=headers-only
-KEYWORDS=-* ~amd64 ~arm ~arm64 ~mips ~ppc ~x86
+KEYWORDS=-* amd64 ~arm arm64 ~mips ~ppc x86
LICENSE=MIT LGPL-2 GPL-2
SLOT=0
SRC_URI=http://www.musl-libc.org/releases/musl-1.1.22.tar.gz https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://dev.gentoo.org/~blueness/musl-misc/getent.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eace87bc3b8caab1eb0fcb6e00c467bd
+_md5_=677d033460fe04cdb7a4bba09224a80f
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index e948b2fc5741..acebdcec7778 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/mediawiki-1.32.0 b/metadata/md5-cache/www-apps/mediawiki-1.32.0
index e841820000e3..5829e02b7b7a 100644
--- a/metadata/md5-cache/www-apps/mediawiki-1.32.0
+++ b/metadata/md5-cache/www-apps/mediawiki-1.32.0
@@ -4,11 +4,11 @@ DESCRIPTION=The MediaWiki wiki web application (as used on wikipedia.org)
EAPI=6
HOMEPAGE=http://www.mediawiki.org
IUSE=imagemagick mysql postgres sqlite vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~x86
LICENSE=GPL-2
RDEPEND=>=dev-lang/php-7.0.0[fileinfo,iconv,json,mysql?,postgres?,session,ssl,unicode,xml,xmlreader] imagemagick? ( virtual/imagemagick-tools ) !imagemagick? ( dev-lang/php[gd] ) mysql? ( || ( >=dev-db/mariadb-5.5.8 >=dev-db/mysql-5.5.8 ) ) sqlite? ( >=dev-db/sqlite-3.3.7[fts3(+)] >=dev-lang/php-7.0.0[pdo] || ( dev-lang/php[sqlite] dev-lang/php[sqlite3] ) ) virtual/httpd-php >=app-admin/webapp-config-1.50.15
RESTRICT=test
SLOT=1.32.0
SRC_URI=http://releases.wikimedia.org/mediawiki/1.32/mediawiki-1.32.0.tar.gz
_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 webapp 16783e418aca3ffa461d68310bf7ab12
-_md5_=1153ccdc8a372dada23e4b2f36bc9567
+_md5_=5a204592cd581029b1d664325360b24c
diff --git a/metadata/md5-cache/www-apps/nanoc-4.11.2 b/metadata/md5-cache/www-apps/nanoc-4.11.2
new file mode 100644
index 000000000000..9382e17633dd
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nanoc-4.11.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( app-text/asciidoc app-text/highlight ) test? ( ruby_targets_ruby24? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby24] dev-ruby/rack:*[ruby_targets_ruby24] www-servers/adsf[ruby_targets_ruby24] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby24] >=dev-ruby/cri-2.15:0[ruby_targets_ruby24] ~www-apps/nanoc-core-4.11.2[ruby_targets_ruby24] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby24] >=dev-ruby/slow_enumerator_tools-1.1.0:1[ruby_targets_ruby24] >=dev-ruby/tomlrb-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby25] dev-ruby/rack:*[ruby_targets_ruby25] www-servers/adsf[ruby_targets_ruby25] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby25] >=dev-ruby/cri-2.15:0[ruby_targets_ruby25] ~www-apps/nanoc-core-4.11.2[ruby_targets_ruby25] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby25] >=dev-ruby/slow_enumerator_tools-1.1.0:1[ruby_targets_ruby25] >=dev-ruby/tomlrb-1.2:1[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/asciidoctor[ruby_targets_ruby24] dev-ruby/fuubar[ruby_targets_ruby24] dev-ruby/haml[ruby_targets_ruby24] dev-ruby/maruku[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/minitest[ruby_targets_ruby24] dev-ruby/mustache[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/rdoc[ruby_targets_ruby24] dev-ruby/rouge:2[ruby_targets_ruby24] dev-ruby/rubypants[ruby_targets_ruby24] dev-ruby/systemu[ruby_targets_ruby24] dev-ruby/timecop[ruby_targets_ruby24] dev-ruby/vcr[ruby_targets_ruby24] dev-ruby/webmock[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby24] dev-ruby/rdiscount[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] dev-ruby/asciidoctor[ruby_targets_ruby25] dev-ruby/fuubar[ruby_targets_ruby25] dev-ruby/haml[ruby_targets_ruby25] dev-ruby/maruku[ruby_targets_ruby25] >=dev-ruby/mocha-0.13[ruby_targets_ruby25] dev-ruby/minitest[ruby_targets_ruby25] dev-ruby/mustache[ruby_targets_ruby25] dev-ruby/pry[ruby_targets_ruby25] dev-ruby/rdoc[ruby_targets_ruby25] dev-ruby/rouge:2[ruby_targets_ruby25] dev-ruby/rubypants[ruby_targets_ruby25] dev-ruby/systemu[ruby_targets_ruby25] dev-ruby/timecop[ruby_targets_ruby25] dev-ruby/vcr[ruby_targets_ruby25] dev-ruby/webmock[ruby_targets_ruby25] dev-ruby/yard[ruby_targets_ruby25] ) doc? ( dev-ruby/kramdown[ruby_targets_ruby25] dev-ruby/rdiscount[ruby_targets_ruby25] dev-ruby/yard[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=nanoc is a simple but very flexible static site generator written in Ruby
+EAPI=6
+HOMEPAGE=https://nanoc.ws/
+IUSE=minimal test elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby24] dev-ruby/rack:*[ruby_targets_ruby24] www-servers/adsf[ruby_targets_ruby24] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby24] >=dev-ruby/cri-2.15:0[ruby_targets_ruby24] ~www-apps/nanoc-core-4.11.2[ruby_targets_ruby24] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby24] >=dev-ruby/slow_enumerator_tools-1.1.0:1[ruby_targets_ruby24] >=dev-ruby/tomlrb-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby25? ( !minimal? ( dev-ruby/mime-types:*[ruby_targets_ruby25] dev-ruby/rack:*[ruby_targets_ruby25] www-servers/adsf[ruby_targets_ruby25] ) >=dev-ruby/addressable-2.5[ruby_targets_ruby25] >=dev-ruby/cri-2.15:0[ruby_targets_ruby25] ~www-apps/nanoc-core-4.11.2[ruby_targets_ruby25] >=dev-ruby/parallel-1.12:1[ruby_targets_ruby25] >=dev-ruby/slow_enumerator_tools-1.1.0:1[ruby_targets_ruby25] >=dev-ruby/tomlrb-1.2:1[ruby_targets_ruby25] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/nanoc/nanoc/archive/4.11.2.tar.gz -> nanoc-4.11.2.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 4044516b167f460104703fee4a3c7f5f ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils 10cec86289e60f4b0d731b2e4b545e5d toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_md5_=6111a53cc7c9b0e7f5e342287c84a0eb
diff --git a/metadata/md5-cache/www-apps/novnc-9999 b/metadata/md5-cache/www-apps/novnc-9999
index 3c9c2e52b515..126b2afd2896 100644
--- a/metadata/md5-cache/www-apps/novnc-9999
+++ b/metadata/md5-cache/www-apps/novnc-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-python/websockify[python_targets_python2_7(-)?,python_targets_python
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 git-r3 0d4635eeb5a96cd5315597a47eba25c9 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=72336b244ca852a3bbe9ae130bf32bdb
+_md5_=f3c4f0c6b7e03f628985ff510c42e1d4
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 0c459fcad10b..7421ac892ed3 100644
Binary files a/metadata/md5-cache/www-misc/Manifest.gz and b/metadata/md5-cache/www-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.13 b/metadata/md5-cache/www-misc/urlwatch-2.13
index 0c586d80b5db..7f717f1e76ec 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.13
+++ b/metadata/md5-cache/www-misc/urlwatch-2.13
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycodestyle[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=A tool for monitoring webpages for updates
EAPI=6
HOMEPAGE=https://thp.io/2008/urlwatch/
IUSE=test python_targets_python3_5 python_targets_python3_6
KEYWORDS=amd64 x86
LICENSE=BSD
-RDEPEND=dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.13.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=254e1e345414602bb1764cbd1231580b
+_md5_=71a430cbfae70c7bb2c668a1259c0479
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.15 b/metadata/md5-cache/www-misc/urlwatch-2.15
deleted file mode 100644
index c3605428226e..000000000000
--- a/metadata/md5-cache/www-misc/urlwatch-2.15
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycodestyle[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-DEFINED_PHASES=compile configure install postinst prepare test
-DESCRIPTION=A tool for monitoring webpages for updates
-EAPI=7
-HOMEPAGE=https://thp.io/2008/urlwatch/
-IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
-SLOT=0
-SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.15.tar.gz
-_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=8b3be26501b9856829289e1058cddd26
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.16 b/metadata/md5-cache/www-misc/urlwatch-2.16
index 24bfdd30c526..2c1ae61ee3bd 100644
--- a/metadata/md5-cache/www-misc/urlwatch-2.16
+++ b/metadata/md5-cache/www-misc/urlwatch-2.16
@@ -1,4 +1,4 @@
-BDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cssselect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycodestyle[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cssselect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] =dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
DEFINED_PHASES=compile configure install postinst prepare test
DESCRIPTION=A tool for monitoring webpages for updates
EAPI=7
@@ -6,9 +6,9 @@ HOMEPAGE=https://thp.io/2008/urlwatch/
IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
KEYWORDS=~amd64 ~x86
LICENSE=BSD
-RDEPEND=dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cssselect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+RDEPEND=dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cssselect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] =dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.16.tar.gz
_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=cb2e70a0f0c1e636cda094de7313c285
+_md5_=bdc43c69381cec6fb325884b51b96196
diff --git a/metadata/md5-cache/www-misc/urlwatch-2.17 b/metadata/md5-cache/www-misc/urlwatch-2.17
new file mode 100644
index 000000000000..14b8ec82cb9e
--- /dev/null
+++ b/metadata/md5-cache/www-misc/urlwatch-2.17
@@ -0,0 +1,14 @@
+BDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] test? ( dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cssselect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/nose[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pycodestyle[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A tool for monitoring webpages for updates
+EAPI=7
+HOMEPAGE=https://thp.io/2008/urlwatch/
+IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/appdirs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/cssselect[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/keyring[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/lxml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/minidb[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyyaml[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://pypi/u/urlwatch/urlwatch-2.17.tar.gz
+_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
+_md5_=d7bf81b3f4fe50dc4a0a7fa764c88e77
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 2f7fd4e84457..0dc5df59118b 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/mate-notification-daemon-1.18.1 b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.18.1
deleted file mode 100644
index 986bdd13bb11..000000000000
--- a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.18.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.78:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 virtual/libintl:0 >=x11-libs/gtk+-3.14:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] !x11-misc/notify-osd:* !x11-misc/qtnotifydaemon:* !x11-misc/notification-daemon:* app-arch/xz-utils:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* >=sys-devel/libtool-2.2.6:2 virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=MATE Notification daemon
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.78:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7:0 x11-libs/libX11:0 virtual/libintl:0 >=x11-libs/gtk+-3.14:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] !x11-misc/notify-osd:* !x11-misc/qtnotifydaemon:* !x11-misc/notification-daemon:*
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-notification-daemon-1.18.1.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=c777dda9584aeaa96690e820191e1057
diff --git a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.22.0 b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.22.0
index acfda5bf9821..4c877586ea69 100644
--- a/metadata/md5-cache/x11-misc/mate-notification-daemon-1.22.0
+++ b/metadata/md5-cache/x11-misc/mate-notification-daemon-1.22.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/atk >=dev-libs/dbus-glib-0.78 >=dev-libs/glib-2.50:2 >=sys-apps/
DESCRIPTION=MATE Notification daemon
EAPI=6
HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/atk >=dev-libs/dbus-glib-0.78 >=dev-libs/glib-2.50:2 >=sys-apps/dbus-1 x11-libs/cairo >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/libnotify-0.7 x11-libs/libX11 virtual/libintl >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3:3 >=media-libs/libcanberra-0.4:0[gtk3] !x11-misc/notify-osd !x11-misc/qtnotifydaemon !x11-misc/notification-daemon
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-notification-daemon-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=b02f780e197d2aa77aacab6fd01656b7
+_md5_=304ffff4e9c6619f28e8c3c1e48bc85f
diff --git a/metadata/md5-cache/x11-misc/mozo-1.18.0 b/metadata/md5-cache/x11-misc/mozo-1.18.0
deleted file mode 100644
index 233afb476a9b..000000000000
--- a/metadata/md5-cache/x11-misc/mozo-1.18.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=mate-base/mate-menus-1.6[introspection,python] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] virtual/libintl:0 !!x11-misc/mate-menu-editor >=dev-util/intltool-0.40:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=Mozo menu editor for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-3:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=mate-base/mate-menus-1.6[introspection,python] x11-libs/gdk-pixbuf:2[introspection] x11-libs/gtk+:3[introspection] virtual/libintl:0 !!x11-misc/mate-menu-editor
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mozo-1.18.0.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=206565f136f3a9213835ea8cffa0ebe1
diff --git a/metadata/md5-cache/x11-misc/mozo-1.22.0 b/metadata/md5-cache/x11-misc/mozo-1.22.0
index fa9e357ecf9b..43eb066f43c8 100644
--- a/metadata/md5-cache/x11-misc/mozo-1.22.0
+++ b/metadata/md5-cache/x11-misc/mozo-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=Mozo menu editor for MATE
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-3:3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=mate-base/mate-menus-1.21.0[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.22:3[introspection] virtual/libintl !!x11-misc/mate-menu-editor
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mozo-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=87d6f5f245aa58bcdafbc9e3712d6fc7
+_md5_=4fcfb61a97a275e296c7a05771dade64
diff --git a/metadata/md5-cache/x11-misc/xdg-user-dirs-0.17 b/metadata/md5-cache/x11-misc/xdg-user-dirs-0.17
index 159896360363..d09bb9334c72 100644
--- a/metadata/md5-cache/x11-misc/xdg-user-dirs-0.17
+++ b/metadata/md5-cache/x11-misc/xdg-user-dirs-0.17
@@ -4,10 +4,10 @@ DESCRIPTION=Tool to help manage 'well known' user directories
EAPI=7
HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-user-dirs
IUSE=gtk
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=GPL-2
PDEPEND=gtk? ( x11-misc/xdg-user-dirs-gtk )
SLOT=0
SRC_URI=https://user-dirs.freedesktop.org/releases/xdg-user-dirs-0.17.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=04278ddd98f0f4b339de7e9f3ad9cc7c
+_md5_=25e6a69e4388178bf3094ea02d39cdfa
diff --git a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1 b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
index 231607d57686..eeb64c2b0847 100644
--- a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
+++ b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib >=x11-misc/xdg-user-dirs-0.14 >=x11-libs/gtk+-3.5.1:3 dev-u
DESCRIPTION=Integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications
EAPI=6
HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-user-dirs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=GPL-2
RDEPEND=dev-libs/glib >=x11-misc/xdg-user-dirs-0.14 >=x11-libs/gtk+-3.5.1:3
SLOT=0
SRC_URI=mirror://gnome/sources/xdg-user-dirs-gtk/0.10/xdg-user-dirs-gtk-0.10.tar.xz
_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 estack 43ddf5aaffa7a8d0482df54d25a66a1f gnome.org 532d56d07b9eace4831aaa817d2b756a readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 versionator 2352c3fc97241f6a02042773c8287748
-_md5_=771ab7295b496ba345bebe48f60fb963
+_md5_=156938db605e61dccf6e470f4c8635c0
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 195dbba26e97..782f449ac720 100644
Binary files a/metadata/md5-cache/x11-terms/Manifest.gz and b/metadata/md5-cache/x11-terms/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-terms/mate-terminal-1.18.2 b/metadata/md5-cache/x11-terms/mate-terminal-1.18.2
deleted file mode 100644
index e32c6601f2f8..000000000000
--- a/metadata/md5-cache/x11-terms/mate-terminal-1.18.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/gtk+-3.14:3[X] >=x11-libs/vte-0.38:2.91 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/glib-utils >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=The MATE Terminal
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/gtk+-3.14:3[X] >=x11-libs/vte-0.38:2.91 >=mate-base/mate-desktop-1.6
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-terminal-1.18.2.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=c5a96e7f5d453b7feeb904fbd081f134
diff --git a/metadata/md5-cache/x11-terms/mate-terminal-1.22.0 b/metadata/md5-cache/x11-terms/mate-terminal-1.22.0
index d2f6f64e7baa..5c19bb7fb113 100644
--- a/metadata/md5-cache/x11-terms/mate-terminal-1.22.0
+++ b/metadata/md5-cache/x11-terms/mate-terminal-1.22.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=gnome-base/dconf-0.13.4 x11-libs/gd
DESCRIPTION=The MATE Terminal
EAPI=6
HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-3
RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=gnome-base/dconf-0.13.4 x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/pango >=x11-libs/gtk+-3.22:3[X] >=x11-libs/vte-0.46:2.91 >=mate-base/mate-desktop-1.6
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-terminal-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=cdbe3f5a8302ba83ec0d9c25697d57a9
+_md5_=11d98139aec045bc41cb40475257c0ba
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index e8d590e80a53..fe6e460cfec7 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/mate-backgrounds-1.18.0 b/metadata/md5-cache/x11-themes/mate-backgrounds-1.18.0
deleted file mode 100644
index c66ba64bc091..000000000000
--- a/metadata/md5-cache/x11-themes/mate-backgrounds-1.18.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-util/intltool-0.35:* sys-devel/gettext:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=A set of backgrounds packaged with the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-backgrounds-1.18.0.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=9b1bb3b295a4d0920f696de02348e889
diff --git a/metadata/md5-cache/x11-themes/mate-backgrounds-1.22.0 b/metadata/md5-cache/x11-themes/mate-backgrounds-1.22.0
index 121fab053218..a0ca9806996c 100644
--- a/metadata/md5-cache/x11-themes/mate-backgrounds-1.22.0
+++ b/metadata/md5-cache/x11-themes/mate-backgrounds-1.22.0
@@ -3,9 +3,9 @@ DEPEND=>=dev-util/intltool-0.35 sys-devel/gettext:* >=app-portage/elt-patches-20
DESCRIPTION=A set of backgrounds packaged with the MATE desktop
EAPI=6
HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-backgrounds-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=d096770a30ce69feb55e989f94bacc71
+_md5_=ede9befe23442fc9d510a97d1fd63e02
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-1.18.2 b/metadata/md5-cache/x11-themes/mate-icon-theme-1.18.2
deleted file mode 100644
index fcadf1b1a77e..000000000000
--- a/metadata/md5-cache/x11-themes/mate-icon-theme-1.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=dev-util/intltool-0.40:* >=x11-misc/icon-naming-utils-0.8.7:0 sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=MATE default icon themes
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/mate-icon-theme-1.18.2.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=d4601b9754340920408fb0b9d63029f7
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-1.22.0 b/metadata/md5-cache/x11-themes/mate-icon-theme-1.22.0
index 633858394db5..fee787e2dcea 100644
--- a/metadata/md5-cache/x11-themes/mate-icon-theme-1.22.0
+++ b/metadata/md5-cache/x11-themes/mate-icon-theme-1.22.0
@@ -3,11 +3,11 @@ DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=dev-util/intltool-0.40 >=x11-misc/
DESCRIPTION=MATE default icon themes
EAPI=6
HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
RESTRICT=binchecks strip
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/mate-icon-theme-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=645277e9e5c2e6f5453f99e2ec3120c7
+_md5_=7bebd3258ff0b3afcd7ababa75ebf9d6
diff --git a/metadata/md5-cache/x11-themes/mate-themes-3.22.18 b/metadata/md5-cache/x11-themes/mate-themes-3.22.18
deleted file mode 100644
index 5a7902fb9548..000000000000
--- a/metadata/md5-cache/x11-themes/mate-themes-3.22.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=postinst postrm preinst prepare
-DEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 >=x11-themes/gtk-engines-2.15.3:2 x11-themes/gtk-engines-murrine >=dev-util/intltool-0.35:* sys-devel/gettext:* >=sys-devel/autoconf-2.53:* >=x11-misc/icon-naming-utils-0.8.7:0 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
-DESCRIPTION=A set of MATE themes, with sets for users with limited or low vision
-EAPI=6
-HOMEPAGE=http://mate-desktop.org
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1 GPL-3
-RDEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 >=x11-themes/gtk-engines-2.15.3:2 x11-themes/gtk-engines-murrine
-RESTRICT=binchecks strip
-SLOT=0/3.22
-SRC_URI=http://pub.mate-desktop.org/releases/themes/3.22/mate-themes-3.22.18.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=18ee2cdf4ddb1f9c711207816cbabb81
diff --git a/metadata/md5-cache/x11-themes/mate-themes-3.22.19 b/metadata/md5-cache/x11-themes/mate-themes-3.22.19
index af6f045347e4..55f6a9406e87 100644
--- a/metadata/md5-cache/x11-themes/mate-themes-3.22.19
+++ b/metadata/md5-cache/x11-themes/mate-themes-3.22.19
@@ -4,11 +4,11 @@ DEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 >=x11-themes/gtk-engines-2.
DESCRIPTION=A set of MATE themes, with sets for users with limited or low vision
EAPI=7
HOMEPAGE=http://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=LGPL-2.1 GPL-3
RDEPEND=>=x11-libs/gdk-pixbuf-2:2 >=x11-libs/gtk+-2:2 >=x11-themes/gtk-engines-2.15.3:2 x11-themes/gtk-engines-murrine
RESTRICT=binchecks strip
SLOT=0/3.22
SRC_URI=http://pub.mate-desktop.org/releases/themes/3.22/mate-themes-3.22.19.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=a186271ef82f1bbc5304d5d517b78f5f
+_md5_=9c741b2972ed9d06f065226febc744ae
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index f6101eab45c1..bee73a206d1f 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/marco-1.18.2 b/metadata/md5-cache/x11-wm/marco-1.18.2
deleted file mode 100644
index 965d9a269ee8..000000000000
--- a/metadata/md5-cache/x11-wm/marco-1.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= media-libs/libcanberra:0[gtk3] x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.0:3 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager app-text/yelp-tools:0 >=dev-util/intltool-0.34.90:* sys-devel/gettext:* virtual/pkgconfig:* x11-base/xorg-proto test? ( app-text/docbook-xml-dtd:4.5 ) >=app-portage/elt-patches-20170815 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info !=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 >=mate-base/mate-common-1.18
-DESCRIPTION=MATE default window manager
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=startup-notification test xinerama
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= media-libs/libcanberra:0[gtk3] x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.0:3 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager gnome-extra/zenity:0 >=mate-base/mate-desktop-1.17.0
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/marco-1.18.2.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=037561a18f0df76e9b169ed4c442b1bb
diff --git a/metadata/md5-cache/x11-wm/marco-1.22.0 b/metadata/md5-cache/x11-wm/marco-1.22.0
index 6abfb453c8ea..191f1b2ce4f4 100644
--- a/metadata/md5-cache/x11-wm/marco-1.22.0
+++ b/metadata/md5-cache/x11-wm/marco-1.22.0
@@ -4,10 +4,10 @@ DESCRIPTION=MATE default window manager
EAPI=6
HOMEPAGE=https://mate-desktop.org
IUSE=startup-notification test xinerama
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
LICENSE=GPL-2
RDEPEND=dev-libs/atk >=dev-libs/glib-2.50:2 >=gnome-base/libgtop-2:2= media-libs/libcanberra[gtk3] x11-libs/cairo >=x11-libs/pango-1.2[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.22:3 x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXcomposite-0.3 x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender >=x11-libs/startup-notification-0.7 virtual/libintl xinerama? ( x11-libs/libXinerama ) !!x11-wm/mate-window-manager gnome-extra/zenity >=mate-base/mate-desktop-1.20.0
SLOT=0
SRC_URI=https://pub.mate-desktop.org/releases/1.22/marco-1.22.0.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 mate 1d1847564eac8e0da804d51adea0a01d mate-desktop.org e10ab79a4595873541dc4897c7b19724 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=c7af32a2fc57158e987b63a8c8745e28
+_md5_=c931f50b3956b6b73ed2baccb319b585
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a0fbd7675505..8ffc9cfb0c24 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Apr 2019 20:08:45 +0000
+Mon, 15 Apr 2019 04:38:43 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index f577c0fa4264..6a913173be29 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -1459,11 +1459,6 @@
Michał Górny
Minor janitor
-
- monsieurp@gentoo.org
- Patrice Clement
- Member
-
perfinion@gentoo.org
Jason Zaman
@@ -2893,11 +2888,6 @@
Michał Górny
Minor helper
-
- monsieurp@gentoo.org
- Patrice Clement
- Member
-
soap@gentoo.org
David Seifert
@@ -3274,11 +3264,6 @@
Michał Górny
Author & maintainer
-
- monsieurp@gentoo.org
- Patrice Clement
- Developer
-
ruby@gentoo.org
diff --git a/metadata/timestamp b/metadata/timestamp
index 0890dbd32a42..594a00ffe568 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Apr 13 20:08:45 UTC 2019
+Mon Apr 15 04:38:43 UTC 2019
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index cfc2ca97f1ab..e81a349e5ba7 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Apr 2019 20:30:01 +0000
+Mon, 15 Apr 2019 05:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 98dddd5be379..da7841c4bcec 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-062d04e9c335bb659e6890ee240107716841a854 1555182715 2019-04-13T19:11:55+00:00
+e02c103ecb8301d891d89af3b88c655492f47c42 1555292029 2019-04-15T01:33:49+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 76469be0b755..c3fa10ac4732 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1555185901 Sat 13 Apr 2019 08:05:01 PM UTC
+1555302901 Mon 15 Apr 2019 04:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a0fbd7675505..8ffc9cfb0c24 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Apr 2019 20:08:45 +0000
+Mon, 15 Apr 2019 04:38:43 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index ef8aea9edc82..dcfb9ad5e915 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/dietsniff/Manifest b/net-analyzer/dietsniff/Manifest
deleted file mode 100644
index cfc8f5265bc0..000000000000
--- a/net-analyzer/dietsniff/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST dietsniff-0.4.tar.gz 14375 BLAKE2B 8a66b0ebe4d010b2337e16b3d00e1defd52590293227e871e33c760b4456fe0dc4c08f2b4efe071807074e75ae5e44e53875e635766b97978f408b7943f343eb SHA512 fb6a1578f7c0554f51f2035449bbde3d810d0ec67c397ebcdf7d43bd704928dd304e2f519372f5b5d9e4168a2a9e5b4f3ccc46341862276d9c3bf3da0132f1fa
diff --git a/net-analyzer/dietsniff/dietsniff-0.4.ebuild b/net-analyzer/dietsniff/dietsniff-0.4.ebuild
deleted file mode 100644
index 525ed6964dc3..000000000000
--- a/net-analyzer/dietsniff/dietsniff-0.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs vcs-snapshot
-
-DESCRIPTION="small and static packet sniffer based on dietlibc and libowfat"
-HOMEPAGE="https://github.com/hynek/dietsniff"
-SRC_URI="https://github.com/hynek/dietsniff/tarball/a80c0e64b3 -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-libs/libowfat
- dev-libs/dietlibc"
-
-src_prepare() {
- sed -e '/^prefix=/s:=.*:=/usr:' \
- -e '/^MAN1DIR=/s:man/man1:share/man/man1:' \
- -e '/^CC/s:=:?=:' \
- -e '/^CFLAGS/s:=:+=:' \
- -e '/^LDFLAGS/s:=-s:+=:' \
- -e '/^dietsniff/,+3s: -o : $(LDFLAGS) -o :' \
- -e '/^dietsniff/,+3s:strip:#strip:' \
- -i Makefile
- export CC="diet -Os $(tc-getCC)"
-}
-
-src_install() {
- default
-
- dodoc AUTHORS ChangeLog README
-}
diff --git a/net-analyzer/dietsniff/metadata.xml b/net-analyzer/dietsniff/metadata.xml
deleted file mode 100644
index 9a1ccff140a7..000000000000
--- a/net-analyzer/dietsniff/metadata.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
- https://github.com/hynek/dietsniff/issues
-
- hs@ox.cx
- Hynek Schlawack
-
- hynek/dietsniff
-
-
-dietsniff is a network-debugging tool like tcpdump or ethereal. The
-difference to those powerful tools however is that dietsniff is linked
-against Felix von Leitner's dietlibc and doesn't require libpcap.
-Therefore it's really small while being static. dietsniff's most
-useful scenario is probably to sniff the packets into a pcap-logfile which
-can be later viewed using more user friendly applications.
-
-
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 9df69321a413..d73477dcc78b 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
index d58eba277fdb..deef56383932 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
kerberos ldap libressl log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique_id vroot xinetd"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 87d0d7a677a7..3a21153317af 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/gajim/files/1.0.3-0001-disable-gspell.patch b/net-im/gajim/files/1.0.3-0001-disable-gspell.patch
deleted file mode 100644
index fbffa1123342..000000000000
--- a/net-im/gajim/files/1.0.3-0001-disable-gspell.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/gajim/common/app.py 2018-05-16 05:59:40.278703415 +0300
-+++ b/gajim/common/app.py 2018-05-16 06:00:14.520423471 +0300
-@@ -265,20 +265,6 @@
- HAVE_IDLE = False
-
- HAVE_SPELL = False
--try:
-- spell_log = logging.getLogger('gajim.speller')
-- gi.require_version('Gspell', '1')
-- from gi.repository import Gspell
-- langs = Gspell.language_get_available()
-- for lang in langs:
-- spell_log.info('%s (%s) dict available',
-- lang.get_name(), lang.get_code())
-- if langs:
-- HAVE_SPELL = True
-- else:
-- spell_log.info('No dicts available')
--except (ImportError, ValueError):
-- pass
-
- gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'}
- gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE,
diff --git a/net-im/gajim/gajim-1.0.3.ebuild b/net-im/gajim/gajim-1.0.3.ebuild
index 25b4890f1575..719d5ddebbd1 100644
--- a/net-im/gajim/gajim-1.0.3.ebuild
+++ b/net-im/gajim/gajim-1.0.3.ebuild
@@ -67,12 +67,6 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT="test"
-src_prepare() {
- default
-
- use spell || eapply "${FILESDIR}/${PV}-0001-disable-gspell.patch"
-}
-
pkg_postinst() {
gnome2_icon_cache_update
xdg_desktop_database_update
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.23.2.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.23.2-r1.ebuild
similarity index 98%
rename from net-im/signal-desktop-bin/signal-desktop-bin-1.23.2.ebuild
rename to net-im/signal-desktop-bin/signal-desktop-bin-1.23.2-r1.ebuild
index 159987e3abe2..98953cd788e0 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.23.2.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.23.2-r1.ebuild
@@ -19,7 +19,6 @@ IUSE=""
RDEPEND="
dev-libs/nss
- gnome-base/gconf:2
media-libs/mesa
net-print/cups
x11-libs/gtk+:3[X]
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 22f377c2b74d..52e140470699 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild
index f019d160ae51..1bd5ae76df71 100644
--- a/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0.6-r2.ebuild
@@ -16,7 +16,7 @@ IUSE="debug libressl ntlm ssl static-libs threads"
RDEPEND="
ssl? (
!libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ libressl? ( dev-libs/libressl:0= )
)"
DEPEND="${RDEPEND}"
diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
index c0d28b116e78..076c676f8ddc 100644
--- a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,13 +10,13 @@ SRC_URI="http://brianstafford.info/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="debug libressl ntlm ssl static-libs threads"
RDEPEND="
ssl? (
!libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
+ libressl? ( dev-libs/libressl:0= )
)"
DEPEND="${RDEPEND}"
DOCS=( AUTHORS ChangeLog NEWS Notes README TODO )
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index e280f9fd1372..54f7a455b042 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/casync/casync-2_p20190407.ebuild b/net-misc/casync/casync-2_p20190407.ebuild
index 5dc04cbd3945..853ece213c86 100644
--- a/net-misc/casync/casync-2_p20190407.ebuild
+++ b/net-misc/casync/casync-2_p20190407.ebuild
@@ -1,28 +1,30 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit vcs-snapshot meson
+EAPI=7
+inherit meson
-COMMIT="6d185a540c54195a919d4b44f9bf28c341da3bf1"
-DESCRIPTION=" Content-Addressable Data Synchronization Tool"
+EGIT_COMMIT="6d185a540c54195a919d4b44f9bf28c341da3bf1"
+DESCRIPTION="Content-Addressable Data Synchronization Tool"
HOMEPAGE="https://github.com/systemd/casync"
-SRC_URI="https://github.com/systemd/casync/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/systemd/casync/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64"
IUSE="+fuse +udev man selinux test"
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
RDEPEND="
- app-arch/xz-utils
- app-arch/zstd
- dev-libs/openssl:0
- net-misc/curl
- virtual/acl
- fuse? ( sys-fs/fuse:0 )
- selinux? ( sys-libs/libselinux )
- udev? ( virtual/libudev )
+ app-arch/xz-utils:=
+ app-arch/zstd:=
+ dev-libs/openssl:0=
+ net-misc/curl:=
+ virtual/acl:=
+ fuse? ( sys-fs/fuse:0= )
+ selinux? ( sys-libs/libselinux:= )
+ udev? ( virtual/libudev:= )
"
DEPEND="${RDEPEND}
virtual/pkgconfig
@@ -34,13 +36,7 @@ src_configure() {
-Dfuse="$(usex fuse true false)"
-Dman="$(usex man true false)"
-Dselinux="$(usex selinux true false)"
- -Dtests="$(usex test true false)"
-Dudev="$(usex udev true false)"
)
meson_src_configure
}
-
-src_install() {
- meson_src_install
- find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/net-misc/casync/metadata.xml b/net-misc/casync/metadata.xml
index 4468d7433a37..0a6e55e76e12 100644
--- a/net-misc/casync/metadata.xml
+++ b/net-misc/casync/metadata.xml
@@ -1,6 +1,10 @@
+
+ zoltan@sinustrom.info
+ Zoltan Puskas
+
hurikhan77+bgo@gmail.com
Kai Krakow
diff --git a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
index 6e53acd32068..80aac4f17fce 100644
--- a/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
+++ b/net-misc/modemmanager/modemmanager-1.8.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.ta
LICENSE="GPL-2+"
SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N}
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
IUSE="elogind +introspection mbim policykit +qmi systemd +udev vala"
REQUIRED_USE="
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild
index dbb8168aa3c4..d6fd89e8e0e4 100644
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild
+++ b/net-misc/rabbitmq-server/rabbitmq-server-3.6.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
inherit eutils python-any-r1 systemd user
DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang"
-HOMEPAGE="http://www.rabbitmq.com/"
-SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.xz"
+HOMEPAGE="https://www.rabbitmq.com/"
+SRC_URI="https://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.xz"
LICENSE="GPL-2 MPL-1.1"
SLOT="0"
@@ -88,12 +88,12 @@ pkg_preinst() {
elog
elog "Please read release notes before upgrading:"
elog
- elog "http://www.rabbitmq.com/release-notes/README-3.0.0.txt"
+ elog "https://www.rabbitmq.com/release-notes/README-3.0.0.txt"
fi
if has_version " (15 Apr 2019)
+# app-arch/zstd is not keyworded.
+dev-libs/boost zstd
+
# Hans de Graaff (08 Apr 2019)
# Obsolete ruby version, no newer versions keyworded or stable.
dev-vcs/subversion ruby
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index bc0de31ddc4a..4801b45d2f5d 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,11 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Andreas K. Hüttel (14 Apr 2019)
+# Make sure glibc static libs are installed for now. Not installing
+# them is an experimental feature and needs testing.
+sys-libs/glibc static-libs
+
# Mart Raudsepp (14 Dec 2018)
# Security is not optional if available for the architecture/kernel.
gnome-base/gnome-desktop seccomp
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 4d25b6c630e8..42af96322d38 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -334,10 +334,6 @@ mate-base/mate bluetooth
app-editors/emacs cairo
app-editors/emacs-vcs cairo
-# Gilles Dartiguelongue (21 Aug 2016)
-# Needs a Gstreamer plugin from gst-plugins-bad that is not packaged to date
-media-plugins/grilo-plugins chromaprint
-
# Michał Górny (05 Jul 2016)
# Mask system-clang support as it requires llvm-3.4 that is subject
# to security bug cleanup, #585102.
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index a18c16751d10..aff54b5205d7 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in package.use.mask
+# Mart Raudsepp (14 Apr 2019)
+# Needs media-plugins/gst-plugins-chromaprint, which is not stable
+# anywhere yet.
+media-plugins/grilo-plugins chromaprint
+
# Andreas Sturmlechner (16 Feb 2019)
# Unstable dependencies.
media-gfx/digikam vkontakte
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 596bcd617ea5..9f49523996e5 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Aaron Bauman (14 Apr 2019)
+# Masked due to vulnerability in dev-libs/ace
+dev-cpp/xsd ace
+
# Jason Zaman (06 Sep 2015)
# This is masked in base/package.use.mask as Linux only.
sys-auth/consolekit -cgroups
diff --git a/profiles/package.mask b/profiles/package.mask
index 2cdacb52e68f..20d2dfc77ced 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,61 @@
#--- END OF EXAMPLES ---
+# David Seifert (15 Apr 2019)
+# Masked for testing, Bug #653878.
+>=dev-libs/boost-1.70.0
+>=dev-util/boost-build-1.70.0
+
+# Patrice Clement (14 Apr 2019)
+# Old, unmaintained and sometimes abandoned Java libraries/programs.
+# Removal in 30 days.
+dev-java/idm-console-framework
+dev-java/matrix-toolkits-java
+dev-java/sat4j-pseudo
+dev-java/sat4j-core
+dev-java/swarmcache
+dev-java/dbus-java
+dev-java/jinklevel
+dev-java/proguard
+dev-java/nailgun
+dev-java/jgroups
+dev-java/libmso
+dev-java/jicmp
+media-sound/jtagger
+app-admin/389-console
+
+# Michał Górny (14 Apr 2019)
+# The ebuild violates EAPI and relies on STRIP_MASK. The default
+# behavior makes it capable of executing arbitrary commands when running
+# files from untrusted sources. Last maintainer activity in 2015. Last
+# upstream release in 2011.
+# Removal in 30 days. Bug #651430.
+app-text/active-dvi
+
+# Michał Górny (14 Apr 2019)
+# The ebuild violates EAPI and relies on STRIP_MASK. Also has
+# suspicious USE=debug logic. Not touched since 2016.
+# Removal in 30 days. Bug #651450.
+dev-util/cyclo
+
+# Michał Górny (14 Apr 2019)
+# The ebuild violates EAPI and relies on STRIP_MASK. Also has
+# suspicious USE=debug logic. Not touched since 2016.
+# Removal in 30 days. Bug #651446.
+dev-util/cccc
+
+# Michał Górny (14 Apr 2019)
+# Integrated into dev-python/python-ldap-3.0+, and declared a deprecated
+# fork by upstream. No reverse dependencies left.
+# Removal in 30 days. Bug #668066.
+dev-python/pyldap
+
+# Aaron Bauman (13 Apr 2019)
+# Unmaintained in Gentoo and outstanding vulnerability
+# Masked for removal in 30 days. Bug #522578
+dev-libs/ace
+net-proxy/bfilter
+
# Ulrich Müller (13 Apr 2019)
# Last release in 2001, HOMEPAGE and SRC_URI are gone.
# Byte-compilation with recent Emacs versions fails.
@@ -37,8 +92,7 @@ app-emacs/prom-wl
# Michał Górny (13 Apr 2019)
# Unmaintained. Contains vulnerable code and a large number of unsolved
-# (upstream) issues, including licensing issues that prevented Debian
-# from including it. The current version is from 2004, and carries
+# (upstream) issues. The current version is from 2004, and carries
# some local patches. Last upstream commits are from 2013, and involve
# three successive branches, the 0.7.x not having a release since 2004,
# and the two remaining branches never seeing a single release.
@@ -73,12 +127,6 @@ net-misc/netkit-rwho
# Removal in 30 days. Bug #682914.
app-crypt/sgeps
-# Michał Górny (13 Apr 2019)
-# Fails to run. The current release is from 2015, and upstream has not
-# made a release since. Uses games.eclass.
-# Removal in 30 days. Bug #654564.
-games-strategy/freecol
-
# Hans de Graaff (13 Apr 2019)
# Old ruby24-only slots of Rails-related packages
# These no longer have reverse dependencies or newer
@@ -109,10 +157,9 @@ dev-ruby/celluloid-supervision
# Aaron Bauman (12 Apr 2019)
# Multiple security vulnerabilities
-# No revbumps in several years
+# No revbumps in several years.
# Removal in 30 days. Bug #675682
dev-java/jackson-databind
-# rdeps
app-text/languagetool
app-vim/languagetool
dev-java/jackson-dataformat-xml
@@ -336,11 +383,6 @@ sys-apps/prefix-chain-utils
# Removal in 30 days. Bug #665174.
sys-auth/fprint_demo
-# Michał Górny (23 Mar 2019)
-# Unmaintained. Fails to build. Probably needs a fresh snapshot.
-# Removal in 30 days. Bug #669592.
-net-misc/casync
-
# Michał Górny (23 Mar 2019)
# Unmaintained. Fails to build due to patch that does not apply.
# Even if that weren't the case, it would need to be updated for modern
@@ -527,13 +569,6 @@ x11-plugins/wmpeople
# Removal in 30 days. Bug #252500.
dev-util/synopsis
-# Michał Górny (20 Mar 2019)
-# Unmaintained since 2015, with occasional uncoordinated updates
-# by varying developers. The current version is outdated, and fails
-# to build.
-# Removal in 30 days. Bug #669604.
-dev-util/trinity
-
# Miroslav Å ulc (19 Mar 2019)
# Depends on >=virtual/{jdk,jre}-11 which is masked
=www-servers/tomcat-9.0.17
@@ -542,11 +577,6 @@ dev-util/trinity
# Masked for testing
=mail-client/geary-3.32.0-r1
-# Patrice Clement (17 Mar 2019)
-# Old and unmaintained Java libraries. Removal in 30 days.
-dev-java/zemberek
-dev-java/echo2
-
# Michał Górny (17 Mar 2019)
# The current Gentoo version has been added in 2015 and has not been
# bumped since. It fails to build with new versions of gperf (#609272)
@@ -711,67 +741,6 @@ sci-chemistry/pymol-plugins-dynamics
# Removal in 30 days. Bug #671854.
www-plugins/mozplugger
-# Michał Górny (15 Mar 2019)
-# Package added in 2014 and not updated since. The current Gentoo
-# version used to violate multilib-strict (#627944), now it does not
-# build at all.
-# Removal in 30 days. Bug #638500.
-dev-util/igprof
-
-# Michał Górny (15 Mar 2019)
-# The current release is from 2005, upstream is gone. Last patch
-# added in 2010, since then the package is completely unmaintained.
-# Very bad ebuild quality, blocking strictening of Portage behavior.
-# Removal in 30 days. Bug #587306.
-sys-boot/quik
-
-# Michał Górny (15 Mar 2019)
-# Upstream website disappeared, and along with it remote index needed
-# for the program to work. No maintainer; package last touched in 2012.
-# Removal in 30 days. Bug #673600.
-app-text/rfcutil
-
-# Michał Górny (15 Mar 2019)
-# Unmaintained in Gentoo, obsoleted upstream. Tests fail (#632706).
-# Upstream suggests switching to Kubernetes.
-# Removal in 30 days. Bug #676728.
-app-admin/fleet
-
-# Michał Górny (15 Mar 2019)
-# Unmaintained in Gentoo, abandoned upstream. Last commit in 2012.
-# Fails to build, in multiple ways (#638842, #672190, #672196).
-# One of the two remaining unconditional revdeps of dev-libs/dietlibc.
-# Many alternatives exist, starting with net-analyzer/dsniff.
-# Removal in 30 days. Bug #678520.
-net-analyzer/dietsniff
-
-# Michał Górny (15 Mar 2019)
-# Last reverse dependency of dev-libs/libgcrypt-1.5* (#656378). Current
-# version is outdated, maintainer is MIA and the new versions are
-# in distro-unfriendly AppImage format (#661740).
-# Removal in 30 days. Bug #677486.
-dev-util/staruml-bin
-=dev-libs/libgcrypt-1.5*
-
-# Michał Górny (15 Mar 2019)
-# pyliblzma installs an old 'lzma' module that is incompatible with
-# the 'lzma' built-in in Python 3. As a result, programs written
-# to conditionally import the latter when available (assuming it will
-# have Python 3 API) are broken by its presence. The suggested
-# replacement is dev-python/backports-lzma that is backported
-# from Python 3.
-#
-# Yum is the only reverse dependency of pyliblzma left (#643312). Its
-# last release is from 2011, and the current Gentoo snapshot is
-# from 2017. Upstream git hosting / gitweb is broken and makes it
-# impossible to fetch current sources. Fedora is apparently replacing
-# it with DNF.
-#
-# Removal in 30 days. Bug #643308.
-app-arch/createrepo
-dev-python/pyliblzma
-sys-apps/yum
-
# Eray Aslan (01 Mar 2019)
# Mask experimental software
=mail-mta/postfix-3.5*
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 18208365aa82..fa5aed9526bb 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2320,8 +2320,10 @@ dev-libs/boost:context - Build and install the Boost.Context (and Boost.Fiber) l
dev-libs/boost:debug - Build and install only the debug version of the Boost libraries. Only enable this flag if you're developing against boost.
dev-libs/boost:doc - Install the full API documentation documentation. This takes over 200MB of extra disk space.
dev-libs/boost:nls - Build libboost_locale. This library requires compatible C library interfaces, which might not be provided by uClibc or other embedded libraries.
+dev-libs/boost:numpy - Optionally build NumPy extensions when Boost.Python is enabled
dev-libs/boost:threads - Build multi-thread-compatible libraries instead of single-threaded only.
dev-libs/boost:tools - Build and install the boost tools (bcp, quickbook, inspect, wave)
+dev-libs/boost:zstd - Enable zstd compression support in Boost.Iostreams
dev-libs/botan:boost - use dev-libs/boost
dev-libs/c-blosc:lz4 - Enable lz4 compression
dev-libs/c-blosc:snappy - Enable snappy compression
@@ -2565,9 +2567,11 @@ dev-libs/ucommon:socks - Build with socks proxy support
dev-libs/userspace-rcu:regression-test - Run regression tests (requires FEATURES=test)
dev-libs/ustr:ustr-import - Install ustr-import developer program and source code for bundling.
dev-libs/weston:colord - Allow setting color managment
+dev-libs/weston:desktop - Enable the desktop shell
dev-libs/weston:drm - Enable drm compositor support
dev-libs/weston:editor - Install wayland-editor example application
dev-libs/weston:fbdev - Enable fbdev compositor support
+dev-libs/weston:fullscreen - Enable fullscreen/kiosk shell
dev-libs/weston:gles2 - Use GLESv2 cairo instead of full GL
dev-libs/weston:headless - Headless backend and a noop renderer, mainly for testing purposes
dev-libs/weston:ivi - Enable the IVI shell
@@ -3341,7 +3345,7 @@ games-action/trine-enchanted-edition:launcher - Install GTK+ launcher
games-action/trine2:launcher - Install GTK+ launcher
games-arcade/bomns:editor - enables building the level editor
games-arcade/burgerspace:network - Enable client-server support
-games-arcade/commandergenius:tremor - Use media-libs/tremor as ogg decoder instead of media-libs/libvorbis
+games-arcade/commandergenius:downloader - Allows some Keen games to be downloaded from the menu
games-arcade/jumpnbump:music - Enable playing of background music
games-arcade/lbreakout2:themes - Install additional themes
games-arcade/moleinvasion:music - Download and install the music files
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 34f5b481139c..8f248afb7e6e 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/fftw/fftw-3.3.8.ebuild b/sci-libs/fftw/fftw-3.3.8.ebuild
index 47b31f4171e3..d345f5d141f9 100644
--- a/sci-libs/fftw/fftw-3.3.8.ebuild
+++ b/sci-libs/fftw/fftw-3.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ if [[ ${PV} = *9999 ]]; then
EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
else
SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
fi
LICENSE="GPL-2+"
diff --git a/sci-libs/libsc/Manifest b/sci-libs/libsc/Manifest
index a9780e3e091e..e05dc5417885 100644
--- a/sci-libs/libsc/Manifest
+++ b/sci-libs/libsc/Manifest
@@ -1,3 +1,4 @@
DIST libsc-1.0.tar.gz 257930 BLAKE2B b67ee98d8a31dcd09af70783a253b7289657c51e345c59b6551ab8be3a2067ce20d75c3f6323f4113501d57baf31d95c5a40b025c77f37a693616ae2bb118266 SHA512 bf5af600e9cbd4038b1bd40c88776b21be5d474e34f9aacf287b890d262a22dc50ca27982c2eb9adba9735c8d9bb1fc31de2a27b24cdab534e3b2f610d76db7d
DIST libsc-1.1.tar.gz 263643 BLAKE2B 827c0e01154983dd309301c6ecfa380d3489b5b764f131c2df2554b002a6c726a44272963cef4b4a853af5fb4c9ba98c77b01e107fc555432317662d985de2a9 SHA512 a3d8bea406a1987e68e88dd587aebe28c796f2a5bddfc381b34b5eb1448e0ac23889cc6f97fc1e4010289f83996180db42cbb001d0518360349b993dd37d4579
DIST libsc-2.0.tar.gz 296392 BLAKE2B b5e1ca5cf6802ed38c32db5e7a77aec2fc636d88f2562314088dc16d13a0dccd24706276b05f8ddd70bc3769270a378c0089873fb2a21ebc93d6ca2622d7a58e SHA512 e4cfe42a1c1fe17412e1ffb6ebebe1f760861a7fb707a6f8fd01cdebda96b166ee05e7ff034f3b9e30de5e9baa82c9a2cebe93d40772dbd206603321de40559c
+DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
diff --git a/sci-libs/libsc/libsc-2.2.ebuild b/sci-libs/libsc/libsc-2.2.ebuild
new file mode 100644
index 000000000000..832e275e91d8
--- /dev/null
+++ b/sci-libs/libsc/libsc-2.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools toolchain-funcs eutils
+
+DESCRIPTION="Support for parallel scientific applications"
+HOMEPAGE="http://www.p4est.org/"
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE="debug examples mpi openmp romio static-libs threads"
+
+REQUIRED_USE="romio? ( mpi )"
+
+RDEPEND="
+ dev-lang/lua:*
+ sys-apps/util-linux
+ virtual/blas
+ virtual/lapack
+ mpi? ( virtual/mpi[romio?] )"
+
+DEPEND="
+ ${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+AUTOTOOLS_AUTORECONF=true
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
+ tc-has-openmp || \
+ die "Please select an openmp capable compiler like gcc[openmp]"
+ fi
+}
+
+src_prepare() {
+ default
+
+ # Inject a version number into the build system
+ echo "${PV}" > ${S}/.tarball-version
+ eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable mpi)
+ $(use_enable openmp openmp)
+ $(use_enable romio mpiio)
+ $(use_enable static-libs static)
+ $(use_enable threads pthread)
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+ --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if use examples; then
+ docinto examples
+ dodoc -r example/*
+ docompress -x /usr/share/doc/${PF}/examples
+ else
+ # Remove compiled example binaries in case of -examples:
+ rm -r "${ED}"/usr/bin || die "rm failed"
+ fi
+
+ # Remove ac files, bug #619806
+ rm -r "${ED}"/usr/share/aclocal || die "rm failed"
+
+ # Fix wrong installation paths:
+ dodir /usr/share/libsc
+ mv "${ED}"/etc/* "${ED}"/usr/share/libsc || die "mv failed"
+ rmdir "${ED}"/etc/ || die "rmdir failed"
+ mv "${ED}"/usr/share/ini/* "${ED}"/usr/share/libsc || die "mv failed"
+ rmdir "${ED}"/usr/share/ini || die "rmdir failed"
+}
diff --git a/sci-libs/p4est/Manifest b/sci-libs/p4est/Manifest
index 0ce540d27caa..d8b401c26337 100644
--- a/sci-libs/p4est/Manifest
+++ b/sci-libs/p4est/Manifest
@@ -1,6 +1,8 @@
DIST libsc-1.0.tar.gz 257930 BLAKE2B b67ee98d8a31dcd09af70783a253b7289657c51e345c59b6551ab8be3a2067ce20d75c3f6323f4113501d57baf31d95c5a40b025c77f37a693616ae2bb118266 SHA512 bf5af600e9cbd4038b1bd40c88776b21be5d474e34f9aacf287b890d262a22dc50ca27982c2eb9adba9735c8d9bb1fc31de2a27b24cdab534e3b2f610d76db7d
DIST libsc-1.1.tar.gz 263643 BLAKE2B 827c0e01154983dd309301c6ecfa380d3489b5b764f131c2df2554b002a6c726a44272963cef4b4a853af5fb4c9ba98c77b01e107fc555432317662d985de2a9 SHA512 a3d8bea406a1987e68e88dd587aebe28c796f2a5bddfc381b34b5eb1448e0ac23889cc6f97fc1e4010289f83996180db42cbb001d0518360349b993dd37d4579
DIST libsc-2.0.tar.gz 296392 BLAKE2B b5e1ca5cf6802ed38c32db5e7a77aec2fc636d88f2562314088dc16d13a0dccd24706276b05f8ddd70bc3769270a378c0089873fb2a21ebc93d6ca2622d7a58e SHA512 e4cfe42a1c1fe17412e1ffb6ebebe1f760861a7fb707a6f8fd01cdebda96b166ee05e7ff034f3b9e30de5e9baa82c9a2cebe93d40772dbd206603321de40559c
+DIST libsc-2.2.tar.gz 311542 BLAKE2B 0879be69208f0964d73cc297a64b158ad88344e876a90dd4bd39c80fc0cf8237f4551cb684dee36e08068fa04644b887ec56230335a9984363055c1248aa6185 SHA512 97953794fdeb985bedb1dc9378f10ed4824446c63762d7813aced3309c2d6b27368c91fecb22587dccdf8b3b42aaaba9e782b739086cf542570360795897ac14
DIST p4est-1.0.tar.gz 695027 BLAKE2B 1b4c21e0ada4928da4fbf94e80e123ad39a1b4701f6019d0e49073b68c90662a277302a07cad22bb1d71a72a47cde8e1cbbfd4475dd7542bcee1c0474bb4addf SHA512 781240bbca2779f4076c310575ad99e8b526ecf6a3da8b7b5f096615bbfb570dd0556e607797715b69c95c6dd73baf837f1c632be763efae835941107f1fe3df
DIST p4est-1.1.tar.gz 1241423 BLAKE2B 3bb767f062a204abee4af64351981609c818c9b1f6bc5fa738161f706e5c9aebe208a4fc76010a2a05d6936070952e938b6ee632bd3ccc6676776fd60d451ef8 SHA512 11eb576a16a4cc959eff8894d6cb11d8bae092951be9cf9d71b538825bdf675af7fd77d79505b9e896ec1810c1f8e9391447a79263c6d2e33fef780e97d07f29
DIST p4est-2.0.tar.gz 1296762 BLAKE2B 1d755ec72905da069b9c91182a437c59107189402eb26444cf7fc1755b81bdbfad9aa25802720df401e8d434e5ac67e68b1d7dd5bf312f881017925498ad7514 SHA512 05f8a95ad431bd36fd3e48ca9360de0f90d1af7dfc77601cd46766898a9bc82b9157e22bdb6135e7003f59c7ecc4cd9ad34b89de25ba3c6f11a86d46cac8592c
+DIST p4est-2.2.tar.gz 1323529 BLAKE2B 262cb8d1ceff1329a71fd302b12c1650e9c099e72a9a93b4abef5822b16a28af0ee1ce9a338c524c2077d4bff83e607e9346f5bb1c660aa9afa8241bb631a637 SHA512 8475e0b6ab1225b22e7538c9c9b227f9aef86f78adf0706065a05f4682618f8f5d3878c18c11b8b13b3912e1de95f40b0ef5f5f5d217c02196993ac07f085299
diff --git a/sci-libs/p4est/p4est-2.0.ebuild b/sci-libs/p4est/p4est-2.0.ebuild
index a54c8b564e3e..62bc613a2602 100644
--- a/sci-libs/p4est/p4est-2.0.ebuild
+++ b/sci-libs/p4est/p4est-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/sci-libs/p4est/p4est-2.2.ebuild b/sci-libs/p4est/p4est-2.2.ebuild
new file mode 100644
index 000000000000..8cd883fb0d28
--- /dev/null
+++ b/sci-libs/p4est/p4est-2.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# The build system currently fails with everything newer than 1.11.
+WANT_AUTOMAKE=1.11
+
+inherit autotools toolchain-funcs eutils
+
+DESCRIPTION="Scalable Algorithms for Parallel Adaptive Mesh Refinement on Forests of Octrees"
+HOMEPAGE="http://www.p4est.org/"
+
+if [[ ${PV} = *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/cburstedde/${PN}.git"
+ EGIT_BRANCH="develop"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="
+ https://github.com/cburstedde/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/cburstedde/libsc/archive/v${PV}.tar.gz -> libsc-${PV}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+# TODO petsc
+IUSE="debug doc examples mpi openmp romio static-libs threads +vtk-binary"
+REQUIRED_USE="romio? ( mpi )"
+
+RDEPEND="
+ ~sci-libs/libsc-${PV}[mpi=,openmp=,romio=,static-libs=,threads=]
+ dev-lang/lua:*
+ sys-apps/util-linux
+ virtual/blas
+ virtual/lapack
+ mpi? ( virtual/mpi[romio=] )"
+
+DEPEND="
+ ${RDEPEND}
+ sys-devel/automake:1.11
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && use openmp; then
+ tc-has-openmp || \
+ die "Please select an openmp capable compiler like gcc[openmp]"
+ fi
+}
+
+src_prepare() {
+ default
+
+ # Inject libsc to get all parts of the build system...
+ if ! [[ ${PV} = *9999* ]]; then
+ rmdir "${S}/sc" || die "rmdir failed"
+ mv "${WORKDIR}/libsc-${PV}" "${S}/sc" || die "mv failed"
+ fi
+
+ # Inject a version number into the build system
+ echo "${PV}" > ${S}/.tarball-version
+
+ AT_M4DIR="${WORKDIR}/${P}/config ${WORKDIR}/${P}/sc/config"
+ eautoreconf
+
+ sed -i \
+ "s/P4EST_SC_DIR\/etc/P4EST_SC_DIR\/share\/libsc/" \
+ "${S}"/configure || die "sed failed"
+
+ sed -i \
+ "s/libsc\.la/libsc\.so/" \
+ "${S}"/configure || die "sed failed"
+
+}
+
+src_configure() {
+ # avoid underlinkage
+ LDFLAGS="${LDFLAGS} -lsc"
+
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable mpi)
+ $(use_enable openmp)
+ $(use_enable romio mpiio)
+ $(use_enable static-libs static)
+ $(use_enable threads pthread)
+ $(use_enable vtk-binary)
+ --with-blas="$($(tc-getPKG_CONFIG) --libs blas)"
+ --with-lapack="$($(tc-getPKG_CONFIG) --libs lapack)"
+ --with-sc="${EPREFIX}/usr"
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ use doc && dodoc -r doc/*
+
+ if use examples
+ then
+ docinto examples
+ dodoc -r example/*
+ docompress -x /usr/share/doc/${PF}/examples
+ else
+ # Remove compiled example binaries in case of -examples:
+ rm -r "${ED}"/usr/bin || die "rm failed"
+ fi
+
+ # Fix wrong installation paths:
+ dodir /usr/share/p4est
+ mv "${ED}"/usr/share/data "${ED}"/usr/share/p4est/data || die "mv failed"
+ mv "${ED}"/etc/* "${ED}"/usr/share/p4est || die "mv failed"
+ rmdir "${ED}"/etc/ || die "rmdir failed"
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7a2bb441c60a..5688f754f0ea 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/install-xattr/Manifest b/sys-apps/install-xattr/Manifest
index d3a88c6c4723..f22e4e080e17 100644
--- a/sys-apps/install-xattr/Manifest
+++ b/sys-apps/install-xattr/Manifest
@@ -1,2 +1,2 @@
DIST install-xattr-0.5.tar.bz2 16136 BLAKE2B 8973584d4819b9f500dcfb76ed0eaddce725b78e72dfa73ccff52c745e6f041926f8f930e5c5035fa888402c6b530207546098864266268dee2c897404bf7c74 SHA512 0bbde3a548fc5062041b38f90ac09c402f3cb0aebf4f0c331552fc44d39dd3d5e4d73bca0811de36c53af8afa5d22e543a7c90107d272f2a1b97c819b244eb7c
-DIST install-xattr-0.6.tar.bz2 16207 BLAKE2B 2f771aa3e81d594eda951ae34242ecf658e18d72f2cb4c8540ab8af40af750e50ad881c44476af84bb05c3ced9df052f08ea8f81ce490f250010e74b190bd1d9 SHA512 1af66ac8ea05b4c32b905f5d5e340e0402fd19d9f5c2fa51c32d0842effafded8327fce58adffdd197b47c0d4d90f8b669c309f512b64e90f86adc7afe995bcf
+DIST install-xattr-0.7.tar.bz2 16200 BLAKE2B bdddd4610e5fbb6f6ccfcdfb37abacff00ada5ca5fa18a6a4ad254b623ebe6dc9d0a2c8931f919f8623ed8f64e9c09584d6beabffbf3c72088f80383b198a2d7 SHA512 1cb4a4e72a9c5820081e032bd0d681ef985a228ad9bb025d5eb31c7b57678348d772f270def803376f2d9d4f8e6ebcede9629ce65eef917b3e8a06d6f40eec44
diff --git a/sys-apps/install-xattr/install-xattr-0.6.ebuild b/sys-apps/install-xattr/install-xattr-0.7.ebuild
similarity index 100%
rename from sys-apps/install-xattr/install-xattr-0.6.ebuild
rename to sys-apps/install-xattr/install-xattr-0.7.ebuild
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index 81a62b573631..0d7b3d2c18ad 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -1,4 +1,3 @@
-DIST inxi-2.3.37.tar.gz 454862 BLAKE2B f1eae662a2b33b4c3a50f3a9a0a500c9c3d2055f61d8a5096c24bc58f92884ca2e53822953e80ba79e435e7fbfc1c33f65a076145f5eda23fa701782987e3c40 SHA512 0a47cd920e80c518d6d6987945eb9526ee1ce7f6bf62754196e05736db44fbced615d29b6e12787bf55f769ed9963dff0088c96f9dbe13dae7f57744b0172802
DIST inxi-2.3.43.tar.gz 457941 BLAKE2B cbcdb3061643ba3516c93dc13e5e0e25d0740e4aa39519643467b03913a10e4ad1eed9cd52f62e7dd344b70f41124f248e48e7d1abacd55dbcb1401b07b1a88b SHA512 33c9ae788ab139f5a2511a3b5bd51276dafb3b847920345b02ad717e1da71f9a78fffc9e55b1085c91d014c2da940b1c64f72db9b59f7bb8d7e442bbbc0bd947
DIST inxi-2.3.47.tar.gz 462826 BLAKE2B c825b80b5b05fabfad22cbcee685d5c5caa7835493555f1e930dfc11aac35fbe7529fa4738d41dfaae4c6130211d42f576d77ba9f764864bfe89b70a4c0d602a SHA512 be2e0f1880e1b7604acd1f7b8f6595536e12fbe0998f85a195e0892bf1b9942c08f791779f99526a337d097259ea8d3cd0b04da465f8deb1b30bbba9fea4dc4e
DIST inxi-2.3.50.tar.gz 467912 BLAKE2B e4d42fbcf073c5815451848d55ad24b782a0851d7701ca87f88ec97467a7968577d6ebe3818cd2b5a59017fecc11baa686d23ffaf0f18ab086bdba0393a07fba SHA512 5f32abb56f8466b5c166616680bc7b6ab5d38b76720ecf3d7d065c5ae08de0bdcf14c31b9ab207adaa7c46f4f292c9971022f27aabe5aa14bb3e828a01bff97c
diff --git a/sys-apps/inxi/inxi-2.3.37.ebuild b/sys-apps/inxi/inxi-2.3.37.ebuild
deleted file mode 100644
index dd00c31e2e57..000000000000
--- a/sys-apps/inxi/inxi-2.3.37.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_COMMIT="2b4e89b21ffd06e888d89a38aaedb797ecea4403"
-# ^^ because upstream refuses to tag commits with version numbers
-
-DESCRIPTION="The CLI inxi collects and prints hardware and system information"
-HOMEPAGE="https://github.com/smxi/inxi"
-SRC_URI="https://github.com/smxi/${PN}/tarball/${MY_COMMIT} -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="sys-apps/pciutils
- sys-apps/usbutils
- "
-S="${WORKDIR}/smxi-${PN}-${MY_COMMIT:0:7}"
-
-src_install() {
- dobin "${PN}"
- unpack "./${PN}.1.gz"
- doman "${PN}.1"
-}
diff --git a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
index 38185fd4adaf..0d88ffd1fd8e 100644
--- a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit subversion
else
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+ KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
fi
DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/texinfo/texinfo-6.6-r1.ebuild b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
index 1be412160236..448f7b1fd3f9 100644
--- a/sys-apps/texinfo/texinfo-6.6-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="nls static"
RDEPEND="
diff --git a/sys-apps/yum/Manifest b/sys-apps/yum/Manifest
deleted file mode 100644
index 941cf6aec44b..000000000000
--- a/sys-apps/yum/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST yum-3.4.3_p20170619.tar.gz 1525362 BLAKE2B b2519fef3260f8c10bc2ac26f24b15cf7751d3620cb328fc4bf2db27fbf7cd23be86b474263887b6a5170e8896ce74627b868ccd2fc5b3ddd0679c1a21ca1be7 SHA512 4dddc3e30be8e86162b7786d7cf4e4e6f00e67c03bc3b16f347df1e54c3c67e5eaa01456e19952452a4eeaa4bc40c9a82a042d43772ad304c87c44bdc36e7ea3
diff --git a/sys-apps/yum/metadata.xml b/sys-apps/yum/metadata.xml
deleted file mode 100644
index 22eb5e1427ef..000000000000
--- a/sys-apps/yum/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- pinkbyte@gentoo.org
- Sergey Popov
-
-
- Automatic updater and package installer/remover for rpm systems
-
-
diff --git a/sys-apps/yum/yum-3.4.3_p20170619.ebuild b/sys-apps/yum/yum-3.4.3_p20170619.ebuild
deleted file mode 100644
index 25ff9b059b59..000000000000
--- a/sys-apps/yum/yum-3.4.3_p20170619.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-inherit python-single-r1 systemd
-
-DESCRIPTION="automatic updater and package installer/remover for rpm systems"
-HOMEPAGE="http://yum.baseurl.org/"
-SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~ppc ~x86"
-
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- ${PYTHON_DEPS}
- app-arch/rpm[python,${PYTHON_USEDEP}]
- dev-python/sqlitecachec[${PYTHON_USEDEP}]
- dev-libs/libxml2[python,${PYTHON_USEDEP}]
- dev-python/pyliblzma[${PYTHON_USEDEP}]
- dev-python/urlgrabber[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
- dev-util/intltool
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-src_prepare() {
- sed -i -e 's/make/$(MAKE)/' Makefile || die
- sed -i -e "s:lib:$(get_libdir):g" rpmUtils/Makefile yum/Makefile || die
- default
-}
-
-src_install() {
- emake INIT=systemd UNITDIR="$(systemd_get_systemunitdir)" DESTDIR="${ED}" install
- python_optimize "${D%/}$(python_get_sitedir)" "${ED%/}/usr/share/yum-cli"
- rm -r "${ED%/}/etc/rc.d" || die
- # bug #563850
- python_fix_shebang "${ED}/usr/bin/yum"
-}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index bed92eaacd79..39834df1265d 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 2cfe9a60908a..89319f3562ff 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,12 +1,9 @@
-DIST keystone-14.0.1.tar.gz 1526741 BLAKE2B 5ae1a6f0e7a7ce737b3a0fdbd2900e8cb1541ec3b1e08228d4abf58d8021a06a6c9db654ef71c22636436f2601bd49d4934f24650e2a44c101c9610ed7b011af SHA512 87065a16ca70dc9115d331f1e0f3669ac9661f5172f9e8afbecef48e7dd9a4726438b4d757fa54bbd6095a5543427dc913f90a765e83ffb30284b1f8dbfbb8e7
DIST keystone-14.1.0.tar.gz 1467270 BLAKE2B ed4bd8a109fe80577d210a09ddb1e49d61cee329f52ded02dfa36d7996089b62b7570bdea3d4afd69d51e91183f6011b6ab69842d4b0463efc22e5140be7e02b SHA512 ab2462f7d4bec19b37e0a482f19fd6cac3559d3fcb2422488646f18590a955bf324c260ca69f34c192508833378bba56c5ef21ee44c653dec50e3dc6e7b65425
DIST keystone-15.0.0.tar.gz 1620138 BLAKE2B 35a8800bb25e40f01837624058d62bf829e50eefe20953785dbbb9afc646c0178031b3d8b7a02e6f9b2b273294f1acdb7ac2c17e8200929cf8dbaac5dbf284ed SHA512 b88f4ca95167a8cf0d1ed5891d692de43d43e95706b6efe8317ecc7356ee69eef85580d6f37dc9a31279c2127db946528fcd2b3612b43ccf6b952f88be097b01
-DIST keystone.conf.sample-14.0.1 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
DIST keystone.conf.sample-14.1.0 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
DIST keystone.conf.sample-15.0.0 109344 BLAKE2B 72542b4d42594bb86ba0afa4179705059c10f4d6978ae7081ba45762a4725c9340f8096099e0db6f6afc84e2b1d328b257f2f08cf25285f41032289458dfb92f SHA512 b73c232e7a58f1bdaf7c50fb6fa6e75edc14742c7e74f70a44fe8be55ac673ae851015ed24c31891647bbddfd9a6c67b57bba4ce2dc368c5cee63e9ab72c8ce9
DIST keystone.conf.sample-2018.2.9999 119794 BLAKE2B 3f3c43b0972230a57b444ffe3ca41fa94a0886831941c8c259738e6575b74776a6add907fac833ba178769bbecd4bc16fe383b53344c1e3cebf3d4eacdbcb50d SHA512 5513b4e3bed869d6fa56bf6163355de2dcbf859dd8f7e76ffa3a0e7b644fe367bbde75a4e090098faba473e1fb26b061d434771e9e6bb8cb105ca609c161e5c1
DIST keystone.conf.sample-2019.1.9999 109344 BLAKE2B 72542b4d42594bb86ba0afa4179705059c10f4d6978ae7081ba45762a4725c9340f8096099e0db6f6afc84e2b1d328b257f2f08cf25285f41032289458dfb92f SHA512 b73c232e7a58f1bdaf7c50fb6fa6e75edc14742c7e74f70a44fe8be55ac673ae851015ed24c31891647bbddfd9a6c67b57bba4ce2dc368c5cee63e9ab72c8ce9
-DIST keystone.policy.yaml.sample-14.0.1 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
DIST keystone.policy.yaml.sample-14.1.0 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
DIST keystone.policy.yaml.sample-15.0.0 6644 BLAKE2B f983189bc8e855db0b1ae92b1066840f3dd13545a1ce8af22be877df1630816fa8fae36217a828d483385e199ede73066b14beb421fe57316ae82a83e851e0f9 SHA512 e358661d4ec363ab11d7d78f6324bbe42c3382b02a1a8579de79686f7c91fe1a09b612ea81138bfcef73f0391262c9fceb3af14e8a8728839b203d281a989c4f
DIST keystone.policy.yaml.sample-2018.2.9999 38318 BLAKE2B a27e4ea59c99dc91dde9d1cc62340faa4b91e644dc6b8725c2d7de731e44684d8d59571e6470da3ab9fa191087a890a0b417b58b1473038bf39cfc75e5b2bad4 SHA512 95fad079d1fb77d15b9f8e507be8b1e01b493c3f1dd4e992567fe9c905bae01a058e93d59677d472ae47856b13d5cffa213d89e8e267f081a2bad1bf8e1f6036
diff --git a/sys-auth/keystone/keystone-14.0.1.ebuild b/sys-auth/keystone/keystone-14.0.1.ebuild
deleted file mode 100644
index d559bbf28df8..000000000000
--- a/sys-auth/keystone/keystone-14.0.1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1 user
-
-DESCRIPTION="The Openstack authentication, authorization, and service catalog"
-HOMEPAGE="https://launchpad.net/keystone"
-if [[ ${PV} == *9999 ]];then
- inherit git-r3
- SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-${PV}
- https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-${PV}"
- EGIT_REPO_URI="https://github.com/openstack/keystone.git"
- EGIT_BRANCH="stable/rocky"
-else
- SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-${PV}
- https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-${PV}
- https://tarballs.openstack.org/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm64 x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+sqlite ldap memcached mongo mysql postgres test"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
- !~dev-python/pbr-2.1.0"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- ${CDEPEND}"
-RDEPEND="
- ${CDEPEND}
- >=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
- !~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
- >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
- >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
- >=dev-python/flask-1.0.2[${PYTHON_USEDEP}]
- >=dev-python/flask-restful-0.3.5[${PYTHON_USEDEP}]
- >=dev-python/cryptography-2.1[${PYTHON_USEDEP}]
- >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
- sqlite? (
- >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
- )
- mysql? (
- >=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
- !~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
- )
- postgres? (
- >=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
- >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
- !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
- )
- >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
- >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
- >=dev-python/passlib-1.7.0[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}]
- >=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
- >=dev-python/scrypt-0.8.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-cache-1.26.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-context-2.21.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
- !~dev-python/oslo-serialization-1.19.1[${PYTHON_USEDEP}]
- >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
- >=dev-python/oauthlib-0.6.2[${PYTHON_USEDEP}]
- >=dev-python/pysaml2-4.5.0[${PYTHON_USEDEP}]
- >=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
- >=dev-python/jsonschema-2.6.0[${PYTHON_USEDEP}]
- =dev-python/pycadf-1.1.0[${PYTHON_USEDEP}]
- !~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
- >=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
- >=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
- memcached? (
- >=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
- )
- mongo? (
- >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
- !~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
- )
- ldap? (
- >=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
- >=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
- )
- || (
- www-servers/uwsgi[python,${PYTHON_USEDEP}]
- www-apache/mod_wsgi[${PYTHON_USEDEP}]
- www-servers/gunicorn[${PYTHON_USEDEP}]
- )"
-
-#PATCHES=(
-#)
-
-pkg_setup() {
- enewgroup keystone
- enewuser keystone -1 -1 /var/lib/keystone keystone
-}
-
-python_prepare_all() {
- # it's in git, but not in the tarball.....
- sed -i '/^hacking/d' test-requirements.txt || die
- mkdir -p ${PN}/tests/tmp/ || die
- cp etc/keystone-paste.ini ${PN}/tests/tmp/ || die
- sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
- sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || die
- # allow useage of renamed msgpack
- sed -i '/^msgpack/d' requirements.txt || die
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- nosetests -I 'test_keystoneclient*' \
- -e test_static_translated_string_is_Message \
- -e test_get_token_id_error_handling \
- -e test_provider_token_expiration_validation \
- -e test_import --process-restartworker --process-timeout=60 || die "testsuite failed under python2.7"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- diropts -m 0750
- keepdir /etc/keystone /var/log/keystone
- insinto /etc/keystone
- insopts -m0640 -okeystone -gkeystone
- newins "${DISTDIR}/keystone.conf.sample-${PV}" keystone.conf.sample
- newins "${DISTDIR}/keystone.policy.yaml.sample-${PV}" keystone.policy.yaml.sample
- doins etc/logging.conf.sample
- doins etc/default_catalog.templates
- doins etc/policy.v3cloudsample.json
- doins etc/keystone-paste.ini
- insinto /etc/keystone/httpd
- doins httpd/*
-
- fowners keystone:keystone /etc/keystone /etc/keystone/httpd /var/log/keystone
-}
-
-pkg_postinst() {
- elog "You might want to run:"
- elog "emerge --config =${CATEGORY}/${PF}"
- elog "if this is a new install."
- elog "If you have not already configured your openssl installation"
- elog "please do it by modifying /etc/ssl/openssl.cnf"
- elog "BEFORE issuing the configuration command."
- elog "Otherwise default values will be used."
-}
-
-pkg_config() {
- if [ ! -d "${ROOT}"/etc/keystone/ssl ] ; then
- einfo "Press ENTER to configure the keystone PKI, or Control-C to abort now..."
- read
- "${ROOT}"/usr/bin/keystone-manage pki_setup --keystone-user keystone --keystone-group keystone
- else
- einfo "keystone PKI certificates directory already present, skipping configuration"
- fi
-}
diff --git a/sys-auth/keystone/keystone-14.1.0.ebuild b/sys-auth/keystone/keystone-14.1.0-r1.ebuild
similarity index 98%
rename from sys-auth/keystone/keystone-14.1.0.ebuild
rename to sys-auth/keystone/keystone-14.1.0-r1.ebuild
index 428ffc5ea13e..cde60987d69a 100644
--- a/sys-auth/keystone/keystone-14.1.0.ebuild
+++ b/sys-auth/keystone/keystone-14.1.0-r1.ebuild
@@ -2,7 +2,6 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1 user
@@ -19,7 +18,7 @@ else
SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.conf.sample -> keystone.conf.sample-${PV}
https://dev.gentoo.org/~prometheanfire/dist/openstack/keystone/rocky/keystone.policy.yaml.sample -> keystone.policy.yaml.sample-${PV}
https://tarballs.openstack.org/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 x86"
fi
LICENSE="Apache-2.0"
@@ -104,8 +103,8 @@ RDEPEND="
!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
)
ldap? (
- >=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
- >=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-ldap-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}]
)
|| (
www-servers/uwsgi[python,${PYTHON_USEDEP}]
diff --git a/sys-auth/keystone/keystone-2018.2.9999.ebuild b/sys-auth/keystone/keystone-2018.2.9999.ebuild
index 3fe0e204e8f3..cf8a86a35023 100644
--- a/sys-auth/keystone/keystone-2018.2.9999.ebuild
+++ b/sys-auth/keystone/keystone-2018.2.9999.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1 user
@@ -80,7 +79,7 @@ RDEPEND="
>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
- >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-3.38.0[${PYTHON_USEDEP}]
>=dev-python/oslo-middleware-3.31.0[${PYTHON_USEDEP}]
>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
@@ -104,8 +103,8 @@ RDEPEND="
!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
)
ldap? (
- >=dev-python/pyldap-2.4.20[${PYTHON_USEDEP}]
- >=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/python-ldap-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/ldappool-2.3.1[${PYTHON_USEDEP}]
)
|| (
www-servers/uwsgi[python,${PYTHON_USEDEP}]
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index d64e7396eedf..f8fd1341dd8d 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/io-scheduler-udev-rules/Manifest b/sys-block/io-scheduler-udev-rules/Manifest
index c27802d020b3..2e471d1e0825 100644
--- a/sys-block/io-scheduler-udev-rules/Manifest
+++ b/sys-block/io-scheduler-udev-rules/Manifest
@@ -1 +1 @@
-DIST io-scheduler-udev-rules-0.tar.bz2 7465 BLAKE2B cc82d81081fd21ccc5714874b02d70206bcf40311070f916ee1312106687e0a8566a1a906e6660f6a508704814f667a58cf547bec54cc88bab4a070616ddb6ba SHA512 c68430a4a3ee78ec34947e225be911c0e61db83f2ae078e1ea21a9c0148c668c0ebbb0fe798c89b8ab14b414a4c6b2e2d77bd5b1abf800a21db0320971134f43
+DIST io-scheduler-udev-rules-1.tar.bz2 7503 BLAKE2B ef1c8f1cf1a94018e82a3c430860af9e7d6c31b12318b5b672ee3b9f0c51c24c69566f764c0a6c0bdfcc1342160a801d7849c0cd0e783715b2b36be1ba285a05 SHA512 7da4ec700bc508c790da916df030164da39bed223677ebc3633e1bf4ad085a9d401a3ed64dc7b07a5e90f4a60933a25a6c4584544c9022ac70e5b1b33cde0e2f
diff --git a/sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-0-r1.ebuild b/sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-1.ebuild
similarity index 100%
rename from sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-0-r1.ebuild
rename to sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-1.ebuild
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 001089ed9656..33cfd48960af 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/quik/Manifest b/sys-boot/quik/Manifest
deleted file mode 100644
index dd6faab8afc3..000000000000
--- a/sys-boot/quik/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST quik-2.1-6.ydl4.src.rpm 91961 BLAKE2B 3398e2278e7700e8da6a68fec135006959eda47663bf0403c041710b3edfd5cc7243a79f84464f0bf8ae91e025df5407e159710bd3ee693d9513f04dbf926fee SHA512 92cdea02afd5053fb51b390e79f4d2d404691be5de9ea3d9c88739fc4fa993b68a017be10ff1b5fa359f8c5493f34d0d743975f5ce99525bdaf5921b0146aa63
diff --git a/sys-boot/quik/files/headers.patch b/sys-boot/quik/files/headers.patch
deleted file mode 100644
index eccfba698e17..000000000000
--- a/sys-boot/quik/files/headers.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- util/elfextract.c.bak 2006-12-04 23:08:33.000000000 -0500
-+++ util/elfextract.c 2006-12-04 23:08:45.000000000 -0500
-@@ -6,7 +6,7 @@
- #include
- #include
- #define __KERNEL__
--#include
-+#include
-
- FILE *fi, *fo;
- char *ni, *no;
---- second/quik.h.bak 2006-12-04 23:10:08.000000000 -0500
-+++ second/quik.h 2006-12-04 23:10:12.000000000 -0500
-@@ -26,7 +26,7 @@
- int tolower(int c);
- int stricmp(const char *s1, const char *s2);
- int strncmp(const char * cs,const char * ct,size_t count);
--int strlen(const char *s1);
-+// int strlen(const char *s1);
- char *strcpy(char * dest,const char *src);
- char *strncpy(char * dest,const char *src,size_t count);
- char *strchr(const char * s, int c);
---- second/misc.c.bak 2010-02-09 22:18:47.000000000 -0500
-+++ second/misc.c 2010-02-09 22:18:52.000000000 -0500
-@@ -11,7 +11,7 @@
- */
- #include
-
--#include
-+// #include
-
- #include
- #include "setjmp.h"
diff --git a/sys-boot/quik/files/md-fix.diff b/sys-boot/quik/files/md-fix.diff
deleted file mode 100644
index 2319397d93f1..000000000000
--- a/sys-boot/quik/files/md-fix.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/quik_md.h.bak 2005-05-27 00:42:36.000000000 +1000
-+++ include/quik_md.h 2005-05-27 00:42:43.000000000 +1000
-@@ -88,8 +88,6 @@
- #define BOOTDEV(dev,i) ((dev)->devs[(i)]->bootdev)
- #define SPART(dev,i) ((dev)->devs[(i)]->spart)
-
--dev_info_t * new_dev_info (unsigned char);
--void free_dev_info (dev_info_t *);
- int md_get_version (int);
- mdev_info_t * md_get_info (const char *);
-
diff --git a/sys-boot/quik/metadata.xml b/sys-boot/quik/metadata.xml
deleted file mode 100644
index 5eb05198076b..000000000000
--- a/sys-boot/quik/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- ppc@gentoo.org
- Gentoo Linux PowerPC Development
-
-
diff --git a/sys-boot/quik/quik-2.1.6.ebuild b/sys-boot/quik/quik-2.1.6.ebuild
deleted file mode 100644
index 1a0ca2e1926f..000000000000
--- a/sys-boot/quik/quik-2.1.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs mount-boot eutils
-
-MY_PV=${PV%.*}-${PV#*.*.}
-
-HOMEPAGE="http://penguinppc.org/bootloaders/quik/"
-DESCRIPTION="OldWorld PowerMac Bootloader"
-SRC_URI="http://www.shiner.info/files/Yellow%20Dog%20Linux%204/quik/quik-${MY_PV}.ydl4.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ppc"
-IUSE=""
-
-DEPEND="app-arch/rpm2targz"
-RDEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
- cd "${WORKDIR}"
- rpm2targz "${DISTDIR}/quik-${MY_PV}.ydl4.src.rpm"
- tar -xzf "${WORKDIR}/quik-${MY_PV}.ydl4.src.tar.gz" || die
- tar -xzf "${WORKDIR}/quik_2.1.orig.tar.gz" || die
-
- cd "${WORKDIR}/quik-2.1"
- epatch "${WORKDIR}/quik_2.1-6.diff.gz"
- epatch "${FILESDIR}/md-fix.diff"
- epatch "${FILESDIR}/headers.patch"
-}
-
-src_compile() {
- cd "${WORKDIR}/quik-2.1"
- emake || die
-}
-
-src_install() {
- cd "${WORKDIR}/quik-2.1"
- DESTDIR=${D} make install
- prepman /usr
-}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 18b8738f7110..246e06d9d5db 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
index 74f9306385af..ad5e78db7935 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -22,6 +22,7 @@ RDEPEND="
app-text/docbook-xml-dtd:4.4
dev-libs/glib:2
dev-libs/libaio
+ dev-libs/libltdl:=
dev-libs/libxml2
ipmilan? ( sys-libs/openipmi )
libnet? ( net-libs/libnet:1.1 )
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 032b3034627b..41f0afcee319 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,4 +1,3 @@
-DIST glusterfs-4.0.0.tar.gz 7632629 BLAKE2B 9367d2c99452d261d889cf564f3a055e1459ee54377cbf8cf6cc46c8d7f153bb258892fb73fc492d1dc6c5bea156d204971256fefc96f9f4825583d9c1086563 SHA512 acd3c462a8e15fb31f4b30d2e217928488e32d66ae7d1061df3e166354a4ddcdeb0ba0bcc994b7563f83376c882800fad07e190e0086fda987915c195266421f
-DIST glusterfs-4.0.2.tar.gz 7643713 BLAKE2B 6314f81fe1474bcf8c577aa68a32c46a6d1e586b32c698a9e30850080408958c0541c1afe72520574fcabebb0884cf3bf315b22582d932876bbb5a4393e167f0 SHA512 33afed4fb4f6d63f1d2b7caedae1ce41e7f6aa4299fb4a7ee2f5e4bc14c97d66f68097171fded6d1f2141dd7127eb408596cce4f5f7287038a14e387ad5ec5e6
DIST glusterfs-4.1.5.tar.gz 7783999 BLAKE2B ac1e7732430fe25eec34a8b85b9cd5ce4f43076befec2d91c0156959887d8a0589adb8afb1ee9290e436ce40ab7e5567c3c4ec90017b4398919637e2047f18b9 SHA512 ae557472b6a263e815b8c4d630b606f8e1334b6604799e499e6f53ea6ff60c2a696160fa427943cc3d01ffee91a57787c91f93a1b914179679038e63d291401f
DIST glusterfs-4.1.8.tar.gz 7835272 BLAKE2B 2546b9c0fe38989df71b8f72b193ce42c499621dcaaa4c5e3deeacfba68179f2280fc699cebeb87486171442152fa8b56b42a0d17465b739769eb227c82307d7 SHA512 950cd2fd774e3eb00f1ec06d54566736b6fbe8d1aed54477a19d9b2727eff8a70ef7ac32815cc7e01d45b5d357fc01af786e16c451f6ad314d472e61ba04ce85
+DIST glusterfs-6.0.tar.gz 7495110 BLAKE2B 89fde01732dbbcecdf514d196e3bac683caaaaefb3658b4e92f1bbf73ca09defa4de9366066a00528564acfbe93c3f65cfabbeb0d830c00f29ee9c99ed7bf08a SHA512 fc4f4ee75b3936469b7c4be146545eb88d2cf3583d5f101bcacb2805c842aa95f69d1c023dee4dac32ebe01cdc9ede4814f9364482e8815e451e43660e6c74b9
diff --git a/sys-cluster/glusterfs/glusterfs-4.0.2.ebuild b/sys-cluster/glusterfs/glusterfs-4.0.2.ebuild
deleted file mode 100644
index fd1498eb3770..000000000000
--- a/sys-cluster/glusterfs/glusterfs-4.0.2.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools elisp-common python-single-r1 systemd user versionator
-
-if [[ ${PV#9999} != ${PV} ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
-else
- SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
-HOMEPAGE="https://www.gluster.org/"
-
-LICENSE="|| ( GPL-2 LGPL-3+ )"
-SLOT="0"
-IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
-
-REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
- glupy? ( ${PYTHON_REQUIRED_USE} )
- ipv6? ( libtirpc )"
-
-# the tests must be run as root
-RESTRICT="test"
-
-# sys-apps/util-linux is required for libuuid
-RDEPEND="bd-xlator? ( sys-fs/lvm2 )
- !elibc_glibc? ( sys-libs/argp-standalone )
- emacs? ( virtual/emacs )
- fuse? ( >=sys-fs/fuse-2.7.0:0 )
- georeplication? ( ${PYTHON_DEPS} )
- infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
- libtirpc? ( net-libs/libtirpc:= )
- !libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
- qemu-block? ( dev-libs/glib:2 )
- systemtap? ( dev-util/systemtap )
- tiering? ( dev-db/sqlite:3 )
- xml? ( dev-libs/libxml2 )
- sys-libs/readline:=
- dev-libs/libaio
- dev-libs/openssl:=[-bindist]
- dev-libs/userspace-rcu:=
- net-libs/rpcsvc-proto
- sys-apps/util-linux"
-DEPEND="${RDEPEND}
- virtual/acl
- virtual/pkgconfig
- sys-devel/bison
- sys-devel/flex
- test? ( >=dev-util/cmocka-1.0.1
- app-benchmarks/dbench
- dev-vcs/git
- net-fs/nfs-utils
- virtual/perl-Test-Harness
- dev-libs/yajl
- sys-fs/xfsprogs
- sys-apps/attr )"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch"
- "${FILESDIR}/${PN}-3.12.2-silent_rules.patch"
- "${FILESDIR}/${PN}-TIRPC-config-summary.patch"
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
-
-# Maintainer notes:
-# * The build system will always configure & build argp-standalone but it'll never use it
-# if the argp.h header is found in the system. Which should be the case with
-# glibc or if argp-standalone is installed.
-
-pkg_setup() {
- python_setup "python2*"
- python-single-r1_pkg_setup
-
- # Needed for statedumps
- # https://github.com/gluster/glusterfs/commit/0e50c4b3ea734456c14e2d7a578463999bd332c3
- enewgroup gluster
- enewuser gluster -1 -1 "${EPREFIX}"/var/run/gluster gluster
-}
-
-src_prepare() {
- default
-
- # build rpc-transport and xlators only once as shared libs
- find rpc/rpc-transport xlators -name Makefile.am |
- xargs sed -i 's|.*$(top_srcdir).*\.sym|\0 -shared|' || die
-
- # fix execution permissions
- chmod +x libglusterfs/src/gen-defaults.py || die
-
- eautoreconf
-}
-
-src_configure() {
- # --without-ipv6-default doesn't do what you think it does. Chewi
- # has given up fighting with upstream about this.
- # https://bugzilla.redhat.com/show_bug.cgi?id=1553926
-
- econf \
- --disable-dependency-tracking \
- --disable-silent-rules \
- --disable-fusermount \
- $(use_enable debug) \
- $(use_enable bd-xlator) \
- $(use_enable crypt-xlator) \
- $(use_enable fuse fuse-client) \
- $(use_enable georeplication) \
- $(use_enable glupy) \
- $(use_enable infiniband ibverbs) \
- $(use_enable qemu-block) \
- $(use_enable static-libs static) \
- $(use_enable syslog) \
- $(use_enable systemtap) \
- $(use_enable test cmocka) \
- $(use_enable tiering) \
- $(use_enable xml xml-output) \
- $(use_with libtirpc) \
- $(use ipv6 && echo --with-ipv6-default) \
- --with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --localstatedir="${EPREFIX}"/var
-}
-
-src_compile() {
- default
- use emacs && elisp-compile extras/glusterfs-mode.el
-}
-
-src_install() {
- default
-
- rm \
- "${ED}"/etc/glusterfs/glusterfs-{georep-,}logrotate \
- "${ED}"/etc/glusterfs/gluster-rsyslog-*.conf \
- "${ED}"/usr/share/doc/${PF}/glusterfs{-mode.el,.vim} || die "removing false files failed"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/glusterfs.logrotate glusterfs
-
- if use rsyslog ; then
- insinto /etc/rsyslog.d
- newins extras/gluster-rsyslog-7.2.conf 60-gluster.conf
- fi
-
- if use emacs ; then
- elisp-install ${PN} extras/glusterfs-mode.el*
- elisp-site-file-install "${FILESDIR}/${SITEFILE}"
- fi
-
- if use vim-syntax ; then
- insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
- insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
- fi
-
- # insert some other tools which might be useful
- insinto /usr/share/glusterfs/scripts
- doins \
- extras/backend-{cleanup,xattr-sanitize}.sh \
- extras/clear_xattrs.sh \
- extras/migrate-unify-to-distribute.sh
-
- # correct permissions on installed scripts
- # fperms 0755 /usr/share/glusterfs/scripts/*.sh
- chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
-
- if use georeplication ; then
- # move the gsync-sync-gfid tool to a binary path
- # and set a symlink to be compliant with all other distros
- mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
- dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
- fi
-
- newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
- newinitd "${FILESDIR}/glusterd-r3.initd" glusterd
- newconfd "${FILESDIR}/${PN}.confd" glusterfsd
-
- keepdir /var/log/${PN}
- keepdir /var/lib/glusterd/{events,glusterfind/.keys}
-
- # QA
- rm -r "${ED}/var/run/" || die
- if ! use static-libs; then
- find "${D}" -type f -name '*.la' -delete || die
- fi
-
- # fix all shebang for python2 #560750
- python_fix_shebang "${ED}"
-}
-
-src_test() {
- ./run-tests.sh || die
-}
-
-pkg_postinst() {
- elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
- elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
- elog " /etc/init.d/glusterd start"
- echo
- elog "For static configurations, the glusterfsd startup script can be multiplexed."
- elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
- elog "separate service. To create additional instances of the glusterfsd service"
- elog "simply create a symlink to the glusterfsd startup script."
- echo
- elog "Example:"
- elog " # ln -s glusterfsd /etc/init.d/glusterfsd2"
- elog " # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
- elog "You can now treat glusterfsd2 like any other service"
- echo
- ewarn "You need to use a ntp client to keep the clocks synchronized across all"
- ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
- ewarn "run GlusterFS."
- echo
- elog "If you are upgrading from a previous version of ${PN}, please read:"
- elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(get_version_component_range '1-2')/"
-
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-4.0.0-r1.ebuild b/sys-cluster/glusterfs/glusterfs-6.0.ebuild
similarity index 81%
rename from sys-cluster/glusterfs/glusterfs-4.0.0-r1.ebuild
rename to sys-cluster/glusterfs/glusterfs-6.0.ebuild
index b8c3d99fa8fd..e9acb97223c7 100644
--- a/sys-cluster/glusterfs/glusterfs-4.0.0-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-6.0.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{5,6,7} )
-inherit autotools elisp-common python-single-r1 systemd user versionator
+inherit autotools elisp-common python-single-r1 systemd user
if [[ ${PV#9999} != ${PV} ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
else
- SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
+ SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(ver_cut 1)/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
@@ -20,31 +20,27 @@ HOMEPAGE="https://www.gluster.org/"
LICENSE="|| ( GPL-2 LGPL-3+ )"
SLOT="0"
-IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
+IUSE="debug emacs +fuse +georeplication infiniband ipv6 libressl +libtirpc rsyslog static-libs +syslog test vim-syntax +xml"
REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
- glupy? ( ${PYTHON_REQUIRED_USE} )
ipv6? ( libtirpc )"
# the tests must be run as root
RESTRICT="test"
# sys-apps/util-linux is required for libuuid
-RDEPEND="bd-xlator? ( sys-fs/lvm2 )
- !elibc_glibc? ( sys-libs/argp-standalone )
+RDEPEND="!elibc_glibc? ( sys-libs/argp-standalone )
emacs? ( virtual/emacs )
fuse? ( >=sys-fs/fuse-2.7.0:0 )
georeplication? ( ${PYTHON_DEPS} )
infiniband? ( sys-fabric/libibverbs:* sys-fabric/librdmacm:* )
libtirpc? ( net-libs/libtirpc:= )
!libtirpc? ( elibc_glibc? ( sys-libs/glibc[rpc(-)] ) )
- qemu-block? ( dev-libs/glib:2 )
- systemtap? ( dev-util/systemtap )
- tiering? ( dev-db/sqlite:3 )
xml? ( dev-libs/libxml2 )
sys-libs/readline:=
dev-libs/libaio
- dev-libs/openssl:=[-bindist]
+ !libressl? ( dev-libs/openssl:=[-bindist] )
+ libressl? ( dev-libs/libressl:= )
dev-libs/userspace-rcu:=
net-libs/rpcsvc-proto
sys-apps/util-linux"
@@ -64,13 +60,6 @@ DEPEND="${RDEPEND}
SITEFILE="50${PN}-mode-gentoo.el"
-PATCHES=(
- "${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch"
- "${FILESDIR}/${PN}-3.12.2-silent_rules.patch"
- "${FILESDIR}/${PN}-without-ipv6-default.patch"
- "${FILESDIR}/${PN}-TIRPC-config-summary.patch"
-)
-
DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
# Maintainer notes:
@@ -79,7 +68,7 @@ DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
# glibc or if argp-standalone is installed.
pkg_setup() {
- python_setup "python2*"
+ python_setup "python3*"
python-single-r1_pkg_setup
# Needed for statedumps
@@ -107,21 +96,15 @@ src_configure() {
--disable-silent-rules \
--disable-fusermount \
$(use_enable debug) \
- $(use_enable bd-xlator) \
- $(use_enable crypt-xlator) \
$(use_enable fuse fuse-client) \
$(use_enable georeplication) \
- $(use_enable glupy) \
$(use_enable infiniband ibverbs) \
- $(use_enable qemu-block) \
$(use_enable static-libs static) \
$(use_enable syslog) \
- $(use_enable systemtap) \
$(use_enable test cmocka) \
- $(use_enable tiering) \
$(use_enable xml xml-output) \
- $(use_with ipv6 ipv6-default) \
- $(use_with libtirpc) \
+ $(use libtirpc || echo --without-libtirpc) \
+ $(use ipv6 && echo --with-ipv6-default) \
--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
--localstatedir="${EPREFIX}"/var
@@ -188,9 +171,6 @@ src_install() {
if ! use static-libs; then
find "${D}" -type f -name '*.la' -delete || die
fi
-
- # fix all shebang for python2 #560750
- python_fix_shebang "${ED}"
}
src_test() {
@@ -217,7 +197,7 @@ pkg_postinst() {
ewarn "run GlusterFS."
echo
elog "If you are upgrading from a previous version of ${PN}, please read:"
- elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(get_version_component_range '1-2')/"
+ elog " http://docs.gluster.org/en/latest/Upgrade-Guide/upgrade_to_$(ver_cut '1-2')/"
use emacs && elisp-site-regen
}
diff --git a/sys-cluster/heat/heat-12.0.0.ebuild b/sys-cluster/heat/heat-12.0.0.ebuild
index 8f177f56ab54..39f1a73b5774 100644
--- a/sys-cluster/heat/heat-12.0.0.ebuild
+++ b/sys-cluster/heat/heat-12.0.0.ebuild
@@ -19,6 +19,7 @@ else
https://tarballs.openstack.org/${PN}/openstack-${P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~x86"
fi
+S="${WORKDIR}/openstack-${P}"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index ee2ad5f2de2c..aecd8f05789b 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -2,3 +2,4 @@ DIST keepalived-2.0.10.tar.gz 927631 BLAKE2B 0cb4c5c613ae2c58f993930c446cdcafdff
DIST keepalived-2.0.11.tar.gz 961182 BLAKE2B 226bac3a544434a36b01ebdb43b166b3833fca3ec12014ba9a76e90f12663a5550271dff87155c74ba5eb908dd48fc9dd2cac810705e96ae3bd30df67a26e708 SHA512 ead982aeacdf329109089dfc58a42915ff44b0c4897006000c74642fa3747b2cac1a472faa438ce517f47b80d193d466875ab7130d2206400c8b2ad52f17c6d4
DIST keepalived-2.0.12.tar.gz 947015 BLAKE2B c6c47bbc19bc8b31ae6c2d30616a5cfe90b1195c956b56731e702c909a1478e3793e22a7573f7b337d556c38d411d30f7aa5b4c0e45d14cfc18e17dfe46264d8 SHA512 345f7574cfe978194504691c0a7bcad76b1438bf8833911271647d445f0d1352972257554524e94be44e9d971299678d2f9a026e29088e844bbb3d2b25637076
DIST keepalived-2.0.13.tar.gz 955953 BLAKE2B f6a8d23cdcf4b8484c37da9d48c12394617d36b1a2bba901c899d3397ed5a2ba048a73d98cf137df3c53359b4e83c382b9a958559303e8d1130316a6026a5d3b SHA512 5e33104d114794f9050958d06730d7ecb89e87157a043146509583df595d8e01439a8f1172abb7d2bca0e8e710a4ff6d364dbb0a89f5aafa632e7af2453f3966
+DIST keepalived-2.0.15.tar.gz 972461 BLAKE2B 7c57d4ecdec7efe5dcb477e92daf4e6ee947ec66c3dc68a96fe0a7f07656a3c503751f10e9448f80e896b63d987fa9448bb264537106685cfac88ca87096721f SHA512 d426f2d917f72264944e8324409838287d4c535dfd5b5574a41c06828efc9095a2304f87a6435a067d4ad88ad5619108f7de97abb4a257a4c30e335929978dd1
diff --git a/sys-cluster/keepalived/keepalived-2.0.15.ebuild b/sys-cluster/keepalived/keepalived-2.0.15.ebuild
new file mode 100644
index 000000000000..02e558b5285b
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-2.0.15.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="A strong & robust keepalive facility to the Linux Virtual Server project"
+HOMEPAGE="http://www.keepalived.org/"
+SRC_URI="http://www.keepalived.org/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+bfd dbus debug -json regex snmp"
+
+RDEPEND="dev-libs/libnl:=
+ dev-libs/openssl:=
+ dev-libs/popt
+ net-libs/libnfnetlink
+ sys-apps/iproute2
+ regex? ( >=dev-libs/libpcre2-8 )
+ dbus? ( sys-apps/dbus dev-libs/glib:2 )
+ json? ( dev-libs/json-c:= )
+ snmp? ( net-analyzer/net-snmp )"
+DEPEND="${RDEPEND}
+ >=sys-kernel/linux-headers-4.4"
+
+DOCS=(
+ README CONTRIBUTORS INSTALL ChangeLog AUTHOR TODO
+ doc/keepalived.conf.SYNOPSIS doc/NOTE_vrrp_vmac.txt
+)
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ # keepalived has support to dynamically use some libraries instead of
+ # linking them:
+ #--enable-dynamic-linking \
+ #--enable-libiptc-dynamic \
+ #--enable-libnl-dynamic \
+ #--enable-libxtables-dynamic \
+ STRIP=/bin/true \
+ econf \
+ --with-init=custom \
+ --with-kernel-dir=/usr \
+ --enable-sha1 \
+ --enable-vrrp \
+ $(use_enable bfd) \
+ $(use_enable dbus) \
+ $(use_enable dbus dbus-create-instance) \
+ $(use_enable debug) \
+ $(use_enable json) \
+ $(use_enable regex) \
+ $(use_enable regex regex-timers ) \
+ $(use_enable snmp) \
+ $(use_enable snmp snmp-checker) \
+ $(use_enable snmp snmp-rfc) \
+ $(use_enable snmp snmp-rfcv2) \
+ $(use_enable snmp snmp-rfcv3) \
+ $(use_enable snmp snmp-vrrp)
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/keepalived.init-r1 keepalived
+ newconfd "${FILESDIR}"/keepalived.confd-r1 keepalived
+
+ systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
+ systemd_install_serviced "${FILESDIR}/${PN}.service.conf"
+
+ use snmp && dodoc doc/*MIB.txt
+
+ docinto genhash
+ dodoc genhash/README genhash/AUTHOR genhash/ChangeLog
+ # This was badly named by upstream, it's more HOWTO than anything else.
+ newdoc INSTALL INSTALL+HOWTO
+
+ # Security risk to bundle SSL certs
+ rm -v "${ED}"/etc/keepalived/samples/*.pem || die
+ # Clean up sysvinit files
+ rm -rv "${ED}"/etc/sysconfig || die
+}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index 23b1b9dde344..22ad1f0cbba6 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild b/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild
index c7fe6e64fc5c..5a72818819c8 100644
--- a/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild
+++ b/sys-firmware/b43-firmware/b43-firmware-5.100.138.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.lwfinger.com/b43-firmware/${MY_P}.tar.bz2"
LICENSE="Broadcom"
SLOT="b43"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
IUSE=""
RESTRICT="binchecks strip bindist"
diff --git a/sys-firmware/b43legacy-firmware/b43legacy-firmware-3.130.20.0.ebuild b/sys-firmware/b43legacy-firmware/b43legacy-firmware-3.130.20.0.ebuild
index d31c683d0cb0..33fb9fad209b 100644
--- a/sys-firmware/b43legacy-firmware/b43legacy-firmware-3.130.20.0.ebuild
+++ b/sys-firmware/b43legacy-firmware/b43legacy-firmware-3.130.20.0.ebuild
@@ -14,7 +14,7 @@ RESTRICT="binchecks bindist strip"
LICENSE="Broadcom"
SLOT=0
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="amd64 ppc ~x86"
IUSE=""
RDEPEND=""
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 93074fecbb59..69c73073288c 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
index 2dcdad74753a..623cbad1b177 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86"
IUSE="debug lz4 lzma lzo static xattr +xz"
LIB_DEPEND="
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 7e6d7940ed2d..ff85ac5d17cf 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -7,3 +7,4 @@ DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a5
DIST systemd-241-rc1.tar.gz 7617965 BLAKE2B 6c491297b71ad3c473d644de04bb334f902ee4110d647b654c5452f34401cfc11c7564b290022072555f3fbd46674ce009f587622f412f8a66330a7089db34c5 SHA512 168ba80d6e8abadbf1ed84270f2b02e257f1490b61021bb6fb704d9b5fad2670b63e0fc0cb26071e8d56c993faa30274e80d53cf49154cce2b609f47c73b30e0
DIST systemd-241-rc2.tar.gz 7619504 BLAKE2B 610940b3141d36a0534cf477d303eb681f418f8c04d7e9ff1d28832d02c05d68195aec108b15392662b134020c28df5b35f6c1c85f8eea8e7090cdc210ce5e26 SHA512 69932b1e5d48fbf6fd650a91354763b1e7e8d490def98a011d6377ee8623abc21244f2c8ddd97a500c4d3e6ab11bae2a6148ddc84e325d75a0273b3d456d8f41
DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
+DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
diff --git a/sys-fs/udev/udev-242.ebuild b/sys-fs/udev/udev-242.ebuild
new file mode 100644
index 000000000000..e3c9cbfb5d88
--- /dev/null
+++ b/sys-fs/udev/udev-242.ebuild
@@ -0,0 +1,328 @@
+# Copyright 2003-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev user
+
+if [[ ${PV} = 9999* ]]; then
+ EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+ inherit git-r3
+else
+ MY_PV=${PV/_/-}
+ MY_P=systemd-${MY_PV}
+ S=${WORKDIR}/${MY_P}
+ SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
+ sys-libs/libcap[${MULTILIB_USEDEP}]
+ acl? ( sys-apps/acl )
+ kmod? ( >=sys-apps/kmod-16 )
+ selinux? ( >=sys-libs/libselinux-2.1.9 )
+ ! "${T}"/40-gentoo.rules
+ # Gentoo specific floppy and usb groups
+ ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+ ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+ EOF
+
+ if [[ -d "${WORKDIR}/patches" ]]; then
+ eapply "${WORKDIR}/patches"
+ fi
+
+ local PATCHES=(
+ "${FILESDIR}/236-uucp-group.patch"
+ )
+
+ default
+}
+
+meson_multilib_native_use() {
+ if multilib_is_native_abi && use "$1"; then
+ echo true
+ else
+ echo false
+ fi
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ -Dacl=$(meson_multilib_native_use acl)
+ -Defi=false
+ -Dkmod=$(meson_multilib_native_use kmod)
+ -Dselinux=$(meson_multilib_native_use selinux)
+ -Dlink-udev-shared=false
+ -Dsplit-usr=true
+
+ # Prevent automagic deps
+ -Dgcrypt=false
+ -Dlibcryptsetup=false
+ -Dlibidn=false
+ -Dlibidn2=false
+ -Dlibiptc=false
+ -Dseccomp=false
+ -Dlz4=false
+ -Dxz=false
+ )
+ meson_src_configure
+}
+
+src_configure() {
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+ multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+ # meson creates this link
+ local libudev=$(readlink src/udev/libudev.so.1)
+
+ local targets=(
+ src/udev/${libudev}
+ )
+ if multilib_is_native_abi; then
+ targets+=(
+ systemd-udevd
+ udevadm
+ src/udev/ata_id
+ src/udev/cdrom_id
+ src/udev/mtd_probe
+ src/udev/scsi_id
+ src/udev/v4l_id
+ man/udev.conf.5
+ man/systemd.link.5
+ man/hwdb.7
+ man/udev.7
+ man/systemd-udevd.service.8
+ man/udevadm.8
+ )
+ fi
+ eninja "${targets[@]}"
+}
+
+multilib_src_install() {
+ local libudev=$(readlink src/udev/libudev.so.1)
+
+ into /
+ dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
+
+ insinto "/usr/$(get_libdir)/pkgconfig"
+ doins src/libudev/libudev.pc
+
+ if multilib_is_native_abi; then
+ into /
+ dobin udevadm
+
+ exeinto /lib/systemd
+ doexe systemd-udevd
+
+ exeinto /lib/udev
+ doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
+
+ rm rules/99-systemd.rules || die
+ insinto /lib/udev/rules.d
+ doins rules/*.rules
+
+ insinto /usr/share/pkgconfig
+ doins src/udev/udev.pc
+
+ mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
+ rm man/systemd-udevd-{control,kernel}.socket.8 || die
+ doman man/*.[0-9]
+ fi
+}
+
+multilib_src_install_all() {
+ doheader src/libudev/libudev.h
+
+ insinto /etc/udev
+ doins src/udev/udev.conf
+ keepdir /etc/udev/{hwdb.d,rules.d}
+
+ insinto /lib/systemd/network
+ doins network/99-default.link
+
+ # see src_prepare() for content of 40-gentoo.rules
+ insinto /lib/udev/rules.d
+ doins "${T}"/40-gentoo.rules
+ doins "${S}"/rules/*.rules
+
+ dobashcomp shell-completion/bash/udevadm
+
+ insinto /usr/share/zsh/site-functions
+ doins shell-completion/zsh/_udevadm
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ mkdir -p "${ROOT%/}"/run
+
+ # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+ # So try to remove it here (will only work if empty).
+ rmdir "${ROOT%/}"/dev/loop 2>/dev/null
+ if [[ -d ${ROOT%/}/dev/loop ]]; then
+ ewarn "Please make sure your remove /dev/loop,"
+ ewarn "else losetup may be confused when looking for unused devices."
+ fi
+
+ local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
+ while read -r dev path fstype rest; do
+ if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+ ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+ ewarn "filesystem. Otherwise udev won't be able to boot."
+ ewarn "See, https://bugs.gentoo.org/453186"
+ fi
+ done < "${fstab}"
+
+ if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
+ ewarn
+ ewarn "Please re-emerge all packages on your system which install"
+ ewarn "rules and helpers in /usr/lib/udev. They should now be in"
+ ewarn "/lib/udev."
+ ewarn
+ ewarn "One way to do this is to run the following command:"
+ ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
+ ewarn "Note that qfile can be found in app-portage/portage-utils"
+ fi
+
+ local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
+ local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
+ for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
+ if [[ -f ${old_rules} ]]; then
+ ewarn
+ ewarn "File ${old_rules} is from old udev installation but if you still use it,"
+ ewarn "rename it to something else starting with 70- to silence this deprecation"
+ ewarn "warning."
+ fi
+ done
+
+ elog
+ elog "Starting from version >= 197 the new predictable network interface names are"
+ elog "used by default, see:"
+ elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+ elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
+ elog
+ elog "Example command to get the information for the new interface name before booting"
+ elog "(replace with, for example, eth0):"
+ elog "# udevadm test-builtin net_id /sys/class/net/ 2> /dev/null"
+ elog
+ elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
+ elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
+ elog "to disable the feature."
+
+ if has_version 'sys-apps/biosdevname'; then
+ ewarn
+ ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
+ ewarn "detected to be installed with the new predictable network interface names."
+ fi
+
+ ewarn
+ ewarn "You need to restart udev as soon as possible to make the upgrade go"
+ ewarn "into effect."
+ ewarn "The method you use to do this depends on your init system."
+ if has_version 'sys-apps/openrc'; then
+ ewarn "For sys-apps/openrc users it is:"
+ ewarn "# /etc/init.d/udev --nodeps restart"
+ fi
+
+ elog
+ elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
+ elog "fixing known issues visit:"
+ elog "https://wiki.gentoo.org/wiki/Udev"
+ elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
+
+ # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+ # do the same for 80-net-setup-link.rules to keep the old behavior
+ local net_move=no
+ local net_name_slot_sym=no
+ local net_rules_path="${ROOT%/}"/etc/udev/rules.d
+ local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+ local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+ if [[ ! -e ${net_setup_link} ]]; then
+ [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
+ if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+ net_move=yes
+ net_name_slot_sym=yes
+ fi
+ fi
+ if [[ ${net_move} == yes ]]; then
+ ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+ if [[ ${net_name_slot_sym} == yes ]]; then
+ ln -nfs /dev/null "${net_setup_link}"
+ else
+ cp "${net_name_slot}" "${net_setup_link}"
+ fi
+ eend $?
+ fi
+
+ # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
+ # https://bugs.gentoo.org/246847
+ # https://bugs.gentoo.org/514174
+ enewgroup input
+ enewgroup kvm 78
+ enewgroup render
+
+ # Update hwdb database in case the format is changed by udev version.
+ if has_version 'sys-apps/hwids[udev]'; then
+ udevadm hwdb --update --root="${ROOT%/}"
+ # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+ # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+ [[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+ fi
+}
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index 989ed2a6113d..35368ad5da1c 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1 +1,2 @@
DIST vhba-module-20190302.tar.bz2 15708 BLAKE2B 4a6f1f22e893597e50e78fa06e1296079b600ad6b2cf7b319267ef44d1ff07795f2aca22541993a7fc57d15550297e71046ce4147226d0731aa2b4d691dd5299 SHA512 6df59112b9b0597ce98de85744acd8158dbc015841740649fa3538fec32f1d7cbf4e489062998cc13dc85a1b3558bcffc2ea65285e17ee5b3f1c0a7d49cd6a38
+DIST vhba-module-20190410.tar.bz2 15741 BLAKE2B 6d513877c771b1c4c5805231cf8bb13333d29dd3c6de7d91879ef1898fdc424df026b0835a772f398dcdc7d8900db462164a40e46c9b66b38ed70f5b5f6a0e7e SHA512 e4b30bea8464d8ac24fd2fddca9d41052af2f5b3dc9e054ead47991bff41366be377600075627c40261722c88c20ed2eaf65fa7afb34690ef09a6f4ea6f9351f
diff --git a/sys-fs/vhba/vhba-20190410.ebuild b/sys-fs/vhba/vhba-20190410.ebuild
new file mode 100644
index 000000000000..8969ab8b663f
--- /dev/null
+++ b/sys-fs/vhba/vhba-20190410.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils linux-mod udev
+
+MY_P=vhba-module-${PV}
+DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/udev"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+MODULE_NAMES="vhba(block:${S})"
+BUILD_TARGETS=modules
+
+pkg_setup() {
+ CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
+ check_extra_config
+ BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
+ linux-mod_pkg_setup
+}
+
+src_prepare() {
+ # Avoid "make jobserver unavailable" warning and -Werror problems
+ sed -e '/ccflags/s/-Werror$/-Wall/' \
+ -i Makefile || die "sed failed"
+
+ eapply_user
+}
+
+src_install() {
+ dodoc AUTHORS ChangeLog README
+ linux-mod_src_install
+
+ einfo "Generating udev rules ..."
+ dodir "$(get_udevdir)"/rules.d
+ cat > "${D}/$(get_udevdir)"/rules.d/69-vhba.rules <<-EOF || die
+ # do not edit this file, it will be overwritten on update
+ #
+ KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"
+ EOF
+}
+
+pkg_postinst() {
+ # Older versions of vhba installed their rule file in /etc/udev/rules.d,
+ # which overrides rules in /lib/udev/rules.d. We remove the old file
+ # automatically if it is identical to the default one installed by
+ # vhba-1.2.1 or 20101015-r1. Note that the comment at the top of the rules
+ # file states that it can be automatically overwritten by the system.
+ old_rules="${ROOT}etc/udev/rules.d/70-vhba.rules"
+ if [[ -f "${old_rules}" ]]; then
+ case "$(md5sum ${old_rules})" in
+ 2959b3cf61cfe6e466cc3516a7bc19de* | 1e7a7e5d6d28c811eeec98ec26ed5d28* )
+ elog
+ elog "Removing old ${old_rules} ..."
+ rm -f "${old_rules}" ||
+ eerror "Failed, please remove ${old_rules} manually."
+ ;;
+ * )
+ ewarn
+ ewarn "The ${old_rules} file from a previous"
+ ewarn "installation of ${PN} is overriding ${P}'s"
+ ewarn "udev rules. Unless you had deliberately customized it,"
+ ewarn "you should remove it."
+ ewarn
+ ;;
+ esac
+ fi
+
+ linux-mod_pkg_postinst
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 93464934467b..6268daffada1 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/glibc/glibc-2.29-r2.ebuild b/sys-libs/glibc/glibc-2.29-r2.ebuild
index 0e1db7e3c853..d98e7bee8e0e 100644
--- a/sys-libs/glibc/glibc-2.29-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.29-r2.ebuild
@@ -720,6 +720,7 @@ pkg_pretend() {
}
pkg_setup() {
+ # see bug 682570
[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
}
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index ba1d5041cb74..b5a01c5590f6 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -35,7 +35,7 @@ PATCH_VER=11
SRC_URI+=" https://dev.gentoo.org/~slyfox/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-${GCC_BOOTSTRAP_VER}.tar.xz )"
-IUSE="audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux +ssp suid systemtap test vanilla"
+IUSE="audit caps cet compile-locales doc gd headers-only +multiarch multilib nscd profile selinux +ssp +static-libs suid systemtap test vanilla"
# Minimum kernel version that glibc requires
MIN_KERN_VER="3.2.0"
@@ -721,6 +721,7 @@ pkg_pretend() {
}
pkg_setup() {
+ # see bug 682570
[[ -z ${BOOTSTRAP_RAP} ]] && python-any-r1_pkg_setup
}
@@ -1331,6 +1332,12 @@ src_install() {
fi
foreach_abi glibc_do_src_install
+
+ if ! use static-libs ; then
+ elog "Not installing static glibc libraries"
+ find "${ED}" -name "*.a" -and -not -name "*_nonshared.a" -delete
+ fi
+
src_strip
}
diff --git a/sys-libs/libapparmor/libapparmor-2.13.2.ebuild b/sys-libs/libapparmor/libapparmor-2.13.2.ebuild
index bf0107144e10..0562b7976134 100644
--- a/sys-libs/libapparmor/libapparmor-2.13.2.ebuild
+++ b/sys-libs/libapparmor/libapparmor-2.13.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc +perl +python static-libs"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-libs/musl/musl-1.1.22.ebuild b/sys-libs/musl/musl-1.1.22.ebuild
index 22f16fa8bfb0..38bdb951f6fe 100644
--- a/sys-libs/musl/musl-1.1.22.ebuild
+++ b/sys-libs/musl/musl-1.1.22.ebuild
@@ -17,7 +17,7 @@ else
https://dev.gentoo.org/~blueness/musl-misc/getconf.c
https://dev.gentoo.org/~blueness/musl-misc/getent.c
https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
- KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+ KEYWORDS="-* amd64 ~arm arm64 ~mips ~ppc x86"
fi
export CBUILD=${CBUILD:-${CHOST}}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index cd714310351c..a005553cf2aa 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/mediawiki/mediawiki-1.32.0.ebuild b/www-apps/mediawiki/mediawiki-1.32.0.ebuild
index b211b54dfd99..c6d6f277a77b 100644
--- a/www-apps/mediawiki/mediawiki-1.32.0.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.32.0.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~x86"
IUSE="imagemagick mysql postgres sqlite"
RDEPEND=">=dev-lang/php-7.0.0[fileinfo,iconv,json,mysql?,postgres?,session,ssl,unicode,xml,xmlreader]
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 11bfa7b27fa7..090997c22688 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,2 +1,3 @@
DIST nanoc-4.10.4.tar.gz 290367 BLAKE2B 0b5cf03938af1f971fccddb6bed4fa6b67da3aaf93cb7666c52e3ff8fc524f17ff10bf1a60ccf7f7b59f840d4c445ef57677349f5b83bc55e754e7078ac4b8d9 SHA512 5446e351906b5b6bbe5c9059dab86490d5deef5e1197adf5827fe201f2932d5cf79c65bfd9d9370ce57c35d965e013098d39d53fa96db8b4d1c6017977683ea2
DIST nanoc-4.11.0.tar.gz 291654 BLAKE2B ab88bf36b472106f356ae67782dac61f691e0d64646f410ae0cceca7a9df11689dd7a011bf58a773d6b35956f0092deac4db43bb8663d66463b72e10da27c658 SHA512 357345c9247465bd470bf6c71ea2b16e3415680fad6a4d4ee755eeb3a1443664590753003a5de0a740ffcfbaf93049c2c12c1f22de052f4d6efc2382430a4e08
+DIST nanoc-4.11.2.tar.gz 302927 BLAKE2B 206142cc13468c3456dfd141bb031791c3d6aa31b81cca04493519e8b44d7bc82d6837d266a0edecc58c0e635cee7428bfdf0d5428de7d5e6fb6eacebb09d45e SHA512 842703e5218c06e817ce188458ee0e9267467b92219dd566fda9d58cd21ec9842bbc011b8f2faa7854caf39af1379c2eae16a3e3b73c53f2c8af6b8851c7c8b9
diff --git a/www-apps/nanoc/nanoc-4.11.2.ebuild b/www-apps/nanoc/nanoc-4.11.2.ebuild
new file mode 100644
index 000000000000..02aaf44b073f
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.11.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="${P}/nanoc"
+
+ruby_add_rdepend "!minimal? (
+ dev-ruby/mime-types:*
+ dev-ruby/rack:*
+ www-servers/adsf
+)
+ >=dev-ruby/addressable-2.5
+ >=dev-ruby/cri-2.15:0
+ ~www-apps/nanoc-core-${PV}
+ >=dev-ruby/parallel-1.12:1
+ >=dev-ruby/slow_enumerator_tools-1.1.0:1
+ >=dev-ruby/tomlrb-1.2:1"
+
+ruby_add_bdepend "test? (
+ dev-ruby/rspec:3
+ dev-ruby/asciidoctor
+ dev-ruby/fuubar
+ dev-ruby/haml
+ dev-ruby/maruku
+ >=dev-ruby/mocha-0.13
+ dev-ruby/minitest
+ dev-ruby/mustache
+ dev-ruby/pry
+ dev-ruby/rdoc
+ dev-ruby/rouge:2
+ dev-ruby/rubypants
+ dev-ruby/systemu
+ dev-ruby/timecop
+ dev-ruby/vcr
+ dev-ruby/webmock
+ dev-ruby/yard
+)
+doc? (
+ dev-ruby/kramdown
+ dev-ruby/rdiscount
+ dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+ # Avoid unneeded development dependencies
+ sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
+ sed -i -e '/simplecov/I s:^:#:' \
+ -e '/codecov/I s:^:#:' ../common/spec/spec_helper_head_core.rb || die
+ sed -i -e '/coverall/I s:^:#:' \
+ -e '/rubocop/ s:^:#:' Rakefile || die
+
+ echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+ # Avoid tests requiring a network connection
+ rm -f test/checking/checks/test_{css,html}.rb || die
+
+ # Avoid tests for unpackaged dependencies
+ rm spec/nanoc/deploying/fog_spec.rb \
+ spec/nanoc/filters/less_spec.rb \
+ test/filters/test_{markaby,rainpress}.rb || die
+
+ # Avoid non-fatal failing tests due to specifics in the environment
+ sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
+ sed -i -e '/does not crash when output dir does not exist and/askip "gentoo"' spec/nanoc/cli/commands/view_spec.rb || die
+ sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+ sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
+}
+
+each_ruby_test() {
+ RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-apps/novnc/novnc-9999.ebuild b/www-apps/novnc/novnc-9999.ebuild
index c876ebff1f79..8be047198637 100644
--- a/www-apps/novnc/novnc-9999.ebuild
+++ b/www-apps/novnc/novnc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,8 +18,6 @@ else
KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
fi
-S="${WORKDIR}/noVNC-${PV}"
-
LICENSE="LGPL-3"
SLOT="0"
IUSE=""
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index 693086d3637b..0d6d2c053e97 100644
Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ
diff --git a/www-misc/urlwatch/Manifest b/www-misc/urlwatch/Manifest
index 4dce477bcd76..dd5ca5439a23 100644
--- a/www-misc/urlwatch/Manifest
+++ b/www-misc/urlwatch/Manifest
@@ -1,3 +1,3 @@
DIST urlwatch-2.13.tar.gz 34312 BLAKE2B 6ac618d4f1f78b0a3f6d17dd2283704e8d1fc7173ce6d79fcf0f9177f48463a610a4c20d8483a4a9c22e56eca67730ef25982981f310ca8e9927e48e298a1b1d SHA512 5ca6ad3de54c2e1d63cb545ae0d213a4483ef175dad947be00994bc990d047c7aec1f3b0a8b23290672db940001a9cc31c919aa7d9c280ab4792299e2dba684c
-DIST urlwatch-2.15.tar.gz 36839 BLAKE2B a474d93adb4ef95ad5c44b7cee4a077dd744caf09c84ec64b2e9f04635505a8ffd422f4ba56cb2069571b5b4b1e1f7df4b7412a716b5738388a0c55ea831e050 SHA512 3390a693656a89e75836f713249261650c03e1dc1d1819d82872d35eead7f29844502073d8674e92e97a32e44180347928e5dfada814798984d11e1ff4f0ac40
DIST urlwatch-2.16.tar.gz 42713 BLAKE2B bee95c808b8705135112646ed7bf42c6606d716f447394e69fbc3355d38597e44b3e94ac91c6c2304fadcc5eb7d35349e6d54601721319c39268583fa8c7c042 SHA512 ffa9245bc4b8631e3105b1afd4ed3c3f5585bc30cd56c7531f9c2d0e4d61e36b56db3a69d62f851bed5fba9c9c332034b1757d70b32f4a4b0607ae59ed6cf887
+DIST urlwatch-2.17.tar.gz 44178 BLAKE2B 46163b3305a50c3b5165da8f794c252aeb0a3581f16ba04cc1f0d920066accd02f7eba47718012e2ac0071f6bfa31019777a28840179a28a7fe365ae2e8f1d2c SHA512 635bca7e55641dd73447f5ec9ad429539decfaa8a1c19ab073c3bd46acfc518fa6012d855e0c37dd78654da28acf1446f580def611bcb85ae94fe13f567e3613
diff --git a/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch b/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch
new file mode 100644
index 000000000000..c8bd04ae932f
--- /dev/null
+++ b/www-misc/urlwatch/files/urlwatch-2.17-fix-yaml.load.patch
@@ -0,0 +1,18 @@
+commit d00041bacd6343cadf29c3d0a98817a7b9fda2a1
+Author: Louis Sautier
+Date: Sun Apr 14 14:49:24 2019 +0200
+
+ Fix YAMLLoadWarning in tests
+
+diff --git a/test/test_filters.py b/test/test_filters.py
+index 3402616..da2393b 100644
+--- a/test/test_filters.py
++++ b/test/test_filters.py
+@@ -33,6 +33,6 @@ def test_filters():
+ eq_(result, expected_result)
+
+ with open(os.path.join(os.path.dirname(__file__), 'data/filter_tests.yaml'), 'r', encoding='utf8') as fp:
+- filter_tests = yaml.load(fp)
++ filter_tests = yaml.load(fp, Loader=yaml.SafeLoader)
+ for test_name in filter_tests:
+ yield check_filter, test_name
diff --git a/www-misc/urlwatch/urlwatch-2.13.ebuild b/www-misc/urlwatch/urlwatch-2.13.ebuild
index feaa87c4b5e4..b14e83974e51 100644
--- a/www-misc/urlwatch/urlwatch-2.13.ebuild
+++ b/www-misc/urlwatch/urlwatch-2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,7 +19,7 @@ RDEPEND="
dev-python/appdirs[${PYTHON_USEDEP}]
dev-python/keyring[${PYTHON_USEDEP}]
dev-python/minidb[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
+