diff --git a/Manifest.files.gz b/Manifest.files.gz
index 36131885f428..38248a9386fd 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 054ca544c946..0a9db58f2b95 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/abrt/Manifest b/app-admin/abrt/Manifest
index f6dc6cffde51..61a9d64165b7 100644
--- a/app-admin/abrt/Manifest
+++ b/app-admin/abrt/Manifest
@@ -1,2 +1,3 @@
DIST abrt-2.0.12.tar.gz 1090121 BLAKE2B 272f486bd166a33fea3e340763b3443b5643a650fe16ad326e249309c355f214c67937456dd2d8f3e7cdac65cb85bd8030e6b89671f427085a05dca64b8f874d SHA512 5432205edb4483fb1883b9bcebab48784b16dd9e72c3a929ea0d50c48dab638d80f136b6b0d7648d8ec9fcb79d5ce8c1be37d36301d3b2b151868901be82a63a
+DIST abrt-2.10.10.tar.gz 6830586 BLAKE2B 5cd45144678e6355cb1362c3ebe5531104bb150ff95c42d10e3056f7619cdc7dc3da57e4025cab05234866a4634f29bc07fd78f574800d6b303385c6befa25bd SHA512 6daeea898c9328d31b952ef12202162e002f91b4115301e5d66a0e6991251f9a8322b87201128f7efd54b42b76cb94abc4cf01e5d5b563f254f6757ec7e2127d
DIST abrt-2.10.9.tar.gz 6830234 BLAKE2B ec96b915103c8b8157eb64c98791d283225091d0f2aa7b78520bfae1bee22f43703715fabc43828c750aa7e84eea4a886878d411670b7b4ad31ca49b96d387f3 SHA512 1ff7e2edf29085fb03c569b67e8bf2bc83aaf4dd77730e5fc96184453224f83dd0632eaf85a7ad03351fdfaea3d4ed50e8a89eb28d82151f95bd34eb1850f93c
diff --git a/app-admin/abrt/abrt-2.10.10-r1.ebuild b/app-admin/abrt/abrt-2.10.10-r1.ebuild
new file mode 100644
index 000000000000..12dd86750951
--- /dev/null
+++ b/app-admin/abrt/abrt-2.10.10-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2-utils python-single-r1 systemd user
+
+DESCRIPTION="Automatic bug detection and reporting tool"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug selinux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.43:2
+ >=dev-libs/libreport-2.9.5[python]
+ dev-libs/libxml2
+ dev-libs/nss
+ >=gnome-base/gsettings-desktop-schemas-3.15.1
+ sys-apps/dbus
+ sys-apps/systemd
+ sys-auth/polkit
+ sys-fs/inotify-tools
+ x11-libs/gtk+:3
+ >=x11-libs/libnotify-0.7
+"
+RDEPEND="${COMMON_DEPEND}
+ app-arch/cpio
+ dev-libs/elfutils
+ dev-python/argcomplete[${PYTHON_USEDEP}]
+ dev-python/argh[${PYTHON_USEDEP}]
+ dev-python/humanize[${PYTHON_USEDEP}]
+ sys-apps/util-linux
+ >=sys-devel/gdb-7
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/asciidoc
+ app-text/xmlto
+ dev-libs/satyr[${PYTHON_USEDEP}]
+ >=dev-util/intltool-0.35.0
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.17
+"
+
+RESTRICT="test" # tests *may* be broken due to all the RHEL crap. explore later.
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+
+ enewgroup abrt
+ enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+ default
+
+ # pyhook test is sensitive to the format of python's error messages, and
+ # fails with certain python versions
+ sed -e '/pyhook.at/ d' \
+ -i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
+ ./gen-version || die # Needed to be run before autoreconf
+ eautoreconf
+}
+
+src_configure() {
+ myeconfargs=(
+ --libdir="${EPREFIX}/usr/$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-bodhi
+ # package breaks due to not finding libreport-web with bodhi plugin enabled
+ --without-rpm
+ $(usex selinux "" "--without-selinux")
+ --without-python2
+ # Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
+ --with-python3
+ --without-pythondoc
+ # package breaks due to no sphinx-build-3
+ --without-pythontests
+ # kill tests for now until they can be explored.
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ keepdir /var/run/abrt
+ # /var/spool/abrt is created by dev-libs/libreport
+
+ diropts -m 700 -o abrt -g abrt
+ keepdir /var/spool/abrt-upload
+
+ diropts -m 775 -o abrt -g abrt
+ keepdir /var/cache/abrt-di
+
+ find "${D}" -name '*.la' -delete || die
+
+ newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
+ newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-admin/abrt/abrt-2.10.10.ebuild b/app-admin/abrt/abrt-2.10.10.ebuild
new file mode 100644
index 000000000000..92a41f5008a3
--- /dev/null
+++ b/app-admin/abrt/abrt-2.10.10.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2-utils python-single-r1 systemd user
+
+DESCRIPTION="Automatic bug detection and reporting tool"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug selinux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ >=dev-libs/glib-2.43:2
+ >=dev-libs/libreport-2.9.5[python]
+ dev-libs/libxml2
+ dev-libs/nss
+ >=gnome-base/gsettings-desktop-schemas-3.15.1
+ sys-apps/dbus
+ sys-apps/systemd
+ sys-auth/polkit
+ sys-fs/inotify-tools
+ x11-libs/gtk+:3
+ >=x11-libs/libnotify-0.7
+"
+RDEPEND="${COMMON_DEPEND}
+ app-arch/cpio
+ dev-libs/elfutils
+ dev-python/argcomplete[${PYTHON_USEDEP}]
+ dev-python/argh[${PYTHON_USEDEP}]
+ dev-python/humanize[${PYTHON_USEDEP}]
+ sys-apps/util-linux
+ >=sys-devel/gdb-7
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/asciidoc
+ app-text/xmlto
+ dev-libs/satyr[${PYTHON_USEDEP}]
+ >=dev-util/intltool-0.35.0
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.17
+"
+
+RESTRICT="test" # tests *may* be broken due to all the RHEL crap. explore later.
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+
+ enewgroup abrt
+ enewuser abrt -1 -1 -1 abrt
+}
+
+src_prepare() {
+ default
+
+ # pyhook test is sensitive to the format of python's error messages, and
+ # fails with certain python versions
+ sed -e '/pyhook.at/ d' \
+ -i tests/Makefile.* tests/testsuite.at || die "sed remove pyhook tests failed"
+ ./gen-version || die # Needed to be run before autoreconf
+ eautoreconf
+}
+
+src_configure() {
+ myeconfargs=(
+ --libdir="${EPREFIX}/$(get_libdir)"
+ --localstatedir="${EPREFIX}/var"
+ --without-bodhi
+ # package breaks due to not finding libreport-web with bodhi plugin enabled
+ --without-rpm
+ $(usex selinux "" "--without-selinux")
+ --without-python2
+ # Fixes "syntax error in VERSION script" and we aren't supporting Python2 anyway
+ --with-python3
+ --without-pythondoc
+ # package breaks due to no sphinx-build-3
+ --without-pythontests
+ # kill tests for now until they can be explored.
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ keepdir /var/run/abrt
+ # /var/spool/abrt is created by dev-libs/libreport
+
+ diropts -m 700 -o abrt -g abrt
+ keepdir /var/spool/abrt-upload
+
+ diropts -m 775 -o abrt -g abrt
+ keepdir /var/cache/abrt-di
+
+ find "${D}" -name '*.la' -delete || die
+
+ newinitd "${FILESDIR}/${PN}-2.0.12-r1-init" abrt
+ newconfd "${FILESDIR}/${PN}-2.0.12-r1-conf" abrt
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-admin/entr/Manifest b/app-admin/entr/Manifest
index 56b6e02a8549..85d5941fa910 100644
--- a/app-admin/entr/Manifest
+++ b/app-admin/entr/Manifest
@@ -1 +1,2 @@
DIST entr-4.0.tar.gz 24758 BLAKE2B 6d57cb93d55bb362b8e771745c9333a5a5eaa156f36a7c9e7318d94f0056fc98b2071bcea7fd33b68ac1dc1d5332fc849e0ea89bc2582196acd51e1490fce96e SHA512 d803c27441448374a866636e0e592a8395488e162e2e8c031aafec3457d10041dc52e10d06cc1e209cd86f69ca021171ef105056206b9afe603a89958eef2707
+DIST entr-4.1.tar.gz 25265 BLAKE2B e90a50e7ac0917441db872fcc3b228bd2d16a77a7178810d004cb23510644843dbee1b9b47aedbe7b6b696501f994201f4eab404c6de950013c0b81b042382b0 SHA512 0a80aa9caa97f2603e43957b716bf5b5746cea8bfb2f2cc884aab8c97a34341d6223035fbb5d4bf86234ea1c9314c077cec9d59ba442a2730fcbd7151425a459
diff --git a/app-admin/entr/entr-4.1.ebuild b/app-admin/entr/entr-4.1.ebuild
new file mode 100644
index 000000000000..829cf311603a
--- /dev/null
+++ b/app-admin/entr/entr-4.1.ebuild
@@ -0,0 +1,30 @@
+# 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/gnome-abrt/Manifest b/app-admin/gnome-abrt/Manifest
new file mode 100644
index 000000000000..571b8de43dc1
--- /dev/null
+++ b/app-admin/gnome-abrt/Manifest
@@ -0,0 +1 @@
+DIST gnome-abrt-1.2.6.tar.gz 340308 BLAKE2B 5221fe43fd72fe8798f2c11275863e6936e616632641448c53dd24118d3b6b808fc373fe98b8775f1f1c58820c06195a665f6d417c95eaa7cc333cd7660b2d0b SHA512 12bcdeefa481b7caa04da046ee11d6adc9fd582b32f709d79a2d94cf61ca02643edd418cd9257c0f732a30aa5714fe83a282a4c794ff4260ddad038f7721ff2c
diff --git a/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild b/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild
new file mode 100644
index 000000000000..5121f602279e
--- /dev/null
+++ b/app-admin/gnome-abrt/gnome-abrt-1.2.6.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit autotools gnome2-utils python-single-r1
+
+DESCRIPTION="A utility for viewing problems that have occurred with the system"
+HOMEPAGE="https://github.com/abrt/abrt/wiki/ABRT-Project"
+SRC_URI="https://github.com/abrt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ x11-libs/gtk+:3
+ >=dev-libs/libreport-2.0.20[python]
+ >=app-admin/abrt-2.10.10-r1
+ dev-python/pygobject:3
+ x11-libs/libX11
+ >=dev-python/pyxdg-0.19
+"
+DEPEND="${RDEPEND}
+ app-text/asciidoc
+ app-text/xmlto
+ >=dev-util/intltool-0.35.0
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.17
+"
+
+PATCHES=(
+ # From Fedora (fixed in next release)
+ "${FILESDIR}"/0001-Remove-Expert-mode-and-the-remaining-Analyze-code.patch
+)
+
+src_prepare() {
+ default
+ ./gen-version > gnome-abrt-version || die
+ eautoreconf
+}
+
+src_configure() {
+ myeconfargs=(
+ --localstatedir="${EPREFIX}/var"
+ --with-nopylint
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-admin/gnome-abrt/metadata.xml b/app-admin/gnome-abrt/metadata.xml
new file mode 100644
index 000000000000..fec665753243
--- /dev/null
+++ b/app-admin/gnome-abrt/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ gnome@gentoo.org
+ Gentoo GNOME Desktop
+
+
+ abrt/gnome-abrt
+
+
diff --git a/app-admin/sudo/sudo-1.8.23-r1.ebuild b/app-admin/sudo/sudo-1.8.23-r1.ebuild
new file mode 100644
index 000000000000..8e7d28d69bd5
--- /dev/null
+++ b/app-admin/sudo/sudo-1.8.23-r1.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils pam multilib libtool
+
+MY_P=${P/_/}
+MY_P=${MY_P/beta/b}
+
+uri_prefix=
+case ${P} in
+ *_beta*|*_rc*) uri_prefix=beta/ ;;
+esac
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+ ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris"
+fi
+IUSE="gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey"
+
+CDEPEND="
+ gcrypt? ( dev-libs/libgcrypt:= )
+ openssl? ( dev-libs/openssl:0= )
+ pam? ( virtual/pam )
+ sasl? ( dev-libs/cyrus-sasl )
+ skey? ( >=sys-auth/skey-1.1.5-r1 )
+ ldap? (
+ >=net-nds/openldap-2.1.30-r1
+ dev-libs/cyrus-sasl
+ )
+ sys-libs/zlib
+"
+RDEPEND="
+ ${CDEPEND}
+ selinux? ( sec-policy/selinux-sudo )
+ ldap? ( dev-lang/perl )
+ pam? ( sys-auth/pambase )
+ >=app-misc/editor-wrapper-3
+ virtual/editor
+ sendmail? ( virtual/mta )
+"
+DEPEND="
+ ${CDEPEND}
+ sys-devel/bison
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+ pam? ( !skey )
+ skey? ( !pam )
+ ?? ( gcrypt openssl )
+"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+ default
+ elibtoolize
+}
+
+set_secure_path() {
+ # FIXME: secure_path is a compile time setting. using PATH or
+ # ROOTPATH is not perfect, env-update may invalidate this, but until it
+ # is available as a sudoers setting this will have to do.
+ einfo "Setting secure_path ..."
+
+ # first extract the default ROOTPATH from build env
+ SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
+ echo "${ROOTPATH}")
+ case "${SECURE_PATH}" in
+ */usr/sbin*) ;;
+ *) SECURE_PATH=$(unset PATH;
+ . "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+ ;;
+ esac
+ if [[ -z ${SECURE_PATH} ]] ; then
+ ewarn " Failed to detect SECURE_PATH, please report this"
+ fi
+
+ # then remove duplicate path entries
+ cleanpath() {
+ local newpath thisp IFS=:
+ for thisp in $1 ; do
+ if [[ :${newpath}: != *:${thisp}:* ]] ; then
+ newpath+=:$thisp
+ else
+ einfo " Duplicate entry ${thisp} removed..."
+ fi
+ done
+ SECURE_PATH=${newpath#:}
+ }
+ cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+ # finally, strip gcc paths #136027
+ rmpath() {
+ local e newpath thisp IFS=:
+ for thisp in ${SECURE_PATH} ; do
+ for e ; do [[ $thisp == $e ]] && continue 2 ; done
+ newpath+=:$thisp
+ done
+ SECURE_PATH=${newpath#:}
+ }
+ rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+ einfo "... done"
+}
+
+src_configure() {
+ local SECURE_PATH
+ set_secure_path
+
+ # audit: somebody got to explain me how I can test this before I
+ # enable it.. - Diego
+ # plugindir: autoconf code is crappy and does not delay evaluation
+ # until `make` time, so we have to use a full path here rather than
+ # basing off other values.
+ myeconfargs=(
+ --enable-zlib=system
+ --with-editor="${EPREFIX}"/usr/libexec/editor
+ --with-env-editor
+ --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+ --with-rundir="${EPREFIX}"/var/run/sudo
+ --with-secure-path="${SECURE_PATH}"
+ --with-vardir="${EPREFIX}"/var/db/sudo
+ --without-linux-audit
+ --without-opie
+ $(use_enable gcrypt)
+ $(use_enable nls)
+ $(use_enable openssl)
+ $(use_enable sasl)
+ $(use_with offensive insults)
+ $(use_with offensive all-insults)
+ $(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+ $(use_with ldap)
+ $(use_with pam)
+ $(use_with skey)
+ $(use_with selinux)
+ $(use_with sendmail)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if use ldap ; then
+ dodoc README.LDAP
+
+ cat <<-EOF > "${T}"/ldap.conf.sudo
+ # See ldap.conf(5) and README.LDAP for details
+ # This file should only be readable by root
+
+ # supported directives: host, port, ssl, ldap_version
+ # uri, binddn, bindpw, sudoers_base, sudoers_debug
+ # tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+ EOF
+
+ insinto /etc
+ doins "${T}"/ldap.conf.sudo
+ fperms 0440 /etc/ldap.conf.sudo
+
+ insinto /etc/openldap/schema
+ newins doc/schema.OpenLDAP sudo.schema
+ fi
+
+ pamd_mimic system-auth sudo auth account session
+
+ keepdir /var/db/sudo/lectured
+ fperms 0700 /var/db/sudo/lectured
+ fperms 0711 /var/db/sudo #652958
+
+ # Don't install into /var/run as that is a tmpfs most of the time
+ # (bug #504854)
+ rm -rf "${ED}"/var/run
+}
+
+pkg_postinst() {
+ #652958
+ local sudo_db="${EROOT}/var/db/sudo"
+ if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+ chmod 711 "${sudo_db}" || die
+ fi
+
+ if use ldap ; then
+ ewarn
+ ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+ ewarn
+ if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+ ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+ ewarn "configured in /etc/nsswitch.conf."
+ ewarn
+ ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+ ewarn " sudoers: ldap files"
+ ewarn
+ fi
+ fi
+ if use prefix ; then
+ ewarn
+ ewarn "To use sudo, you need to change file ownership and permissions"
+ ewarn "with root privileges, as follows:"
+ ewarn
+ ewarn " # chown root:root ${EPREFIX}/usr/bin/sudo"
+ ewarn " # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers"
+ ewarn " # chown root:root ${EPREFIX}/etc/sudoers.d"
+ ewarn " # chown root:root ${EPREFIX}/var/db/sudo"
+ ewarn " # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+ ewarn
+ fi
+
+ elog "To use the -A (askpass) option, you need to install a compatible"
+ elog "password program from the following list. Starred packages will"
+ elog "automatically register for the use with sudo (but will not force"
+ elog "the -A option):"
+ elog ""
+ elog " [*] net-misc/ssh-askpass-fullscreen"
+ elog " net-misc/x11-ssh-askpass"
+ elog ""
+ elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+ elog "variable to the program you want to use."
+}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 2d6b68e6da4a..b31bf2d1badb 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -1,4 +1,5 @@
DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
DIST syslog-ng-3.14.1.tar.gz 9039910 BLAKE2B 688eb52557c41a2556835978809b74ef4cc6b78e54580c4f349a8b9ebc07a6cf5ab99d8cda2a0212cb0186fe9e0a276d46ab9846c5ed1c391d734596ccc2d0a9 SHA512 86e5b59f76de3f585781accc9e426b2f74a73a560a6b49364e3f2b71b6fdd382b8473b468ac396e09c1dd0e00aa525a25874af67ce6c81978df2995c9b920aa7
DIST syslog-ng-3.15.1.tar.gz 9147238 BLAKE2B 86c51a51569efed2c2127a6102a10224a0599d40af0d34f28b5b52e314687851753f979a8d9edabdba02d347407b1b2856bce11991eeda53cbe10ad135934534 SHA512 79b4f2eff92bcbfe8a875bc72eb98bb43d86ef3c63deaf4acefcdad4f3a98df9de4e7935fc2ebbe017fd5eb22aa0743f1ff428d0ccf3790a1767f4e25c6a7b13
+DIST syslog-ng-3.16.1.tar.gz 8899693 BLAKE2B 850d83ff6f7e2db4aaf0737cc97403084bfa97855df28ccc8134c7d744cc0539e5d9efcd72f7eaa5407504897bc274419963843afa4c81964732dc5d6f0337cd SHA512 6b47e570ac19154f6158d8de0898c0a49e87d4ed51cae67224501e9460063efc53c4b2ad518d7def811d320f88cbefbf5d645de31f300498921652d7be305999
DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
diff --git a/app-admin/syslog-ng/syslog-ng-3.16.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.16.1.ebuild
new file mode 100644
index 000000000000..27ecc33b1e1a
--- /dev/null
+++ b/app-admin/syslog-ng/syslog-ng-3.16.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit autotools eapi7-ver python-single-r1 systemd
+
+MY_PV_MM=$(ver_cut 1-2)
+DESCRIPTION="syslog replacement with advanced filtering features"
+HOMEPAGE="https://syslog-ng.com/open-source-log-management"
+SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+# unit tests require https://github.com/Snaipe/Criterion with additional deps
+RESTRICT="test"
+
+RDEPEND="
+ >=dev-libs/glib-2.10.1:2
+ >=dev-libs/ivykis-0.42.3
+ >=dev-libs/libpcre-6.1:=
+ !dev-libs/eventlog
+ amqp? ( >=net-libs/rabbitmq-c-0.8.0:= )
+ caps? ( sys-libs/libcap )
+ dbi? ( >=dev-db/libdbi-0.9.0 )
+ geoip? ( >=dev-libs/geoip-1.5.0 )
+ http? ( net-misc/curl )
+ json? ( >=dev-libs/json-c-0.9:= )
+ mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 )
+ python? ( ${PYTHON_DEPS} )
+ redis? ( >=dev-libs/hiredis-0.11.0:= )
+ smtp? ( net-libs/libesmtp )
+ spoof-source? ( net-libs/libnet:1.1= )
+ systemd? ( sys-apps/systemd:= )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS.md CONTRIBUTING.md contrib/syslog-ng.conf.{HP-UX,RedHat,SunOS,doc}
+ contrib/syslog2ng "${T}/syslog-ng.conf.gentoo.hardened"
+ "${T}/syslog-ng.logrotate.hardened" "${FILESDIR}/README.hardened" )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ local f
+
+ use python && python_fix_shebang .
+
+ # remove bundled libs
+ rm -r lib/ivykis modules/afmongodb/mongo-c-driver || die
+
+ # drop scl modules requiring json
+ if use !json; then
+ sed -i -r '/cim|elasticsearch|ewmm|graylog2|loggly|logmatic/d' scl/Makefile.am || die
+ fi
+
+ # drop scl modules requiring http
+ if use !http; then
+ sed -i -r '/telegram/d' scl/Makefile.am || die
+ fi
+
+ # use gentoo default path
+ if use systemd; then
+ sed -e 's@/etc/syslog-ng.conf@/etc/syslog-ng/syslog-ng.conf@g;s@/var/run@/run@g' \
+ -i contrib/systemd/syslog-ng@default || die
+ fi
+
+ for f in syslog-ng.logrotate.hardened.in syslog-ng.logrotate.in; do
+ sed \
+ -e "s#@GENTOO_RESTART@#$(usex systemd "systemctl kill -s HUP syslog-ng@default" \
+ "/etc/init.d/syslog-ng reload")#g" \
+ "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+ done
+
+ for f in syslog-ng.conf.gentoo.fbsd.in \
+ syslog-ng.conf.gentoo.hardened.in \
+ syslog-ng.conf.gentoo.in; do
+ sed -e "s/@SYSLOGNG_VERSION@/${MY_PV_MM}/g" "${FILESDIR}/${f}" > "${T}/${f/.in/}" || die
+ done
+
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=(
+ --disable-docs
+ --disable-java
+ --disable-java-modules
+ --disable-riemann
+ --enable-manpages
+ --localstatedir=/var/lib/syslog-ng
+ --sysconfdir=/etc/syslog-ng
+ --with-embedded-crypto
+ --with-ivykis=system
+ --with-module-dir=/usr/$(get_libdir)/syslog-ng
+ --with-pidfile-dir=/var/run
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+ $(use_enable amqp)
+ $(usex amqp --with-librabbitmq-client=system --without-librabbitmq-client)
+ $(use_enable caps linux-caps)
+ $(use_enable dbi sql)
+ $(use_enable geoip)
+ $(use_enable http)
+ $(use_enable ipv6)
+ $(use_enable json)
+ $(use_enable mongodb)
+ $(usex mongodb --with-mongoc=system "--without-mongoc --disable-legacy-mongodb-options")
+ $(use_enable pacct)
+ $(use_enable python)
+ $(use_enable redis)
+ $(use_enable smtp)
+ $(use_enable spoof-source)
+ $(use_enable systemd)
+ $(use_enable tcpd tcp-wrapper)
+ )
+
+ econf "${myconf[@]}"
+}
+
+src_install() {
+ default
+
+ # Install default configuration
+ insinto /etc/default
+ doins contrib/systemd/syslog-ng@default
+
+ insinto /etc/syslog-ng
+ if use userland_BSD ; then
+ newins "${T}/syslog-ng.conf.gentoo.fbsd" syslog-ng.conf
+ else
+ newins "${T}/syslog-ng.conf.gentoo" syslog-ng.conf
+ fi
+
+ insinto /etc/logrotate.d
+ newins "${T}/syslog-ng.logrotate" syslog-ng
+
+ newinitd "${FILESDIR}/syslog-ng.rc" syslog-ng
+ newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng
+ keepdir /etc/syslog-ng/patterndb.d /var/lib/syslog-ng
+ find "${D}" -name '*.la' -delete || die
+
+ use python && python_optimize
+}
+
+pkg_postinst() {
+ # bug #355257
+ if ! has_version app-admin/logrotate ; then
+ elog "It is highly recommended that app-admin/logrotate be emerged to"
+ elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
+ elog "for logrotate to use."
+ fi
+
+ if use systemd; then
+ ewarn "The service file for systemd has changed to support multiple instances."
+ ewarn "To start the default instance issue:"
+ ewarn "# systemctl start syslog-ng@default"
+ fi
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 1a4a6e14aa79..139f80e09671 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
index ffbfc2d26664..6362c8add2c8 100644
--- a/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.6-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.bzip.org/${PV}/${P}.tar.gz"
LICENSE="BZIP2"
SLOT="0/1" # subslot = SONAME
-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="static static-libs"
PATCHES=(
diff --git a/app-arch/innoextract/innoextract-1.6.ebuild b/app-arch/innoextract/innoextract-1.6.ebuild
index 29e0e3b7e89e..509f67a4b24c 100644
--- a/app-arch/innoextract/innoextract-1.6.ebuild
+++ b/app-arch/innoextract/innoextract-1.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://constexpr.org/innoextract/files/${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="debug +iconv +lzma"
RDEPEND="
diff --git a/app-arch/tar/tar-1.30.ebuild b/app-arch/tar/tar-1.30.ebuild
index a2e73cd2c85e..cbe36afbf633 100644
--- a/app-arch/tar/tar-1.30.ebuild
+++ b/app-arch/tar/tar-1.30.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/tar/${P}.tar.bz2
LICENSE="GPL-3+"
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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="acl elibc_glibc minimal nls selinux static userland_GNU xattr"
RDEPEND="acl? ( virtual/acl )
diff --git a/app-backup/Manifest.gz b/app-backup/Manifest.gz
index ffff2db12aa6..6c4daf891073 100644
Binary files a/app-backup/Manifest.gz and b/app-backup/Manifest.gz differ
diff --git a/app-backup/ccollect/ccollect-0.8.ebuild b/app-backup/ccollect/ccollect-0.8.ebuild
index b5a9a055b4ac..f4da568241cd 100644
--- a/app-backup/ccollect/ccollect-0.8.ebuild
+++ b/app-backup/ccollect/ccollect-0.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="Pseudo incremental backup with different exclude lists using hardlinks and rsync"
-HOMEPAGE="http://www.nico.schottelius.org/software/ccollect/"
-SRC_URI="http://www.nico.schottelius.org/software/${PN}/download/${P}.tar.bz2"
+HOMEPAGE="https://www.nico.schottelius.org/software/ccollect/"
+SRC_URI="https://www.nico.schottelius.org/software/${PN}/download/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
diff --git a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
index ce161ddf95a6..74b44cfffacb 100644
--- a/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
+++ b/app-backup/rdiff-backup/rdiff-backup-1.3.3-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/sol1/${PN}/archive/r${UPSTREAM_PV}.tar.gz -> ${P}.ta
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="examples"
DEPEND="
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3c022d4d44f3..bb2f49392cc5 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/kstart/kstart-4.1.ebuild b/app-crypt/kstart/kstart-4.1.ebuild
index e3ad1f1dc019..c80974b18abb 100644
--- a/app-crypt/kstart/kstart-4.1.ebuild
+++ b/app-crypt/kstart/kstart-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -7,8 +7,8 @@ inherit eutils
DESCRIPTION="Modified versions of kinit for refreshing kerberos tickets
automatically"
-HOMEPAGE="http://www.eyrie.org/~eagle/software/kstart"
-SRC_URI="http://archives.eyrie.org/software/kerberos/${P}.tar.gz"
+HOMEPAGE="https://www.eyrie.org/~eagle/software/kstart/"
+SRC_URI="https://archives.eyrie.org/software/kerberos/${P}.tar.gz"
LICENSE="|| ( MIT Stanford ISC )"
SLOT="0"
diff --git a/app-crypt/kstart/kstart-4.2.ebuild b/app-crypt/kstart/kstart-4.2.ebuild
index 076efc616f77..0f9b5ae1131c 100644
--- a/app-crypt/kstart/kstart-4.2.ebuild
+++ b/app-crypt/kstart/kstart-4.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="Modified versions of kinit for refreshing kerberos tickets
automatically"
-HOMEPAGE="http://www.eyrie.org/~eagle/software/kstart"
-SRC_URI="http://archives.eyrie.org/software/kerberos/${P}.tar.gz"
+HOMEPAGE="https://www.eyrie.org/~eagle/software/kstart/"
+SRC_URI="https://archives.eyrie.org/software/kerberos/${P}.tar.gz"
LICENSE="|| ( MIT Stanford ISC )"
SLOT="0"
diff --git a/app-crypt/monkeysphere/monkeysphere-0.41.ebuild b/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
index 6c792e154275..f760f6ac2239 100644
--- a/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
+++ b/app-crypt/monkeysphere/monkeysphere-0.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -11,7 +11,7 @@ LICENSE="GPL-3"
SLOT="0/0"
IUSE=""
SRC_URI="mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_${PV}.orig.tar.gz"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
DOCS=( README Changelog )
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index b8964c9c929c..7792e946fae5 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/edox-data/Manifest b/app-doc/edox-data/Manifest
deleted file mode 100644
index b4901025bc73..000000000000
--- a/app-doc/edox-data/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST e16-docs-0.16.8.0.2.tar.gz 1655229 BLAKE2B 7f57fcc90791f27e2186cd266222072c5ab5214f12e0f35fbdf706035e6f7ce68ab632779e77572e3ddb8c0d183aebfacc23dc25f400a941325dced54ae72b92 SHA512 df46cedff63984f5fe3cd4d523406efc3b4334447cbe9e31abae969961142887c5891bad7c65b066bb077f69789de4d38718872554e4a23f3b5b853bda665e31
diff --git a/app-doc/edox-data/edox-data-0.16.8.0.2.ebuild b/app-doc/edox-data/edox-data-0.16.8.0.2.ebuild
deleted file mode 100644
index 4bf3991a9d0c..000000000000
--- a/app-doc/edox-data/edox-data-0.16.8.0.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-MY_P="e16-docs-${PV}"
-DESCRIPTION="The Enlightenment online help"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="mirror://sourceforge/enlightenment/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=">=x11-wm/enlightenment-0.16.8"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
- econf --enable-fsstd || die
- emake || die
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- dodoc AUTHORS ChangeLog README
-}
diff --git a/app-doc/edox-data/metadata.xml b/app-doc/edox-data/metadata.xml
deleted file mode 100644
index 2031ab52a3ef..000000000000
--- a/app-doc/edox-data/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
- enlightenment
-
-
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index f7c8dfe8fcb6..3040985fb077 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/joe/joe-4.6.ebuild b/app-editors/joe/joe-4.6.ebuild
index 505b87e2bff6..de47dad7c619 100644
--- a/app-editors/joe/joe-4.6.ebuild
+++ b/app-editors/joe/joe-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/joe-editor/${P}.tar.gz"
LICENSE="GPL-1+ CC-BY-3.0"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
IUSE="xterm"
DEPEND=">=sys-libs/ncurses-5.2-r2:0="
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index e15f87b3d020..7ba8596901dd 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/ebuild-mode/Manifest b/app-emacs/ebuild-mode/Manifest
index 7e83220e4780..9da786c088ba 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1,2 +1,3 @@
DIST ebuild-mode-1.42.tar.xz 34936 BLAKE2B dd94d17dc57e2d32b329ab62ec6eec8ada6a4aeddadb8d978736f5dcb4d613759fd860043cab92d12db11614f8b7fa71fc5537576a2af3f5e6c9d56fc2fdcc05 SHA512 119f954eaf009bd0c9f0a75810b94a54d65ed91c6ffef20dd164c7a5ef095410dd0f3642426817f5efa6623d4f3e120ed3b27076222b02a90e75a83bb80b8703
DIST ebuild-mode-1.43.tar.xz 34688 BLAKE2B 577900e2fa7ccb2362ec7f9046affb58e92bdfde44f2ea48274ba61d65f35fa6a1852bda6d9c64bd3f63aba99df244b4cb3378de079259508b149cdacf7caf28 SHA512 91f9a06de6feeeadb27d765a6ca6f2fa17e01938a6c953efe3586646f1bf48da87fe269ee9b07b2e16199d3ba4a76f42b8be9143218b808fac2971fc6f64f36d
+DIST ebuild-mode-1.44.tar.xz 34468 BLAKE2B 05c420979c2e4e145ab6230e9218d2ace8250abcc07e819610e9ac1fbb86147a641b88e69328ff624f9787b87cef56f9fe02a1205a02d01a0157b0293656647e SHA512 4d9b01939af089794255faf747264f948b8b2df47936e364ccfa23da493a33f56fbce1277526089e60b716e38e248b12fac39eca0d59d4974e2e70236ffbcd44
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.44.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.44.ebuild
new file mode 100644
index 000000000000..3e82ece8f10e
--- /dev/null
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.44.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit elisp readme.gentoo-r1
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+DEPEND="sys-apps/texinfo"
+
+DOCS="ChangeLog keyword-generation.sh"
+ELISP_TEXINFO="${PN}.texi"
+SITEFILE="50${PN}-gentoo-1.39.el"
+DOC_CONTENTS="Some optional features may require installation of additional
+ packages, like dev-python/docutils-glep for glep."
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 3d58db5af799..e6c905e8c67c 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
new file mode 100644
index 000000000000..d5b281cbba85
--- /dev/null
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.0-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit python-single-r1 unpacker
+
+DESCRIPTION="Commercial version of app-emulation/wine with paid support."
+HOMEPAGE="http://www.codeweavers.com/products/crossover/"
+SRC_URI="https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-${PV}.bin"
+
+LICENSE="CROSSOVER-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l"
+RESTRICT="bindist test"
+QA_FLAGS_IGNORED="opt/cxoffice/.*"
+QA_PRESTRIPPED="opt/cxoffice/lib/.*
+ opt/cxoffice/bin/cxburner
+ opt/cxoffice/bin/cxntlm_auth
+ opt/cxoffice/bin/wineserver
+ opt/cxoffice/bin/unrar
+ opt/cxoffice/bin/wine-preloader
+ opt/cxoffice/bin/cxdiag
+ opt/cxoffice/bin/cxgettext
+ opt/cxoffice/bin/wineloader
+ "
+S="${WORKDIR}"
+
+DEPEND="dev-lang/perl
+ app-arch/unzip
+ ${PYTHON_DEPS}"
+
+RDEPEND="${DEPEND}
+ !prefix? ( sys-libs/glibc )
+ >=dev-python/pygtk-2.10[${PYTHON_USEDEP}]
+ dev-python/dbus-python[${PYTHON_USEDEP}]
+ dev-util/desktop-file-utils
+ !app-emulation/crossover-office-pro-bin
+ !app-emulation/crossover-office-bin
+ capi? ( net-libs/libcapi[abi_x86_32(-)] )
+ cups? ( net-print/cups[abi_x86_32(-)] )
+ gsm? ( media-sound/gsm[abi_x86_32(-)] )
+ jpeg? ( virtual/jpeg[abi_x86_32(-)] )
+ lcms? ( media-libs/lcms:2 )
+ ldap? ( net-nds/openldap[abi_x86_32(-)] )
+ gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] )
+ mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] )
+ nls? ( sys-devel/gettext[abi_x86_32(-)] )
+ openal? ( media-libs/openal[abi_x86_32(-)] )
+ opencl? ( virtual/opencl[abi_x86_32(-)] )
+ opengl? (
+ virtual/glu[abi_x86_32(-)]
+ virtual/opengl[abi_x86_32(-)]
+ )
+ png? ( media-libs/libpng:0[abi_x86_32(-)] )
+ scanner? ( media-gfx/sane-backends[abi_x86_32(-)] )
+ ssl? ( dev-libs/openssl:0[abi_x86_32(-)] )
+ v4l? ( media-libs/libv4l[abi_x86_32(-)] )
+ media-libs/alsa-lib[abi_x86_32(-)]
+ >=media-libs/freetype-2.0.0[abi_x86_32(-)]
+ media-libs/mesa[abi_x86_32(-)]
+ sys-auth/nss-mdns[abi_x86_32(-)]
+ sys-apps/util-linux[abi_x86_32(-)]
+ sys-libs/ncurses:5/5[abi_x86_32(-)]
+ sys-libs/zlib[abi_x86_32(-)]
+ x11-libs/libICE[abi_x86_32(-)]
+ x11-libs/libSM[abi_x86_32(-)]
+ x11-libs/libX11[abi_x86_32(-)]
+ x11-libs/libXau[abi_x86_32(-)]
+ x11-libs/libXdmcp[abi_x86_32(-)]
+ x11-libs/libXext[abi_x86_32(-)]
+ x11-libs/libXi[abi_x86_32(-)]
+ x11-libs/libXrandr[abi_x86_32(-)]
+ x11-libs/libXxf86vm[abi_x86_32(-)]
+ x11-libs/libxcb[abi_x86_32(-)]"
+
+pkg_nofetch() {
+ einfo "Please visit ${HOMEPAGE}"
+ einfo "and place ${A} in ${DISTDIR}"
+}
+
+src_unpack() {
+ # self unpacking zip archive; unzip warns about the exe stuff
+ unpack_zip ${A}
+}
+
+src_prepare() {
+ python_fix_shebang .
+
+ sed -i \
+ -e "s:xdg_install_icons(:&\"${ED}\".:" \
+ -e "s:\"\(.*\)/applications:\"${ED}\1/applications:" \
+ -e "s:\"\(.*\)/desktop-directories:\"${ED}\1/desktop-directories:" \
+ "${S}/lib/perl/CXMenuXDG.pm"
+
+ # Remove unnecessary files
+ rm -r license.txt guis/ || die "Could not remove files"
+ use doc || rm -r doc/ || die "Could not remove files"
+}
+
+src_install() {
+ # Install crossover symlink, bug #476314
+ dosym ../cxoffice/bin/crossover /opt/bin/crossover
+
+ # Install documentation
+ dodoc README changelog.txt
+ rm README changelog.txt || die "Could not remove README and changelog.txt"
+
+ # Install files
+ dodir /opt/cxoffice
+ #cp -r ./* "${ED}opt/cxoffice" \
+ find . | cpio -dumpl "${ED}/opt/cxoffice" 2>/dev/null \
+ || die "Could not install into ${ED}opt/cxoffice"
+
+ # Install configuration file
+ insinto /opt/cxoffice/etc
+ doins share/crossover/data/cxoffice.conf
+
+ # Install menus
+ # XXX: locate_gui.sh automatically detects *-application-merged directories
+ # This means what we install will vary depending on the contents of
+ # /etc/xdg, which is a QA violation. It is not clear how to resolve this.
+ XDG_DATA_HOME="/usr/share" XDG_CONFIG_HOME="/etc/xdg" \
+ "${ED}opt/cxoffice/bin/cxmenu" --destdir="${ED}" --crossover --install \
+ || die "Could not install menus"
+
+ rm "${ED}usr/share/applications/"*"Uninstall CrossOver Linux.desktop" \
+ || die "Could not remove uninstall menus"
+ sed -i \
+ -e "s:\"${ED}\".::" \
+ -e "s:${ED}::" \
+ "${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm" \
+ || die "Could not fix paths in ${ED}/opt/cxoffice/lib/perl/CXMenuXDG.pm"
+ sed -i -e "s:${ED}:/:" \
+ "${ED}usr/share/applications/"*"CrossOver.desktop" \
+ || die "Could not fix paths of *.desktop files"
+}
+
+pkg_postinst() {
+ einfo "${P} is open source software with the exception of the GUI."
+ einfo "Source code can be obtained from:"
+ einfo
+ einfo "https://media.codeweavers.com/pub/crossover/source/crossover-sources-${PV}.tar.gz"
+}
diff --git a/app-emulation/qemu/qemu-2.12.0-r3.ebuild b/app-emulation/qemu/qemu-2.12.0-r3.ebuild
index f0dfe3c9180d..78d76f896408 100644
--- a/app-emulation/qemu/qemu-2.12.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-2.12.0-r3.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]]; then
SRC_URI=""
else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2"
- KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
+ KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd"
# Gentoo specific patchsets:
SRC_URI+=" https://dev.gentoo.org/~tamiko/distfiles/${P}-patches-r4.tar.xz"
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index ef2b528eaac6..625298554ff0 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-libpinyin/metadata.xml b/app-i18n/ibus-libpinyin/metadata.xml
index c6c777817015..7eb3bcc18ded 100644
--- a/app-i18n/ibus-libpinyin/metadata.xml
+++ b/app-i18n/ibus-libpinyin/metadata.xml
@@ -2,7 +2,7 @@
- ramsey.graham@ntlworld.com
+ graham.ramsey@gmail.com
Graham Ramsey
diff --git a/app-i18n/scim/scim-1.4.18.ebuild b/app-i18n/scim/scim-1.4.18.ebuild
index 072a20f7482b..0075757623c6 100644
--- a/app-i18n/scim/scim-1.4.18.ebuild
+++ b/app-i18n/scim/scim-1.4.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/scim-im/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd"
IUSE="doc gtk3 qt4"
RDEPEND="x11-libs/libX11
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 0e0e60230782..dbd182d72234 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/cdircmp/cdircmp-0.3-r1.ebuild b/app-misc/cdircmp/cdircmp-0.3-r1.ebuild
index b2576f017b87..f7851f0207a2 100644
--- a/app-misc/cdircmp/cdircmp-0.3-r1.ebuild
+++ b/app-misc/cdircmp/cdircmp-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="2"
@@ -7,7 +7,7 @@ inherit toolchain-funcs
DESCRIPTION="Compare directories and select files to copy"
HOMEPAGE="http://home.hccnet.nl/paul.schuurmans/"
-SRC_URI="http://home.hccnet.nl/paul.schuurmans/download/${P}.tar.gz"
+SRC_URI="http://home.hccnet.nl/paul.schuurmans/linux/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-misc/cdircmp/cdircmp-0.3-r2.ebuild b/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
new file mode 100644
index 000000000000..ea5818e44538
--- /dev/null
+++ b/app-misc/cdircmp/cdircmp-0.3-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Compare directories and select files to copy"
+HOMEPAGE="http://home.hccnet.nl/paul.schuurmans/"
+SRC_URI="http://home.hccnet.nl/paul.schuurmans/linux/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=sys-libs/ncurses-5.4:0="
+
+src_prepare() {
+ sed -i Makefile \
+ -e 's| -o | $(LDFLAGS)&|g' \
+ || die "sed Makefile"
+ default
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" \
+ CFLAGS="${CFLAGS}" \
+ LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+ einstalldocs
+ dobin ${PN}
+}
diff --git a/app-misc/kryoflux-dtc/Manifest b/app-misc/kryoflux-dtc/Manifest
new file mode 100644
index 000000000000..e6d215853fe9
--- /dev/null
+++ b/app-misc/kryoflux-dtc/Manifest
@@ -0,0 +1,2 @@
+DIST kryoflux-ui.jar 2101377 BLAKE2B db9922b9d5787772849d1ef9edae52d64de066f643c471412ed9129307c4ee399ec3a18ebcacd7428ab15eabf5307e916b678831f2fa456cbd7073aa60bbb574 SHA512 66ba81ed1b2a97a0391e513c45b19436f17677e3dfe7c063749e41763658f99a5eb92e5b3312f4151f8fc51bd79502ac11ffd895966117e1d5a9849867aeb957
+DIST kryoflux_2.6_linux.tar.bz2 9177658 BLAKE2B 6eb0bc7a166950bfedb32da466c17125a8a7d64e4bc9aa6610c69dd0f98c2fb5187ad19dbaf191b33dcb5a786ec4a1fa9bce2464c3c04eb152e0b9ed7ae770f2 SHA512 9bf700e9c646bad135999eb1fed12c86ff6fbc11a0034b86af7541fb16a4905dd740c706ebb87bf5848f5d80f45699c350a56397df5b6850559c2576d18eef1b
diff --git a/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild b/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild
new file mode 100644
index 000000000000..de512258d895
--- /dev/null
+++ b/app-misc/kryoflux-dtc/kryoflux-dtc-2.6.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="kryoflux_${PV}_linux"
+
+inherit desktop eutils udev xdg-utils
+
+DESCRIPTION="KryoFlux Host Software"
+HOMEPAGE="https://www.kryoflux.com"
+SRC_URI="https://www.kryoflux.com/download/${MY_P}.tar.bz2
+ gui? ( https://www.kryoflux.com/kryoflux-ui.jar )"
+
+KEYWORDS="-* ~amd64 ~x86"
+LICENSE="SPS"
+SLOT="0"
+IUSE="demos doc fast-firmware gui static"
+
+RDEPEND="dev-libs/spsdeclib
+ virtual/libusb:1
+ virtual/udev
+ gui? ( virtual/jre )"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror strip"
+
+S="${WORKDIR}/${MY_P}"
+
+QA_PREBUILT="/usr/bin/kryoflux-dtc"
+
+src_unpack() {
+ unpack ${MY_P}.tar.bz2
+
+ if use gui; then
+ # Updated *.jar for compatibility with >= Java 9
+ cp "${DISTDIR}"/kryoflux-ui.jar "${S}" || die
+
+ # Extract kryoflux-ui.jar to get a logo for the meny entry
+ unpack kryoflux-ui.jar
+ fi
+}
+
+src_install() {
+ newbin dtc/$(usex amd64 x86_64 i686)/$(usex static static dynamic)/dtc kryoflux-dtc
+
+ cat <<-EOF > "${T}"/80-kryoflux.rules || die
+ ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="03eb", ATTR{idProduct}=="6124", GROUP="floppy", MODE="0660"
+ EOF
+ udev_dorules "${T}"/80-kryoflux.rules
+
+ if use gui; then
+ insinto /usr/share/kryoflux-ui
+ doins kryoflux-ui.jar
+
+ dosym ../../bin/kryoflux-dtc /usr/share/kryoflux-ui/dtc
+
+ make_wrapper kryoflux-ui "java -jar kryoflux-ui.jar" /usr/share/kryoflux-ui
+
+ newicon "${WORKDIR}"/images/disk.png kryoflux-ui.png
+
+ make_desktop_entry "kryoflux-ui" "KryoFlux UI" kryoflux-ui Development
+
+ dodoc dtc/kryoflux-ui_README.txt
+ fi
+
+ if use fast-firmware; then
+ insinto /lib/firmware
+ doins dtc/firmware_fast/firmware_kf_usb_rosalie.bin
+
+ dodoc dtc/firmware_fast/firmware_fast_README.txt
+ else
+ insinto /lib/firmware
+ doins dtc/firmware_kf_usb_rosalie.bin
+ fi
+
+ if use demos; then
+ dodoc -r g64_demo ipf_demo
+ fi
+
+ if use doc; then
+ dodoc -r docs schematics
+ fi
+
+ local DOCS=( "DONATIONS.txt" "RELEASE.txt" "README.linux" )
+ einstalldocs
+}
+
+pkg_postinst() {
+ elog "If you want to access your Kryoflux without root access,"
+ elog "please add yourself to the floppy group."
+
+ if use fast-firmware; then
+ elog ""
+ elog "You have enabled the fast firmware. Please keep in mind,"
+ elog "that this firmware can cause trouble with older floppy drives."
+ fi
+
+ if use gui; then
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ fi
+}
diff --git a/app-misc/kryoflux-dtc/metadata.xml b/app-misc/kryoflux-dtc/metadata.xml
new file mode 100644
index 000000000000..c95657a7f862
--- /dev/null
+++ b/app-misc/kryoflux-dtc/metadata.xml
@@ -0,0 +1,17 @@
+
+
+
+
+ ck+gentoo@bl4ckb0x.de
+ Conrad Kostecki
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+
diff --git a/app-misc/ktoblzcheck/ktoblzcheck-1.49.ebuild b/app-misc/ktoblzcheck/ktoblzcheck-1.49.ebuild
index 8918bd7bc302..7b070a25b3a4 100644
--- a/app-misc/ktoblzcheck/ktoblzcheck-1.49.ebuild
+++ b/app-misc/ktoblzcheck/ktoblzcheck-1.49.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
IUSE="python"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/app-misc/lirc/lirc-0.10.0.ebuild b/app-misc/lirc/lirc-0.10.0.ebuild
index 8ddbc22037b4..9b8d2c10c013 100644
--- a/app-misc/lirc/lirc-0.10.0.ebuild
+++ b/app-misc/lirc/lirc-0.10.0.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_4 python3_5 )
+PYTHON_COMPAT=( python3_4 python3_{5,6} )
inherit eutils flag-o-matic linux-info python-single-r1 systemd xdg-utils
diff --git a/app-misc/media-player-info/media-player-info-23.ebuild b/app-misc/media-player-info/media-player-info-23.ebuild
index 24e2cf1b615c..ca04d1190391 100644
--- a/app-misc/media-player-info/media-player-info-23.ebuild
+++ b/app-misc/media-player-info/media-player-info-23.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+EAPI=7
-inherit eutils python-any-r1
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit python-any-r1
DESCRIPTION="A repository of data files describing media player capabilities"
HOMEPAGE="https://cgit.freedesktop.org/media-player-info/"
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index a18e96cc4218..d38d99badeef 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,2 +1,3 @@
DIST neofetch-3.4.0.tar.gz 82090 BLAKE2B afc00b37d84cdf3ae0fd4037312b1c67fdadcbe99d6d602e8f3b6caa844b3780861c9d2522ec605ba5b7aa08e4e85ef804129da2ce3f6f01ab8b536704cdd182 SHA512 931648e8173eb91fdf5c79b5bb9b6efef132d30cf2f10d6f75dcff42f3661d40ceec712c109e90e2226e1aa85cad7676c438b6cad49e8298a77d990d9a3d197b
DIST neofetch-4.0.2.tar.gz 111792 BLAKE2B 865c45a366224915aeeff82c843c869685814ccb5f553d7da59ab51e26336500cb133b5c827dd6dccccef3e771b357852e86db166d88cda894515419e9eadbc8 SHA512 326b7a9fdf08aa10b790c281148946727dc6a10c5c073654fc0ce9cee9afe663de84ac13144cb3e1d2e33b5ca3ed5094d2cb83e78b7b5f6e1ced49d78e191ce4
+DIST neofetch-5.0.0.tar.gz 110526 BLAKE2B 7149321c051021644407d28b232631c8149d21f1b8463b3a4470d1baaf88494f3a88026c606ac539938933333da5671f4a14b6ce029268ba01a16e85d4a30c33 SHA512 7872e646a0d784d0c9d851d16cb1ef03926d07f67ec9573b673b2a82fd9a1ffbb7bbcb0ca0e67c299dd210947396a8c36dacb98d8a61c3ea72b5a438995e7de6
diff --git a/app-misc/neofetch/neofetch-4.0.2.ebuild b/app-misc/neofetch/neofetch-4.0.2.ebuild
index a25cba92a486..4757864917ab 100644
--- a/app-misc/neofetch/neofetch-4.0.2.ebuild
+++ b/app-misc/neofetch/neofetch-4.0.2.ebuild
@@ -3,12 +3,18 @@
EAPI=7
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
DESCRIPTION="Simple information system script"
HOMEPAGE="https://github.com/dylanaraps/neofetch"
-SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
LICENSE="MIT-with-advertising"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
IUSE="X"
RDEPEND="sys-apps/pciutils
diff --git a/app-misc/neofetch/neofetch-5.0.0.ebuild b/app-misc/neofetch/neofetch-5.0.0.ebuild
new file mode 100644
index 000000000000..4757864917ab
--- /dev/null
+++ b/app-misc/neofetch/neofetch-5.0.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
+DESCRIPTION="Simple information system script"
+HOMEPAGE="https://github.com/dylanaraps/neofetch"
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="X"
+
+RDEPEND="sys-apps/pciutils
+ X? (
+ media-gfx/imagemagick
+ media-libs/imlib2
+ www-client/w3m[imlib]
+ x11-apps/xprop
+ x11-apps/xrandr
+ x11-apps/xwininfo
+ )"
diff --git a/app-misc/neofetch/neofetch-9999.ebuild b/app-misc/neofetch/neofetch-9999.ebuild
index 82642075d611..4757864917ab 100644
--- a/app-misc/neofetch/neofetch-9999.ebuild
+++ b/app-misc/neofetch/neofetch-9999.ebuild
@@ -3,10 +3,16 @@
EAPI=7
-inherit git-r3
+if [[ ${PV} != *9999* ]]; then
+ SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+else
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
+fi
+
DESCRIPTION="Simple information system script"
HOMEPAGE="https://github.com/dylanaraps/neofetch"
-EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
LICENSE="MIT-with-advertising"
SLOT="0"
IUSE="X"
diff --git a/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
index c06409b09fda..a5d4a0ca6de4 100644
--- a/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
+++ b/app-misc/xmind/xmind-3.5.3.201506180105-r2.ebuild
@@ -9,7 +9,7 @@ MY_PN="${PN}-portable"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="A brainstorming and mind mapping software tool"
-HOMEPAGE="http://www.xmind.net"
+HOMEPAGE="https://www.xmind.net"
SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
LICENSE="EPL-1.0 LGPL-3"
diff --git a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
index 40981f622a19..12a6a7c49210 100644
--- a/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
+++ b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
@@ -9,7 +9,7 @@ MY_PV="8-update7"
MY_P="${PN}-${MY_PV}-linux"
DESCRIPTION="A brainstorming and mind mapping software tool"
-HOMEPAGE="http://www.xmind.net"
+HOMEPAGE="https://www.xmind.net"
SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
LICENSE="EPL-1.0 LGPL-3"
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index d8ddb688fa02..4a8b86061f4d 100644
Binary files a/app-mobilephone/Manifest.gz and b/app-mobilephone/Manifest.gz differ
diff --git a/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild b/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
index d5746a637f68..c42ed0fdb306 100644
--- a/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
+++ b/app-mobilephone/obexftp/obexftp-0.24-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
USE_RUBY="ruby22 ruby23"
inherit cmake-utils python-single-r1 python-utils-r1 ruby-single eutils multilib
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 135f2b0a097d..361d68ee2eaa 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild b/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild
index 6f9e2d38cea1..a0f7ef30fc00 100644
--- a/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild
@@ -41,7 +41,7 @@ done
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="
!app-office/openoffice
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index a2e9d888b592..017d708a473e 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/elogviewer/elogviewer-2.9.ebuild b/app-portage/elogviewer/elogviewer-2.9.ebuild
index 234b72e591de..c50f9830848a 100644
--- a/app-portage/elogviewer/elogviewer-2.9.ebuild
+++ b/app-portage/elogviewer/elogviewer-2.9.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
DISABLE_AUTOFORMATTING=true
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 8bcddc631e3f..4fbc1abca0ef 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
index 0733072905ec..81e35adb5d0d 100644
--- a/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
+++ b/app-shells/gentoo-bashcomp/gentoo-bashcomp-20180302.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
LICENSE="GPL-2"
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 ~m68k-mint ~sparc-solaris ~sparc64-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris"
IUSE=""
src_install() {
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index b1f9b38d5ef6..c6b3dd208a08 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/asciidoc/asciidoc-8.6.10.ebuild b/app-text/asciidoc/asciidoc-8.6.10.ebuild
index 9b0209cb6e6d..79a10d61469a 100644
--- a/app-text/asciidoc/asciidoc-8.6.10.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit autotools python-single-r1 readme.gentoo-r1
-DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
+DESCRIPTION="A plain text human readable/writable document format"
HOMEPAGE="http://asciidoc.org/"
SRC_URI="https://github.com/asciidoc/asciidoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
index a8ca6c45174c..cded88810c54 100644
--- a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit readme.gentoo python-single-r1
-DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
+DESCRIPTION="A plain text human readable/writable document format"
HOMEPAGE="http://asciidoc.org/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
index 4b9175db95c7..7be61c90a3f0 100644
--- a/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 pypy )
inherit python-single-r1 readme.gentoo-r1
-DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
+DESCRIPTION="A plain text human readable/writable document format"
HOMEPAGE="http://asciidoc.org/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
index abb20d7cebc8..215efe89a67f 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
LICENSE="MIT"
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 ~x86-macos ~sparc-solaris ~x64-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-macos ~sparc-solaris ~x64-solaris"
IUSE=""
RDEPEND="app-text/sgml-common"
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 9884cd75e44d..f78887da2b8e 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,2 +1,2 @@
-DIST kbibtex-0.7.95.tar.xz 4060200 BLAKE2B aa08cd10c4e67bd8cdfc52803df03326a3c49b86aff699d7be2c40082f5d7359ef8aeb399dd3ab7c6b62f63274ad5d545c6acdaf4f77ed2b922583346557e76a SHA512 683456504861271df46d4b423ed8994f7e97d653e3b634c81c14b0187efa51ebae6d72bc4ccbe7cf18682ccfd9ff2cfcc2ba399a1d7f6bac62e3cb9e79710cd6
+DIST kbibtex-0.8.1.tar.xz 4060484 BLAKE2B 1dd100b0c469955f273907d79765268fdefdd4ae05faa851f4c1823c41f312810f2992113cda97c1f8e19c4c3bf35e7e79c6a0bc12cde60995edbd903a9b5ae3 SHA512 73c318b1d29de98761f43de9828a48e943528f413c6c2489e916f88ef4ba1424a300bd9eddd10fa763985322248ef863cad1b8cfc681f083eb9acdabd6c6dfea
DIST kbibtex-0.8_pre20171110.tar.gz 11423893 BLAKE2B 78bcd72da35775d9927f35b865aba1e5ee88fd6391e5b354dd23d319a17a18c5aa521d32f58f1827a86bf33d1a42e7bef19940fdd1b83e67124b7335520bb1cd SHA512 719c40e78e22dc936a5395bf299962b4ec657df89877df78f17139dcd9b45a7ed98ff213a7c8a0cf0eeb4960a3b10cafaf7521e334a3269f96e2abdcdd67c913
diff --git a/app-text/kbibtex/kbibtex-0.8_pre20180526-r1.ebuild b/app-text/kbibtex/kbibtex-0.8.1.ebuild
similarity index 94%
rename from app-text/kbibtex/kbibtex-0.8_pre20180526-r1.ebuild
rename to app-text/kbibtex/kbibtex-0.8.1.ebuild
index e581fd7cf61f..bfce07591e19 100644
--- a/app-text/kbibtex/kbibtex-0.8_pre20180526-r1.ebuild
+++ b/app-text/kbibtex/kbibtex-0.8.1.ebuild
@@ -3,7 +3,6 @@
EAPI=6
-MY_PV=0.7.95
KDE_HANDBOOK="optional"
KDE_TEST="true"
VIRTUALX_REQUIRED="test"
@@ -12,7 +11,7 @@ inherit kde5
DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
HOMEPAGE="https://userbase.kde.org/KBibTeX"
if [[ ${KDE_BUILD_TYPE} != live ]]; then
- SRC_URI="mirror://kde/unstable/KBibTeX/${PN}-${MY_PV}.tar.xz"
+ SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
fi
@@ -62,8 +61,6 @@ RDEPEND="${DEPEND}
RESTRICT+=" test"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
diff --git a/app-text/pdfgrep/pdfgrep-2.0.1.ebuild b/app-text/pdfgrep/pdfgrep-2.0.1.ebuild
index fb916b4566ae..bc4a71cddff0 100644
--- a/app-text/pdfgrep/pdfgrep-2.0.1.ebuild
+++ b/app-text/pdfgrep/pdfgrep-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://www.pdfgrep.org/download/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="+pcre test unac"
RDEPEND="
diff --git a/app-text/poppler-data/poppler-data-0.4.7.ebuild b/app-text/poppler-data/poppler-data-0.4.7.ebuild
index 5da9e309d400..8583800548d5 100644
--- a/app-text/poppler-data/poppler-data-0.4.7.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.7.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://poppler.freedesktop.org/"
SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
LICENSE="BSD GPL-2 MIT"
-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 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+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 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE=""
diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild
index e643afbe71bc..568a800956bf 100644
--- a/app-text/poppler/poppler-0.62.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.62.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ "${PV}" == "9999" ]] ; then
SLOT="0/9999"
else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
- 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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT="0/73" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
fi
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
index 53455753c23f..46ff31dcb0a0 100644
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild
@@ -76,7 +76,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
done
SRC_URI="${SRC_URI} )"
-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"
IUSE="cjk X doc source tk +luajittex xetex"
TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index c9dea4ae7955..e966fcbac7ef 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/perl-support/perl-support-5.4.ebuild b/app-vim/perl-support/perl-support-5.4.ebuild
index 2755cfce0c02..740c39da3f61 100644
--- a/app-vim/perl-support/perl-support-5.4.ebuild
+++ b/app-vim/perl-support/perl-support-5.4.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="vim plugin: Perl-IDE - Write and run Perl scripts using menus and h
HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=556"
SRC_URI="https://github.com/WolfgangMehner/perl-support/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2 GPL-2+"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
VIM_PLUGIN_HELPFILES="perlsupport.txt"
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 7da3a888dec0..78ff2d6e87b2 100644
Binary files a/app-xemacs/Manifest.gz and b/app-xemacs/Manifest.gz differ
diff --git a/app-xemacs/ebuild-mode/Manifest b/app-xemacs/ebuild-mode/Manifest
index 7e83220e4780..9da786c088ba 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1,2 +1,3 @@
DIST ebuild-mode-1.42.tar.xz 34936 BLAKE2B dd94d17dc57e2d32b329ab62ec6eec8ada6a4aeddadb8d978736f5dcb4d613759fd860043cab92d12db11614f8b7fa71fc5537576a2af3f5e6c9d56fc2fdcc05 SHA512 119f954eaf009bd0c9f0a75810b94a54d65ed91c6ffef20dd164c7a5ef095410dd0f3642426817f5efa6623d4f3e120ed3b27076222b02a90e75a83bb80b8703
DIST ebuild-mode-1.43.tar.xz 34688 BLAKE2B 577900e2fa7ccb2362ec7f9046affb58e92bdfde44f2ea48274ba61d65f35fa6a1852bda6d9c64bd3f63aba99df244b4cb3378de079259508b149cdacf7caf28 SHA512 91f9a06de6feeeadb27d765a6ca6f2fa17e01938a6c953efe3586646f1bf48da87fe269ee9b07b2e16199d3ba4a76f42b8be9143218b808fac2971fc6f64f36d
+DIST ebuild-mode-1.44.tar.xz 34468 BLAKE2B 05c420979c2e4e145ab6230e9218d2ace8250abcc07e819610e9ac1fbb86147a641b88e69328ff624f9787b87cef56f9fe02a1205a02d01a0157b0293656647e SHA512 4d9b01939af089794255faf747264f948b8b2df47936e364ccfa23da493a33f56fbce1277526089e60b716e38e248b12fac39eca0d59d4974e2e70236ffbcd44
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.44.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.44.ebuild
new file mode 100644
index 000000000000..b0e82e52e220
--- /dev/null
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.44.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xemacs-elisp
+
+DESCRIPTION="Emacs modes for editing ebuilds and other Gentoo specific files"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+RDEPEND=">=app-editors/xemacs-21.4.20-r5
+ app-xemacs/sh-script"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ ${XEMACS_BATCH_CLEAN} -eval "(add-to-list 'load-path \".\")" \
+ -f batch-byte-compile ebuild-mode.el gentoo-newsitem-mode.el || die
+ xemacs-elisp-make-autoload-file \
+ ebuild-mode.el gentoo-newsitem-mode.el || die
+}
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 379e4676d075..82fcbda14820 100644
Binary files a/dev-ada/Manifest.gz and b/dev-ada/Manifest.gz differ
diff --git a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
index c5225d8d11f2..35a98ae03fcb 100644
--- a/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
+++ b/dev-ada/gprbuild/files/gprbuild-2018-gentoo.patch
@@ -1,5 +1,5 @@
---- gprbuild-2017/gpr/gpr.gpr.old 2017-05-27 20:59:07.061135892 +0200
-+++ gprbuild-2017/gpr/gpr.gpr 2017-05-27 20:59:38.022638398 +0200
+--- a/gpr/gpr.gpr 2017-05-27 20:59:07.061135892 +0200
++++ b/gpr/gpr.gpr 2017-05-27 20:59:38.022638398 +0200
@@ -67,6 +67,7 @@
for Switches ("gpr*.ad?") use
Compiler'Default_Switches ("Ada") & ("-g1");
@@ -8,8 +8,8 @@
end Compiler;
end GPR;
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.ads.old 2017-11-19 13:09:18.947527738 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.ads 2017-11-19 13:10:08.125654595 +0100
+--- a/gpr/src/gpr-names.ads 2017-11-19 13:09:18.947527738 +0100
++++ b/gpr/src/gpr-names.ads 2017-11-19 13:10:08.125654595 +0100
@@ -27,6 +27,8 @@
Name_Buffer : String (1 .. 1_000_000);
Name_Len : Natural := 0;
@@ -19,8 +19,8 @@
procedure Get_Name_String (Id : Name_Id);
procedure Get_Name_String (Id : Unit_Name_Type);
procedure Get_Name_String (Id : File_Name_Type);
---- gprbuild-gpl-2017-src/gpr/src/gpr-names.adb.old 2017-11-19 13:10:27.674316703 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-names.adb 2017-11-19 13:14:38.360963627 +0100
+--- a/gpr/src/gpr-names.adb 2017-11-19 13:10:27.674316703 +0100
++++ b/gpr/src/gpr-names.adb 2017-11-19 13:14:38.360963627 +0100
@@ -354,6 +354,8 @@
Name_Chars.Append (ASCII.NUL);
@@ -39,8 +39,8 @@
return Name_Entries.Last;
end Name_Find;
---- gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb.old 2017-11-19 13:12:41.592995718 +0100
-+++ gprbuild-gpl-2017-src/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100
+--- a/gpr/src/gpr-snames.adb 2017-11-19 13:12:41.592995718 +0100
++++ b/gpr/src/gpr-snames.adb 2017-11-19 13:16:31.980979696 +0100
@@ -53,6 +53,10 @@
return;
end if;
@@ -52,18 +52,20 @@
Add_Name ("a");
Add_Name ("b");
Add_Name ("c");
---- gprbuild-gpl-2017/src/gprlib.adb.old 2017-12-18 12:20:02.937317216 +0100
-+++ gprbuild-gpl-2017/src/gprlib.adb 2017-12-18 12:21:36.519604590 +0100
-@@ -263,7 +263,7 @@
+--- a/src/gprlib.adb 2017-12-18 12:20:02.937317216 +0100
++++ b/src/gprlib.adb 2017-12-18 12:21:36.519604590 +0100
+@@ -263,7 +263,9 @@
Driver_Name : Name_Id := No_Name;
- Gnatbind_Name : String_Access := new String'("gnatbind");
+ Gnatbind_Name : String_Access := new String'("@GNATBIND@");
++
++ Gnatbind_Path_Option : constant String := "--gnatbind_path=";
Compiler_Name : String_Access := new String'("gcc");
-@@ -2237,13 +2237,13 @@
+@@ -1944,13 +1946,13 @@
and then Line (Last - 2 .. Last) = "gcc"
then
Gnatbind_Name :=
@@ -79,3 +81,18 @@
end if;
end if;
+@@ -2100,7 +2102,13 @@
+ Mapping_File_Name := new String'(Line (1 .. Last));
+
+ when Binding_Options =>
+- Binding_Options_Table.Append (Line (1 .. Last));
++ if Last > Gnatbind_Path_Option'Length
++ and then Line (1 .. Gnatbind_Path_Option'Length) =
++ Gnatbind_Path_Option then
++ null;
++ else
++ Binding_Options_Table.Append (Line (1 .. Last));
++ end if;
+
+ when Copy_Source_Dir =>
+ Copy_Source_Directory := new String'(Line (1 .. Last));
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 0eab9afda16c..d9702d4725e3 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb/mariadb-10.0.35-r2.ebuild b/dev-db/mariadb/mariadb-10.0.35-r2.ebuild
index ec74aef50db0..98b873c5e0c0 100644
--- a/dev-db/mariadb/mariadb-10.0.35-r2.ebuild
+++ b/dev-db/mariadb/mariadb-10.0.35-r2.ebuild
@@ -269,7 +269,7 @@ src_configure(){
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
- -DINSTALL_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
diff --git a/dev-db/mariadb/mariadb-10.1.34.ebuild b/dev-db/mariadb/mariadb-10.1.34.ebuild
index d551110e27dc..e030e7f69348 100644
--- a/dev-db/mariadb/mariadb-10.1.34.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.34.ebuild
@@ -289,7 +289,7 @@ src_configure(){
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
-DCMAKE_INSTALL_PREFIX="${EPREFIX%/}/usr"
- -DINSTALL_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
+ -DDEFAULT_SYSCONFDIR="${EPREFIX%/}/etc/mysql"
-DINSTALL_BINDIR=bin
-DINSTALL_DOCDIR=share/doc/${PF}
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
diff --git a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
index e965de1f0c1a..c954a54054f4 100644
--- a/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
+++ b/dev-db/mysql-connector-c++/mysql-connector-c++-1.1.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.mysql.com/get/Downloads/${URI_DIR}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
IUSE="debug examples gcov static-libs"
DEPEND="virtual/libmysqlclient:=
diff --git a/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r1.ebuild b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r1.ebuild
index 3dcd5ad4a202..7ec9bf8b064f 100644
--- a/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r1.ebuild
+++ b/dev-db/mysql-connector-c/mysql-connector-c-6.1.11-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
SRC_URI="https://dev.mysql.com/get/Downloads/Connector-C/${P}-src.tar.gz"
S="${WORKDIR}/${P}-src"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
SUBSLOT="18"
SLOT="0/${SUBSLOT}"
diff --git a/dev-db/mysql/mysql-5.7.22.ebuild b/dev-db/mysql/mysql-5.7.22.ebuild
index 58394d6071fd..324706b4ef94 100644
--- a/dev-db/mysql/mysql-5.7.22.ebuild
+++ b/dev-db/mysql/mysql-5.7.22.ebuild
@@ -347,10 +347,6 @@ multilib_src_configure() {
mycmakeargs+=( -DWITH_PIC=1 )
fi
- if use jemalloc || use tcmalloc ; then
- mycmakeargs+=( -DWITH_SAFEMALLOC=OFF )
- fi
-
# Storage engines
mycmakeargs+=(
-DWITH_EXAMPLE_STORAGE_ENGINE=0
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index fce6d6a54114..1887b2a9e4c3 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,7 +1,3 @@
-DIST phpMyAdmin-4.0.10.20-all-languages.tar.xz 4323896 BLAKE2B d645280c185904a91f2f9b7d365416d13fd3416c46c82fe3d9ed6e406af0c97e6fe5110db34311689d2fcb4ec3b52d6db64e9e455ca1283794c4667c315f97ba SHA512 e1d8b8a503eaa19a090d24d5ad011241aab06c2767138424d875edd82a868b4ebcdf5bba154b7eefef23b41d1949dcd021defe17e9047d0bf5fcfd0d6a5f4d27
DIST phpMyAdmin-4.7.0-all-languages.tar.xz 7600296 BLAKE2B 10e1168ab7a1d8dfccf5837c211a2e6455d767e27f11aec870a9c4a1a19e8a4a1df67b82a7a83ff3c184c8a111dc272da5c876150615a9fd9a32a643bba84007 SHA512 03f3b56d3fed846e8e27e38a1bf32175b267a3cc2784ee499b64a48b6a37f0352302a9c150e1db1c99f633aabd8a373a834ad7ab2b694146b0ac13dd05bd27e3
-DIST phpMyAdmin-4.7.7-all-languages.tar.xz 6411768 BLAKE2B 59ea3c69ee6bd019d5ff61f16ec37c39b9f94dde72198acd1892d4212d2258b9913305d22c93f6925426a9554c411ebf1a20beeae0a5b5a4f869a3bf7da9d73b SHA512 7eab8567a7889b79839104c3a46cfa7a841cb7188dc0bb0a306a6e15d06265b70e2b389c25e69bef2ebb77c7460381342322e2cfe546686d9b314b99c9419513
DIST phpMyAdmin-4.7.8-all-languages.tar.xz 6218056 BLAKE2B 879ef6703711725781fcf3b4c9ab607741c4df0d2f1955f632087e33b599e54128c0811dbd125d9015a0ec597dd6d9af54e7136e91f8637badf698ad7a30b8ba SHA512 ae6edcfba72413a6e0af0b120a99809320a840ab332ae77263f21e14f3b34a38cca70591628ba5818d6732ff6d23551ea51cbf6a75012d2326d0fab1c2a1b9ae
-DIST phpMyAdmin-4.7.9-all-languages.tar.xz 6370604 BLAKE2B 28ae240ffe092eac1d1226d37c520417c2949b548fa3b3f7ebe93f26d113b3518cad28f28feb8c47446ecc4573dfe32cec747dd1eedf5a9862a70bfcfaafbd4e SHA512 8788beb62e8a049197e52dc75a797705a7aec9fa748a00f858ecd6d912aa5907f5d9de042d50880c5ab55b7479f194d32dbb6c01706130e70fec5c95c51ca08d
-DIST phpMyAdmin-4.8.0.1-all-languages.tar.xz 5926908 BLAKE2B 4209d6d5e57c1757a232c8a765d45ef5e8384d99cd94a389593080d6f1bfb2a64295acaa092f9fc435a7d4853ae553762721ddd4e69cb67de651a42376657c3c SHA512 4849ee320caaaa9a6af4d1cfba3fba32089b3bd932c89dcef3823a441691c52c722818099b7f4f5e1713bb3a38f55a6c9b6706ab5a12f131dda97172513d8549
-DIST phpMyAdmin-4.8.1-all-languages.tar.xz 5916536 BLAKE2B 3263b66d52eb0b5d8795ade2a6700738c797181e6efaa89516b73a7d3fca1db02c5aff6d26898cfbc23c9458f6579ba4f252699c79ef7643aa89700c0ef02946 SHA512 93f04c76b8a0a73ff61dbe3edb9df8b1536eb18f5b5944c2f5eb0e8f5eddb183497c4c2e4a3d290f70422a49027c1de220630bdce731a6b7315b1d3295641d0c
+DIST phpMyAdmin-4.8.2-all-languages.tar.xz 5914400 BLAKE2B 3a2bbef5cba6583e5b8a2409647a6657fcc54041213ad26143e6ca6ab58a7550d94c65afc9dac8f5751c31072748b7183ba255b4aebe047c10b06dc6efdbed16 SHA512 32c5f048b31089ea6a6bc0212b32f01eb842eddc323a9729b98a693d96d38b0ef091b4521381dae432d2482bf0214ad65ffaa13c925b0dca5dcb645e2987eb33
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild
deleted file mode 100644
index 7897b8451a16..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
- dev-lang/php[crypt,ctype,filter,json,session,unicode]
- || (
- dev-lang/php[mysqli]
- dev-lang/php[mysql]
- )
- virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
- webapp_pkg_setup
-}
-
-src_install() {
- webapp_src_preinst
-
- dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
- rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
- if ! use setup; then
- rm -rf setup || die "Cannot remove setup utility"
- elog "The phpMyAdmin setup utility has been removed."
- elog "It is a regular target of various exploits. If you need it, set USE=setup."
- else
- elog "You should consider disabling the setup USE flag"
- elog "to exclude the setup utility if you don't use it."
- elog "It regularly is the target of various exploits."
- fi
-
- insinto "${MY_HTDOCSDIR#${EPREFIX}}"
- doins -r .
-
- webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
- webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
- webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.7-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.7-r1.ebuild
deleted file mode 100644
index 388c0a19120a..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.7-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
- dev-lang/php[ctype,filter,json,session,unicode]
- || (
- dev-lang/php[mysqli]
- dev-lang/php[mysql]
- )
- virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
- webapp_pkg_setup
-}
-
-src_install() {
- webapp_src_preinst
-
- dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
- rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
- if ! use setup; then
- rm -rf setup || die "Cannot remove setup utility"
- elog "The phpMyAdmin setup utility has been removed."
- elog "It is a regular target of various exploits. If you need it, set USE=setup."
- else
- elog "You should consider disabling the setup USE flag"
- elog "to exclude the setup utility if you don't use it."
- elog "It regularly is the target of various exploits."
- fi
-
- insinto "${MY_HTDOCSDIR#${EPREFIX}}"
- doins -r .
-
- webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
- webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
- webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.8.0.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.8.0.1.ebuild
deleted file mode 100644
index f89f833a9205..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.8.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
- dev-lang/php[ctype,filter,json,session,unicode]
- || (
- dev-lang/php[mysqli]
- dev-lang/php[mysql]
- )
- virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
- webapp_pkg_setup
-}
-
-src_install() {
- webapp_src_preinst
-
- dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
- rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
- if ! use setup; then
- rm -rf setup || die "Cannot remove setup utility"
- elog "The phpMyAdmin setup utility has been removed."
- elog "It is a regular target of various exploits. If you need it, set USE=setup."
- else
- elog "You should consider disabling the setup USE flag"
- elog "to exclude the setup utility if you don't use it."
- elog "It regularly is the target of various exploits."
- fi
-
- insinto "${MY_HTDOCSDIR#${EPREFIX}}"
- doins -r .
-
- webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
- webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
- webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.8.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.8.1.ebuild
deleted file mode 100644
index f89f833a9205..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.8.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
- dev-lang/php[ctype,filter,json,session,unicode]
- || (
- dev-lang/php[mysqli]
- dev-lang/php[mysql]
- )
- virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
- webapp_pkg_setup
-}
-
-src_install() {
- webapp_src_preinst
-
- dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
- rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
- if ! use setup; then
- rm -rf setup || die "Cannot remove setup utility"
- elog "The phpMyAdmin setup utility has been removed."
- elog "It is a regular target of various exploits. If you need it, set USE=setup."
- else
- elog "You should consider disabling the setup USE flag"
- elog "to exclude the setup utility if you don't use it."
- elog "It regularly is the target of various exploits."
- fi
-
- insinto "${MY_HTDOCSDIR#${EPREFIX}}"
- doins -r .
-
- webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
- webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
- webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.9.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.8.2.ebuild
similarity index 100%
rename from dev-db/phpmyadmin/phpmyadmin-4.7.9.ebuild
rename to dev-db/phpmyadmin/phpmyadmin-4.8.2.ebuild
diff --git a/dev-db/qdbm/qdbm-1.8.78-r1.ebuild b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
similarity index 93%
rename from dev-db/qdbm/qdbm-1.8.78-r1.ebuild
rename to dev-db/qdbm/qdbm-1.8.78-r2.ebuild
index fcb210018c4c..fee0cfe58c34 100644
--- a/dev-db/qdbm/qdbm-1.8.78-r1.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.78-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
USE_RUBY="ruby21 ruby22 ruby23 ruby24"
RUBY_OPTIONAL="yes"
-inherit autotools java-pkg-opt-2 perl-functions ruby-ng
+inherit autotools flag-o-matic java-pkg-opt-2 perl-functions ruby-ng
DESCRIPTION="Quick Database Manager"
HOMEPAGE="http://fallabs.com/qdbm/"
@@ -89,6 +89,9 @@ src_prepare() {
default
java-pkg-opt-2_src_prepare
+ # fix build with >=sys-devel/gcc-7, bug #638878
+ append-cflags $(test-flags-CC -fno-tree-vrp)
+
sed -i \
-e "/^CFLAGS/s|$| ${CFLAGS}|" \
-e "/^OPTIMIZE/s|$| ${CFLAGS}|" \
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index df9445e647e6..f2b2770ed3dd 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/platformio/platformio-3.5.3.ebuild b/dev-embedded/platformio/platformio-3.5.3.ebuild
index 1f41bb03d1a6..a4d3b719d1c2 100644
--- a/dev-embedded/platformio/platformio-3.5.3.ebuild
+++ b/dev-embedded/platformio/platformio-3.5.3.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1
DESCRIPTION="An open source ecosystem for IoT development"
-HOMEPAGE="http://platformio.org/"
+HOMEPAGE="https://platformio.org/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 1fa913021034..d4cc5a828c91 100644
Binary files a/dev-haskell/Manifest.gz and b/dev-haskell/Manifest.gz differ
diff --git a/dev-haskell/transformers-base/Manifest b/dev-haskell/transformers-base/Manifest
index 2328293a1935..f988f0c08a6f 100644
--- a/dev-haskell/transformers-base/Manifest
+++ b/dev-haskell/transformers-base/Manifest
@@ -1,2 +1 @@
-DIST transformers-base-0.4.1.tar.gz 2449 BLAKE2B 0783e2dbbe1e100c78c4428843c20ce7853b5d926d646585cc8a99884b91d2e9fb68a6e93f9a645bfc64f56be3982d4fb8c63ea4952a99bbbb8d686bf5156930 SHA512 c2eb3ea5d10c9a520da4cf7faf99cc80c8aee5fb8bfef3d1fcee8f97fc2cb036a316457b19a7f235945d81a72bcb30f4c84edd1d3d11c7a4f72e5dcb265a58cb
DIST transformers-base-0.4.4.tar.gz 2550 BLAKE2B 39bb717561d9cd44737787c6770fd3306726caf6fca50b74015f6b28b47ca330edcefbd3ab2f1131875b3d918d1df6d44890463119ada422fd84f735046c4cb5 SHA512 5dbcbb321c7dc07a70af426cf3426433e9000e94278449ecbea025b79ec14f49cd9c8c35ea56ffa2b18444798c088a9db05badc2c819739b6ddd583c04114ea5
diff --git a/dev-haskell/transformers-base/transformers-base-0.4.1.ebuild b/dev-haskell/transformers-base/transformers-base-0.4.1.ebuild
deleted file mode 100644
index 978eeb369775..000000000000
--- a/dev-haskell/transformers-base/transformers-base-0.4.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.17.9999
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Lift computations from the bottom of a transformer stack"
-HOMEPAGE="https://github.com/mvv/transformers-base"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND=">=dev-haskell/transformers-0.2[profile?]
- >=dev-lang/ghc-6.8.2"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6.0"
diff --git a/dev-haskell/unix-compat/Manifest b/dev-haskell/unix-compat/Manifest
index 9dce03c703db..218e5bb44ad1 100644
--- a/dev-haskell/unix-compat/Manifest
+++ b/dev-haskell/unix-compat/Manifest
@@ -1,4 +1,3 @@
-DIST unix-compat-0.3.0.1.tar.gz 12614 BLAKE2B c2b88927c3e6146d7633f3b5f3cea052abb7e61c8f2bcba5dd8e039d1028406920b6f01304e721885cf5d26143a94340640ef2b8a932eac220b80dcefc5d4cc9 SHA512 2dc2dd0389c3860ad4b9f2113c1067e3574a9d728074ff08608ba2ee87e46fb2cc39a816ca10d1af908194f765895d45b842b6ee10a02d89ea197670e11d73c1
DIST unix-compat-0.4.1.3.tar.gz 12823 BLAKE2B 0cf1fa6c1b9f10c39fcbe8e0fa54085d7eb93d3177ba15d16e7f3a0f7b64178cea2f2be29e3b91f3611cc49528058e8f226febb941a57378c9156ee5eb609a2c SHA512 6065c2ec39e96ea8a7f91964a0e3ad93fa3a46625dfe831f0b4641e181e1ebbdac8cb5f954ee6a1fe8061896e97f437670605f0b4684183fc84f69725c3cf7a5
DIST unix-compat-0.4.1.4.tar.gz 12830 BLAKE2B b3b94ff1733d8df2b7105ea6956db7d37d5af445373dad3dd4583a7c515d742835c781da106a7c7b8ecabc55b877f648892308aae9706e94365b4e8c5e50afca SHA512 bc2aa14231b294ada9006d18e54f353f9c5b4bde387f585fc6e3adc38efd18d81819295255f0e385a9cde0fcc423db556801c9285767781eeedf32123b7639af
DIST unix-compat-0.4.2.0.tar.gz 12895 BLAKE2B df4f07a36b7371f658f533eabf4faa3880d1935371ae46fd05c3567e5f922b35999c7d71af2103c9b88b81ee4328aee6b002d54658e88422fa037c21a209939b SHA512 c3271dc7bbb35948cc2edb143ffe2ab0d14c53115668c257eeba8ccc148b586ee994f417ccfabb58fcd6533e786dcccac3062ece1923afaf20fcd05055fdad39
diff --git a/dev-haskell/unix-compat/unix-compat-0.3.0.1.ebuild b/dev-haskell/unix-compat/unix-compat-0.3.0.1.ebuild
deleted file mode 100644
index 220b7424e3fb..000000000000
--- a/dev-haskell/unix-compat/unix-compat-0.3.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Portable POSIX-compatibility layer"
-HOMEPAGE="https://github.com/jystic/unix-compat"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.12.1"
-DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.6"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 146159d69fc4..8751c6369f3b 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
index 39097f756844..942a90166414 100644
--- a/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -12,7 +12,7 @@ HOMEPAGE="http://icedtea.classpath.org"
SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="doc javascript nsplugin tagsoup test"
RESTRICT="test"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index d36c117d715b..0e519a1992a5 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index 5dc6a86b3522..9cb4c3546bd4 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -8,3 +8,4 @@ DIST swipl-7.6.3.tar.gz 16772590 BLAKE2B 644be801e290ec9d949a9b7462256a35e11cf9a
DIST swipl-7.6.4.tar.gz 16777875 BLAKE2B 94409966362e649f4748b94b4ec25415bb827c7742aa39453d8e37db4ce992a65ad2d054ded4e651f2a9abe3a9438285bc9c9c895437c087ae6cf88f4afae9ca SHA512 f0ed16e4f1436115651c38a0bb37008d0dadad5a19b0f09894fcfc51dd3d429f86488e89cce00788c3c36cc2f0cd2957f92df47d5441133a6f8ea9d91ca5470f
DIST swipl-7.7.13.tar.gz 17057506 BLAKE2B 4eb1f94511d1784f2df93100e646921541db67d09469f34f58ac9884935d1917feb4ce76f1e6284fd9e6f707b13bb8d77110c61300a78aa4c68bf4b4afd908a9 SHA512 b838b6c441542fbca3f635cb62dd844f09d0549f4da1f4ea9f9201d9e917f08e4a8917357f83e1c6704354f095f9212df92b19cbc631e91d891599eba23ef6ed
DIST swipl-7.7.14.tar.gz 17058567 BLAKE2B ad73035dfb6f731de7a6463ee1a2162f8fe54154969310f837df2367547243790c18df6cf96f16757b6e9760713123cae87c331efbb029c7b48354da24b148fa SHA512 b94b4c3f5dd55d5e90b7b005a03607eb31bb7e6aced5616b819491287b650f819a95853ad5df179c9db5b3646773c458e6d1ae65d30687d4e45e22555a4301f8
+DIST swipl-7.7.15.tar.gz 16858761 BLAKE2B e35a1d2f57ce98dc8d4d5a3fdbacc0a012bf400153b5947fea01b503a4118aa8d770636a37bdd95380e7fdd39cef271628f577839dc76f02480ad0d4505954b3 SHA512 52423615cb623059fc5a6f49451e92ebc3d1dcb43a3c0d5a1636ac156878930c9b2441e7f94567dd8128d15a56e73ac77fe4e2bd80aff7951d4fbf45d6ed5e25
diff --git a/dev-lang/swi-prolog/swi-prolog-7.7.15.ebuild b/dev-lang/swi-prolog/swi-prolog-7.7.15.ebuild
new file mode 100644
index 000000000000..38db2fe7a5aa
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.7.15.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses:=
+ archive? ( app-arch/libarchive )
+ berkdb? ( >=sys-libs/db-4:= )
+ zlib? ( sys-libs/zlib )
+ odbc? ( dev-db/unixODBC )
+ pcre? ( dev-libs/libpcre )
+ readline? ( sys-libs/readline:= )
+ libedit? ( dev-libs/libedit )
+ gmp? ( dev-libs/gmp:0 )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ java? ( >=virtual/jdk-1.7:= )
+ uuid? ( dev-libs/ossp-uuid )
+ X? (
+ virtual/jpeg:0
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXpm
+ x11-libs/libXt
+ x11-libs/libICE
+ x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+ X? ( x11-base/xorg-proto )
+ java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+ EPATCH_FORCE=yes
+ EPATCH_SUFFIX=patch
+ if [[ -d "${WORKDIR}"/${PV} ]] ; then
+ epatch "${WORKDIR}"/${PV}
+ fi
+
+ if ! use uuid; then
+ mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+ fi
+
+ # OSX/Intel ld doesn't like an archive without table of contents
+ sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+
+ eapply_user
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ use ppc && append-flags -mno-altivec
+ use hardened && append-flags -fno-unit-at-a-time
+ use debug && append-flags -DO_DEBUG
+
+ # ARCH is used in the configure script to figure out host and target
+ # specific stuff
+ export ARCH=${CHOST}
+
+ export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+ cd "${S}"/src || die
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_enable gmp) \
+ $(use_enable static-libs static) \
+ --enable-shared \
+ --enable-custom-flags COFLAGS="${CFLAGS} -DOF=_Z_OF"
+
+ if ! use minimal ; then
+ local jpltestconf
+ if use java && use test ; then
+ jpltestconf="--with-junit=$(java-config --classpath junit)"
+ fi
+
+ cd "${S}/packages" || die
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_with archive) \
+ $(use_with berkdb bdb ) \
+ $(use_with java jpl) \
+ ${jpltestconf} \
+ $(use_with libedit) \
+ $(use_with pcre) \
+ $(use_with odbc) \
+ $(use_with readline) \
+ $(use_with ssl) \
+ $(use_with X xpce) \
+ $(use_with zlib) \
+ COFLAGS='"${CFLAGS}"'
+ fi
+}
+
+src_compile() {
+ cd "${S}"/src || die
+ emake
+
+ if ! use minimal ; then
+ cd "${S}/packages" || die
+ emake
+ ./report-failed || die "Cannot report failed packages"
+ fi
+}
+
+src_test() {
+ cd "${S}/src" || die
+ emake check
+
+ if ! use minimal ; then
+ unset DISPLAY
+ cd "${S}/packages" || die
+ emake \
+ USE_PUBLIC_NETWORK_TESTS=false \
+ USE_ODBC_TESTS=false \
+ check
+ ./report-failed || die
+ fi
+}
+
+src_install() {
+ emake -C src DESTDIR="${D}" install
+
+ if ! use minimal ; then
+ emake -C packages DESTDIR="${D}" install
+ if use doc ; then
+ emake -C packages DESTDIR="${D}" html-install
+ fi
+ ./packages/report-failed || die "Cannot report failed packages"
+ fi
+
+ dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d0e3f629b609..46dc3d4dffca 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
index 06ae3b7b69f6..ca763db967b6 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.6.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ DESCRIPTION="Provides GObjects and helper methods to read and write AppStream me
HOMEPAGE="https://people.freedesktop.org/~hughsient/appstream-glib/"
SRC_URI="https://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
SLOT="0/8" # soname version
KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86"
IUSE="+introspection nls stemmer"
diff --git a/dev-libs/caliper/caliper-1.5.0.ebuild b/dev-libs/caliper/caliper-1.5.0.ebuild
index 8ecd92169088..be677d0ac535 100644
--- a/dev-libs/caliper/caliper-1.5.0.ebuild
+++ b/dev-libs/caliper/caliper-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit cmake-utils
DESCRIPTION="Application Introspection System"
-HOMEPAGE="http://computation.llnl.gov/projects/caliper"
+HOMEPAGE="https://computation.llnl.gov/projects/caliper"
SRC_URI="https://github.com/LLNL/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
diff --git a/dev-libs/efl/efl-1.18.4.ebuild b/dev-libs/efl/efl-1.18.4.ebuild
index 3e76a6359ddc..ba90b1c3f86d 100644
--- a/dev-libs/efl/efl-1.18.4.ebuild
+++ b/dev-libs/efl/efl-1.18.4.ebuild
@@ -13,7 +13,7 @@ elif [[ *"${PV}" == *"_pre"* ]] ; then
SRC_URI="https://download.enlightenment.org/pre-releases/${MY_P}.tar.xz"
else
SRC_URI="https://download.enlightenment.org/rel/libs/${PN}/${MY_P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
fi
inherit enlightenment pax-utils
diff --git a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
index 088ad6e3c474..3e769cb26ae1 100644
--- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
+++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -11,7 +11,7 @@ SRC_URI="http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz"
LICENSE="FastCGI"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="html"
DEPEND=""
diff --git a/dev-libs/gom/gom-0.3.2.ebuild b/dev-libs/gom/gom-0.3.2.ebuild
index f79646f4bcac..c69949bbf5ec 100644
--- a/dev-libs/gom/gom-0.3.2.ebuild
+++ b/dev-libs/gom/gom-0.3.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
GCONF_DEBUG="yes"
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
inherit gnome2 python-r1
diff --git a/dev-libs/ivykis/ivykis-0.42.3.ebuild b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
similarity index 72%
rename from dev-libs/ivykis/ivykis-0.42.3.ebuild
rename to dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
index 0660fddcca95..a5ee1b0d17d3 100644
--- a/dev-libs/ivykis/ivykis-0.42.3.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.3-r1.ebuild
@@ -10,3 +10,14 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name "*.la" -delete || die
+}
diff --git a/dev-libs/libattica/Manifest b/dev-libs/libattica/Manifest
deleted file mode 100644
index 036ca798d2dd..000000000000
--- a/dev-libs/libattica/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST attica-0.4.2.tar.bz2 57093 BLAKE2B 3bed190846d8d2f15c9b3f650ee6f224787e18287eec4ab746c92d6ececb08bfd732183450d6ba6ca628d48bedb7b1c3d6fc579dfe61b29bbd317943f36b019a SHA512 cef5d5c4bf01ed45ed8b59db354a4ac7949de435a45e4f753c847cadc15855e25997dedf1ff20c7bc4a2724d2cdba15139c54f0682df7d8cc8750de5be6f716e
diff --git a/dev-libs/libattica/libattica-0.4.2.ebuild b/dev-libs/libattica/libattica-0.4.2.ebuild
deleted file mode 100644
index 71dc23670246..000000000000
--- a/dev-libs/libattica/libattica-0.4.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="${P#lib}"
-MY_PN="${PN#lib}"
-
-if [[ $PV = *9999* ]]; then
- EGIT_REPO_URI="git://anongit.kde.org/attica"
- KEYWORDS=""
- scm_eclass=git-2
-else
- SRC_URI="mirror://kde/stable/${MY_PN}/${MY_P}.tar.bz2"
- KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-
-inherit cmake-utils ${scm_eclass}
-
-DESCRIPTION="A library providing access to Open Collaboration Services"
-HOMEPAGE="https://www.kde.org/"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="0"
-IUSE="debug test"
-
-RDEPEND="
- dev-qt/qtcore:4
-"
-DEPEND="${RDEPEND}
- test? (
- dev-qt/qtgui:4
- dev-qt/qttest:4
- )
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
- local mycmakeargs=(
- -DQT4_BUILD=true
- $(cmake-utils_use test ATTICA_ENABLE_TESTS)
- )
- cmake-utils_src_configure
-}
diff --git a/dev-libs/libattica/metadata.xml b/dev-libs/libattica/metadata.xml
deleted file mode 100644
index 0cf59224b009..000000000000
--- a/dev-libs/libattica/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- kde@gentoo.org
- Gentoo KDE Project
-
-
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 507fdb270031..53b45ce472f9 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -1,6 +1,7 @@
DIST libbson-0.98.0.tar.gz 4451923 BLAKE2B 2d53cdc0cf1afa189eb1597ccc46a604c98011cc54b6f77c5848e10f044bf5edb9fd57f6a3dce6907ddcec76de043def6d488c8e1b7eda42d7b420b1026c58f5 SHA512 9bae7593198c8ac358978bd6a065d65fb872a15fd43d11839ad5dff1ffbe0362b06cd4bde08032a2c11e8633789328b5d504cd032b7636dc525f6df3e6fd641d
DIST libbson-1.1.10.tar.gz 4431658 BLAKE2B 1e542797c6617296c0ca7cb6dbbd34be5b31789a39130fb61000f11dfce6f7e3584f884c9350234b9704143d6a3280635cd32572b35e83010a7e9ddcc3f86ff8 SHA512 636178bafb19e7b103b5192866dbda0c70b8d7173560b0466f88b3a85cce3292a7caac9521808fa8c09d187f8c96564dcd9fb787e855d1619610f813583379bc
DIST libbson-1.1.2.tar.gz 4492014 BLAKE2B 684c5053faf5a7f3afe6063e34247cfe7709afe0c17e8f387cfb337e6cc62e7b79c3cbf018e245bc189899e094858e1caff156344e126ba889964b1112820d21 SHA512 03e2ee337445286c14b846cd7545707959b1d351fa466c6292379a85e48ea1a171dae37dd7aff092212239ad59aac6f1ab216ee5de74ef00a8a2a124559e34da
+DIST libbson-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49f7b670f027b410595b1e6455228dc776f0ed629d6ee599d16b9d0db08ec08a8e4dac2bdf06fa931ef1578849bf86d85726 SHA512 47af1baad1ad74bbbdf2fd22a437034d317a2f3ec02fee485e983ae6829b3f01af2649a09577f08144a88385fa940dfa211ea02bfa3c0e25b59dbe2090269603
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/libbson-1.10.3.ebuild b/dev-libs/libbson/libbson-1.10.3.ebuild
new file mode 100644
index 000000000000..e229e5ac1bdd
--- /dev/null
+++ b/dev-libs/libbson/libbson-1.10.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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/archive/${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"
+
+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)"
+ )
+
+ 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/libinput/Manifest b/dev-libs/libinput/Manifest
index 807098601ecf..a388032af6fa 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,3 +1,4 @@
DIST libinput-1.10.6.tar.xz 495536 BLAKE2B 3f23808635406eeb66cd6b4ce2a2dbaed69ee0917045f75ad262a59702d72923493b6faa7951ea3f7cc2591d4c9e1fc49cffc53b6dfbcb2aadc7b9f40c20517b SHA512 b76963c3429c5590ee04f1da94d08775c8bb8584830e678804fb1d4cf0e2af84826782eae71fdd57492461f85df87ac2fc940c280b0672c75cd81d5f34702fe4
DIST libinput-1.10.7.tar.xz 494648 BLAKE2B ddcbe5f54b90f8291c16e5912fa3d673fb2c66f0247c9d771f7c2dfeeef9b51404f31d7ac99cfd20b37e1d01d6b2b3bc95155ab6581c6a94e922e153d9098892 SHA512 b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684
DIST libinput-1.11.0.tar.xz 485976 BLAKE2B f0bd88463b6aba7bfcf80d3354e53fe86e367a29055e295621d84175720544af035cc6303a2777d6ac4535d4706c41fa435a3a5a3abd20eb9ad33366dad4eae8 SHA512 382a6c9ec4aaf13ac209ee5a7f507c7a6d2dd399c5104703ac7c6ac62fb3f393de6f4e15d7895b18c8b8d845ce8fc1f551a90aa7532f0de4cc17e57a09cfe857
+DIST libinput-1.11.1.tar.xz 485064 BLAKE2B 15ab0fddee37323f3df0b52e297ac5b0995e7db6531854852a21c7182474df0ffb136886e3d305d987dcb4f82e9f1cf3724e2f34448ef40ed1df10bd27cb2218 SHA512 3dd1a318c89d66f5a66016c6dbfa5277b61a8cb5337d99f85b1eeef40ed894bdc04fd4588a97383988daea0f034df5a72bff318325320a01b857db9deb94a2b0
diff --git a/dev-libs/libinput/libinput-1.10.7.ebuild b/dev-libs/libinput/libinput-1.10.7.ebuild
index 9e10a1005467..bed8843385aa 100644
--- a/dev-libs/libinput/libinput-1.10.7.ebuild
+++ b/dev-libs/libinput/libinput-1.10.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0/10"
-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="doc input_devices_wacom test"
# Tests require write access to udev rules directory which is a no-no for live system.
# Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libinput/libinput-1.11.1.ebuild b/dev-libs/libinput/libinput-1.11.1.ebuild
new file mode 100644
index 000000000000..0635ed1b8faf
--- /dev/null
+++ b/dev-libs/libinput/libinput-1.11.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit meson udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+ input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+ >=dev-libs/libevdev-1.3
+ >=sys-libs/mtdev-1.1
+ virtual/libudev:=
+ virtual/udev
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? (
+ >=app-doc/doxygen-1.8.3
+ >=media-gfx/graphviz-2.38.0
+ )
+"
+# test? (
+# >=dev-libs/check-0.9.10
+# dev-util/valgrind
+# sys-libs/libunwind )
+
+src_configure() {
+ # gui can be built but will not be installed
+ local emesonargs=(
+ -Ddebug-gui=false
+ -Ddocumentation="$(usex doc true false)"
+ -Dlibwacom="$(usex input_devices_wacom true false)"
+ -Dtests="$(usex test true false)"
+ -Dudev-dir="$(get_udevdir)"
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ if use doc ; then
+ docinto html
+ dodoc -r "${BUILD_DIR}"/html/.
+ fi
+ find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
+
+pkg_postinst() {
+ udevadm hwdb --update --root="${ROOT%/}"
+}
diff --git a/dev-libs/libnl/libnl-3.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild
index fc9536f8ff28..a68c63bad5ec 100644
--- a/dev-libs/libnl/libnl-3.4.0.ebuild
+++ b/dev-libs/libnl/libnl-3.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
"
LICENSE="LGPL-2.1 utils? ( GPL-2 )"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="+debug static-libs python +threads utils"
RDEPEND="
diff --git a/dev-libs/libuv/Manifest b/dev-libs/libuv/Manifest
index 716eb66fd4fa..47d9241ef7d1 100644
--- a/dev-libs/libuv/Manifest
+++ b/dev-libs/libuv/Manifest
@@ -2,3 +2,4 @@ DIST libuv-1.10.2.tar.gz 1074184 BLAKE2B 81b5327684ae75ad1347730264f07f1106d9136
DIST libuv-1.20.0.tar.gz 1180231 BLAKE2B 8ba258477c685acc1ed5486211b65719419757f6dec5dda863d622d4190552a2f5968f3b05519ec5574a5963cce99a9b92c224b511e0f9e70aa099d47f4fb4ca SHA512 382309cb6e54765b956b03357cb754f49d93505ba0e0122a77f33efca07d7b87966c993a5fd9f9503edd1bcd0f49ca42bd9cd9264cce94c847aebca77d237ba0
DIST libuv-1.20.2.tar.gz 1180957 BLAKE2B bbf29ea1ee989a5197daef92fee12aa83687002e14e8a4311b61c743cfbf6e4e8e9f0045b38fa5301afcc9981a5fcd59d12e0649515b2e1695ede62795929d4b SHA512 449dfd15e2953d2a8b9c6160ab39728a87799b3e8595f9e3013467daf69d3561e2c5602172a0596e7c884237cf0d52d3b0f00edde03a7b037dc90b61bce2057c
DIST libuv-1.20.3.tar.gz 1181741 BLAKE2B ee68f975c9f150034b02772b297a05692305155449dac75f35ca32761ffa2803385b22cce5c0fe1b2ad73a52144e6218e2c62d73c92e098017bee74a99e16062 SHA512 60ebc0059ec9fdd022aa9d60b2a0340f29e037bf79fa08707f6f2ecca9ec263c7a6466bdc1f94e0875a6a627ee749efa86117dedb22119676a7bafed8b5d77a0
+DIST libuv-1.21.0.tar.gz 1187827 BLAKE2B e534eb4a7cdde3988a34047c999fd20e83f443bcf3ac1c62e07b7e4ddd95f62ac8221d58197b5f8fed618686d6003e35793b1b91e1dcfd6245a05d8bff1b881c SHA512 ab6b52f8bee1900953d9136e4d281f81ba9f14287760f7bfc8633289699cb9eeaab15d9146ed05b164631fcb3c2b5abcee8c10499d080a82a411bb1f02564c48
diff --git a/dev-libs/libuv/libuv-1.20.0.ebuild b/dev-libs/libuv/libuv-1.20.0.ebuild
index e4d496fd500d..8f162ded409e 100644
--- a/dev-libs/libuv/libuv-1.20.0.ebuild
+++ b/dev-libs/libuv/libuv-1.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD BSD-2 ISC MIT"
SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ppc64 s390 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 ~mips ~ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RESTRICT="test"
diff --git a/dev-libs/libuv/libuv-1.21.0.ebuild b/dev-libs/libuv/libuv-1.21.0.ebuild
new file mode 100644
index 000000000000..1edbef416b0b
--- /dev/null
+++ b/dev-libs/libuv/libuv-1.21.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune multilib-minimal
+
+DESCRIPTION="Cross-platform asychronous I/O"
+HOMEPAGE="https://github.com/libuv/libuv"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD BSD-2 ISC MIT"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+RESTRICT="test"
+
+DEPEND="sys-devel/libtool
+ virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+ default
+
+ echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \
+ > m4/libuv-extra-automake-flags.m4 || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ cc_cv_cflags__g=no
+ $(use_enable static-libs static)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+ mkdir "${BUILD_DIR}"/test || die
+ cp -pPR "${S}"/test/fixtures "${BUILD_DIR}"/test/fixtures || die
+ default
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files
+}
diff --git a/dev-libs/libwacom/Manifest b/dev-libs/libwacom/Manifest
index 69aa5d15d2c1..00cdcdba3334 100644
--- a/dev-libs/libwacom/Manifest
+++ b/dev-libs/libwacom/Manifest
@@ -1,3 +1,4 @@
DIST libwacom-0.24.tar.bz2 488313 BLAKE2B c4eba20e57a231ddf1401f25787576ccb524b95e2c8de7715b115eb15ce5124a1cdbe0cd9c55fb0280e53804708b117f0016594a3e023a5f7f78715ad1522d24 SHA512 331acb33ab798abf376f70647786c894014d5baa373cc66d53f1e77e77129ba78ec059f32f5cf3659a1fe3e8f9ff6ab3eb6eefd6090fc3c3bab4582ea25a5640
DIST libwacom-0.25.tar.bz2 478780 BLAKE2B fb9f3010f2db7aecd967508976daec40fdf956d600b2cc12a90b560e6195e7fac01d5df08413c78247fc17a97850f250b2b4533d78d9fff38871114ce5ab9357 SHA512 080d12706c3b685ee1cb963b79068e0e7c08e47296c1535cde4d2280239758d6bccbd38982a63d366cab1a77a4db287cc5bb329abaee6dbb285c4b8e010eaf67
DIST libwacom-0.26.tar.bz2 479348 BLAKE2B 7b7fc7a74b5dd67935911ec9fb728acc99ee96e56852cbe5b6d2434e5fcdb02954dac5dbe1fab3253ddf00353cd33f2cde850fc2cb18d35e9eaf87e6bf6fcac9 SHA512 4250a9c3481580d88b76f0dbcc9bff39bbe88bf3c874e0d7776d604980481ef7f3bf6d550a46c4bcb9690fb589e955cb416a0724dae200ba027bc129b3cd3100
+DIST libwacom-0.30.tar.gz 119261 BLAKE2B 4f76fcbed42c5453701e3b5dda880a26f9956a803827584aeaf080196b26bedb65f6bdccb7ffe18e7f93861dfee8a633894869b1ea4f6b95e72d64273087b60c SHA512 952ead4b39461d64d9592d0e05824669d0a8bc721aced46f5a99832da0fc63a4023f9803d416ceaf71dc7182660d05d45b799424bca7f54128fa7c44447b688b
diff --git a/dev-libs/libwacom/libwacom-0.30.ebuild b/dev-libs/libwacom/libwacom-0.30.ebuild
new file mode 100644
index 000000000000..245f3d5f7845
--- /dev/null
+++ b/dev-libs/libwacom/libwacom-0.30.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools udev
+
+DESCRIPTION="Library for identifying Wacom tablets and their model-specific features"
+HOMEPAGE="https://github.com/linuxwacom/libwacom"
+SRC_URI="https://github.com/linuxwacom/${PN}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+ dev-libs/glib:2
+ virtual/libgudev:=
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_prepare() {
+ default
+ if ! use doc; then
+ sed -e 's:^\(SUBDIRS = .* \)doc:\1:' -i Makefile.am || die
+ fi
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ use doc && HTML_DOCS=( doc/html/. )
+ default
+ local udevdir="$(get_udevdir)"
+ dodir "${udevdir}/rules.d"
+ # generate-udev-rules must be run from inside tools directory
+ pushd tools > /dev/null || die
+ ./generate-udev-rules > "${ED}/${udevdir}/rules.d/65-libwacom.rules" || \
+ die "generating udev rules failed"
+ popd > /dev/null || die
+ find "${D}" -name '*.la' -exec rm -f {} + || die
+}
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 0f187f8dd87d..ace85a1ab450 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -3,6 +3,7 @@ DIST mongo-c-driver-0.8.1.tar.gz 124053 BLAKE2B 1c6b0d3998c6497c39fc2f6597021e84
DIST mongo-c-driver-0.98.2.tar.gz 5342760 BLAKE2B 399fb03464234c87dcb66647c5383c505e654238e72e86794fdbc56716590ea6637aa7bfb0d25c0fb6aae8fce6055741753ac33125cb1b475c7bfe1e198a0a1e SHA512 6e3abc31b1e0e02d3bb864882444a95aa01ec4a85ee77abdc52675a730790be7f1924f3c6ea36405ff0f2066e332302ca567bbfa35ba7b918bce81fb409600eb
DIST mongo-c-driver-1.1.10.tar.gz 5321144 BLAKE2B d63ba4b1a256b8b29654398a53d9ca46d49faad0e0327db0d51cfc4e2a1771568341ff4e7ba6ff2ff31fb11ad8a14c452e52cabdd83da7eb1c1ceb8af7bef7d2 SHA512 10ebd1bddc0c713c0934679974fb1ed29eda1bf8e2ebbe2a1ebbcba219574092c34c4b352231ec65ffe3e350d8d701ef85debaaa9f9c10e6ab36fc3fa29f69df
DIST mongo-c-driver-1.1.2.tar.gz 5443153 BLAKE2B f8004486baf6d2d3086e458bdb4bc8060462fd52ba700cbf05fdb9827adcbd087b61d7e0e00169cf635c8021983dc851b7f34c3e08d66efc65483fce98a85f74 SHA512 d420fc407f6a04c06a959b8971dc2643c987df5c3d82f2b13bfdf6a44e96bc377478c4d0e385abf67f21b56892c915c79675fe9ebf6efa9aab51fe452c5e6f95
+DIST mongo-c-driver-1.10.3.tar.gz 5616159 BLAKE2B 368e273aedc21ec79b804625276a49f7b670f027b410595b1e6455228dc776f0ed629d6ee599d16b9d0db08ec08a8e4dac2bdf06fa931ef1578849bf86d85726 SHA512 47af1baad1ad74bbbdf2fd22a437034d317a2f3ec02fee485e983ae6829b3f01af2649a09577f08144a88385fa940dfa211ea02bfa3c0e25b59dbe2090269603
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.10.3-enable-tests.patch b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.10.3-enable-tests.patch
new file mode 100644
index 000000000000..af26b6953139
--- /dev/null
+++ b/dev-libs/mongo-c-driver/files/mongo-c-driver-1.10.3-enable-tests.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2eeb6cb..aeaa23b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -109,7 +109,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 51514ed..accb251 100644
+--- a/src/libbson/tests/test-bson.c
++++ b/src/libbson/tests/test-bson.c
+@@ -18,7 +18,7 @@
+ #include
+ #include
+ #define BSON_INSIDE
+-#include
++#include "bson-private.h"
+ #undef BSON_INSIDE
+ #include
+ #include
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild
new file mode 100644
index 000000000000..e2009f3e717e
--- /dev/null
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.10.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="debug examples libressl sasl ssl static-libs test"
+REQUIRED_USE="test? ( static-libs )"
+
+RDEPEND="app-arch/snappy:=
+ >=dev-libs/libbson-1.10.3
+ dev-python/sphinx
+ sys-libs/zlib:=
+ 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}/${P}-enable-tests.patch" # enable tests without libbson
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # copy private headers for tests since we don't build libbson
+ if use test; then
+ for f in bson-private.h bson-iso8601-private.h bson-thread-private.h; do
+ cp -v src/libbson/src/bson/${f} src/libbson/tests/ || die
+ done
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_SKIP_RPATH=ON # mongoc-stat insecure runpath
+ -DENABLE_BSON=SYSTEM
+ -DENABLE_EXAMPLES=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)"
+ )
+
+ cmake-utils_src_configure
+}
+
+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/mpfr/mpfr-3.1.3_p4.ebuild b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
index ea96ab6369f0..4a7ba6e98544 100644
--- a/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.3_p4.ebuild
@@ -4,7 +4,7 @@
EAPI="4"
# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils libtool multilib multilib-minimal
+inherit libtool multilib multilib-minimal preserve-libs
MY_PV=${PV/_p*}
MY_P=${PN}-${MY_PV}
diff --git a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
index 272e4e3f30cc..f2ae19aea02d 100644
--- a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils libtool multilib-minimal
+inherit libtool multilib-minimal preserve-libs
MY_PV=${PV/_p*}
MY_P=${PN}-${MY_PV}
diff --git a/dev-libs/mpfr/mpfr-4.0.1.ebuild b/dev-libs/mpfr/mpfr-4.0.1.ebuild
index 272e4e3f30cc..f2ae19aea02d 100644
--- a/dev-libs/mpfr/mpfr-4.0.1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
# NOTE: we cannot depend on autotools here starting with gcc-4.3.x
-inherit eutils libtool multilib-minimal
+inherit libtool multilib-minimal preserve-libs
MY_PV=${PV/_p*}
MY_P=${PN}-${MY_PV}
diff --git a/dev-libs/nspr/nspr-4.13.1.ebuild b/dev-libs/nspr/nspr-4.13.1.ebuild
index 37480aac7750..6bc28a907334 100644
--- a/dev-libs/nspr/nspr-4.13.1.ebuild
+++ b/dev-libs/nspr/nspr-4.13.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz"
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug"
RDEPEND=""
diff --git a/dev-libs/nss/nss-3.29.5.ebuild b/dev-libs/nss/nss-3.29.5.ebuild
index c758958bb937..3c5afbacf3bb 100644
--- a/dev-libs/nss/nss-3.29.5.ebuild
+++ b/dev-libs/nss/nss-3.29.5.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
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 ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="cacert +nss-pem utils"
CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/oniguruma/oniguruma-6.8.2.ebuild b/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
index 2b05c0720e32..3805e7eee87b 100644
--- a/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/5"
-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 ~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 ~x86-solaris"
IUSE="crnl-as-line-terminator static-libs"
S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/poco/poco-1.9.0.ebuild b/dev-libs/poco/poco-1.9.0.ebuild
index b6b741001baa..127c9d0ac2c1 100644
--- a/dev-libs/poco/poco-1.9.0.ebuild
+++ b/dev-libs/poco/poco-1.9.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
inherit cmake-utils
DESCRIPTION="C++ libraries for building network-based applications"
-HOMEPAGE="http://pocoproject.org/"
+HOMEPAGE="https://pocoproject.org/"
SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz"
LICENSE="Boost-1.0"
SLOT="0"
diff --git a/dev-libs/spsdeclib/metadata.xml b/dev-libs/spsdeclib/metadata.xml
index 7159d99914d9..29b8f4c73b66 100644
--- a/dev-libs/spsdeclib/metadata.xml
+++ b/dev-libs/spsdeclib/metadata.xml
@@ -11,6 +11,6 @@
The SPS decoder library will load IPF and CT Raw files in the emulator of your choice.
- Kryofluxes app-misc/dtc also will need this.
+ Kryofluxes app-misc/kryoflux-dtc also will need this.
diff --git a/dev-libs/zziplib/zziplib-0.13.62-r2.ebuild b/dev-libs/zziplib/zziplib-0.13.62-r2.ebuild
index 83d49e733a5f..6b1da7bf50b6 100644
--- a/dev-libs/zziplib/zziplib-0.13.62-r2.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.62-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zziplib/${P}.tar.bz2"
LICENSE="|| ( LGPL-2.1 MPL-1.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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc sdl static-libs test"
RDEPEND="
diff --git a/dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild b/dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild
index a538d9cd9f25..e93a9e901cf1 100644
--- a/dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild
+++ b/dev-perl/Capture-Tiny/Capture-Tiny-0.460.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Capture STDOUT and STDERR from Perl, XS or external programs"
LICENSE="Apache-2.0"
SLOT="0"
-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"
+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="test"
RDEPEND="
diff --git a/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild b/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild
index aa1525ff7659..0d82012c2bef 100644
--- a/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild
+++ b/dev-perl/Devel-CheckBin/Devel-CheckBin-0.40.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
DESCRIPTION="check that a command is available"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 s390 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"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ~ppc64 s390 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="test"
RDEPEND="
diff --git a/dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild b/dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild
index 73628240a137..0330105d5235 100644
--- a/dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild
+++ b/dev-perl/Encode-Locale/Encode-Locale-1.50.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Determine the locale encoding"
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 ~arm-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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND=">=virtual/perl-Encode-2.0.0"
diff --git a/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild b/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild
index 9568e873e0e3..de75b0b5b481 100644
--- a/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild
+++ b/dev-perl/ExtUtils-PkgConfig/ExtUtils-PkgConfig-1.160.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Simplistic perl interface to pkg-config"
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
DEPEND="
diff --git a/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild b/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild
index dd7d2858c19a..1fec83aa6882 100644
--- a/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild
+++ b/dev-perl/HTML-Parser/HTML-Parser-3.720.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Parse
section of HTML documents"
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 ~arm-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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild
index faa2c10bc085..3663b004d754 100644
--- a/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild
+++ b/dev-perl/HTTP-Daemon/HTTP-Daemon-6.10.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Base class for simple HTTP servers"
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 ~arm-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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild b/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild
index d8cd693dafba..2d3f9f99988e 100644
--- a/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild
+++ b/dev-perl/HTTP-Message/HTTP-Message-6.130.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Base class for Request/Response"
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 ~arm-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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
# MIME::QuotedPrint -> MIME-Base64
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 6534ebe4eacd..886a42b82077 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild b/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild
index 2b73eee54c23..2876451102f5 100644
--- a/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild
+++ b/dev-perl/Sub-Name/Sub-Name-0.210.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="(Re)name a sub"
SLOT="0"
-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 ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test suggested"
RDEPEND="
diff --git a/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild b/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild
index 12c6e06ee063..27de0e1b79d9 100644
--- a/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild
+++ b/dev-perl/Try-Tiny/Try-Tiny-0.300.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Minimal try/catch with proper localization of \$@"
LICENSE="MIT"
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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test minimal"
RDEPEND="
diff --git a/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild b/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
index fe67014cdb98..2b50375f07b8 100644
--- a/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
+++ b/dev-perl/XML-SAX-Base/XML-SAX-Base-1.90.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Base class SAX Drivers and Filters"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 24ea5d6294a8..dda4fb644d5b 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/pecl-mongodb/Manifest b/dev-php/pecl-mongodb/Manifest
index 251d58b05938..4f1fb7b7f2ed 100644
--- a/dev-php/pecl-mongodb/Manifest
+++ b/dev-php/pecl-mongodb/Manifest
@@ -4,3 +4,4 @@ DIST mongodb-1.2.11.tgz 786669 BLAKE2B 69c0689436f73846294f13610d569c2bdd4fc0614
DIST mongodb-1.2.9.tgz 786049 BLAKE2B 39c1ea211fdaa116e5a25fdb17a7be8b6c375909fc8a46bbcd7ed9f5d7a528f1effccec81000b61ed784fb924196237fb9cea74969cc0754dd53cb202377e800 SHA512 7eff5cfce08f3d69bc7acdb9ab5f8f55d02dab67593e5d03402c8bb6b6611fd703e8dfda89b99e8d3de387ed58cb9eea096fe68e0c9657ec3f8b1b7f622cfe58
DIST mongodb-1.3.3.tgz 925476 BLAKE2B 845abd4c7cf5dbb1fb3b04c5fc4070f0a360874ac566f1988025701258141a89afaa0e60c3d7166484fa37eda4ef08d94deeabdcc2ebe2a4f221dcf83aff20df SHA512 16c82ada278eac6996065d3c594237fbb8c1a7fe4e21828aa8af9ef98033cf6dfaf0fee90095e8116e946e620b551a6122238f85865a6c47d4d087f784cd54ea
DIST mongodb-1.4.1.tgz 1037836 BLAKE2B eb31be94e1508a860d88d44e3e6714bea62a34eb999285a2e40082a0b66b617d380adbbf56614244eb567b8939dae223b0553d425e608d05d86cd3232441b59d SHA512 4c053917ba6e178e114a4aafcd20ec505694bd96575235485e1524f1063d17ea1c446c86b7eb70d0c25db4ae6338d71fb33aa9df647ce1c80a17f539362230b0
+DIST mongodb-1.4.4.tgz 1043458 BLAKE2B bb159170fe6696f996a69d1a3ffbfbc66016e6f31a8c53022e836fb3c21554bd4b74f263b11c4ad78fd6e17b8ec75d551fbe65612778d3d44c9fb1c049f84e5a SHA512 fe54b169593d8cddc0318ae6e40f833796b8745a45917446ce360604bb1ceb7b3242498ac9ca6a6be1389a735c12786b0542ba29655ff42a0c96e16a4a0b68cb
diff --git a/dev-php/pecl-mongodb/pecl-mongodb-1.4.4.ebuild b/dev-php/pecl-mongodb/pecl-mongodb-1.4.4.ebuild
new file mode 100644
index 000000000000..bc420b457167
--- /dev/null
+++ b/dev-php/pecl-mongodb/pecl-mongodb-1.4.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PHP_EXT_NAME="mongodb"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="MongoDB database driver for PHP"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl sasl"
+
+RDEPEND="
+ php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] )
+ php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] )
+ php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] )
+ php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] )
+ >=dev-libs/libbson-1.9.0
+ >=dev-libs/mongo-c-driver-1.9.0[sasl?,ssl]
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ sasl? ( dev-libs/cyrus-sasl )
+"
+# pkgconfig needed if system libraries are used for bson and libmongoc
+DEPEND="${RDEPEND} virtual/pkgconfig"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --enable-mongodb
+ --with-libbson
+ --with-libmongoc
+ --with-mongodb-sasl=$(usex sasl)
+ )
+ php-ext-source-r3_src_configure
+}
diff --git a/dev-python/3to2/3to2-1.1.1-r1.ebuild b/dev-python/3to2/3to2-1.1.1-r1.ebuild
index e37f6271ca66..ed9d46062026 100644
--- a/dev-python/3to2/3to2-1.1.1-r1.ebuild
+++ b/dev-python/3to2/3to2-1.1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
LICENSE="Apache-1.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="app-arch/unzip"
diff --git a/dev-python/HeapDict/HeapDict-1.0.0.ebuild b/dev-python/HeapDict/HeapDict-1.0.0.ebuild
index bcc1e17ee916..3a4e5471a901 100644
--- a/dev-python/HeapDict/HeapDict-1.0.0.ebuild
+++ b/dev-python/HeapDict/HeapDict-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c87ac27e46c8..749b53e7519b 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 835fb46beca2..9e0dd6899d09 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,3 +1,2 @@
DIST argcomplete-1.4.1.tar.gz 37219 BLAKE2B eff9c8b8a2996d2d57ca99516071a1c831f9e64be4efd72bf930dfe7fb2404db2aa03546e761ae73b5d22f8ebe683728c433ab837eee5c073616e7d32fa32010 SHA512 3e9fa64fca93baf14fddd653947ff0269004e8783de0567931dafb9e4d0dfff2e2450ef6df331a4d648f5ce1d817a422f52d8d30b94315cd54fd82102467ded5
-DIST argcomplete-1.9.2.tar.gz 46445 BLAKE2B a515fb1fdb94a78f02d01c90950bc21ac8000ccd54724e3037fb491097627a0f5de08b281dc13a7b531b4df6598f1aa1d7310932131a5a5a778dc5e5b39020d0 SHA512 174a4f7f1e24944472567c7cf2959b1bf1bf1d57f9c9d36469837f568d9e5db89d7055a2b93ff58e72fa5a78acb498833833a465da2b69bcf09fcfa2ecdad742
DIST argcomplete-1.9.4.tar.gz 47471 BLAKE2B ba64acc1fb2ae336166504db3dd991227c4e2a04abc6909ecf6723c1d2ce82ea65453ca2dde97316da9eaaa5b60026a6c8e4f3d658f1ed8122ca4fd00723fca1 SHA512 831958dffc75c65e2a63918d1e6f5e1fa47ec753b913c978e8d1d30d430ab8fedf66c99d8df23b2abc547b42c27335ccf47811224322994316ca2225c85ce346
diff --git a/dev-python/argcomplete/argcomplete-1.9.2.ebuild b/dev-python/argcomplete/argcomplete-1.9.2.ebuild
deleted file mode 100644
index 57c5338fd7a8..000000000000
--- a/dev-python/argcomplete/argcomplete-1.9.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86 ~arm ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pexpect[${PYTHON_USEDEP}]
- app-shells/tcsh )"
-
-python_test() {
- "${EPYTHON}" test/test.py || die
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- newbashcomp "${S}"/${PN}/bash_completion.d/python-argcomplete.sh python-${PN}
-}
diff --git a/dev-python/argcomplete/argcomplete-1.9.4.ebuild b/dev-python/argcomplete/argcomplete-1.9.4.ebuild
index 8ad059a2c767..03a25240d56c 100644
--- a/dev-python/argcomplete/argcomplete-1.9.4.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.9.4.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
inherit bash-completion-r1 distutils-r1
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~arm ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE="test"
DEPEND="
diff --git a/dev-python/backports-abc/backports-abc-0.5.ebuild b/dev-python/backports-abc/backports-abc-0.5.ebuild
index a94847026e9a..bd95231621e6 100644
--- a/dev-python/backports-abc/backports-abc-0.5.ebuild
+++ b/dev-python/backports-abc/backports-abc-0.5.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy pypy3 )
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
inherit distutils-r1
diff --git a/dev-python/backports-abc/metadata.xml b/dev-python/backports-abc/metadata.xml
index f968a3faa0f9..06d5bc5e40f4 100644
--- a/dev-python/backports-abc/metadata.xml
+++ b/dev-python/backports-abc/metadata.xml
@@ -8,5 +8,6 @@
cython/backports_abc
backports_abc
+ https://github.com/cython/backports_abc/issues
diff --git a/dev-python/bcolz/bcolz-1.1.2.ebuild b/dev-python/bcolz/bcolz-1.1.2.ebuild
index 0e2e061028f4..354447a3501c 100644
--- a/dev-python/bcolz/bcolz-1.1.2.ebuild
+++ b/dev-python/bcolz/bcolz-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RDEPEND="
diff --git a/dev-python/billiard/billiard-3.5.0.2.ebuild b/dev-python/billiard/billiard-3.5.0.2.ebuild
index 038495a8b193..c02f3b17638e 100644
--- a/dev-python/billiard/billiard-3.5.0.2.ebuild
+++ b/dev-python/billiard/billiard-3.5.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc test"
RDEPEND=""
diff --git a/dev-python/blaze/blaze-0.11.3.ebuild b/dev-python/blaze/blaze-0.11.3.ebuild
index 57b775b4bf4b..0eec45f052ee 100644
--- a/dev-python/blaze/blaze-0.11.3.ebuild
+++ b/dev-python/blaze/blaze-0.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/blaze/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index ac079c34c667..446c809173bb 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,3 +1,4 @@
DIST brython-3.5.0.tar.gz 9232597 BLAKE2B a01c01cf0e67589bd58312e05eb56b11b7905c19e2ac62b895d3352ff9aa0eba141a52437ab12a1aec43e63d07714b56822db2aa82bec89b46c2c9f8b0980c45 SHA512 a0ba2e66712fdf41d64fee4f832d1e620a965099cb506660268d43c9ff00c808d853ac7b7373bad9bfc16f3ec7b60066ed6ba28c33d7df151624169b272951cc
DIST brython-3.5.1.tar.gz 9238724 BLAKE2B 88237a237afd65a7a4b66e74fdb38d10adb30a41f86536baf0f66754fe9ba32b4fe96938c2856d8ccaf1edf846b90dda730e5d22dd7372108e8dc3c274926ce5 SHA512 90666cd1ecb82432099da0acbe47f6693aeddd9cb2db939ae98af43560589924d3aac0aef6ed3191ae496c76bbfc5d8a5916917d2ba4b38da422e4d8cffb6013
DIST brython-3.6.0.tar.gz 9310837 BLAKE2B 616874f2a9c303e910a3fd2910aad6ffe360f87e98d009d66e85fd8c05d61c5d96c1a313214c08b69b5d073a23008b23d882a607af0d54f7d2942fcd2b6861ff SHA512 c59cee89634a2439a6fc64d3397966762aa508c6c00d05186138acce25fcf6597230511e30a261217898bca3d86a11eea92516cfe630c5d82cb271603dbecb2c
+DIST brython-3.6.2.tar.gz 9314999 BLAKE2B 809b9367eb42e723aa58dc22f1d1186144258135bf129de6d28be9a3d86f5f039c2c566e897ed6e8b436ee1ddd80ea2950c6053e366e204255877a777bfe68db SHA512 3edc603bb06a3ce5a383f6e86023e3266cf3ccc916c209fcef0ee69b4cb5445aba820034b5ce33b7c828c5a9a50f48c1226bcb69724967ec438c0702558c7641
diff --git a/dev-python/brython/brython-3.6.2.ebuild b/dev-python/brython/brython-3.6.2.ebuild
new file mode 100644
index 000000000000..50f67db89823
--- /dev/null
+++ b/dev-python/brython/brython-3.6.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit webapp python-single-r1
+
+DESCRIPTION="A Python 3 implementation for client-side web programming"
+HOMEPAGE="http://www.brython.info"
+SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+need_httpd_cgi
+
+pkg_setup() {
+ webapp_pkg_setup
+ python-single-r1_pkg_setup
+}
+
+src_install() {
+ dodoc LICENCE.txt README.md
+ rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
+
+ webapp_src_preinst
+
+ insinto "${MY_HTDOCSDIR}"
+ doins -r .
+
+ webapp_src_install
+}
diff --git a/dev-python/celery/celery-4.1.0.ebuild b/dev-python/celery/celery-4.1.0.ebuild
index ba8b5a3c6b87..6ad15fdc11b6 100644
--- a/dev-python/celery/celery-4.1.0.ebuild
+++ b/dev-python/celery/celery-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
# There are a number of other optional 'extras' which overlap with those of kombu, however
# there has been no apparent expression of interest or demand by users for them. See requires.txt
IUSE="doc examples redis sqs test yaml"
diff --git a/dev-python/curtsies/curtsies-0.2.11.ebuild b/dev-python/curtsies/curtsies-0.2.11.ebuild
index b6c030de8ddd..6f3815890e74 100644
--- a/dev-python/curtsies/curtsies-0.2.11.ebuild
+++ b/dev-python/curtsies/curtsies-0.2.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/dask/dask-0.15.1.ebuild b/dev-python/dask/dask-0.15.1.ebuild
index bb208eb98ad4..098f9d7aef78 100644
--- a/dev-python/dask/dask-0.15.1.ebuild
+++ b/dev-python/dask/dask-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="distributed test"
RDEPEND="
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index fa95a6cbd62b..af72c42e2da1 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,2 +1,2 @@
-DIST denonavr-0.6.1.tar.gz 59624 BLAKE2B 01d1b63e3d59847608bf7dbe68d60007f1d698711acab92768260f93b3d7ea9992568a08a5d01b0eff749002293ea6ba700ddf4341727207df6373a23605802f SHA512 c5ed772b5846210cd71f82597a3b1739f0949807c7deb09f3404adfccf1b5ced1330bb6c0327a9a6e7863822692cdc8215111814170990c85df939794814a9f1
DIST denonavr-0.7.2.tar.gz 61673 BLAKE2B 98de89e385f51d6a13e1b365074a8bed7303fb4e666c608f547f9f515924539d6f54349483f4a78ed8968295cb1c3196e8713c05f1e10aca7ad290f6114bb29c SHA512 941f8133e19c41df9525f4a9c705ce4dc7a35eef493fa465df52a50fb752f6d23818c7046b7e8281af58b285f65b983bead1c77f49c61fd47743984a4a3f6a4a
+DIST denonavr-0.7.3.tar.gz 61735 BLAKE2B 5a6a8fab2f416cb34ac3078cc65fa92342de81a21f1710f6460fb00c1d255d7a5e208d3d9f9904c063004456e6e3447a08c677b95fc216bab1153060bafa8dd2 SHA512 51d559bf0db1ca9fcd6239046d2c2a149ac22e99aec331f10c7c6d59b2c9290aa66477093f4e707caf24f9ff78572659c3ffe2c9d508a28b344a1838e8cdee5d
diff --git a/dev-python/denonavr/denonavr-0.6.1.ebuild b/dev-python/denonavr/denonavr-0.7.3.ebuild
similarity index 93%
rename from dev-python/denonavr/denonavr-0.6.1.ebuild
rename to dev-python/denonavr/denonavr-0.7.3.ebuild
index 3fdaf698fada..f5b4967262a1 100644
--- a/dev-python/denonavr/denonavr-0.6.1.ebuild
+++ b/dev-python/denonavr/denonavr-0.7.3.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python3_{4,5,6} )
PYTHON_REQ_USE="xml(+)"
inherit distutils-r1
@@ -21,10 +21,10 @@ RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
test? (
+ ${RDEPEND}
dev-python/pytest[${PYTHON_USEDEP}]
dev-python/requests-mock[${PYTHON_USEDEP}]
dev-python/testtools[${PYTHON_USEDEP}]
- ${RDEPEND}
)
"
diff --git a/dev-python/distributed/distributed-1.18.0.ebuild b/dev-python/distributed/distributed-1.18.0.ebuild
index 6c0ea4f46e0f..2c1255fb1e2d 100644
--- a/dev-python/distributed/distributed-1.18.0.ebuild
+++ b/dev-python/distributed/distributed-1.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild
index 2099e048d670..5ab67d6e6f40 100644
--- a/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild
+++ b/dev-python/editorconfig-core-py/editorconfig-core-py-0.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
inherit distutils-r1
DESCRIPTION="Clone of EditorConfig core written in Python"
-HOMEPAGE="http://editorconfig.org/"
+HOMEPAGE="https://editorconfig.org/"
SRC_URI="https://github.com/${PN%-core-py}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
test? (
https://github.com/${PN%-core-py}/${PN%-core-py}-core-test/archive/${TESTVER}.tar.gz -> ${PN%-core-py}-core-test-${TESTVER}.tar.gz
diff --git a/dev-python/flask-appconfig/flask-appconfig-0.11.1.ebuild b/dev-python/flask-appconfig/flask-appconfig-0.11.1.ebuild
deleted file mode 100644
index c543bd77e196..000000000000
--- a/dev-python/flask-appconfig/flask-appconfig-0.11.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-DESCRIPTION="Configures Flask applications in a canonical way"
-HOMEPAGE="https://github.com/mbr/flask-appconfig"
-# PyPI tarballs don't include tests
-# https://github.com/mbr/flask-appconfig/pull/4
-SRC_URI="https://github.com/mbr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-RDEPEND="
- dev-python/click[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- dev-python/pytest[${PYTHON_USEDEP}]
- ${RDEPEND}
- )
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-"
-
-python_prepare_all() {
- sed -i "s/, 'sphinx.ext.intersphinx'//" docs/conf.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- py.test || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/flexx/flexx-0.4.1.ebuild b/dev-python/flexx/flexx-0.4.1.ebuild
index 53e6c78f0fc2..2f27036efa8c 100644
--- a/dev-python/flexx/flexx-0.4.1.ebuild
+++ b/dev-python/flexx/flexx-0.4.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/zoofIO//${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
#IUSE="doc test" broken tests
IUSE=""
diff --git a/dev-python/html2text/html2text-2018.1.9.ebuild b/dev-python/html2text/html2text-2018.1.9.ebuild
index 5bb615018eeb..af6a64977547 100644
--- a/dev-python/html2text/html2text-2018.1.9.ebuild
+++ b/dev-python/html2text/html2text-2018.1.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Alir3z4/${PN}/archive/${PV}.tar.gz -> ${P}-1.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~sparc ~x86"
CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${CDEPEND}
diff --git a/dev-python/irc/Manifest b/dev-python/irc/Manifest
index 8b4d763aa12b..3a36658a3355 100644
--- a/dev-python/irc/Manifest
+++ b/dev-python/irc/Manifest
@@ -1 +1,2 @@
DIST irc-15.0.6.tar.gz 81996 BLAKE2B b5d329b70404a92d4f69cc3fef2be374b0a1e98e04588b7f2f7f7c241dc3d72122f813b67e48522b7779dfdf90478db6ff10cda3c66b621f7c4a099142d533f0 SHA512 48240eb496a3c88310f02cf092b8e19e4aa8d8dc165a9a8a39c313490a69ecc29ac67db297436df5e86e7253e2481bd19bc0429ea9cc359089a5cd6179125c0f
+DIST irc-16.3.tar.gz 87067 BLAKE2B 61d8b9cc20390a3eb918e5593a167b28f37154ee05cb4d7a72f8901509d3345e8d6bee9c17b66aa6c71fad4608a9f98eb3848190f82eac7db6f2013227979c25 SHA512 84b5a56a441cdf22396c10b81c115cb2e297ac082785e9baf0bc73d655034be1ff3f553d44412f066ab4b74530faddb66a9cc2f511a332e87fe49af0b6e68e5b
diff --git a/dev-python/irc/irc-16.3.ebuild b/dev-python/irc/irc-16.3.ebuild
new file mode 100644
index 000000000000..a588afd852e2
--- /dev/null
+++ b/dev-python/irc/irc-16.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+DESCRIPTION="IRC client framework written in Python"
+HOMEPAGE="https://github.com/jaraco/irc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND="
+ >=dev-python/jaraco-functools-1.5[${PYTHON_USEDEP}]
+ >=dev-python/jaraco-itertools-1.8[${PYTHON_USEDEP}]
+ >=dev-python/tempora-1.6[${PYTHON_USEDEP}]
+ dev-python/jaraco-collections[${PYTHON_USEDEP}]
+ dev-python/jaraco-logging[${PYTHON_USEDEP}]
+ dev-python/jaraco-stream[${PYTHON_USEDEP}]
+ dev-python/jaraco-text[${PYTHON_USEDEP}]
+ dev-python/more-itertools[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+ test? (
+ ${RDEPEND}
+ dev-python/backports-unittest-mock[${PYTHON_USEDEP}]
+ >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+ )
+ doc? (
+ >=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+ >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ )
+"
+
+python_compile_all() {
+ if use doc; then
+ cd docs || die
+ sphinx-build . _build/html || die
+ HTML_DOCS=( docs/_build/html/. )
+ fi
+}
+
+python_test() {
+ # Override pytest options to skip flake8
+ py.test --override-ini="addopts=--doctest-modules" \
+ || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ if use examples; then
+ docompress -x "/usr/share/doc/${PF}/scripts"
+ dodoc -r scripts
+ fi
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 53301f91774e..d5ab850f99f8 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,2 +1,2 @@
-DIST jaraco.collections-1.4.1.tar.gz 10456 BLAKE2B 1e07163a7f98d7ace5ee62a83ac2184ecdca01671882b381bc2b60d816df70d329a6adebe21adc7de75e0ec0ffde5891dd33f84d1ed322feffe374e8f11e979d SHA512 1f9eca787efb427a73b5f03e144a2a95e5740580e21e9857a376d76dd35f39066c3a06056eaf78f72de2f97e4fc70805467fcc516f989ba4785e3f3d9354a538
+DIST jaraco.collections-1.5.3.tar.gz 11669 BLAKE2B 2dbcac99edf28f4544e354724f8d95c0cbcdd793b33bcf892b403e72410f3b5b72b6eae62a49f0e56991cfb19b4ad5da0e95a3327f11fe5ae885e9a0029a92be SHA512 6e1fa88b468b9d971a7a302ebfdf8b9762404c2fdc1b003eee6653704b9f385f0f2e0c84ac075bdc81f8693195781cc5532c4adb31bcabd87974624a14e287ed
DIST jaraco.collections-1.5.tar.gz 10615 BLAKE2B 4331a1df4a1232817e5bde97ce22b019ecb50711c0f4dfd18d050233b820a51c420719ff2a0d013e60da4710a63ab34293ee15f091b86392ec0d5e36e8262880 SHA512 7e2d3849d26422d687cfeb560f8096fb099a9c7b99b3061a06f9ad7037c3805b577754f62e5d5ead3f6f89bcd7dbf574df2844aa3c28928941ea2c99d50fc161
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.4.1.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.4.1.ebuild
deleted file mode 100644
index d4d9d45a02f9..000000000000
--- a/dev-python/jaraco-collections/jaraco-collections-1.4.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Models and classes to supplement the stdlib collections module"
-HOMEPAGE="https://github.com/jaraco/jaraco.collections"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/jaraco-classes[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/rst-linker[${PYTHON_USEDEP}]
- )
- test? (
- ${RDEPEND}
- >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
- if use test && ! has_version "dev-python/jaraco-text"; then
- die "Ensure dev-python/jaraco-text is installed or the" \
- "test suite will fail"
- fi
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && esetup.py build_sphinx
-}
-
-python_test() {
- PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/jaraco-collections/jaraco-collections-1.5.3.ebuild b/dev-python/jaraco-collections/jaraco-collections-1.5.3.ebuild
new file mode 100644
index 000000000000..eb33644bab54
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-1.5.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+PDEPEND="dev-python/jaraco-text[${PYTHON_USEDEP}]"
+RDEPEND="
+ dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+ dev-python/jaraco-classes[${PYTHON_USEDEP}]
+ >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+ doc? (
+ >=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+ >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${PDEPEND}
+ ${RDEPEND}
+ >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+ )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+ if use doc; then
+ sphinx-build docs docs/_build/html || die
+ HTML_DOCS=( docs/_build/html/. )
+ fi
+}
+
+python_test() {
+ # Override pytest options to skip flake8
+ PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+ || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/jaraco-itertools/Manifest b/dev-python/jaraco-itertools/Manifest
index 8364b08b00eb..f3b328c7dea2 100644
--- a/dev-python/jaraco-itertools/Manifest
+++ b/dev-python/jaraco-itertools/Manifest
@@ -1,2 +1,2 @@
-DIST jaraco.itertools-1.7.1.tar.gz 10224 BLAKE2B 11f22156736f283604d75aaf48975a483be972ac3b1feabead224c4a323575c3978429638ada7c82037f9cbf9ce3a966a535acbdffdfdf880ebb8db152506cf4 SHA512 e149de3368137db4379d02858be0cbb3b6dc1e81cc06eb0f53064a55c8e25fb09b2b4387035dda29928bdf54e22d28c9d9744dfbd82a6cf4e4c90b5d42b31dfb
DIST jaraco.itertools-2.0.tar.gz 11158 BLAKE2B 4fe42711819e5aca6a8995037ba05f4858e14cb55ed0fc2d54d805e00b5c12229cb2148d515179e4b7c14cdfe64e4162b1891481b0906fb96d832c155af758a3 SHA512 56877e141da1c79499dee2e3cfd15a81f07d6cf6fa1ee88f4ae387423d91106f41c1787fecc194755fddc521d6284763cba93083904e67d548c053d1584a4438
+DIST jaraco.itertools-2.3.tar.gz 12857 BLAKE2B 714b123965af3ff593205aab373f3097709729377cd867ca2a7ccbb7795b1818f47b0b316d4c927c9aec4eb66fe1da63b44c1d60db310dd97b5444b01f7db04d SHA512 070a442531fd079fefcb61bbbdb0cc98bc88cbc5f23f6cb40ee1fafbc9a259c69e0a373e949ab54d22836f54b0de41e1b09d10692f92d18030825ca09345be48
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-1.7.1.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-1.7.1.ebuild
deleted file mode 100644
index 885d69ea24af..000000000000
--- a/dev-python/jaraco-itertools/jaraco-itertools-1.7.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Additional functions used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]
-dev-python/inflect[${PYTHON_USEDEP}]
-dev-python/more-itertools[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_prepare_all() {
- if use test && has_version "${CATEGORY}/${PN}"; then
- die "Ensure $PN is not already installed or the test suite will fail"
- fi
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-2.0.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-2.0.ebuild
index 7c1d7c48359e..e75c202a52be 100644
--- a/dev-python/jaraco-itertools/jaraco-itertools-2.0.ebuild
+++ b/dev-python/jaraco-itertools/jaraco-itertools-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
inherit distutils-r1
MY_PN="${PN/-/.}"
-DESCRIPTION="Additional functions used by other projects by developer jaraco"
+DESCRIPTION="Tools for working with iterables. Complements itertools and more_itertools"
HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
diff --git a/dev-python/jaraco-itertools/jaraco-itertools-2.3.ebuild b/dev-python/jaraco-itertools/jaraco-itertools-2.3.ebuild
new file mode 100644
index 000000000000..ab4fb4f433c2
--- /dev/null
+++ b/dev-python/jaraco-itertools/jaraco-itertools-2.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Tests fail with PyPy and PyPy 3
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Tools for working with iterables. Complements itertools and more_itertools"
+HOMEPAGE="https://github.com/jaraco/jaraco.itertools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RDEPEND="
+ dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/inflect[${PYTHON_USEDEP}]
+ >=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/rst-linker[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${RDEPEND}
+ >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+ )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+ if use doc; then
+ sphinx-build docs docs/_build/html || die
+ HTML_DOCS=( docs/_build/html/. )
+ fi
+}
+
+python_test() {
+ # Override pytest options to skip flake8
+ PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+ || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild b/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild
index 8cc0be38d7f0..42a1867a0bc0 100644
--- a/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild
+++ b/dev-python/jaraco-logging/jaraco-logging-1.5.2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy{,3} )
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
inherit distutils-r1
@@ -24,7 +24,7 @@ RDEPEND="
"
DEPEND="
dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
+ >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
doc? (
>=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index c8df7b2fb869..0a0014b4bc2f 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,2 +1,2 @@
-DIST jaraco.text-1.7.tar.gz 7020 BLAKE2B 33b17223cfcbc07c096803c7be698458d72f869399161476b718904cf4ceafe1178bbf8cd71cd8c229efafcc234fbdaa751c9ef72f01cd4ab6c4333c91c1c340 SHA512 b1418dc19b52e353da3b2a332ffbc9a4201c6696ecc962722e25fd6549c8748a9dbea2cf76f658111aa4e3fd411ee999b526fa4d8148259866dbe95ebc4cfa95
+DIST jaraco.text-1.10.1.tar.gz 8790 BLAKE2B 268c13a9a84c4b29ac9141d8a43c716d8248b87c2b71f6bb8a34c2cf1568acdd012e84b1be0469f70ee8e102f723e218b6d551a9bd0cab5192a28d712ed39f03 SHA512 5c09b90f586d5ddf7419013f7e36814598337c257e6bd1c1eec993d7df021440798ec9300a6d45c960c5458c4197b458d1863f478b60a9a003241e98a644f28e
DIST jaraco.text-1.8.tar.gz 7364 BLAKE2B 60e3ce561ca5c6dca3093a51f8397e925279882ee5b1c02e5359b518f2344481f3d86a927fbd1c7fc903e3207c46cd052a6efbcfac693debce721884188ab87a SHA512 7f13eee9553d7531bf2f51af1b1c7fbb9d778cf082e6eb49948fc0943b7eb5a0268ec51b363ae9e96df854e0af5e38fbc4a679c746160e422759c044d4a33654
diff --git a/dev-python/jaraco-text/jaraco-text-1.10.1.ebuild b/dev-python/jaraco-text/jaraco-text-1.10.1.ebuild
new file mode 100644
index 000000000000..1e7cd931da37
--- /dev/null
+++ b/dev-python/jaraco-text/jaraco-text-1.10.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Text utilities used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.text"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+PDEPEND="dev-python/jaraco-collections[${PYTHON_USEDEP}]"
+RDEPEND="
+ dev-python/jaraco-functools[${PYTHON_USEDEP}]
+ dev-python/namespace-jaraco[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ >=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+ doc? (
+ >=dev-python/jaraco-packaging-3.2[${PYTHON_USEDEP}]
+ >=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${PDEPEND}
+ ${RDEPEND}
+ >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
+ )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_compile_all() {
+ if use doc; then
+ sphinx-build docs docs/_build/html || die
+ HTML_DOCS=( docs/_build/html/. )
+ fi
+}
+
+python_test() {
+ # Override pytest options to skip flake8
+ PYTHONPATH=. py.test --override-ini="addopts=--doctest-modules" \
+ || die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+ find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/jaraco-text/jaraco-text-1.7.ebuild b/dev-python/jaraco-text/jaraco-text-1.7.ebuild
deleted file mode 100644
index 2c1db8dfdd7e..000000000000
--- a/dev-python/jaraco-text/jaraco-text-1.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Text utilities used by other projects by developer jaraco"
-HOMEPAGE="https://github.com/jaraco/jaraco.text"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-PDEPEND="dev-python/jaraco-collections[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/jaraco-functools[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/setuptools_scm-1.9[${PYTHON_USEDEP}]
- doc? (
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/rst-linker[${PYTHON_USEDEP}]
- )
- test? (
- ${RDEPEND}
- >=dev-python/pytest-2.8[${PYTHON_USEDEP}]
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
- use doc && esetup.py build_sphinx
-}
-
-python_test() {
- PYTHONPATH=. py.test || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/jaraco-text/metadata.xml b/dev-python/jaraco-text/metadata.xml
index b584b408c0e2..97eb016b7480 100644
--- a/dev-python/jaraco-text/metadata.xml
+++ b/dev-python/jaraco-text/metadata.xml
@@ -9,5 +9,6 @@
jaraco.text
jaraco/jaraco.text
https://github.com/jaraco/jaraco.text/issues
+ https://github.com/jaraco/jaraco.text/blob/master/CHANGES.rst
diff --git a/dev-python/libcloud/libcloud-2.3.0.ebuild b/dev-python/libcloud/libcloud-2.3.0.ebuild
index 642cd7ab92f0..c0867071868e 100644
--- a/dev-python/libcloud/libcloud-2.3.0.ebuild
+++ b/dev-python/libcloud/libcloud-2.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/${PN}/apache-${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="examples test"
RDEPEND=""
diff --git a/dev-python/lmdb/lmdb-0.92.ebuild b/dev-python/lmdb/lmdb-0.92.ebuild
index 3e152d59d2f9..1fe97c27f8f4 100644
--- a/dev-python/lmdb/lmdb-0.92.ebuild
+++ b/dev-python/lmdb/lmdb-0.92.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="OPENLDAP"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="dev-db/lmdb:="
diff --git a/dev-python/meld3/meld3-1.0.2-r2.ebuild b/dev-python/meld3/meld3-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..d5e4e2b76ad6
--- /dev/null
+++ b/dev-python/meld3/meld3-1.0.2-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6}} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="meld3 is an HTML/XML templating engine"
+HOMEPAGE="https://github.com/supervisor/meld3 https://pypi.org/project/meld3/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/multidict/multidict-4.1.0.ebuild b/dev-python/multidict/multidict-4.1.0.ebuild
index 02df4b8087a8..906dc6b8e701 100644
--- a/dev-python/multidict/multidict-4.1.0.ebuild
+++ b/dev-python/multidict/multidict-4.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc test"
DEPEND="
diff --git a/dev-python/numba/numba-0.37.0.ebuild b/dev-python/numba/numba-0.37.0.ebuild
index bfd87aa9847b..0ef12bbab440 100644
--- a/dev-python/numba/numba-0.37.0.ebuild
+++ b/dev-python/numba/numba-0.37.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
RDEPEND="
diff --git a/dev-python/objgraph/objgraph-1.7.2.ebuild b/dev-python/objgraph/objgraph-1.7.2.ebuild
index 72f432f7209f..90fdb9d51925 100644
--- a/dev-python/objgraph/objgraph-1.7.2.ebuild
+++ b/dev-python/objgraph/objgraph-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Draws Python object reference graphs with graphviz"
-HOMEPAGE="http://mg.pov.lt/objgraph/"
+HOMEPAGE="https://mg.pov.lt/objgraph/"
SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/objgraph/objgraph-1.8.1.ebuild b/dev-python/objgraph/objgraph-1.8.1.ebuild
index 44d0b197b22f..90fdb9d51925 100644
--- a/dev-python/objgraph/objgraph-1.8.1.ebuild
+++ b/dev-python/objgraph/objgraph-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
DESCRIPTION="Draws Python object reference graphs with graphviz"
-HOMEPAGE="http://mg.pov.lt/objgraph/"
+HOMEPAGE="https://mg.pov.lt/objgraph/"
SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/objgraph/objgraph-3.1.0.ebuild b/dev-python/objgraph/objgraph-3.1.0.ebuild
index df22cf88af4e..c3a25b2db0ff 100644
--- a/dev-python/objgraph/objgraph-3.1.0.ebuild
+++ b/dev-python/objgraph/objgraph-3.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
inherit distutils-r1
DESCRIPTION="Draws Python object reference graphs with graphviz"
-HOMEPAGE="http://mg.pov.lt/objgraph/"
+HOMEPAGE="https://mg.pov.lt/objgraph/"
SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
LICENSE="MIT"
diff --git a/dev-python/odo/odo-0.5.0-r1.ebuild b/dev-python/odo/odo-0.5.0-r1.ebuild
index e35895d90669..4b747366ab18 100644
--- a/dev-python/odo/odo-0.5.0-r1.ebuild
+++ b/dev-python/odo/odo-0.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc"
RDEPEND="
diff --git a/dev-python/partd/partd-0.3.8.ebuild b/dev-python/partd/partd-0.3.8.ebuild
index 5f0935f33f87..4bd9e33998ed 100644
--- a/dev-python/partd/partd-0.3.8.ebuild
+++ b/dev-python/partd/partd-0.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RDEPEND="dev-python/locket[${PYTHON_USEDEP}]"
diff --git a/dev-python/peewee/peewee-3.1.0.ebuild b/dev-python/peewee/peewee-3.1.0.ebuild
index 2a0505fdaa22..0bc936d97a44 100644
--- a/dev-python/peewee/peewee-3.1.0.ebuild
+++ b/dev-python/peewee/peewee-3.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc examples"
DEPEND="dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/pid/pid-2.2.0.ebuild b/dev-python/pid/pid-2.2.0.ebuild
index c8a0972a69eb..31548e434889 100644
--- a/dev-python/pid/pid-2.2.0.ebuild
+++ b/dev-python/pid/pid-2.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="Apache-2.0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="test"
DEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/ptpython/ptpython-0.33-r1.ebuild b/dev-python/ptpython/ptpython-0.33-r1.ebuild
index f27a8e8028d8..72e732eec88a 100644
--- a/dev-python/ptpython/ptpython-0.33-r1.ebuild
+++ b/dev-python/ptpython/ptpython-0.33-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/dev-python/py/py-1.4.34.ebuild b/dev-python/py/py-1.4.34.ebuild
index bbc768ed1693..74b00a108596 100644
--- a/dev-python/py/py-1.4.34.ebuild
+++ b/dev-python/py/py-1.4.34.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+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"
IUSE="doc test"
RDEPEND=""
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
index 785da1a4fb6b..47b5397eba2c 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-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"
IUSE="doc examples ssl test"
RDEPEND="
diff --git a/dev-python/pygal/pygal-2.4.0.ebuild b/dev-python/pygal/pygal-2.4.0.ebuild
index cb453601e913..17ea7a3d5c38 100644
--- a/dev-python/pygal/pygal-2.4.0.ebuild
+++ b/dev-python/pygal/pygal-2.4.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/Kozea/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc examples test"
RDEPEND="
diff --git a/dev-python/pygame/pygame-1.9.3.ebuild b/dev-python/pygame/pygame-1.9.3.ebuild
index ceab1f93675a..8e93d6830dd7 100644
--- a/dev-python/pygame/pygame-1.9.3.ebuild
+++ b/dev-python/pygame/pygame-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
IUSE="doc examples midi X"
DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
diff --git a/dev-python/pyodbc/pyodbc-4.0.16.ebuild b/dev-python/pyodbc/pyodbc-4.0.16.ebuild
index 88343266e081..e2b470cf3986 100644
--- a/dev-python/pyodbc/pyodbc-4.0.16.ebuild
+++ b/dev-python/pyodbc/pyodbc-4.0.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="mssql"
RDEPEND=">=dev-db/unixODBC-2.3.0
diff --git a/dev-python/pyte/pyte-0.5.2-r2.ebuild b/dev-python/pyte/pyte-0.5.2-r2.ebuild
index 03bb80f7d558..c2d93cf6cf7f 100644
--- a/dev-python/pyte/pyte-0.5.2-r2.ebuild
+++ b/dev-python/pyte/pyte-0.5.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="dev-python/wcwidth[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
index 9b3b4e5aaa9d..9aef7a752f58 100644
--- a/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86"
IUSE="doc test"
RDEPEND="
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
index 8b25c64118ca..a6f5d0112692 100644
--- a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
IUSE="doc test"
RDEPEND="
diff --git a/dev-python/python-axolotl-curve25519/Manifest b/dev-python/python-axolotl-curve25519/Manifest
new file mode 100644
index 000000000000..d678c06615a3
--- /dev/null
+++ b/dev-python/python-axolotl-curve25519/Manifest
@@ -0,0 +1 @@
+DIST python-axolotl-curve25519-0.4.1-2.tar.gz 100957 BLAKE2B cda4fb7ad7c78df7465a952e2b5f3c6616849876bc1c8b72dde08042a655c2b86233329d311f6bee1bfc6d2b32926968aafc7e6204320209c2c1bd008f1aa361 SHA512 cbc7c6caa47a9a811640c247a1be727d7b1b68bcdb4c5336e02b4d1eaf9fd2c57b7438b0da466a379a1c0f3f146756b9b7eea3c9b7945ce88478d4bf0b8a1e0d
diff --git a/dev-python/python-axolotl-curve25519/metadata.xml b/dev-python/python-axolotl-curve25519/metadata.xml
new file mode 100644
index 000000000000..0d550cd85953
--- /dev/null
+++ b/dev-python/python-axolotl-curve25519/metadata.xml
@@ -0,0 +1,24 @@
+
+
+
+
+ hanno@gentoo.org
+
+
+ ck+gentoo@bl4ckb0x.de
+ Conrad Kostecki
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ This is a python wrapper for the curve25519 library with ed25519 signatures.
+ The C code was pulled from libaxolotl-android.
+ At the moment this wrapper is meant for use by dev-python/python-axolotl.
+
+
+ https://github.com/tgalal/python-axolotl-curve25519/issues
+ tgalal/python-axolotl-curve25519
+
+
diff --git a/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2.ebuild b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2.ebuild
new file mode 100644
index 000000000000..46d50ec426bc
--- /dev/null
+++ b/dev-python/python-axolotl-curve25519/python-axolotl-curve25519-0.4.1_p2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+MY_PV="${PV/_p/-}"
+
+DESCRIPTION="A python wrapper for the curve25519 library with ed25519 signatures"
+HOMEPAGE="https://github.com/tgalal/python-axolotl-curve25519"
+SRC_URI="https://github.com/tgalal/${PN}/archive/${MY_PV}.tar.gz -> ${PN}-${MY_PV}.tar.gz"
+
+LICENSE="BSD GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-python/python-axolotl/Manifest b/dev-python/python-axolotl/Manifest
new file mode 100644
index 000000000000..f4ad7a3bc3c9
--- /dev/null
+++ b/dev-python/python-axolotl/Manifest
@@ -0,0 +1 @@
+DIST python-axolotl-0.1.42.tar.gz 53869 BLAKE2B 045d19b38478404b19717daee431a4fc36d187dc511d42ee950b37ef257d98aaee8ba42633888d596265c0d64bfc33f2da9307d45feb4189ec04c03d69687108 SHA512 db9e1cfab87d690619a672b1782942a18b12b17af555959c17bcc3e2581e9c689c57becc0ea884a1129df9dace17684ba03de38b81f8c8c65cab27962ebdb6c5
diff --git a/dev-python/python-axolotl/metadata.xml b/dev-python/python-axolotl/metadata.xml
new file mode 100644
index 000000000000..7f774de79b24
--- /dev/null
+++ b/dev-python/python-axolotl/metadata.xml
@@ -0,0 +1,23 @@
+
+
+
+
+ hanno@gentoo.org
+
+
+ ck+gentoo@bl4ckb0x.de
+ Conrad Kostecki
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ This is a python port of libsignal-protocol-java
+ originally written by Moxie Marlinspike.
+
+
+ https://github.com/tgalal/python-axolotl/issues
+ tgalal/python-axolotl
+
+
diff --git a/dev-python/python-axolotl/python-axolotl-0.1.42.ebuild b/dev-python/python-axolotl/python-axolotl-0.1.42.ebuild
new file mode 100644
index 000000000000..b36e154d501b
--- /dev/null
+++ b/dev-python/python-axolotl/python-axolotl-0.1.42.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python module for the axolotl protocol"
+HOMEPAGE="https://github.com/tgalal/python-axolotl"
+SRC_URI="https://github.com/tgalal/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/protobuf-python[${PYTHON_USEDEP}]
+ dev-python/python-axolotl-curve25519[${PYTHON_USEDEP}]"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${RDEPEND}"
+
+python_test() {
+ esetup.py test
+}
diff --git a/dev-python/python-debian/python-debian-0.1.31.ebuild b/dev-python/python-debian/python-debian-0.1.31.ebuild
index d563a839202d..c40b36f322af 100644
--- a/dev-python/python-debian/python-debian-0.1.31.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -13,7 +13,7 @@ SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
LICENSE="GPL-2 GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/python-magic/python-magic-0.4.15.ebuild b/dev-python/python-magic/python-magic-0.4.15.ebuild
index 19c5d2b4c73d..273194ce5e40 100644
--- a/dev-python/python-magic/python-magic-0.4.15.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
+KEYWORDS="amd64 ~hppa ~ia64 ~x86"
IUSE=""
RDEPEND="sys-apps/file[-python]"
diff --git a/dev-python/s3fs/s3fs-0.1.2.ebuild b/dev-python/s3fs/s3fs-0.1.2.ebuild
index 89fdf050793f..08cb5d147ece 100644
--- a/dev-python/s3fs/s3fs-0.1.2.ebuild
+++ b/dev-python/s3fs/s3fs-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="dev-python/boto3[${PYTHON_USEDEP}]"
diff --git a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild b/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
index a000cde4c13a..f222468d6148 100644
--- a/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
+++ b/dev-python/sortedcollections/sortedcollections-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
index 9a090c9d00a5..8721c79bd738 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
IUSE=""
DEPEND=""
diff --git a/dev-python/sphinx/sphinx-1.6.5.ebuild b/dev-python/sphinx/sphinx-1.6.5.ebuild
index 7e33ec6a6ee2..340cc9bfdfef 100644
--- a/dev-python/sphinx/sphinx-1.6.5.ebuild
+++ b/dev-python/sphinx/sphinx-1.6.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
IUSE="doc latex net test"
RDEPEND="
diff --git a/dev-python/sphinx/sphinx-1.7.5.ebuild b/dev-python/sphinx/sphinx-1.7.5.ebuild
index 328f321d8296..e9a69465dfe3 100644
--- a/dev-python/sphinx/sphinx-1.7.5.ebuild
+++ b/dev-python/sphinx/sphinx-1.7.5.ebuild
@@ -82,8 +82,8 @@ python_compile() {
python_compile_all() {
if use doc; then
- emake -C doc SPHINXBUILD='"${EPYTHON}" "${S}/sphinx-build.py"' html
- HTML_DOCS=( doc/_build/html/. )
+ esetup.py build_sphinx
+ HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
fi
}
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild
index 26c570b6344e..3a96759fffa9 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
diff --git a/dev-python/tblib/tblib-1.3.2.ebuild b/dev-python/tblib/tblib-1.3.2.ebuild
index 77617dd47020..42354d8d885e 100644
--- a/dev-python/tblib/tblib-1.3.2.ebuild
+++ b/dev-python/tblib/tblib-1.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-python/vcrpy/vcrpy-1.11.1.ebuild b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
index 0bc4604553ed..4a679725f4f3 100644
--- a/dev-python/vcrpy/vcrpy-1.11.1.ebuild
+++ b/dev-python/vcrpy/vcrpy-1.11.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
index 415122d4455a..ccd074ebd906 100644
--- a/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
+++ b/dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/v/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd"
IUSE="test"
DEPEND="
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
index 32ffca254a26..2df8322f07d7 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.8.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
# testsuite doesn't work out of the box. Demand of a virtualenv outstrips setup by the eclass
diff --git a/dev-python/webassets/webassets-0.12.1.ebuild b/dev-python/webassets/webassets-0.12.1.ebuild
index ccd9940ca276..7bfe8e9f0d8a 100644
--- a/dev-python/webassets/webassets-0.12.1.ebuild
+++ b/dev-python/webassets/webassets-0.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/miracle2k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
# ^^ pypi tarball is missing tests
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
RDEPEND=""
diff --git a/dev-python/ws4py/ws4py-0.5.1.ebuild b/dev-python/ws4py/ws4py-0.5.1.ebuild
index b8797e5d4151..54b81d3c3df9 100644
--- a/dev-python/ws4py/ws4py-0.5.1.ebuild
+++ b/dev-python/ws4py/ws4py-0.5.1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then
else
inherit vcs-snapshot
SRC_URI="https://github.com/Lawouach/WebSocket-for-Python/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~x86"
+ KEYWORDS="amd64 ~arm ~x86"
fi
DESCRIPTION="WebSocket client and server library for Python 2 and 3 as well as PyPy"
diff --git a/dev-python/yapsy/yapsy-1.11.223-r2.ebuild b/dev-python/yapsy/yapsy-1.11.223-r2.ebuild
index 62cd725684e6..2764cd331629 100644
--- a/dev-python/yapsy/yapsy-1.11.223-r2.ebuild
+++ b/dev-python/yapsy/yapsy-1.11.223-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/yapsy/${MY_P}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="doc"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index d6bbc3fef533..6819aa58539c 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,6 +1,3 @@
-DIST yarl-0.10.2.tar.gz 127679 BLAKE2B 427d79ba52d81fdf45f9fdb5c6d9732101b5f7868c630ccfc290eca4522d14b08be22d2c6dae588a207ea046cd50b7ba2838c02d6222425b2c0527a5d7d1ad7b SHA512 b385a4165b7d095e4d6e2ec5c808c6536e044fb7750000d917370ca4ca66162ed60b142e33eedb02f608bd8b005f6d1f18304992fe00702ea30dd746a0ad9a88
-DIST yarl-0.10.3.tar.gz 127867 BLAKE2B 6e20500e51a083f20f12bb4ea95611953ea01c56b80ffd5f8127fc905f6cf5a5b94b6dd2a756cd196573e619b159bf74e640f6f783f74df35adc73750f96a4ee SHA512 61df025fb906ecd95b8360bda224801baac5268215f6957837415cfe56a64c90e29bcd0b6a2dd7f253d1142643058301d362952cd3c8f8dd5f5a78a2da413177
-DIST yarl-0.14.1.tar.gz 134863 BLAKE2B 7295b746948c78f174975f2862e481fea0c11b7a292ce59552c17eccc02de7e7b8f3063dd3cea1e5d79b5bd270afa5859c9ae645c2de0fa2a66b52262748febb SHA512 d48292616058731bebb9370f23a892072afbbe8c3c720d920c7b9bb1554d91b02d2c9669662bcff0c1efdc7d519145e214a1440622c03e05c7a9b910d69d69da
DIST yarl-0.9.8.tar.gz 125806 BLAKE2B 983ccd2516ad00e89b75cb94a2237ea85325947d8fdfd7978b08addba08566b205b5c2a2863fb9943343857b976981b0b5735fe35b2c88f77d6178faa0d814d5 SHA512 67446ca618a2539f8c1fc8a7a96d1ce50a924ece0479e01103347f73a7bd75b0fbdd0ff5c007529195c3f12aa62d185563e761557fcb95b3226eaece65c0be9f
DIST yarl-1.1.1.tar.gz 156284 BLAKE2B d070b0ea5cb06ef78f850a130d3292e66f592fd46ccf671cfe51f93c0e419a599f42f6a7255e3eb0f15ba96b1ac0cdcd0bce4deff81da6e5dcc25f7a8136bd78 SHA512 fe53e24401e91994d04fd7274200f92168bb08d78c460b49e800646a3e4611f6baefca4ede5b2b6727f2e6e4cd51296ca834305c0e2fb377ac3a928463f995cd
DIST yarl-1.2.4.tar.gz 159570 BLAKE2B 2214917d01ba8f7ba4ea66e28711bcf2549fb1016be9da49147788d61a51168bc81b209ee1466482c93a8fddb4bec87c9ee072b703a1b0094553ecfcc525c0a9 SHA512 370fafa7ca507589660cb9f025bfa154c7b351fa6f7f7cfbedf8b20b64a175bba78e7673b122443132b10e6214e503668efd98c79dd79ee45364b1f779ecd8f1
diff --git a/dev-python/yarl/yarl-0.10.2.ebuild b/dev-python/yarl/yarl-0.10.2.ebuild
deleted file mode 100644
index 7cfc0223f0bf..000000000000
--- a/dev-python/yarl/yarl-0.10.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/multidict[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
- py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/yarl/yarl-0.10.3.ebuild b/dev-python/yarl/yarl-0.10.3.ebuild
deleted file mode 100644
index 7cfc0223f0bf..000000000000
--- a/dev-python/yarl/yarl-0.10.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/multidict[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
- py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/yarl/yarl-0.14.1.ebuild b/dev-python/yarl/yarl-0.14.1.ebuild
deleted file mode 100644
index e1b4bc79d0d7..000000000000
--- a/dev-python/yarl/yarl-0.14.1.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
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/multidict-2.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/pytest[${PYTHON_USEDEP}]
- dev-python/pytest-runner[${PYTHON_USEDEP}]
- )"
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/yarl/yarl-1.1.1.ebuild b/dev-python/yarl/yarl-1.1.1.ebuild
index 0b326f2e0d50..eb84ca5d8e6f 100644
--- a/dev-python/yarl/yarl-1.1.1.ebuild
+++ b/dev-python/yarl/yarl-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
RDEPEND="
diff --git a/dev-python/zict/zict-0.1.2.ebuild b/dev-python/zict/zict-0.1.2.ebuild
index a7e5459067c8..436b56ee9a9f 100644
--- a/dev-python/zict/zict-0.1.2.ebuild
+++ b/dev-python/zict/zict-0.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="dev-python/HeapDict[${PYTHON_USEDEP}]"
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 281705dfd4c4..cc3f358bac7d 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index d93362dc7bc2..cd7c273bf4c3 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -6,6 +6,8 @@
Gentoo Qt Project
diff --git a/media-sound/supercollider/supercollider-3.8.0-r1.ebuild b/media-sound/supercollider/supercollider-3.8.1.ebuild
similarity index 85%
rename from media-sound/supercollider/supercollider-3.8.0-r1.ebuild
rename to media-sound/supercollider/supercollider-3.8.1.ebuild
index d5199f592ce1..07406d0c4346 100644
--- a/media-sound/supercollider/supercollider-3.8.0-r1.ebuild
+++ b/media-sound/supercollider/supercollider-3.8.1.ebuild
@@ -12,8 +12,7 @@ SRC_URI="https://github.com/supercollider/supercollider/releases/download/Versio
LICENSE="GPL-2 gpl3? ( GPL-3 )"
SLOT="0"
KEYWORDS="~x86 ~amd64"
-IUSE="avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack +portaudio qt5 server +sndfile static-libs vim wiimote"
-REQUIRED_USE="^^ ( jack portaudio )"
+IUSE="avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim"
RESTRICT="mirror"
RDEPEND="
@@ -24,7 +23,7 @@ RDEPEND="
avahi? ( net-dns/avahi )
fftw? ( sci-libs/fftw:3.0= )
jack? ( virtual/jack )
- portaudio? ( media-libs/portaudio )
+ !jack? ( media-libs/portaudio )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
@@ -35,7 +34,6 @@ RDEPEND="
)
server? ( !app-admin/supernova )
sndfile? ( media-libs/libsndfile )
- wiimote? ( app-misc/cwiid )
"
DEPEND="${RDEPEND}
dev-libs/icu
@@ -53,19 +51,18 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/SuperCollider-Source"
PATCHES=(
- "${FILESDIR}"/${P}-no-opengl.patch
- "${FILESDIR}"/${P}-no-qtsensors.patch
- "${FILESDIR}"/${P}-no-qtpositioning.patch
- "${FILESDIR}"/${P}-multilib.patch
- "${FILESDIR}"/${P}-gcc-7.patch
- "${FILESDIR}"/${P}-desktop.patch
+ "${FILESDIR}"/${PN}-3.8.0-no-opengl.patch
+ "${FILESDIR}"/${PN}-3.8.0-no-qtsensors.patch
+ "${FILESDIR}"/${PN}-3.8.0-no-qtpositioning.patch
+ "${FILESDIR}"/${PN}-3.8.0-multilib.patch
+ "${FILESDIR}"/${PN}-3.8.0-gcc-7.patch
+ "${FILESDIR}"/${PN}-3.8.0-desktop.patch
)
src_configure() {
local mycmakeargs=(
-DAUDIOAPI=$(usex jack jack portaudio)
-DINSTALL_HELP=ON
- -DNATIVE=ON
-DSYSTEM_BOOST=OFF
-DSYSTEM_YAMLCPP=OFF
-DNO_AVAHI=$(usex !avahi)
@@ -82,7 +79,6 @@ src_configure() {
-DSC_ED=$(usex gedit)
-DSC_VIM=$(usex vim)
-DSC_EL=$(usex emacs)
- -DSC_WII=$(usex wiimote)
)
use debug && mycmakeargs+=(
diff --git a/media-sound/supercollider/supercollider-3.9.3.ebuild b/media-sound/supercollider/supercollider-3.9.3.ebuild
new file mode 100644
index 000000000000..5ea861d111ba
--- /dev/null
+++ b/media-sound/supercollider/supercollider-3.9.3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="An environment and a programming language for real time audio synthesis."
+HOMEPAGE="https://supercollider.github.io/"
+SRC_URI="https://github.com/supercollider/supercollider/releases/download/Version-${PV}/SuperCollider-${PV}-Source-linux.tar.bz2"
+
+LICENSE="GPL-2 gpl3? ( GPL-3 )"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim"
+RESTRICT="mirror"
+
+RDEPEND="
+ media-libs/alsa-lib
+ sys-libs/readline:0=
+ x11-libs/libX11
+ x11-libs/libXt
+ avahi? ( net-dns/avahi )
+ fftw? ( sci-libs/fftw:3.0= )
+ jack? ( virtual/jack )
+ !jack? ( media-libs/portaudio )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtwebkit:5
+ dev-qt/qtwidgets:5
+ )
+ server? ( !app-admin/supernova )
+ sndfile? ( media-libs/libsndfile )
+"
+DEPEND="${RDEPEND}
+ dev-libs/icu
+ virtual/pkgconfig
+ emacs? ( virtual/emacs )
+ gedit? ( app-editors/gedit )
+ qt5? (
+ dev-qt/linguist-tools:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtconcurrent:5
+ )
+ vim? ( app-editors/vim )
+"
+
+S="${WORKDIR}/SuperCollider-Source"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.8.0-no-opengl.patch
+ "${FILESDIR}"/${PN}-3.8.0-no-qtsensors.patch
+ "${FILESDIR}"/${PN}-3.8.0-no-qtpositioning.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DAUDIOAPI=$(usex jack jack portaudio)
+ -DINSTALL_HELP=ON
+ -DSYSTEM_BOOST=OFF
+ -DSYSTEM_YAMLCPP=OFF
+ -DNO_AVAHI=$(usex !avahi)
+ -DFFT_GREEN=$(usex !fftw)
+ -DNO_GPL3=$(usex !gpl3)
+ -DNO_LIBSNDFILE=$(usex !sndfile)
+ -DSC_QT=$(usex qt5)
+ -DSCLANG_SERVER=$(usex server)
+ -DSUPERNOVA=$(usex server)
+ -DLIBSCSYNTH=$(usex !static-libs)
+ -DSSE=$(usex cpu_flags_x86_sse)
+ -DSSE2=$(usex cpu_flags_x86_sse2)
+ -DSC_IDE=$(usex qt5)
+ -DSC_ED=$(usex gedit)
+ -DSC_VIM=$(usex vim)
+ -DSC_EL=$(usex emacs)
+ )
+
+ use debug && mycmakeargs+=(
+ -DSC_MEMORY_DEBUGGING=ON
+ -DSN_MEMORY_DEBUGGING=ON
+ -DGC_SANITYCHECK=ON
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ use vim && newdoc editors/scvim/README.md README.vim
+ use emacs && newdoc editors/scel/README.md README.emacs
+ use gedit && newdoc editors/sced/README.md README.gedit
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Notice: SuperCollider is not very intuitive to get up and running."
+ einfo "The best course of action to make sure that the installation was"
+ einfo "successful and get you started with using SuperCollider is to take"
+ einfo "a look through ${EROOT%/}/usr/share/doc/${PF}/README.md.bz2"
+ einfo
+
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_mimeinfo_database_update
+ xdg_desktop_database_update
+}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 200ac0e3c55e..49c696502731 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/plex-media-server/Manifest b/media-tv/plex-media-server/Manifest
index 040338bd6511..8cd0da75b94b 100644
--- a/media-tv/plex-media-server/Manifest
+++ b/media-tv/plex-media-server/Manifest
@@ -1,3 +1,3 @@
DIST plexmediaserver_1.11.3.4803-c40bba82e_amd64.deb 108830880 BLAKE2B 7ed912756b8bdedb695c4cbf99d0565da53904814cedb8e026614b8db9bb638cbd437f35e05915d6d22221c87ecf1136ea9ae08797bca2ebbe4f2e0a861b4841 SHA512 0bda324e733b1e86e8dba7c10f6bab3e9dad5463113c5998059492bd7d4a49e105068d1d9313c9405d7a3c85c99e6528be6c0f1c9f52db115a1da1545a9485b5
-DIST plexmediaserver_1.12.1.4885-1046ba85f_amd64.deb 109238814 BLAKE2B 52f44e4531c3ffb4a7f6d6cc5fdaed97ce3b44a7469074c6c4e81a5a9991b7a371a40a3d4db30f8cab5e10ae6caeb9798822c541dc27b1f5597d464fdd0292c2 SHA512 8125fa8132b6ed928f08660ddbff6dd8855719c0833c4c2b5dc8193674d8d22148f95848ce8b500612b12379efbc6e180ea72b2f90d695e1bf40ba2705def8a4
DIST plexmediaserver_1.12.3.4973-215c28d86_amd64.deb 109277946 BLAKE2B 6a868943c77a1355dd0a4dbe88323b937d827dbfe84e729cf1f5c5c7d4a7d44e9af7e69121a7e3cf9f5d60786c9877bd3e303d9d5d301c86f08984afb1062730 SHA512 1befe9196926bf4cabd1f9c746e958efc72392479a844f8c3d9161282618fe28e29dbb9c12ddccf5db5b852ae58cd43dc0d988f00732431e16106021c8618347
+DIST plexmediaserver_1.13.2.5154-fd05be322_amd64.deb 111093662 BLAKE2B 26b1161107a8f9223f7065ff4119a32470c06794a159a42181b9278107a6d14f9fbb582e515223aaa659e9007d9b18299cd65b2a068e1d7dd934d52552a44cd1 SHA512 548c033272d56f6c54ab073536327b285fdbda3192c203a3ea3ff2b6c7afbc79ba7d56d7251f623ca1e09db572c92000d7baa7a8a555d853d85fdb9d1dfb8479
diff --git a/media-tv/plex-media-server/plex-media-server-1.12.3.ebuild b/media-tv/plex-media-server/plex-media-server-1.12.3.ebuild
index ce3171a2e619..9269358d163c 100644
--- a/media-tv/plex-media-server/plex-media-server-1.12.3.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.12.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64
SLOT="0"
LICENSE="Plex"
RESTRICT="bindist strip"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
diff --git a/media-tv/plex-media-server/plex-media-server-1.12.1.ebuild b/media-tv/plex-media-server/plex-media-server-1.13.2.ebuild
similarity index 98%
rename from media-tv/plex-media-server/plex-media-server-1.12.1.ebuild
rename to media-tv/plex-media-server/plex-media-server-1.13.2.ebuild
index 935cabb2db7c..63a8831254d1 100644
--- a/media-tv/plex-media-server/plex-media-server-1.12.1.ebuild
+++ b/media-tv/plex-media-server/plex-media-server-1.13.2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit eutils user systemd unpacker pax-utils python-single-r1
-MINOR_VERSION="4885-1046ba85f"
+MINOR_VERSION="5154-fd05be322"
_APPNAME="plexmediaserver"
_USERNAME="plex"
@@ -21,7 +21,7 @@ SRC_URI="amd64? ( ${URI}/${_FULL_VERSION}/plexmediaserver_${_FULL_VERSION}_amd64
SLOT="0"
LICENSE="Plex"
RESTRICT="bindist strip"
-KEYWORDS="-* amd64"
+KEYWORDS="-* ~amd64"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 15ff03370e50..7882264d8f2e 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest
index e567dff029f2..5c4596f38c52 100644
--- a/media-video/subliminal/Manifest
+++ b/media-video/subliminal/Manifest
@@ -1,2 +1,3 @@
DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3d322c4e933aad10afb3aa6f69bb3469114c4400d161e53d8a7618b818b22465177460003804a7ac3e69fa4f4db000d SHA512 f170a8e83dab15228f992b3692330163da2402b8e436c7fa195ac1ecc06cf1eaf1a48d8c99a85c031122c158c2d4006023aae75d5b7805385ba25a6d601cb78f
DIST subliminal-2.0.5-r1.tar.gz 4442435 BLAKE2B ea2139bd61344d6a0cb4b48a2b75cbfd29905adc81bca25a332443725fff80bc03b58704d0e6289d44ddc26104e15744f67acb7e0e4eafae584098b02fb4c007 SHA512 b0f99c6b2fa6bc3860c86592bb428c7b4b34836df7a619b19d69b15532a68b4d05369f724131e120d4b390bd91f430aea442aef72ebc00ae8e3d31a457925eec
+DIST subliminal-2.0.5-r2.tar.gz 4442435 BLAKE2B ea2139bd61344d6a0cb4b48a2b75cbfd29905adc81bca25a332443725fff80bc03b58704d0e6289d44ddc26104e15744f67acb7e0e4eafae584098b02fb4c007 SHA512 b0f99c6b2fa6bc3860c86592bb428c7b4b34836df7a619b19d69b15532a68b4d05369f724131e120d4b390bd91f430aea442aef72ebc00ae8e3d31a457925eec
diff --git a/media-video/subliminal/subliminal-2.0.5-r2.ebuild b/media-video/subliminal/subliminal-2.0.5-r2.ebuild
new file mode 100644
index 000000000000..4a23ca73b388
--- /dev/null
+++ b/media-video/subliminal/subliminal-2.0.5-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='xml(+)'
+COMMIT_ID='dd74383d1cba82829ce720f2e439a65d13ffe7ef'
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Python library to search and download subtitles"
+HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/"
+SRC_URI="
+ https://github.com/Diaoul/${PN}/archive/${COMMIT_ID}.tar.gz -> ${PF}.tar.gz
+ test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+ >=dev-python/guessit-2.0.1[${PYTHON_USEDEP}]
+ >=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}]
+ >=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}]
+ >=dev-python/beautifulsoup-4.4.0:4[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.0[${PYTHON_USEDEP}]
+ >=dev-python/click-4.0[${PYTHON_USEDEP}]
+ >=dev-python/dogpile-cache-0.6.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
+ >=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
+ >=dev-python/pysrt-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+ >=dev-python/appdirs-1.3[${PYTHON_USEDEP}]
+ >=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}]
+ >=dev-python/pytz-2012c[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ test? (
+ app-arch/unzip
+ >=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytest-cov[${PYTHON_USEDEP}]
+ dev-python/pytest-runner[${PYTHON_USEDEP}]
+ dev-python/sympy[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7)
+ )
+"
+
+# Tests don't work in 2.0.5. Recheck in later versions. See Gentoo bug 630114.
+RESTRICT=test
+
+PATCHES=( "${FILESDIR}/${P}-add-missing-comma.patch" )
+
+S="${WORKDIR}/${PF}"
+
+python_prepare_all() {
+ # Disable code checkers as they require unavailable dependencies.
+ sed -i -e 's/--\(pep8\|flakes\)//g' pytest.ini || die
+ sed -i -e "s/'pytest-\(pep8\|flakes\)',//g" setup.py || die
+
+ # Disable unconditional dependency on dev-python/pytest-runner.
+ sed -i -e "s|'pytest-runner'||g" setup.py || die
+
+ if use test; then
+ mkdir -p tests/data/mkv || die
+ ln -s "${WORKDIR}"/test*.mkv tests/data/mkv/ || die
+ fi
+
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ esetup.py test
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 9022cad0b6cd..0e318b71da09 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 ad20d6303102..28aa288d647a 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Fri, 22 Jun 2018 09:08:30 +0000
+Sun, 24 Jun 2018 11:08:30 +0000
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index b789ac8f5af8..f740db1e7b5d 100644
Binary files a/metadata/glsa/Manifest.files.gz and b/metadata/glsa/Manifest.files.gz differ
diff --git a/metadata/glsa/glsa-201806-08.xml b/metadata/glsa/glsa-201806-08.xml
new file mode 100644
index 000000000000..9d4493b3898f
--- /dev/null
+++ b/metadata/glsa/glsa-201806-08.xml
@@ -0,0 +1,50 @@
+
+
+
+ file: Denial of service
+ A vulnerability in file could lead to a Denial of Service
+ condition.
+
+ file
+ 2018-06-23
+ 2018-06-23
+ 657930
+ remote
+
+
+ 5.33-r2
+ 5.33-r2
+
+
+
+ file is a utility that guesses a file format by scanning binary data for
+ patterns.
+
+
+
+ File does not properly utilize the do_core_note function in readelf.c in
+ libmagic.a.
+
+
+
+ A remote attacker could send a specially crafted ELF file possibly
+ resulting in a Denial of Service condition.
+
+
+
+ There is no known workaround at this time.
+
+
+ All file users should upgrade to the latest version:
+
+
+ # emerge --sync
+ # emerge --ask --oneshot --verbose ">=sys-apps/file-5.33-r2"
+
+
+
+ CVE-2018-10360
+
+ b-man
+ Zlogene
+
diff --git a/metadata/glsa/glsa-201806-09.xml b/metadata/glsa/glsa-201806-09.xml
new file mode 100644
index 000000000000..3cd03fbde533
--- /dev/null
+++ b/metadata/glsa/glsa-201806-09.xml
@@ -0,0 +1,48 @@
+
+
+
+ PNP4Nagios: Root privilege escalation
+ A vulnerability in PNP4Nagios which may allow local attackers to
+ gain root privileges.
+
+ pnp4nagios
+ 2018-06-24
+ 2018-06-24
+ 637640
+ local
+
+
+ 0.6.26-r9
+ 0.6.26-r9
+
+
+
+ PNP4Nagios is an addon for the Nagios Network Monitoring System.
+
+
+ It was found that PHP4Nagios creates files owned by an unprivileged user
+ that are used by root.
+
+
+
+ A local attacker could escalate privileges to root.
+
+
+ There is no known workaround at this time.
+
+
+ All PNP4Nagios users should upgrade to the latest version:
+
+
+ # emerge --sync
+ # emerge --ask --oneshot --verbose
+ ">=net-analyzer/pnp4nagios-0.6.26-r9"
+
+
+
+
+ CVE-2017-16834
+
+ b-man
+ irishluck83
+
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index ad20d6303102..2666ef35ee96 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Fri, 22 Jun 2018 09:08:30 +0000
+Sun, 24 Jun 2018 11:08:31 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index 48672ed37550..371b226d6874 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-5b6712dd5c527643b1249a76e15d0921eda06151 1529454280 2018-06-20T00:24:40+00:00
+676a0a13a2c9c89e7a04d5a85550b5b48c25f9b4 1529809898 2018-06-24T03:11:38+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e6e9eb555cfc..a369c1f827e4 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 2d2652042654..89de129c7c08 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/abrt-2.10.10 b/metadata/md5-cache/app-admin/abrt-2.10.10
new file mode 100644
index 000000000000..5817ab0f0fb8
--- /dev/null
+++ b/metadata/md5-cache/app-admin/abrt-2.10.10
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.43:2 >=dev-libs/libreport-2.9.5[python] dev-libs/libxml2 dev-libs/nss >=gnome-base/gsettings-desktop-schemas-3.15.1 sys-apps/dbus sys-apps/systemd sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 >=x11-libs/libnotify-0.7 app-text/asciidoc app-text/xmlto dev-libs/satyr[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 >=app-portage/elt-patches-20170422 !=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 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=Automatic bug detection and reporting tool
+EAPI=6
+HOMEPAGE=https://github.com/abrt/abrt/wiki/ABRT-Project
+IUSE=debug selinux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.43:2 >=dev-libs/libreport-2.9.5[python] dev-libs/libxml2 dev-libs/nss >=gnome-base/gsettings-desktop-schemas-3.15.1 sys-apps/dbus sys-apps/systemd sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 >=x11-libs/libnotify-0.7 app-arch/cpio dev-libs/elfutils dev-python/argcomplete[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/argh[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/humanize[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/util-linux >=sys-devel/gdb-7
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/abrt/abrt/archive/2.10.10.tar.gz -> abrt-2.10.10.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2d22d7473321cc2c5c2f2dacbe1035f2
diff --git a/metadata/md5-cache/app-admin/abrt-2.10.10-r1 b/metadata/md5-cache/app-admin/abrt-2.10.10-r1
new file mode 100644
index 000000000000..a4d4ee46c7ff
--- /dev/null
+++ b/metadata/md5-cache/app-admin/abrt-2.10.10-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.43:2 >=dev-libs/libreport-2.9.5[python] dev-libs/libxml2 dev-libs/nss >=gnome-base/gsettings-desktop-schemas-3.15.1 sys-apps/dbus sys-apps/systemd sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 >=x11-libs/libnotify-0.7 app-text/asciidoc app-text/xmlto dev-libs/satyr[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 >=app-portage/elt-patches-20170422 !=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 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=Automatic bug detection and reporting tool
+EAPI=6
+HOMEPAGE=https://github.com/abrt/abrt/wiki/ABRT-Project
+IUSE=debug selinux python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.43:2 >=dev-libs/libreport-2.9.5[python] dev-libs/libxml2 dev-libs/nss >=gnome-base/gsettings-desktop-schemas-3.15.1 sys-apps/dbus sys-apps/systemd sys-auth/polkit sys-fs/inotify-tools x11-libs/gtk+:3 >=x11-libs/libnotify-0.7 app-arch/cpio dev-libs/elfutils dev-python/argcomplete[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/argh[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/humanize[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/util-linux >=sys-devel/gdb-7
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/abrt/abrt/archive/2.10.10.tar.gz -> abrt-2.10.10.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=17ab8eb6b0d5c5d192acc2cac23d789b
diff --git a/metadata/md5-cache/app-admin/entr-4.1 b/metadata/md5-cache/app-admin/entr-4.1
new file mode 100644
index 000000000000..a5edfcf2ab6e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/entr-4.1
@@ -0,0 +1,11 @@
+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.1.tar.gz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
+_md5_=9e85ef5aefa662a0bbf7fab013ad350b
diff --git a/metadata/md5-cache/app-admin/gnome-abrt-1.2.6 b/metadata/md5-cache/app-admin/gnome-abrt-1.2.6
new file mode 100644
index 000000000000..52f33e738859
--- /dev/null
+++ b/metadata/md5-cache/app-admin/gnome-abrt-1.2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst postrm prepare setup
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/gtk+:3 >=dev-libs/libreport-2.0.20[python] >=app-admin/abrt-2.10.10-r1 dev-python/pygobject:3 x11-libs/libX11 >=dev-python/pyxdg-0.19 app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.35.0 virtual/pkgconfig >=sys-devel/gettext-0.17 >=app-portage/elt-patches-20170422 !=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 >=sys-apps/sed-4
+DESCRIPTION=A utility for viewing problems that have occurred with the system
+EAPI=6
+HOMEPAGE=https://github.com/abrt/abrt/wiki/ABRT-Project
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] x11-libs/gtk+:3 >=dev-libs/libreport-2.0.20[python] >=app-admin/abrt-2.10.10-r1 dev-python/pygobject:3 x11-libs/libX11 >=dev-python/pyxdg-0.19
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/abrt/gnome-abrt/archive/1.2.6.tar.gz -> gnome-abrt-1.2.6.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cd4f981f808c9ee58d22cf8097d4b13c
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.23-r1 b/metadata/md5-cache/app-admin/sudo-1.8.23-r1
new file mode 100644
index 000000000000..e80767ca0c8e
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.8.23-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison >=app-portage/elt-patches-20170422
+DESCRIPTION=Allows users or groups to run commands as other users
+EAPI=6
+HOMEPAGE=https://www.sudo.ws/
+IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~sparc-solaris
+LICENSE=ISC BSD
+RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
+REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
+SLOT=0
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.23.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.23.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=6e89eaa76815f3cd963efa270768e8fc
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.16.1 b/metadata/md5-cache/app-admin/syslog-ng-3.16.1
new file mode 100644
index 000000000000..282d876f70e9
--- /dev/null
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.16.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.3 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:= ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !=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=syslog replacement with advanced filtering features
+EAPI=6
+HOMEPAGE=https://syslog-ng.com/open-source-log-management
+IUSE=amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2.10.1:2 >=dev-libs/ivykis-0.42.3 >=dev-libs/libpcre-6.1:= !dev-libs/eventlog amqp? ( >=net-libs/rabbitmq-c-0.8.0:= ) caps? ( sys-libs/libcap ) dbi? ( >=dev-db/libdbi-0.9.0 ) geoip? ( >=dev-libs/geoip-1.5.0 ) http? ( net-misc/curl ) json? ( >=dev-libs/json-c-0.9:= ) mongodb? ( >=dev-libs/mongo-c-driver-1.2.0 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) redis? ( >=dev-libs/hiredis-0.11.0:= ) smtp? ( net-libs/libesmtp ) spoof-source? ( net-libs/libnet:1.1= ) systemd? ( sys-apps/systemd:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.16.1/syslog-ng-3.16.1.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=15b30cefbc341736c54d95f5d6c3a07c
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 781f2bba1f47..176fc09acd7f 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.6-r9 b/metadata/md5-cache/app-arch/bzip2-1.0.6-r9
index 9634e2aa31c7..73047a770f52 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.6-r9
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.6-r9
@@ -3,9 +3,9 @@ DESCRIPTION=A high-quality data compressor used extensively by Gentoo Linux
EAPI=6
HOMEPAGE=http://www.bzip.org/
IUSE=static static-libs abi_x86_32 abi_x86_64 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 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=BZIP2
SLOT=0/1
SRC_URI=http://www.bzip.org/1.0.6/bzip2-1.0.6.tar.gz
_eclasses_=multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a95278aecf32fdf40fb1592e0b9d8c5c
+_md5_=569718621fae49257cb5cb89277025eb
diff --git a/metadata/md5-cache/app-arch/innoextract-1.6 b/metadata/md5-cache/app-arch/innoextract-1.6
index 7b26d8129227..fc59341d0619 100644
--- a/metadata/md5-cache/app-arch/innoextract-1.6
+++ b/metadata/md5-cache/app-arch/innoextract-1.6
@@ -4,10 +4,10 @@ DESCRIPTION=A tool to unpack installers created by Inno Setup
EAPI=5
HOMEPAGE=http://constexpr.org/innoextract/
IUSE=debug +iconv +lzma
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=ZLIB
RDEPEND=dev-libs/boost:= iconv? ( virtual/libiconv ) lzma? ( app-arch/xz-utils )
SLOT=0
SRC_URI=http://constexpr.org/innoextract/files/innoextract-1.6.tar.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1b3fcb7f5b1a89c627c5aadc1e37e77c
+_md5_=e3951f1e6dc377dc3020b82cd2001b3e
diff --git a/metadata/md5-cache/app-arch/tar-1.30 b/metadata/md5-cache/app-arch/tar-1.30
index 5dc4a849071f..66b33f22c857 100644
--- a/metadata/md5-cache/app-arch/tar-1.30
+++ b/metadata/md5-cache/app-arch/tar-1.30
@@ -4,10 +4,10 @@ DESCRIPTION=Use this to make tarballs :)
EAPI=6
HOMEPAGE=https://www.gnu.org/software/tar/
IUSE=acl elibc_glibc minimal nls selinux static userland_GNU xattr
-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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-3+
RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
SLOT=0
SRC_URI=mirror://gnu/tar/tar-1.30.tar.bz2 mirror://gnu-alpha/tar/tar-1.30.tar.bz2
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b545588180d623091aa56984138480d5
+_md5_=cc9cc8797f51de4d907ba7dec115dfa4
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 7a2c22b9647b..28cee6936207 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/ccollect-0.8 b/metadata/md5-cache/app-backup/ccollect-0.8
index 7599ad8d9fc5..9b1714bfa3ba 100644
--- a/metadata/md5-cache/app-backup/ccollect-0.8
+++ b/metadata/md5-cache/app-backup/ccollect-0.8
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile install postinst
DEPEND=doc? ( >=app-text/asciidoc-8.1.0 app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.2 dev-libs/libxslt )
DESCRIPTION=Pseudo incremental backup with different exclude lists using hardlinks and rsync
EAPI=6
-HOMEPAGE=http://www.nico.schottelius.org/software/ccollect/
+HOMEPAGE=https://www.nico.schottelius.org/software/ccollect/
IUSE=doc examples
KEYWORDS=amd64 hppa ppc ~sparc x86
LICENSE=GPL-3
RDEPEND=net-misc/rsync
RESTRICT=test
SLOT=0
-SRC_URI=http://www.nico.schottelius.org/software/ccollect/download/ccollect-0.8.tar.bz2
-_md5_=a3b7b8c7d50de459a8df2d10990c85d6
+SRC_URI=https://www.nico.schottelius.org/software/ccollect/download/ccollect-0.8.tar.bz2
+_md5_=b2b3acf4765d6d97aea67e065712c4c5
diff --git a/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r3 b/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r3
index 8765b62762ae..37dd1f8f87d6 100644
--- a/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r3
+++ b/metadata/md5-cache/app-backup/rdiff-backup-1.3.3-r3
@@ -5,11 +5,11 @@ DESCRIPTION=Local/remote mirroring+incremental backup
EAPI=7
HOMEPAGE=https://github.com/sol1/rdiff-backup
IUSE=examples python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
LICENSE=GPL-2
RDEPEND=net-libs/librsync:0= dev-python/pylibacl[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyxattr[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=https://github.com/sol1/rdiff-backup/archive/r1.3.3.tar.gz -> rdiff-backup-1.3.3.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=b8694cbef59a42766be979fa63e5c6c1
+_md5_=c92cc8ec5ef4b95a3eed7da79a0173bb
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 044b8ec9fafd..ceee354f40d7 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/kstart-4.1 b/metadata/md5-cache/app-crypt/kstart-4.1
index 1ccd053945a7..3ee8cfb45283 100644
--- a/metadata/md5-cache/app-crypt/kstart-4.1
+++ b/metadata/md5-cache/app-crypt/kstart-4.1
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install
DEPEND=virtual/krb5 afs? ( net-fs/openafs )
DESCRIPTION=Modified versions of kinit for refreshing kerberos tickets automatically
EAPI=4
-HOMEPAGE=http://www.eyrie.org/~eagle/software/kstart
+HOMEPAGE=https://www.eyrie.org/~eagle/software/kstart/
IUSE=afs
KEYWORDS=amd64 x86
LICENSE=|| ( MIT Stanford ISC )
RDEPEND=virtual/krb5 afs? ( net-fs/openafs )
SLOT=0
-SRC_URI=http://archives.eyrie.org/software/kerberos/kstart-4.1.tar.gz
+SRC_URI=https://archives.eyrie.org/software/kerberos/kstart-4.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7a1e235353a6a93d423b74a88ac9b09c
+_md5_=d38717684e5e38f60af986815caa5c00
diff --git a/metadata/md5-cache/app-crypt/kstart-4.2 b/metadata/md5-cache/app-crypt/kstart-4.2
index acbde87b9106..dcd13981a8e5 100644
--- a/metadata/md5-cache/app-crypt/kstart-4.2
+++ b/metadata/md5-cache/app-crypt/kstart-4.2
@@ -2,11 +2,11 @@ DEFINED_PHASES=configure install
DEPEND=virtual/krb5 afs? ( net-fs/openafs )
DESCRIPTION=Modified versions of kinit for refreshing kerberos tickets automatically
EAPI=6
-HOMEPAGE=http://www.eyrie.org/~eagle/software/kstart
+HOMEPAGE=https://www.eyrie.org/~eagle/software/kstart/
IUSE=afs
KEYWORDS=~amd64 ~x86
LICENSE=|| ( MIT Stanford ISC )
RDEPEND=virtual/krb5 afs? ( net-fs/openafs )
SLOT=0
-SRC_URI=http://archives.eyrie.org/software/kerberos/kstart-4.2.tar.gz
-_md5_=3219a0c7b7f528665d7e00c955c05491
+SRC_URI=https://archives.eyrie.org/software/kerberos/kstart-4.2.tar.gz
+_md5_=ec0517148b579db67bb99da4d923eb65
diff --git a/metadata/md5-cache/app-crypt/monkeysphere-0.41 b/metadata/md5-cache/app-crypt/monkeysphere-0.41
index 4cf127be4c6a..34c78e3aafb4 100644
--- a/metadata/md5-cache/app-crypt/monkeysphere-0.41
+++ b/metadata/md5-cache/app-crypt/monkeysphere-0.41
@@ -3,11 +3,11 @@ DEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-pe
DESCRIPTION=Leverage the OpenPGP web of trust for OpenSSH and Web authentication
EAPI=5
HOMEPAGE=http://web.monkeysphere.info/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
LICENSE=GPL-3
RDEPEND=app-crypt/gnupg:0= net-misc/socat:0= dev-perl/Crypt-OpenSSL-RSA:0= dev-perl/Digest-SHA1:0= app-misc/lockfile-progs:0=
RESTRICT=test
SLOT=0/0
SRC_URI=mirror://debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.41.orig.tar.gz http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_0.41.orig.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bc5f25cf616f2bace00c58f012f5e7be
+_md5_=63f0eadc731bcea4015df2c886370c29
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index c8c18cd43e0a..2bc52a6953d1 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/edox-data-0.16.8.0.2 b/metadata/md5-cache/app-doc/edox-data-0.16.8.0.2
deleted file mode 100644
index 8eba3c81af60..000000000000
--- a/metadata/md5-cache/app-doc/edox-data-0.16.8.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=x11-wm/enlightenment-0.16.8
-DESCRIPTION=The Enlightenment online help
-EAPI=0
-HOMEPAGE=https://www.enlightenment.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=x11-wm/enlightenment-0.16.8
-SLOT=0
-SRC_URI=mirror://sourceforge/enlightenment/e16-docs-0.16.8.0.2.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4a9a99d6df0442465b44799410626741
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index f9441ed589da..7f48ab5ed351 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/joe-4.6 b/metadata/md5-cache/app-editors/joe-4.6
index e8516d76e990..d5caa58f37f2 100644
--- a/metadata/md5-cache/app-editors/joe-4.6
+++ b/metadata/md5-cache/app-editors/joe-4.6
@@ -4,10 +4,10 @@ DESCRIPTION=A free ASCII-Text Screen Editor for UNIX
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/joe-editor/
IUSE=xterm
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris
LICENSE=GPL-1+ CC-BY-3.0
RDEPEND=>=sys-libs/ncurses-5.2-r2:0= xterm? ( >=x11-terms/xterm-239 )
SLOT=0
SRC_URI=mirror://sourceforge/joe-editor/joe-4.6.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f9fd45cbd6d154dade9654bf39276986
+_md5_=e050eb5d21c4bad6c76fa464cd74af59
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 950931097cd9..a4f10de67d55 100644
Binary files a/metadata/md5-cache/app-emacs/Manifest.gz and b/metadata/md5-cache/app-emacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emacs/ebuild-mode-1.44 b/metadata/md5-cache/app-emacs/ebuild-mode-1.44
new file mode 100644
index 000000000000..9243fcd1d7a4
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.44
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/emacs-23
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=sys-apps/texinfo
+DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2+
+RDEPEND=>=virtual/emacs-23
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.44.tar.xz
+_eclasses_=elisp 12e33ba725e375a938c5997b692a8667 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
+_md5_=ed28283578474c330cb478200e3eb7f7
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index d0ffe6eb7800..c2b7660f6309 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/crossover-bin-17.5.0-r1 b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1
new file mode 100644
index 000000000000..1ac5d84d048a
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/crossover-bin-17.5.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst prepare setup unpack
+DEPEND=dev-lang/perl app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+DESCRIPTION=Commercial version of app-emulation/wine with paid support.
+EAPI=5
+HOMEPAGE=http://www.codeweavers.com/products/crossover/
+IUSE=+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opencl +opengl +png +scanner +ssl +v4l python_targets_python2_7
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=CROSSOVER-3
+RDEPEND=dev-lang/perl app-arch/unzip python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] !prefix? ( sys-libs/glibc ) >=dev-python/pygtk-2.10[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin capi? ( net-libs/libcapi[abi_x86_32(-)] ) cups? ( net-print/cups[abi_x86_32(-)] ) gsm? ( media-sound/gsm[abi_x86_32(-)] ) jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:2 ) ldap? ( net-nds/openldap[abi_x86_32(-)] ) gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) nls? ( sys-devel/gettext[abi_x86_32(-)] ) openal? ( media-libs/openal[abi_x86_32(-)] ) opencl? ( virtual/opencl[abi_x86_32(-)] ) opengl? ( virtual/glu[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] ) png? ( media-libs/libpng:0[abi_x86_32(-)] ) scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) v4l? ( media-libs/libv4l[abi_x86_32(-)] ) media-libs/alsa-lib[abi_x86_32(-)] >=media-libs/freetype-2.0.0[abi_x86_32(-)] media-libs/mesa[abi_x86_32(-)] sys-auth/nss-mdns[abi_x86_32(-)] sys-apps/util-linux[abi_x86_32(-)] sys-libs/ncurses:5/5[abi_x86_32(-)] sys-libs/zlib[abi_x86_32(-)] x11-libs/libICE[abi_x86_32(-)] x11-libs/libSM[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)] x11-libs/libXau[abi_x86_32(-)] x11-libs/libXdmcp[abi_x86_32(-)] x11-libs/libXext[abi_x86_32(-)] x11-libs/libXi[abi_x86_32(-)] x11-libs/libXrandr[abi_x86_32(-)] x11-libs/libXxf86vm[abi_x86_32(-)] x11-libs/libxcb[abi_x86_32(-)]
+RESTRICT=bindist test
+SLOT=0
+SRC_URI=https://media.codeweavers.com/pub/crossover/cxlinux/demo/install-crossover-17.5.0.bin
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=9bff0cf1660d9680ae76e94bc0beb0a2
diff --git a/metadata/md5-cache/app-emulation/qemu-2.12.0-r3 b/metadata/md5-cache/app-emulation/qemu-2.12.0-r3
index 6526077983db..bf701304de4e 100644
--- a/metadata/md5-cache/app-emulation/qemu-2.12.0-r3
+++ b/metadata/md5-cache/app-emulation/qemu-2.12.0-r3
@@ -4,11 +4,11 @@ DESCRIPTION=QEMU + Kernel-based Virtual Machine userland tools
EAPI=6
HOMEPAGE=http://www.qemu.org http://www.linux-kvm.org
IUSE=accessibility +aio alsa bluetooth bzip2 capstone +caps +curl debug +fdt glusterfs gnutls gtk gtk2 infiniband iscsi +jpeg kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs +png pulseaudio python rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-user systemtap tci test usb usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen xfs qemu_softmmu_targets_aarch64 qemu_softmmu_targets_alpha qemu_softmmu_targets_arm qemu_softmmu_targets_cris qemu_softmmu_targets_hppa qemu_softmmu_targets_i386 qemu_softmmu_targets_m68k qemu_softmmu_targets_microblaze qemu_softmmu_targets_microblazeel qemu_softmmu_targets_mips qemu_softmmu_targets_mips64 qemu_softmmu_targets_mips64el qemu_softmmu_targets_mipsel qemu_softmmu_targets_nios2 qemu_softmmu_targets_or1k qemu_softmmu_targets_ppc qemu_softmmu_targets_ppc64 qemu_softmmu_targets_riscv32 qemu_softmmu_targets_riscv64 qemu_softmmu_targets_s390x qemu_softmmu_targets_sh4 qemu_softmmu_targets_sh4eb qemu_softmmu_targets_sparc qemu_softmmu_targets_sparc64 qemu_softmmu_targets_x86_64 qemu_softmmu_targets_xtensa qemu_softmmu_targets_xtensaeb qemu_softmmu_targets_lm32 qemu_softmmu_targets_moxie qemu_softmmu_targets_ppcemb qemu_softmmu_targets_tricore qemu_softmmu_targets_unicore32 qemu_user_targets_aarch64 qemu_user_targets_alpha qemu_user_targets_arm qemu_user_targets_cris qemu_user_targets_hppa qemu_user_targets_i386 qemu_user_targets_m68k qemu_user_targets_microblaze qemu_user_targets_microblazeel qemu_user_targets_mips qemu_user_targets_mips64 qemu_user_targets_mips64el qemu_user_targets_mipsel qemu_user_targets_nios2 qemu_user_targets_or1k qemu_user_targets_ppc qemu_user_targets_ppc64 qemu_user_targets_riscv32 qemu_user_targets_riscv64 qemu_user_targets_s390x qemu_user_targets_sh4 qemu_user_targets_sh4eb qemu_user_targets_sparc qemu_user_targets_sparc64 qemu_user_targets_x86_64 qemu_user_targets_xtensa qemu_user_targets_xtensaeb qemu_user_targets_aarch64_be qemu_user_targets_armeb qemu_user_targets_mipsn32 qemu_user_targets_mipsn32el qemu_user_targets_ppc64abi32 qemu_user_targets_ppc64le qemu_user_targets_sparc32plus qemu_user_targets_tilegx python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 +filecaps
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86 ~x86-fbsd
LICENSE=GPL-2 LGPL-2 BSD-2
RDEPEND=!static? ( >=dev-libs/glib-2.0 sys-libs/zlib python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,readline] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses,readline] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses,readline] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses,readline] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) systemtap? ( dev-util/systemtap ) xattr? ( sys-apps/attr ) dev-libs/libxml2 x11-libs/libxkbcommon >=x11-libs/pixman-0.28.0 accessibility? ( app-accessibility/brltty[api] app-accessibility/brltty ) aio? ( dev-libs/libaio ) alsa? ( >=media-libs/alsa-lib-1.0.13 ) bluetooth? ( net-wireless/bluez ) bzip2? ( app-arch/bzip2 ) capstone? ( dev-libs/capstone ) caps? ( sys-libs/libcap-ng ) curl? ( >=net-misc/curl-7.15.4 ) fdt? ( >=sys-apps/dtc-1.4.2 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.0 ) gnutls? ( dev-libs/nettle:= >=net-libs/gnutls-3.0:= ) gtk? ( gtk2? ( x11-libs/gtk+:2 vte? ( x11-libs/vte:0 ) ) !gtk2? ( x11-libs/gtk+:3 vte? ( x11-libs/vte:2.91 ) ) ) infiniband? ( sys-fabric/libibumad:= sys-fabric/libibverbs:= sys-fabric/librdmacm:= ) iscsi? ( net-libs/libiscsi ) jpeg? ( virtual/jpeg:0= ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:0=[unicode] sys-libs/ncurses:0= ) nfs? ( >=net-fs/libnfs-1.9.3:= ) numa? ( sys-process/numactl ) opengl? ( virtual/opengl media-libs/libepoxy media-libs/mesa media-libs/mesa[egl,gbm] ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( !sdl2? ( media-libs/libsdl[X] >=media-libs/libsdl-1.2.11 ) sdl2? ( media-libs/libsdl2[X] media-libs/libsdl2 ) ) seccomp? ( >=sys-libs/libseccomp-2.1.0 ) smartcard? ( >=app-emulation/libcacard-2.5.0 ) snappy? ( app-arch/snappy:= ) spice? ( >=app-emulation/spice-protocol-0.12.3 >=app-emulation/spice-0.12.0 ) ssh? ( >=net-libs/libssh2-1.2.8 ) usb? ( >=virtual/libusb-1-r2 ) usbredir? ( >=sys-apps/usbredir-0.6 ) vde? ( net-misc/vde ) virgl? ( media-libs/virglrenderer ) virtfs? ( sys-libs/libcap ) xen? ( app-emulation/xen-tools:= ) xfs? ( sys-fs/xfsprogs ) ) qemu_softmmu_targets_i386? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_x86_64? ( pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-2017_p20180211[binary] ~sys-firmware/ipxe-1.0.0_p20180211[binary] ~sys-firmware/seabios-1.11.0[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre8[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe >=sys-firmware/seabios-1.10.2[seavgabios] sys-firmware/sgabios ) ) qemu_softmmu_targets_ppc64? ( pin-upstream-blobs? ( ~sys-firmware/seabios-1.11.0[binary,seavgabios] ) !pin-upstream-blobs? ( >=sys-firmware/seabios-1.10.2[seavgabios] ) ) selinux? ( sec-policy/selinux-qemu )
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) gtk2? ( gtk ) qemu_softmmu_targets_arm? ( fdt ) qemu_softmmu_targets_microblaze? ( fdt ) qemu_softmmu_targets_mips64el? ( fdt ) qemu_softmmu_targets_ppc? ( fdt ) qemu_softmmu_targets_ppc64? ( fdt ) sdl2? ( sdl ) static? ( static-user !alsa !bluetooth !gtk !gtk2 !opengl !pulseaudio !snappy ) virtfs? ( xattr ) vte? ( gtk )
SLOT=0
SRC_URI=http://wiki.qemu-project.org/download/qemu-2.12.0.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/qemu-2.12.0-patches-r4.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc fcaps 9445d60c1eb084a91c38ef4c070b2f16 flag-o-matic 5128c4729303400bd8d4b0b966530955 l10n 97f2753e3f1f3753d53d856c7c0bbb0b linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=47b8ac41ce08fb7e3d5bc3fda18bc37d
+_md5_=7c6629c1498743897353d7432b5bcb47
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 1c9878d8fb38..1903548c67df 100644
Binary files a/metadata/md5-cache/app-i18n/Manifest.gz and b/metadata/md5-cache/app-i18n/Manifest.gz differ
diff --git a/metadata/md5-cache/app-i18n/scim-1.4.18 b/metadata/md5-cache/app-i18n/scim-1.4.18
index a868beb138ca..634927d87b85 100644
--- a/metadata/md5-cache/app-i18n/scim-1.4.18
+++ b/metadata/md5-cache/app-i18n/scim-1.4.18
@@ -4,10 +4,10 @@ DESCRIPTION=Smart Common Input Method (SCIM) is an Input Method (IM) development
EAPI=6
HOMEPAGE=https://github.com/scim-im/scim
IUSE=doc gtk3 qt4
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ppc ~ppc64 sparc x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 dev-libs/glib:2 gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) >=dev-libs/atk-1 >=x11-libs/pango-1
SLOT=0
SRC_URI=https://github.com/scim-im/scim/archive/1.4.18.tar.gz -> scim-1.4.18.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ca7f9a7e997a8f17381fe79f29badbd
+_md5_=bc3965471c8e3ab809488d387bf0145a
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 58aa7d297b10..9062633f0dec 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/cdircmp-0.3-r1 b/metadata/md5-cache/app-misc/cdircmp-0.3-r1
index 564b38b6caff..28cd64e25ac9 100644
--- a/metadata/md5-cache/app-misc/cdircmp-0.3-r1
+++ b/metadata/md5-cache/app-misc/cdircmp-0.3-r1
@@ -7,6 +7,6 @@ KEYWORDS=amd64 ~ppc x86
LICENSE=GPL-2
RDEPEND=>=sys-libs/ncurses-5.4
SLOT=0
-SRC_URI=http://home.hccnet.nl/paul.schuurmans/download/cdircmp-0.3.tar.gz
+SRC_URI=http://home.hccnet.nl/paul.schuurmans/linux/download/cdircmp-0.3.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=e47d136e0ac2abfbb786c8ec917ba4de
+_md5_=4d8b8b8932711f5abc984e3d5be1a510
diff --git a/metadata/md5-cache/app-misc/cdircmp-0.3-r2 b/metadata/md5-cache/app-misc/cdircmp-0.3-r2
new file mode 100644
index 000000000000..07656f8100b2
--- /dev/null
+++ b/metadata/md5-cache/app-misc/cdircmp-0.3-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Compare directories and select files to copy
+EAPI=7
+HOMEPAGE=http://home.hccnet.nl/paul.schuurmans/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-libs/ncurses-5.4:0=
+SLOT=0
+SRC_URI=http://home.hccnet.nl/paul.schuurmans/linux/download/cdircmp-0.3.tar.gz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=e40145e590833ed0c96ced79fb124d0f
diff --git a/metadata/md5-cache/app-misc/kryoflux-dtc-2.6 b/metadata/md5-cache/app-misc/kryoflux-dtc-2.6
new file mode 100644
index 000000000000..fc5423563899
--- /dev/null
+++ b/metadata/md5-cache/app-misc/kryoflux-dtc-2.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst unpack
+DEPEND=app-arch/unzip virtual/pkgconfig
+DESCRIPTION=KryoFlux Host Software
+EAPI=6
+HOMEPAGE=https://www.kryoflux.com
+IUSE=demos doc fast-firmware gui static
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=SPS
+RDEPEND=dev-libs/spsdeclib virtual/libusb:1 virtual/udev gui? ( virtual/jre )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://www.kryoflux.com/download/kryoflux_2.6_linux.tar.bz2 gui? ( https://www.kryoflux.com/kryoflux-ui.jar )
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=13d5ae8bebccc43974d0fc4b5cd8944c
diff --git a/metadata/md5-cache/app-misc/ktoblzcheck-1.49 b/metadata/md5-cache/app-misc/ktoblzcheck-1.49
index 8ff017be9a0d..9ef9b94b2d63 100644
--- a/metadata/md5-cache/app-misc/ktoblzcheck-1.49
+++ b/metadata/md5-cache/app-misc/ktoblzcheck-1.49
@@ -4,11 +4,11 @@ DESCRIPTION=Library to check account numbers and bank codes of German banks
EAPI=6
HOMEPAGE=http://ktoblzcheck.sourceforge.net/
IUSE=python python_targets_python2_7
-KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
LICENSE=LGPL-2.1
RDEPEND=app-text/recode sys-apps/grep sys-apps/sed virtual/awk || ( net-misc/wget www-client/lynx ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=mirror://sourceforge/ktoblzcheck/ktoblzcheck-1.49.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=871ef0592e2bb72f4f33471348d80b10
+_md5_=8436677df8cb6827604af6ac9d296139
diff --git a/metadata/md5-cache/app-misc/lirc-0.10.0 b/metadata/md5-cache/app-misc/lirc-0.10.0
index a321f3693758..abb1a0ed96b6 100644
--- a/metadata/md5-cache/app-misc/lirc-0.10.0
+++ b/metadata/md5-cache/app-misc/lirc-0.10.0
@@ -1,14 +1,14 @@
DEFINED_PHASES=configure install postinst preinst setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers virtual/pkgconfig
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-libs/libxslt doc? ( app-doc/doxygen ) sys-apps/kmod sys-kernel/linux-headers virtual/pkgconfig
DESCRIPTION=decode and send infra-red signals of many commonly used remote controls
EAPI=6
HOMEPAGE=http://www.lirc.org/
-IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
+IUSE=audio +devinput doc ftdi gtk inputlirc static-libs systemd +uinput usb X python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] dev-python/pygobject[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) inputlirc? ( app-misc/inputlircd )
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) gtk? ( X )
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] audio? ( >media-libs/portaudio-18 media-libs/alsa-lib ) dev-python/pyyaml[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ftdi? ( dev-embedded/libftdi:0 ) systemd? ( sys-apps/systemd ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/vte[introspection] dev-python/pygobject[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) inputlirc? ( app-misc/inputlircd )
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) gtk? ( X )
SLOT=0
SRC_URI=mirror://sourceforge/lirc/lirc-0.10.0.tar.bz2
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=40be7a3c13dbdc04b698287918384230
+_md5_=71d6d49970421d6e3b066d8ea9e000ef
diff --git a/metadata/md5-cache/app-misc/media-player-info-23 b/metadata/md5-cache/app-misc/media-player-info-23
index 7cbb359226aa..6383b6b3a953 100644
--- a/metadata/md5-cache/app-misc/media-player-info-23
+++ b/metadata/md5-cache/app-misc/media-player-info-23
@@ -1,7 +1,7 @@
DEFINED_PHASES=postinst setup
DEPEND=>=virtual/udev-208 || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) virtual/pkgconfig
DESCRIPTION=A repository of data files describing media player capabilities
-EAPI=6
+EAPI=7
HOMEPAGE=https://cgit.freedesktop.org/media-player-info/
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
LICENSE=BSD
@@ -9,5 +9,5 @@ RDEPEND=>=virtual/udev-208
RESTRICT=binchecks strip
SLOT=0
SRC_URI=https://www.freedesktop.org/software/media-player-info/media-player-info-23.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b521edaf20d63752a0b271753c238ad0
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=623862c144121d8b2d8d6d0f83fc1c76
diff --git a/metadata/md5-cache/app-misc/neofetch-4.0.2 b/metadata/md5-cache/app-misc/neofetch-4.0.2
index 396fce207d99..d544b8ab6485 100644
--- a/metadata/md5-cache/app-misc/neofetch-4.0.2
+++ b/metadata/md5-cache/app-misc/neofetch-4.0.2
@@ -8,4 +8,4 @@ LICENSE=MIT-with-advertising
RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
SLOT=0
SRC_URI=https://github.com/dylanaraps/neofetch/archive/4.0.2/neofetch-4.0.2.tar.gz
-_md5_=c10b4b1797c2fe8a9f0485f9f3f80067
+_md5_=f853e59744382d9b09b33a96ee6ac38b
diff --git a/metadata/md5-cache/app-misc/neofetch-5.0.0 b/metadata/md5-cache/app-misc/neofetch-5.0.0
new file mode 100644
index 000000000000..8947cc1a14f1
--- /dev/null
+++ b/metadata/md5-cache/app-misc/neofetch-5.0.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Simple information system script
+EAPI=7
+HOMEPAGE=https://github.com/dylanaraps/neofetch
+IUSE=X
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd
+LICENSE=MIT-with-advertising
+RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
+SLOT=0
+SRC_URI=https://github.com/dylanaraps/neofetch/archive/5.0.0/neofetch-5.0.0.tar.gz
+_md5_=f853e59744382d9b09b33a96ee6ac38b
diff --git a/metadata/md5-cache/app-misc/neofetch-9999 b/metadata/md5-cache/app-misc/neofetch-9999
index 59e48fc4ffa5..aa34f9c3fa6c 100644
--- a/metadata/md5-cache/app-misc/neofetch-9999
+++ b/metadata/md5-cache/app-misc/neofetch-9999
@@ -8,4 +8,4 @@ LICENSE=MIT-with-advertising
RDEPEND=sys-apps/pciutils X? ( media-gfx/imagemagick media-libs/imlib2 www-client/w3m[imlib] x11-apps/xprop x11-apps/xrandr x11-apps/xwininfo )
SLOT=0
_eclasses_=git-r3 8f6de46b0aa318aea0e8cac62ece098b
-_md5_=daa0904ff92f1f90bc2c01475b5832ad
+_md5_=f853e59744382d9b09b33a96ee6ac38b
diff --git a/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2 b/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
index 1af71dbd7642..52c8943e327a 100644
--- a/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
+++ b/metadata/md5-cache/app-misc/xmind-3.5.3.201506180105-r2
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm preinst
DEPEND=>=sys-apps/sed-4
DESCRIPTION=A brainstorming and mind mapping software tool
EAPI=5
-HOMEPAGE=http://www.xmind.net
+HOMEPAGE=https://www.xmind.net
KEYWORDS=amd64 x86
LICENSE=EPL-1.0 LGPL-3
RDEPEND=>=virtual/jre-1.5 x11-libs/gtk+:2
SLOT=0
SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-portable-3.5.3.201506180105.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80364db190562172faf954bb1ff22617
+_md5_=b61b2695899d930261580226def15a24
diff --git a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814 b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
index 85f35b4cb773..4d740112bc30 100644
--- a/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
+++ b/metadata/md5-cache/app-misc/xmind-3.7.6_p201801311814
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst setup
DEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=sys-apps/sed-4
DESCRIPTION=A brainstorming and mind mapping software tool
EAPI=6
-HOMEPAGE=http://www.xmind.net
+HOMEPAGE=https://www.xmind.net
IUSE=X
KEYWORDS=~amd64 ~x86
LICENSE=EPL-1.0 LGPL-3
@@ -10,4 +10,4 @@ RDEPEND=>=virtual/jre-1.8 x11-libs/gtk+:2
SLOT=0
SRC_URI=http://dl2.xmind.net/xmind-downloads/xmind-8-update7-linux.zip https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc font 82836641e7d4639329d8c195234ad0e3 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a336f7ec97cba88db6d7de66f9b003d3
+_md5_=e64b2bf1d92151d2ecba9a0a3844d7f8
diff --git a/metadata/md5-cache/app-mobilephone/Manifest.gz b/metadata/md5-cache/app-mobilephone/Manifest.gz
index 485a0df5790a..16f7dbf13267 100644
Binary files a/metadata/md5-cache/app-mobilephone/Manifest.gz and b/metadata/md5-cache/app-mobilephone/Manifest.gz differ
diff --git a/metadata/md5-cache/app-mobilephone/obexftp-0.24-r1 b/metadata/md5-cache/app-mobilephone/obexftp-0.24-r1
index e3edeff64944..1364773b638b 100644
--- a/metadata/md5-cache/app-mobilephone/obexftp-0.24-r1
+++ b/metadata/md5-cache/app-mobilephone/obexftp-0.24-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=File transfer over OBEX for mobile phones
EAPI=5
HOMEPAGE=http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp
-IUSE=perl python ruby tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+IUSE=perl python ruby tcl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
KEYWORDS=amd64 hppa ppc x86
LICENSE=GPL-2
-RDEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
+RDEPEND=>=dev-libs/openobex-1.7 net-wireless/bluez perl? ( dev-lang/perl:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) virtual/rubygems ) tcl? ( dev-lang/tcl:0= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
SLOT=0
SRC_URI=mirror://sourceforge/openobex/obexftp-0.24-Source.tar.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 ruby-single 7435c1687c234eb8cf5b212756f6381e ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e1137cdc414cc57479de9dbc3cc10288
+_md5_=7d1f6ffa5f7fb6d8a887f0014dba79d4
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index aa359ab6db10..a8e48ea8cf94 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/openoffice-bin-4.1.5 b/metadata/md5-cache/app-office/openoffice-bin-4.1.5
index fd9daa181600..ca95b7e6bbfe 100644
--- a/metadata/md5-cache/app-office/openoffice-bin-4.1.5
+++ b/metadata/md5-cache/app-office/openoffice-bin-4.1.5
@@ -4,7 +4,7 @@ DESCRIPTION=Apache OpenOffice productivity suite
EAPI=5
HOMEPAGE=https://www.openoffice.org/
IUSE=gnome java l10n_ast l10n_eu l10n_bg l10n_ca l10n_ca-valencia l10n_zh-CN l10n_zh-TW l10n_cs l10n_da l10n_nl l10n_en-GB l10n_fi l10n_fr l10n_gd l10n_gl l10n_de l10n_el l10n_he l10n_hi l10n_hu l10n_it l10n_ja l10n_km l10n_ko l10n_lt l10n_nb l10n_pl l10n_pt-BR l10n_pt l10n_ru l10n_sr l10n_sk l10n_sl l10n_es l10n_sv l10n_ta l10n_th l10n_tr l10n_vi
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
PDEPEND=java? ( >=virtual/jre-1.5 )
RDEPEND=!app-office/openoffice !prefix? ( sys-libs/glibc ) app-arch/unzip app-arch/zip >=dev-lang/perl-5.0 dev-lang/python:2.7 >=media-libs/freetype-2.1.10-r2 sys-libs/ncurses:5/5 x11-libs/libXaw x11-libs/libXinerama
@@ -12,4 +12,4 @@ RESTRICT=strip
SLOT=0
SRC_URI=amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_install-rpm_en-US.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_install-rpm_en-US.tar.gz ) l10n_ast? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ast.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ast.tar.gz ) ) l10n_eu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_eu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_eu.tar.gz ) ) l10n_bg? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_bg.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_bg.tar.gz ) ) l10n_ca? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ca.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ca.tar.gz ) ) l10n_ca-valencia? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ca-XV.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ca-XV.tar.gz ) ) l10n_zh-CN? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_zh-CN.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_zh-CN.tar.gz ) ) l10n_zh-TW? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_zh-TW.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_zh-TW.tar.gz ) ) l10n_cs? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_cs.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_cs.tar.gz ) ) l10n_da? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_da.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_da.tar.gz ) ) l10n_nl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_nl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_nl.tar.gz ) ) l10n_en-GB? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_en-GB.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_en-GB.tar.gz ) ) l10n_fi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_fi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_fi.tar.gz ) ) l10n_fr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_fr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_fr.tar.gz ) ) l10n_gd? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_gd.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_gd.tar.gz ) ) l10n_gl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_gl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_gl.tar.gz ) ) l10n_de? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_de.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_de.tar.gz ) ) l10n_el? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_el.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_el.tar.gz ) ) l10n_he? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_he.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_he.tar.gz ) ) l10n_hi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_hi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_hi.tar.gz ) ) l10n_hu? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_hu.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_hu.tar.gz ) ) l10n_it? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_it.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_it.tar.gz ) ) l10n_ja? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ja.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ja.tar.gz ) ) l10n_km? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_km.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_km.tar.gz ) ) l10n_ko? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ko.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ko.tar.gz ) ) l10n_lt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_lt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_lt.tar.gz ) ) l10n_nb? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_nb.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_nb.tar.gz ) ) l10n_pl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pl.tar.gz ) ) l10n_pt-BR? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pt-BR.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pt-BR.tar.gz ) ) l10n_pt? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_pt.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_pt.tar.gz ) ) l10n_ru? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ru.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ru.tar.gz ) ) l10n_sr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sr.tar.gz ) ) l10n_sk? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sk.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sk.tar.gz ) ) l10n_sl? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sl.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sl.tar.gz ) ) l10n_es? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_es.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_es.tar.gz ) ) l10n_sv? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_sv.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_sv.tar.gz ) ) l10n_ta? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_ta.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_ta.tar.gz ) ) l10n_th? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_th.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_th.tar.gz ) ) l10n_tr? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_tr.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_tr.tar.gz ) ) l10n_vi? ( amd64? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86-64_langpack-rpm_vi.tar.gz ) x86? ( mirror://sourceforge/openofficeorg.mirror/Apache_OpenOffice_4.1.5_Linux_x86_langpack-rpm_vi.tar.gz ) )
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 rpm f52cfa3a435468d86d3b49c357b9cb35 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9a8b0fba74d45601bf845f90c7aa6427
+_md5_=65a4e07e03ad70785a132085dae89fdd
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index ce579024f8e4..edf7802d8914 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/elogviewer-2.9 b/metadata/md5-cache/app-portage/elogviewer-2.9
index 681dc89a522f..ec4e2b295bb9 100644
--- a/metadata/md5-cache/app-portage/elogviewer-2.9
+++ b/metadata/md5-cache/app-portage/elogviewer-2.9
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile install postinst setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] || ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
DESCRIPTION=Elog viewer for Gentoo
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/elogviewer
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] || ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] || ( >=sys-apps/portage-2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) python_single_target_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/Synss/elogviewer/archive/v2.9.tar.gz -> elogviewer-2.9.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1df02a6830f4bf39927e4115b27e2f90
+_md5_=e7a5478550698099aad8cb594fea5e19
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 9624c4118bd2..e21c7991a92c 100644
Binary files a/metadata/md5-cache/app-shells/Manifest.gz and b/metadata/md5-cache/app-shells/Manifest.gz differ
diff --git a/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302 b/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302
index d001e415b26d..2e5ec17e906b 100644
--- a/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302
+++ b/metadata/md5-cache/app-shells/gentoo-bashcomp-20180302
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
DESCRIPTION=Gentoo-specific bash command-line completions (emerge, ebuild, equery, etc)
EAPI=6
HOMEPAGE=https://www.gentoo.org/
-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 ~m68k-mint ~sparc-solaris ~sparc64-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 ~m68k-mint ~sparc-solaris ~sparc64-solaris
LICENSE=GPL-2
SLOT=0
SRC_URI=https://gitweb.gentoo.org/proj/gentoo-bashcomp.git/snapshot/gentoo-bashcomp-20180302.tar.bz2
_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=830ed5e16b038f328b3df2fa1f3a2e58
+_md5_=4928ab233ea10cb8dd502f11f65cc287
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 08e66a05c728..580cb32be6c1 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 9fb36acc364a..84e7f51921ef 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.10
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.10
@@ -1,6 +1,6 @@
DEFINED_PHASES=configure install postinst prepare setup test
DEPEND=test? ( app-text/dvipng dev-texlive/texlive-latex dev-util/source-highlight media-gfx/graphviz media-gfx/imagemagick media-sound/lilypond 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] ) >=app-portage/elt-patches-20170422 !=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=AsciiDoc is a plain text human readable/writable document format
+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
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) pyt
SLOT=0
SRC_URI=https://github.com/asciidoc/asciidoc/archive/8.6.10.tar.gz -> asciidoc-8.6.10.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=199f68ad6a4ba91904f5d4a56272a489
+_md5_=9587b0990b76ed471ee278dbc9adcf28
diff --git a/metadata/md5-cache/app-text/asciidoc-8.6.9-r2 b/metadata/md5-cache/app-text/asciidoc-8.6.9-r2
index f242c9f42586..8a16aa1b9648 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.9-r2
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.9-r2
@@ -1,6 +1,6 @@
DEFINED_PHASES=configure install postinst prepare setup test
DEPEND=test? ( dev-util/source-highlight media-sound/lilypond media-gfx/imagemagick dev-texlive/texlive-latex app-text/dvipng media-gfx/graphviz 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] )
-DESCRIPTION=AsciiDoc is a plain text human readable/writable document format
+DESCRIPTION=A plain text human readable/writable document format
EAPI=5
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
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) pyt
SLOT=0
SRC_URI=mirror://sourceforge/project/asciidoc/asciidoc/8.6.9/asciidoc-8.6.9.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 readme.gentoo da528e0e6c88b426c83f9b3bce3df2ef toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=227730f668cd8470dae7a5b8137618e4
+_md5_=7e48b87aafefc3b9546fecd0ea39544f
diff --git a/metadata/md5-cache/app-text/asciidoc-8.6.9-r6 b/metadata/md5-cache/app-text/asciidoc-8.6.9-r6
index e9d26397ff3a..6dd4294c8835 100644
--- a/metadata/md5-cache/app-text/asciidoc-8.6.9-r6
+++ b/metadata/md5-cache/app-text/asciidoc-8.6.9-r6
@@ -1,6 +1,6 @@
DEFINED_PHASES=configure install postinst prepare setup test
DEPEND=test? ( app-text/dvipng dev-texlive/texlive-latex dev-util/source-highlight media-gfx/graphviz media-gfx/imagemagick media-sound/lilypond 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] )
-DESCRIPTION=AsciiDoc is a plain text human readable/writable document format
+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
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) pyt
SLOT=0
SRC_URI=mirror://sourceforge/project/asciidoc/asciidoc/8.6.9/asciidoc-8.6.9.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=45cc2ecc2d9418b70a478d6e47da8b58
+_md5_=a5dca8cbb1eea471c0cdc53c46eb7678
diff --git a/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r2 b/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r2
index a0337cd288a9..7db2d310f190 100644
--- a/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r2
+++ b/metadata/md5-cache/app-text/docbook-dsssl-stylesheets-1.79-r2
@@ -3,10 +3,10 @@ DEPEND=>=app-text/sgml-common-0.6.3-r2
DESCRIPTION=DSSSL Stylesheets for DocBook
EAPI=5
HOMEPAGE=https://github.com/docbook/wiki/wiki
-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-macos ~sparc-solaris ~x64-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-macos ~sparc-solaris ~x64-solaris
LICENSE=MIT
RDEPEND=app-text/sgml-common
SLOT=0
SRC_URI=mirror://sourceforge/docbook/docbook-dsssl-1.79.tar.bz2
_eclasses_=base 983774947da124fb7d542ce25a218bb1 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 sgml-catalog 1ca36a4ae32c67b390f310dd6d7b1189 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d46352f4dcf43e10203a160d06bb291d
+_md5_=2c5627f6354a0d8d89296515238cd012
diff --git a/metadata/md5-cache/app-text/kbibtex-0.8_pre20180526-r1 b/metadata/md5-cache/app-text/kbibtex-0.8.1
similarity index 97%
rename from metadata/md5-cache/app-text/kbibtex-0.8_pre20180526-r1
rename to metadata/md5-cache/app-text/kbibtex-0.8.1
index 6e61d58437e1..c5b54f587d9e 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.8_pre20180526-r1
+++ b/metadata/md5-cache/app-text/kbibtex-0.8.1
@@ -10,6 +10,6 @@ RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5
REQUIRED_USE=?? ( webengine webkit )
RESTRICT=test
SLOT=5
-SRC_URI=mirror://kde/unstable/KBibTeX/kbibtex-0.7.95.tar.xz
+SRC_URI=mirror://kde/stable/KBibTeX/0.8.1/kbibtex-0.8.1.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 kde5 0afda9a43e3d76e470f447753ad056af kde5-functions 5023dbcb3c1a817f64e2c51cc71f08ab ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4448ff301f01dc83c0f20e6fe9fd6e62
+_md5_=cc9d13569b432e1e305ba9a67e00527d
diff --git a/metadata/md5-cache/app-text/pdfgrep-2.0.1 b/metadata/md5-cache/app-text/pdfgrep-2.0.1
index c39d4e4dc2c2..b53215e95c57 100644
--- a/metadata/md5-cache/app-text/pdfgrep-2.0.1
+++ b/metadata/md5-cache/app-text/pdfgrep-2.0.1
@@ -4,9 +4,9 @@ DESCRIPTION=A tool similar to grep which searches text in PDFs
EAPI=6
HOMEPAGE=http://www.pdfgrep.org/
IUSE=+pcre test unac
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=GPL-2
RDEPEND=app-text/poppler:=[cxx] dev-libs/libgcrypt:0= pcre? ( dev-libs/libpcre[cxx] ) unac? ( app-text/unac )
SLOT=0
SRC_URI=http://www.pdfgrep.org/download/pdfgrep-2.0.1.tar.gz
-_md5_=3a7dc0ab0a7a5018c51130fea63a3f35
+_md5_=ef7adf072f90578b03924aad1c13b98f
diff --git a/metadata/md5-cache/app-text/poppler-0.62.0-r1 b/metadata/md5-cache/app-text/poppler-0.62.0-r1
index 2e58b7e48666..06163912a916 100644
--- a/metadata/md5-cache/app-text/poppler-0.62.0-r1
+++ b/metadata/md5-cache/app-text/poppler-0.62.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
EAPI=6
HOMEPAGE=https://poppler.freedesktop.org/
IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
RESTRICT=test
SLOT=0/73
SRC_URI=https://poppler.freedesktop.org/poppler-0.62.0.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=475f937097beeeafe1012e7032592016
+_md5_=3dd7049092d54e4015ad7a98fa2b7734
diff --git a/metadata/md5-cache/app-text/poppler-data-0.4.7 b/metadata/md5-cache/app-text/poppler-data-0.4.7
index 538556626080..d1a356890a28 100644
--- a/metadata/md5-cache/app-text/poppler-data-0.4.7
+++ b/metadata/md5-cache/app-text/poppler-data-0.4.7
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
EAPI=5
HOMEPAGE=https://poppler.freedesktop.org/
-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 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+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 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD GPL-2 MIT
SLOT=0
SRC_URI=https://poppler.freedesktop.org/poppler-data-0.4.7.tar.gz
-_md5_=7854bb213d2bcd2e9c76544f6d6d1413
+_md5_=74c3021c99e5405a333bd557625f5219
diff --git a/metadata/md5-cache/app-text/texlive-core-2017-r4 b/metadata/md5-cache/app-text/texlive-core-2017-r4
index 5e5617741659..00eef2641d10 100644
--- a/metadata/md5-cache/app-text/texlive-core-2017-r4
+++ b/metadata/md5-cache/app-text/texlive-core-2017-r4
@@ -4,10 +4,10 @@ DESCRIPTION=A complete TeX distribution
EAPI=5
HOMEPAGE=https://tug.org/texlive/
IUSE=cjk X doc source tk +luajittex xetex
-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=GPL-2 LPPL-1.3c TeX
RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !app-text/ptex !app-text/tetex !=media-libs/libpng-1.2.43-r2:0= >=app-text/poppler-0.58.0:= >=x11-libs/cairo-1.12 >=x11-libs/pixman-0.18 dev-libs/zziplib app-text/libpaper dev-libs/gmp:0 dev-libs/mpfr:0= xetex? ( >=media-libs/harfbuzz-1.4.5[icu,graphite] >=dev-libs/icu-50:= >=app-text/teckit-2.5.3 media-libs/fontconfig media-gfx/graphite2 ) media-libs/freetype:2 >=dev-libs/kpathsea-6.2.3 cjk? ( >=dev-libs/ptexenc-1.3.5 ) >=app-text/ps2pkm-1.8_p20170524 >=app-text/dvipsk-5.997 >=dev-tex/bibtexu-3.71_p20170524 virtual/perl-Getopt-Long tk? ( dev-perl/Tk )
SLOT=0
SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz mirror://gentoo/texlive-core-patches-70.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive-20170524-source-freetype.patch.xz mirror://gentoo/texlive-module-tetex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-base-2017.tar.xz mirror://gentoo/texlive-module-texconfig-2017.tar.xz mirror://gentoo/texlive-module-gsftopk-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra-2017.tar.xz mirror://gentoo/texlive-module-a2ping-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2017.tar.xz mirror://gentoo/texlive-module-arara-2017.tar.xz mirror://gentoo/texlive-module-asymptote-2017.tar.xz mirror://gentoo/texlive-module-bundledoc-2017.tar.xz mirror://gentoo/texlive-module-checklistings-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk-2017.tar.xz mirror://gentoo/texlive-module-ctanify-2017.tar.xz mirror://gentoo/texlive-module-ctanupload-2017.tar.xz mirror://gentoo/texlive-module-ctie-2017.tar.xz mirror://gentoo/texlive-module-cweb-2017.tar.xz mirror://gentoo/texlive-module-de-macro-2017.tar.xz mirror://gentoo/texlive-module-dtl-2017.tar.xz mirror://gentoo/texlive-module-dtxgen-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty-2017.tar.xz mirror://gentoo/texlive-module-dviasm-2017.tar.xz mirror://gentoo/texlive-module-dvicopy-2017.tar.xz mirror://gentoo/texlive-module-dvidvi-2017.tar.xz mirror://gentoo/texlive-module-dviljk-2017.tar.xz mirror://gentoo/texlive-module-dvipos-2017.tar.xz mirror://gentoo/texlive-module-findhyph-2017.tar.xz mirror://gentoo/texlive-module-fragmaster-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2017.tar.xz mirror://gentoo/texlive-module-hyphenex-2017.tar.xz mirror://gentoo/texlive-module-installfont-2017.tar.xz mirror://gentoo/texlive-module-lacheck-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize-2017.tar.xz mirror://gentoo/texlive-module-latex2man-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion-2017.tar.xz mirror://gentoo/texlive-module-latexpand-2017.tar.xz mirror://gentoo/texlive-module-latexindent-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2017.tar.xz mirror://gentoo/texlive-module-ltximg-2017.tar.xz mirror://gentoo/texlive-module-listings-ext-2017.tar.xz mirror://gentoo/texlive-module-make4ht-2017.tar.xz mirror://gentoo/texlive-module-match_parens-2017.tar.xz mirror://gentoo/texlive-module-mflua-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2017.tar.xz mirror://gentoo/texlive-module-patgen-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2017.tar.xz mirror://gentoo/texlive-module-pdftools-2017.tar.xz mirror://gentoo/texlive-module-pdfxup-2017.tar.xz mirror://gentoo/texlive-module-pfarrei-2017.tar.xz mirror://gentoo/texlive-module-pkfix-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2017.tar.xz mirror://gentoo/texlive-module-purifyeps-2017.tar.xz mirror://gentoo/texlive-module-seetexk-2017.tar.xz mirror://gentoo/texlive-module-srcredact-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx-2017.tar.xz mirror://gentoo/texlive-module-synctex-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook-2017.tar.xz mirror://gentoo/texlive-module-texcount-2017.tar.xz mirror://gentoo/texlive-module-texdef-2017.tar.xz mirror://gentoo/texlive-module-texdiff-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten-2017.tar.xz mirror://gentoo/texlive-module-texdoc-2017.tar.xz mirror://gentoo/texlive-module-texfot-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser-2017.tar.xz mirror://gentoo/texlive-module-texosquery-2017.tar.xz mirror://gentoo/texlive-module-texware-2017.tar.xz mirror://gentoo/texlive-module-tie-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2017.tar.xz mirror://gentoo/texlive-module-web-2017.tar.xz mirror://gentoo/texlive-module-collection-binextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2017.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2017.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2017.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-arara.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2017.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2017.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2017.tar.xz mirror://gentoo/texlive-module-ctie.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb.doc-2017.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2017.tar.xz mirror://gentoo/texlive-module-dtl.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2017.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2017.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2017.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2017.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2017.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2017.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-installfont.doc-2017.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2017.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2017.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2017.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2017.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2017.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2017.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2017.tar.xz mirror://gentoo/texlive-module-synctex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-texcount.doc-2017.tar.xz mirror://gentoo/texlive-module-texdef.doc-2017.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2017.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-texfot.doc-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2017.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2017.tar.xz mirror://gentoo/texlive-module-texware.doc-2017.tar.xz mirror://gentoo/texlive-module-tie.doc-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-web.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2017.tar.xz mirror://gentoo/texlive-module-arara.source-2017.tar.xz mirror://gentoo/texlive-module-checklistings.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2017.tar.xz mirror://gentoo/texlive-module-pythontex.source-2017.tar.xz mirror://gentoo/texlive-module-texdef.source-2017.tar.xz mirror://gentoo/texlive-module-texosquery.source-2017.tar.xz )
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 texlive-common f68a634c367f10b9fbb8fb02195ba411 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=62207fb10b610a9ea2604381f9c65222
+_md5_=74746145cf1d4436dc64308e2321580e
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index 4b5ecce03ea2..eca9660105a2 100644
Binary files a/metadata/md5-cache/app-vim/Manifest.gz and b/metadata/md5-cache/app-vim/Manifest.gz differ
diff --git a/metadata/md5-cache/app-vim/perl-support-5.4 b/metadata/md5-cache/app-vim/perl-support-5.4
index 95252bb14628..ee38fdc33805 100644
--- a/metadata/md5-cache/app-vim/perl-support-5.4
+++ b/metadata/md5-cache/app-vim/perl-support-5.4
@@ -3,10 +3,10 @@ DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
DESCRIPTION=vim plugin: Perl-IDE - Write and run Perl scripts using menus and hotkeys
EAPI=5
HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=556
-KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos
LICENSE=GPL-2 GPL-2+
RDEPEND=!ppc? ( dev-perl/Devel-NYTProf ) dev-perl/Perl-Tidy dev-perl/Perl-Tags dev-perl/Perl-Critic || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
SLOT=0
SRC_URI=https://github.com/WolfgangMehner/perl-support/archive/version-5.4.tar.gz -> perl-support-5.4.tar.gz
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
-_md5_=45eebc007f68852ce9d3f8b30622fdb8
+_md5_=7cf245e9774630d7efe64d645becfbb4
diff --git a/metadata/md5-cache/app-xemacs/Manifest.gz b/metadata/md5-cache/app-xemacs/Manifest.gz
index 06ffd12d636e..15acaf83613d 100644
Binary files a/metadata/md5-cache/app-xemacs/Manifest.gz and b/metadata/md5-cache/app-xemacs/Manifest.gz differ
diff --git a/metadata/md5-cache/app-xemacs/ebuild-mode-1.44 b/metadata/md5-cache/app-xemacs/ebuild-mode-1.44
new file mode 100644
index 000000000000..9d2e6b17a434
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/ebuild-mode-1.44
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script app-editors/xemacs
+DESCRIPTION=Emacs modes for editing ebuilds and other Gentoo specific files
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Emacs
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2+
+RDEPEND=>=app-editors/xemacs-21.4.20-r5 app-xemacs/sh-script
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~ulm/emacs/ebuild-mode-1.44.tar.xz
+_eclasses_=xemacs-elisp ec6a89e5b3d4b998d328d445d1c7ec06 xemacs-elisp-common 5ad47e1940fe7ffbdeeb002a3912bf79
+_md5_=88eb99e8ef5020a6e684fe940b9658bc
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 3a8dee68246b..8cef27dcfc84 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/mariadb-10.0.35-r2 b/metadata/md5-cache/dev-db/mariadb-10.0.35-r2
index e83f2b49c378..63cd0ab2a060 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.0.35-r2
+++ b/metadata/md5-cache/dev-db/mariadb-10.0.35-r2
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test )
SLOT=0/18
SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.0.35/source/mariadb-10.0.35.tar.gz mirror://gentoo/mysql-extras-20180515-1334Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180515-1334Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180515-1334Z.tar.bz2
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e353cc71093858a0f546c955aa069a7
+_md5_=e2c8ebc25d09d62cbae48201a106cc82
diff --git a/metadata/md5-cache/dev-db/mariadb-10.1.34 b/metadata/md5-cache/dev-db/mariadb-10.1.34
index c3f778518d97..75720abcedc0 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.1.34
+++ b/metadata/md5-cache/dev-db/mariadb-10.1.34
@@ -13,4 +13,4 @@ RESTRICT=!bindist? ( bindist ) libressl? ( test )
SLOT=0/18
SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.1.34/source/mariadb-10.1.34.tar.gz mirror://gentoo/mysql-extras-20180621-0218Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180621-0218Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180621-0218Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180621-0218Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180621-0218Z.tar.bz2
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e86eed2f636f0fb106c12a8f5638e3dc
+_md5_=72786dbda03a418a320c1f8c1d6aa58d
diff --git a/metadata/md5-cache/dev-db/mariadb-5.5.60 b/metadata/md5-cache/dev-db/mariadb-5.5.60
index 1ec46baf5bba..239c83b189ed 100644
--- a/metadata/md5-cache/dev-db/mariadb-5.5.60
+++ b/metadata/md5-cache/dev-db/mariadb-5.5.60
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare
DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) ssl? ( !>=dev-libs/openssl-1.1 ) sys-devel/make >=dev-util/cmake-3.9.6 ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) oqgraph? ( >=dev-libs/boost-1.40.0 ) !minimal? ( pam? ( virtual/pam ) ) perl? ( !dev-db/mytop ) !dev-db/mysql !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3
DESCRIPTION=An enhanced, drop-in replacement for MySQL
EAPI=5
-HOMEPAGE=http://mariadb.org/
+HOMEPAGE=https://mariadb.org/
IUSE=bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling oqgraph sphinx pam tokudb jemalloc tcmalloc systemtap
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-2
@@ -12,5 +12,5 @@ REQUIRED_USE=minimal? ( !oqgraph ) minimal? ( !sphinx ) tokudb? ( jemalloc !tcma
RESTRICT=!bindist? ( bindist )
SLOT=0/18
SRC_URI=http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.60/kvm-tarbake-jaunty-x86/mariadb-5.5.60.tar.gz http://ftp.osuosl.org/pub/mariadb/mariadb-5.5.60/source/mariadb-5.5.60.tar.gz http://mirror.jmu.edu/pub/mariadb/mariadb-5.5.60/kvm-tarbake-jaunty-x86/mariadb-5.5.60.tar.gz http://mirrors.coreix.net/mariadb/mariadb-5.5.60/kvm-tarbake-jaunty-x86/mariadb-5.5.60.tar.gz http://mirrors.syringanetworks.net/mariadb/mariadb-5.5.60/kvm-tarbake-jaunty-x86/mariadb-5.5.60.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.5.60/kvm-tarbake-jaunty-x86/mariadb-5.5.60.tar.gz http://mirror2.hs-esslingen.de/mariadb/mariadb-5.5.60/kvm-tarbake-jaunty-x86/mariadb-5.5.60.tar.gz mirror://gentoo/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20160721-1526Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20160721-1526Z.tar.bz2
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 mysql-cmake 39849cc54381eee7c8d7333058ea7132 mysql-v2 c498244d7e52726f86bb9c0a02e0f14b mysql_fx fd803e05287868299aac78823b68920e ninja-utils d2e7e7d290428bb25c56dcf2502badc1 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 mysql-cmake 39849cc54381eee7c8d7333058ea7132 mysql-v2 af0178e9946ce2a0df18ca31f697e949 mysql_fx fd803e05287868299aac78823b68920e ninja-utils d2e7e7d290428bb25c56dcf2502badc1 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
_md5_=fe4883f60e960a27b519d800db1d66f7
diff --git a/metadata/md5-cache/dev-db/mysql-5.5.60 b/metadata/md5-cache/dev-db/mysql-5.5.60
index 1c976653a3e7..11f541ddc581 100644
--- a/metadata/md5-cache/dev-db/mysql-5.5.60
+++ b/metadata/md5-cache/dev-db/mysql-5.5.60
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare
DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/make >=dev-util/cmake-3.9.6 ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3
DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
EAPI=5
-HOMEPAGE=http://www.mysql.com/
+HOMEPAGE=https://www.mysql.com/
IUSE=bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-2
@@ -12,5 +12,5 @@ REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster
RESTRICT=!bindist? ( bindist )
SLOT=0/18
SRC_URI=http://downloads.mysql.com/archives/mysql-5.5/mysql-5.5.60.tar.gz https://downloads.skysql.com/files/mysql-5.5/mysql-5.5.60.tar.gz mirror://mysql/Downloads/MySQL-5.5/mysql-5.5.60.tar.gz mirror://gentoo/mysql-extras-20180214-0024Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180214-0024Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180214-0024Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180214-0024Z.tar.bz2
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 mysql-cmake 39849cc54381eee7c8d7333058ea7132 mysql-v2 c498244d7e52726f86bb9c0a02e0f14b mysql_fx fd803e05287868299aac78823b68920e ninja-utils d2e7e7d290428bb25c56dcf2502badc1 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 mysql-cmake 39849cc54381eee7c8d7333058ea7132 mysql-v2 af0178e9946ce2a0df18ca31f697e949 mysql_fx fd803e05287868299aac78823b68920e ninja-utils d2e7e7d290428bb25c56dcf2502badc1 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
_md5_=07cbb0e0242e923123546310c177ca0f
diff --git a/metadata/md5-cache/dev-db/mysql-5.7.22 b/metadata/md5-cache/dev-db/mysql-5.7.22
index 47547eeaa6af..f879d126ebd4 100644
--- a/metadata/md5-cache/dev-db/mysql-5.7.22
+++ b/metadata/md5-cache/dev-db/mysql-5.7.22
@@ -13,4 +13,4 @@ RESTRICT=libressl? ( test )
SLOT=0/18
SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.7/mysql-boost-5.7.22.tar.gz https://cdn.mysql.com/archives/mysql-5.7/mysql-boost-5.7.22.tar.gz http://downloads.mysql.com/archives/MySQL-5.7/mysql-boost-5.7.22.tar.gz mirror://gentoo/mysql-extras-20180312-2011Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180312-2011Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180312-2011Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180312-2011Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180312-2011Z.tar.bz2
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bed2932db99f6cb34e5d60eeb4ccdf0b
+_md5_=0c9bf582aebcdaa09ea713e7d7f34d4e
diff --git a/metadata/md5-cache/dev-db/mysql-cluster-7.2.31 b/metadata/md5-cache/dev-db/mysql-cluster-7.2.31
index da89e2f85bd7..f478d5a3235a 100644
--- a/metadata/md5-cache/dev-db/mysql-cluster-7.2.31
+++ b/metadata/md5-cache/dev-db/mysql-cluster-7.2.31
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile config configure install postinst postrm preinst prepare
DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) java? ( >=dev-java/java-config-2.2.0-r3 ) sys-devel/make >=dev-util/cmake-3.9.6 ssl? ( >=dev-libs/openssl-0.9.6d:0 ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/zlib-1.2.3 !bindist? ( >=sys-libs/readline-4.1:0 ) !dev-db/mysql !dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server jemalloc? ( dev-libs/jemalloc[static-libs?] ) tcmalloc? ( dev-util/google-perftools ) >=sys-libs/zlib-1.2.3[static-libs?] ssl? ( >=dev-libs/openssl-0.9.6d[static-libs?] ) systemtap? ( >=dev-util/systemtap-1.3 ) kernel_linux? ( dev-libs/libaio ) dev-libs/libevent java? ( >=virtual/jdk-1.6 ) virtual/yacc static? ( sys-libs/ncurses[static-libs] ) >=dev-util/cmake-2.4.3 >=dev-util/cmake-2.6.3
DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
EAPI=5
-HOMEPAGE=http://www.mysql.com/
+HOMEPAGE=https://www.mysql.com/
IUSE=elibc_FreeBSD java bindist debug embedded minimal +perl selinux ssl static static-libs test latin1 extraengine cluster max-idx-128 +community profiling jemalloc tcmalloc systemtap
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -12,5 +12,5 @@ REQUIRED_USE=tcmalloc? ( !jemalloc ) jemalloc? ( !tcmalloc ) minimal? ( !cluster
RESTRICT=!bindist? ( bindist )
SLOT=0
SRC_URI=http://downloads.mysql.com/archives/mysql-cluster-gpl-7.2/mysql-cluster-gpl-7.2.31.tar.gz https://downloads.skysql.com/files/mysql-cluster-gpl-7.2/mysql-cluster-gpl-7.2.31.tar.gz mirror://mysql/Downloads/MySQL-Cluster-7.2/mysql-cluster-gpl-7.2.31.tar.gz mirror://gentoo/mysql-extras-20171108-2050Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171108-2050Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171108-2050Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171108-2050Z.tar.bz2
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 mysql-cmake 39849cc54381eee7c8d7333058ea7132 mysql-v2 c498244d7e52726f86bb9c0a02e0f14b mysql_fx fd803e05287868299aac78823b68920e ninja-utils d2e7e7d290428bb25c56dcf2502badc1 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 mysql-cmake 39849cc54381eee7c8d7333058ea7132 mysql-v2 af0178e9946ce2a0df18ca31f697e949 mysql_fx fd803e05287868299aac78823b68920e ninja-utils d2e7e7d290428bb25c56dcf2502badc1 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
_md5_=034d6b5cf66d009f3bb014418886b259
diff --git a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9 b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9
index e6d126518a20..3aa21a622bde 100644
--- a/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9
+++ b/metadata/md5-cache/dev-db/mysql-connector-c++-1.1.9
@@ -4,10 +4,10 @@ DESCRIPTION=MySQL database connector for C++ (mimics JDBC 4.0 API)
EAPI=6
HOMEPAGE=https://dev.mysql.com/downloads/connector/cpp/
IUSE=debug examples gcov static-libs
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=virtual/libmysqlclient:= dev-libs/boost:= dev-libs/openssl:0= !=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=5
-HOMEPAGE=http://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[crypt,ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.0.10.20
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.0.10.20/phpMyAdmin-4.0.10.20-all-languages.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 6ae2395d7f341093c36057cb4f69101a
-_md5_=58d198717d596e145e893f2af7be7964
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.7.7-r1 b/metadata/md5-cache/dev-db/phpmyadmin-4.7.7-r1
deleted file mode 100644
index fe0600eee51a..000000000000
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.7.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=5
-HOMEPAGE=https://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.7.7-r1
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.7.7/phpMyAdmin-4.7.7-all-languages.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 6ae2395d7f341093c36057cb4f69101a
-_md5_=2b63f3ec5940a72d250ac61050778b46
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.7.9 b/metadata/md5-cache/dev-db/phpmyadmin-4.7.9
deleted file mode 100644
index 748afbf0a075..000000000000
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.7.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=5
-HOMEPAGE=https://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.7.9
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.7.9/phpMyAdmin-4.7.9-all-languages.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 6ae2395d7f341093c36057cb4f69101a
-_md5_=cbb7141d8c95de096c713f7540ade3cc
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.8.0.1 b/metadata/md5-cache/dev-db/phpmyadmin-4.8.0.1
deleted file mode 100644
index ad4a5c5c04dc..000000000000
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.8.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for MySQL database in PHP
-EAPI=5
-HOMEPAGE=https://www.phpmyadmin.net/
-IUSE=setup vhosts
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.8.0.1
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.8.0.1/phpMyAdmin-4.8.0.1-all-languages.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 6ae2395d7f341093c36057cb4f69101a
-_md5_=cbb7141d8c95de096c713f7540ade3cc
diff --git a/metadata/md5-cache/dev-db/phpmyadmin-4.8.1 b/metadata/md5-cache/dev-db/phpmyadmin-4.8.2
similarity index 90%
rename from metadata/md5-cache/dev-db/phpmyadmin-4.8.1
rename to metadata/md5-cache/dev-db/phpmyadmin-4.8.2
index 81ce9470ea2b..834f14abee07 100644
--- a/metadata/md5-cache/dev-db/phpmyadmin-4.8.1
+++ b/metadata/md5-cache/dev-db/phpmyadmin-4.8.2
@@ -7,7 +7,7 @@ IUSE=setup vhosts
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
LICENSE=GPL-2
RDEPEND=dev-lang/php[ctype,filter,json,session,unicode] || ( dev-lang/php[mysqli] dev-lang/php[mysql] ) virtual/httpd-php:* >=app-admin/webapp-config-1.50.15
-SLOT=4.8.1
-SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.8.1/phpMyAdmin-4.8.1-all-languages.tar.xz
+SLOT=4.8.2
+SRC_URI=https://files.phpmyadmin.net/phpMyAdmin/4.8.2/phpMyAdmin-4.8.2-all-languages.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 6ae2395d7f341093c36057cb4f69101a
_md5_=cbb7141d8c95de096c713f7540ade3cc
diff --git a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1 b/metadata/md5-cache/dev-db/qdbm-1.8.78-r2
similarity index 68%
rename from metadata/md5-cache/dev-db/qdbm-1.8.78-r1
rename to metadata/md5-cache/dev-db/qdbm-1.8.78-r2
index 105942f50e09..3b5f6c860099 100644
--- a/metadata/md5-cache/dev-db/qdbm-1.8.78-r1
+++ b/metadata/md5-cache/dev-db/qdbm-1.8.78-r2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
RDEPEND=bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
SLOT=0
SRC_URI=http://fallabs.com/qdbm/qdbm-1.8.78.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e perl-functions 01e8c68d5a528bbcda4d3c60205983df preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0f3d281c6e5781a8dc90a7c6e06d08e4
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e perl-functions 01e8c68d5a528bbcda4d3c60205983df preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=7b80f9d12c3898ac9bb5e5c495c789a4
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 3c2b344acd42..deb07b4b2368 100644
Binary files a/metadata/md5-cache/dev-embedded/Manifest.gz and b/metadata/md5-cache/dev-embedded/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-embedded/platformio-3.5.3 b/metadata/md5-cache/dev-embedded/platformio-3.5.3
index 8cf6e9a669fe..1c4c60e93c52 100644
--- a/metadata/md5-cache/dev-embedded/platformio-3.5.3
+++ b/metadata/md5-cache/dev-embedded/platformio-3.5.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare setup test
DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
DESCRIPTION=An open source ecosystem for IoT development
EAPI=6
-HOMEPAGE=http://platformio.org/
+HOMEPAGE=https://platformio.org/
IUSE=python_targets_python2_7
KEYWORDS=~x86 ~amd64
LICENSE=BSD
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=mirror://pypi/p/platformio/platformio-3.5.3.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fa4a16ade0ec28ef265ff84e4460096a
+_md5_=141779745d2e371615608e0b1409b959
diff --git a/metadata/md5-cache/dev-haskell/Manifest.gz b/metadata/md5-cache/dev-haskell/Manifest.gz
index d962c92acc6c..568a95f13097 100644
Binary files a/metadata/md5-cache/dev-haskell/Manifest.gz and b/metadata/md5-cache/dev-haskell/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-haskell/transformers-base-0.4.1 b/metadata/md5-cache/dev-haskell/transformers-base-0.4.1
deleted file mode 100644
index 629260157660..000000000000
--- a/metadata/md5-cache/dev-haskell/transformers-base-0.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/transformers-0.2[profile?] >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.6.0 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Lift computations from the bottom of a transformer stack
-EAPI=4
-HOMEPAGE=https://github.com/mvv/transformers-base
-IUSE=doc hscolour profile
-KEYWORDS=amd64 x86 ~amd64-linux
-LICENSE=BSD
-RDEPEND=>=dev-haskell/transformers-0.2[profile?] >=dev-lang/ghc-6.8.2
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/transformers-base/0.4.1/transformers-base-0.4.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ghc-package a0d34e2f5f204f01c404ae1ce539542a haskell-cabal 45605f3898bdc59eb016fb50ca27bf18 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=d491588d77f259338a666b41dbc20b86
diff --git a/metadata/md5-cache/dev-haskell/unix-compat-0.3.0.1 b/metadata/md5-cache/dev-haskell/unix-compat-0.3.0.1
deleted file mode 100644
index 5ea4e52571cb..000000000000
--- a/metadata/md5-cache/dev-haskell/unix-compat-0.3.0.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-lang/ghc-6.12.1 >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Portable POSIX-compatibility layer
-EAPI=4
-HOMEPAGE=https://github.com/jystic/unix-compat
-IUSE=doc hscolour profile
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=>=dev-lang/ghc-6.12.1
-SLOT=0
-SRC_URI=mirror://hackage/packages/archive/unix-compat/0.3.0.1/unix-compat-0.3.0.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ghc-package a0d34e2f5f204f01c404ae1ce539542a haskell-cabal 45605f3898bdc59eb016fb50ca27bf18 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=061e37458d4362220615788b413d0bf2
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index e49f75f56e5a..51bf849a8c82 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/icedtea-web-1.6.2 b/metadata/md5-cache/dev-java/icedtea-web-1.6.2
index 010bee9188d1..b09c89b04f18 100644
--- a/metadata/md5-cache/dev-java/icedtea-web-1.6.2
+++ b/metadata/md5-cache/dev-java/icedtea-web-1.6.2
@@ -4,11 +4,11 @@ DESCRIPTION=FOSS Java browser plugin and Web Start implementation
EAPI=5
HOMEPAGE=http://icedtea.classpath.org
IUSE=doc javascript nsplugin tagsoup test elibc_FreeBSD
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86
LICENSE=GPL-2 GPL-2-with-linking-exception LGPL-2
RDEPEND=javascript? ( dev-java/rhino:1.6 ) nsplugin? ( >=dev-libs/glib-2.16:2= ) tagsoup? ( dev-java/tagsoup:0 ) >=app-eselect/eselect-java-0.2.0 >=virtual/jre-1.7 nsplugin? ( !dev-java/oracle-jdk-bin[nsplugin] !dev-java/oracle-jre-bin[nsplugin] ) >=dev-java/java-config-2.2.0-r3
RESTRICT=test
SLOT=0
SRC_URI=http://icedtea.classpath.org/download/source/icedtea-web-1.6.2.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d4599466389f73466b3735491a5fbf74
+_md5_=3a7ad49affa6dded9cdedb40b5603685
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 9bf17f1d6142..96b118ccddaf 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/swi-prolog-7.7.15 b/metadata/md5-cache/dev-lang/swi-prolog-7.7.15
new file mode 100644
index 000000000000..358f84930d3c
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.7.15
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-base/xorg-proto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=free, small, and standard compliant Prolog compiler
+EAPI=6
+HOMEPAGE=http://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X elibc_FreeBSD java
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=http://www.swi-prolog.org/download/devel/src/swipl-7.7.15.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=33f50845f75787c5eae51437002e1951
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 084c3b1fd96c..49da87f12b0c 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/appstream-glib-0.6.13 b/metadata/md5-cache/dev-libs/appstream-glib-0.6.13
index 9e13883b463d..d09913fa4ea8 100644
--- a/metadata/md5-cache/dev-libs/appstream-glib-0.6.13
+++ b/metadata/md5-cache/dev-libs/appstream-glib-0.6.13
@@ -5,9 +5,9 @@ EAPI=6
HOMEPAGE=https://people.freedesktop.org/~hughsient/appstream-glib/
IUSE=+introspection nls stemmer
KEYWORDS=alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
+LICENSE=LGPL-2.1+
RDEPEND=app-arch/gcab app-arch/libarchive dev-db/sqlite:3 >=dev-libs/glib-2.45.8:2 >=dev-libs/json-glib-1.1.1 dev-libs/libyaml >=media-libs/fontconfig-2.11:1.0 >=media-libs/freetype-2.4:2 >=net-libs/libsoup-2.51.92:2.4 sys-apps/util-linux >=x11-libs/gdk-pixbuf-2.31.5:2[introspection?] x11-libs/gtk+:3 x11-libs/pango introspection? ( >=dev-libs/gobject-introspection-0.9.8:= ) stemmer? ( dev-libs/snowball-stemmer ) !=dev-util/cmake-3.9.6
DESCRIPTION=Application Introspection System
EAPI=6
-HOMEPAGE=http://computation.llnl.gov/projects/caliper
+HOMEPAGE=https://computation.llnl.gov/projects/caliper
KEYWORDS=~amd64 ~x86
LICENSE=BSD
RDEPEND=net-misc/curl sys-libs/libunwind dev-libs/papi
SLOT=0
SRC_URI=https://github.com/LLNL/caliper/archive/v1.5.0.tar.gz -> caliper-1.5.0.tar.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c7f02d8182ebab961fe59a16a3c8e8ba
+_md5_=1bdd47a2cf827d6b42970482c8191f97
diff --git a/metadata/md5-cache/dev-libs/efl-1.18.4 b/metadata/md5-cache/dev-libs/efl-1.18.4
index efdc514fea3c..786edd4a6b72 100644
--- a/metadata/md5-cache/dev-libs/efl-1.18.4
+++ b/metadata/md5-cache/dev-libs/efl-1.18.4
@@ -4,11 +4,11 @@ DESCRIPTION=Enlightenment Foundation Libraries all-in-one package
EAPI=5
HOMEPAGE=https://www.enlightenment.org
IUSE=+bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jpeg2k libressl neon oldlua opengl ssl physics pixman +png postscript +ppm +psd pulseaudio raw scim sdl sound systemd tga tiff tslib unwind v4l valgrind wayland webp X xim xine xpm nls doc
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=BSD-2 GPL-2 LGPL-2.1 ZLIB
RDEPEND=drm? ( >=dev-libs/libinput-0.8 media-libs/mesa[gbm] >=x11-libs/libdrm-2.4 >=x11-libs/libxkbcommon-0.3.0 ) fontconfig? ( media-libs/fontconfig ) fribidi? ( dev-libs/fribidi ) gif? ( media-libs/giflib ) glib? ( dev-libs/glib:2 ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) harfbuzz? ( media-libs/harfbuzz ) ibus? ( app-i18n/ibus ) jpeg2k? ( media-libs/openjpeg:0 ) !oldlua? ( >=dev-lang/luajit-2.0.0 ) oldlua? ( dev-lang/lua:* ) physics? ( >=sci-physics/bullet-2.80 ) pixman? ( x11-libs/pixman ) postscript? ( app-text/libspectre ) png? ( media-libs/libpng:0= ) pulseaudio? ( media-sound/pulseaudio ) raw? ( media-libs/libraw ) scim? ( app-i18n/scim ) sdl? ( media-libs/libsdl2 virtual/opengl ) sound? ( media-libs/libsndfile ) systemd? ( sys-apps/systemd ) tiff? ( media-libs/tiff:0= ) tslib? ( x11-libs/tslib ) unwind? ( sys-libs/libunwind ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-1.8.0 >=x11-libs/libxkbcommon-0.3.1 media-libs/mesa[gles2,wayland] ) webp? ( media-libs/libwebp ) X? ( x11-libs/libXcursor x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libXScrnSaver opengl? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) gles? ( x11-libs/libX11 x11-libs/libXrender virtual/opengl ) ) xine? ( >=media-libs/xine-lib-1.1.1 ) xpm? ( x11-libs/libXpm ) sys-apps/dbus >=sys-apps/util-linux-2.20.0 sys-libs/zlib virtual/jpeg:0= !dev-libs/ecore !dev-libs/edbus !dev-libs/eet !dev-libs/eeze !dev-libs/efreet !dev-libs/eina !dev-libs/eio !dev-libs/embryo !dev-libs/eobj !dev-libs/ephysics !media-libs/edje !media-libs/elementary !media-libs/emotion !media-libs/ethumb !media-libs/evas !media-plugins/emotion_generic_players !media-plugins/evas_generic_loaders nls? ( sys-devel/gettext )
REQUIRED_USE=pulseaudio? ( sound ) opengl? ( || ( X sdl wayland ) ) gles? ( || ( X wayland ) ) gles? ( !sdl ) gles? ( egl ) sdl? ( opengl ) wayland? ( egl !opengl gles ) xim? ( X )
SLOT=0
SRC_URI=https://download.enlightenment.org/rel/libs/efl/efl-1.18.4.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 enlightenment e2ebae76ba56501855712c5fd3c4c77c epatch 9a5f039771f143195164a15a4faa41a1 epunt-cxx e99babeaa7d98c1caaa6a61a79902210 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=48430a5de2bf31f27be2bf5c6c7108fb
+_md5_=97839db7519d5196acd0452052a5993d
diff --git a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2 b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
index 8a34e6a70807..4e7b0e5fec1b 100644
--- a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
+++ b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
@@ -4,9 +4,9 @@ DESCRIPTION=FastCGI Developer's Kit
EAPI=4
HOMEPAGE=http://www.fastcgi.com/
IUSE=html
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
LICENSE=FastCGI
SLOT=0
SRC_URI=http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1c7545696cd2286c9fd868b32791d71c
+_md5_=86be39f99a2171842185d81de4e232e6
diff --git a/metadata/md5-cache/dev-libs/gom-0.3.2 b/metadata/md5-cache/dev-libs/gom-0.3.2
index 09db042dbdb5..e31042930696 100644
--- a/metadata/md5-cache/dev-libs/gom-0.3.2
+++ b/metadata/md5-cache/dev-libs/gom-0.3.2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pygobject-3.16:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 sys-devel/gettext virtual/pkgconfig x11-libs/gdk-pixbuf:2 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-3.16:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 sys-devel/gettext virtual/pkgconfig x11-libs/gdk-pixbuf:2 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=GObject to SQLite object mapper library
EAPI=5
HOMEPAGE=https://wiki.gnome.org/Projects/Gom
-IUSE=+introspection python debug python_targets_python3_4 python_targets_python3_5
+IUSE=+introspection python debug python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=LGPL-2+
-RDEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pygobject-3.16:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
-REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 ) introspection )
+RDEPEND=>=dev-db/sqlite-3.7:3 >=dev-libs/glib-2.36:2 introspection? ( >=dev-libs/gobject-introspection-1.30.0:= ) python? ( python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-3.16:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) introspection )
SLOT=0
SRC_URI=mirror://gnome/sources/gom/0.3/gom-0.3.2.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6e3aa5a754e8be6570885ae31d9cbdd5
+_md5_=2a3e6a9e3a65f424f916baedacec6bc2
diff --git a/metadata/md5-cache/dev-libs/ivykis-0.42.3 b/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
similarity index 76%
rename from metadata/md5-cache/dev-libs/ivykis-0.42.3
rename to metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
index c08a812f9e3b..53fb9a01694e 100644
--- a/metadata/md5-cache/dev-libs/ivykis-0.42.3
+++ b/metadata/md5-cache/dev-libs/ivykis-0.42.3-r1
@@ -1,9 +1,10 @@
-DEFINED_PHASES=-
+DEFINED_PHASES=configure install
DESCRIPTION=Library for asynchronous I/O readiness notification
EAPI=6
HOMEPAGE=https://github.com/buytenh/ivykis
+IUSE=static-libs
KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.3.tar.gz -> ivykis-0.42.3.tar.gz
-_md5_=ee27c6c0064a121f42fd9ec960da6957
+_md5_=f80f28ccd83febb3ac6ab77b5e430b22
diff --git a/metadata/md5-cache/dev-libs/libattica-0.4.2 b/metadata/md5-cache/dev-libs/libbson-1.10.3
similarity index 63%
rename from metadata/md5-cache/dev-libs/libattica-0.4.2
rename to metadata/md5-cache/dev-libs/libbson-1.10.3
index add5d96ced67..4d90c95e3e24 100644
--- a/metadata/md5-cache/dev-libs/libattica-0.4.2
+++ b/metadata/md5-cache/dev-libs/libbson-1.10.3
@@ -1,13 +1,12 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 test? ( dev-qt/qtgui:4 dev-qt/qttest:4 ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A library providing access to Open Collaboration Services
-EAPI=5
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2 LGPL-2
-RDEPEND=dev-qt/qtcore:4
+DEPEND=dev-python/sphinx sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Library routines related to building,parsing and iterating BSON documents
+EAPI=6
+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=mirror://kde/stable/attica/attica-0.4.2.tar.bz2
+SRC_URI=https://github.com/mongodb/mongo-c-driver/archive/1.10.3.tar.gz -> libbson-1.10.3.tar.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b73706a93c243d9b32ebbb72e8372ecb
+_md5_=e7548ca91069f22ac81cccee51c02f3e
diff --git a/metadata/md5-cache/dev-libs/libinput-1.10.7 b/metadata/md5-cache/dev-libs/libinput-1.10.7
index 0ecb823c162d..f3df4d5b1efd 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.10.7
+++ b/metadata/md5-cache/dev-libs/libinput-1.10.7
@@ -4,11 +4,11 @@ DESCRIPTION=Library to handle input devices in Wayland
EAPI=6
HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
IUSE=doc input_devices_wacom test
-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=MIT
RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev
RESTRICT=test
SLOT=0/10
SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.10.7.tar.xz
_eclasses_=meson eb124b9e9d7a5f1ebc89589fe73c816f multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88
-_md5_=29649723d266f913bf622481a28cc7e3
+_md5_=a2941358f10673cbe99ccece72b205fe
diff --git a/metadata/md5-cache/dev-libs/libinput-1.11.1 b/metadata/md5-cache/dev-libs/libinput-1.11.1
new file mode 100644
index 000000000000..214631519f48
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libinput-1.11.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev virtual/pkgconfig doc? ( >=app-doc/doxygen-1.8.3 >=media-gfx/graphviz-2.38.0 ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=Library to handle input devices in Wayland
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
+IUSE=doc input_devices_wacom test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
+RESTRICT=test
+SLOT=0/10
+SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.11.1.tar.xz
+_eclasses_=meson eb124b9e9d7a5f1ebc89589fe73c816f multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88
+_md5_=e30d3b13a58a029a72a80a477f79f658
diff --git a/metadata/md5-cache/dev-libs/libnl-3.4.0 b/metadata/md5-cache/dev-libs/libnl-3.4.0
index 0c0fa0552211..f8f89cf8d639 100644
--- a/metadata/md5-cache/dev-libs/libnl-3.4.0
+++ b/metadata/md5-cache/dev-libs/libnl-3.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Libraries providing APIs to netlink protocol based Linux kernel inte
EAPI=6
HOMEPAGE=http://www.infradead.org/~tgr/libnl/ https://github.com/thom311/libnl
IUSE=+debug static-libs python +threads utils python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1 utils? ( GPL-2 )
RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
SLOT=3
SRC_URI=https://github.com/thom311/libnl/releases/download/libnl3_4_0/libnl-3.4.0.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be8b0a2ba96645580f48f20e93a16ad8
+_md5_=ccfe39fcbc082b81057f5412122baaaf
diff --git a/metadata/md5-cache/dev-libs/libuv-1.20.0 b/metadata/md5-cache/dev-libs/libuv-1.20.0
index c94595b555b2..160247737b9c 100644
--- a/metadata/md5-cache/dev-libs/libuv-1.20.0
+++ b/metadata/md5-cache/dev-libs/libuv-1.20.0
@@ -4,10 +4,10 @@ DESCRIPTION=Cross-platform asychronous I/O
EAPI=6
HOMEPAGE=https://github.com/libuv/libuv
IUSE=static-libs abi_x86_32 abi_x86_64 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 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 ~mips ~ppc ppc64 s390 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=BSD BSD-2 ISC MIT
RESTRICT=test
SLOT=0/1
SRC_URI=https://github.com/libuv/libuv/archive/v1.20.0.tar.gz -> libuv-1.20.0.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=16346ca778c215b684d99f65bdd9aa0c
+_md5_=742b00531e719c1063ae8a1bb5b02d35
diff --git a/metadata/md5-cache/dev-libs/libuv-1.21.0 b/metadata/md5-cache/dev-libs/libuv-1.21.0
new file mode 100644
index 000000000000..444eea5cf4a4
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libuv-1.21.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/libtool virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,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-portage/elt-patches-20170422 !=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=Cross-platform asychronous I/O
+EAPI=6
+HOMEPAGE=https://github.com/libuv/libuv
+IUSE=static-libs abi_x86_32 abi_x86_64 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD BSD-2 ISC MIT
+RESTRICT=test
+SLOT=0/1
+SRC_URI=https://github.com/libuv/libuv/archive/v1.21.0.tar.gz -> libuv-1.21.0.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=8cfa3b5c69c7d6a18b7b3c80b498561f
diff --git a/metadata/md5-cache/dev-libs/libwacom-0.30 b/metadata/md5-cache/dev-libs/libwacom-0.30
new file mode 100644
index 000000000000..8e9604a72ea5
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libwacom-0.30
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/glib:2 virtual/libgudev:= virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !=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=Library for identifying Wacom tablets and their model-specific features
+EAPI=6
+HOMEPAGE=https://github.com/linuxwacom/libwacom
+IUSE=doc static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-libs/glib:2 virtual/libgudev:=
+SLOT=0
+SRC_URI=https://github.com/linuxwacom/libwacom/archive/libwacom-0.30.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88
+_md5_=8bdda7d09067169403920d820cb5e57d
diff --git a/metadata/md5-cache/dev-libs/mongo-c-driver-1.10.3 b/metadata/md5-cache/dev-libs/mongo-c-driver-1.10.3
new file mode 100644
index 000000000000..bd055c8b437f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mongo-c-driver-1.10.3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-arch/snappy:= >=dev-libs/libbson-1.10.3 dev-python/sphinx sys-libs/zlib:= 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] ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Client library written in C for MongoDB
+EAPI=6
+HOMEPAGE=https://github.com/mongodb/mongo-c-driver
+IUSE=debug examples libressl sasl ssl static-libs test
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=Apache-2.0
+RDEPEND=app-arch/snappy:= >=dev-libs/libbson-1.10.3 dev-python/sphinx sys-libs/zlib:= 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/archive/1.10.3.tar.gz -> mongo-c-driver-1.10.3.tar.gz
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bf568dabfaeeac0cddb9338a949c10b4
diff --git a/metadata/md5-cache/dev-libs/mpfr-3.1.3_p4 b/metadata/md5-cache/dev-libs/mpfr-3.1.3_p4
index 68a8adbaae4f..ac2cfeff52db 100644
--- a/metadata/md5-cache/dev-libs/mpfr-3.1.3_p4
+++ b/metadata/md5-cache/dev-libs/mpfr-3.1.3_p4
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/gmp-4.1.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
SLOT=0
SRC_URI=https://www.mpfr.org/mpfr-3.1.3/mpfr-3.1.3.tar.xz https://dev.gentoo.org/~mgorny/dist/mpfr-3.1.3-patchset.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3ba76c0ad8e350c632e0c30a3af49e2
+_md5_=0b586b70498ad25191816514c4b56996
diff --git a/metadata/md5-cache/dev-libs/mpfr-4.0.0-r1 b/metadata/md5-cache/dev-libs/mpfr-4.0.0-r1
index 0e66b61ef377..7f7752e361fd 100644
--- a/metadata/md5-cache/dev-libs/mpfr-4.0.0-r1
+++ b/metadata/md5-cache/dev-libs/mpfr-4.0.0-r1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
RDEPEND=>=dev-libs/gmp-5.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(-)?,static-libs?]
SLOT=0/6
SRC_URI=https://www.mpfr.org/mpfr-4.0.0/mpfr-4.0.0.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=086d12a2e2c03b89d29d711eb4e50c36
+_eclasses_=libtool 0081a71a261724730ec4c248494f044d multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=b902266c8cc6dde04a0e19b7977f21bd
diff --git a/metadata/md5-cache/dev-libs/mpfr-4.0.1 b/metadata/md5-cache/dev-libs/mpfr-4.0.1
index f5f5665c64b5..c3cf74fdac5a 100644
--- a/metadata/md5-cache/dev-libs/mpfr-4.0.1
+++ b/metadata/md5-cache/dev-libs/mpfr-4.0.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
RDEPEND=>=dev-libs/gmp-5.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(-)?,static-libs?]
SLOT=0/6
SRC_URI=https://www.mpfr.org/mpfr-4.0.1/mpfr-4.0.1.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=086d12a2e2c03b89d29d711eb4e50c36
+_eclasses_=libtool 0081a71a261724730ec4c248494f044d multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=b902266c8cc6dde04a0e19b7977f21bd
diff --git a/metadata/md5-cache/dev-libs/nspr-4.13.1 b/metadata/md5-cache/dev-libs/nspr-4.13.1
index cd1aee43439c..c6b3615452cd 100644
--- a/metadata/md5-cache/dev-libs/nspr-4.13.1
+++ b/metadata/md5-cache/dev-libs/nspr-4.13.1
@@ -4,9 +4,9 @@ DESCRIPTION=Netscape Portable Runtime
EAPI=6
HOMEPAGE=http://www.mozilla.org/projects/nspr/
IUSE=debug abi_x86_32 abi_x86_64 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 ~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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
SLOT=0
SRC_URI=https://archive.mozilla.org/pub/nspr/releases/v4.13.1/src/nspr-4.13.1.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a591748178e1621724b315fdebfc7bf4
+_md5_=7bfc782c5b535364361ec4f006d9d280
diff --git a/metadata/md5-cache/dev-libs/nss-3.29.5 b/metadata/md5-cache/dev-libs/nss-3.29.5
index 13d153dbab91..7585d0961fde 100644
--- a/metadata/md5-cache/dev-libs/nss-3.29.5
+++ b/metadata/md5-cache/dev-libs/nss-3.29.5
@@ -4,11 +4,11 @@ DESCRIPTION=Mozilla's Network Security Services library that implements PKI supp
EAPI=6
HOMEPAGE=http://www.mozilla.org/projects/security/pki/nss/
IUSE=cacert +nss-pem 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
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
RDEPEND=>=dev-libs/nspr-4.13.1[abi_x86_32(-)?,abi_x86_64(-)?,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-db/sqlite-3.8.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(-)?] >=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(-)?]
RESTRICT=test
SLOT=0
SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_29_5_RTM/src/nss-3.29.5.tar.gz cacert? ( https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch ) nss-pem? ( https://dev.gentoo.org/~polynomial-c/nss-pem-20160329.tar.xz )
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c1b8e3d776cc81accf6482b71b762611
+_md5_=abbe6d346e12be5031c8f6c8ec27b7e9
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.8.2 b/metadata/md5-cache/dev-libs/oniguruma-6.8.2
index 2686d29bf692..03bdd473449c 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-6.8.2
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.8.2
@@ -3,9 +3,9 @@ DESCRIPTION=Regular expression library for different character encodings
EAPI=6
HOMEPAGE=https://github.com/kkos/oniguruma
IUSE=crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~x86-solaris
LICENSE=BSD-2
SLOT=0/5
SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.8.2/onig-6.8.2.tar.gz
_eclasses_=multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=342ddaec183c432626e521850633692b
+_md5_=fe8ea0c3abd10c95d9bfb37c244f50be
diff --git a/metadata/md5-cache/dev-libs/poco-1.9.0 b/metadata/md5-cache/dev-libs/poco-1.9.0
index 476ca9881220..5fe8b669fde3 100644
--- a/metadata/md5-cache/dev-libs/poco-1.9.0
+++ b/metadata/md5-cache/dev-libs/poco-1.9.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=C++ libraries for building network-based applications
EAPI=6
-HOMEPAGE=http://pocoproject.org/
+HOMEPAGE=https://pocoproject.org/
IUSE=7z apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip
KEYWORDS=~amd64 ~arm ~x86
LICENSE=Boost-1.0
@@ -11,4 +11,4 @@ REQUIRED_USE=7z? ( xml ) apache? ( net util ) file2pagecompiler? ( pagecompiler
SLOT=0
SRC_URI=https://github.com/pocoproject/poco/archive/poco-1.9.0-release.tar.gz -> poco-1.9.0.tar.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=987d8cc66e6575d601692901e74676a4
+_md5_=dff36f10e3c054e9cb668fa83cc8bef8
diff --git a/metadata/md5-cache/dev-libs/zziplib-0.13.62-r2 b/metadata/md5-cache/dev-libs/zziplib-0.13.62-r2
index 7d3eb12c3b1d..191f6e679a8a 100644
--- a/metadata/md5-cache/dev-libs/zziplib-0.13.62-r2
+++ b/metadata/md5-cache/dev-libs/zziplib-0.13.62-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight library for extracting data from files archived in a sin
EAPI=5
HOMEPAGE=http://zziplib.sourceforge.net/
IUSE=doc sdl static-libs 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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( LGPL-2.1 MPL-1.1 )
RDEPEND=sys-libs/zlib sdl? ( >=media-libs/libsdl-1.2.6 )
SLOT=0
SRC_URI=mirror://sourceforge/zziplib/zziplib-0.13.62.tar.bz2
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5dbb6d5f5da4b96e5c73c71bd6b01293
+_md5_=1c81e2c90cfbcc6861f3746674943d58
diff --git a/metadata/md5-cache/dev-perl/Capture-Tiny-0.460.0 b/metadata/md5-cache/dev-perl/Capture-Tiny-0.460.0
index 84451ebdda1e..b3f9e3db3718 100644
--- a/metadata/md5-cache/dev-perl/Capture-Tiny-0.460.0
+++ b/metadata/md5-cache/dev-perl/Capture-Tiny-0.460.0
@@ -4,10 +4,10 @@ DESCRIPTION=Capture STDOUT and STDERR from Perl, XS or external programs
EAPI=6
HOMEPAGE=http://search.cpan.org/dist/Capture-Tiny/
IUSE=test examples
-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
+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=Apache-2.0
RDEPEND=virtual/perl-Carp virtual/perl-Exporter virtual/perl-File-Spec virtual/perl-File-Temp virtual/perl-IO virtual/perl-Scalar-List-Utils dev-lang/perl:=
SLOT=0
SRC_URI=mirror://cpan/authors/id/D/DA/DAGOLDEN/Capture-Tiny-0.46.tar.gz
_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
-_md5_=07eb1f1c2a6307cad8b130afd3666b29
+_md5_=10b2e1d5e9bd822bba0dffe103af7627
diff --git a/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0 b/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0
index b3e046ca1c75..c98d2bab2cd1 100644
--- a/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0
+++ b/metadata/md5-cache/dev-perl/Devel-CheckBin-0.40.0
@@ -4,10 +4,10 @@ DESCRIPTION=check that a command is available
EAPI=6
HOMEPAGE=http://search.cpan.org/dist/Devel-CheckBin/
IUSE=test
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 s390 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
+KEYWORDS=~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ~ppc64 s390 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=|| ( Artistic GPL-1+ )
RDEPEND=virtual/perl-Exporter >=virtual/perl-ExtUtils-MakeMaker-6.520.0 virtual/perl-parent dev-lang/perl:=
SLOT=0
SRC_URI=mirror://cpan/authors/id/T/TO/TOKUHIROM/Devel-CheckBin-0.04.tar.gz
_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
-_md5_=0cd237373bb3f5ed4f23e99b48564716
+_md5_=d753aca69f057fa5518fb8d9172abe5d
diff --git a/metadata/md5-cache/dev-perl/Encode-Locale-1.50.0 b/metadata/md5-cache/dev-perl/Encode-Locale-1.50.0
index a7c6e82fe266..c5fc9364efc6 100644
--- a/metadata/md5-cache/dev-perl/Encode-Locale-1.50.0
+++ b/metadata/md5-cache/dev-perl/Encode-Locale-1.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=Determine the locale encoding
EAPI=6
HOMEPAGE=http://search.cpan.org/dist/Encode-Locale/
IUSE=test
-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 ~arm-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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=>=virtual/perl-Encode-2.0.0 dev-lang/perl:=
SLOT=0
SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/Encode-Locale-1.05.tar.gz
_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
-_md5_=e49b08ca23bb70596c7526eb7ecce2aa
+_md5_=2283603d4fc7d21d6e89dcc53768bc92
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-PkgConfig-1.160.0 b/metadata/md5-cache/dev-perl/ExtUtils-PkgConfig-1.160.0
index cfb3e7e730be..a9aa5223c71e 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-PkgConfig-1.160.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-PkgConfig-1.160.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-ExtUtils-MakeMaker virtual/pkgconfig dev-lang/perl:=
DESCRIPTION=Simplistic perl interface to pkg-config
EAPI=6
HOMEPAGE=http://search.cpan.org/dist/ExtUtils-PkgConfig/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=LGPL-2+
RDEPEND=dev-lang/perl:=
SLOT=0
SRC_URI=mirror://cpan/authors/id/X/XA/XAOC/ExtUtils-PkgConfig-1.16.tar.gz
_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
-_md5_=d9cc21835a024ef3b0882edd5a9850a9
+_md5_=99055cc12e8e27b9a2cdc1ebdf2475bc
diff --git a/metadata/md5-cache/dev-perl/HTML-Parser-3.720.0 b/metadata/md5-cache/dev-perl/HTML-Parser-3.720.0
index 84add3f22c9a..b8eb29e9733d 100644
--- a/metadata/md5-cache/dev-perl/HTML-Parser-3.720.0
+++ b/metadata/md5-cache/dev-perl/HTML-Parser-3.720.0
@@ -4,10 +4,10 @@ DESCRIPTION=Parse section of HTML documents
EAPI=6
HOMEPAGE=http://search.cpan.org/dist/HTML-Parser/
IUSE=test
-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 ~arm-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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=>=dev-perl/HTML-Tagset-3.03 virtual/perl-XSLoader dev-lang/perl:=
SLOT=0
SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTML-Parser-3.72.tar.gz
_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
-_md5_=23ac51b733c57c4a31448674385c40c3
+_md5_=63ac5a7ffac0a5c549015d0a3a3b644e
diff --git a/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0-r2 b/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0-r2
index 8df3c22a6565..7fceaca0f44b 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0-r2
+++ b/metadata/md5-cache/dev-perl/HTTP-Daemon-6.10.0-r2
@@ -3,10 +3,10 @@ DEPEND=!=dev-perl/HTTP-Date-6.0.0 virtual/perl-IO >=dev
DESCRIPTION=Base class for simple HTTP servers
EAPI=6
HOMEPAGE=http://search.cpan.org/dist/HTTP-Daemon/
-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 ~arm-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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=!=dev-perl/HTTP-Date-6.0.0 virtual/perl-IO >=dev-perl/HTTP-Message-6.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 dev-lang/perl:=
SLOT=0
SRC_URI=mirror://cpan/authors/id/G/GA/GAAS/HTTP-Daemon-6.01.tar.gz
_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
-_md5_=bf2df721f6b5e7d104f09e9e07bfeb0f
+_md5_=010c64448ef1e5186c9a84114e0aa633
diff --git a/metadata/md5-cache/dev-perl/HTTP-Message-6.130.0 b/metadata/md5-cache/dev-perl/HTTP-Message-6.130.0
index f3834bd0733f..2c594d7f4b94 100644
--- a/metadata/md5-cache/dev-perl/HTTP-Message-6.130.0
+++ b/metadata/md5-cache/dev-perl/HTTP-Message-6.130.0
@@ -4,10 +4,10 @@ DESCRIPTION=Base class for Request/Response
EAPI=6
HOMEPAGE=http://search.cpan.org/dist/HTTP-Message/
IUSE=test
-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 ~arm-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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=!=dev-perl/URI-1.100.0 >=virtual/perl-Encode-2.210.0 >=dev-perl/HTTP-Date-6.0.0 dev-perl/IO-HTML >=dev-perl/Encode-Locale-1.0.0 >=dev-perl/LWP-MediaTypes-6.0.0 >=virtual/perl-IO-Compress-2.021 >=virtual/perl-MIME-Base64-2.100.0 >=virtual/perl-Exporter-5.570.0 virtual/perl-Storable dev-lang/perl:=
SLOT=0
SRC_URI=mirror://cpan/authors/id/O/OA/OALDERS/HTTP-Message-6.13.tar.gz
_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
-_md5_=db408a7400c10aec1f80bd663ce2f67c
+_md5_=d75dd1ee18e0aa143f258061252ddbd0
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 59fff2dcf846..a161bc901287 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Sub-Name-0.210.0 b/metadata/md5-cache/dev-perl/Sub-Name-0.210.0
index ebcc8b46b6bf..7478cb638f81 100644
--- a/metadata/md5-cache/dev-perl/Sub-Name-0.210.0
+++ b/metadata/md5-cache/dev-perl/Sub-Name-0.210.0
@@ -4,10 +4,10 @@ DESCRIPTION=(Re)name a sub
EAPI=6
HOMEPAGE=http://search.cpan.org/dist/Sub-Name/
IUSE=test suggested
-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 ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=>=virtual/perl-Exporter-5.570.0 virtual/perl-XSLoader dev-lang/perl:=
SLOT=0
SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Sub-Name-0.21.tar.gz
_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
-_md5_=4bd4f9c0a44de12724f3974e60207293
+_md5_=d738b75c9446adb73990938eb75332ca
diff --git a/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0 b/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0
index 61f82e5f6168..a10aeda830b7 100644
--- a/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0
+++ b/metadata/md5-cache/dev-perl/Try-Tiny-0.300.0
@@ -4,10 +4,10 @@ DESCRIPTION=Minimal try/catch with proper localization of $@
EAPI=6
HOMEPAGE=http://search.cpan.org/dist/Try-Tiny/
IUSE=test minimal
-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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=!<=dev-perl/Try-Tiny-Except-0.10.0 !minimal? ( || ( >=virtual/perl-Scalar-List-Utils-1.400.0 dev-perl/Sub-Name ) ) virtual/perl-Carp >=virtual/perl-Exporter-5.570.0 dev-lang/perl:=
SLOT=0
SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Try-Tiny-0.30.tar.gz
_eclasses_=multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011
-_md5_=db5440b8fdde4eaa13d69a89b1a21dca
+_md5_=ca1b4aa429c194ffa59e889e891a9c99
diff --git a/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0 b/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
index 99af94da4693..e71d2107a128 100644
--- a/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
+++ b/metadata/md5-cache/dev-perl/XML-SAX-Base-1.90.0
@@ -4,10 +4,10 @@ DESCRIPTION=Base class SAX Drivers and Filters
EAPI=6
HOMEPAGE=http://search.cpan.org/dist/XML-SAX-Base/
IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=|| ( Artistic GPL-1+ )
RDEPEND=!=dev-libs/libbson-1.9.0 >=dev-libs/mongo-c-driver-1.9.0[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !=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 sys-devel/m4 sys-devel/libtool php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+DESCRIPTION=MongoDB database driver for PHP
+EAPI=6
+HOMEPAGE=https://pecl.php.net/mongodb
+IUSE=libressl sasl php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=php_targets_php5-6? ( dev-lang/php:5.6[json,ssl,zlib] ) php_targets_php7-0? ( dev-lang/php:7.0[json,ssl,zlib] ) php_targets_php7-1? ( dev-lang/php:7.1[json,ssl,zlib] ) php_targets_php7-2? ( dev-lang/php:7.2[json,ssl,zlib] ) >=dev-libs/libbson-1.9.0 >=dev-libs/mongo-c-driver-1.9.0[sasl?,ssl] !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) sasl? ( dev-libs/cyrus-sasl ) php_targets_php5-6? ( dev-lang/php:5.6 ) php_targets_php7-0? ( dev-lang/php:7.0 ) php_targets_php7-1? ( dev-lang/php:7.1 ) php_targets_php7-2? ( dev-lang/php:7.2 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/mongodb-1.4.4.tgz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 63b281041baa106ff1ef59b602ca7e2a toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=ee480e78a39d59c170bd796394c0867b
diff --git a/metadata/md5-cache/dev-python/3to2-1.1.1-r1 b/metadata/md5-cache/dev-python/3to2-1.1.1-r1
index 673101fff013..3e45c058a25d 100644
--- a/metadata/md5-cache/dev-python/3to2-1.1.1-r1
+++ b/metadata/md5-cache/dev-python/3to2-1.1.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Tool to refactor valid 3.x syntax into valid 2.x syntax
EAPI=5
HOMEPAGE=https://pypi.org/project/3to2/
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-1.1
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/3/3to2/3to2-1.1.1.zip
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a1dbc9e8a6fd397211f22ce2aeed5946
+_md5_=4320f141c5cad0b0254d925d9bdd96d0
diff --git a/metadata/md5-cache/dev-python/HeapDict-1.0.0 b/metadata/md5-cache/dev-python/HeapDict-1.0.0
index 5f5bb745aa2e..8c2fa24871f9 100644
--- a/metadata/md5-cache/dev-python/HeapDict-1.0.0
+++ b/metadata/md5-cache/dev-python/HeapDict-1.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Heap with decrease-key and increase-key operations
EAPI=6
HOMEPAGE=http://stutzbachenterprises.com/
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/H/HeapDict/HeapDict-1.0.0.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c85c59a084a0566a66589975a3825bf
+_md5_=49560856639b12e795a142657a5138ce
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 278226720f3f..f5ce26f97c10 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/argcomplete-1.9.2 b/metadata/md5-cache/dev-python/argcomplete-1.9.2
deleted file mode 100644
index 0f38e8621007..000000000000
--- a/metadata/md5-cache/dev-python/argcomplete-1.9.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pexpect[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-shells/tcsh ) 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Bash tab completion for argparse
-EAPI=6
-HOMEPAGE=https://pypi.org/project/argcomplete/
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~arm ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=Apache-2.0
-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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.9.2.tar.gz
-_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ec87c73b02950cd6f4bfb6c0f5f58210
diff --git a/metadata/md5-cache/dev-python/argcomplete-1.9.4 b/metadata/md5-cache/dev-python/argcomplete-1.9.4
index cf2e791c3731..12b54841d7b9 100644
--- a/metadata/md5-cache/dev-python/argcomplete-1.9.4
+++ b/metadata/md5-cache/dev-python/argcomplete-1.9.4
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pexpect[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-shells/tcsh ) 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pexpect[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-shells/tcsh ) 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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=Bash tab completion for argparse
EAPI=6
HOMEPAGE=https://pypi.org/project/argcomplete/
-IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~arm ~amd64-linux ~x86-linux ~x64-macos
+IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 ~arm ~x86 ~amd64-linux ~x86-linux ~x64-macos
LICENSE=Apache-2.0
-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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/a/argcomplete/argcomplete-1.9.4.tar.gz
_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9783efc37e6e995e34fd10182e9566b0
+_md5_=5189d12dee0b69221b419d180b6b9474
diff --git a/metadata/md5-cache/dev-python/backports-abc-0.5 b/metadata/md5-cache/dev-python/backports-abc-0.5
index 66bfa84e671e..ac20f1056de3 100644
--- a/metadata/md5-cache/dev-python/backports-abc-0.5
+++ b/metadata/md5-cache/dev-python/backports-abc-0.5
@@ -1,14 +1,14 @@
+BDEPEND=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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DEFINED_PHASES=compile configure install prepare test
-DEPEND=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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
DESCRIPTION=Backport of Python 3.5's 'collections.abc' module
-EAPI=6
+EAPI=7
HOMEPAGE=https://github.com/cython/backports_abc https://pypi.org/project/backports_abc/
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
LICENSE=PSF-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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/b/backports_abc/backports_abc-0.5.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05ea689c90d5ab488a01778317a93ea4
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=81481715d464d5c4f7bbc5b60d4e62ba
diff --git a/metadata/md5-cache/dev-python/bcolz-1.1.2 b/metadata/md5-cache/dev-python/bcolz-1.1.2
index c1529cb6a86f..67c95a69bb35 100644
--- a/metadata/md5-cache/dev-python/bcolz-1.1.2
+++ b/metadata/md5-cache/dev-python/bcolz-1.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Provides columnar and compressed data containers
EAPI=6
HOMEPAGE=http://bcolz.blosc.org/
IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-libs/c-blosc:= dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/b/bcolz/bcolz-1.1.2.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d5966a3efeabf3c6c4f1e45c12e52d3b
+_md5_=57db77182c598721f6ff3f1b802641c9
diff --git a/metadata/md5-cache/dev-python/billiard-3.5.0.2 b/metadata/md5-cache/dev-python/billiard-3.5.0.2
index d66b78b7b932..7491ab6b8061 100644
--- a/metadata/md5-cache/dev-python/billiard-3.5.0.2
+++ b/metadata/md5-cache/dev-python/billiard-3.5.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Python multiprocessing fork
EAPI=6
HOMEPAGE=https://pypi.org/project/billiard/ https://github.com/celery/billiard
IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/b/billiard/billiard-3.5.0.2.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1680c7869e45270a83516633d8ca2c28
+_md5_=484070e74da4ac041bf2b05796579cab
diff --git a/metadata/md5-cache/dev-python/blaze-0.11.3 b/metadata/md5-cache/dev-python/blaze-0.11.3
index 3acbc6bfbf78..db8ef3f86afa 100644
--- a/metadata/md5-cache/dev-python/blaze-0.11.3
+++ b/metadata/md5-cache/dev-python/blaze-0.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Next generation Python numpy
EAPI=6
HOMEPAGE=http://blaze.readthedocs.io/
IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-python/bcolz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cytoolz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/datashape[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/dynd-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/flask-cors[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/into[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/multipledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numba[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/odo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytables[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sqlalchemy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/toolz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unicodecsv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/blaze/blaze/archive/0.11.3.tar.gz -> blaze-0.11.3.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=59465a875dadf97fd6887d39a3787c1d
+_md5_=25c8407dd8cf749da2850dd593b4f79b
diff --git a/metadata/md5-cache/dev-python/brython-3.6.2 b/metadata/md5-cache/dev-python/brython-3.6.2
new file mode 100644
index 000000000000..17b819a8fc9a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/brython-3.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
+DESCRIPTION=A Python 3 implementation for client-side web programming
+EAPI=6
+HOMEPAGE=http://www.brython.info
+IUSE=vhosts python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=>=app-admin/webapp-config-1.50.15
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=3.6.2
+SRC_URI=https://github.com/brython-dev/brython/archive/3.6.2.tar.gz -> brython-3.6.2.tar.gz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 webapp 6ae2395d7f341093c36057cb4f69101a
+_md5_=ac091245ceaad58924eb6466d6750ba4
diff --git a/metadata/md5-cache/dev-python/celery-4.1.0 b/metadata/md5-cache/dev-python/celery-4.1.0
index 830c6e98f5e2..acd2c1189499 100644
--- a/metadata/md5-cache/dev-python/celery-4.1.0
+++ b/metadata/md5-cache/dev-python/celery-4.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Asynchronous task queue/job queue based on distributed message passi
EAPI=6
HOMEPAGE=http://celeryproject.org/ https://pypi.org/project/celery/
IUSE=doc examples redis sqs test yaml python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=BSD
RDEPEND==dev-python/kombu-4.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/billiard-3.5.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/c/celery/celery-4.1.0.tar.gz
_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4d5e1baea1d5d97cacb6f3b98b784053
+_md5_=1ac5ce808d1d75a3fe380374b434af95
diff --git a/metadata/md5-cache/dev-python/curtsies-0.2.11 b/metadata/md5-cache/dev-python/curtsies-0.2.11
index b1743eba393b..535511175613 100644
--- a/metadata/md5-cache/dev-python/curtsies-0.2.11
+++ b/metadata/md5-cache/dev-python/curtsies-0.2.11
@@ -4,11 +4,11 @@ DESCRIPTION=Curses-like terminal wrapper, with colored strings
EAPI=5
HOMEPAGE=https://github.com/thomasballinger/curtsies
IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=>=dev-python/blessings-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyte[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/wcwidth-0.1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/c/curtsies/curtsies-0.2.11.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1f23201fe269648db10ba62e7c4cb93
+_md5_=bff348dbcdf374746881cfd6338c9dd8
diff --git a/metadata/md5-cache/dev-python/dask-0.15.1 b/metadata/md5-cache/dev-python/dask-0.15.1
index b55cc2c2a549..2ffc8b7366ed 100644
--- a/metadata/md5-cache/dev-python/dask-0.15.1
+++ b/metadata/md5-cache/dev-python/dask-0.15.1
@@ -4,11 +4,11 @@ DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
EAPI=6
HOMEPAGE=http://dask.pydata.org/
IUSE=distributed test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=>=dev-python/cloudpickle-0.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.19[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/partd-0.3.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/toolz-0.7.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] distributed? ( >=dev-python/distributed-1.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/s3fs-0.0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/d/dask/dask-0.15.1.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=46570193fce4c3093b17d085c0bbbfd1
+_md5_=038c5d3053b0397552e7c57489a19c99
diff --git a/metadata/md5-cache/dev-python/denonavr-0.6.1 b/metadata/md5-cache/dev-python/denonavr-0.7.3
similarity index 55%
rename from metadata/md5-cache/dev-python/denonavr-0.6.1
rename to metadata/md5-cache/dev-python/denonavr-0.7.3
index c8169ebc7eb0..995872a07656 100644
--- a/metadata/md5-cache/dev-python/denonavr-0.6.1
+++ b/metadata/md5-cache/dev-python/denonavr-0.7.3
@@ -1,7 +1,8 @@
+BDEPEND=python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testtools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests-mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testtools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
DESCRIPTION=Automation Library for Denon AVR receivers
-EAPI=6
+EAPI=7
HOMEPAGE=https://github.com/scarface-4711/denonavr
IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
@@ -9,6 +10,6 @@ LICENSE=MIT
RDEPEND=dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
-SRC_URI=mirror://pypi/d/denonavr/denonavr-0.6.1.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=91518058367faccacffbb500abebdd55
+SRC_URI=mirror://pypi/d/denonavr/denonavr-0.7.3.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=f46792a609f8cf9a70e0e760ed5b4da4
diff --git a/metadata/md5-cache/dev-python/distributed-1.18.0 b/metadata/md5-cache/dev-python/distributed-1.18.0
index 09e8ee1108e9..53c9050b1c5c 100644
--- a/metadata/md5-cache/dev-python/distributed-1.18.0
+++ b/metadata/md5-cache/dev-python/distributed-1.18.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python library for distributed computation
EAPI=6
HOMEPAGE=http://distributed.readthedocs.io/
IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cloudpickle-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dask-0.14.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/joblib-0.10.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/msgpack[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/partd-0.3.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sortedcollections[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/tblib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/toolz-0.7.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/zict[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/d/distributed/distributed-1.18.0.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8322a2738799e16e254a2d68d808046b
+_md5_=7c0888600924c236bf1be13db64f2ad5
diff --git a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0 b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
index 76fee96bceef..d4aca693e1cd 100644
--- a/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
+++ b/metadata/md5-cache/dev-python/editorconfig-core-py-0.12.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >dev-util/cmake-3.0 ) !=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=Clone of EditorConfig core written in Python
EAPI=6
-HOMEPAGE=http://editorconfig.org/
+HOMEPAGE=https://editorconfig.org/
IUSE=test cli python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=PYTHON BSD-4
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=https://github.com/editorconfig/editorconfig-core-py/archive/v0.12.0.tar.gz -> editorconfig-core-py-0.12.0.tar.gz test? ( https://github.com/editorconfig/editorconfig-core-test/archive/abb579e00f2deeede91cb485e53512efab9c6474.tar.gz -> editorconfig-core-test-abb579e00f2deeede91cb485e53512efab9c6474.tar.gz )
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2d8fae4b6b02556e3d34850045c485b4
+_md5_=abfcc4119ea867d8887ccb690bb027e2
diff --git a/metadata/md5-cache/dev-python/flask-appconfig-0.11.1 b/metadata/md5-cache/dev-python/flask-appconfig-0.11.1
deleted file mode 100644
index a77872617a84..000000000000
--- a/metadata/md5-cache/dev-python/flask-appconfig-0.11.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Configures Flask applications in a canonical way
-EAPI=6
-HOMEPAGE=https://github.com/mbr/flask-appconfig
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/click[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/mbr/flask-appconfig/archive/0.11.1.tar.gz -> flask-appconfig-0.11.1.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=072cb754d56fb68ce532d09463a5e6d9
diff --git a/metadata/md5-cache/dev-python/flexx-0.4.1 b/metadata/md5-cache/dev-python/flexx-0.4.1
index c5f060566865..f49af8f53d7b 100644
--- a/metadata/md5-cache/dev-python/flexx-0.4.1
+++ b/metadata/md5-cache/dev-python/flexx-0.4.1
@@ -4,11 +4,11 @@ DESCRIPTION=Pure Python toolkit for creating GUI's using web technology
EAPI=6
HOMEPAGE=https://flexx.readthedocs.org https://github.com/zoofio/flexx https://pypi.org/project/flexx/
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=www-servers/tornado[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/zoofIO//flexx/archive/v0.4.1.tar.gz -> flexx-0.4.1.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cf2cc3bc1b5ca0c887e25c47f2d6a91d
+_md5_=b3485a96158ce739bbe631ee690d4f53
diff --git a/metadata/md5-cache/dev-python/html2text-2018.1.9 b/metadata/md5-cache/dev-python/html2text-2018.1.9
index c6ba8d182271..3b060863b486 100644
--- a/metadata/md5-cache/dev-python/html2text-2018.1.9
+++ b/metadata/md5-cache/dev-python/html2text-2018.1.9
@@ -4,11 +4,11 @@ DESCRIPTION=Turn HTML into equivalent Markdown-structured text
EAPI=6
HOMEPAGE=https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/
IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~ppc ~sparc ~x86
LICENSE=GPL-3
RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/feedparser[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/Alir3z4/html2text/archive/2018.1.9.tar.gz -> html2text-2018.1.9-1.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8d455fa18de5bea8a0978313d3f7e361
+_md5_=6cdba7beff60fcbe9f11e7ad1b80c491
diff --git a/metadata/md5-cache/dev-python/irc-16.3 b/metadata/md5-cache/dev-python/irc-16.3
new file mode 100644
index 000000000000..93b577d3495c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/irc-16.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( >=dev-python/jaraco-functools-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jaraco-itertools-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tempora-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jaraco-collections[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jaraco-logging[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jaraco-stream[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jaraco-text[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/more-itertools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/backports-unittest-mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rst-linker-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=IRC client framework written in Python
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/irc
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/jaraco-functools-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jaraco-itertools-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/tempora-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jaraco-collections[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jaraco-logging[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jaraco-stream[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jaraco-text[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/more-itertools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/i/irc/irc-16.3.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=8a06d955bfce80ab63785dfa1ac6c3b6
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-1.4.1 b/metadata/md5-cache/dev-python/jaraco-collections-1.4.1
deleted file mode 100644
index 6c7441a3e3cf..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-collections-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/rst-linker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/jaraco-classes[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Models and classes to supplement the stdlib collections module
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/jaraco.collections
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PDEPEND=dev-python/jaraco-text[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-RDEPEND=dev-python/jaraco-classes[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-1.4.1.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=020d3f0672be395d03876c1650bc2e6e
diff --git a/metadata/md5-cache/dev-python/jaraco-collections-1.5.3 b/metadata/md5-cache/dev-python/jaraco-collections-1.5.3
new file mode 100644
index 000000000000..633312d7fc85
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-collections-1.5.3
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rst-linker-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/jaraco-text[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/namespace-jaraco[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jaraco-classes[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Models and classes to supplement the stdlib collections module
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/jaraco.collections
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+PDEPEND=dev-python/jaraco-text[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/namespace-jaraco[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jaraco-classes[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/j/jaraco.collections/jaraco.collections-1.5.3.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=1321994b5a06afd7d20f33efdfa401de
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-1.7.1 b/metadata/md5-cache/dev-python/jaraco-itertools-1.7.1
deleted file mode 100644
index baa128f0b820..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-itertools-1.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/inflect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/more-itertools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Additional functions used by other projects by developer jaraco
-EAPI=5
-HOMEPAGE=https://github.com/jaraco/jaraco.itertools
-IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/inflect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/more-itertools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/j/jaraco.itertools/jaraco.itertools-1.7.1.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd25f98d0ec06ad1d431e3e995ec4789
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-2.0 b/metadata/md5-cache/dev-python/jaraco-itertools-2.0
index e98f6c554636..75facc7df8a1 100644
--- a/metadata/md5-cache/dev-python/jaraco-itertools-2.0
+++ b/metadata/md5-cache/dev-python/jaraco-itertools-2.0
@@ -1,6 +1,6 @@
DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/rst-linker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/inflect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/more-itertools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Additional functions used by other projects by developer jaraco
+DESCRIPTION=Tools for working with iterables. Complements itertools and more_itertools
EAPI=6
HOMEPAGE=https://github.com/jaraco/jaraco.itertools
IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=mirror://pypi/j/jaraco.itertools/jaraco.itertools-2.0.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f1105df0600062a6ad7ebfca04e65d47
+_md5_=725e5ed320cf16e19c14f7f9a5b8ce20
diff --git a/metadata/md5-cache/dev-python/jaraco-itertools-2.3 b/metadata/md5-cache/dev-python/jaraco-itertools-2.3
new file mode 100644
index 000000000000..afdf074be06f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-itertools-2.3
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rst-linker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/namespace-jaraco[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/inflect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/more-itertools-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Tools for working with iterables. Complements itertools and more_itertools
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/jaraco.itertools
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/namespace-jaraco[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/inflect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/more-itertools-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/j/jaraco.itertools/jaraco.itertools-2.3.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=676fc995ff823d3be57b77567515e0b5
diff --git a/metadata/md5-cache/dev-python/jaraco-logging-1.5.2 b/metadata/md5-cache/dev-python/jaraco-logging-1.5.2
index ce7aff7a2e02..027cd4da7836 100644
--- a/metadata/md5-cache/dev-python/jaraco-logging-1.5.2
+++ b/metadata/md5-cache/dev-python/jaraco-logging-1.5.2
@@ -1,15 +1,15 @@
-BDEPEND=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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+BDEPEND=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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/namespace-jaraco[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/tempora[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rst-linker-1.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/namespace-jaraco[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/tempora[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
DESCRIPTION=Additional facilities to supplement Python's stdlib logging module
EAPI=7
HOMEPAGE=https://github.com/jaraco/jaraco.logging
-IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=MIT
-RDEPEND=dev-python/namespace-jaraco[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/tempora[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] 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_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=dev-python/namespace-jaraco[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/tempora[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/j/jaraco.logging/jaraco.logging-1.5.2.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=4524fa363079c73709d5fede29773907
+_md5_=91539ec1b97f4e17a8748b55aa13c3bd
diff --git a/metadata/md5-cache/dev-python/jaraco-text-1.10.1 b/metadata/md5-cache/dev-python/jaraco-text-1.10.1
new file mode 100644
index 000000000000..188329f2fdf7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jaraco-text-1.10.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/setuptools_scm-1.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/jaraco-packaging-3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rst-linker-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/jaraco-collections[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jaraco-functools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/namespace-jaraco[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+DESCRIPTION=Text utilities used by other projects by developer jaraco
+EAPI=7
+HOMEPAGE=https://github.com/jaraco/jaraco.text
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+PDEPEND=dev-python/jaraco-collections[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+RDEPEND=dev-python/jaraco-functools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/namespace-jaraco[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-1.10.1.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=a4fabf75a96300d40aa9b1eaf0ccf17d
diff --git a/metadata/md5-cache/dev-python/jaraco-text-1.7 b/metadata/md5-cache/dev-python/jaraco-text-1.7
deleted file mode 100644
index 7a6a5d6feecc..000000000000
--- a/metadata/md5-cache/dev-python/jaraco-text-1.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/setuptools_scm-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/rst-linker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/jaraco-functools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytest-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Text utilities used by other projects by developer jaraco
-EAPI=6
-HOMEPAGE=https://github.com/jaraco/jaraco.text
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-PDEPEND=dev-python/jaraco-collections[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-RDEPEND=dev-python/jaraco-functools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-1.7.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1989b6ee6dc6ed96425c5c72abb96ff2
diff --git a/metadata/md5-cache/dev-python/libcloud-2.3.0 b/metadata/md5-cache/dev-python/libcloud-2.3.0
index c9a1bf390dfd..7f34aa708899 100644
--- a/metadata/md5-cache/dev-python/libcloud-2.3.0
+++ b/metadata/md5-cache/dev-python/libcloud-2.3.0
@@ -5,7 +5,7 @@ DESCRIPTION=Unified Interface to the Cloud - python support libs
EAPI=7
HOMEPAGE=https://libcloud.apache.org/
IUSE=examples test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -13,4 +13,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://apache/libcloud/apache-libcloud-2.3.0.tar.bz2
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=fcc0277e9ec9c00bc7b3a173bc5ab5d4
+_md5_=3e515814fd8adc8cfa6eed036a583313
diff --git a/metadata/md5-cache/dev-python/lmdb-0.92 b/metadata/md5-cache/dev-python/lmdb-0.92
index 85eda7ef53c4..240b1e76c3e3 100644
--- a/metadata/md5-cache/dev-python/lmdb-0.92
+++ b/metadata/md5-cache/dev-python/lmdb-0.92
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Lightning Database
EAPI=6
HOMEPAGE=https://github.com/dw/py-lmdb/
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=OPENLDAP
RDEPEND=dev-db/lmdb:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/l/lmdb/lmdb-0.92.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6c06d4fbdde8963cac88ff6bc1ab865c
+_md5_=06489e69d2ac42e56dbe3be802a09d5f
diff --git a/metadata/md5-cache/dev-python/meld3-1.0.2-r2 b/metadata/md5-cache/dev-python/meld3-1.0.2-r2
new file mode 100644
index 000000000000..40d29939f857
--- /dev/null
+++ b/metadata/md5-cache/dev-python/meld3-1.0.2-r2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=meld3 is an HTML/XML templating engine
+EAPI=7
+HOMEPAGE=https://github.com/supervisor/meld3 https://pypi.org/project/meld3/
+IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=repoze
+RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) 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_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/m/meld3/meld3-1.0.2.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=ecd7279e0ba504c69c082a0a1ff9169f
diff --git a/metadata/md5-cache/dev-python/multidict-4.1.0 b/metadata/md5-cache/dev-python/multidict-4.1.0
index 6d2efa3b8ea9..58c6f60ae598 100644
--- a/metadata/md5-cache/dev-python/multidict-4.1.0
+++ b/metadata/md5-cache/dev-python/multidict-4.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=multidict implementation
EAPI=6
HOMEPAGE=https://github.com/aio-libs/multidict/
IUSE=doc test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/aio-libs/multidict/archive/v4.1.0.tar.gz -> multidict-4.1.0.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e9ad2ed43c18a52e53091375a84283ab
+_md5_=d00f45925385a870fdffacdf9d9cd52c
diff --git a/metadata/md5-cache/dev-python/numba-0.37.0 b/metadata/md5-cache/dev-python/numba-0.37.0
index a8ef38aa83c8..1c3c53b7af08 100644
--- a/metadata/md5-cache/dev-python/numba-0.37.0
+++ b/metadata/md5-cache/dev-python/numba-0.37.0
@@ -4,11 +4,11 @@ DESCRIPTION=NumPy aware dynamic Python compiler using LLVM
EAPI=6
HOMEPAGE=http://numba.pydata.org/
IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=>=dev-python/llvmlite-0.19[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/numba/numba/archive/0.37.0.tar.gz -> numba-0.37.0.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e1eed019b20f919322453c7b6331149
+_md5_=2f9c6e26624f08f0e3393917e2619b46
diff --git a/metadata/md5-cache/dev-python/objgraph-1.7.2 b/metadata/md5-cache/dev-python/objgraph-1.7.2
index 3de7746174ee..38a10fbcb118 100644
--- a/metadata/md5-cache/dev-python/objgraph-1.7.2
+++ b/metadata/md5-cache/dev-python/objgraph-1.7.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare 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_python2_7(-)]
DESCRIPTION=Draws Python object reference graphs with graphviz
EAPI=5
-HOMEPAGE=http://mg.pov.lt/objgraph/
+HOMEPAGE=https://mg.pov.lt/objgraph/
IUSE=doc python_targets_python2_7
KEYWORDS=~amd64
LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://pypi/o/objgraph/objgraph-1.7.2.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9418baed87cf84a2e1d2d260c4f0c6ae
+_md5_=0068e348b10fd8364ff8b532bad20c0b
diff --git a/metadata/md5-cache/dev-python/objgraph-1.8.1 b/metadata/md5-cache/dev-python/objgraph-1.8.1
index a92822f847d1..52269fa35a72 100644
--- a/metadata/md5-cache/dev-python/objgraph-1.8.1
+++ b/metadata/md5-cache/dev-python/objgraph-1.8.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare 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_python2_7(-)]
DESCRIPTION=Draws Python object reference graphs with graphviz
EAPI=5
-HOMEPAGE=http://mg.pov.lt/objgraph/
+HOMEPAGE=https://mg.pov.lt/objgraph/
IUSE=doc python_targets_python2_7
KEYWORDS=~amd64
LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://pypi/o/objgraph/objgraph-1.8.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8b373f5c198b0a25cdba32733d7856c9
+_md5_=0068e348b10fd8364ff8b532bad20c0b
diff --git a/metadata/md5-cache/dev-python/objgraph-3.1.0 b/metadata/md5-cache/dev-python/objgraph-3.1.0
index 33ad745e5b71..344fb9e74587 100644
--- a/metadata/md5-cache/dev-python/objgraph-3.1.0
+++ b/metadata/md5-cache/dev-python/objgraph-3.1.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
DEPEND=dev-python/setuptools python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
DESCRIPTION=Draws Python object reference graphs with graphviz
EAPI=6
-HOMEPAGE=http://mg.pov.lt/objgraph/
+HOMEPAGE=https://mg.pov.lt/objgraph/
IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=MIT
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=mirror://pypi/o/objgraph/objgraph-3.1.0.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a440744967f624e17a46a0c629eb408f
+_md5_=1a49e9ea5f73bb8eca5942d9883c430d
diff --git a/metadata/md5-cache/dev-python/odo-0.5.0-r1 b/metadata/md5-cache/dev-python/odo-0.5.0-r1
index edec96de7c08..7342a60c4b8d 100644
--- a/metadata/md5-cache/dev-python/odo-0.5.0-r1
+++ b/metadata/md5-cache/dev-python/odo-0.5.0-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Data migration in python
EAPI=6
HOMEPAGE=https://github.com/blaze/odo
IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=>=dev-python/datashape-0.4.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dask-0.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multipledispatch-0.4.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pandas-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/toolz-0.7.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/o/odo/odo-0.5.0.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ffa1254a3ffb505946aac2a2c6a5ea03
+_md5_=1e4cde21cb739d27da7cb808394c2220
diff --git a/metadata/md5-cache/dev-python/partd-0.3.8 b/metadata/md5-cache/dev-python/partd-0.3.8
index 0cf5ccc99443..a494aaad5904 100644
--- a/metadata/md5-cache/dev-python/partd-0.3.8
+++ b/metadata/md5-cache/dev-python/partd-0.3.8
@@ -4,11 +4,11 @@ DESCRIPTION=Appendable key-value storage
EAPI=6
HOMEPAGE=https://github.com/dask/partd/
IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-python/locket[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/p/partd/partd-0.3.8.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5015ea3142f256681a9fad47fda7e5aa
+_md5_=215597975183d0e24c7e0445bdf121ff
diff --git a/metadata/md5-cache/dev-python/peewee-3.1.0 b/metadata/md5-cache/dev-python/peewee-3.1.0
index d4d8b9f04233..dacea0571e91 100644
--- a/metadata/md5-cache/dev-python/peewee-3.1.0
+++ b/metadata/md5-cache/dev-python/peewee-3.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=Small python ORM
EAPI=6
HOMEPAGE=https://github.com/coleifer/peewee/
IUSE=doc examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=BSD
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/coleifer/peewee/archive/3.1.0.tar.gz -> peewee-3.1.0.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1430413aca10ac4c7fd5b9943f3992f3
+_md5_=b5164e777891337f3f70b75d0da21866
diff --git a/metadata/md5-cache/dev-python/pid-2.2.0 b/metadata/md5-cache/dev-python/pid-2.2.0
index 8e7a79c561cb..f5df537defdb 100644
--- a/metadata/md5-cache/dev-python/pid-2.2.0
+++ b/metadata/md5-cache/dev-python/pid-2.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Pidfile featuring stale detection and file-locking
EAPI=5
HOMEPAGE=https://pypi.org/project/pid/ https://github.com/trbs/pid/
IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
+KEYWORDS=amd64
LICENSE=Apache-2.0
RDEPEND=dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/p/pid/pid-2.2.0.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f3908b1277863e1492e4057ec41dbab
+_md5_=4ee586c2dce692e3cad8202adedf4fd0
diff --git a/metadata/md5-cache/dev-python/ptpython-0.33-r1 b/metadata/md5-cache/dev-python/ptpython-0.33-r1
index c9eaab349ccd..ca700aefca29 100644
--- a/metadata/md5-cache/dev-python/ptpython-0.33-r1
+++ b/metadata/md5-cache/dev-python/ptpython-0.33-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python REPL build on top of prompt_toolkit
EAPI=6
HOMEPAGE=https://pypi.org/project/ptpython/ https://github.com/jonathanslenders/ptpython
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-python/docopt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-0.58[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://pypi/p/ptpython/ptpython-0.33.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=027a1d35b12c2b760a8299270b2ef5ca
+_md5_=d84f37f50671e3b3c1c9f593bd6d0a13
diff --git a/metadata/md5-cache/dev-python/py-1.4.34 b/metadata/md5-cache/dev-python/py-1.4.34
index 7d22d7c28553..38a987abcd67 100644
--- a/metadata/md5-cache/dev-python/py-1.4.34
+++ b/metadata/md5-cache/dev-python/py-1.4.34
@@ -4,11 +4,11 @@ DESCRIPTION=library with cross-python path, ini-parsing, io, code, log facilitie
EAPI=6
HOMEPAGE=https://pylib.readthedocs.io/en/latest/ https://pypi.org/project/py/
IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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
+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
LICENSE=MIT
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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/p/py/py-1.4.34.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=76c229e6d2f2c9f7837278b00c7156eb
+_md5_=ea076b7c1bee1a4aad66587516219da6
diff --git a/metadata/md5-cache/dev-python/pyftpdlib-1.5.3 b/metadata/md5-cache/dev-python/pyftpdlib-1.5.3
index ac00138d2233..e5299fcf9e52 100644
--- a/metadata/md5-cache/dev-python/pyftpdlib-1.5.3
+++ b/metadata/md5-cache/dev-python/pyftpdlib-1.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python FTP server library
EAPI=6
HOMEPAGE=https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/
IUSE=doc examples ssl test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-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
+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
LICENSE=MIT
RDEPEND=ssl? ( dev-python/pyopenssl[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[ssl(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[ssl(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ssl(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[ssl(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[ssl(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[ssl(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/p/pyftpdlib/pyftpdlib-1.5.3.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ee4b05cee708cf4aa0480bef5df18261
+_md5_=f22286ba27d4ddee00e8c9cce7377297
diff --git a/metadata/md5-cache/dev-python/pygal-2.4.0 b/metadata/md5-cache/dev-python/pygal-2.4.0
index 1df1bb57364c..057569675838 100644
--- a/metadata/md5-cache/dev-python/pygal-2.4.0
+++ b/metadata/md5-cache/dev-python/pygal-2.4.0
@@ -5,11 +5,11 @@ DESCRIPTION=A python SVG charts generator
EAPI=7
HOMEPAGE=http://pygal.org/
IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=LGPL-3+
RDEPEND=dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-gfx/cairosvg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/Kozea/pygal/archive/2.4.0.tar.gz -> pygal-2.4.0.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=4c6487654a559111c157f98310745b5c
+_md5_=0d2cb5ff7c99aade3cff1a813dd2cf1d
diff --git a/metadata/md5-cache/dev-python/pygame-1.9.3 b/metadata/md5-cache/dev-python/pygame-1.9.3
index 6f8dbbd48667..b8ad7a807b65 100644
--- a/metadata/md5-cache/dev-python/pygame-1.9.3
+++ b/metadata/md5-cache/dev-python/pygame-1.9.3
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings for SDL multimedia library
EAPI=6
HOMEPAGE=http://www.pygame.org/
IUSE=doc examples midi X python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86
LICENSE=LGPL-2.1
RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=media-libs/sdl-image-1.2.2[png,jpeg] >=media-libs/sdl-mixer-1.2.4 >=media-libs/sdl-ttf-2.0.6 >=media-libs/smpeg-0.4.4-r1 midi? ( media-libs/portmidi ) X? ( >=media-libs/libsdl-1.2.5[X,video] ) !X? ( >=media-libs/libsdl-1.2.5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://pypi/p/pygame/pygame-1.9.3.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f416a883e19882fec81546bd97c2f93
+_md5_=37e3b4a0c9ca5abd220e0c092b1a8748
diff --git a/metadata/md5-cache/dev-python/pyodbc-4.0.16 b/metadata/md5-cache/dev-python/pyodbc-4.0.16
index 56650eb7d0ad..2421d8c5a5ca 100644
--- a/metadata/md5-cache/dev-python/pyodbc-4.0.16
+++ b/metadata/md5-cache/dev-python/pyodbc-4.0.16
@@ -4,11 +4,11 @@ DESCRIPTION=python ODBC module to connect to almost any database
EAPI=6
HOMEPAGE=https://github.com/mkleehammer/pyodbc
IUSE=mssql python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=MIT
RDEPEND=>=dev-db/unixODBC-2.3.0 mssql? ( >=dev-db/freetds-0.64[odbc] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/p/pyodbc/pyodbc-4.0.16.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cef34d37f1f38c7ef8c7da947ceeb3f0
+_md5_=53d2dc3f862e8b43b4096f755389057e
diff --git a/metadata/md5-cache/dev-python/pyte-0.5.2-r2 b/metadata/md5-cache/dev-python/pyte-0.5.2-r2
index 7e8f4f0f9e86..28e18a68ab46 100644
--- a/metadata/md5-cache/dev-python/pyte-0.5.2-r2
+++ b/metadata/md5-cache/dev-python/pyte-0.5.2-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Simple VTXXX-compatible terminal emulator
EAPI=5
HOMEPAGE=https://pypi.org/project/pyte/ https://github.com/selectel/pyte
IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-3
RDEPEND=dev-python/wcwidth[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/p/pyte/pyte-0.5.2.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e3b18a29198cceeb72872eec4d292213
+_md5_=d857b5efa3dca0083df955cd41eb21bd
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.3.1 b/metadata/md5-cache/dev-python/pytest-cov-2.3.1
index 1de3a7a02870..0d88828ce6ed 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.3.1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=py.test plugin for coverage reporting
EAPI=6
HOMEPAGE=https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/
IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 sparc x86
LICENSE=MIT
RDEPEND=>=dev-python/py-1.4.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.7.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cov-core-1.14.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-3.7.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/p/pytest-cov/pytest-cov-2.3.1.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=92b212d76b2b23d688320d9077f7fbaa
+_md5_=42b445ce1b1a581ed869fe413d5c0511
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1 b/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1
index 1c32aa3998f1..fba809deb9e6 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=py.test plugin for coverage reporting
EAPI=6
HOMEPAGE=https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/
IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd
+KEYWORDS=~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
LICENSE=MIT
RDEPEND=>=dev-python/py-1.4.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.7.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cov-core-1.14.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-3.7.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/p/pytest-cov/pytest-cov-2.5.1.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4037a468d379126f00d5fd3ee987967f
+_md5_=1ff1d7ae8c466590e6603caced8b5022
diff --git a/metadata/md5-cache/dev-python/python-axolotl-0.1.42 b/metadata/md5-cache/dev-python/python-axolotl-0.1.42
new file mode 100644
index 000000000000..565756bd97a3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-axolotl-0.1.42
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-axolotl-curve25519[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A python module for the axolotl protocol
+EAPI=6
+HOMEPAGE=https://github.com/tgalal/python-axolotl
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/cryptography[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/protobuf-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-axolotl-curve25519[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/tgalal/python-axolotl/archive/0.1.42.tar.gz -> python-axolotl-0.1.42.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8e1f7029e77a10d26234314d764351b3
diff --git a/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2 b/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2
new file mode 100644
index 000000000000..dfe962c2968f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-axolotl-curve25519-0.4.1_p2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A python wrapper for the curve25519 library with ed25519 signatures
+EAPI=6
+HOMEPAGE=https://github.com/tgalal/python-axolotl-curve25519
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-3
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/tgalal/python-axolotl-curve25519/archive/0.4.1-2.tar.gz -> python-axolotl-curve25519-0.4.1-2.tar.gz
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=efe606b1684c0eee54dc4bb5da56ad57
diff --git a/metadata/md5-cache/dev-python/python-debian-0.1.31 b/metadata/md5-cache/dev-python/python-debian-0.1.31
index 9f4a5b9e71db..7d6e84f90d26 100644
--- a/metadata/md5-cache/dev-python/python-debian-0.1.31
+++ b/metadata/md5-cache/dev-python/python-debian-0.1.31
@@ -4,7 +4,7 @@ DESCRIPTION=Python modules to work with Debian-related data formats
EAPI=6
HOMEPAGE=https://packages.debian.org/sid/python-debian
IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=GPL-2 GPL-3
RDEPEND=dev-python/chardet[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://debian/pool/main/p/python-debian/python-debian_0.1.31.tar.xz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2cb3c0c031e162aa624b4b156dd75043
+_md5_=8ae25ad3e81012f4e20774f8dab08ce0
diff --git a/metadata/md5-cache/dev-python/python-magic-0.4.15 b/metadata/md5-cache/dev-python/python-magic-0.4.15
index 6ab80cc8a3ec..3239fb1a0e7e 100644
--- a/metadata/md5-cache/dev-python/python-magic-0.4.15
+++ b/metadata/md5-cache/dev-python/python-magic-0.4.15
@@ -4,11 +4,11 @@ DESCRIPTION=Access the libmagic file type identification library
EAPI=6
HOMEPAGE=https://github.com/ahupp/python-magic
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~hppa ~ia64 ~x86
+KEYWORDS=amd64 ~hppa ~ia64 ~x86
LICENSE=MIT
RDEPEND=sys-apps/file[-python] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/p/python-magic/python-magic-0.4.15.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9b8ca9ddad3e58127ff7a96590852700
+_md5_=fc5e5a6603eb005e39707d4882f4452a
diff --git a/metadata/md5-cache/dev-python/s3fs-0.1.2 b/metadata/md5-cache/dev-python/s3fs-0.1.2
index cfc8d1f3670d..b4f03fbfa9e5 100644
--- a/metadata/md5-cache/dev-python/s3fs-0.1.2
+++ b/metadata/md5-cache/dev-python/s3fs-0.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Pythonic file interface to S3
EAPI=6
HOMEPAGE=http://s3fs.readthedocs.io/en/latest/
IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-python/boto3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/s/s3fs/s3fs-0.1.2.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c7a7b11d09d6b26df229b5f5ec7c1c33
+_md5_=b2d7ea3763a5dc91853303827c69001c
diff --git a/metadata/md5-cache/dev-python/sortedcollections-0.5.3 b/metadata/md5-cache/dev-python/sortedcollections-0.5.3
index 428f7b8ab859..f2b60206a884 100644
--- a/metadata/md5-cache/dev-python/sortedcollections-0.5.3
+++ b/metadata/md5-cache/dev-python/sortedcollections-0.5.3
@@ -4,11 +4,11 @@ DESCRIPTION=Python library to sort collections and containers
EAPI=6
HOMEPAGE=http://www.grantjenks.com/docs/sortedcontainers/
IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
RDEPEND=dev-python/sortedcontainers[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/s/sortedcollections/sortedcollections-0.5.3.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f90c543e8fdeef914aaf3ba7b13dfab0
+_md5_=21edee6a800f2118b66ad9a68bed1acc
diff --git a/metadata/md5-cache/dev-python/sphinx-1.6.5 b/metadata/md5-cache/dev-python/sphinx-1.6.5
index 5b447752004f..5ca3a591fd8a 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.6.5
+++ b/metadata/md5-cache/dev-python/sphinx-1.6.5
@@ -4,11 +4,11 @@ DESCRIPTION=Python documentation generator
EAPI=6
HOMEPAGE=http://www.sphinx-doc.org/
IUSE=doc latex net test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-fbsd ~x86-macos ~x86-linux ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
LICENSE=BSD
RDEPEND=>=dev-python/alabaster-0.7.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/Babel-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/docutils-0.11[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/imagesize[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.0.1-r1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/snowballstemmer-1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sphinx_rtd_theme-0.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/sqlalchemy-0.9[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/whoosh-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[threads(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.6.5.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d10751210073a09cc7f54d77d1781725
+_md5_=ec79eeb352188b5a024c65ef05a90ed4
diff --git a/metadata/md5-cache/dev-python/sphinx-1.7.5 b/metadata/md5-cache/dev-python/sphinx-1.7.5
index f00cc2706020..51b5e994844e 100644
--- a/metadata/md5-cache/dev-python/sphinx-1.7.5
+++ b/metadata/md5-cache/dev-python/sphinx-1.7.5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
SLOT=0
SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.7.5.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=630c014abc9d78d7adc2b85213f0a9f0
+_md5_=9530507c5b2ab8db5916c233d225e23c
diff --git a/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2 b/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2
index bcdaf8bdeef0..e3eada3c2f6b 100644
--- a/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2
+++ b/metadata/md5-cache/dev-python/sphinx-py3doc-enhanced-theme-2.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Enhanced Sphinx theme (based on Python 3 docs)
EAPI=6
HOMEPAGE=https://github.com/ionelmc/sphinx-py3doc-enhanced-theme https://pypi.org/project/sphinx-py3doc-enhanced-theme/
IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd
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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/s/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=90ebe580a93f8742b9d72401f9702a62
+_md5_=bfdf331e09d8a7a2d1bc24ace590a2a2
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11 b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11
index 87cfa64984b8..15ed7da58204 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-programoutput-0.11
@@ -4,11 +4,11 @@ DESCRIPTION=Extension to sphinx to include program output
EAPI=6
HOMEPAGE=https://sphinxcontrib-programoutput.readthedocs.io/en/latest/
IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-python/sphinx[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/namespace-sphinxcontrib[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/s/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.11.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3c12ad92294091a50ed8df68f3d60436
+_md5_=0bc80f186e7ce37061c11bb13f82b82f
diff --git a/metadata/md5-cache/dev-python/tblib-1.3.2 b/metadata/md5-cache/dev-python/tblib-1.3.2
index 91f6d2ed2f4f..b12b6ac1e18a 100644
--- a/metadata/md5-cache/dev-python/tblib-1.3.2
+++ b/metadata/md5-cache/dev-python/tblib-1.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Traceback fiddling library for Python
EAPI=6
HOMEPAGE=https://github.com/ionelmc/python-tblib
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/t/tblib/tblib-1.3.2.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9801a625ef9cb58d5e32181df0b5af8f
+_md5_=5a86987643330f7659dc9ceb30cb0ba8
diff --git a/metadata/md5-cache/dev-python/vcrpy-1.11.1 b/metadata/md5-cache/dev-python/vcrpy-1.11.1
index f939000e9adc..acb0eb8d7bb6 100644
--- a/metadata/md5-cache/dev-python/vcrpy-1.11.1
+++ b/metadata/md5-cache/dev-python/vcrpy-1.11.1
@@ -4,11 +4,11 @@ DESCRIPTION=Automatically mock your HTTP interactions to simplify and speed up t
EAPI=5
HOMEPAGE=https://github.com/kevin1024/vcrpy
IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.5[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/urllib3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/wrapt[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python3_4? ( dev-python/yarl[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-python/yarl[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/yarl[python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/v/vcrpy/vcrpy-1.11.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a49fee2931842fcd38004a383f01ed38
+_md5_=5ad8aec65e3d390b42c90c065386f961
diff --git a/metadata/md5-cache/dev-python/vcversioner-2.16.0.0 b/metadata/md5-cache/dev-python/vcversioner-2.16.0.0
index 0434e31f4b13..356b3fff332e 100644
--- a/metadata/md5-cache/dev-python/vcversioner-2.16.0.0
+++ b/metadata/md5-cache/dev-python/vcversioner-2.16.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=Use version control tags to discover version numbers
EAPI=5
HOMEPAGE=https://github.com/habnabit/vcversioner https://pypi.org/project/vcversioner/
IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd
LICENSE=MIT
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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://pypi/v/vcversioner/vcversioner-2.16.0.0.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f58f40ec55c10030e77670245b90a7e
+_md5_=a55502471095cee864cf55c599e0edce
diff --git a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2 b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2
index a5a0cacc0474..123b528f94cc 100644
--- a/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2
+++ b/metadata/md5-cache/dev-python/virtualenvwrapper-4.8.2
@@ -4,7 +4,7 @@ DESCRIPTION=Set of extensions to Ian Bicking's virtualenv tool
EAPI=6
HOMEPAGE=https://bitbucket.org/dhellmann/virtualenvwrapper https://pypi.org/project/virtualenvwrapper/
IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=BSD
RDEPEND=dev-python/virtualenv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/stevedore[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/virtualenv-clone[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://pypi/v/virtualenvwrapper/virtualenvwrapper-4.8.2.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5db62220d57d927cc51783f53240321
+_md5_=0eb759d334ff78318a0699d0ca7c3f98
diff --git a/metadata/md5-cache/dev-python/webassets-0.12.1 b/metadata/md5-cache/dev-python/webassets-0.12.1
index 34ff04b4ec09..113c54963d01 100644
--- a/metadata/md5-cache/dev-python/webassets-0.12.1
+++ b/metadata/md5-cache/dev-python/webassets-0.12.1
@@ -4,11 +4,11 @@ DESCRIPTION=Asset management for Python web development
EAPI=6
HOMEPAGE=https://github.com/miracle2k/webassets
IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=BSD-2
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/miracle2k/webassets/archive/0.12.1.tar.gz -> webassets-0.12.1.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=588ff995fd9330c8d223fd4ec665c648
+_md5_=52f24b0cd810ff0096b977be846b81af
diff --git a/metadata/md5-cache/dev-python/ws4py-0.5.1 b/metadata/md5-cache/dev-python/ws4py-0.5.1
index 86d17d7375da..f85524573a04 100644
--- a/metadata/md5-cache/dev-python/ws4py-0.5.1
+++ b/metadata/md5-cache/dev-python/ws4py-0.5.1
@@ -4,11 +4,11 @@ DESCRIPTION=WebSocket client and server library for Python 2 and 3 as well as Py
EAPI=6
HOMEPAGE=https://github.com/Lawouach/WebSocket-for-Python
IUSE=+client +server test +threads python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
LICENSE=BSD
RDEPEND=>=dev-python/greenlet-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/gevent[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/cython-0.19.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] client? ( >=www-servers/tornado-3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) server? ( >=dev-python/cherrypy-3.2.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads?] ) python_targets_python3_4? ( dev-lang/python:3.4[threads?] ) python_targets_python3_5? ( dev-lang/python:3.5[threads?] ) python_targets_python3_6? ( dev-lang/python:3.6[threads?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/Lawouach/WebSocket-for-Python/archive/0.5.1.tar.gz -> ws4py-0.5.1.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3010272300e89b9f407b04ce5e161f2b
+_md5_=c92318148adca6be0893d715f0040fe3
diff --git a/metadata/md5-cache/dev-python/yapsy-1.11.223-r2 b/metadata/md5-cache/dev-python/yapsy-1.11.223-r2
index ac63f7b6e2ac..38a909b050c8 100644
--- a/metadata/md5-cache/dev-python/yapsy-1.11.223-r2
+++ b/metadata/md5-cache/dev-python/yapsy-1.11.223-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A fat-free DIY Python plugin management toolkit
EAPI=6
HOMEPAGE=http://yapsy.sourceforge.net/
IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://sourceforge/yapsy/Yapsy-1.11.223/Yapsy-1.11.223.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80d10757e7ea136cb199e61d2486e1e8
+_md5_=86e7086ffd4af1650be9e2614509c8d2
diff --git a/metadata/md5-cache/dev-python/yarl-0.10.2 b/metadata/md5-cache/dev-python/yarl-0.10.2
deleted file mode 100644
index 5c38b86a9528..000000000000
--- a/metadata/md5-cache/dev-python/yarl-0.10.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/multidict[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Yet another URL library
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/yarl/
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/multidict[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/y/yarl/yarl-0.10.2.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56919854583e3e7435d4307dabdd23c5
diff --git a/metadata/md5-cache/dev-python/yarl-0.10.3 b/metadata/md5-cache/dev-python/yarl-0.10.3
deleted file mode 100644
index 635caff8a11e..000000000000
--- a/metadata/md5-cache/dev-python/yarl-0.10.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/multidict[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Yet another URL library
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/yarl/
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/multidict[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/y/yarl/yarl-0.10.3.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=56919854583e3e7435d4307dabdd23c5
diff --git a/metadata/md5-cache/dev-python/yarl-0.14.1 b/metadata/md5-cache/dev-python/yarl-0.14.1
deleted file mode 100644
index 17d13f2bd28d..000000000000
--- a/metadata/md5-cache/dev-python/yarl-0.14.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/multidict-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Yet another URL library
-EAPI=6
-HOMEPAGE=https://github.com/aio-libs/yarl/
-IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/multidict-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/y/yarl/yarl-0.14.1.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b5853de59976caf1c3d19810b43395c2
diff --git a/metadata/md5-cache/dev-python/yarl-1.1.1 b/metadata/md5-cache/dev-python/yarl-1.1.1
index 5845e79c3471..97d5eacd0c14 100644
--- a/metadata/md5-cache/dev-python/yarl-1.1.1
+++ b/metadata/md5-cache/dev-python/yarl-1.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Yet another URL library
EAPI=6
HOMEPAGE=https://github.com/aio-libs/yarl/
IUSE=test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=Apache-2.0
RDEPEND=>=dev-python/multidict-4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/idna-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/y/yarl/yarl-1.1.1.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5f83aa4f698d4363d3216b0d6702922b
+_md5_=8ad660c2f1dfe4c0221e239ac44ab5f4
diff --git a/metadata/md5-cache/dev-python/zict-0.1.2 b/metadata/md5-cache/dev-python/zict-0.1.2
index a5e52406935d..d748f005ff35 100644
--- a/metadata/md5-cache/dev-python/zict-0.1.2
+++ b/metadata/md5-cache/dev-python/zict-0.1.2
@@ -4,11 +4,11 @@ DESCRIPTION=Mutable mapping tools
EAPI=6
HOMEPAGE=https://github.com/dask/zict/
IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-python/HeapDict[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-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_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://pypi/z/zict/zict-0.1.2.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=94e55f5aa13d50144ef95fa817a268b7
+_md5_=c7d98e12a61d60b8cca4ea9599600e20
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 116b520a194d..7d2449a81cd4 100644
Binary files a/metadata/md5-cache/dev-qt/Manifest.gz and b/metadata/md5-cache/dev-qt/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.11.0_rc2 b/metadata/md5-cache/dev-qt/qtwebengine-5.11.0_rc2
index 97786511e92d..772efb1101d3 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.11.0_rc2
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.11.0_rc2
@@ -1,14 +1,15 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.0_rc2 ~dev-qt/qtdeclarative-5.11.0_rc2 ~dev-qt/qtgui-5.11.0_rc2 ~dev-qt/qtnetwork-5.11.0_rc2 ~dev-qt/qtprintsupport-5.11.0_rc2 ~dev-qt/qtwebchannel-5.11.0_rc2[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) geolocation? ( ~dev-qt/qtpositioning-5.11.0_rc2 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.0_rc2[widgets] ~dev-qt/qtwidgets-5.11.0_rc2 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc2 )
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.0_rc2 ~dev-qt/qtdeclarative-5.11.0_rc2 ~dev-qt/qtgui-5.11.0_rc2 ~dev-qt/qtnetwork-5.11.0_rc2 ~dev-qt/qtprintsupport-5.11.0_rc2 ~dev-qt/qtwebchannel-5.11.0_rc2[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.11.0_rc2 ) geolocation? ( ~dev-qt/qtpositioning-5.11.0_rc2 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.0_rc2[widgets] ~dev-qt/qtwidgets-5.11.0_rc2 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.11.0_rc2 )
DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
EAPI=6
HOMEPAGE=https://www.qt.io/
-IUSE=alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
+IUSE=alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.0_rc2 ~dev-qt/qtdeclarative-5.11.0_rc2 ~dev-qt/qtgui-5.11.0_rc2 ~dev-qt/qtnetwork-5.11.0_rc2 ~dev-qt/qtprintsupport-5.11.0_rc2 ~dev-qt/qtwebchannel-5.11.0_rc2[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) geolocation? ( ~dev-qt/qtpositioning-5.11.0_rc2 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.0_rc2[widgets] ~dev-qt/qtwidgets-5.11.0_rc2 ) dev-qt/qtchooser
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.11.0_rc2 ~dev-qt/qtdeclarative-5.11.0_rc2 ~dev-qt/qtgui-5.11.0_rc2 ~dev-qt/qtnetwork-5.11.0_rc2 ~dev-qt/qtprintsupport-5.11.0_rc2 ~dev-qt/qtwebchannel-5.11.0_rc2[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libjpeg-turbo:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.11.0_rc2 ) geolocation? ( ~dev-qt/qtpositioning-5.11.0_rc2 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.11.0_rc2[widgets] ~dev-qt/qtwidgets-5.11.0_rc2 ) dev-qt/qtchooser
+REQUIRED_USE=designer? ( widgets )
RESTRICT=test
SLOT=5/5.11
SRC_URI=https://download.qt.io/development_releases/qt/5.11/5.11.0-rc2/submodules/qtwebengine-everywhere-src-5.11.0-rc2.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 qt5-build e171eb59bd29fd84761d8ee631c901d2 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=a04363f7de82a808f8cd18017539fe7d
+_md5_=b1af83bb266c8ae8d8fa8a7c7d25b79d
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.9.6 b/metadata/md5-cache/dev-qt/qtwebengine-5.9.6
index 01926601d864..8098ccffe20e 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.9.6
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.9.6
@@ -1,14 +1,15 @@
DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtwebchannel-5.9.6[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) geolocation? ( ~dev-qt/qtpositioning-5.9.6 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.6[widgets] ~dev-qt/qtwidgets-5.9.6 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtwebchannel-5.9.6[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.9.6 ) geolocation? ( ~dev-qt/qtpositioning-5.9.6 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.6[widgets] ~dev-qt/qtwidgets-5.9.6 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.6 )
DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
EAPI=6
HOMEPAGE=https://www.qt.io/
-IUSE=alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
+IUSE=alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtwebchannel-5.9.6[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) geolocation? ( ~dev-qt/qtpositioning-5.9.6 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.6[widgets] ~dev-qt/qtwidgets-5.9.6 ) dev-qt/qtchooser
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.6 ~dev-qt/qtdeclarative-5.9.6 ~dev-qt/qtgui-5.9.6 ~dev-qt/qtnetwork-5.9.6 ~dev-qt/qtprintsupport-5.9.6 ~dev-qt/qtwebchannel-5.9.6[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) designer? ( ~dev-qt/designer-5.9.6 ) geolocation? ( ~dev-qt/qtpositioning-5.9.6 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.6[widgets] ~dev-qt/qtwidgets-5.9.6 ) dev-qt/qtchooser
+REQUIRED_USE=designer? ( widgets )
RESTRICT=test
SLOT=5/5.9
SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtwebengine-opensource-src-5.9.6.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 qt5-build e171eb59bd29fd84761d8ee631c901d2 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=aef7c24bfcfa0958b5ed837272d9fcac
+_md5_=b38c6b1167cf1c33313b8b76497c6c4b
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.9.6 b/metadata/md5-cache/dev-qt/qtwidgets-5.9.6-r1
similarity index 97%
rename from metadata/md5-cache/dev-qt/qtwidgets-5.9.6
rename to metadata/md5-cache/dev-qt/qtwidgets-5.9.6-r1
index e6ad2d7661d9..0210c78bae6f 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.9.6
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.9.6-r1
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=5/5.9
SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.6/submodules/qtbase-opensource-src-5.9.6.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qt5-build e171eb59bd29fd84761d8ee631c901d2 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c
-_md5_=b069c13688588f35e6d0e06074c046ce
+_md5_=16adb62276593b43d9735120336cef22
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 04d73a0114a9..58f5689bda63 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/chunky_png-1.3.10 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.10
index f65427022554..f163d43571e8 100644
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.10
+++ b/metadata/md5-cache/dev-ruby/chunky_png-1.3.10
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
DESCRIPTION=Pure Ruby library that can read and write PNG images
EAPI=6
HOMEPAGE=https://wiki.github.com/wvanbergen/chunky_png
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
KEYWORDS=~amd64 ~x86
LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=mirror://rubygems/chunky_png-1.3.10.gem
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7b85fbeb0d8160a5e8dd7e8cfa950ff5
+_md5_=84b2f30c82315df9aed17cc510a335ab
diff --git a/metadata/md5-cache/dev-ruby/chunky_png-1.3.8 b/metadata/md5-cache/dev-ruby/chunky_png-1.3.8
deleted file mode 100644
index f4d1e086bff3..000000000000
--- a/metadata/md5-cache/dev-ruby/chunky_png-1.3.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Pure Ruby library that can read and write PNG images
-EAPI=5
-HOMEPAGE=https://wiki.github.com/wvanbergen/chunky_png
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/chunky_png-1.3.8.gem
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e7afb3b6b2d26a35a1e8469a477284b1
diff --git a/metadata/md5-cache/dev-ruby/compass-1.0.3-r1 b/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
index 50cf9e2c25d6..50da2d74b0c8 100644
--- a/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/compass-1.0.3-r1
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/chunky_png-1.2[ruby_targets_ruby23] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby23] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby23] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby23] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby23] =dev-ruby/chunky_png-1.2[ruby_targets_ruby24] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby24] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby24] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby24] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby24] =dev-ruby/chunky_png-1.2[ruby_targets_ruby23] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby23] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby23] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby23] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby23] =dev-ruby/chunky_png-1.2[ruby_targets_ruby24] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby24] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby24] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby24] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby24] =dev-ruby/chunky_png-1.2[ruby_targets_ruby25] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby25] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby25] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby25] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby25] =dev-ruby/chunky_png-1.2[ruby_targets_ruby23] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby23] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby23] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby23] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby23] =dev-ruby/chunky_png-1.2[ruby_targets_ruby24] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby24] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby24] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby24] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby24] =dev-ruby/chunky_png-1.2[ruby_targets_ruby23] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby23] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby23] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby23] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby23] =dev-ruby/chunky_png-1.2[ruby_targets_ruby24] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby24] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby24] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby24] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby24] =dev-ruby/chunky_png-1.2[ruby_targets_ruby25] >=dev-ruby/compass-core-1.0.2:1.0[ruby_targets_ruby25] >=dev-ruby/compass-import-once-1.0.5:1.0[ruby_targets_ruby25] >=dev-ruby/rb-inotify-0.9[ruby_targets_ruby25] >=dev-ruby/sass-3.3.13:*[ruby_targets_ruby25] =dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby23] =dev-ruby/multi_json-1.0[ruby_targets_ruby24] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby24] =dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby23] =dev-ruby/multi_json-1.0[ruby_targets_ruby24] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby24] =dev-ruby/multi_json-1.0[ruby_targets_ruby25] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby25] =dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby23] =dev-ruby/multi_json-1.0[ruby_targets_ruby24] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby24] =dev-ruby/multi_json-1.0[ruby_targets_ruby23] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby23] =dev-ruby/multi_json-1.0[ruby_targets_ruby24] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby24] =dev-ruby/multi_json-1.0[ruby_targets_ruby25] >=dev-ruby/sass-3.3.0:*[ruby_targets_ruby25] =dev-ruby/sass-3.2:*[ruby_targets_ruby23] =dev-ruby/sass-3.2:*[ruby_targets_ruby24] =dev-ruby/sass-3.2:*[ruby_targets_ruby23] =dev-ruby/sass-3.2:*[ruby_targets_ruby24] =dev-ruby/sass-3.2:*[ruby_targets_ruby25] =dev-ruby/sass-3.2:*[ruby_targets_ruby23] =dev-ruby/sass-3.2:*[ruby_targets_ruby24] =dev-ruby/sass-3.2:*[ruby_targets_ruby23] =dev-ruby/sass-3.2:*[ruby_targets_ruby24] =dev-ruby/sass-3.2:*[ruby_targets_ruby25] fast_gettext-1.7.0.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=a2a047a3adc3a8f4a73b04ec78fd6c02
diff --git a/metadata/md5-cache/dev-ruby/hocon-1.2.5 b/metadata/md5-cache/dev-ruby/hocon-1.2.5
index d473f65658fb..46c4883ae57d 100644
--- a/metadata/md5-cache/dev-ruby/hocon-1.2.5
+++ b/metadata/md5-cache/dev-ruby/hocon-1.2.5
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
DESCRIPTION=This is a port of the Typesafe Config library to Ruby.
EAPI=5
HOMEPAGE=https://github.com/puppetlabs/ruby-hocon
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
KEYWORDS=amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=mirror://rubygems/hocon-1.2.5.gem
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=efe092ae184c50424b2f4c58b8499fd4
+_md5_=e569416a186c96c79ca2176101f81063
diff --git a/metadata/md5-cache/dev-ruby/http-cookie-1.0.3 b/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
index d543eb106e03..d8bb08a526e1 100644
--- a/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
+++ b/metadata/md5-cache/dev-ruby/http-cookie-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=A ruby library to handle HTTP cookies
EAPI=5
HOMEPAGE=https://github.com/sparklemotion/http-cookie
IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86
LICENSE=MIT
RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/domain_name-0.5:0[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=mirror://rubygems/http-cookie-1.0.3.gem
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8084d186dd4fe29e076c1606f8321819
+_md5_=287aefb293f1b4f86b9e6ee01800673a
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5-r1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5-r1
index ea3d7f1cdff0..fee6d8622ab0 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5-r1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-5.0.5-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
DESCRIPTION=The jQuery UI assets for the Rails 3.2+ asset pipeline
EAPI=5
HOMEPAGE=http://www.rubyonrails.org
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=5
SRC_URI=mirror://rubygems/jquery-ui-rails-5.0.5.gem
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=14f46da1f8f56b6d43a609b5af0dd312
+_md5_=8921a27952ff96707d2827345eb72606
diff --git a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1 b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
index 2ffcaa9a9a34..daf895a2c552 100644
--- a/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
+++ b/metadata/md5-cache/dev-ruby/jquery-ui-rails-6.0.1-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
DESCRIPTION=The jQuery UI assets for the Rails 3.2+ asset pipeline
EAPI=6
HOMEPAGE=https://github.com/joliss/jquery-ui-rails
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test
KEYWORDS=~amd64 ~arm ~x86 ~x64-macos
LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby24] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/railties-3.2.16:*[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=6
SRC_URI=mirror://rubygems/jquery-ui-rails-6.0.1.gem
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=07fb7f05a63225c5690cdceca15353e6
+_md5_=b90321577fbffa11616374c4b673fa28
diff --git a/metadata/md5-cache/dev-ruby/paramesan-0.1.1 b/metadata/md5-cache/dev-ruby/paramesan-0.1.1
index b9cc81e1938d..b380a65788ed 100644
--- a/metadata/md5-cache/dev-ruby/paramesan-0.1.1
+++ b/metadata/md5-cache/dev-ruby/paramesan-0.1.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
SLOT=0
SRC_URI=https://github.com/jpace/paramesan/archive/v0.1.1.tar.gz -> paramesan-0.1.1.tgz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3dca0a3ba0821383a58851f0eb7941e0
+_md5_=eaa9a8fee0f23412d76525369219030e
diff --git a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1 b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
index 9fa1f8ebe80c..e6fc308fda65 100644
--- a/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
+++ b/metadata/md5-cache/dev-ruby/ruby-progressbar-1.4.2-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/timecop[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/timecop[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/timecop[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby23] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby24] >=dev-ruby/rspec-core-2.14.8-r2[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
DESCRIPTION=A Text Progress Bar Library for Ruby
EAPI=5
HOMEPAGE=https://github.com/jfelchner/ruby-progressbar
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 test test
KEYWORDS=amd64 ~hppa ppc ppc64 x86 ~x86-fbsd
LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
+RDEPEND=ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
SLOT=0
SRC_URI=mirror://rubygems/ruby-progressbar-1.4.2.gem
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 28631ba8ae1b3218596c0eb3e38c438e ruby-ng c1f44e746d7656dd6e02d8815ff9518a ruby-utils e5942a80e3c3b936c6b84d6dc4af9f9c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f7759d05107ef33d84977574e5c272f8
+_md5_=011cd3170d30f7faea177cf578b1f11a
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 37f2cb4771c7..1d1b9f317f9e 100644
Binary files a/metadata/md5-cache/dev-scheme/Manifest.gz and b/metadata/md5-cache/dev-scheme/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-scheme/escm-1.1 b/metadata/md5-cache/dev-scheme/escm-1.1-r1
similarity index 90%
rename from metadata/md5-cache/dev-scheme/escm-1.1
rename to metadata/md5-cache/dev-scheme/escm-1.1-r1
index f996cdd6a68d..45865532cab0 100644
--- a/metadata/md5-cache/dev-scheme/escm-1.1
+++ b/metadata/md5-cache/dev-scheme/escm-1.1-r1
@@ -1,12 +1,12 @@
DEFINED_PHASES=install prepare
DEPEND=>=app-portage/elt-patches-20170422 !=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=escm - Embedded Scheme Processor
-EAPI=5
+EAPI=6
HOMEPAGE=http://practical-scheme.net/vault/escm.html
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 ~ia64 x86
LICENSE=BSD
RDEPEND=|| ( dev-scheme/gauche dev-scheme/guile )
SLOT=0
SRC_URI=http://practical-scheme.net/vault/escm-1.1.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=154709f02bfa4dd1af7c3c7ce7d07e5a
+_md5_=bd10aac6509aa872e5df1adc8422b7f1
diff --git a/metadata/md5-cache/dev-scheme/gauche-0.9.3.3 b/metadata/md5-cache/dev-scheme/gauche-0.9.3.3
deleted file mode 100644
index 1be74ad619b8..000000000000
--- a/metadata/md5-cache/dev-scheme/gauche-0.9.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/gdbm test? ( dev-libs/openssl ) >=app-portage/elt-patches-20170422 !=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 Unix system friendly Scheme Interpreter
-EAPI=6
-HOMEPAGE=http://practical-scheme.net/gauche/
-IUSE=ipv6 test
-KEYWORDS=~alpha ~amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=sys-libs/gdbm
-SLOT=0
-SRC_URI=mirror://sourceforge/gauche/Gauche-0.9.3.3.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9f026481dbab91cda38a53617bb24f19
diff --git a/metadata/md5-cache/dev-scheme/gauche-0.9.4-r1 b/metadata/md5-cache/dev-scheme/gauche-0.9.4-r1
deleted file mode 100644
index b63cdfc549ea..000000000000
--- a/metadata/md5-cache/dev-scheme/gauche-0.9.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/gdbm test? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=app-portage/elt-patches-20170422 !=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 Unix system friendly Scheme Interpreter
-EAPI=6
-HOMEPAGE=http://practical-scheme.net/gauche/
-IUSE=ipv6 libressl test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=BSD
-RDEPEND=sys-libs/gdbm
-SLOT=0
-SRC_URI=mirror://sourceforge/gauche/Gauche-0.9.4.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ce382aac7285a5e390aa85f4fdcf877e
diff --git a/metadata/md5-cache/dev-scheme/gauche-0.9.5 b/metadata/md5-cache/dev-scheme/gauche-0.9.5
index 558c555bb241..0a2016581a78 100644
--- a/metadata/md5-cache/dev-scheme/gauche-0.9.5
+++ b/metadata/md5-cache/dev-scheme/gauche-0.9.5
@@ -4,10 +4,10 @@ DESCRIPTION=A Unix system friendly Scheme Interpreter
EAPI=6
HOMEPAGE=http://practical-scheme.net/gauche/
IUSE=ipv6 libressl test
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-macos
LICENSE=BSD
RDEPEND=sys-libs/gdbm
SLOT=0
SRC_URI=mirror://sourceforge/gauche/Gauche-0.9.5.tgz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3a731b103640035b4a4603db57c764fe
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=1fa39aecbbe983650539faa0832cb6c3
diff --git a/metadata/md5-cache/dev-scheme/guile-www-2.35 b/metadata/md5-cache/dev-scheme/guile-www-2.35
index e6ee02759748..a26ab4e97be7 100644
--- a/metadata/md5-cache/dev-scheme/guile-www-2.35
+++ b/metadata/md5-cache/dev-scheme/guile-www-2.35
@@ -3,10 +3,10 @@ DEPEND=dev-scheme/guile
DESCRIPTION=Guile Scheme modules to facilitate HTTP, URL and CGI programming
EAPI=5
HOMEPAGE=http://www.nongnu.org/guile-www/
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
LICENSE=GPL-3
RDEPEND=dev-scheme/guile
SLOT=0
SRC_URI=mirror://nongnu/guile-www/guile-www-2.35.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91bbfae1d3feee8af2bfaa106ffa409e
+_md5_=80d21a36df1ae780aa8dda4493954618
diff --git a/metadata/md5-cache/dev-scheme/scm-5.5.6-r4 b/metadata/md5-cache/dev-scheme/scm-5.5.6-r4
new file mode 100644
index 000000000000..27ed812c7c41
--- /dev/null
+++ b/metadata/md5-cache/dev-scheme/scm-5.5.6-r4
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile config install postinst test
+DEPEND=>=dev-scheme/slib-3.1.5 dev-util/cproto ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/libtermcap-compat )
+DESCRIPTION=SCM is a Scheme implementation from the author of slib
+EAPI=7
+HOMEPAGE=http://swiss.csail.mit.edu/~jaffer/SCM
+IUSE=arrays bignums cautious dynamic-linking engineering-notation gsubr inexact ioext libscm macro ncurses posix readline regex sockets unix
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-macos
+LICENSE=LGPL-3
+RDEPEND=>=dev-scheme/slib-3.1.5 dev-util/cproto ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/libtermcap-compat )
+SLOT=0
+SRC_URI=http://groups.csail.mit.edu/mac/ftpdir/scm/scm-5e6.zip
+_md5_=a531c126620062194af7bbb59d80a9be
diff --git a/metadata/md5-cache/dev-texlive/Manifest.gz b/metadata/md5-cache/dev-texlive/Manifest.gz
index 7fdfdbfe2d8a..84d31564e2dc 100644
Binary files a/metadata/md5-cache/dev-texlive/Manifest.gz and b/metadata/md5-cache/dev-texlive/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017 b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
index 2f2f2ae7a96a..8fe52b3bb2a6 100644
--- a/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-fontsrecommended-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Recommended fonts
EAPI=5
HOMEPAGE=http://www.tug.org/texlive/
IUSE=source doc
-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 GPL-1 GPL-2 LPPL-1.3 OFL public-domain TeX TeX-other-free
RDEPEND=>=dev-texlive/texlive-basic-2017 !=dev-texlive/texlive-basic-2007* !=app-text/texlive-core-2017
SLOT=0
SRC_URI=mirror://gentoo/texlive-module-avantgar-2017.tar.xz mirror://gentoo/texlive-module-bookman-2017.tar.xz mirror://gentoo/texlive-module-charter-2017.tar.xz mirror://gentoo/texlive-module-cm-super-2017.tar.xz mirror://gentoo/texlive-module-cmextra-2017.tar.xz mirror://gentoo/texlive-module-courier-2017.tar.xz mirror://gentoo/texlive-module-ec-2017.tar.xz mirror://gentoo/texlive-module-euro-2017.tar.xz mirror://gentoo/texlive-module-euro-ce-2017.tar.xz mirror://gentoo/texlive-module-eurosym-2017.tar.xz mirror://gentoo/texlive-module-fpl-2017.tar.xz mirror://gentoo/texlive-module-helvetic-2017.tar.xz mirror://gentoo/texlive-module-lm-2017.tar.xz mirror://gentoo/texlive-module-lm-math-2017.tar.xz mirror://gentoo/texlive-module-marvosym-2017.tar.xz mirror://gentoo/texlive-module-mathpazo-2017.tar.xz mirror://gentoo/texlive-module-manfnt-font-2017.tar.xz mirror://gentoo/texlive-module-mflogo-font-2017.tar.xz mirror://gentoo/texlive-module-ncntrsbk-2017.tar.xz mirror://gentoo/texlive-module-palatino-2017.tar.xz mirror://gentoo/texlive-module-pxfonts-2017.tar.xz mirror://gentoo/texlive-module-rsfs-2017.tar.xz mirror://gentoo/texlive-module-symbol-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math-2017.tar.xz mirror://gentoo/texlive-module-times-2017.tar.xz mirror://gentoo/texlive-module-tipa-2017.tar.xz mirror://gentoo/texlive-module-txfonts-2017.tar.xz mirror://gentoo/texlive-module-utopia-2017.tar.xz mirror://gentoo/texlive-module-wasy-2017.tar.xz mirror://gentoo/texlive-module-wasy2-ps-2017.tar.xz mirror://gentoo/texlive-module-wasysym-2017.tar.xz mirror://gentoo/texlive-module-zapfchan-2017.tar.xz mirror://gentoo/texlive-module-zapfding-2017.tar.xz mirror://gentoo/texlive-module-collection-fontsrecommended-2017.tar.xz doc? ( mirror://gentoo/texlive-module-charter.doc-2017.tar.xz mirror://gentoo/texlive-module-cm-super.doc-2017.tar.xz mirror://gentoo/texlive-module-ec.doc-2017.tar.xz mirror://gentoo/texlive-module-euro.doc-2017.tar.xz mirror://gentoo/texlive-module-euro-ce.doc-2017.tar.xz mirror://gentoo/texlive-module-eurosym.doc-2017.tar.xz mirror://gentoo/texlive-module-fpl.doc-2017.tar.xz mirror://gentoo/texlive-module-lm.doc-2017.tar.xz mirror://gentoo/texlive-module-lm-math.doc-2017.tar.xz mirror://gentoo/texlive-module-marvosym.doc-2017.tar.xz mirror://gentoo/texlive-module-mathpazo.doc-2017.tar.xz mirror://gentoo/texlive-module-mflogo-font.doc-2017.tar.xz mirror://gentoo/texlive-module-pxfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-rsfs.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre.doc-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math.doc-2017.tar.xz mirror://gentoo/texlive-module-tipa.doc-2017.tar.xz mirror://gentoo/texlive-module-txfonts.doc-2017.tar.xz mirror://gentoo/texlive-module-utopia.doc-2017.tar.xz mirror://gentoo/texlive-module-wasy.doc-2017.tar.xz mirror://gentoo/texlive-module-wasy2-ps.doc-2017.tar.xz mirror://gentoo/texlive-module-wasysym.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-euro.source-2017.tar.xz mirror://gentoo/texlive-module-fpl.source-2017.tar.xz mirror://gentoo/texlive-module-lm.source-2017.tar.xz mirror://gentoo/texlive-module-marvosym.source-2017.tar.xz mirror://gentoo/texlive-module-mathpazo.source-2017.tar.xz mirror://gentoo/texlive-module-tex-gyre-math.source-2017.tar.xz mirror://gentoo/texlive-module-wasysym.source-2017.tar.xz )
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 texlive-common f68a634c367f10b9fbb8fb02195ba411 texlive-module c0d611850cfb6f43e490d9abc709fab7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e480ff9bc8ffa24950d3dc5ff9c37a31
+_md5_=3aef10a1a9fa4272e7b59baa1366735a
diff --git a/metadata/md5-cache/dev-texlive/texlive-genericrecommended-2016 b/metadata/md5-cache/dev-texlive/texlive-genericrecommended-2016
index ca12b5959e38..1f5f7a61b4e4 100644
--- a/metadata/md5-cache/dev-texlive/texlive-genericrecommended-2016
+++ b/metadata/md5-cache/dev-texlive/texlive-genericrecommended-2016
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive Generic recommended packages
EAPI=5
HOMEPAGE=http://www.tug.org/texlive/
IUSE=source doc
-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=GPL-1 GPL-2 LPPL-1.3 public-domain TeX-other-free
RDEPEND=>=dev-texlive/texlive-basic-2016 !=dev-texlive/texlive-basic-2007* !=app-text/texlive-core-2016
SLOT=0
SRC_URI=mirror://gentoo/texlive-module-apnum-2016.tar.xz mirror://gentoo/texlive-module-epsf-2016.tar.xz mirror://gentoo/texlive-module-fontname-2016.tar.xz mirror://gentoo/texlive-module-genmisc-2016.tar.xz mirror://gentoo/texlive-module-kastrup-2016.tar.xz mirror://gentoo/texlive-module-multido-2016.tar.xz mirror://gentoo/texlive-module-path-2016.tar.xz mirror://gentoo/texlive-module-tex-ps-2016.tar.xz mirror://gentoo/texlive-module-ulem-2016.tar.xz mirror://gentoo/texlive-module-collection-genericrecommended-2016.tar.xz doc? ( mirror://gentoo/texlive-module-apnum.doc-2016.tar.xz mirror://gentoo/texlive-module-epsf.doc-2016.tar.xz mirror://gentoo/texlive-module-fontname.doc-2016.tar.xz mirror://gentoo/texlive-module-kastrup.doc-2016.tar.xz mirror://gentoo/texlive-module-multido.doc-2016.tar.xz mirror://gentoo/texlive-module-path.doc-2016.tar.xz mirror://gentoo/texlive-module-tex-ps.doc-2016.tar.xz mirror://gentoo/texlive-module-ulem.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-kastrup.source-2016.tar.xz mirror://gentoo/texlive-module-multido.source-2016.tar.xz )
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 texlive-common f68a634c367f10b9fbb8fb02195ba411 texlive-module c0d611850cfb6f43e490d9abc709fab7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e59d0bb992e774efe5a5e5f4ca169bf1
+_md5_=f5b6a3ec8f24de15e3d64fd55af32d01
diff --git a/metadata/md5-cache/dev-texlive/texlive-langgerman-2017 b/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
index 5ed149898b85..53e21b7f1b1c 100644
--- a/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
+++ b/metadata/md5-cache/dev-texlive/texlive-langgerman-2017
@@ -4,10 +4,10 @@ DESCRIPTION=TeXLive German
EAPI=5
HOMEPAGE=http://www.tug.org/texlive/
IUSE=source doc
-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=FDL-1.1 GPL-1 GPL-2 LPPL-1.3 MIT OPL TeX-other-free
RDEPEND=>=dev-texlive/texlive-basic-2017 !=app-text/texlive-core-2017
SLOT=0
SRC_URI=mirror://gentoo/texlive-module-apalike-german-2017.tar.xz mirror://gentoo/texlive-module-babel-german-2017.tar.xz mirror://gentoo/texlive-module-bibleref-german-2017.tar.xz mirror://gentoo/texlive-module-booktabs-de-2017.tar.xz mirror://gentoo/texlive-module-csquotes-de-2017.tar.xz mirror://gentoo/texlive-module-dehyph-exptl-2017.tar.xz mirror://gentoo/texlive-module-dhua-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung2-2017.tar.xz mirror://gentoo/texlive-module-etdipa-2017.tar.xz mirror://gentoo/texlive-module-etoolbox-de-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info-2017.tar.xz mirror://gentoo/texlive-module-geometry-de-2017.tar.xz mirror://gentoo/texlive-module-german-2017.tar.xz mirror://gentoo/texlive-module-germbib-2017.tar.xz mirror://gentoo/texlive-module-germkorr-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura-2017.tar.xz mirror://gentoo/texlive-module-hyphen-german-2017.tar.xz mirror://gentoo/texlive-module-koma-script-examples-2017.tar.xz mirror://gentoo/texlive-module-l2picfaq-2017.tar.xz mirror://gentoo/texlive-module-l2tabu-2017.tar.xz mirror://gentoo/texlive-module-latex-bib-ex-2017.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex-2017.tar.xz mirror://gentoo/texlive-module-latex-referenz-2017.tar.xz mirror://gentoo/texlive-module-latex-tabellen-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-de-2017.tar.xz mirror://gentoo/texlive-module-lshort-german-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de-2017.tar.xz mirror://gentoo/texlive-module-microtype-de-2017.tar.xz mirror://gentoo/texlive-module-milog-2017.tar.xz mirror://gentoo/texlive-module-presentations-2017.tar.xz mirror://gentoo/texlive-module-r_und_s-2017.tar.xz mirror://gentoo/texlive-module-templates-fenn-2017.tar.xz mirror://gentoo/texlive-module-templates-sommer-2017.tar.xz mirror://gentoo/texlive-module-texlive-de-2017.tar.xz mirror://gentoo/texlive-module-tipa-de-2017.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de-2017.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de-2017.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de-2017.tar.xz mirror://gentoo/texlive-module-translation-ecv-de-2017.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de-2017.tar.xz mirror://gentoo/texlive-module-translation-europecv-de-2017.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de-2017.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de-2017.tar.xz mirror://gentoo/texlive-module-udesoftec-2017.tar.xz mirror://gentoo/texlive-module-uhrzeit-2017.tar.xz mirror://gentoo/texlive-module-umlaute-2017.tar.xz mirror://gentoo/texlive-module-voss-mathcol-2017.tar.xz mirror://gentoo/texlive-module-collection-langgerman-2017.tar.xz doc? ( mirror://gentoo/texlive-module-apalike-german.doc-2017.tar.xz mirror://gentoo/texlive-module-babel-german.doc-2017.tar.xz mirror://gentoo/texlive-module-bibleref-german.doc-2017.tar.xz mirror://gentoo/texlive-module-booktabs-de.doc-2017.tar.xz mirror://gentoo/texlive-module-csquotes-de.doc-2017.tar.xz mirror://gentoo/texlive-module-dehyph-exptl.doc-2017.tar.xz mirror://gentoo/texlive-module-dhua.doc-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung.doc-2017.tar.xz mirror://gentoo/texlive-module-einfuehrung2.doc-2017.tar.xz mirror://gentoo/texlive-module-etdipa.doc-2017.tar.xz mirror://gentoo/texlive-module-etoolbox-de.doc-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info.doc-2017.tar.xz mirror://gentoo/texlive-module-geometry-de.doc-2017.tar.xz mirror://gentoo/texlive-module-german.doc-2017.tar.xz mirror://gentoo/texlive-module-germbib.doc-2017.tar.xz mirror://gentoo/texlive-module-germkorr.doc-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.doc-2017.tar.xz mirror://gentoo/texlive-module-koma-script-examples.doc-2017.tar.xz mirror://gentoo/texlive-module-l2picfaq.doc-2017.tar.xz mirror://gentoo/texlive-module-l2tabu.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-bib-ex.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-bib2-ex.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-referenz.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-tabellen.doc-2017.tar.xz mirror://gentoo/texlive-module-latexcheat-de.doc-2017.tar.xz mirror://gentoo/texlive-module-lshort-german.doc-2017.tar.xz mirror://gentoo/texlive-module-lualatex-doc-de.doc-2017.tar.xz mirror://gentoo/texlive-module-microtype-de.doc-2017.tar.xz mirror://gentoo/texlive-module-milog.doc-2017.tar.xz mirror://gentoo/texlive-module-presentations.doc-2017.tar.xz mirror://gentoo/texlive-module-r_und_s.doc-2017.tar.xz mirror://gentoo/texlive-module-templates-fenn.doc-2017.tar.xz mirror://gentoo/texlive-module-templates-sommer.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive-de.doc-2017.tar.xz mirror://gentoo/texlive-module-tipa-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-arsclassica-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-biblatex-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-chemsym-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-ecv-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-enumitem-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-europecv-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-filecontents-de.doc-2017.tar.xz mirror://gentoo/texlive-module-translation-moreverb-de.doc-2017.tar.xz mirror://gentoo/texlive-module-udesoftec.doc-2017.tar.xz mirror://gentoo/texlive-module-uhrzeit.doc-2017.tar.xz mirror://gentoo/texlive-module-umlaute.doc-2017.tar.xz mirror://gentoo/texlive-module-voss-mathcol.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-babel-german.source-2017.tar.xz mirror://gentoo/texlive-module-dhua.source-2017.tar.xz mirror://gentoo/texlive-module-fifinddo-info.source-2017.tar.xz mirror://gentoo/texlive-module-german.source-2017.tar.xz mirror://gentoo/texlive-module-hausarbeit-jura.source-2017.tar.xz mirror://gentoo/texlive-module-udesoftec.source-2017.tar.xz mirror://gentoo/texlive-module-umlaute.source-2017.tar.xz )
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 texlive-common f68a634c367f10b9fbb8fb02195ba411 texlive-module c0d611850cfb6f43e490d9abc709fab7 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=111199751ace605f835c7844cef6d160
+_md5_=9a4fa251c0ebc5d48d71380fe169d83c
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c8cd08b35d63..d7995412fff8 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/android-studio-3.1.3.0.173.4819257 b/metadata/md5-cache/dev-util/android-studio-3.1.3.0.173.4819257
new file mode 100644
index 000000000000..02df28486fa6
--- /dev/null
+++ b/metadata/md5-cache/dev-util/android-studio-3.1.3.0.173.4819257
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install preinst prepare setup
+DEPEND=app-arch/zip dev-java/commons-logging:0 dev-java/log4j:0 >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A new Android development environment based on IntelliJ IDEA
+EAPI=6
+HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
+IUSE=selinux elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jdk-1.7 selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 dev-java/commons-logging:0 dev-java/log4j:0 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8 || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) >=sys-libs/ncurses-5.9-r3:5/5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://dl.google.com/dl/android/studio/ide-zips/3.1.3.0/android-studio-ide-173.4819257-linux.zip
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc java-pkg-2 c4e6af2574fd1dc79b43a6e27af4b5fb java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=ed15285059d46a5914357520ce9af871
diff --git a/metadata/md5-cache/dev-util/byacc-20170709 b/metadata/md5-cache/dev-util/byacc-20180609
similarity index 76%
rename from metadata/md5-cache/dev-util/byacc-20170709
rename to metadata/md5-cache/dev-util/byacc-20180609
index 71c58a6dd5b3..879fd3f8b7a9 100644
--- a/metadata/md5-cache/dev-util/byacc-20170709
+++ b/metadata/md5-cache/dev-util/byacc-20180609
@@ -5,5 +5,5 @@ HOMEPAGE=https://invisible-island.net/byacc/byacc.html
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=public-domain
SLOT=0
-SRC_URI=ftp://invisible-island.net/byacc/byacc-20170709.tgz
-_md5_=f6416072843145ccf5edb27c33b367bc
+SRC_URI=https://invisible-mirror.net/archives/byacc/byacc-20180609.tgz
+_md5_=c0a07ec3a549a4ba97a5d4d3f174c5c9
diff --git a/metadata/md5-cache/dev-util/cmake-3.11.4 b/metadata/md5-cache/dev-util/cmake-3.11.4
index ed05f3cc2cb3..240a98cf33d1 100644
--- a/metadata/md5-cache/dev-util/cmake-3.11.4
+++ b/metadata/md5-cache/dev-util/cmake-3.11.4
@@ -10,4 +10,4 @@ RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=d
SLOT=0
SRC_URI=https://cmake.org/files/v3.11/cmake-3.11.4.tar.gz
_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7fbb566ed1528503fdb7a29cb18bb527
+_md5_=9241078c3fb9160d55613c1be98f8811
diff --git a/metadata/md5-cache/dev-util/cmake-3.12.0_rc1 b/metadata/md5-cache/dev-util/cmake-3.12.0_rc1
index 5e3f20352509..eb8f11424b59 100644
--- a/metadata/md5-cache/dev-util/cmake-3.12.0_rc1
+++ b/metadata/md5-cache/dev-util/cmake-3.12.0_rc1
@@ -9,4 +9,4 @@ RDEPEND=app-crypt/rhash >=app-arch/libarchive-3.0.0:= >=dev-libs/expat-2.0.1 >=d
SLOT=0
SRC_URI=https://cmake.org/files/v3.12/cmake-3.12.0-rc1.tar.gz
_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7fbb566ed1528503fdb7a29cb18bb527
+_md5_=f161c7334cd5f7fcf93c8cce39fef796
diff --git a/metadata/md5-cache/dev-util/dejagnu-1.6 b/metadata/md5-cache/dev-util/dejagnu-1.6
index 5045bd35a1a3..2acea832419f 100644
--- a/metadata/md5-cache/dev-util/dejagnu-1.6
+++ b/metadata/md5-cache/dev-util/dejagnu-1.6
@@ -3,8 +3,8 @@ DEPEND=dev-lang/tcl dev-tcltk/expect
DESCRIPTION=Framework for testing other programs
EAPI=6
HOMEPAGE=https://www.gnu.org/software/dejagnu/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~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 ~x86-macos ~x64-solaris ~x86-solaris
LICENSE=GPL-3
SLOT=0
SRC_URI=mirror://gnu/dejagnu/dejagnu-1.6.tar.gz
-_md5_=0d96e4f6c5e652100c592b882da421a6
+_md5_=ce1df2b3bb05a9c1cfa418b59a9f170c
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20170509 b/metadata/md5-cache/dev-util/dialog-1.3.20180621
similarity index 84%
rename from metadata/md5-cache/dev-util/dialog-1.3.20170509
rename to metadata/md5-cache/dev-util/dialog-1.3.20180621
index ce4bf5be6291..f8fb6ae4b5a2 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20170509
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20180621
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install prepare
DEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?] nls? ( sys-devel/gettext ) !minimal? ( sys-devel/libtool ) !<=sys-freebsd/freebsd-contrib-8.9999
DESCRIPTION=tool to display dialog boxes from a shell
EAPI=6
-HOMEPAGE=http://invisible-island.net/dialog/dialog.html
+HOMEPAGE=https://invisible-island.net/dialog/
IUSE=examples minimal nls static-libs unicode
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
LICENSE=GPL-2
RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode?]
-SLOT=0/14
-SRC_URI=ftp://invisible-island.net/dialog/dialog-1.3-20170509.tgz
+SLOT=0/15
+SRC_URI=https://dev.gentoo.org/~jer/dialog-1.3-20180621.tgz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8f1299857a01868aecd389901b7b59a4
+_md5_=a2e82c37e59923cbe7619b7746049c82
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-0_pre20180601 b/metadata/md5-cache/dev-util/vulkan-headers-1.1.77.0
similarity index 83%
rename from metadata/md5-cache/dev-util/vulkan-headers-0_pre20180601
rename to metadata/md5-cache/dev-util/vulkan-headers-1.1.77.0
index b563dd70db0c..1d4e47aadc79 100644
--- a/metadata/md5-cache/dev-util/vulkan-headers-0_pre20180601
+++ b/metadata/md5-cache/dev-util/vulkan-headers-1.1.77.0
@@ -7,6 +7,6 @@ KEYWORDS=~amd64
LICENSE=Apache-2.0
RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/afd12b7bdcd63bf4d8d669d6e06a368a0954b6e3.tar.gz -> vulkan-headers-0_pre20180601.tar.gz
+SRC_URI=https://github.com/KhronosGroup/Vulkan-Headers/archive/b1577d5fbd5424c863710aa156aaafa77cae3de8.tar.gz -> vulkan-headers-1.1.77.0.tar.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0c47c30362cb286be97b8da9f986e6fb
+_md5_=a28b9639ebb64bb93d1b3e44cef4a706
diff --git a/metadata/md5-cache/dev-util/vulkan-headers-9999 b/metadata/md5-cache/dev-util/vulkan-headers-9999
index 9e2096a41aa9..cb6ca9b747ef 100644
--- a/metadata/md5-cache/dev-util/vulkan-headers-9999
+++ b/metadata/md5-cache/dev-util/vulkan-headers-9999
@@ -7,4 +7,4 @@ LICENSE=Apache-2.0
RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
SLOT=0
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0c47c30362cb286be97b8da9f986e6fb
+_md5_=a28b9639ebb64bb93d1b3e44cef4a706
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-0_pre20180601 b/metadata/md5-cache/dev-util/vulkan-tools-1.1.77.0
similarity index 92%
rename from metadata/md5-cache/dev-util/vulkan-tools-0_pre20180601
rename to metadata/md5-cache/dev-util/vulkan-tools-1.1.77.0
index dd4e8d770d2b..1a7306e282c1 100644
--- a/metadata/md5-cache/dev-util/vulkan-tools-0_pre20180601
+++ b/metadata/md5-cache/dev-util/vulkan-tools-1.1.77.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
LICENSE=Apache-2.0
RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/b7940409945face40657080b6074fc5588a0c0ad.tar.gz -> vulkan-tools-0_pre20180601.tar.gz
+SRC_URI=https://github.com/KhronosGroup/Vulkan-Tools/archive/384fff68c802a10b5d7f4f352a4bb43b3efe5f23.tar.gz -> vulkan-tools-1.1.77.0.tar.gz
_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=16585baa712cf7ae2b6244d12021eb87
+_md5_=034b0add24ec3ff12ce774c44c368ffc
diff --git a/metadata/md5-cache/dev-util/vulkan-tools-9999 b/metadata/md5-cache/dev-util/vulkan-tools-9999
index 0fd72b3bb375..b432e4fa9ac5 100644
--- a/metadata/md5-cache/dev-util/vulkan-tools-9999
+++ b/metadata/md5-cache/dev-util/vulkan-tools-9999
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
SLOT=0
_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5254d32b611265edf6bb3bb06a757721
+_md5_=034b0add24ec3ff12ce774c44c368ffc
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 1f00f8538879..36c3bb08db58 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/git-2.18.0_rc2 b/metadata/md5-cache/dev-vcs/git-2.18.0
similarity index 87%
rename from metadata/md5-cache/dev-vcs/git-2.18.0_rc2
rename to metadata/md5-cache/dev-vcs/git-2.18.0
index ddf9365e1337..bc5ac69f7b82 100644
--- a/metadata/md5-cache/dev-vcs/git-2.18.0_rc2
+++ b/metadata/md5-cache/dev-vcs/git-2.18.0
@@ -4,10 +4,11 @@ DESCRIPTION=stupid content tracker: distributed VCS designed for speed and effic
EAPI=6
HOMEPAGE=https://www.git-scm.com/
IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~amd64-fbsd
LICENSE=GPL-2
RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) perl? ( dev-perl/Error dev-perl/MailTools dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/testing/git-2.18.0.rc2.tar.xz mirror://kernel/software/scm/git/testing/git-manpages-2.18.0.rc2.tar.xz doc? ( mirror://kernel/software/scm/git/testing/git-htmldocs-2.18.0.rc2.tar.xz )
+SRC_URI=mirror://kernel/software/scm/git/git-2.18.0.tar.xz mirror://kernel/software/scm/git/git-manpages-2.18.0.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.18.0.tar.xz )
_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c desktop 1b286a7e7143d8c4ec89cd0d2743a097 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=3cc41c178a94ac2a1faf6d1931326ca2
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-4.6.1 b/metadata/md5-cache/dev-vcs/tortoisehg-4.6.1
new file mode 100644
index 000000000000..4fb76d9c58d6
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-4.6.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-vcs/mercurial-4.5 =dev-python/qscintilla-python-2.9.4:=[qt5(+),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( >=dev-python/sphinx-1.0.3 ) 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=Set of graphical tools for Mercurial
+EAPI=6
+HOMEPAGE=https://tortoisehg.bitbucket.io/
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-vcs/mercurial-4.5 =dev-python/qscintilla-python-2.9.4:=[qt5(+),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=https://www.bitbucket.org/tortoisehg/targz/downloads/tortoisehg-4.6.1.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dd967a297044df85552326e89ef44e20
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 43a2b07e7f96..c79662a6e2a8 100644
Binary files a/metadata/md5-cache/games-server/Manifest.gz and b/metadata/md5-cache/games-server/Manifest.gz differ
diff --git a/metadata/md5-cache/games-server/steamcmd-1.0 b/metadata/md5-cache/games-server/steamcmd-1.0
new file mode 100644
index 000000000000..4e4ca6962022
--- /dev/null
+++ b/metadata/md5-cache/games-server/steamcmd-1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst setup
+DESCRIPTION=This is the command-line version of the Steam client for dedicated servers
+EAPI=6
+HOMEPAGE=https://developer.valvesoftware.com/wiki/SteamCMD
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-2.1+ Steam
+RDEPEND=app-misc/screen
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz -> steamcmd-1.0.tar.gz
+_eclasses_=readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 user 8bc2845510e2109af75e3eeac607ec81
+_md5_=14926e225a9d6373a9fea2e2f865c2e7
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index fb0d77494eae..6d80cfdddefa 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/cinnamon-3.6.6-r2 b/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
index d03a6cdd1e76..dda264e2a9c6 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
+++ b/metadata/md5-cache/gnome-extra/cinnamon-3.6.6-r2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-3.6:0=[introspection] >=gnome-extra/cinnamon-menus-3.6[introspection] >=gnome-extra/cjs-3.6.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.6.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) python_targets_python2_7? ( dev-python/polib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc >=dev-util/intltool-0.4 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* >=app-portage/elt-patches-20170422 !=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-3.6:0=[introspection] >=gnome-extra/cinnamon-menus-3.6[introspection] >=gnome-extra/cjs-3.6.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.6.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) python_targets_python2_7? ( dev-python/polib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-util/gtk-doc >=dev-util/intltool-0.4 >=sys-devel/gettext-0.17 virtual/pkgconfig gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* >=app-portage/elt-patches-20170422 !=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 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=A fork of GNOME Shell with layout similar to GNOME 2
EAPI=6
HOMEPAGE=http://developer.linuxmint.com/
-IUSE=+nls +networkmanager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+IUSE=+nls +networkmanager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=amd64 x86
LICENSE=GPL-2+
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-3.6:0=[introspection] >=gnome-extra/cinnamon-menus-3.6[introspection] >=gnome-extra/cjs-3.6.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.6.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) >=gnome-extra/cinnamon-session-3.6 >=gnome-extra/cinnamon-settings-daemon-3.6 >=app-accessibility/caribou-0.3 x11-misc/xdg-utils x11-libs/xapps[introspection] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/gconf-python:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) x11-themes/gnome-themes-standard x11-themes/adwaita-icon-theme >=gnome-extra/nemo-3.6 >=gnome-extra/cinnamon-control-center-3.6 >=gnome-extra/cinnamon-screensaver-3.6 gnome-extra/polkit-gnome networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=gnome-extra/cinnamon-translations-2.4 )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 ) || ( python_targets_python2_7 ) || ( python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-accessibility/at-spi2-atk:2 app-misc/ca-certificates dev-libs/dbus-glib >=dev-libs/glib-2.35.0:2[dbus] >=dev-libs/gobject-introspection-0.10.1:= >=dev-libs/json-glib-0.13.2 >=dev-libs/libcroco-0.6.2:0.6 dev-libs/libxml2:2 gnome-base/gconf:2[introspection] gnome-base/librsvg >=gnome-extra/cinnamon-desktop-3.6:0=[introspection] >=gnome-extra/cinnamon-menus-3.6[introspection] >=gnome-extra/cjs-3.6.0 >=media-libs/clutter-1.10:1.0[introspection] media-libs/cogl:1.0=[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 net-libs/libsoup:2.4[introspection] >=sys-auth/polkit-0.100[introspection] x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.9.12:3[introspection] x11-libs/pango[introspection] >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 >=x11-wm/muffin-3.6.0[introspection] networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999:=[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] || ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] ) >=gnome-extra/cinnamon-session-3.6 >=gnome-extra/cinnamon-settings-daemon-3.6 >=app-accessibility/caribou-0.3 x11-misc/xdg-utils x11-libs/xapps[introspection] dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/gconf-python:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pexpect[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pycairo[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyinotify[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) x11-themes/gnome-themes-standard x11-themes/adwaita-icon-theme >=gnome-extra/nemo-3.6 >=gnome-extra/cinnamon-control-center-3.6 >=gnome-extra/cinnamon-screensaver-3.6 gnome-extra/polkit-gnome networkmanager? ( gnome-extra/nm-applet net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) nls? ( >=gnome-extra/cinnamon-translations-2.4 )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 ) || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/linuxmint/Cinnamon/archive/3.6.6.tar.gz -> cinnamon-3.6.6.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=34e8f3e2eb9d415a30e22f6052deece5
+_md5_=f0771af73f2cfb7fe624540a08e2430d
diff --git a/metadata/md5-cache/gnome-extra/gnome-commander-1.6.1 b/metadata/md5-cache/gnome-extra/gnome-commander-1.6.1
deleted file mode 100644
index 70a5a508946d..000000000000
--- a/metadata/md5-cache/gnome-extra/gnome-commander-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 >=dev-libs/libunique-0.9.3:1 gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 sys-devel/gettext virtual/pkgconfig test? ( >=dev-util/cppunit-1.13.2 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A graphical, full featured, twin-panel file manager
-EAPI=6
-HOMEPAGE=https://gcmd.github.io/
-IUSE=chm exif gsf pdf python taglib samba test python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/gnome-doc-utils >=dev-libs/glib-2.44.0:2 >=dev-libs/libunique-0.9.3:1 gnome-base/gnome-keyring >=gnome-base/gnome-vfs-2.0.0 >=gnome-base/libgnome-2.0.0 >=gnome-base/libgnomeui-2.4.0 >=x11-libs/gtk+-2.8.0:2 chm? ( dev-libs/chmlib ) exif? ( >=media-gfx/exiv2-0.14 ) gsf? ( >=gnome-extra/libgsf-1.12.0 ) samba? ( >=gnome-base/gnome-vfs-2.0.0[samba] ) pdf? ( >=app-text/poppler-0.18 ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/gnome-vfs-python-2.0.0 ) taglib? ( >=media-libs/taglib-1.4 )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-commander/1.6/gnome-commander-1.6.1.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d1290809c0c193ac76aa0a69f7a24591
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 971990a8e8a5..fc634fe44133 100644
Binary files a/metadata/md5-cache/kde-frameworks/Manifest.gz and b/metadata/md5-cache/kde-frameworks/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37 b/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37
deleted file mode 100644
index a460db691e2e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs-4.14.37
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm test
-DEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-lang/perl >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt >=dev-qt/designer-4.8.7:4 >=dev-qt/qtcore-4.8.7:4[qt3support?,ssl] >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtdeclarative-4.8.7:4 >=dev-qt/qtgui-4.8.7:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.7:4 >=dev-qt/qtsvg-4.8.7:4 media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) plasma? ( app-crypt/qca:2[qt4] >=dev-qt/qtsql-4.8.7:4[qt3support?] ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant:= ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) >=dev-qt/qttest-4.8.7:4 doc? ( app-doc/doxygen ) nls? ( virtual/libintl ) test? ( dev-util/cppunit ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Libraries needed for programs by KDE
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=cpu_flags_x86_3dnow acl altivec +bzip2 debug doc fam +handbook jpeg2k kerberos libressl lzma cpu_flags_x86_mmx nls openexr plasma +policykit qt3support spell test cpu_flags_x86_sse cpu_flags_x86_sse2 ssl +udev +udisks +upower zeroconf
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-PDEPEND=dev-util/automoc virtual/pkgconfig x11-base/xorg-proto >=x11-libs/libXtst-1.1.0 x11-misc/xdg-utils handbook? ( kde-apps/khelpcenter:* ) policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets dev-lang/perl >=dev-libs/libattica-0.4.2 dev-libs/libdbusmenu-qt[qt4] dev-libs/libpcre[unicode] dev-libs/libxml2 dev-libs/libxslt >=dev-qt/designer-4.8.7:4 >=dev-qt/qtcore-4.8.7:4[qt3support?,ssl] >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtdeclarative-4.8.7:4 >=dev-qt/qtgui-4.8.7:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.7:4 >=dev-qt/qtsvg-4.8.7:4 media-libs/fontconfig media-libs/freetype:2 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt4] sys-libs/zlib virtual/jpeg:0 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXcursor x11-libs/libXdmcp x11-libs/libXext x11-libs/libXfixes x11-libs/libXft x11-libs/libXpm x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-misc/shared-mime-info !kernel_SunOS? ( || ( sys-libs/libutempter >=sys-freebsd/freebsd-lib-9.0 ) ) acl? ( virtual/acl ) bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) jpeg2k? ( media-libs/jasper:= ) kerberos? ( virtual/krb5 ) openexr? ( media-libs/openexr:= media-libs/ilmbase:= ) plasma? ( app-crypt/qca:2[qt4] >=dev-qt/qtsql-4.8.7:4[qt3support?] ) policykit? ( sys-auth/polkit-qt[qt4] ) spell? ( app-text/enchant:= ) ssl? ( libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) ) udev? ( virtual/udev ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) !dev-qt/qtphonon >=app-crypt/gnupg-2.0.11 app-misc/ca-certificates kde-frameworks/kdelibs-env:4 kde-frameworks/oxygen-icons sys-apps/dbus[X] x11-apps/iceauth x11-apps/rgb x11-misc/xdg-utils plasma? ( !sci-libs/plasma ) udev? ( app-misc/media-player-info ) udisks? ( sys-fs/udisks:2 ) upower? ( >=sys-power/upower-0.9.23 )
-REQUIRED_USE=udisks? ( udev ) upower? ( udev )
-RESTRICT=test
-SLOT=4/4.14
-SRC_URI=mirror://kde/stable/applications/17.08.2/src/kdelibs-4.14.37.tar.xz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8ad31576f447b4520395f3d7470d05f6
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs-env-4.14.3 b/metadata/md5-cache/kde-frameworks/kdelibs-env-4.14.3
deleted file mode 100644
index b81d709fae46..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs-env-4.14.3
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Environment setting required for all KDELibs4 apps to run
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=4/4.14
-_md5_=05553e09999983baf7ea2e5071deba7f
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index a6933befc831..fea32b62c810 100644
Binary files a/metadata/md5-cache/kde-misc/Manifest.gz and b/metadata/md5-cache/kde-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-misc/krusader-2.6.0 b/metadata/md5-cache/kde-misc/krusader-2.6.0
deleted file mode 100644
index a58d61d1ed91..000000000000
--- a/metadata/md5-cache/kde-misc/krusader-2.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-apps/acl sys-libs/zlib >=kde-frameworks/knotifications-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Advanced twin-panel (commander-style) file-manager with many extras
-EAPI=6
-HOMEPAGE=https://krusader.org/
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-apps/acl sys-libs/zlib >=kde-apps/kio-extras-17.12.3:5 !kde-misc/krusader:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/krusader/2.6.0/krusader-2.6.0.tar.xz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 kde5 0afda9a43e3d76e470f447753ad056af kde5-functions 5023dbcb3c1a817f64e2c51cc71f08ab ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2bb992c64356949aa3ab6f8054a82d9a
diff --git a/metadata/md5-cache/kde-misc/krusader-2.7.0 b/metadata/md5-cache/kde-misc/krusader-2.7.0
index b8f478879fd3..4b47b4c4001b 100644
--- a/metadata/md5-cache/kde-misc/krusader-2.7.0
+++ b/metadata/md5-cache/kde-misc/krusader-2.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=Advanced twin-panel (commander-style) file-manager with many extras
EAPI=6
HOMEPAGE=https://krusader.org/
IUSE=debug +handbook
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2+
RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcodecs-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kguiaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-apps/acl sys-libs/zlib >=kde-apps/kio-extras-17.12.3:5 !kde-misc/krusader:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
SLOT=5
SRC_URI=mirror://kde/stable/krusader/2.7.0/krusader-2.7.0.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 kde5 0afda9a43e3d76e470f447753ad056af kde5-functions 5023dbcb3c1a817f64e2c51cc71f08ab ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0303c36cba29fa9c07be7dddd5c79eef
+_md5_=b589734f37b9e482a16c9708a3f87afc
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.7 b/metadata/md5-cache/kde-misc/rsibreak-0.12.7
deleted file mode 100644
index c5040286f368..000000000000
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Small utility which bothers you at certain intervals
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/RSIBreak
-IUSE=debug +handbook
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2 )
-RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/frameworkintegration-5.46.0:5 !kde-misc/rsibreak:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-SLOT=5
-SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.7.tar.xz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 kde5 0afda9a43e3d76e470f447753ad056af kde5-functions 5023dbcb3c1a817f64e2c51cc71f08ab ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=aeea0e4c395caada164f15a8d0dc6d6e
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.8 b/metadata/md5-cache/kde-misc/rsibreak-0.12.8
index 2b8a1366b19d..70ac51b57099 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12.8
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.8
@@ -4,10 +4,10 @@ DESCRIPTION=Small utility which bothers you at certain intervals
EAPI=6
HOMEPAGE=https://userbase.kde.org/RSIBreak
IUSE=test debug +handbook
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2+ handbook? ( FDL-1.2 )
RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=kde-frameworks/frameworkintegration-5.46.0:5 !kde-misc/rsibreak:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
SLOT=5
SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.8.tar.xz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 kde5 0afda9a43e3d76e470f447753ad056af kde5-functions 5023dbcb3c1a817f64e2c51cc71f08ab ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a1edc8c49c1783583ca043b5b5944b0
+_md5_=a9fbfa31036a248ab824cbea87fda964
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.1.0 b/metadata/md5-cache/kde-misc/wacomtablet-3.1.0
new file mode 100644
index 000000000000..6bd4b10d563a
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/wacomtablet-3.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-libs/libwacom-0.30 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libXi x11-libs/libxcb sys-devel/gettext x11-base/xorg-proto x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KControl module for Wacom tablets
+EAPI=6
+HOMEPAGE=https://www.linux-apps.com/content/show.php?action=content&content=114856
+IUSE=test debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtx11extras-5.9.4:5 >=dev-libs/libwacom-0.30 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libXi x11-libs/libxcb !kde-misc/wacomtablet:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
+SLOT=5
+SRC_URI=mirror://kde/stable/wacomtablet/3.1.0/wacomtablet-3.1.0.tar.xz
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 kde5 0afda9a43e3d76e470f447753ad056af kde5-functions 5023dbcb3c1a817f64e2c51cc71f08ab ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 3a3c4637ea6d5a2113707a644766337c xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=171f68213eccdb73b7b9cbacadb71047
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 76714accf91a..1221e88a3881 100644
Binary files a/metadata/md5-cache/kde-plasma/Manifest.gz and b/metadata/md5-cache/kde-plasma/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-plasma/qguiplatformplugin_kde-4.11.22 b/metadata/md5-cache/kde-plasma/qguiplatformplugin_kde-4.11.22
deleted file mode 100644
index 652d6f927378..000000000000
--- a/metadata/md5-cache/kde-plasma/qguiplatformplugin_kde-4.11.22
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4 sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Helps integration of pure Qt4 applications with KDE Plasma
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs:4
-SLOT=4/4.11
-SRC_URI=mirror://kde/Attic/applications/15.08.0/src/kde-workspace-4.11.22.tar.xz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b5e98b04390e0ba078de76b036758dab
diff --git a/metadata/md5-cache/lxde-base/Manifest.gz b/metadata/md5-cache/lxde-base/Manifest.gz
index 530f68b9370e..e481e4d823cd 100644
Binary files a/metadata/md5-cache/lxde-base/Manifest.gz and b/metadata/md5-cache/lxde-base/Manifest.gz differ
diff --git a/metadata/md5-cache/lxde-base/lxappearance-0.6.3-r1 b/metadata/md5-cache/lxde-base/lxappearance-0.6.3-r1
index 4e093a7a192b..ef8bd871b6b9 100644
--- a/metadata/md5-cache/lxde-base/lxappearance-0.6.3-r1
+++ b/metadata/md5-cache/lxde-base/lxappearance-0.6.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=LXDE GTK+ theme switcher
EAPI=6
HOMEPAGE=https://wiki.lxde.org/en/LXAppearance
IUSE=dbus
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux
LICENSE=GPL-3
RDEPEND=x11-libs/gtk+:2 dbus? ( dev-libs/dbus-glib )
SLOT=0
SRC_URI=mirror://sourceforge/lxde/lxappearance-0.6.3.tar.xz
_eclasses_=l10n 97f2753e3f1f3753d53d856c7c0bbb0b
-_md5_=996010eb131e776605f0e1041411c4df
+_md5_=348617f68ad5ce9e2500bfe4474bf72f
diff --git a/metadata/md5-cache/lxde-base/lxinput-0.3.5-r1 b/metadata/md5-cache/lxde-base/lxinput-0.3.5-r1
index 9a249ea6d3d1..470d6c34ecdd 100644
--- a/metadata/md5-cache/lxde-base/lxinput-0.3.5-r1
+++ b/metadata/md5-cache/lxde-base/lxinput-0.3.5-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext virtual/pkgconfig >=dev
DESCRIPTION=LXDE keyboard and mouse configuration tool
EAPI=6
HOMEPAGE=https://lxde.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=dev-libs/glib:2 x11-libs/gtk+:2
SLOT=0
SRC_URI=mirror://sourceforge/lxde/lxinput-0.3.5.tar.xz
_eclasses_=l10n 97f2753e3f1f3753d53d856c7c0bbb0b
-_md5_=d92412714fbd183ff7927cec666a8975
+_md5_=f4b33fe114be4c7878b384294e402b2b
diff --git a/metadata/md5-cache/lxde-base/lxpanel-0.9.3-r1 b/metadata/md5-cache/lxde-base/lxpanel-0.9.3-r1
index d31fc08a5352..ebcb67051b15 100644
--- a/metadata/md5-cache/lxde-base/lxpanel-0.9.3-r1
+++ b/metadata/md5-cache/lxde-base/lxpanel-0.9.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight X11 desktop panel for LXDE
EAPI=6
HOMEPAGE=https://wiki.lxde.org/en/LXPanel
IUSE=+alsa wifi
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~x86 ~amd64-linux ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=dev-libs/keybinder:0= x11-libs/gtk+:2 >=x11-libs/libfm-1.2.0[gtk] x11-libs/libwnck:1 x11-libs/libXmu x11-libs/libXpm x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/libX11 lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) wifi? ( net-wireless/wireless-tools )
SLOT=0
SRC_URI=mirror://sourceforge/lxde/lxpanel-0.9.3.tar.xz
_eclasses_=l10n 97f2753e3f1f3753d53d856c7c0bbb0b readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3
-_md5_=6ecb837b2de7694f2451056b82bdd0fe
+_md5_=ce01eab2c0e0038dfb93768da098c06c
diff --git a/metadata/md5-cache/lxde-base/lxrandr-0.3.1-r1 b/metadata/md5-cache/lxde-base/lxrandr-0.3.1-r1
index 9e0d1b9d5c92..68cca052fa98 100644
--- a/metadata/md5-cache/lxde-base/lxrandr-0.3.1-r1
+++ b/metadata/md5-cache/lxde-base/lxrandr-0.3.1-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr >=dev-util/intltool-0.
DESCRIPTION=LXDE GUI interface to RandR extention
EAPI=6
HOMEPAGE=https://wiki.lxde.org/en/LXRandR
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr
SLOT=0
SRC_URI=mirror://sourceforge/lxde/lxrandr-0.3.1.tar.xz
_eclasses_=l10n 97f2753e3f1f3753d53d856c7c0bbb0b
-_md5_=1f534d0140dbd2279ad50911ffdd7e85
+_md5_=6d8aae2943824909d9be53ee742a38de
diff --git a/metadata/md5-cache/lxde-base/lxtask-0.1.8-r1 b/metadata/md5-cache/lxde-base/lxtask-0.1.8-r1
index 18b693060b90..2d1c6b7b6888 100644
--- a/metadata/md5-cache/lxde-base/lxtask-0.1.8-r1
+++ b/metadata/md5-cache/lxde-base/lxtask-0.1.8-r1
@@ -3,10 +3,10 @@ DEPEND=x11-libs/gtk+:2 dev-libs/glib:2 virtual/pkgconfig sys-devel/gettext >=dev
DESCRIPTION=LXDE Task manager
EAPI=6
HOMEPAGE=https://wiki.lxde.org/en/LXTask
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ppc ~x86 ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=x11-libs/gtk+:2 dev-libs/glib:2
SLOT=0
SRC_URI=mirror://sourceforge/lxde/lxtask-0.1.8.tar.xz
_eclasses_=l10n 97f2753e3f1f3753d53d856c7c0bbb0b
-_md5_=357d20f5855b7ae69c917c3b930c251c
+_md5_=798ddc9a9f3a5253c01da71fb04d3605
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 052f7a82eeaa..84336f9e524c 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/neomutt-20180512 b/metadata/md5-cache/mail-client/neomutt-20180512
index aec5c81a5193..7ec9cca1c624 100644
--- a/metadata/md5-cache/mail-client/neomutt-20180512
+++ b/metadata/md5-cache/mail-client/neomutt-20180512
@@ -4,10 +4,10 @@ DESCRIPTION=A small but very powerful text-based mail client
EAPI=6
HOMEPAGE=https://neomutt.org/
IUSE=berkdb crypt doc gdbm gnutls gpg gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime smime_classic ssl tokyocabinet
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=GPL-2
RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) =net-libs/gnutls-1.0.17 ) gpg? ( >=app-crypt/gpgme-0.9.0 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
SLOT=0
SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20180512.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dfd03257f24b99a41a6cf88be7dfc609
+_md5_=67e8f9b1bbf93e1d8fa28470a5692a7c
diff --git a/metadata/md5-cache/mail-client/neomutt-20180622 b/metadata/md5-cache/mail-client/neomutt-20180622
new file mode 100644
index 000000000000..7875c2a80ba5
--- /dev/null
+++ b/metadata/md5-cache/mail-client/neomutt-20180622
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) =net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) dev-lang/tcl net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) )
+DESCRIPTION=A small but very powerful text-based mail client
+EAPI=6
+HOMEPAGE=https://neomutt.org/
+IUSE=berkdb doc gdbm gnutls gpgme idn kerberos kyotocabinet libressl lmdb nls notmuch pgp_classic qdbm sasl selinux slang smime_classic ssl tokyocabinet
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=app-misc/mime-types berkdb? ( || ( sys-libs/db:6.2 sys-libs/db:5.3 sys-libs/db:4.8 ) =net-libs/gnutls-1.0.17 ) gpgme? ( >=app-crypt/gpgme-0.9.0 ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) notmuch? ( net-mail/notmuch ) sasl? ( >=dev-libs/cyrus-sasl-2 ) !slang? ( sys-libs/ncurses:0 ) slang? ( sys-libs/slang ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6:0 ) libressl? ( dev-libs/libressl ) ) selinux? ( sec-policy/selinux-mutt )
+SLOT=0
+SRC_URI=https://github.com/neomutt/neomutt/archive/neomutt-20180622.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=01dea4741716cd1be4de6949783412c4
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index e1cfbb4700dc..cbf16fb1c6ca 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/spamassassin-3.4.1-r20 b/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r20
index 0a38b8185ab1..01e7d1ec4b6d 100644
--- a/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r20
+++ b/metadata/md5-cache/mail-filter/spamassassin-3.4.1-r20
@@ -4,10 +4,10 @@ DESCRIPTION=An extensible mail filter which can identify and tag spam
EAPI=6
HOMEPAGE=https://spamassassin.apache.org/
IUSE=berkdb cron ipv6 ldap libressl mysql postgres qmail sqlite ssl test
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~ppc ppc64 s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ~hppa ia64 ppc ppc64 s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
LICENSE=Apache-2.0 GPL-2
RDEPEND=dev-lang/perl:= dev-perl/HTML-Parser dev-perl/Net-DNS dev-perl/NetAddr-IP virtual/perl-Archive-Tar virtual/perl-Digest-SHA virtual/perl-IO-Zlib virtual/perl-Time-HiRes ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) app-crypt/gnupg dev-perl/Digest-SHA1 dev-perl/Encode-Detect dev-perl/Geo-IP dev-perl/HTTP-Date dev-perl/Mail-DKIM dev-perl/Mail-SPF dev-perl/Net-Patricia dev-perl/Net-CIDR-Lite dev-util/re2c || ( net-misc/wget[ssl] net-misc/curl[ssl] ) virtual/perl-MIME-Base64 virtual/perl-Pod-Parser berkdb? ( virtual/perl-DB_File ) ipv6? ( dev-perl/IO-Socket-INET6 ) ldap? ( dev-perl/perl-ldap ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) postgres? ( dev-perl/DBI dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBI dev-perl/DBD-SQLite ) ssl? ( dev-perl/IO-Socket-SSL )
SLOT=0
SRC_URI=mirror://apache/spamassassin/source/Mail-SpamAssassin-3.4.1.tar.bz2
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e perl-functions 01e8c68d5a528bbcda4d3c60205983df systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=c7f0c151de01b3cd8db81ea46f0588e4
+_md5_=2f1efc9a5fb5f07dbd20b408378ae5de
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index 3d9d186c570a..2152f53be142 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/exim-4.91-r2 b/metadata/md5-cache/mail-mta/exim-4.91-r2
index c4108c86502b..8853cea149e5 100644
--- a/metadata/md5-cache/mail-mta/exim-4.91-r2
+++ b/metadata/md5-cache/mail-mta/exim-4.91-r2
@@ -4,11 +4,11 @@ DESCRIPTION=A highly configurable, drop-in replacement for sendmail
EAPI=6
HOMEPAGE=http://www.exim.org/
IUSE=arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-solaris
LICENSE=GPL-2
RDEPEND=>=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= =net-nds/openldap-2.0.7 ) nis? ( elibc_glibc? ( net-libs/libtirpc >=net-libs/libnsl-1:= ) ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) redis? ( dev-libs/hiredis ) spf? ( >=mail-filter/libspf2-1.2.5-r1 ) dmarc? ( mail-filter/opendmarc ) srs? ( mail-filter/libsrs_alt ) X? ( x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXaw ) sqlite? ( dev-db/sqlite ) radius? ( net-dialup/freeradius-client ) virtual/libiconv elibc_glibc? ( net-libs/libnsl ) !mail-mta/courier !mail-mta/esmtp !mail-mta/mini-qmail !=mail-mta/msmtp-1.4.19-r1[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/mailwrapper >=net-mail/mailbase-0.00-r5 virtual/logger dcc? ( mail-filter/dcc ) selinux? ( sec-policy/selinux-exim )
REQUIRED_USE=arc? ( dkim spf ) dane? ( ssl ) dmarc? ( dkim spf ) gnutls? ( ssl ) pkcs11? ( ssl ) spf? ( exiscan-acl ) srs? ( exiscan-acl )
SLOT=0
SRC_URI=https://downloads.exim.org/exim4/exim-4.91.tar.xz mirror://gentoo/system_filter.exim.gz doc? ( https://downloads.exim.org/exim4/exim-pdf-4.91.tar.xz )
_eclasses_=db-use 582140d1a711279e50ce284fc7b609f5 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f572b5eaa8acf8680ba25100debb4f11
+_md5_=3da71675ba832629ed1ca01e24d6385d
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 96e33dfc8c76..1b80b9aaf7a9 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/graphviz-2.40.1-r1 b/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
index 7a2a467a612b..97fd71443a8d 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
+++ b/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Open Source Graph Visualization Software
EAPI=6
HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
IUSE=+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
LICENSE=CPL-1.0
RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0 sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) !<=sci-chemistry/cluster-1.3.081231 java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=9a80a01ce54fb2de97c59396c386f1cb
+_md5_=ea02a0c0ff735ad0f318415174cfeba5
diff --git a/metadata/md5-cache/media-gfx/hugin-2018.0.0 b/metadata/md5-cache/media-gfx/hugin-2018.0.0
index bebcbfd73f76..90a5b0a1da59 100644
--- a/metadata/md5-cache/media-gfx/hugin-2018.0.0
+++ b/metadata/md5-cache/media-gfx/hugin-2018.0.0
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=GUI for the creation & processing of panoramic images
EAPI=6
HOMEPAGE=http://hugin.sf.net
-IUSE=debug lapack python sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+IUSE=debug lapack python sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 SIFT
-RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
+RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sci-libs/flann sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
SLOT=0
SRC_URI=mirror://sourceforge/hugin/hugin-2018.0.0.tar.bz2
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 wxwidgets 04e063b0eff26daaea83d859dd9d6e05 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f8f0f2392f3f9006764b8eb2dd89f217
+_md5_=73341964daf98f9495dbac129f7b758b
diff --git a/metadata/md5-cache/media-gfx/hugin-9999 b/metadata/md5-cache/media-gfx/hugin-9999
index 785c45762800..0fa4ed5ddf38 100644
--- a/metadata/md5-cache/media-gfx/hugin-9999
+++ b/metadata/md5-cache/media-gfx/hugin-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-vcs/mercurial sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) dev-cpp/tclap sys-devel/gettext virtual/pkgconfig python? ( >=dev-lang/swig-2.0.4 ) dev-vcs/mercurial sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=GUI for the creation & processing of panoramic images
EAPI=6
HOMEPAGE=http://hugin.sf.net
-IUSE=debug lapack python sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+IUSE=debug lapack python sift l10n_ca l10n_ca-valencia l10n_cs l10n_da l10n_de l10n_en-GB l10n_es l10n_eu l10n_fi l10n_fr l10n_hu l10n_it l10n_ja l10n_nl l10n_pl l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
LICENSE=GPL-2 SIFT
-RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool
-REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
+RDEPEND=!!dev-util/cocom dev-db/sqlite:3 dev-libs/boost:= dev-libs/zthread >=media-gfx/enblend-4.0 media-gfx/exiv2:= media-libs/freeglut media-libs/glew:= >=media-libs/libpano13-2.9.19_beta1:0= media-libs/libpng:0= media-libs/openexr:= media-libs/tiff:0 >=media-libs/vigra-1.11.0[openexr] sci-libs/fftw:3.0= sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/wxGTK:3.0=[X,opengl] lapack? ( virtual/blas virtual/lapack ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) sift? ( media-gfx/autopano-sift-C ) media-libs/exiftool
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
SLOT=0
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e mercurial 9813bb616cb1bd0c943177ab52204409 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 wxwidgets 04e063b0eff26daaea83d859dd9d6e05 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=379ed59cf202fc409ed72819effb704e
+_md5_=8011def26657fb60eaef2fe95fcc8bf2
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 7dd0a5eb63ef..8e0dfa3ab2ce 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/freeglut-3.0.0 b/metadata/md5-cache/media-libs/freeglut-3.0.0
index 01de7b8fc077..3cc9e219fc30 100644
--- a/metadata/md5-cache/media-libs/freeglut-3.0.0
+++ b/metadata/md5-cache/media-libs/freeglut-3.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=A completely OpenSourced alternative to the OpenGL Utility Toolkit (
EAPI=5
HOMEPAGE=http://freeglut.sourceforge.net/
IUSE=debug static-libs abi_x86_32 abi_x86_64 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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
LICENSE=MIT
RDEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libXi-1.7.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/libXrandr-1.4.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/libXxf86vm-1.1.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(-)?]
SLOT=0
SRC_URI=mirror://sourceforge/freeglut/freeglut-3.0.0.tar.gz
_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2b818e91027c29371ddfa3ce04e29105
+_md5_=3edd496ca50db8f6a0055d6247a87ad4
diff --git a/metadata/md5-cache/media-libs/gd-2.2.5 b/metadata/md5-cache/media-libs/gd-2.2.5
index 1c55f67866f3..c9c141a56a52 100644
--- a/metadata/md5-cache/media-libs/gd-2.2.5
+++ b/metadata/md5-cache/media-libs/gd-2.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=A graphics library for fast image creation
EAPI=6
HOMEPAGE=http://libgd.org/ http://www.boutell.com/gd/
IUSE=fontconfig jpeg png static-libs tiff truetype webp xpm 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
-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 ~x64-solaris ~x86-solaris
+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 ~x64-solaris ~x86-solaris
LICENSE=gd IJG HPND BSD
RDEPEND=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(-)?] ) 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(-)?] ) png? ( >=media-libs/libpng-1.6.10: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(-)?] ) tiff? ( media-libs/tiff: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(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xpm? ( >=x11-libs/libXpm-3.5.10-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(-)?] >=x11-libs/libXt-1.1.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(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
REQUIRED_USE=prefix? ( fontconfig )
SLOT=2/3
SRC_URI=https://github.com/libgd/libgd/releases/download/gd-2.2.5/libgd-2.2.5.tar.xz
_eclasses_=libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=ece1911afc360e96a72b0ba0993255fa
+_md5_=db00804a0d5bae919657bc6c877ba587
diff --git a/metadata/md5-cache/media-libs/lcms-2.9 b/metadata/md5-cache/media-libs/lcms-2.9
index ffe3b275e144..032916a01828 100644
--- a/metadata/md5-cache/media-libs/lcms-2.9
+++ b/metadata/md5-cache/media-libs/lcms-2.9
@@ -4,10 +4,10 @@ DESCRIPTION=A lightweight, speed optimized color management engine
EAPI=6
HOMEPAGE=http://www.littlecms.com/
IUSE=doc jpeg static-libs test +threads tiff abi_x86_32 abi_x86_64 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 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
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(-)?] ) tiff? ( >=media-libs/tiff-4.0.3-r6: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=2
SRC_URI=mirror://sourceforge/lcms/lcms2-2.9.tar.gz
_eclasses_=libtool 0081a71a261724730ec4c248494f044d multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=4dc14b5a39ff53b6082f787aeeaf9cd4
+_md5_=7308e2161da8be95a7a6b90c0ecdbd24
diff --git a/metadata/md5-cache/media-libs/libsixel-1.7.2 b/metadata/md5-cache/media-libs/libsixel-1.8.1
similarity index 84%
rename from metadata/md5-cache/media-libs/libsixel-1.7.2
rename to metadata/md5-cache/media-libs/libsixel-1.8.1
index b4ee688a44a4..8da166bb6a79 100644
--- a/metadata/md5-cache/media-libs/libsixel-1.7.2
+++ b/metadata/md5-cache/media-libs/libsixel-1.8.1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ia64 ~x86
LICENSE=MIT public-domain
RDEPEND=curl? ( net-misc/curl ) gd? ( media-libs/gd ) gtk? ( x11-libs/gdk-pixbuf:2 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0 )
SLOT=0
-SRC_URI=https://github.com/saitoha/libsixel/archive/v1.7.2.tar.gz -> libsixel-1.7.2.tar.gz
+SRC_URI=https://github.com/saitoha/libsixel/releases/download/v1.8.1/libsixel-1.8.1.tar.gz
_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=7a3460d8ddb56e3798cfd393fa7740c1
+_md5_=586975532d5029b1b289d9a0abcce34c
diff --git a/metadata/md5-cache/media-libs/libuninameslist-20091231 b/metadata/md5-cache/media-libs/libuninameslist-20091231-r1
similarity index 88%
rename from metadata/md5-cache/media-libs/libuninameslist-20091231
rename to metadata/md5-cache/media-libs/libuninameslist-20091231-r1
index 9f812abc7fb4..d8dc3e6039ad 100644
--- a/metadata/md5-cache/media-libs/libuninameslist-20091231
+++ b/metadata/md5-cache/media-libs/libuninameslist-20091231-r1
@@ -1,9 +1,9 @@
DEFINED_PHASES=configure install
DESCRIPTION=Library of unicode annotation data
-EAPI=4
+EAPI=6
HOMEPAGE=http://libuninameslist.sourceforge.net/
KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
LICENSE=BSD
SLOT=0
SRC_URI=mirror://sourceforge/libuninameslist/libuninameslist-20091231.tar.bz2
-_md5_=7b4e667a8358f4b0b608b196e4523490
+_md5_=5bf1fe0a64bd39359fdb81be65244b28
diff --git a/metadata/md5-cache/media-libs/libwebp-0.5.2 b/metadata/md5-cache/media-libs/libwebp-0.5.2
index a92afc15242d..6ab037e8be0e 100644
--- a/metadata/md5-cache/media-libs/libwebp-0.5.2
+++ b/metadata/md5-cache/media-libs/libwebp-0.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=A lossy image compression format
EAPI=6
HOMEPAGE=https://developers.google.com/speed/webp/download
IUSE=cpu_flags_x86_avx2 cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 experimental gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff abi_x86_32 abi_x86_64 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 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~m68k-mint
LICENSE=BSD
RDEPEND=gif? ( media-libs/giflib:= ) jpeg? ( virtual/jpeg:0= ) opengl? ( media-libs/freeglut virtual/opengl ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= )
SLOT=0/6
SRC_URI=http://downloads.webmproject.org/releases/webp/libwebp-0.5.2.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d044d03297b2096c1b0b1ff0bcb5d67a
+_md5_=b5ab470802a04288fe965698bb52f51e
diff --git a/metadata/md5-cache/media-libs/mesa-17.3.9 b/metadata/md5-cache/media-libs/mesa-17.3.9
index abf7f283ddc2..aea47fa99386 100644
--- a/metadata/md5-cache/media-libs/mesa-17.3.9
+++ b/metadata/md5-cache/media-libs/mesa-17.3.9
@@ -4,7 +4,7 @@ DESCRIPTION=OpenGL-like graphic library for Linux
EAPI=6
HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
IUSE=video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_i915 video_cards_i965 video_cards_imx video_cards_intel video_cards_nouveau video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind vdpau vulkan wayland xvmc xa abi_x86_32 abi_x86_64 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~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 ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=!=app-eselect/eselect-opengl-1.3.0 >=dev-libs/expat-2.1.0-r3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXdamage-1.1.4-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_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/libXxf86vm-1.1.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(-)?] >=x11-libs/libxcb-1.9.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(-)?] 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(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) opencl? ( app-eselect/eselect-opencl dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmax? ( >=media-libs/libomxil-bellagio-0.9.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(-)?] x11-misc/xdg-utils ) vaapi? ( >=x11-libs/libva-1.7.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) ) vdpau? ( >=x11-libs/libvdpau-1.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.11.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/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=x11-libs/libdrm-2.4.89[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] video_cards_intel? ( !video_cards_i965? ( >=x11-libs/libdrm-2.4.89[video_cards_intel] ) ) video_cards_i915? ( >=x11-libs/libdrm-2.4.89[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.89[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.89[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] sys-devel/clang: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(-)?,llvm_targets_AMDGPU(-)] >=sys-devel/clang-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) =sys-devel/clang-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) =sys-devel/clang-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) =sys-devel/clang-3.9.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(-)?] ) =sys-devel/llvm-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) =sys-devel/llvm-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) =sys-devel/llvm-3.9.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(-)?,llvm_targets_AMDGPU(-)] ) =sys-devel/llvm-3.9.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(-)?] ) openjpeg-2.3.0.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/c07f38fae1e67adc288c2d6679df5d3652017fbe.tar.gz -> openjpeg-data_20170814.tar.gz )
_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2062659fe1df4482b338e9b05e012deb
+_md5_=e8f700b199fb2aa233aa65b3a590c453
diff --git a/metadata/md5-cache/media-libs/sdl-pango-0.1.2-r1 b/metadata/md5-cache/media-libs/sdl-pango-0.1.2-r1
index 122540eee228..db1fc8b43beb 100644
--- a/metadata/md5-cache/media-libs/sdl-pango-0.1.2-r1
+++ b/metadata/md5-cache/media-libs/sdl-pango-0.1.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=connect the text rendering engine of GNOME to SDL
EAPI=6
HOMEPAGE=http://sdlpango.sourceforge.net/
IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ia64 ~ppc sparc ~x86
LICENSE=GPL-2
RDEPEND=x11-libs/pango media-libs/libsdl[video]
SLOT=0
SRC_URI=mirror://sourceforge/sdlpango/SDL_Pango-0.1.2.tar.gz http://zarb.org/~gc/t/SDL_Pango-0.1.2-API-adds.patch
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=c1626897ee09c5d2cf2430489b61485a
+_md5_=44b0db3896ee58ae0792270da90854a1
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-0_pre20180601 b/metadata/md5-cache/media-libs/vulkan-layers-1.1.77.0
similarity index 94%
rename from metadata/md5-cache/media-libs/vulkan-layers-0_pre20180601
rename to metadata/md5-cache/media-libs/vulkan-layers-1.1.77.0
index a8c528ccca34..a6afff7e3096 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-0_pre20180601
+++ b/metadata/md5-cache/media-libs/vulkan-layers-1.1.77.0
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
LICENSE=Apache-2.0
RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/cd83f4cb83aad4b279642beb9e9d6bd988b66338.tar.gz -> vulkan-layers-0_pre20180601.tar.gz
+SRC_URI=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/0ec7ce985fba34d5303f84f09fab79cd2b9874a8.tar.gz -> vulkan-layers-1.1.77.0.tar.gz
_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=19796ee4c1bfca3e04c8147253989187
+_md5_=3846a5456b32636344d15f73dc7fb5a0
diff --git a/metadata/md5-cache/media-libs/vulkan-layers-9999 b/metadata/md5-cache/media-libs/vulkan-layers-9999
index e05ce074e72c..ab9456768806 100644
--- a/metadata/md5-cache/media-libs/vulkan-layers-9999
+++ b/metadata/md5-cache/media-libs/vulkan-layers-9999
@@ -8,4 +8,4 @@ LICENSE=Apache-2.0
RDEPEND=!<=media-libs/vulkan-loader-1.1.70.0-r999
SLOT=0
_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a98c9801a482307626dfd368000babe
+_md5_=3846a5456b32636344d15f73dc7fb5a0
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.1.70.0 b/metadata/md5-cache/media-libs/vulkan-loader-1.1.70.0
deleted file mode 100644
index 0e4a290a35bf..000000000000
--- a/metadata/md5-cache/media-libs/vulkan-loader-1.1.70.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) demos? ( 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(-)?] ) layers? ( 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/spirv-tools-2018.2-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(-)?] ) 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-LoaderAndValidationLayers
-IUSE=demos 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
-LICENSE=Apache-2.0
-REQUIRED_USE=demos? ( X )
-SLOT=0
-SRC_URI=https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-1.1.70.0.tar.gz -> vulkan-loader-1.1.70.0.tar.gz
-_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=324434e08fba78989783bac47e46e392
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-1.1.77.0 b/metadata/md5-cache/media-libs/vulkan-loader-1.1.77.0
new file mode 100644
index 000000000000..41d6ab14ac58
--- /dev/null
+++ b/metadata/md5-cache/media-libs/vulkan-loader-1.1.77.0
@@ -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-lang/python:3.4 ) dev-util/vulkan-headers 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
+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/c71d5027a9d7fe4b170c0ff69bad67efd1d530cf.tar.gz -> vulkan-loader-1.1.77.0.tar.gz
+_eclasses_=cmake-multilib 7bc2cc09a4a5082b915541d447be8e5e cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=96fa78815c7df59b51c89c7fab10ccfb
diff --git a/metadata/md5-cache/media-libs/vulkan-loader-9999 b/metadata/md5-cache/media-libs/vulkan-loader-9999
index fbe341b4d2bc..ffa530a5c79c 100644
--- a/metadata/md5-cache/media-libs/vulkan-loader-9999
+++ b/metadata/md5-cache/media-libs/vulkan-loader-9999
@@ -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 7bc2cc09a4a5082b915541d447be8e5e cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=722f86b814b31e6c2486cc2e876e896d
+_md5_=96fa78815c7df59b51c89c7fab10ccfb
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 7dcfe4b40bfb..5ffde5571721 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.1 b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.1
new file mode 100644
index 000000000000..3edf70821a72
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-chromaprint-1.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=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(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-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-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.1: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(-)?]
+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=~amd64
+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.1: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.1.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gstreamer 4afab3a8901eec34d0fb1877fae766ba ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bd8e22eb6530d51ed2900f86bfc6b5f0
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.1
new file mode 100644
index 000000000000..f100339e3a8b
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/gst-plugins-colormanagement-1.14.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=media-libs/lcms-2.7: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(-)?] >=sys-apps/sed-4 >=virtual/pkgconfig-0-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-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.1: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(-)?]
+DESCRIPTION=Color management correction GStreamer plugins
+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=~amd64
+LICENSE=GPL-2
+RDEPEND=>=media-libs/lcms-2.7: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(-)?] >=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.1: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.1.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gstreamer 4afab3a8901eec34d0fb1877fae766ba ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=396912a6897bfd1a0e46312cee8bf46a
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.3 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.3
index 6d7baa3f862b..e195e515a810 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.3
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.3
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=1.0
SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.3.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gstreamer 4afab3a8901eec34d0fb1877fae766ba ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=74f013db578f2376527646f9453ca2d1
+_md5_=f136b53d291363ac47f44e20f5028492
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.4 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.4
index 41cf5bd3cec3..4a71390d0a59 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.4
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.12.4
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=1.0
SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.12.4.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gstreamer 4afab3a8901eec34d0fb1877fae766ba ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8254b527f6a939bc539915d4693dfe55
+_md5_=52449aec69206ce37bad4b0ff26bee52
diff --git a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.1 b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.1
index 1f969ca7ecd3..c6be7a243a11 100644
--- a/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.1
+++ b/metadata/md5-cache/media-plugins/gst-plugins-vpx-1.14.1
@@ -11,4 +11,4 @@ RESTRICT=test
SLOT=1.0
SRC_URI=https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.14.1.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gstreamer 4afab3a8901eec34d0fb1877fae766ba ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cfe3ae431000c9fe8149c31825e3bf43
+_md5_=aa22c4244c32698735b39f897572a6ab
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 9f9e68f5a389..8349e1713697 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/cantata-2.3.1 b/metadata/md5-cache/media-sound/cantata-2.3.1
new file mode 100644
index 000000000000..3ce99fe33b0d
--- /dev/null
+++ b/metadata/md5-cache/media-sound/cantata-2.3.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) sys-libs/zlib virtual/libudev:= cdda? ( media-sound/cdparanoia ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) mtp? ( media-libs/libmtp ) musicbrainz? ( media-libs/musicbrainz:5= ) replaygain? ( media-libs/libebur128 media-sound/mpg123 virtual/ffmpeg ) streaming? ( media-video/vlc:0= ) taglib? ( media-libs/taglib[asf(+),mp4(+)] udisks? ( sys-fs/udisks:2 ) ) zeroconf? ( net-dns/avahi ) dev-qt/qtconcurrent:5 dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
+DESCRIPTION=Featureful and configurable Qt client for the music player daemon (MPD)
+EAPI=6
+HOMEPAGE=https://github.com/CDrummond/cantata
+IUSE=cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) sys-libs/zlib virtual/libudev:= cdda? ( media-sound/cdparanoia ) cddb? ( media-libs/libcddb ) cdio? ( dev-libs/libcdio-paranoia ) mtp? ( media-libs/libmtp ) musicbrainz? ( media-libs/musicbrainz:5= ) replaygain? ( media-libs/libebur128 media-sound/mpg123 virtual/ffmpeg ) streaming? ( media-video/vlc:0= ) taglib? ( media-libs/taglib[asf(+),mp4(+)] udisks? ( sys-fs/udisks:2 ) ) zeroconf? ( net-dns/avahi ) dev-lang/perl[ithreads]
+REQUIRED_USE=?? ( cdda cdio ) cdda? ( udisks || ( cddb musicbrainz ) ) cddb? ( || ( cdio cdda ) taglib ) cdio? ( udisks || ( cddb musicbrainz ) ) mtp? ( taglib udisks ) musicbrainz? ( || ( cdio cdda ) taglib ) replaygain? ( taglib )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/CDrummond/cantata/releases/download/v2.3.1/cantata-2.3.1.tar.bz2
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e1bc9bbccedb3f645ab2a8a0ab527100
diff --git a/metadata/md5-cache/media-sound/gnome-music-3.24.2 b/metadata/md5-cache/media-sound/gnome-music-3.24.2
index 2b0e9cd49414..3830ae7973f5 100644
--- a/metadata/md5-cache/media-sound/gnome-music-3.24.2
+++ b/metadata/md5-cache/media-sound/gnome-music-3.24.2
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=app-misc/tracker-1.11.1[introspection(+)] >=dev-python/pygobject-3.21.1:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9:= >=media-libs/grilo-0.3.2:0.3[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] >=x11-libs/gtk+-3.19.3:3[introspection] app-text/yelp-tools >=dev-util/intltool-0.26 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-misc/tracker-1.11.1[introspection(+)] >=dev-python/pygobject-3.21.1:3[cairo,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9:= >=media-libs/grilo-0.3.2:0.3[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] >=x11-libs/gtk+-3.19.3:3[introspection] app-text/yelp-tools >=dev-util/intltool-0.26 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=Music management for Gnome
EAPI=6
HOMEPAGE=https://wiki.gnome.org/Apps/Music
-IUSE=python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
KEYWORDS=amd64 x86
LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=app-misc/tracker-1.11.1[introspection(+)] >=dev-python/pygobject-3.21.1:3[cairo,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9:= >=media-libs/grilo-0.3.2:0.3[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] >=x11-libs/gtk+-3.19.3:3[introspection] || ( app-misc/tracker[gstreamer] app-misc/tracker[ffmpeg] ) x11-libs/libnotify[introspection] dev-python/dbus-python[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.3[tracker] x11-misc/xdg-user-dirs
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
+RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-misc/tracker-1.11.1[introspection(+)] >=dev-python/pygobject-3.21.1:3[cairo,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-1.35.9:= >=media-libs/grilo-0.3.2:0.3[introspection] >=media-libs/libmediaart-1.9.1:2.0[introspection] >=x11-libs/gtk+-3.19.3:3[introspection] || ( app-misc/tracker[gstreamer] app-misc/tracker[ffmpeg] ) x11-libs/libnotify[introspection] dev-python/dbus-python[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] media-libs/gstreamer:1.0[introspection] media-libs/gst-plugins-base:1.0[introspection] media-plugins/gst-plugins-meta:1.0 media-plugins/grilo-plugins:0.3[tracker] x11-misc/xdg-user-dirs
+REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) 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/gnome-music/3.24/gnome-music-3.24.2.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8d9c379269b584529c2d9951d69e4067
+_md5_=e3ae1532b325a7cbb23c4069c48a0b2b
diff --git a/metadata/md5-cache/media-sound/mp3info-0.8.5a-r1 b/metadata/md5-cache/media-sound/mp3info-0.8.5a-r1
new file mode 100644
index 000000000000..3dd2cf42ac5e
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mp3info-0.8.5a-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=gtk? ( >=x11-libs/gtk+-2.6.10:2 ) sys-libs/ncurses:0= virtual/pkgconfig
+DESCRIPTION=An MP3 technical info viewer and ID3 1.x tag editor
+EAPI=6
+HOMEPAGE=http://ibiblio.org/mp3info/
+IUSE=gtk
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+LICENSE=GPL-2
+RDEPEND=gtk? ( >=x11-libs/gtk+-2.6.10:2 ) sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=http://ibiblio.org/pub/linux/apps/sound/mp3-utils/mp3info/mp3info-0.8.5a.tgz
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=320587e7b2c7773abb03fce1d28aa200
diff --git a/metadata/md5-cache/media-sound/pulseaudio-12.0-r1 b/metadata/md5-cache/media-sound/pulseaudio-12.0-r1
index 1210efa3f377..a0d8cbb5582d 100644
--- a/metadata/md5-cache/media-sound/pulseaudio-12.0-r1
+++ b/metadata/md5-cache/media-sound/pulseaudio-12.0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=bluetooth? ( dbus ) equalizer? ( dbus ) ofono-headset? ( bluetooth
SLOT=0
SRC_URI=https://freedesktop.org/software/pulseaudio/releases/pulseaudio-12.0.tar.xz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f6502012a572513eac7fcf8dacbfb344
+_md5_=2a47e5f6bf506b1fac8f1ac69b64f632
diff --git a/metadata/md5-cache/media-sound/supercollider-3.8.0-r1 b/metadata/md5-cache/media-sound/supercollider-3.8.1
similarity index 57%
rename from metadata/md5-cache/media-sound/supercollider-3.8.0-r1
rename to metadata/md5-cache/media-sound/supercollider-3.8.1
index ac2fd23be7a5..804c058beba1 100644
--- a/metadata/md5-cache/media-sound/supercollider-3.8.0-r1
+++ b/metadata/md5-cache/media-sound/supercollider-3.8.1
@@ -1,15 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=media-libs/alsa-lib sys-libs/readline:0= x11-libs/libX11 x11-libs/libXt avahi? ( net-dns/avahi ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) server? ( !app-admin/supernova ) sndfile? ( media-libs/libsndfile ) wiimote? ( app-misc/cwiid ) dev-libs/icu virtual/pkgconfig emacs? ( virtual/emacs ) gedit? ( app-editors/gedit ) qt5? ( dev-qt/linguist-tools:5 dev-qt/qtdeclarative:5 dev-qt/qtconcurrent:5 ) vim? ( app-editors/vim ) sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=media-libs/alsa-lib sys-libs/readline:0= x11-libs/libX11 x11-libs/libXt avahi? ( net-dns/avahi ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) !jack? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) server? ( !app-admin/supernova ) sndfile? ( media-libs/libsndfile ) dev-libs/icu virtual/pkgconfig emacs? ( virtual/emacs ) gedit? ( app-editors/gedit ) qt5? ( dev-qt/linguist-tools:5 dev-qt/qtdeclarative:5 dev-qt/qtconcurrent:5 ) vim? ( app-editors/vim ) sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=An environment and a programming language for real time audio synthesis.
EAPI=6
HOMEPAGE=https://supercollider.github.io/
-IUSE=avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack +portaudio qt5 server +sndfile static-libs vim wiimote
+IUSE=avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim
KEYWORDS=~x86 ~amd64
LICENSE=GPL-2 gpl3? ( GPL-3 )
-RDEPEND=media-libs/alsa-lib sys-libs/readline:0= x11-libs/libX11 x11-libs/libXt avahi? ( net-dns/avahi ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) server? ( !app-admin/supernova ) sndfile? ( media-libs/libsndfile ) wiimote? ( app-misc/cwiid )
-REQUIRED_USE=^^ ( jack portaudio )
+RDEPEND=media-libs/alsa-lib sys-libs/readline:0= x11-libs/libX11 x11-libs/libXt avahi? ( net-dns/avahi ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) !jack? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) server? ( !app-admin/supernova ) sndfile? ( media-libs/libsndfile )
RESTRICT=mirror
SLOT=0
-SRC_URI=https://github.com/supercollider/supercollider/releases/download/Version-3.8.0/SuperCollider-3.8.0-Source-linux.tar.bz2
+SRC_URI=https://github.com/supercollider/supercollider/releases/download/Version-3.8.1/SuperCollider-3.8.1-Source-linux.tar.bz2
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a11c1b16219404537afbb05f3b9b0114
+_md5_=2f608b0a00f25a8a2dfeb54dcb0c4295
diff --git a/metadata/md5-cache/media-sound/supercollider-3.9.3 b/metadata/md5-cache/media-sound/supercollider-3.9.3
new file mode 100644
index 000000000000..feed8e2a11cf
--- /dev/null
+++ b/metadata/md5-cache/media-sound/supercollider-3.9.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=media-libs/alsa-lib sys-libs/readline:0= x11-libs/libX11 x11-libs/libXt avahi? ( net-dns/avahi ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) !jack? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) server? ( !app-admin/supernova ) sndfile? ( media-libs/libsndfile ) dev-libs/icu virtual/pkgconfig emacs? ( virtual/emacs ) gedit? ( app-editors/gedit ) qt5? ( dev-qt/linguist-tools:5 dev-qt/qtdeclarative:5 dev-qt/qtconcurrent:5 ) vim? ( app-editors/vim ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=An environment and a programming language for real time audio synthesis.
+EAPI=6
+HOMEPAGE=https://supercollider.github.io/
+IUSE=avahi cpu_flags_x86_sse cpu_flags_x86_sse2 debug emacs +fftw gedit +gpl3 jack qt5 server +sndfile static-libs vim
+KEYWORDS=~x86 ~amd64
+LICENSE=GPL-2 gpl3? ( GPL-3 )
+RDEPEND=media-libs/alsa-lib sys-libs/readline:0= x11-libs/libX11 x11-libs/libXt avahi? ( net-dns/avahi ) fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) !jack? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) server? ( !app-admin/supernova ) sndfile? ( media-libs/libsndfile )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://github.com/supercollider/supercollider/releases/download/Version-3.9.3/SuperCollider-3.9.3-Source-linux.tar.bz2
+_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=183b21c0acf3f297107fc10a12dbb5d6
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 88cbf1c9adc0..1b60d86b3556 100644
Binary files a/metadata/md5-cache/media-tv/Manifest.gz and b/metadata/md5-cache/media-tv/Manifest.gz differ
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.12.3 b/metadata/md5-cache/media-tv/plex-media-server-1.12.3
index cc3d6fe14594..286fa0175525 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.12.3
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.12.3
@@ -4,7 +4,7 @@ DESCRIPTION=A free media library that is intended for use with a plex client.
EAPI=6
HOMEPAGE=https://www.plex.tv/
IUSE=python_targets_python2_7
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
LICENSE=Plex
RDEPEND=net-dns/avahi 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=bindist strip
SLOT=0
SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server/1.12.3.4973-215c28d86/plexmediaserver_1.12.3.4973-215c28d86_amd64.deb )
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=62634b354b26e0d387613f05240545c0
+_md5_=b7b5a19f174acb9d7cd0b2fc284b3adb
diff --git a/metadata/md5-cache/media-tv/plex-media-server-1.12.1 b/metadata/md5-cache/media-tv/plex-media-server-1.13.2
similarity index 93%
rename from metadata/md5-cache/media-tv/plex-media-server-1.12.1
rename to metadata/md5-cache/media-tv/plex-media-server-1.13.2
index abbb784d3644..b36be775e227 100644
--- a/metadata/md5-cache/media-tv/plex-media-server-1.12.1
+++ b/metadata/md5-cache/media-tv/plex-media-server-1.13.2
@@ -4,12 +4,12 @@ DESCRIPTION=A free media library that is intended for use with a plex client.
EAPI=6
HOMEPAGE=https://www.plex.tv/
IUSE=python_targets_python2_7
-KEYWORDS=-* amd64
+KEYWORDS=-* ~amd64
LICENSE=Plex
RDEPEND=net-dns/avahi 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
REQUIRED_USE=python_targets_python2_7
RESTRICT=bindist strip
SLOT=0
-SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server/1.12.1.4885-1046ba85f/plexmediaserver_1.12.1.4885-1046ba85f_amd64.deb )
+SRC_URI=amd64? ( https://downloads.plex.tv/plex-media-server/1.13.2.5154-fd05be322/plexmediaserver_1.13.2.5154-fd05be322_amd64.deb )
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a434c02a9ba95b912e675ace74b35681
+_md5_=081c2496bb449d64229bf72bf2eca68a
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index dd766cf22259..1cf89230eed6 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/subliminal-2.0.5-r2 b/metadata/md5-cache/media-video/subliminal-2.0.5-r2
new file mode 100644
index 000000000000..a3307e1af778
--- /dev/null
+++ b/metadata/md5-cache/media-video/subliminal-2.0.5-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-python/guessit-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/babelfish-0.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/enzyme-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/beautifulsoup-4.4.0:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pysrt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rarfile-2.7[compressed,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2012c[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( app-arch/unzip >=dev-python/vcrpy-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sympy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python library to search and download subtitles
+EAPI=6
+HOMEPAGE=https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/guessit-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/babelfish-0.5.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/enzyme-0.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/beautifulsoup-4.4.0:4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/requests-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/click-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/dogpile-cache-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/stevedore-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/chardet-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pysrt-1.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/appdirs-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/rarfile-2.7[compressed,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytz-2012c[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] virtual/python-futures[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/Diaoul/subliminal/archive/dd74383d1cba82829ce720f2e439a65d13ffe7ef.tar.gz -> subliminal-2.0.5-r2.tar.gz test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )
+_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6f8bedc21e2eb1199bd914aca6d66922
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 6e963bdae944..e043b5032869 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/fail2ban-0.10.3.1 b/metadata/md5-cache/net-analyzer/fail2ban-0.10.3.1
index e962946fe9db..589b924e8dd8 100644
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.10.3.1
+++ b/metadata/md5-cache/net-analyzer/fail2ban-0.10.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=scans log files and bans IPs that show malicious signs
EAPI=6
HOMEPAGE=http://www.fail2ban.org/
IUSE=selinux systemd python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_pypy python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( sys-freebsd/freebsd-pf ) net-misc/whois virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python2_7? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) python_single_target_python3_4? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) python_single_target_python3_5? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) python_single_target_python3_6? ( || ( dev-python/python-systemd[python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] sys-apps/systemd[python(-),python_targets_python2_7(-)?,python_single_target_python2_7(+)?,python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) ) ) python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
REQUIRED_USE=systemd? ( !python_single_target_pypy ) ^^ ( python_single_target_pypy python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/fail2ban/fail2ban/tarball/0.10.3.1 -> fail2ban-0.10.3.1.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=787a375c17d27fd8288a44a80cff1b6e
+_md5_=ea36a5ab2e6e0cf7fe673aa59ffbcb87
diff --git a/metadata/md5-cache/net-analyzer/nagios-4.4.0 b/metadata/md5-cache/net-analyzer/nagios-4.4.0
new file mode 100644
index 000000000000..dfe67370fcd3
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagios-4.4.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=The Nagios metapackage
+EAPI=6
+HOMEPAGE=https://www.nagios.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=~net-analyzer/nagios-core-4.4.0 || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
+SLOT=0
+_md5_=4228c5a1c2da0c98f8d9144da69ad485
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.4.0 b/metadata/md5-cache/net-analyzer/nagios-core-4.4.0
new file mode 100644
index 000000000000..37576b7d908f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst setup
+DEPEND=sys-devel/libtool virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_fcgid] ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) )
+DESCRIPTION=Nagios core - monitoring daemon, web GUI, and documentation
+EAPI=6
+HOMEPAGE=https://www.nagios.org/
+IUSE=apache2 classicui lighttpd perl +web vim-syntax
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=sys-devel/libtool virtual/mailx perl? ( dev-lang/perl:= ) web? ( app-arch/unzip media-libs/gd[jpeg,png] lighttpd? ( www-servers/lighttpd[php] ) apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgi] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_cgid] >=www-servers/apache-2.4[apache2_modules_alias,apache2_modules_fcgid] ) || ( dev-lang/php:*[apache2] dev-lang/php:*[cgi] dev-lang/php:*[fpm] ) ) ) vim-syntax? ( app-vim/nagios-syntax )
+REQUIRED_USE=apache2? ( !lighttpd )
+SLOT=0
+SRC_URI=mirror://sourceforge/nagios/nagios-4.4.0.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81
+_md5_=cd4c04db9421b21a5eb1f2eb08fad4f3
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 97851564e73c..9edff179ed65 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/ppp-2.4.7-r6 b/metadata/md5-cache/net-dialup/ppp-2.4.7-r6
index 1ec4459e4147..84fea7c1e605 100644
--- a/metadata/md5-cache/net-dialup/ppp-2.4.7-r6
+++ b/metadata/md5-cache/net-dialup/ppp-2.4.7-r6
@@ -4,11 +4,11 @@ DESCRIPTION=Point-to-Point Protocol (PPP)
EAPI=6
HOMEPAGE=https://ppp.samba.org/
IUSE=activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86
LICENSE=BSD GPL-2
PDEPEND=net-dialup/ppp-scripts
RDEPEND=activefilter? ( net-libs/libpcap ) atm? ( net-dialup/linux-atm ) pam? ( virtual/pam ) gtk? ( x11-libs/gtk+:2 ) eap-tls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
SLOT=0/2.4.7
SRC_URI=https://download.samba.org/pub/ppp/ppp-2.4.7.tar.gz https://dev.gentoo.org/~polynomial-c/ppp-2.4.7-patches-6.tar.xz http://www.netservers.net.uk/gpl/ppp-dhcpc.tgz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fbbdb92abf6697068a02e2cd20a502c9
+_md5_=885087ecefb426af4fb710a4b1ac6353
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index cb56c4b3e711..424ae74d0499 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/samba-4.5.16 b/metadata/md5-cache/net-fs/samba-4.5.16
index d8aa5a350228..c20b33dfcdef 100644
--- a/metadata/md5-cache/net-fs/samba-4.5.16
+++ b/metadata/md5-cache/net-fs/samba-4.5.16
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare setup test
DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,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-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(-)?] >=sys-libs/ldb-1.1.27[ldap(+)?,python(+),abi_x86_32(-)?,abi_x86_64(-)?,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/talloc-2.1.8[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=sys-libs/tdb-1.3.10[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=sys-libs/tevent-0.9.31-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(-)?] 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(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) 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(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-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(-)?] ) systemd? ( sys-apps/systemd:0= ) app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig test? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) virtual/pkgconfig
DESCRIPTION=Samba Suite Version 4
EAPI=6
-HOMEPAGE=http://www.samba.org/
+HOMEPAGE=https://www.samba.org/
IUSE=acl addc addns ads client cluster cups dmapi fam gnutls gpg iprint ldap pam quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_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 ppc ppc64 sparc x86
LICENSE=GPL-3
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://samba/stable/samba-4.5.16.tar.gz https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 waf-utils d1ea2758053cbb7c5b38b8f88654468d
-_md5_=477db42709c14b92904633addd21f0c4
+_md5_=25898ade94aec08a7e228cba94995699
diff --git a/metadata/md5-cache/net-fs/samba-4.6.15 b/metadata/md5-cache/net-fs/samba-4.6.15
index e867fd94032e..aa9d80bdb706 100644
--- a/metadata/md5-cache/net-fs/samba-4.6.15
+++ b/metadata/md5-cache/net-fs/samba-4.6.15
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare setup test
DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=dev-util/cmocka-1.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(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,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-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(-)?] ~sys-libs/ldb-1.1.29[ldap(+)?,python(+),python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] sys-libs/libcap sys-libs/ncurses: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(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=sys-libs/tdb-1.3.12[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=sys-libs/tevent-0.9.34[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] 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(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) 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(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( app-crypt/mit-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(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
DESCRIPTION=Samba Suite Version 4
EAPI=6
-HOMEPAGE=http://www.samba.org/
+HOMEPAGE=https://www.samba.org/
IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_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=~amd64 ~arm64 ~hppa ~x86
LICENSE=GPL-3
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://samba/stable/samba-4.6.15.tar.gz https://dev.gentoo.org/~axs/samba-4.6.7-disable-python-patches.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 waf-utils d1ea2758053cbb7c5b38b8f88654468d
-_md5_=fd2fe2020d29a52cd19d67231eb39f17
+_md5_=3f30580a4d56f2d61ae56d28e38bbcf7
diff --git a/metadata/md5-cache/net-fs/samba-4.7.7 b/metadata/md5-cache/net-fs/samba-4.7.7
index 9cd663cf1d12..11829120ed58 100644
--- a/metadata/md5-cache/net-fs/samba-4.7.7
+++ b/metadata/md5-cache/net-fs/samba-4.7.7
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare setup test
DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.2.3[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] sys-libs/libcap sys-libs/ncurses: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(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.9[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=sys-libs/tdb-1.3.14[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=sys-libs/tevent-0.9.34[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] 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(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) 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(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] || ( net-libs/rpcsvc-proto =sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
DESCRIPTION=Samba Suite Version 4
EAPI=6
-HOMEPAGE=http://www.samba.org/
+HOMEPAGE=https://www.samba.org/
IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_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=~amd64 ~arm64 ~hppa ~x86
LICENSE=GPL-3
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://samba/stable/samba-4.7.7.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 waf-utils d1ea2758053cbb7c5b38b8f88654468d
-_md5_=acedeaaae9d97a125c50a22e11f34ff2
+_md5_=f94262b49e85838c68213184e02bd5ca
diff --git a/metadata/md5-cache/net-fs/samba-4.8.2 b/metadata/md5-cache/net-fs/samba-4.8.2
index 10f23f7b8570..595050b2c8db 100644
--- a/metadata/md5-cache/net-fs/samba-4.8.2
+++ b/metadata/md5-cache/net-fs/samba-4.8.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare setup test
DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.3[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] sys-libs/libcap sys-libs/ncurses: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(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] >=sys-libs/tevent-0.9.36[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_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(-)?] 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(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) 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(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig || ( net-libs/rpcsvc-proto =sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
DESCRIPTION=Samba Suite Version 4
EAPI=6
-HOMEPAGE=http://www.samba.org/
+HOMEPAGE=https://www.samba.org/
IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_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=~amd64 ~arm64 ~hppa ~x86
LICENSE=GPL-3
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://samba/stable/samba-4.8.2.tar.gz
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f linux-info aedb720bff5a5dec9b87edd351382bfc multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 versionator 26ca8a8bd95d6a74122c08ba98a4ee72 waf-utils d1ea2758053cbb7c5b38b8f88654468d
-_md5_=37257604b53d067fdeaa175ed27205be
+_md5_=3034048434e24a6ec8e5162ce4770172
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 6dac32bb2478..19e95e28a54b 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/signal-desktop-bin-1.12.0 b/metadata/md5-cache/net-im/signal-desktop-bin-1.13.0
similarity index 96%
rename from metadata/md5-cache/net-im/signal-desktop-bin-1.12.0
rename to metadata/md5-cache/net-im/signal-desktop-bin-1.13.0
index 1ef225e17699..efc37a2c8fbb 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-1.12.0
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-1.13.0
@@ -8,6 +8,6 @@ LICENSE=GPL-3
RDEPEND=gnome-base/gconf:2 dev-libs/nss x11-libs/gtk+:3[X] x11-libs/libXScrnSaver x11-libs/libXtst net-print/cups
RESTRICT=bindist mirror
SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.12.0_amd64.deb
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_1.13.0_amd64.deb
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
_md5_=095dc5f02023f302a39a6196606c2469
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 0013e3155313..9336df0166c8 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/aqbanking-5.7.8 b/metadata/md5-cache/net-libs/aqbanking-5.7.8
index 2e54802b2b20..7f2af5114133 100644
--- a/metadata/md5-cache/net-libs/aqbanking-5.7.8
+++ b/metadata/md5-cache/net-libs/aqbanking-5.7.8
@@ -4,9 +4,9 @@ DESCRIPTION=Generic Online Banking Interface
EAPI=6
HOMEPAGE=https://www.aquamaniac.de/aqbanking/
IUSE=chipcard debug doc ebics examples gtk ofx
-KEYWORDS=~amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=app-misc/ktoblzcheck dev-libs/gmp:0= sys-libs/gwenhywfar:=[gtk?] virtual/libintl chipcard? ( >=sys-libs/libchipcard-5.0.2 ) ebics? ( dev-libs/xmlsec[gcrypt,gnutls] ) ofx? ( >=dev-libs/libofx-0.9.5 )
SLOT=0
SRC_URI=https://www.aquamaniac.de/sites/download/download.php?package=03&release=217&file=02&dummy=aqbanking-5.7.8.tar.gz -> aqbanking-5.7.8.tar.gz
-_md5_=8058478728512ccd22e5aab744287e9a
+_md5_=0ee2d7de09b40c2b0b2ca0f5d0265856
diff --git a/metadata/md5-cache/net-libs/gloox-1.0.21 b/metadata/md5-cache/net-libs/gloox-1.0.21
new file mode 100644
index 000000000000..bca6495fd405
--- /dev/null
+++ b/metadata/md5-cache/net-libs/gloox-1.0.21
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) zlib? ( sys-libs/zlib )
+DESCRIPTION=A portable high-level Jabber/XMPP library for C++
+EAPI=7
+HOMEPAGE=https://camaya.net/gloox/
+IUSE=debug gnutls idn libressl ssl static-libs test zlib
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86
+LICENSE=GPL-3
+RDEPEND=idn? ( net-dns/libidn:= ) gnutls? ( net-libs/gnutls ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) zlib? ( sys-libs/zlib )
+RESTRICT=test
+SLOT=0/17
+SRC_URI=https://camaya.net/download/gloox-1.0.21.tar.bz2
+_md5_=e2ec8a0112afd412d5fbdbf80dcb61fa
diff --git a/metadata/md5-cache/net-libs/libnsl-1.2.0 b/metadata/md5-cache/net-libs/libnsl-1.2.0
index 2c61dae176b8..60562a9c3118 100644
--- a/metadata/md5-cache/net-libs/libnsl-1.2.0
+++ b/metadata/md5-cache/net-libs/libnsl-1.2.0
@@ -4,10 +4,10 @@ DESCRIPTION=Public client interface for NIS(YP) and NIS+ in a IPv6 ready version
EAPI=6
HOMEPAGE=https://github.com/thkukuk/libnsl
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 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1+
RDEPEND=net-libs/libtirpc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ! libnsl-1.2.0.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=153e53beee18a0cd46887d821affde63
+_md5_=7b7739b11d4c706161b4f68dd26084a9
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.10.0 b/metadata/md5-cache/net-libs/mbedtls-2.10.0
index 0ca6917aedc7..8fddc2dd5ee4 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.10.0
+++ b/metadata/md5-cache/net-libs/mbedtls-2.10.0
@@ -4,10 +4,10 @@ DESCRIPTION=Cryptographic library for embedded systems
EAPI=6
HOMEPAGE=https://tls.mbed.org/
IUSE=cpu_flags_x86_sse2 doc havege libressl programs test threads 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
-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=Apache-2.0
RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0/10
SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.10.0.tar.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2d595fc03b098563ae8e6634c4e99921
+_md5_=6b1a9aeb89c09f01ab6034c7d7d01dc7
diff --git a/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1 b/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1
index b5f3fbbc655e..698b861858ce 100644
--- a/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1
+++ b/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1-r1
@@ -3,10 +3,10 @@ DEPEND=>=app-portage/elt-patches-20170422 !
DESCRIPTION=rpcsvc protocol definitions from glibc
EAPI=6
HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
-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=LGPL-2.1+ BSD
RDEPEND=! rpcsvc-proto-1.3.1.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=1377a71da7f3119f5dabefb61ea34ab7
+_md5_=9d16f225678c09ba88e140c50e9ddc2b
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 5e48127e4736..a9ee0a349856 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/mailutils-3.4-r2 b/metadata/md5-cache/net-mail/mailutils-3.4-r2
new file mode 100644
index 000000000000..ad9733795fcc
--- /dev/null
+++ b/metadata/md5-cache/net-mail/mailutils-3.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:12/22 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !=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 useful collection of mail servers, clients, and filters
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/mailutils/mailutils.html
+IUSE=berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap mysql nls pam postgres python servers ssl static-libs +threads tcpd tokyocabinet python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=!mail-client/nmh !mail-filter/libsieve !mail-client/mailx !mail-client/nail sys-libs/ncurses:= sys-libs/readline:= dev-libs/libltdl:0 virtual/mta berkdb? ( sys-libs/db:= ) bidi? ( dev-libs/fribidi ) gdbm? ( sys-libs/gdbm ) guile? ( dev-scheme/guile:12/22 ) kerberos? ( virtual/krb5 ) kyotocabinet? ( dev-db/kyotocabinet ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:= ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) sasl? ( virtual/gsasl ) ssl? ( net-libs/gnutls:= ) tcpd? ( sys-apps/tcp-wrappers ) tokyocabinet? ( dev-db/tokyocabinet )
+REQUIRED_USE=python? ( python_targets_python2_7 ) servers? ( tcpd )
+SLOT=0
+SRC_URI=mirror://gnu/mailutils/mailutils-3.4.tar.xz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=530da06fbcaa757ceb9171462a94a457
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 67ac667cd56e..a3c01af70937 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/electrum-3.1.3 b/metadata/md5-cache/net-misc/electrum-3.1.3
index e84c10133baf..653403208bd1 100644
--- a/metadata/md5-cache/net-misc/electrum-3.1.3
+++ b/metadata/md5-cache/net-misc/electrum-3.1.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( cli ncurses qt5 ) audio_modem? ( qt5 ) cosign? ( qt5 ) digital
SLOT=0
SRC_URI=https://download.electrum.org/3.1.3/Electrum-3.1.3.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8dceca9f028aa1348b4bb7f1a0eb137c
+_md5_=ab3081fada4bce3547e66929f0802373
diff --git a/metadata/md5-cache/net-misc/s3cmd-2.0.0 b/metadata/md5-cache/net-misc/s3cmd-2.0.0
index a87c66567440..bafa5c4a3c9c 100644
--- a/metadata/md5-cache/net-misc/s3cmd-2.0.0
+++ b/metadata/md5-cache/net-misc/s3cmd-2.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Command line client for Amazon S3
EAPI=6
HOMEPAGE=http://s3tools.org/s3cmd
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86 ~x64-macos
+KEYWORDS=amd64 ~x86 ~x64-macos
LICENSE=GPL-2
RDEPEND=dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-magic[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) 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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=mirror://sourceforge/s3tools/s3cmd-2.0.0.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e60dd022dde433106c8f32fcf5d7cd90
+_md5_=96f0aa21b304083ed6acb59a8c0d58c7
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 201534ade60d..1ab806b3b5d7 100644
Binary files a/metadata/md5-cache/net-p2p/Manifest.gz and b/metadata/md5-cache/net-p2p/Manifest.gz differ
diff --git a/metadata/md5-cache/net-p2p/amule-2.3.2-r2 b/metadata/md5-cache/net-p2p/amule-2.3.2-r2
new file mode 100644
index 000000000000..d9eacff63e3f
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/amule-2.3.2-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install preinst setup
+DEPEND=dev-libs/boost:= dev-libs/crypto++:= sys-libs/binutils-libs:0= sys-libs/zlib x11-libs/wxGTK:3.0[X?] stats? ( media-libs/gd:=[jpeg,png] ) geoip? ( dev-libs/geoip ) upnp? ( net-libs/libupnp:* ) remote? ( media-libs/libpng:0= ) !net-p2p/imule
+DESCRIPTION=aMule, the all-platform eMule p2p client
+EAPI=6
+HOMEPAGE=http://www.amule.org/
+IUSE=daemon debug geoip nls remote stats upnp +X
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/boost:= dev-libs/crypto++:= sys-libs/binutils-libs:0= sys-libs/zlib x11-libs/wxGTK:3.0[X?] stats? ( media-libs/gd:=[jpeg,png] ) geoip? ( dev-libs/geoip ) upnp? ( net-libs/libupnp:* ) remote? ( media-libs/libpng:0= ) !net-p2p/imule
+SLOT=0
+SRC_URI=mirror://sourceforge/amule/aMule-2.3.2.tar.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets 04e063b0eff26daaea83d859dd9d6e05
+_md5_=469db53af05e477565d335226e68611f
diff --git a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1 b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
index 7fe8d2a37ac8..2290b72f5c42 100644
--- a/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
+++ b/metadata/md5-cache/net-p2p/torrentinfo-1.8.6-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A torrent file parser
EAPI=6
HOMEPAGE=https://github.com/Fuuzetsu/torrentinfo
IUSE=test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=GPL-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_4? ( dev-lang/python:3.4 ) 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_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/Fuuzetsu/torrentinfo/archive/v1.8.6.tar.gz -> torrentinfo-1.8.6.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0ae2680ebc44ca03195db19dacf0fb1
+_md5_=8cfa9c717619161085f01bb194db0653
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index ffcbd4043065..c414789e9926 100644
Binary files a/metadata/md5-cache/net-print/Manifest.gz and b/metadata/md5-cache/net-print/Manifest.gz differ
diff --git a/metadata/md5-cache/net-print/hplip-3.18.6 b/metadata/md5-cache/net-print/hplip-3.18.6
index 5325bedae852..a963ebcf1535 100644
--- a/metadata/md5-cache/net-print/hplip-3.18.6
+++ b/metadata/md5-cache/net-print/hplip-3.18.6
@@ -4,11 +4,11 @@ DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service
EAPI=6
HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
IUSE=doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=net-print/cups virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !minimal? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads,xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[threads,xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[threads,xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-apps/dbus !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) scanner? ( media-gfx/sane-backends ) snmp? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) net-analyzer/net-snmp ) ) app-text/ghostscript-gpl !minimal? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] python_single_target_python2_7? ( dev-python/pygobject:2[python_targets_python2_7(-)?,python_single_target_python2_7(+)?] ) python_single_target_python3_4? ( dev-python/pygobject:3[python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) python_single_target_python3_5? ( dev-python/pygobject:3[python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_4(-)?,python_single_target_python3_4(+)?,python_targets_python3_5(-)?,python_single_target_python3_5(+)?,python_targets_python3_6(-)?,python_single_target_python3_6(+)?] ) fax? ( dev-python/reportlab[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) kernel_linux? ( virtual/udev ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/pillow-3.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) policykit? ( sys-auth/polkit )
REQUIRED_USE=!minimal? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
SLOT=0
SRC_URI=mirror://sourceforge/hplip/hplip-3.18.6.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.18.3-patches-2.tar.xz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 estack 43ddf5aaffa7a8d0482df54d25a66a1f libtool 0081a71a261724730ec4c248494f044d linux-info aedb720bff5a5dec9b87edd351382bfc multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4d0e2eccec2a18ab4708609e08e6baa4
+_md5_=d2726a1d9ac920b37c7744c3a248c8c3
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index f460b75ad563..b1b49bef7772 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/squid-3.5.27-r1 b/metadata/md5-cache/net-proxy/squid-3.5.27-r1
index 35112ec478ae..a88b69ffec76 100644
--- a/metadata/md5-cache/net-proxy/squid-3.5.27-r1
+++ b/metadata/md5-cache/net-proxy/squid-3.5.27-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=configure install prepare pretend setup
-DEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( libressl? ( dev-libs/libressl:0 ) !libressl? ( dev-libs/openssl:0 ) dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4:* dev-lang/perl dev-libs/libltdl:0 ecap? ( virtual/pkgconfig ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !=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=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( libressl? ( dev-libs/libressl:0 ) !libressl? ( dev-libs/openssl:0 ) dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4:* dev-libs/libltdl:0 dev-lang/perl ecap? ( virtual/pkgconfig ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !=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 full-featured web proxy cache
EAPI=6
HOMEPAGE=http://www.squid-cache.org/
-IUSE=caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
+IUSE=caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite perl qos tproxy +htcp +wccp +wccpv2 pf-transparent ipf-transparent kqueue elibc_uclibc kernel_linux
KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd
LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( libressl? ( dev-libs/libressl:0 ) !libressl? ( dev-libs/openssl:0 ) dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4:* dev-lang/perl dev-libs/libltdl:0 samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
+RDEPEND=caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( libressl? ( dev-libs/libressl:0 ) !libressl? ( dev-libs/openssl:0 ) dev-libs/nettle >=net-libs/gnutls-3.1.5 ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4:* dev-libs/libltdl:0 samba? ( net-fs/samba ) perl? ( dev-lang/perl ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite ) !<=sci-biology/meme-4.8.1-r1
REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
SLOT=0
SRC_URI=http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.27.tar.xz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f96484377dc5a281b7bf46a63c080228
+_md5_=f907dc2c19b77d8f656b833c0395386a
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 654097b51843..d7a241530525 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/linssid-3.5 b/metadata/md5-cache/net-wireless/linssid-3.5
new file mode 100644
index 000000000000..da940743f8f8
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/linssid-3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 x11-libs/qwt:6[opengl,qt5,svg]
+DESCRIPTION=Graphical wireless scanning for Linux
+EAPI=6
+HOMEPAGE=https://sourceforge.net/projects/linssid/
+IUSE=policykit
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=net-wireless/iw x11-libs/libxkbcommon[X] policykit? ( sys-auth/polkit ) !policykit? ( app-admin/sudo x11-libs/gksu ) dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 x11-libs/qwt:6[opengl,qt5,svg]
+SLOT=0
+SRC_URI=mirror://sourceforge/linssid/linssid_3.5.orig.tar.gz
+_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ec59f64c96d3a4b959f20689766af0b8
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 873bc79759db..1f4bf59064d6 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/tensorflow-1.9.0_rc0 b/metadata/md5-cache/sci-libs/tensorflow-1.9.0_rc0
deleted file mode 100644
index e477411d94a1..000000000000
--- a/metadata/md5-cache/sci-libs/tensorflow-1.9.0_rc0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup unpack
-DEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/libpcre dev-libs/protobuf dev-libs/protobuf-c >=dev-libs/re2-0.2018.04.01 media-libs/giflib media-libs/libpng:0 net-libs/grpc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/curl sys-libs/zlib virtual/jpeg:0 cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0.61[profiler] >=dev-libs/cudnn-6.0 ) jemalloc? ( >=dev-libs/jemalloc-4.4.0 ) mpi? ( virtual/mpi ) 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(-)] dev-python/absl-py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/protobuf-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(-)] 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/termcolor[python_targets_python2_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? ( dev-lang/python ) app-arch/unzip >=dev-util/bazel-0.14.0 dev-java/java-config dev-lang/nasm dev-lang/swig dev-python/cython dev-python/mock
-DESCRIPTION=Computation framework using data flow graphs for scalable machine learning
-EAPI=6
-HOMEPAGE=https://www.tensorflow.org/
-IUSE=cuda jemalloc mpi +python cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=app-arch/snappy dev-db/lmdb dev-db/sqlite dev-libs/libpcre dev-libs/protobuf dev-libs/protobuf-c >=dev-libs/re2-0.2018.04.01 media-libs/giflib media-libs/libpng:0 net-libs/grpc[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] net-misc/curl sys-libs/zlib virtual/jpeg:0 cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0.61[profiler] >=dev-libs/cudnn-6.0 ) jemalloc? ( >=dev-libs/jemalloc-4.4.0 ) mpi? ( virtual/mpi ) 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(-)] dev-python/absl-py[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/protobuf-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(-)] 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/termcolor[python_targets_python2_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? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.9.0-rc0.tar.gz -> tensorflow-1.9.0_rc0.tar.gz http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2 http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz https://bitbucket.org/eigen/eigen/get/6913f0cf7d06.tar.gz -> eigen-6913f0cf7d06.tar.gz https://github.com/LMDB/lmdb/archive/LMDB_0.9.19.tar.gz https://github.com/abseil/abseil-cpp/archive/9613678332c976568272c8f4a78631a29159271d.tar.gz -> abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz https://github.com/glennrp/libpng/archive/v1.6.34.tar.gz -> libpng-v1.6.34.tar.gz https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/nsync/archive/0559ce013feac8db639ee1bf776aca0325d28777.tar.gz -> nsync-0559ce013feac8db639ee1bf776aca0325d28777.tar.gz https://github.com/google/protobuf/archive/396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz -> protobuf-396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz https://github.com/google/re2/archive/26cd968b735e227361c9703683266f01e5df7857.tar.gz -> re2-26cd968b735e227361c9703683266f01e5df7857.tar.gz https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz https://github.com/grpc/grpc/archive/d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz -> grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.3.tar.gz -> libjpeg_turbo-1.5.3.tar.gz https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz -> jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70.tar.gz https://www.sqlite.org/2018/sqlite-amalgamation-3230100.zip https://zlib.net/zlib-1.2.11.tar.gz https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz -> jemalloc-4.4.0.tar.gz python? ( http://ftp.exim.org/pub/pcre/pcre-8.39.tar.gz http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz https://curl.haxx.se/download/curl-7.49.1.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip https://github.com/abseil/abseil-py/archive/ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz -> abseil-py-ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz https://github.com/aws/aws-sdk-cpp/archive/1.3.15.tar.gz -> aws_sdk_cpp-1.3.15.tar.gz https://github.com/cython/cython/archive/3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz -> cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz https://github.com/edenhill/librdkafka/archive/v0.11.1.tar.gz -> librdkafka-v0.11.1.tar.gz https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz https://github.com/google/flatbuffers/archive/971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz -> flatbuffers-971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz https://github.com/hfp/libxsmm/archive/1.8.1.tar.gz -> libxsmm-1.8.1.tar.gz https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz https://github.com/intel/mkl-dnn/archive/v0.12.tar.gz -> mkl_dnn-v0.12.tar.gz https://github.com/llvm-mirror/llvm/archive/7e78daafdd22f3f17720a103d29d89590534004e.tar.gz -> llvm-7e78daafdd22f3f17720a103d29d89590534004e.tar.gz https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz https://pypi.python.org/packages/d8/be/c4276b3199ec3feee2a88bc64810fbea8f26d961e0a4cd9c68387a9f35de/astor-0.6.2.tar.gz https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz )
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b1e43405dfa6a534c69e209dbaba98fc
diff --git a/metadata/md5-cache/sci-libs/tensorflow-1.9.0_rc1 b/metadata/md5-cache/sci-libs/tensorflow-1.9.0_rc1-r1
similarity index 99%
rename from metadata/md5-cache/sci-libs/tensorflow-1.9.0_rc1
rename to metadata/md5-cache/sci-libs/tensorflow-1.9.0_rc1-r1
index 6a1aaa84fb82..96cc73bac684 100644
--- a/metadata/md5-cache/sci-libs/tensorflow-1.9.0_rc1
+++ b/metadata/md5-cache/sci-libs/tensorflow-1.9.0_rc1-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_5 py
SLOT=0
SRC_URI=https://github.com/tensorflow/tensorflow/archive/v1.9.0-rc1.tar.gz -> tensorflow-1.9.0_rc1.tar.gz http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2 http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz https://bitbucket.org/eigen/eigen/get/6913f0cf7d06.tar.gz -> eigen-6913f0cf7d06.tar.gz https://github.com/LMDB/lmdb/archive/LMDB_0.9.19.tar.gz https://github.com/abseil/abseil-cpp/archive/9613678332c976568272c8f4a78631a29159271d.tar.gz -> abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz https://github.com/glennrp/libpng/archive/v1.6.34.tar.gz -> libpng-v1.6.34.tar.gz https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz https://github.com/google/nsync/archive/0559ce013feac8db639ee1bf776aca0325d28777.tar.gz -> nsync-0559ce013feac8db639ee1bf776aca0325d28777.tar.gz https://github.com/google/protobuf/archive/396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz -> protobuf-396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz https://github.com/google/re2/archive/26cd968b735e227361c9703683266f01e5df7857.tar.gz -> re2-26cd968b735e227361c9703683266f01e5df7857.tar.gz https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz https://github.com/grpc/grpc/archive/d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz -> grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.3.tar.gz -> libjpeg_turbo-1.5.3.tar.gz https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz -> jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70.tar.gz https://www.sqlite.org/2018/sqlite-amalgamation-3230100.zip https://zlib.net/zlib-1.2.11.tar.gz https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz -> jemalloc-4.4.0.tar.gz python? ( http://ftp.exim.org/pub/pcre/pcre-8.39.tar.gz http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz https://curl.haxx.se/download/curl-7.49.1.tar.gz https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip https://github.com/abseil/abseil-py/archive/ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz -> abseil-py-ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz https://github.com/aws/aws-sdk-cpp/archive/1.3.15.tar.gz -> aws_sdk_cpp-1.3.15.tar.gz https://github.com/cython/cython/archive/3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz -> cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz https://github.com/edenhill/librdkafka/archive/v0.11.1.tar.gz -> librdkafka-v0.11.1.tar.gz https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz https://github.com/google/flatbuffers/archive/971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz -> flatbuffers-971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz https://github.com/hfp/libxsmm/archive/1.8.1.tar.gz -> libxsmm-1.8.1.tar.gz https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz https://github.com/intel/mkl-dnn/archive/v0.12.tar.gz -> mkl_dnn-v0.12.tar.gz https://github.com/llvm-mirror/llvm/archive/7e78daafdd22f3f17720a103d29d89590534004e.tar.gz -> llvm-7e78daafdd22f3f17720a103d29d89590534004e.tar.gz https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz https://pypi.python.org/packages/d8/be/c4276b3199ec3feee2a88bc64810fbea8f26d961e0a4cd9c68387a9f35de/astor-0.6.2.tar.gz https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz )
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8df07fff8e4787ae3bdf44a46891e41f
+_md5_=ac42f074858a959c78e9e03fb9c7c99f
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index cc5928863d43..354fa8904e7f 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/attr-2.4.48-r1 b/metadata/md5-cache/sys-apps/attr-2.4.48-r2
similarity index 100%
rename from metadata/md5-cache/sys-apps/attr-2.4.48-r1
rename to metadata/md5-cache/sys-apps/attr-2.4.48-r2
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.3 b/metadata/md5-cache/sys-apps/diffutils-3.3
deleted file mode 100644
index 251acda20e32..000000000000
--- a/metadata/md5-cache/sys-apps/diffutils-3.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare test
-DEPEND=app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Tools to make diffs and compare files
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/diffutils/
-IUSE=nls static
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gnu-alpha/diffutils/diffutils-3.3.tar.xz mirror://gnu/diffutils/diffutils-3.3.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93db8389b3fc03647c36e55c5696bbb6
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.5 b/metadata/md5-cache/sys-apps/diffutils-3.5
index a47ace7960a6..0d01b90ed45f 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.5
+++ b/metadata/md5-cache/sys-apps/diffutils-3.5
@@ -4,9 +4,9 @@ DESCRIPTION=Tools to make diffs and compare files
EAPI=5
HOMEPAGE=https://www.gnu.org/software/diffutils/
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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gnu/diffutils/diffutils-3.5.tar.xz mirror://gnu-alpha/diffutils/diffutils-3.5.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fc5ab25a7749f30b9631c55f5ab4c0af
+_md5_=f774fdfc4e5d2b9e473aae7ee8e720aa
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.6 b/metadata/md5-cache/sys-apps/diffutils-3.6
deleted file mode 100644
index 48a0a3dba94f..000000000000
--- a/metadata/md5-cache/sys-apps/diffutils-3.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure test
-DEPEND=app-arch/xz-utils nls? ( sys-devel/gettext )
-DESCRIPTION=Tools to make diffs and compare files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/diffutils/
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gnu/diffutils/diffutils-3.6.tar.xz mirror://gnu-alpha/diffutils/diffutils-3.6.tar.xz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=da57de843bed392d9b2262555bcf962e
diff --git a/metadata/md5-cache/sys-apps/file-5.32-r1 b/metadata/md5-cache/sys-apps/file-5.32-r1
deleted file mode 100644
index 253f8c15cf3a..000000000000
--- a/metadata/md5-cache/sys-apps/file-5.32-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422
-DESCRIPTION=identify a file's format by scanning binary data for patterns
-EAPI=6
-HOMEPAGE=https://www.darwinsys.com/file/
-IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_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
-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=BSD-2
-RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic )
-REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=ftp://ftp.astron.com/pub/file/file-5.32.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4dcef8de1a1b52f1e3de5e7320ab49bd
diff --git a/metadata/md5-cache/sys-apps/file-5.33-r1 b/metadata/md5-cache/sys-apps/file-5.33-r1
deleted file mode 100644
index c219943470da..000000000000
--- a/metadata/md5-cache/sys-apps/file-5.33-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=app-portage/elt-patches-20170422
-DESCRIPTION=identify a file's format by scanning binary data for patterns
-EAPI=6
-HOMEPAGE=https://www.darwinsys.com/file/
-IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_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
-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=BSD-2
-RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic )
-REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=ftp://ftp.astron.com/pub/file/file-5.33.tar.gz
-_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=57381e3d601b39649e7b19e06eefb3ca
diff --git a/metadata/md5-cache/sys-apps/file-5.33-r2 b/metadata/md5-cache/sys-apps/file-5.33-r2
index aea638971d1d..43de21bda376 100644
--- a/metadata/md5-cache/sys-apps/file-5.33-r2
+++ b/metadata/md5-cache/sys-apps/file-5.33-r2
@@ -4,11 +4,11 @@ DESCRIPTION=identify a file's format by scanning binary data for patterns
EAPI=6
HOMEPAGE=https://www.darwinsys.com/file/
IUSE=python static-libs zlib python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_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
-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=BSD-2
RDEPEND=python? ( python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic )
REQUIRED_USE=python? ( || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
SLOT=0
SRC_URI=ftp://ftp.astron.com/pub/file/file-5.33.tar.gz
_eclasses_=distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3faf4e5ee32eff231c651cf16237ac29
+_md5_=2f734cc91d032174af8012af76ddb0aa
diff --git a/metadata/md5-cache/sys-apps/ipmicfg-1.27.1.170901 b/metadata/md5-cache/sys-apps/ipmicfg-1.28.0.180302
similarity index 82%
rename from metadata/md5-cache/sys-apps/ipmicfg-1.27.1.170901
rename to metadata/md5-cache/sys-apps/ipmicfg-1.28.0.180302
index dcc7e9951b2f..3d3a5d46c72f 100644
--- a/metadata/md5-cache/sys-apps/ipmicfg-1.27.1.170901
+++ b/metadata/md5-cache/sys-apps/ipmicfg-1.28.0.180302
@@ -8,6 +8,6 @@ LICENSE=supermicro
RDEPEND=sys-libs/glibc
RESTRICT=bindist fetch mirror strip
SLOT=0
-SRC_URI=ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_1.27.1_build.170901.zip
+SRC_URI=ftp://ftp.supermicro.com/utility/IPMICFG/IPMICFG_1.28.0_build.180302.zip
_eclasses_=eapi7-ver d97a56a62c7df8614afddcb25f5ff00f
_md5_=f62e5a59fc3ad5aa8540200e1703ff7e
diff --git a/metadata/md5-cache/sys-apps/paludis-3.0.0_pre20180214 b/metadata/md5-cache/sys-apps/paludis-3.0.0_pre20180214
index c5907bca969a..6d516d3062c8 100644
--- a/metadata/md5-cache/sys-apps/paludis-3.0.0_pre20180214
+++ b/metadata/md5-cache/sys-apps/paludis-3.0.0_pre20180214
@@ -4,7 +4,7 @@ DESCRIPTION=paludis, the other package mangler
EAPI=6
HOMEPAGE=http://paludis.exherbo.org/
IUSE=doc pbins pink python ruby ruby_targets_ruby23 search-index test +xml python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
LICENSE=GPL-2 vim
PDEPEND=app-eselect/eselect-package-manager
RDEPEND=>=app-admin/eselect-1.2.13 >=app-shells/bash-3.2:0 dev-libs/libpcre:=[cxx] sys-apps/file:= pbins? ( >=app-arch/libarchive-3.1.2:= ) 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] =dev-db/sqlite-3:= ) xml? ( >=dev-libs/libxml2-2.6:= ) sys-apps/sandbox
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://git.exherbo.org/paludis/paludis.git/snapshot/paludis-57881321fa3d5d82a9260db54afd608fd61dd533.tar.xz
_eclasses_=bash-completion-r1 6af26c1ffe65d92d3f525cb715f6250c cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be395a24b786153e2757459d0ff4bf6d
+_md5_=e8b2d548297144cd0cdf26a3470f0879
diff --git a/metadata/md5-cache/sys-apps/sed-4.5 b/metadata/md5-cache/sys-apps/sed-4.5
index 3b74d723a2f2..b38bbfc36c0a 100644
--- a/metadata/md5-cache/sys-apps/sed-4.5
+++ b/metadata/md5-cache/sys-apps/sed-4.5
@@ -4,10 +4,10 @@ DESCRIPTION=Super-useful stream editor
EAPI=6
HOMEPAGE=http://sed.sourceforge.net/
IUSE=acl forced-sandbox nls selinux 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=acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
SLOT=0
SRC_URI=mirror://gnu/sed/sed-4.5.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9a73f0bf4846c5145699922d86f3ed46
+_md5_=0e4be30ed19c113ee948903a85d5c2e6
diff --git a/metadata/md5-cache/sys-apps/systemd-239 b/metadata/md5-cache/sys-apps/systemd-239
new file mode 100644
index 000000000000..a646c896aaa5
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-239
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare prerm pretend setup test unpack
+DEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] !=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) app-arch/xz-utils:0 dev-util/gperf >=dev-util/intltool-0.50 >=sys-apps/coreutils-8.16 >=sys-kernel/linux-headers-3.11 virtual/pkgconfig gnuefi? ( >=sys-boot/gnu-efi-3.0.2 ) test? ( sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( dev-lang/python:3.6 dev-python/lxml[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/lxml[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/lxml[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ) >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=System and service manager for Linux
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/systemd
+IUSE=acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb abi_x86_32 abi_x86_64 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
+LICENSE=GPL-2 LGPL-2.1 MIT public-domain
+PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-apps/hwids-20150417[udev] >=sys-fs/udev-init-scripts-25 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
+RDEPEND=>=sys-apps/util-linux-2.30: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(-)?] sys-libs/libcap: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(-)?] !=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.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(-)?] ) http? ( >=net-libs/libmicrohttpd-0.9.33:0= ssl? ( >=net-libs/gnutls-3.1.4:0= ) ) idn? ( libidn2? ( net-dns/libidn2:= ) !libidn2? ( net-dns/libidn:= ) ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131: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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1: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(-)?] ) nat? ( net-firewall/iptables:0= ) pam? ( virtual/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre? ( dev-libs/libpcre2 ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !build? ( || ( sys-apps/util-linux[kill(-)] sys-process/procps[kill(+)] sys-apps/coreutils[kill(-)] ) ) !sys-auth/nss-myhostname !=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://kernel/linux/utils/usb/usbutils/usbutils-009.tar.xz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a7c8e2676fa89ec1960a81dc28f69cf4
+_md5_=d7a2a947d5c5f5791c3710578fb39558
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 383d736aee5b..24268aeecc57 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/whdd-2.2 b/metadata/md5-cache/sys-block/whdd-2.2
index 4323e1f5d549..3ec9f32c7c72 100644
--- a/metadata/md5-cache/sys-block/whdd-2.2
+++ b/metadata/md5-cache/sys-block/whdd-2.2
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-util/dialog sys-libs/ncurses:0[unicode] sys-devel/make >=dev-util/cmake-3.9.6
+DEPEND=dev-util/dialog:= sys-libs/ncurses:0[unicode] sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=Diagnostic and recovery tool for block devices
EAPI=6
HOMEPAGE=https://whdd.github.io
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=dev-util/dialog sys-libs/ncurses:0[unicode] sys-apps/smartmontools
+RDEPEND=dev-util/dialog:= sys-libs/ncurses:0[unicode] sys-apps/smartmontools
SLOT=0
SRC_URI=https://github.com/krieger-od/whdd/tarball/2.2 -> whdd-2.2.tar.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=454d9313af8960305302665f5e5b921d
+_md5_=de5aac78fd65b137d210686a89491246
diff --git a/metadata/md5-cache/sys-block/whdd-3.0 b/metadata/md5-cache/sys-block/whdd-3.0
index 8750cb4a93d9..0d688d0c5f52 100644
--- a/metadata/md5-cache/sys-block/whdd-3.0
+++ b/metadata/md5-cache/sys-block/whdd-3.0
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile unpack
-DEPEND=dev-util/dialog sys-libs/ncurses:0=[unicode]
+DEPEND=dev-util/dialog:= sys-libs/ncurses:0=[unicode]
DESCRIPTION=Diagnostic and recovery tool for block devices
EAPI=6
HOMEPAGE=https://whdd.github.io
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
-RDEPEND=dev-util/dialog sys-libs/ncurses:0=[unicode] sys-apps/smartmontools
+RDEPEND=dev-util/dialog:= sys-libs/ncurses:0=[unicode] sys-apps/smartmontools
SLOT=0
SRC_URI=https://github.com/whdd/whdd/tarball/3.0 -> whdd-3.0.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-snapshot 3be1ab44131e8c0bbdaa75823008444b
-_md5_=ae31f5ada4a3c31d5166cfacecd7fe8e
+_md5_=7cf65bdf0f3074a9c108f5ea33536f7d
diff --git a/metadata/md5-cache/sys-block/whdd-9999 b/metadata/md5-cache/sys-block/whdd-9999
index fdeffdc6d7be..0947dd71b8a0 100644
--- a/metadata/md5-cache/sys-block/whdd-9999
+++ b/metadata/md5-cache/sys-block/whdd-9999
@@ -1,10 +1,10 @@
DEFINED_PHASES=compile unpack
-DEPEND=dev-util/dialog sys-libs/ncurses:0=[unicode] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-util/dialog:= sys-libs/ncurses:0=[unicode] >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Diagnostic and recovery tool for block devices
EAPI=6
HOMEPAGE=https://whdd.github.io
LICENSE=GPL-3
-RDEPEND=dev-util/dialog sys-libs/ncurses:0=[unicode] sys-apps/smartmontools
+RDEPEND=dev-util/dialog:= sys-libs/ncurses:0=[unicode] sys-apps/smartmontools
SLOT=0
_eclasses_=git-r3 8f6de46b0aa318aea0e8cac62ece098b multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=ae31f5ada4a3c31d5166cfacecd7fe8e
+_md5_=7cf65bdf0f3074a9c108f5ea33536f7d
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 6fcdb9b91de4..af96a7804cb7 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/unetbootin-657 b/metadata/md5-cache/sys-boot/unetbootin-657
deleted file mode 100644
index 3c309f917a47..000000000000
--- a/metadata/md5-cache/sys-boot/unetbootin-657
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtgui:4
-DESCRIPTION=UNetbootin installs Linux/BSD distributions to a partition or USB drive
-EAPI=6
-HOMEPAGE=https://github.com/unetbootin/unetbootin
-IUSE=l10n_am l10n_ar l10n_ast l10n_be l10n_bg l10n_bn l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fo l10n_fr l10n_gl l10n_he l10n_hr l10n_hu l10n_id l10n_it l10n_ja l10n_lt l10n_lv l10n_ml l10n_ms l10n_nan l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt-BR l10n_pt l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sr l10n_sv l10n_sw l10n_tr l10n_uk l10n_ur l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtgui:4 app-arch/p7zip sys-boot/syslinux sys-fs/mtools
-SLOT=0
-SRC_URI=https://github.com/unetbootin/unetbootin/archive/657.tar.gz -> unetbootin-657.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e537bfe0dba2a52e744a014ebb6ae53
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 8c89803886cb..68f848312063 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/keepalived-1.4.2 b/metadata/md5-cache/sys-cluster/keepalived-1.4.5
similarity index 94%
rename from metadata/md5-cache/sys-cluster/keepalived-1.4.2
rename to metadata/md5-cache/sys-cluster/keepalived-1.4.5
index 6964c3954f57..80f2fe02709a 100644
--- a/metadata/md5-cache/sys-cluster/keepalived-1.4.2
+++ b/metadata/md5-cache/sys-cluster/keepalived-1.4.5
@@ -8,6 +8,6 @@ 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 dbus? ( sys-apps/dbus ) json? ( dev-libs/json-c:= ) snmp? ( net-analyzer/net-snmp )
SLOT=0
-SRC_URI=http://www.keepalived.org/software/keepalived-1.4.2.tar.gz
+SRC_URI=http://www.keepalived.org/software/keepalived-1.4.5.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
_md5_=90c75184a345ff11dd1803261c8349ec
diff --git a/metadata/md5-cache/sys-cluster/keepalived-2.0.4 b/metadata/md5-cache/sys-cluster/keepalived-2.0.4
new file mode 100644
index 000000000000..d9b2ce938465
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/keepalived-2.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libnl:= dev-libs/openssl:= dev-libs/popt net-libs/libnfnetlink sys-apps/iproute2 dbus? ( sys-apps/dbus ) json? ( dev-libs/json-c:= ) snmp? ( net-analyzer/net-snmp ) >=sys-kernel/linux-headers-4.4 >=app-portage/elt-patches-20170422 !=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 strong & robust keepalive facility to the Linux Virtual Server project
+EAPI=6
+HOMEPAGE=http://www.keepalived.org/
+IUSE=dbus debug ipv6 -json 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 dbus? ( sys-apps/dbus ) json? ( dev-libs/json-c:= ) snmp? ( net-analyzer/net-snmp )
+SLOT=0
+SRC_URI=http://www.keepalived.org/software/keepalived-2.0.4.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=90c75184a345ff11dd1803261c8349ec
diff --git a/metadata/md5-cache/sys-cluster/ucx-1.2.2 b/metadata/md5-cache/sys-cluster/ucx-1.2.2-r1
similarity index 86%
rename from metadata/md5-cache/sys-cluster/ucx-1.2.2
rename to metadata/md5-cache/sys-cluster/ucx-1.2.2-r1
index 37b6b579eb5f..1f94d0e17feb 100644
--- a/metadata/md5-cache/sys-cluster/ucx-1.2.2
+++ b/metadata/md5-cache/sys-cluster/ucx-1.2.2-r1
@@ -3,9 +3,11 @@ DEPEND=>=app-portage/elt-patches-20170422 !
DESCRIPTION=Unified Communication X
EAPI=6
HOMEPAGE=http://www.openucx.org
+IUSE=+numa +openmp
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
+RDEPEND=numa? ( sys-process/numactl )
SLOT=0
SRC_URI=https://github.com/openucx/ucx/releases/download/v1.2.2/ucx-1.2.2.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=545041a85d2c946730b28d9c4f7f8e1b
+_md5_=224a237e8c3e109564ad703bc061d6cf
diff --git a/metadata/md5-cache/sys-cluster/ucx-1.3.0 b/metadata/md5-cache/sys-cluster/ucx-1.3.0
new file mode 100644
index 000000000000..8ad0d5d71894
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/ucx-1.3.0
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure
+DESCRIPTION=Unified Communication X
+EAPI=6
+HOMEPAGE=http://www.openucx.org
+IUSE=+numa +openmp
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=numa? ( sys-process/numactl )
+SLOT=0
+SRC_URI=https://github.com/openucx/ucx/releases/download/v1.3.0/ucx-1.3.0.tar.gz
+_md5_=0851324f78ac3927d960c423a6512000
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 5a4c470bb8dd..e702529fcf12 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/binutils-2.30-r2 b/metadata/md5-cache/sys-devel/binutils-2.30-r2
index 916ed6b99025..1de5306981e9 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.30-r2
+++ b/metadata/md5-cache/sys-devel/binutils-2.30-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Tools necessary to build programs
EAPI=6
HOMEPAGE=https://sourceware.org/binutils/
IUSE=+cxx doc multitarget +nls static-libs test
-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=>=sys-devel/binutils-config-3 sys-libs/zlib
SLOT=2.30
SRC_URI=mirror://gnu/binutils/binutils-2.30.tar.xz https://sourceware.org/pub/binutils/releases/binutils-2.30.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.30-patches-2.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=113967a278e9e582bd5019215ae85e84
+_md5_=f4b403143a876ee21843779ca2c97304
diff --git a/metadata/md5-cache/sys-devel/binutils-9999 b/metadata/md5-cache/sys-devel/binutils-9999
index d4581e58f280..d0f55c7026b9 100644
--- a/metadata/md5-cache/sys-devel/binutils-9999
+++ b/metadata/md5-cache/sys-devel/binutils-9999
@@ -6,6 +6,7 @@ HOMEPAGE=https://sourceware.org/binutils/
IUSE=+cxx doc multitarget +nls static-libs test
LICENSE=GPL-3+
RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
-SLOT=git
+SLOT=9999
+SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/binutils-9999-patches-1.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=486e8d0ffe97b43bf32a5aa8e2a09110
+_md5_=193f4e8eaf8dfcec16898621d0e67e01
diff --git a/metadata/md5-cache/sys-devel/gcc-7.3.0-r3 b/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
index ae46e9ef25d5..59295e2c7428 100644
--- a/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
+++ b/metadata/md5-cache/sys-devel/gcc-7.3.0-r3
@@ -4,7 +4,7 @@ DESCRIPTION=The GNU Compiler Collection
EAPI=5
HOMEPAGE=https://gcc.gnu.org/
IUSE=regression-test vanilla altivec debug doc hardened multilib objc pgo objc-gc libssp objc++ fixed-point go graphite cilk +vtv jit mpx +pie +ssp +pch +nls +nptl +cxx +fortran +openmp +sanitize
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos
LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
@@ -12,4 +12,4 @@ RESTRICT=strip
SLOT=7.3.0
SRC_URI=mirror://gnu/gcc/gcc-7.3.0/gcc-7.3.0.tar.xz mirror://gentoo/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-7.3.0-patches-1.4.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-7.3.0-patches-1.4.tar.bz2
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc fixheadtails 6b7b3d896b0b285c12a94f3105c2a06c flag-o-matic 5128c4729303400bd8d4b0b966530955 gnuconfig b8ec1c34be4ff9dac7ad4034d277936b libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain b642837e72167f5e819eac3a9fe26bbb toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=e42fe7503d068376dd789fbe957b3c0f
+_md5_=47bff7407d753416a877c3d1739d8644
diff --git a/metadata/md5-cache/sys-devel/gdb-8.1-r1 b/metadata/md5-cache/sys-devel/gdb-8.1-r1
index 7c1e21e6816c..bfbcdd7cc81a 100644
--- a/metadata/md5-cache/sys-devel/gdb-8.1-r1
+++ b/metadata/md5-cache/sys-devel/gdb-8.1-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=server? ( !dev-util/gdbserver ) client? ( >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) xml? ( dev-libs/expat ) sys-libs/zlib ) app-arch/xz-utils sys-apps/texinfo client? ( virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) )
+DEPEND=dev-libs/mpfr:= server? ( !dev-util/gdbserver ) client? ( >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) xml? ( dev-libs/expat ) sys-libs/zlib ) app-arch/xz-utils sys-apps/texinfo client? ( virtual/yacc test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) )
DESCRIPTION=GNU debugger
EAPI=6
HOMEPAGE=https://sourceware.org/gdb/
IUSE=+client lzma multitarget nls +python +server test vanilla xml python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2 LGPL-2
-RDEPEND=server? ( !dev-util/gdbserver ) client? ( >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) xml? ( dev-libs/expat ) sys-libs/zlib )
+RDEPEND=dev-libs/mpfr:= server? ( !dev-util/gdbserver ) client? ( >=sys-libs/ncurses-5.2-r2:0= sys-libs/readline:0= lzma? ( app-arch/xz-utils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) xml? ( dev-libs/expat ) sys-libs/zlib )
REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) ) || ( client server )
SLOT=0
SRC_URI=mirror://gnu/gdb/gdb-8.1.tar.xz ftp://sourceware.org/pub/gdb/releases/gdb-8.1.tar.xz https://dev.gentoo.org/~slyfox/distfiles/gdb-8.1-patches-1.tar.xz mirror://gentoo/gdb-8.1-patches-1.tar.xz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3cbaeeb79e7f83d8bce49f594cbcfc16
+_md5_=518763074d2832b2e87d0ee1ffba0707
diff --git a/metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0 b/metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0-r1
similarity index 87%
rename from metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0
rename to metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0-r1
index bd68ed774f35..bd33d87efbae 100644
--- a/metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0
+++ b/metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install
+DEFINED_PHASES=install postinst postrm
DESCRIPTION=Wrappers for gcc tools to be used on non-native CHOSTs
EAPI=5
HOMEPAGE=https://www.gentoo.org
@@ -7,4 +7,4 @@ LICENSE=public-domain
RDEPEND=sys-devel/gcc:=
SLOT=0
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=477b3dfcd40e91ec94310c3f956ffad0
+_md5_=623e300ea0062f0a327ef89db4569579
diff --git a/metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0-r2 b/metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0-r2
new file mode 100644
index 000000000000..b1a0cb9ce880
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/multilib-gcc-wrapper-0-r2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst postrm
+DESCRIPTION=Wrappers for gcc tools to be used on non-native CHOSTs
+EAPI=7
+HOMEPAGE=https://www.gentoo.org
+KEYWORDS=~amd64
+LICENSE=public-domain
+RDEPEND=sys-devel/gcc:=
+SLOT=0
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=7faf9994dec0763ce21f90c606d254a3
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 6970972e3a36..b349d74385da 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/intel-microcode-20140430 b/metadata/md5-cache/sys-firmware/intel-microcode-20140430
deleted file mode 100644
index f84b3870fd06..000000000000
--- a/metadata/md5-cache/sys-firmware/intel-microcode-20140430
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=Intel IA32 microcode update data
-EAPI=4
-HOMEPAGE=http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=23829
-KEYWORDS=-* amd64 x86
-LICENSE=intel-ucode
-RDEPEND=! ipxe-1.0.0_p20180211-546dd51.tar.bz2 ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/ipxe-1.0.0_p20180211-546dd51-bin.tar.xz )
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=056008403b0a99f8ad466d00f30a75c0
+_md5_=c83860e1337dc159ca5df79d3bc78fc2
diff --git a/metadata/md5-cache/sys-firmware/seabios-1.11.0 b/metadata/md5-cache/sys-firmware/seabios-1.11.0
index a80747c40879..432da2e6e09d 100644
--- a/metadata/md5-cache/sys-firmware/seabios-1.11.0
+++ b/metadata/md5-cache/sys-firmware/seabios-1.11.0
@@ -4,10 +4,10 @@ DESCRIPTION=Open Source implementation of a 16-bit x86 BIOS
EAPI=6
HOMEPAGE=https://www.seabios.org/
IUSE=+binary debug +seavgabios
-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=LGPL-3 GPL-3
REQUIRED_USE=debug? ( !binary ) !amd64? ( !x86? ( binary ) )
SLOT=0
SRC_URI=!binary? ( https://code.coreboot.org/p/seabios/downloads/get/seabios-1.11.0.tar.gz ) binary? ( https://dev.gentoo.org/~tamiko/distfiles/seabios-1.11.0-bin.tar.xz )
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c104068828cb24097eabba95b06ffaf9
+_md5_=b03251dc18bba2d06aaf046d88e34c16
diff --git a/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1 b/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1
index 45003b00807a..4efb5e92df6d 100644
--- a/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1
+++ b/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8-r1
@@ -3,10 +3,10 @@ DESCRIPTION=serial graphics adapter bios option rom for x86
EAPI=6
HOMEPAGE=https://code.google.com/p/sgabios/
IUSE=+binary
-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=Apache-2.0
REQUIRED_USE=!amd64? ( !x86? ( binary ) )
SLOT=0
SRC_URI=mirror://gentoo/sgabios-0.1_pre8.tar.xz !binary? ( https://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8.tar.xz ) binary? ( https://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8-bins.tar.xz )
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cec23a381589b1e2c5af1846592e71b7
+_md5_=9e072d90de043769e3afb665410183f0
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index e07168d9e6b7..c0112fe5dd29 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/bcache-tools-1.0.8_p20140220-r1 b/metadata/md5-cache/sys-fs/bcache-tools-1.0.8_p20140220-r1
index 0f884b1ddb38..9b111e24248f 100644
--- a/metadata/md5-cache/sys-fs/bcache-tools-1.0.8_p20140220-r1
+++ b/metadata/md5-cache/sys-fs/bcache-tools-1.0.8_p20140220-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=install postinst prepare
-DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=sys-apps/util-linux-2.24 virtual/pkgconfig
+DEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/util-linux-2.24 virtual/pkgconfig
DESCRIPTION=Tools for bcachefs
EAPI=5
HOMEPAGE=http://bcache.evilpiepirate.org/
-IUSE=python_targets_python3_4 python_targets_python3_5
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
-RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=sys-apps/util-linux-2.24
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
+RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) 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_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/util-linux-2.24
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/g2p/bcache-tools/archive/v1.0.8.tar.gz -> bcache-tools-1.0.8_p20140220.tgz https://dev.gentoo.org/~jlec/distfiles/bcache-status-20140220.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b2117c4407b7a0c3df9740b8614c7aeb
+_md5_=81ae3bdea7d5ef13b7f7a3533a664fec
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23 b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23
index 86f7f9c0ff6e..842344388478 100644
--- a/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2017.3.23
@@ -4,10 +4,10 @@ DESCRIPTION=Open source read-write NTFS driver that runs under FUSE
EAPI=6
HOMEPAGE=http://www.tuxera.com/community/ntfs-3g-download/
IUSE=acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=!=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) external-fuse? ( >=sys-fs/fuse-2.8.0 =dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.14
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=experimental symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.14.51
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-4.14 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.14-gnu/deblob-check -> deblob-check-4.14 ) mirror://gentoo/genpatches-4.14-56.base.tar.xz mirror://gentoo/genpatches-4.14-56.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.14-56.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.14/4.14-ck1/patch-4.14-ck1.xz https://github.com/ckolivas/linux/commit/25849740d77dfc089fdbfb53623e50d38a972aff.patch -> ck-sources-4.14-blkio-fix.patch
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=627b2495aae7f20956ee25ee6a9317ab
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.16.17 b/metadata/md5-cache/sys-kernel/ck-sources-4.16.17
new file mode 100644
index 000000000000..fa4561f4f687
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.16.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.16
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/
+IUSE=experimental symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc virtual/libelf )
+RESTRICT=binchecks strip
+SLOT=4.16.17
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.16.tar.xz deblob? ( https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.16-gnu/deblob-4.16 https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags//4.16-gnu/deblob-check -> deblob-check-4.16 ) mirror://gentoo/genpatches-4.16-18.base.tar.xz mirror://gentoo/genpatches-4.16-18.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.16-18.experimental.tar.xz ) http://ck.kolivas.org/patches/4.0/4.16/4.16-ck1/patch-4.16-ck1.xz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc kernel-2 9c959482618084f1edf862d4783a73b4 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
+_md5_=e86a394e54314e868fd976fe07b87e21
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index f027df97473a..d305cd15ecbf 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/binutils-libs-2.30-r2 b/metadata/md5-cache/sys-libs/binutils-libs-2.30-r2
index b15efdf3682d..fcfbfb039bc8 100644
--- a/metadata/md5-cache/sys-libs/binutils-libs-2.30-r2
+++ b/metadata/md5-cache/sys-libs/binutils-libs-2.30-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Core binutils libraries (libbfd, libopcodes, libiberty) for external
EAPI=6
HOMEPAGE=https://sourceware.org/binutils/
IUSE=64-bit-bfd multitarget nls static-libs abi_x86_32 abi_x86_64 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 ~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-3 LGPL-3 )
RDEPEND=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(-)?] >=sys-devel/binutils-config-5 nls? ( ! gwenhywfar-4.20.0.tar.gz
_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f multilib 97f470f374f2e94ccab04a2fb21d811e qmake-utils 990448b067cb3cfe1443bc25fb57239c toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=f9fed81262e401f9b2428437e7134d05
+_md5_=6a5dea38457bf786d63af87ba6cc93e9
diff --git a/metadata/md5-cache/sys-libs/ldb-1.3.3 b/metadata/md5-cache/sys-libs/ldb-1.3.3
index 603481077359..6f8b66d2330d 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.3.3
+++ b/metadata/md5-cache/sys-libs/ldb-1.3.3
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst prepare setup test
DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] !elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,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/popt[abi_x86_32(-)?,abi_x86_64(-)?,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/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,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/talloc-2.1.11[python?,abi_x86_32(-)?,abi_x86_64(-)?,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/tdb-1.3.15[python?,abi_x86_32(-)?,abi_x86_64(-)?,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/tevent-0.9.36[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,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 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
DESCRIPTION=An LDAP-like embedded database
EAPI=6
-HOMEPAGE=http://ldb.samba.org
+HOMEPAGE=https://ldb.samba.org
IUSE=doc +ldap +python python_targets_python2_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 ~amd64-fbsd ~x86-fbsd
LICENSE=LGPL-3
RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,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/popt[abi_x86_32(-)?,abi_x86_64(-)?,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/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,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/talloc-2.1.11[python?,abi_x86_32(-)?,abi_x86_64(-)?,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/tdb-1.3.15[python?,abi_x86_32(-)?,abi_x86_64(-)?,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/tevent-0.9.36[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,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 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0/1.3.3
-SRC_URI=http://www.samba.org/ftp/pub/ldb/ldb-1.3.3.tar.gz
+SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.3.3.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils d1ea2758053cbb7c5b38b8f88654468d
-_md5_=fd47c47b06f9ab87396d24167eaa17a9
+_md5_=9c71e00aecb16932ca43530eb2f8785c
diff --git a/metadata/md5-cache/sys-libs/ldb-1.4.0-r1 b/metadata/md5-cache/sys-libs/ldb-1.4.0-r1
index fc0b59d07a04..64b8ae986722 100644
--- a/metadata/md5-cache/sys-libs/ldb-1.4.0-r1
+++ b/metadata/md5-cache/sys-libs/ldb-1.4.0-r1
@@ -2,13 +2,13 @@ DEFINED_PHASES=compile configure install postinst prepare setup test
DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] !elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,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/popt[abi_x86_32(-)?,abi_x86_64(-)?,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/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,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/talloc-2.1.13[python?,abi_x86_32(-)?,abi_x86_64(-)?,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/tdb-1.3.15[python?,abi_x86_32(-)?,abi_x86_64(-)?,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/tevent-0.9.36[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,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 ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
DESCRIPTION=An LDAP-like embedded database
EAPI=6
-HOMEPAGE=http://ldb.samba.org
+HOMEPAGE=https://ldb.samba.org
IUSE=doc +ldap +lmdb +python python_targets_python2_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 ~amd64-fbsd ~x86-fbsd
LICENSE=LGPL-3
RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,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/popt[abi_x86_32(-)?,abi_x86_64(-)?,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/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,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/talloc-2.1.13[python?,abi_x86_32(-)?,abi_x86_64(-)?,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/tdb-1.3.15[python?,abi_x86_32(-)?,abi_x86_64(-)?,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/tevent-0.9.36[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,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 ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0/1.4.0
-SRC_URI=http://www.samba.org/ftp/pub/ldb/ldb-1.4.0.tar.gz
+SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-1.4.0.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils d1ea2758053cbb7c5b38b8f88654468d
-_md5_=d9cb62cadb2119ddff222d545df50116
+_md5_=4d20dbf526908202a124be19b4457f5e
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.15-r1 b/metadata/md5-cache/sys-libs/libblockdev-2.15-r1
deleted file mode 100644
index c5c3e4212235..000000000000
--- a/metadata/md5-cache/sys-libs/libblockdev-2.15-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key >=sys-fs/cryptsetup-1.6.7:= ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/gobject-introspection-1.3.0 doc? ( dev-util/gtk-doc ) >=app-portage/elt-patches-20170422 !=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 library for manipulating block devices
-EAPI=6
-HOMEPAGE=https://github.com/rhinstaller/libblockdev
-IUSE=bcache +cryptsetup dmraid doc lvm kbd test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key >=sys-fs/cryptsetup-1.6.7:= ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/rhinstaller/libblockdev/archive/2.15-1.tar.gz -> libblockdev-2.15-1.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=3246423bbe029e93eab2300a206c7892
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.16 b/metadata/md5-cache/sys-libs/libblockdev-2.16
deleted file mode 100644
index 2ccb2f39b2c2..000000000000
--- a/metadata/md5-cache/sys-libs/libblockdev-2.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key >=sys-fs/cryptsetup-1.6.7:= ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/gobject-introspection-1.3.0 doc? ( dev-util/gtk-doc ) >=app-portage/elt-patches-20170422 !=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 library for manipulating block devices
-EAPI=6
-HOMEPAGE=https://github.com/rhinstaller/libblockdev
-IUSE=bcache +cryptsetup dmraid doc lvm kbd test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key >=sys-fs/cryptsetup-1.6.7:= ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/rhinstaller/libblockdev/archive/2.16-1.tar.gz -> libblockdev-2.16-1.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=1262a93e2506e32bd5f8c796dcbe752b
diff --git a/metadata/md5-cache/sys-libs/libblockdev-2.18-r1 b/metadata/md5-cache/sys-libs/libblockdev-2.18-r1
new file mode 100644
index 000000000000..a4f5867b05ba
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libblockdev-2.18-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-libs/gobject-introspection-1.3.0 doc? ( dev-util/gtk-doc ) >=app-portage/elt-patches-20170422 !=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 library for manipulating block devices
+EAPI=7
+HOMEPAGE=https://github.com/rhinstaller/libblockdev
+IUSE=bcache +cryptsetup dmraid doc escrow lvm kbd test vdo python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-libs/glib-2.42.2 dev-libs/libbytesize >=sys-apps/kmod-19 >=sys-apps/util-linux-2.27 >=sys-block/parted-3.1 cryptsetup? ( escrow? ( >=dev-libs/nss-3.18.0 dev-libs/volume_key ) >=sys-fs/cryptsetup-1.6.7:= ) dmraid? ( sys-fs/dmraid sys-fs/lvm2 ) lvm? ( sys-fs/lvm2 virtual/udev ) vdo? ( dev-libs/libyaml ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) escrow? ( cryptsetup )
+SLOT=0
+SRC_URI=https://github.com/rhinstaller/libblockdev/archive/2.18-1.tar.gz -> libblockdev-2.18-1.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
+_md5_=3894f2fdb2996eaa44189bba4d2732eb
diff --git a/metadata/md5-cache/sys-libs/libchipcard-5.0.4 b/metadata/md5-cache/sys-libs/libchipcard-5.0.4
index 6580ab1dcbac..b0b876373f94 100644
--- a/metadata/md5-cache/sys-libs/libchipcard-5.0.4
+++ b/metadata/md5-cache/sys-libs/libchipcard-5.0.4
@@ -4,9 +4,9 @@ DESCRIPTION=Library for accessing chip cards via chip card readers (terminals)
EAPI=6
HOMEPAGE=https://www.aquamaniac.de/aqbanking/
IUSE=doc examples
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~sparc x86
LICENSE=LGPL-2.1
RDEPEND=>=sys-apps/pcsc-lite-1.6.2 sys-libs/gwenhywfar:= sys-libs/zlib:= virtual/libintl
SLOT=0
SRC_URI=https://www.aquamaniac.de/sites/download/download.php?package=02&release=200&file=01&dummy=libchipcard-5.0.4.tar.gz -> libchipcard-5.0.4.tar.gz
-_md5_=9d5d5fa878a50b0cbfa4dcb88ea5da47
+_md5_=402691d087c542a8d2825f88930204b8
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 8925a861f7bc..aade48c531e4 100644
Binary files a/metadata/md5-cache/sys-power/Manifest.gz and b/metadata/md5-cache/sys-power/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-power/acpilight-1.0-r1 b/metadata/md5-cache/sys-power/acpilight-1.0-r1
deleted file mode 100644
index e5b49f707dca..000000000000
--- a/metadata/md5-cache/sys-power/acpilight-1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst
-DEPEND=virtual/pkgconfig
-DESCRIPTION=Replacement for xbacklight that uses the ACPI interface to set brightness
-EAPI=6
-HOMEPAGE=https://github.com/wavexx/acpilight/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=virtual/udev python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !x11-apps/xbacklight
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/wavexx/acpilight/archive/v1.0.tar.gz -> acpilight-1.0.tar.gz
-_eclasses_=multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88
-_md5_=70bf4551b597618378d0421fdc814b0f
diff --git a/metadata/md5-cache/sys-power/acpilight-1.1 b/metadata/md5-cache/sys-power/acpilight-1.1
new file mode 100644
index 000000000000..3dd48c686f4c
--- /dev/null
+++ b/metadata/md5-cache/sys-power/acpilight-1.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Replacement for xbacklight that uses the ACPI interface to set brightness
+EAPI=6
+HOMEPAGE=https://gitlab.com/wavexx/acpilight/
+IUSE=python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=virtual/udev 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(-)] !x11-apps/xbacklight
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://gitlab.com/wavexx/acpilight/-/archive/v1.1/acpilight-v1.1.tar.gz
+_eclasses_=multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 udev 79c22815770535c8ae27f6f356559a88
+_md5_=5f941cda1ca28e065118e7e454f3e520
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 01915b9fb013..cb6974cc407a 100644
Binary files a/metadata/md5-cache/sys-process/Manifest.gz and b/metadata/md5-cache/sys-process/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-process/evisum-0.1.1 b/metadata/md5-cache/sys-process/evisum-0.1.1
new file mode 100644
index 000000000000..31ccd9903314
--- /dev/null
+++ b/metadata/md5-cache/sys-process/evisum-0.1.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=>=dev-libs/efl-1.20.0[X]
+DESCRIPTION=System and process monitor written with EFL
+EAPI=7
+HOMEPAGE=https://www.enlightenment.org/
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=dev-libs/efl-1.20.0[X]
+SLOT=0
+SRC_URI=https://download.enlightenment.org/rel/apps/evisum/evisum-0.1.1.tar.xz
+_md5_=f5c1f256088656cbca1a79af193e0fef
diff --git a/metadata/md5-cache/sys-process/psmisc-23.1-r1 b/metadata/md5-cache/sys-process/psmisc-23.1-r1
index c8b61a32df05..8171864ae791 100644
--- a/metadata/md5-cache/sys-process/psmisc-23.1-r1
+++ b/metadata/md5-cache/sys-process/psmisc-23.1-r1
@@ -4,9 +4,9 @@ DESCRIPTION=A set of tools that use the proc filesystem
EAPI=6
HOMEPAGE=http://psmisc.sourceforge.net/
IUSE=ipv6 nls selinux X
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=>=sys-libs/ncurses-5.7-r7:0= nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux )
SLOT=0
SRC_URI=mirror://sourceforge/psmisc/psmisc-23.1.tar.xz
-_md5_=f5b37af1b023f5e84ac3618c7256d900
+_md5_=a99a08e0b5772220fb091f208d6f12e7
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index bdc1c4d23ab5..fa27743b164d 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/opengl-7.0-r1 b/metadata/md5-cache/virtual/opengl-7.0-r1
index dea31dd0b413..c10d8e7f6471 100644
--- a/metadata/md5-cache/virtual/opengl-7.0-r1
+++ b/metadata/md5-cache/virtual/opengl-7.0-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for OpenGL implementation
EAPI=5
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 ~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
RDEPEND=|| ( >=media-libs/mesa-9.1.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(-)?] media-libs/opengl-apple )
SLOT=0
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=86a4e997f153de8f0229841864bff526
+_md5_=69fbafc65a38260ecc8d64e78fcf73f9
diff --git a/metadata/md5-cache/virtual/w3m-0 b/metadata/md5-cache/virtual/w3m-0
index b437d74b7e4e..4f2c11cbea37 100644
--- a/metadata/md5-cache/virtual/w3m-0
+++ b/metadata/md5-cache/virtual/w3m-0
@@ -1,7 +1,7 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for the w3m web browser
EAPI=6
-KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
RDEPEND=|| ( www-client/w3m www-client/w3mmee )
SLOT=0
-_md5_=22ff6d7109ca8166f78fdf97e9ca6374
+_md5_=c9abf4fd5011d1494acbe4786e935c62
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index edeb535ec9b2..caf22cb7103d 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/icingaweb2-module-graphite-1.0.1-r1 b/metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.0.1-r1
index 76473c19bc8d..3223fe72e3c5 100644
--- a/metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.0.1-r1
+++ b/metadata/md5-cache/www-apps/icingaweb2-module-graphite-1.0.1-r1
@@ -3,9 +3,9 @@ DEPEND=>=net-analyzer/icinga2-2.4.0 >=www-apps/icingaweb2-2.5.0
DESCRIPTION=Icinga Web 2 plugin for Graphite
EAPI=7
HOMEPAGE=https://www.icinga.com/docs/graphite/latest/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=net-analyzer/icinga2-2.4.0 >=www-apps/icingaweb2-2.5.0
SLOT=0
SRC_URI=https://github.com/Icinga/icingaweb2-module-graphite/archive/v1.0.1.tar.gz -> icingaweb2-module-graphite-1.0.1.tar.gz
-_md5_=7f883890d58b1c68fcf6436c2c98b750
+_md5_=bb7a72679a2c00135852818b983065b3
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 080bd6bf59f3..3891fb9d1462 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-68.0.3440.25 b/metadata/md5-cache/www-client/google-chrome-beta-68.0.3440.33
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-beta-68.0.3440.25
rename to metadata/md5-cache/www-client/google-chrome-beta-68.0.3440.33
index 85b2bd1e8ce6..bd95ba3c0dd2 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-68.0.3440.25
+++ b/metadata/md5-cache/www-client/google-chrome-beta-68.0.3440.33
@@ -9,6 +9,6 @@ LICENSE=google-chrome
RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
RESTRICT=bindist mirror strip
SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_68.0.3440.25-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_68.0.3440.33-1_amd64.deb
_eclasses_=chromium-2 3d468f3fc7ed63c78db7408ea04246e3 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils b963274a93e76570a88168c1f1db4cd7 preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 54aecea034d5e90bdb0684b80da5c9f3 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
_md5_=e09ca174a2430e8444d73b4834cbab6d
diff --git a/metadata/md5-cache/www-client/opera-53.0.2907.68 b/metadata/md5-cache/www-client/opera-53.0.2907.106
similarity index 83%
rename from metadata/md5-cache/www-client/opera-53.0.2907.68
rename to metadata/md5-cache/www-client/opera-53.0.2907.106
index 7da777e236b1..64cab483fd9a 100644
--- a/metadata/md5-cache/www-client/opera-53.0.2907.68
+++ b/metadata/md5-cache/www-client/opera-53.0.2907.106
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
LICENSE=OPERA-2014
RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
SLOT=0
-SRC_URI=http://download1.operacdn.com/pub/opera/desktop/53.0.2907.68/linux/opera-stable_53.0.2907.68_amd64.deb http://download2.operacdn.com/pub/opera/desktop/53.0.2907.68/linux/opera-stable_53.0.2907.68_amd64.deb http://download3.operacdn.com/pub/opera/desktop/53.0.2907.68/linux/opera-stable_53.0.2907.68_amd64.deb http://download4.operacdn.com/pub/opera/desktop/53.0.2907.68/linux/opera-stable_53.0.2907.68_amd64.deb
+SRC_URI=http://download1.operacdn.com/pub/opera/desktop/53.0.2907.106/linux/opera-stable_53.0.2907.106_amd64.deb http://download2.operacdn.com/pub/opera/desktop/53.0.2907.106/linux/opera-stable_53.0.2907.106_amd64.deb http://download3.operacdn.com/pub/opera/desktop/53.0.2907.106/linux/opera-stable_53.0.2907.106_amd64.deb http://download4.operacdn.com/pub/opera/desktop/53.0.2907.106/linux/opera-stable_53.0.2907.106_amd64.deb
_eclasses_=chromium-2 3d468f3fc7ed63c78db7408ea04246e3 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 unpacker f40f7b4bd5aa88c2a4ba7b0d1e0ded70 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg-utils f2c8335407f0b935b0a96d4adf23ef25
_md5_=4f8be215632c60a14d3dfee846ca70e1
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.3.1 b/metadata/md5-cache/www-client/qutebrowser-1.3.3
similarity index 98%
rename from metadata/md5-cache/www-client/qutebrowser-1.3.1
rename to metadata/md5-cache/www-client/qutebrowser-1.3.3
index 93676dc81f0c..1f148ff66842 100644
--- a/metadata/md5-cache/www-client/qutebrowser-1.3.1
+++ b/metadata/md5-cache/www-client/qutebrowser-1.3.3
@@ -10,6 +10,6 @@ RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python
REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
RESTRICT=test
SLOT=0
-SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.3.1/qutebrowser-1.3.1.tar.gz
+SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.3.3/qutebrowser-1.3.3.tar.gz
_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 distutils-r1 63fea93ca1cc4fdc5fa2247afc4e3a15 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 0b5829eb6369d7af3a834b6eed7b7107 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
_md5_=4649ad2b7da150f7c82044597fc91630
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 041924c325e7..3d4b132c52fc 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.25_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.33_beta
similarity index 92%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.25_beta
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.33_beta
index ebd5f610d2fb..3e08e424a685 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.25_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-68.0.3440.33_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( !=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 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170422 virtual/pkgconfig
-DESCRIPTION=Robust, small and high performance http and reverse proxy server
-EAPI=6
-HOMEPAGE=https://nginx.org
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_javascript nginx_modules_http_spdy
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
-PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline
-REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nginx.org/download/nginx-1.14.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/37ab9b2933a0b756ba3447000b7f31d432ed8228.tar.gz -> ngx_brotli-37ab9b2933a0b756ba3447000b7f31d432ed8228.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.1.0.tar.gz -> ngx_http_dav_ext-0.1.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.2.tar.gz -> ngx_http_fancyindex-0.4.2.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.2.0.tar.gz -> njs-0.2.0.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.11.tar.gz -> ngx_http_lua-0.10.11.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.18.tar.gz -> ngx_memc_module-0.18.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.55.3.tar.gz -> ngx_http_naxsi-0.55.3.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.2/modsecurity-2.9.2.tar.gz -> modsecurity-2.9.2.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/Whissi/nginx-module-vts/archive/v0.1.15-gentoo.tar.gz -> ngx_http_vhost_traffic_status-0.1.15-gentoo.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.2.0.tar.gz -> njs-0.2.0.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 ssl-cert b5e85f9a834c71d8bd532de477fe4ce2 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bfa011cdb57afbe8b6ee6975d9eb71e4
diff --git a/metadata/md5-cache/www-servers/nginx-1.13.12-r1 b/metadata/md5-cache/www-servers/nginx-1.14.0-r1
similarity index 55%
rename from metadata/md5-cache/www-servers/nginx-1.13.12-r1
rename to metadata/md5-cache/www-servers/nginx-1.14.0-r1
index 96ab7515c793..7ea4220f5b64 100644
--- a/metadata/md5-cache/www-servers/nginx-1.13.12-r1
+++ b/metadata/md5-cache/www-servers/nginx-1.14.0-r1
@@ -1,16 +1,16 @@
DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( !=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 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170422 virtual/pkgconfig
+DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_http_brotli? ( virtual/pkgconfig ) nginx_modules_http_security? ( !=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 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170422 virtual/pkgconfig
DESCRIPTION=Robust, small and high performance http and reverse proxy server
EAPI=6
HOMEPAGE=https://nginx.org
-IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_javascript nginx_modules_http_spdy
+IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_grpc +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_auth_ldap nginx_modules_http_auth_pam nginx_modules_http_brotli nginx_modules_http_cache_purge nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_fancyindex nginx_modules_http_geoip2 nginx_modules_http_headers_more nginx_modules_http_javascript nginx_modules_http_lua nginx_modules_http_memc nginx_modules_http_metrics nginx_modules_http_mogilefs nginx_modules_http_naxsi nginx_modules_http_push_stream nginx_modules_http_security nginx_modules_http_slowfs_cache nginx_modules_http_sticky nginx_modules_http_upload_progress nginx_modules_http_upstream_check nginx_modules_http_vhost_traffic_status nginx_modules_stream_geoip2 nginx_modules_stream_javascript nginx_modules_http_spdy
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
-RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
+RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_brotli? ( app-arch/brotli:= ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:mainline
REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
RESTRICT=test
-SLOT=mainline
-SRC_URI=https://nginx.org/download/nginx-1.13.12.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/37ab9b2933a0b756ba3447000b7f31d432ed8228.tar.gz -> ngx_brotli-37ab9b2933a0b756ba3447000b7f31d432ed8228.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.1.0.tar.gz -> ngx_http_dav_ext-0.1.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.2.tar.gz -> ngx_http_fancyindex-0.4.2.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.2.0.tar.gz -> njs-0.2.0.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.11.tar.gz -> ngx_http_lua-0.10.11.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.18.tar.gz -> ngx_memc_module-0.18.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.55.3.tar.gz -> ngx_http_naxsi-0.55.3.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.2/modsecurity-2.9.2.tar.gz -> modsecurity-2.9.2.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/Whissi/nginx-module-vts/archive/v0.1.15-gentoo.tar.gz -> ngx_http_vhost_traffic_status-0.1.15-gentoo.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.2.0.tar.gz -> njs-0.2.0.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
+SLOT=0
+SRC_URI=https://nginx.org/download/nginx-1.14.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/v0.1.2.tar.gz -> ngx_brotli-0.1.2.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.1.0.tar.gz -> ngx_http_dav_ext-0.1.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.2.tar.gz -> ngx_http_fancyindex-0.4.2.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/2.0.tar.gz -> ngx_http_geoip2_module-2.0.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.2.2.tar.gz -> njs-0.2.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.13.tar.gz -> ngx_http_lua-0.10.13.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.55.3.tar.gz -> ngx_http_naxsi-0.55.3.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.2/modsecurity-2.9.2.tar.gz -> modsecurity-2.9.2.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/v0.1.17.tar.gz -> ngx_http_vhost_traffic_status-0.1.17.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/2.0.tar.gz -> ngx_http_geoip2_module-2.0.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.2.2.tar.gz -> njs-0.2.2.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 ssl-cert b5e85f9a834c71d8bd532de477fe4ce2 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4ee0504582ea4f85dcedc5af9f9640f1
+_md5_=90d40d203e3f944c7a89972a225f6d0a
diff --git a/metadata/md5-cache/www-servers/nginx-1.15.0-r1 b/metadata/md5-cache/www-servers/nginx-1.15.0-r2
similarity index 71%
rename from metadata/md5-cache/www-servers/nginx-1.15.0-r1
rename to metadata/md5-cache/www-servers/nginx-1.15.0-r2
index 7b2bcf80904f..3863b05b6def 100644
--- a/metadata/md5-cache/www-servers/nginx-1.15.0-r1
+++ b/metadata/md5-cache/www-servers/nginx-1.15.0-r2
@@ -11,6 +11,6 @@ RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl?
REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_grpc? ( http2 ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
RESTRICT=test
SLOT=mainline
-SRC_URI=https://nginx.org/download/nginx-1.15.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/37ab9b2933a0b756ba3447000b7f31d432ed8228.tar.gz -> ngx_brotli-37ab9b2933a0b756ba3447000b7f31d432ed8228.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.1.0.tar.gz -> ngx_http_dav_ext-0.1.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.2.tar.gz -> ngx_http_fancyindex-0.4.2.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/2.0.tar.gz -> ngx_http_geoip2_module-2.0.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.2.1.tar.gz -> njs-0.2.1.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.13.tar.gz -> ngx_http_lua-0.10.13.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.55.3.tar.gz -> ngx_http_naxsi-0.55.3.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.2/modsecurity-2.9.2.tar.gz -> modsecurity-2.9.2.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/v0.1.16.tar.gz -> ngx_http_vhost_traffic_status-0.1.16.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/2.0.tar.gz -> ngx_http_geoip2_module-2.0.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.2.1.tar.gz -> njs-0.2.1.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
+SRC_URI=https://nginx.org/download/nginx-1.15.0.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz -> nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_brotli? ( https://github.com/eustas/ngx_brotli/archive/v0.1.2.tar.gz -> ngx_brotli-0.1.2.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.1.0.tar.gz -> ngx_http_dav_ext-0.1.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.2.tar.gz -> ngx_http_fancyindex-0.4.2.tar.gz ) nginx_modules_http_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/2.0.tar.gz -> ngx_http_geoip2_module-2.0.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.33.tar.gz -> ngx_http_headers_more-0.33.tar.gz ) nginx_modules_http_javascript? ( https://github.com/nginx/njs/archive/0.2.2.tar.gz -> njs-0.2.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.13.tar.gz -> ngx_http_lua-0.10.13.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.19.tar.gz -> ngx_memc_module-0.19.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.55.3.tar.gz -> ngx_http_naxsi-0.55.3.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.4.tar.gz -> ngx_http_push_stream-0.5.4.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.2/modsecurity-2.9.2.tar.gz -> modsecurity-2.9.2.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz -> ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz ) nginx_modules_http_vhost_traffic_status? ( https://github.com/vozlt/nginx-module-vts/archive/v0.1.17.tar.gz -> ngx_http_vhost_traffic_status-0.1.17.tar.gz ) nginx_modules_stream_geoip2? ( https://github.com/leev/ngx_http_geoip2_module/archive/2.0.tar.gz -> ngx_http_geoip2_module-2.0.tar.gz ) nginx_modules_stream_javascript? ( https://github.com/nginx/njs/archive/0.2.2.tar.gz -> njs-0.2.2.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.1.tar.gz -> ngx_rtmp-1.2.1.tar.gz )
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions 01e8c68d5a528bbcda4d3c60205983df perl-module 863b35d127db98823d439f8d73c2d011 preserve-libs ef207dc62baddfddfd39a164d9797648 ssl-cert b5e85f9a834c71d8bd532de477fe4ce2 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=08718829ccc6b075190b9cb5131c6158
+_md5_=a78e8ff95aa81084b7c87f3f8d42748e
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index f5eac550e3ce..eadc6fe70a11 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.27.1 b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.27.1
index e3529d58823c..75652e202745 100644
--- a/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.27.1
+++ b/metadata/md5-cache/x11-drivers/xf86-input-libinput-0.27.1
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/libinput-1.5.0:0= >=app-portage/elt-patches-20170422 !=dev-libs/libinput-1.5.0:0= x11-base/xorg-server:= x11-base/xorg-server[xorg]
SLOT=0
SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-0.27.1.tar.bz2
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d linux-info aedb720bff5a5dec9b87edd351382bfc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xorg-2 811a80d4e90bbf83e68c204ee75316ef
-_md5_=bad24ceb284ec773d44b21648253de98
+_md5_=ad56481a2dd13542f196f7277475ab54
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 6b013b59f0c7..5021cbb40a53 100644
Binary files a/metadata/md5-cache/x11-libs/Manifest.gz and b/metadata/md5-cache/x11-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-libs/libXi-1.7.9-r1 b/metadata/md5-cache/x11-libs/libXi-1.7.9-r1
index d9ae0798a18b..b7f8b306b7c9 100644
--- a/metadata/md5-cache/x11-libs/libXi-1.7.9-r1
+++ b/metadata/md5-cache/x11-libs/libXi-1.7.9-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xi library
EAPI=5
HOMEPAGE=https://www.x.org/wiki/ https://cgit.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 static-libs doc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=x11-base/xorg-proto >=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/libXfixes-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,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://www.x.org/releases/individual/lib/libXi-1.7.9.tar.bz2
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 811a80d4e90bbf83e68c204ee75316ef
-_md5_=2ca39686cad1b0e0a30707c2fdb3cf98
+_md5_=6ce4fb10327d1cf403b350dc270026f8
diff --git a/metadata/md5-cache/x11-libs/libXpm-3.5.12-r1 b/metadata/md5-cache/x11-libs/libXpm-3.5.12-r1
index cee04b9b489c..1561c1659433 100644
--- a/metadata/md5-cache/x11-libs/libXpm-3.5.12-r1
+++ b/metadata/md5-cache/x11-libs/libXpm-3.5.12-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xpm library
EAPI=5
HOMEPAGE=https://www.x.org/wiki/ https://cgit.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 static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=>=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/libXt-1.1.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(-)?]
SLOT=0
SRC_URI=https://www.x.org/releases/individual/lib/libXpm-3.5.12.tar.bz2
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 811a80d4e90bbf83e68c204ee75316ef
-_md5_=82b6c037c4984448f87bdc9e22a7f7e8
+_md5_=aee1f9b08a291c17ba8eba1d4c6b2a6d
diff --git a/metadata/md5-cache/x11-libs/libXrandr-1.5.1-r1 b/metadata/md5-cache/x11-libs/libXrandr-1.5.1-r1
index a616d5ec52ac..f4d790e35ba9 100644
--- a/metadata/md5-cache/x11-libs/libXrandr-1.5.1-r1
+++ b/metadata/md5-cache/x11-libs/libXrandr-1.5.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xrandr library
EAPI=5
HOMEPAGE=https://www.x.org/wiki/ https://cgit.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 static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=x11-base/xorg-proto >=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/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,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://www.x.org/releases/individual/lib/libXrandr-1.5.1.tar.bz2
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 811a80d4e90bbf83e68c204ee75316ef
-_md5_=2d8050c10bd847bff3085d5014e28dec
+_md5_=770b0f23b6355e3ea4a469b572e86952
diff --git a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r1 b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r1
index 3449ec0c0d52..aba435e3ca8a 100644
--- a/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r1
+++ b/metadata/md5-cache/x11-libs/libXxf86vm-1.1.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org Xxf86vm library
EAPI=5
HOMEPAGE=https://www.x.org/wiki/ https://cgit.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 static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=x11-base/xorg-proto >=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(-)?]
SLOT=0
SRC_URI=https://www.x.org/releases/individual/lib/libXxf86vm-1.1.4.tar.bz2
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 811a80d4e90bbf83e68c204ee75316ef
-_md5_=b84a18a1bb25f7a93dcbbac1e70eacdb
+_md5_=ce09227ee8627e0a3575a969d19445fa
diff --git a/metadata/md5-cache/x11-libs/libfontenc-1.1.3-r1 b/metadata/md5-cache/x11-libs/libfontenc-1.1.3-r1
index 5ad92145279b..b2c87d5a78da 100644
--- a/metadata/md5-cache/x11-libs/libfontenc-1.1.3-r1
+++ b/metadata/md5-cache/x11-libs/libfontenc-1.1.3-r1
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org fontenc library
EAPI=5
HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=sys-libs/zlib
SLOT=0
SRC_URI=https://www.x.org/releases/individual/lib/libfontenc-1.1.3.tar.bz2
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 811a80d4e90bbf83e68c204ee75316ef
-_md5_=f6f0e4a8640c531bcfba3f5ab0f6dbee
+_md5_=f4d75f7d97d8ffbd0ff77fb25de2065e
diff --git a/metadata/md5-cache/x11-libs/libxcb-1.13 b/metadata/md5-cache/x11-libs/libxcb-1.13
index 332fc900a39b..bafe563c257e 100644
--- a/metadata/md5-cache/x11-libs/libxcb-1.13
+++ b/metadata/md5-cache/x11-libs/libxcb-1.13
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings library
EAPI=5
HOMEPAGE=https://xcb.freedesktop.org/
IUSE=doc selinux test xkb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs doc
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=>=dev-libs/libpthread-stubs-0.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(-)?] >=x11-libs/libXau-1.0.7-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(-)?] >=x11-libs/libXdmcp-1.1.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(-)?]
SLOT=0/1.12
SRC_URI=https://xcb.freedesktop.org/dist/libxcb-1.13.tar.bz2
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 6faea633ae2f79f6d55dcfd431b79fbf python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 811a80d4e90bbf83e68c204ee75316ef
-_md5_=a961b1a5d71a1cdab4a759b52793dc12
+_md5_=b32ae585adc2734ef2c8063b3e04760c
diff --git a/metadata/md5-cache/x11-libs/libxkbfile-1.0.9-r2 b/metadata/md5-cache/x11-libs/libxkbfile-1.0.9-r2
index abdf9df5e678..a1a0966c142f 100644
--- a/metadata/md5-cache/x11-libs/libxkbfile-1.0.9-r2
+++ b/metadata/md5-cache/x11-libs/libxkbfile-1.0.9-r2
@@ -4,10 +4,10 @@ DESCRIPTION=X.Org xkbfile library
EAPI=5
HOMEPAGE=https://www.x.org/wiki/ https://cgit.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 static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
RDEPEND=x11-base/xorg-proto 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(-)?]
SLOT=0
SRC_URI=https://www.x.org/releases/individual/lib/libxkbfile-1.0.9.tar.bz2
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 811a80d4e90bbf83e68c204ee75316ef
-_md5_=2dbcfc24d07441841b6a26a0a483c4b8
+_md5_=c3ec980ab5267b6622ceb47a74765995
diff --git a/metadata/md5-cache/x11-libs/pixman-0.34.0 b/metadata/md5-cache/x11-libs/pixman-0.34.0
index e9e8b49f1e3a..6e4a89cc7b34 100644
--- a/metadata/md5-cache/x11-libs/pixman-0.34.0
+++ b/metadata/md5-cache/x11-libs/pixman-0.34.0
@@ -4,9 +4,9 @@ DESCRIPTION=Low-level pixel manipulation routines
EAPI=5
HOMEPAGE=https://www.x.org/wiki/ https://cgit.freedesktop.org/
IUSE=altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 static-libs
-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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
LICENSE=MIT
SLOT=0
SRC_URI=https://www.x.org/releases/individual/lib/pixman-0.34.0.tar.bz2
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 811a80d4e90bbf83e68c204ee75316ef
-_md5_=d7265947ddb1917442b493995c29dcfa
+_md5_=d6c2ec4347cf5037d9a3809902c2e9c9
diff --git a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r2 b/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r2
index 69080a7529d8..35b12203e8a4 100644
--- a/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r2
+++ b/metadata/md5-cache/x11-libs/xcb-util-wm-0.4.1-r2
@@ -4,10 +4,10 @@ DESCRIPTION=X C-language Bindings sample implementations
EAPI=5
HOMEPAGE=https://xcb.freedesktop.org/
IUSE=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 static-libs doc
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~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 ~x86-macos ~sparc-solaris ~x64-solaris
LICENSE=MIT
RDEPEND=>=x11-libs/libxcb-1.9.1:=[abi_x86_32(-)?,abi_x86_64(-)?,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://xcb.freedesktop.org/dist//xcb-util-wm-0.4.1.tar.bz2
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-multilib f4848d9634439c7203cb7dd3b9650fff autotools-utils 5a4611dfba155b1659528663fad4cd5e desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multibuild 35719a9cd25ec71ee49c966f6868454c multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build 45f0e78dba7de5c77988265229b4402a multilib-minimal bfa1226d0f1fa0093d10b84acd029633 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 811a80d4e90bbf83e68c204ee75316ef
-_md5_=1c902b6b8f73b829d5de783630f87378
+_md5_=c4ba1c37a8fca3a2d9b1c87223495bdb
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index c3ef7724f0a9..5d01b7e31a8a 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/e16keyedit-0.7 b/metadata/md5-cache/x11-misc/e16keyedit-0.7
deleted file mode 100644
index c1768b4e67b3..000000000000
--- a/metadata/md5-cache/x11-misc/e16keyedit-0.7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND==x11-libs/gtk+-2* virtual/pkgconfig
-DESCRIPTION=Key binding editor for enlightenment 16
-EAPI=6
-HOMEPAGE=https://www.enlightenment.org/
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=MIT-with-advertising
-RDEPEND==x11-libs/gtk+-2*
-SLOT=0
-SRC_URI=mirror://sourceforge/enlightenment/e16keyedit-0.7.tar.gz
-_md5_=5f54853c876a53aba084d651e4c9bf41
diff --git a/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3 b/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3
deleted file mode 100644
index e80670eee618..000000000000
--- a/metadata/md5-cache/x11-misc/e16menuedit2-0.0.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=x11-wm/enlightenment-0.16 >=gnome-base/libglade-2.4 x11-libs/gtk+:2 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Menu editor for enlightenment DR16 written in GTK2
-EAPI=5
-HOMEPAGE=https://www.enlightenment.org/
-IUSE=debug
-KEYWORDS=amd64 arm ~ppc sh sparc x86
-LICENSE=MIT-with-advertising
-RDEPEND=>=x11-wm/enlightenment-0.16 >=gnome-base/libglade-2.4 x11-libs/gtk+:2
-SLOT=0
-SRC_URI=mirror://sourceforge/enlightenment/e16menuedit2-0.0.3.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 6e4acb9c9da2cfa25f2dfedb93bb4a43 gnome2-utils 29bb8f7881c95139e532a2d5e47ff834 libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 26ca8a8bd95d6a74122c08ba98a4ee72 xdg 6cd76cc914c1a759dee032778487b57f xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ed465679bb9013df7973321d09b624e7
diff --git a/metadata/md5-cache/x11-misc/i3lock-2.10 b/metadata/md5-cache/x11-misc/i3lock-2.10
index d4990d0fb9f1..77a62a714a21 100644
--- a/metadata/md5-cache/x11-misc/i3lock-2.10
+++ b/metadata/md5-cache/x11-misc/i3lock-2.10
@@ -3,10 +3,10 @@ DEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev virtual/pam x11-libs/cair
DESCRIPTION=Simple screen locker
EAPI=6
HOMEPAGE=https://i3wm.org/i3lock/
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
LICENSE=BSD
RDEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev virtual/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util
SLOT=0
SRC_URI=https://i3wm.org/i3lock/i3lock-2.10.tar.bz2
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=0066342a0d3ed625979c824eeb743c65
+_md5_=452761b0fa2d182cd15392a752b3bf99
diff --git a/metadata/md5-cache/x11-misc/i3lock-2.9.1 b/metadata/md5-cache/x11-misc/i3lock-2.9.1
deleted file mode 100644
index 5a98e40f7727..000000000000
--- a/metadata/md5-cache/x11-misc/i3lock-2.9.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev virtual/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util virtual/pkgconfig
-DESCRIPTION=Simple screen locker
-EAPI=6
-HOMEPAGE=https://i3wm.org/i3lock/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=x11-libs/libxkbcommon-0.5.0[X] dev-libs/libev virtual/pam x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util
-SLOT=0
-SRC_URI=https://i3wm.org/i3lock/i3lock-2.9.1.tar.bz2
-_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=a00d4854a9103a1dc11bf2d2d672cf03
diff --git a/metadata/md5-cache/x11-misc/polybar-3.1.0 b/metadata/md5-cache/x11-misc/polybar-3.1.0
index 83608a8aa25f..f31095f51537 100644
--- a/metadata/md5-cache/x11-misc/polybar-3.1.0
+++ b/metadata/md5-cache/x11-misc/polybar-3.1.0
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install 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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) sys-devel/make >=dev-util/cmake-3.9.6
+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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) sys-devel/make >=dev-util/cmake-3.9.6
DESCRIPTION=A fast and easy-to-use tool for creating status bars
EAPI=6
HOMEPAGE=https://github.com/jaagr/polybar
IUSE=alsa curl i3wm ipc mpd network python_targets_python2_7
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=MIT
-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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools )
+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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools )
REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=https://github.com/jaagr/polybar/archive/3.1.0.tar.gz -> polybar-3.1.0.tar.gz https://github.com/jaagr/xpp/archive/1.4.0.tar.gz -> xpp-1.4.0.tar.gz https://github.com/jaagr/i3ipcpp/archive/v0.7.1.tar.gz -> i3ipcpp-0.7.1.tar.gz
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ce4a977c00acc1f6d1496277e1d0fd59
+_md5_=3fe0f5bf1ddc334a53b85447f2921afb
diff --git a/metadata/md5-cache/x11-misc/polybar-9999 b/metadata/md5-cache/x11-misc/polybar-9999
index 2507b8f04ace..c0de59e9ae3f 100644
--- a/metadata/md5-cache/x11-misc/polybar-9999
+++ b/metadata/md5-cache/x11-misc/polybar-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=A fast and easy-to-use tool for creating status bars
EAPI=6
HOMEPAGE=https://github.com/jaagr/polybar
IUSE=alsa curl i3wm ipc mpd network pulseaudio python_targets_python2_7
LICENSE=MIT
-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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
+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_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-base/xcb-proto x11-libs/cairo[xcb] x11-libs/libxcb[xkb] x11-libs/xcb-util-image x11-libs/xcb-util-wm x11-libs/xcb-util-xrm alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) i3wm? ( dev-libs/jsoncpp ) mpd? ( media-libs/libmpdclient ) network? ( net-wireless/wireless-tools ) pulseaudio? ( media-sound/pulseaudio )
REQUIRED_USE=python_targets_python2_7
SLOT=0
_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 git-r3 8f6de46b0aa318aea0e8cac62ece098b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 26fdbe5e685d53f67303a3a43d9e4848 python-utils-r1 ffa9c3284c6b07b8c9f7933911f63812 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a33fe599a82c2e634077cbe109292372
+_md5_=adad0588acbb4e303a996af2530921f1
diff --git a/metadata/md5-cache/x11-misc/rofi-1.5.0 b/metadata/md5-cache/x11-misc/rofi-1.5.0
deleted file mode 100644
index bc4ded8d847a..000000000000
--- a/metadata/md5-cache/x11-misc/rofi-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm virtual/pkgconfig x11-base/xorg-proto test? ( >=dev-libs/check-0.11 ) >=app-portage/elt-patches-20170422 !=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 window switcher, run dialog and dmenu replacement
-EAPI=6
-HOMEPAGE=https://github.com/DaveDavenport/rofi/
-IUSE=test windowmode
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
-SLOT=0
-SRC_URI=https://github.com/DaveDavenport/rofi//releases/download/1.5.0/rofi-1.5.0.tar.xz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=2ca6e9c84f8eea99226df012b1da4cbd
diff --git a/metadata/md5-cache/x11-misc/rofi-1.5.1 b/metadata/md5-cache/x11-misc/rofi-1.5.1
index 2b1550dc04d1..6e203bc4d1bf 100644
--- a/metadata/md5-cache/x11-misc/rofi-1.5.1
+++ b/metadata/md5-cache/x11-misc/rofi-1.5.1
@@ -4,10 +4,10 @@ DESCRIPTION=A window switcher, run dialog and dmenu replacement
EAPI=6
HOMEPAGE=https://github.com/DaveDavenport/rofi/
IUSE=test windowmode
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
LICENSE=MIT
RDEPEND=dev-libs/glib:2 gnome-base/librsvg:2 media-libs/freetype x11-libs/cairo[xcb] x11-libs/libXft x11-libs/libXinerama x11-libs/libxcb x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-wm x11-libs/xcb-util-xrm
SLOT=0
SRC_URI=https://github.com/DaveDavenport/rofi//releases/download/1.5.1/rofi-1.5.1.tar.xz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=25d023d6f52914e89968e3238f8c9134
+_md5_=007d548571723dcfc877efbe88b90f16
diff --git a/metadata/md5-cache/x11-misc/sddm-0.17.0-r3 b/metadata/md5-cache/x11-misc/sddm-0.17.0-r3
deleted file mode 100644
index 5e066f663fb2..000000000000
--- a/metadata/md5-cache/x11-misc/sddm-0.17.0-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtdeclarative-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower ) dev-python/docutils >=dev-qt/linguist-tools-5.6:5 kde-frameworks/extra-cmake-modules virtual/pkgconfig test? ( >=dev-qt/qttest-5.6:5 ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
-DESCRIPTION=Simple Desktop Display Manager
-EAPI=6
-HOMEPAGE=https://github.com/sddm/sddm
-IUSE=consolekit elogind +pam systemd test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain
-RDEPEND=>=dev-qt/qtcore-5.6:5 >=dev-qt/qtdbus-5.6:5 >=dev-qt/qtdeclarative-5.6:5 >=dev-qt/qtgui-5.6:5 >=dev-qt/qtnetwork-5.6:5 >=x11-base/xorg-server-1.15.1 x11-libs/libxcb[xkb] consolekit? ( >=sys-auth/consolekit-0.9.4 ) elogind? ( sys-auth/elogind ) pam? ( sys-libs/pam ) systemd? ( sys-apps/systemd:= ) !systemd? ( sys-power/upower )
-REQUIRED_USE=?? ( elogind systemd )
-SLOT=0
-SRC_URI=https://github.com/sddm/sddm/releases/download/v0.17.0/sddm-0.17.0.tar.gz
-_eclasses_=cmake-utils 57384a259cf0c7985ce651b2c0865405 desktop 1b286a7e7143d8c4ec89cd0d2743a097 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc flag-o-matic 5128c4729303400bd8d4b0b966530955 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils d2e7e7d290428bb25c56dcf2502badc1 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 04e50685fbf3d89e5c67ac6a385dd595 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils f2c8335407f0b935b0a96d4adf23ef25
-_md5_=26fe8fa5276fb350df84f3768163c244
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index a3a864241786..c42d1cf39680 100644
Binary files a/metadata/md5-cache/x11-plugins/Manifest.gz and b/metadata/md5-cache/x11-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-plugins/epplets-0.12 b/metadata/md5-cache/x11-plugins/epplets-0.12
deleted file mode 100644
index 3abe69cd7f87..000000000000
--- a/metadata/md5-cache/x11-plugins/epplets-0.12
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=x11-libs/libX11 x11-libs/libXext media-libs/freeglut media-libs/imlib2 >=x11-wm/enlightenment-0.16.4 virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Base files for Enlightenment epplets and some epplets
-EAPI=0
-HOMEPAGE=https://www.enlightenment.org/
-KEYWORDS=alpha amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext media-libs/freeglut media-libs/imlib2 >=x11-wm/enlightenment-0.16.4
-SLOT=0
-SRC_URI=mirror://sourceforge/enlightenment/epplets-0.12.tar.gz
-_md5_=fc369d13f60586241f6b378e0a84e0f5
diff --git a/metadata/md5-cache/x11-plugins/epplets-0.14 b/metadata/md5-cache/x11-plugins/epplets-0.14
deleted file mode 100644
index 31c57c1fc1f5..000000000000
--- a/metadata/md5-cache/x11-plugins/epplets-0.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=x11-libs/libX11 x11-libs/libXext media-libs/freeglut media-libs/imlib2 >=x11-wm/enlightenment-0.16.4 virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Base files for Enlightenment epplets and some epplets
-EAPI=4
-HOMEPAGE=https://www.enlightenment.org/
-IUSE=static-libs
-KEYWORDS=alpha amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext media-libs/freeglut media-libs/imlib2 >=x11-wm/enlightenment-0.16.4
-SLOT=0
-SRC_URI=mirror://sourceforge/enlightenment/epplets-0.14.tar.gz
-_md5_=532c9d757d120f2dc9df31a7dbf8d3e6
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 53ad06269f3c..9069edd58ca9 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/mlterm-3.8.0 b/metadata/md5-cache/x11-terms/mlterm-3.8.0
deleted file mode 100644
index 3887ed097de3..000000000000
--- a/metadata/md5-cache/x11-terms/mlterm-3.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo[X(+)] ) canna? ( app-i18n/canna ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) xft? ( x11-libs/libXft ) virtual/pkgconfig nls? ( sys-devel/gettext )
-DESCRIPTION=A multi-lingual terminal emulator
-EAPI=6
-HOMEPAGE=http://mlterm.sourceforge.net/
-IUSE=bidi cairo canna debug fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft
-KEYWORDS=amd64 ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo[X(+)] ) canna? ( app-i18n/canna ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) xft? ( x11-libs/libXft )
-REQUIRED_USE=gtk2? ( gtk )
-SLOT=0
-SRC_URI=mirror://sourceforge/mlterm/mlterm-3.8.0.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=402984881ddff4951ca4415349610608
diff --git a/metadata/md5-cache/x11-terms/mlterm-3.8.6 b/metadata/md5-cache/x11-terms/mlterm-3.8.6
new file mode 100644
index 000000000000..d95a3cda1a2c
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/mlterm-3.8.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty ) cairo? ( x11-libs/cairo[X(+)] ) canna? ( app-i18n/canna ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland ) xft? ( x11-libs/libXft ) virtual/pkgconfig nls? ( sys-devel/gettext )
+DESCRIPTION=A multi-lingual terminal emulator
+EAPI=6
+HOMEPAGE=http://mlterm.sourceforge.net/
+IUSE=bidi brltty cairo canna debug fbcon fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=x11-libs/libICE x11-libs/libSM x11-libs/libX11 bidi? ( dev-libs/fribidi ) brltty? ( app-accessibility/brltty ) cairo? ( x11-libs/cairo[X(+)] ) canna? ( app-i18n/canna ) fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) gtk? ( gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3 ) ) harfbuzz? ( media-libs/harfbuzz[truetype(+)] ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) nls? ( virtual/libintl ) regis? ( || ( media-libs/sdl-ttf media-libs/sdl2-ttf ) ) scim? ( app-i18n/scim ) skk? ( || ( virtual/skkserv app-i18n/skk-jisyo ) ) uim? ( app-i18n/uim ) utempter? ( sys-libs/libutempter ) wayland? ( dev-libs/wayland ) xft? ( x11-libs/libXft )
+REQUIRED_USE=gtk2? ( gtk )
+SLOT=0
+SRC_URI=mirror://sourceforge/mlterm/mlterm-3.8.6.tar.gz
+_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=d6e2005e90d438696ad0454f8fe61b32
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index b2d1700e500c..3ef7f6f7757e 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/enlightenment-0.16.9999 b/metadata/md5-cache/x11-wm/enlightenment-0.16.9999
deleted file mode 100644
index bbce8ab2447e..000000000000
--- a/metadata/md5-cache/x11-wm/enlightenment-0.16.9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=pulseaudio? ( media-sound/pulseaudio ) dbus? ( sys-apps/dbus ) pango? ( x11-libs/pango ) =media-libs/freetype-2* >=media-libs/imlib2-1.3.0[X] x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXxf86vm x11-libs/libXft xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender x11-misc/xbitmaps xinerama? ( x11-libs/libXinerama ) xcomposite? ( x11-libs/libXcomposite ) nls? ( virtual/libintl ) virtual/libiconv virtual/pkgconfig x11-base/xorg-proto nls? ( sys-devel/gettext ) || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync >=app-portage/elt-patches-20170422 !=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=Enlightenment Window Manager (e16)
-EAPI=5
-HOMEPAGE=https://www.enlightenment.org/
-IUSE=dbus doc nls pango pulseaudio xcomposite xinerama xrandr
-LICENSE=BSD
-PDEPEND=doc? ( app-doc/edox-data )
-RDEPEND=pulseaudio? ( media-sound/pulseaudio ) dbus? ( sys-apps/dbus ) pango? ( x11-libs/pango ) =media-libs/freetype-2* >=media-libs/imlib2-1.3.0[X] x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXxf86vm x11-libs/libXft xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender x11-misc/xbitmaps xinerama? ( x11-libs/libXinerama ) xcomposite? ( x11-libs/libXcomposite ) nls? ( virtual/libintl ) virtual/libiconv
-SLOT=0
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc libtool 0081a71a261724730ec4c248494f044d ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 subversion a5d5826a85609611f098c0553eb24cc1 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93b17554e92f41c92f5f40e71d003766
diff --git a/metadata/md5-cache/x11-wm/enlightenment-1.0.17 b/metadata/md5-cache/x11-wm/enlightenment-1.0.17
deleted file mode 100644
index 4f5c9e22c8c3..000000000000
--- a/metadata/md5-cache/x11-wm/enlightenment-1.0.17
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=pulseaudio? ( media-sound/pulseaudio ) dbus? ( sys-apps/dbus ) pango? ( x11-libs/pango ) =media-libs/freetype-2* >=media-libs/imlib2-1.3.0[X] x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXxf86vm x11-libs/libXft xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender x11-misc/xbitmaps xinerama? ( x11-libs/libXinerama ) xcomposite? ( x11-libs/libXcomposite ) nls? ( virtual/libintl ) virtual/libiconv virtual/pkgconfig x11-base/xorg-proto nls? ( sys-devel/gettext )
-DESCRIPTION=Enlightenment Window Manager (e16)
-EAPI=5
-HOMEPAGE=https://www.enlightenment.org/
-IUSE=dbus doc nls pango pulseaudio xcomposite xinerama xrandr
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86
-LICENSE=BSD
-PDEPEND=doc? ( app-doc/edox-data )
-RDEPEND=pulseaudio? ( media-sound/pulseaudio ) dbus? ( sys-apps/dbus ) pango? ( x11-libs/pango ) =media-libs/freetype-2* >=media-libs/imlib2-1.3.0[X] x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXxf86vm x11-libs/libXft xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender x11-misc/xbitmaps xinerama? ( x11-libs/libXinerama ) xcomposite? ( x11-libs/libXcomposite ) nls? ( virtual/libintl ) virtual/libiconv
-SLOT=0
-SRC_URI=mirror://sourceforge/enlightenment/e16-1.0.17.tar.gz
-_eclasses_=desktop 1b286a7e7143d8c4ec89cd0d2743a097 epatch 9a5f039771f143195164a15a4faa41a1 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 5b8ce72259e08104b337fe28c6de5dbc ltprune 607e058da37aa6dabfa408b7d61da72e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=00b01b6a684a8d1a093a62a6eaba646c
diff --git a/metadata/md5-cache/x11-wm/i3-gaps-4.15.0.1 b/metadata/md5-cache/x11-wm/i3-gaps-4.15.0.1
index b8bb314a4a28..e0613e8be4d5 100644
--- a/metadata/md5-cache/x11-wm/i3-gaps-4.15.0.1
+++ b/metadata/md5-cache/x11-wm/i3-gaps-4.15.0.1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/ca
DESCRIPTION=i3 fork with gaps and some more features
EAPI=6
HOMEPAGE=https://github.com/Airblader/i3
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=dev-libs/glib:2 dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/cairo[X,xcb] x11-libs/libxcb[xkb] x11-libs/libxkbcommon[X] x11-libs/pango[X] x11-libs/startup-notification x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm x11-libs/xcb-util-xrm dev-lang/perl dev-perl/AnyEvent-I3 dev-perl/JSON-XS !x11-wm/i3
SLOT=0
SRC_URI=https://github.com/Airblader/i3/archive/4.15.0.1.tar.gz -> i3-gaps-4.15.0.1.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 eapi7-ver d97a56a62c7df8614afddcb25f5ff00f libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs 1e35303c63cd707f6c3422b4493d5607
-_md5_=7ff422c3a616a9f7772e25172f3d12a3
+_md5_=f7375cc891070bd626291160afd5f63f
diff --git a/metadata/news/2018-06-23-mpfr-4-update/2018-06-23-mpfr-4-update.en.txt b/metadata/news/2018-06-23-mpfr-4-update/2018-06-23-mpfr-4-update.en.txt
new file mode 100644
index 000000000000..a93df9a5a11f
--- /dev/null
+++ b/metadata/news/2018-06-23-mpfr-4-update/2018-06-23-mpfr-4-update.en.txt
@@ -0,0 +1,29 @@
+Title: dev-libs/mpfr 4 upgrade
+Author: Matthias Maier
+Posted: 2018-06-23
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: =dev-libs/mpfr-4" dev-libs/mpc sys-devel/gcc
+
+Detailed explanation:
+
+libmpfr.so is used by libmpc.so (provided by dev-libs/mpc), as well as by
+internal executables (e.g. cc1, cc1plus) of sys-devel/gcc. Appropriate
+subslots in mpfr and slot-operators in dependencies in mpc and gcc will
+cause a rebuild of mpc and gcc after an upgrade of mpfr.
+
+However, after mpfr-4 is installed and mpc rebuiltd, but *before* gcc is
+rebuilt, gcc will be in an inconsistent state wherein symbols from
+incorrect library versions of mpfr might get used. This can result in
+segfaults and internal compiler errors. It is therefore important to
+rebuild gcc immmediately after mpc.
+
+A detailed update guide with troubleshoot section can be found on the wiki:
+https://wiki.gentoo.org/wiki/Mpfr4-update-guide
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index b49d3b71ed28..a931a298db67 100644
Binary files a/metadata/news/Manifest.files.gz and b/metadata/news/Manifest.files.gz differ
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index ad20d6303102..2666ef35ee96 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Fri, 22 Jun 2018 09:08:30 +0000
+Sun, 24 Jun 2018 11:08:31 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 62e944283032..24ac9f129cfe 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-226f7edc8ca431f523e014cfc98751780ec0994c 1527006439 2018-05-22T16:27:19+00:00
+ed081df12a0fbb5ee39bb148e692a625bd8a4317 1529779852 2018-06-23T18:50:52+00:00
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 93e31da0de54..9953d8f971ec 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -3167,7 +3167,7 @@ developers and volunteer mentors.
amynka@gentoo.org
Amy Liffey
- Developer
+ Lead
creffett@gentoo.org
@@ -3192,7 +3192,7 @@ developers and volunteer mentors.
pinkbyte@gentoo.org
Sergey Popov
- Lead
+ Developer
soap@gentoo.org
diff --git a/metadata/timestamp b/metadata/timestamp
index 06083b920885..407da618fc90 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Fri Jun 22 09:08:30 UTC 2018
+Sun Jun 24 11:08:30 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1d7958b08b00..5c1377e9e8aa 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 22 Jun 2018 09:30:01 +0000
+Sun, 24 Jun 2018 11:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 963b36d6d20b..79f3af6bb30d 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f522894fea466602465267ac23c346548a5d64d6 1529658128 2018-06-22T09:02:08+00:00
+103a534b09bc410cbede796cd8bc3bc39c560768 1529837645 2018-06-24T10:54:05+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0914834defe3..ae336c9462fc 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1529658301 Fri 22 Jun 2018 09:05:01 AM UTC
+1529838301 Sun 24 Jun 2018 11:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index ad20d6303102..28aa288d647a 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Fri, 22 Jun 2018 09:08:30 +0000
+Sun, 24 Jun 2018 11:08:30 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index c338aaf09786..b02e86f83079 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild b/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild
index 1efe5233391c..842feac3a0a4 100644
--- a/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.10.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/tarball/${PV} -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
IUSE="selinux systemd"
# TODO support ipfw and ipfilter
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 6bd1ee96f5ae..f051a22305cf 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -1,3 +1,4 @@
DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 537d49ecf28b457fbc1e24eaaa9c5d9e8c4db59ed69c91a573c0cacb6cfb6fd2d52c31e87c0cef34b81a69247bb5b9513983d95e7eae3ea7f861742da485d2d4 SHA512 588292a95342cb2d95d7b58f70442b82b99a23dd9fdc1390e9ae0743626a047e5127d77b1d7e6a1d8edd6f34a425e581bcd42459b673a0ddea14125bde4b7d9e
DIST nagios-4.3.4.tar.gz 11101966 BLAKE2B 6cb8182f40a4f83875c94df040bb1c62ce078d4130e10fa8595ea0b14cf715fc2a237ffb34199da9c1528e4789f3ce8deae3d993b5b795ad712d48b1e5fdb820 SHA512 f4e92aa98151739442a225a245871d93b5560d89510bdacb1a615959b9687f7a92675f10fcba71078b104ca8f237b0155a9261d67ec66f80aec7f033b4b3e316
+DIST nagios-4.4.0.tar.gz 11295727 BLAKE2B f89e7934b13814ec8c0ae7a19f14eed8842c7b0044fb2812f1399f27a82e5a639b63cc53f04b58ae99aa87bf595b2e25642ad3eb134a041e39f744919bd46d2f SHA512 8c136463133cf26c756ccd39b158ed417297e30f8a0b12d063a4dba6a43f126b27bb5f7ea962c8cde9fb9c1fd8d3439d7cfeaab833045315a9800c993fa0676f
DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
new file mode 100644
index 000000000000..ec0577881b03
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.0.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs user
+
+MY_P=${PN/-core}-${PV}
+DESCRIPTION="Nagios core - monitoring daemon, web GUI, and documentation"
+HOMEPAGE="https://www.nagios.org/"
+
+# The name of the directory into which our Gentoo icons will be
+# extracted, and also the basename of the archive containing it.
+GENTOO_ICONS="${PN}-gentoo-icons-20141125"
+SRC_URI="mirror://sourceforge/nagios/${MY_P}.tar.gz
+ web? ( https://dev.gentoo.org/~mjo/distfiles/${GENTOO_ICONS}.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="apache2 classicui lighttpd perl +web vim-syntax"
+
+# In pkg_postinst(), we change the group of the Nagios configuration
+# directory to that of the web server user. It can't belong to both
+# apache/lighttpd groups at the same time, so we block this combination
+# for our own sanity.
+#
+# This could be made to work, but we would need a better way to allow
+# the web user read-only access to Nagios's configuration directory.
+#
+REQUIRED_USE="apache2? ( !lighttpd )"
+
+# sys-devel/libtool dependency is bug #401237.
+#
+# Note, we require one of the apache2 CGI modules:
+#
+# * mod_cgi
+# * mod_cgid
+# * mod_fcgid
+#
+# We just don't care /which/ one. And of course PHP supports both CGI
+# (USE=cgi) and FastCGI (USE=fpm). We're pretty lenient with the
+# dependencies, and expect the user not to do anything /too/
+# stupid. (For example, installing Apache with only FastCGI support, and
+# PHP with only CGI support.)
+#
+# Another annoyance is that the upstream Makefile uses app-arch/unzip to
+# extract a snapshot of AngularJS, but that's only needed when USE=web.
+#
+MOD_ALIAS=apache2_modules_alias
+DEPEND="sys-devel/libtool
+ virtual/mailx
+ perl? ( dev-lang/perl:= )
+ web? (
+ app-arch/unzip
+ media-libs/gd[jpeg,png]
+ lighttpd? ( www-servers/lighttpd[php] )
+ apache2? (
+ || (
+ >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgi]
+ >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_cgid]
+ >=www-servers/apache-2.4[${MOD_ALIAS},apache2_modules_fcgid] )
+ || (
+ dev-lang/php:*[apache2]
+ dev-lang/php:*[cgi]
+ dev-lang/php:*[fpm] )
+ )
+ )"
+RDEPEND="${DEPEND}
+ vim-syntax? ( app-vim/nagios-syntax )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ enewgroup nagios
+ enewuser nagios -1 /bin/bash /var/nagios/home nagios
+}
+
+src_configure() {
+ local myconf
+
+ if use perl; then
+ myconf="${myconf} --enable-embedded-perl --with-perlcache"
+ fi
+
+ if use !apache2 && use !lighttpd ; then
+ myconf="${myconf} --with-command-group=nagios"
+ else
+ if use apache2 ; then
+ myconf="${myconf} --with-command-group=apache"
+ myconf="${myconf} --with-httpd-conf=/etc/apache2/conf.d"
+ elif use lighttpd ; then
+ myconf="${myconf} --with-command-group=lighttpd"
+ fi
+ fi
+
+ econf ${myconf} \
+ --prefix=/usr \
+ --bindir=/usr/sbin \
+ --sbindir=/usr/$(get_libdir)/nagios/cgi-bin \
+ --datadir=/usr/share/nagios/htdocs \
+ --localstatedir=/var/nagios \
+ --sysconfdir=/etc/nagios \
+ --libexecdir=/usr/$(get_libdir)/nagios/plugins
+}
+
+src_compile() {
+ emake CC=$(tc-getCC) nagios
+
+ if use web; then
+ # Only compile the CGIs/HTML when USE=web is set.
+ emake CC=$(tc-getCC) DESTDIR="${D}" cgis html
+ fi
+}
+
+src_install() {
+ dodoc Changelog CONTRIBUTING.md README.md THANKS UPGRADING
+
+ # There is no way to install the CGIs unstripped from the top-level
+ # makefile, so descend into base/ here. The empty INSTALL_OPTS
+ # ensures that root:root: owns the nagios executables.
+ cd "${S}/base" || die
+ emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+ cd "${S}" || die
+
+ # Otherwise this gets installed as 770 and you get "access denied"
+ # for some reason or other when starting nagios. The permissions
+ # on nagiostats are just for consistency (these should both get
+ # fixed upstream).
+ fperms 775 /usr/sbin/nagios /usr/sbin/nagiostats
+
+ # INSTALL_OPTS are needed for most of install-basic, but we don't
+ # want them on the LIBEXECDIR, argh.
+ emake DESTDIR="${D}" install-basic
+ fowners root:root /usr/$(get_libdir)/nagios/plugins
+
+ # Don't make the configuration owned by the nagios user, because
+ # then he can edit nagios.cfg and trick nagios into running as root
+ # and doing his bidding.
+ emake INSTALL_OPTS="" DESTDIR="${D}" install-config
+
+ # No INSTALL_OPTS used in install-commandmode, thankfully.
+ emake DESTDIR="${D}" install-commandmode
+
+ if use web; then
+ # There is no way to install the CGIs unstripped from the
+ # top-level makefile, so descend into cgi/ here. The empty
+ # INSTALL_OPTS ensures that root:root: owns the CGI executables.
+ cd "${S}/cgi" || die
+ emake INSTALL_OPTS="" DESTDIR="${D}" install-unstripped
+ cd "${S}" || die
+
+ # install-html installs the new exfoliation theme
+ emake INSTALL_OPTS="" DESTDIR="${D}" install-html
+
+ if use classicui; then
+ # This overwrites the already-installed exfoliation theme
+ emake INSTALL_OPTS="" DESTDIR="${D}" install-classicui
+ fi
+
+ # Install cute Gentoo icons (bug #388323), setting their
+ # owner, group, and mode to match those of the rest of Nagios's
+ # images.
+ insinto /usr/share/nagios/htdocs/images/logos
+ doins "${WORKDIR}/${GENTOO_ICONS}"/*.*
+ fi
+
+ newinitd startup/openrc-init nagios
+
+ if use web ; then
+ if use apache2 ; then
+ # Install the Nagios configuration file for Apache.
+ insinto "/etc/apache2/modules.d"
+ doins "${FILESDIR}"/99_nagios4.conf
+ elif use lighttpd ; then
+ # Install the Nagios configuration file for Lighttpd.
+ insinto /etc/lighttpd
+ newins "${FILESDIR}/lighttpd_nagios4.conf" nagios.conf
+ else
+ ewarn "${CATEGORY}/${PF} only supports apache or lighttpd"
+ ewarn "out of the box. Since you are not using one of them, you"
+ ewarn "will have to configure your webserver yourself."
+ fi
+ fi
+}
+
+pkg_postinst() {
+
+ if use web; then
+ if use apache2 || use lighttpd ; then
+ if use apache2; then
+ elog "To enable the Nagios web front-end, please edit"
+ elog "${ROOT}etc/conf.d/apache2 and add \"-D NAGIOS -D PHP\""
+ elog "to APACHE2_OPTS. Then Nagios will be available at,"
+ elog
+ elif use lighttpd; then
+ elog "To enable the Nagios web front-end, please add"
+ elog "'include \"nagios.conf\"' to the lighttpd configuration"
+ elog "file at ${ROOT}etc/lighttpd/lighttpd.conf. Then Nagios"
+ elog "will be available at,"
+ elog
+ fi
+
+ elog " http://localhost/nagios/"
+ fi
+ fi
+
+ elog
+ elog "If your kernel has /proc protection, nagios"
+ elog "will not be happy as it relies on accessing the proc"
+ elog "filesystem. You can fix this by adding nagios into"
+ elog "the group wheel, but this is not recomended."
+ elog
+}
diff --git a/net-analyzer/nagios/nagios-4.4.0.ebuild b/net-analyzer/nagios/nagios-4.4.0.ebuild
new file mode 100644
index 000000000000..a29da55bee71
--- /dev/null
+++ b/net-analyzer/nagios/nagios-4.4.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="The Nagios metapackage"
+HOMEPAGE="https://www.nagios.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="~net-analyzer/nagios-core-${PV}
+ || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )"
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 32687bbfbe78..a22b696d9c02 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/ppp/ppp-2.4.7-r6.ebuild b/net-dialup/ppp/ppp-2.4.7-r6.ebuild
index ed2dfd4c8c2e..b60a527f75cb 100644
--- a/net-dialup/ppp/ppp-2.4.7-r6.ebuild
+++ b/net-dialup/ppp/ppp-2.4.7-r6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://download.samba.org/pub/ppp/${P}.tar.gz
LICENSE="BSD GPL-2"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
DEPEND="activefilter? ( net-libs/libpcap )
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index adddf21d6e5a..80138b96fde8 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/samba/samba-4.5.16.ebuild b/net-fs/samba/samba-4.5.16.ebuild
index 7c80d9db44e7..507d6554595d 100644
--- a/net-fs/samba/samba-4.5.16.ebuild
+++ b/net-fs/samba/samba-4.5.16.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
+HOMEPAGE="https://www.samba.org/"
LICENSE="GPL-3"
SLOT="0"
@@ -288,7 +288,7 @@ pkg_postinst() {
ewarn "controller work previously known as 'samba4'."
elog "For further information and migration steps make sure to read "
- elog "http://samba.org/samba/history/${P}.html "
- elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
- elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+ elog "https://samba.org/samba/history/${P}.html "
+ elog "https://samba.org/samba/history/${PN}-4.5.0.html and"
+ elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
}
diff --git a/net-fs/samba/samba-4.6.15.ebuild b/net-fs/samba/samba-4.6.15.ebuild
index 5cb08f5d799b..f45ae5e7a916 100644
--- a/net-fs/samba/samba-4.6.15.ebuild
+++ b/net-fs/samba/samba-4.6.15.ebuild
@@ -19,7 +19,7 @@ SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz
KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
+HOMEPAGE="https://www.samba.org/"
LICENSE="GPL-3"
SLOT="0"
@@ -310,7 +310,7 @@ pkg_postinst() {
ewarn "controller work previously known as 'samba4'."
elog "For further information and migration steps make sure to read "
- elog "http://samba.org/samba/history/${P}.html "
- elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
- elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+ elog "https://samba.org/samba/history/${P}.html "
+ elog "https://samba.org/samba/history/${PN}-4.5.0.html and"
+ elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
}
diff --git a/net-fs/samba/samba-4.7.7.ebuild b/net-fs/samba/samba-4.7.7.ebuild
index 6a4a386e8bae..70a7a8aa61e8 100644
--- a/net-fs/samba/samba-4.7.7.ebuild
+++ b/net-fs/samba/samba-4.7.7.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
+HOMEPAGE="https://www.samba.org/"
LICENSE="GPL-3"
SLOT="0"
@@ -313,7 +313,7 @@ pkg_postinst() {
ewarn "controller work previously known as 'samba4'."
elog "For further information and migration steps make sure to read "
- elog "http://samba.org/samba/history/${P}.html "
- elog "http://samba.org/samba/history/${PN}-4.5.0.html and"
- elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+ elog "https://samba.org/samba/history/${P}.html "
+ elog "https://samba.org/samba/history/${PN}-4.5.0.html and"
+ elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
}
diff --git a/net-fs/samba/samba-4.8.2.ebuild b/net-fs/samba/samba-4.8.2.ebuild
index cd603d27bdea..eb9a466868e3 100644
--- a/net-fs/samba/samba-4.8.2.ebuild
+++ b/net-fs/samba/samba-4.8.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
KEYWORDS="~amd64 ~arm64 ~hppa ~x86"
DESCRIPTION="Samba Suite Version 4"
-HOMEPAGE="http://www.samba.org/"
+HOMEPAGE="https://www.samba.org/"
LICENSE="GPL-3"
SLOT="0"
@@ -281,6 +281,6 @@ pkg_postinst() {
ewarn "controller work previously known as 'samba4'."
elog "For further information and migration steps make sure to read "
- elog "http://samba.org/samba/history/${P}.html "
- elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+ elog "https://samba.org/samba/history/${P}.html "
+ elog "https://wiki.samba.org/index.php/Samba4/HOWTO "
}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 7c99bb7c5829..910d27ad659c 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/choqok/metadata.xml b/net-im/choqok/metadata.xml
index 468d03a98f06..fd48455d9707 100644
--- a/net-im/choqok/metadata.xml
+++ b/net-im/choqok/metadata.xml
@@ -6,7 +6,7 @@
Gentoo KDE Project
- Build Open Collaboration Services plugin using dev-libs/libattica
+ Build Open Collaboration Services plugin using kde-frameworks/attica
Build Konqueror Choqok plugin
Enable support for the real-time communication framework telepathy
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index b14ebc0a24b4..a2969975b31c 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1 +1 @@
-DIST signal-desktop_1.12.0_amd64.deb 65766890 BLAKE2B 2be9046bc3da1ef12784181640919b2082f9f1c818683201c8c2c2996033d9851497617ec5bf3e5614d00dc9526d0b9af3a0c731ef89ffdc48f18715f01412ef SHA512 306de244ce1f121432ac6c83ae1dc8ad170dfaf2ecc384aa16c3d80fa06febf07504d63391ae8f81309ead5d43dd60f61eb4b4a2bb7ea2f78e284425d6f11ead
+DIST signal-desktop_1.13.0_amd64.deb 65702626 BLAKE2B bbe0cf058e98f587c1c828170d287a4c796e9638b921a0a5e33a6cf0a6031977366e240bd72a339620ce65f3bcd624ab49616d75ea30a51251dbe7b624d2e419 SHA512 396a918b4a078ca8511917664a4ef4c0fedf042e44099a4801e1607c8c4f1a5ec01ac50dc39e32b3b7de62482b75842d906318a56c4413a2efcadacf6e8151cb
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.12.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.13.0.ebuild
similarity index 100%
rename from net-im/signal-desktop-bin/signal-desktop-bin-1.12.0.ebuild
rename to net-im/signal-desktop-bin/signal-desktop-bin-1.13.0.ebuild
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 70a8b7aaf5fa..1f2fd7084674 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/aqbanking/aqbanking-5.7.8.ebuild b/net-libs/aqbanking/aqbanking-5.7.8.ebuild
index 0093d5905e92..ec6994a53840 100644
--- a/net-libs/aqbanking/aqbanking-5.7.8.ebuild
+++ b/net-libs/aqbanking/aqbanking-5.7.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.aquamaniac.de/sites/download/download.php?package=03&releas
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="chipcard debug doc ebics examples gtk ofx"
RDEPEND="
diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index cdc907e70d60..045a5eb7521c 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1 +1,2 @@
DIST gloox-1.0.20.tar.bz2 701114 BLAKE2B d86b4de05a040b4f7fe1200d5863514778197e7e13ee08ebe983a85255065045c47b322ba20fa4ea051049ce609f122c00374cc3188f46c8729ec904da7778eb SHA512 b94269487875ae32631b5b15eeebe3293c6b8ab4080a6e15926c575305841a609a5e4da25bff266806ef4b65c1db14e9a9e5dabf8af8b174773cbdc37cfa12f8
+DIST gloox-1.0.21.tar.bz2 716449 BLAKE2B 9728b137b088e3ebd067dd88688474e37ec27108cc87ffe6d2d78b206c3215f36c072e333d04c659e5dc9db43c330bcac7ee7f495208bd8df1bbeb72db1e0792 SHA512 ee2c180e6a6e05955707fdd3e790c4c0e7be46fdf071201abd081b8620e3f664045f000804e1a30bddf8a3324e90f211ce5ee870fd5330ab87979dedfeb45575
diff --git a/net-libs/gloox/gloox-1.0.21.ebuild b/net-libs/gloox/gloox-1.0.21.ebuild
new file mode 100644
index 000000000000..f2fe910d22e6
--- /dev/null
+++ b/net-libs/gloox/gloox-1.0.21.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_/-}"
+DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
+HOMEPAGE="https://camaya.net/gloox/"
+SRC_URI="https://camaya.net/download/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0/17"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~ia64 ~sparc ~x86"
+IUSE="debug gnutls idn libressl ssl static-libs test zlib"
+
+DEPEND="idn? ( net-dns/libidn:= )
+ gnutls? ( net-libs/gnutls )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl )
+ )
+ zlib? ( sys-libs/zlib )"
+
+RDEPEND="${DEPEND}"
+
+# GnuTLS checks hang forever
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ # Examples are not installed anyway, so - why should we build them?
+ local myeconfargs=(
+ --without-examples
+ $(usex debug "--enable-debug" '')
+ $(use_enable static-libs static)
+ $(use_with idn libidn)
+ $(use_with gnutls)
+ $(use_with ssl openssl)
+ $(use_with test tests)
+ $(use_with zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+ find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/net-libs/libnsl/libnsl-1.2.0.ebuild b/net-libs/libnsl/libnsl-1.2.0.ebuild
index 3d2e8430509b..ca4d27b79518 100644
--- a/net-libs/libnsl/libnsl-1.2.0.ebuild
+++ b/net-libs/libnsl/libnsl-1.2.0.ebuild
@@ -13,7 +13,7 @@ SLOT="0/2"
LICENSE="LGPL-2.1+"
# Stabilize together with glibc-2.26!
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
IUSE=""
diff --git a/net-libs/mbedtls/mbedtls-2.10.0.ebuild b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
index 761238bca7bf..460a6ad7601c 100644
--- a/net-libs/mbedtls/mbedtls-2.10.0.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.10.0.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
LICENSE="Apache-2.0"
SLOT="0/10" # slot for libmbedtls.so
-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="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
RDEPEND="
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
index d2900ad6c89f..d4989038def7 100644
--- a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="LGPL-2.1+ BSD"
-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=""
RDEPEND="!
+Date: Thu, 21 Jun 2018 09:46:43 +0300
+Subject: Fix endianness bug in string to IP conversion
+
+* libmailutils/cidr/fromsa.c (_mu_inaddr_to_bytes)
+(_mu_sockaddr_to_bytes): Fix improper endianness conversion.
+* libmailutils/cidr/tosa.c (mu_cidr_to_sockaddr): Simplify conversion.
+---
+ libmailutils/cidr/fromsa.c | 45 ++++++++++++++++++++-------------------------
+ libmailutils/cidr/tosa.c | 9 ++-------
+ 2 files changed, 22 insertions(+), 32 deletions(-)
+
+diff --git a/libmailutils/cidr/fromsa.c b/libmailutils/cidr/fromsa.c
+index f57aadc..39d24fd 100644
+--- a/libmailutils/cidr/fromsa.c
++++ b/libmailutils/cidr/fromsa.c
+@@ -29,55 +29,50 @@
+ #include
+ #include
+
+-static void
+-uint32_to_bytes (unsigned char *bytes, uint32_t u)
+-{
+- int i;
+-
+- for (i = 0; i < 4; i++)
+- {
+- bytes[i] = u & 0xff;
+- u >>= 8;
+- }
+-}
+-
+ int
+ _mu_inaddr_to_bytes (int af, void *buf, unsigned char *bytes)
+ {
+- uint32_t u;
++ size_t len;
+
+ switch (af)
+ {
+ case AF_INET:
+- memcpy (&u, buf, sizeof u);
+- uint32_to_bytes (bytes, u);
+- return 4;
+-
++ len = 4;
++ break;
++
+ #ifdef MAILUTILS_IPV6
+ case AF_INET6:
+- memcpy (bytes, buf, 16);
+- return 16;
++ len = 16;
++ break;
+ #endif
++
++ default:
++ len = 0;
+ }
+- return 0;
++ memcpy (bytes, buf, len);
++ return len;
+ }
+
+ int
+ _mu_sockaddr_to_bytes (unsigned char *bytes, struct sockaddr const *sa)
+ {
++ void *buf;
+ switch (sa->sa_family)
+ {
+ case AF_INET:
+- uint32_to_bytes (bytes, ((struct sockaddr_in*)sa)->sin_addr.s_addr);
+- return 4;
++ buf = &(((struct sockaddr_in*)sa)->sin_addr.s_addr);
++ break;
+
+ #ifdef MAILUTILS_IPV6
+ case AF_INET6:
+- memcpy (bytes, &((struct sockaddr_in6*)sa)->sin6_addr, 16);
+- return 16;
++ buf = &(((struct sockaddr_in6*)sa)->sin6_addr);
++ break;
+ #endif
++
++ default:
++ return 0;
+ }
+- return 0;
++ return _mu_inaddr_to_bytes (sa->sa_family, buf, bytes);
+ }
+
+ int
+diff --git a/libmailutils/cidr/tosa.c b/libmailutils/cidr/tosa.c
+index 33715e1..2b372b1 100644
+--- a/libmailutils/cidr/tosa.c
++++ b/libmailutils/cidr/tosa.c
+@@ -42,19 +42,14 @@ mu_cidr_to_sockaddr (struct mu_cidr *cidr, struct sockaddr **psa)
+ } addr;
+ struct sockaddr *sa;
+ int socklen;
+- int i;
+-
++
+ memset (&addr, 0, sizeof (addr));
+ addr.sa.sa_family = cidr->family;
+ switch (cidr->family)
+ {
+ case AF_INET:
+ socklen = sizeof (addr.s_in);
+- for (i = 0; i < cidr->len; i++)
+- {
+- addr.s_in.sin_addr.s_addr <<= 8;
+- addr.s_in.sin_addr.s_addr |= cidr->address[i];
+- }
++ memcpy (&addr.s_in.sin_addr.s_addr, cidr->address, 4);
+ break;
+
+ #ifdef MAILUTILS_IPV6
+--
+cgit v1.0-41-gc330
+
diff --git a/net-mail/mailutils/mailutils-3.4-r2.ebuild b/net-mail/mailutils/mailutils-3.4-r2.ebuild
new file mode 100644
index 000000000000..f7d379b8b042
--- /dev/null
+++ b/net-mail/mailutils/mailutils-3.4-r2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools eutils flag-o-matic python-single-r1 toolchain-funcs
+
+DESCRIPTION="A useful collection of mail servers, clients, and filters"
+HOMEPAGE="https://www.gnu.org/software/mailutils/mailutils.html"
+SRC_URI="mirror://gnu/mailutils/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="berkdb bidi +clients gdbm sasl guile ipv6 kerberos kyotocabinet ldap \
+ mysql nls pam postgres python servers ssl static-libs +threads tcpd \
+ tokyocabinet"
+
+RDEPEND="!mail-client/nmh
+ !mail-filter/libsieve
+ !mail-client/mailx
+ !mail-client/nail
+ sys-libs/ncurses:=
+ sys-libs/readline:=
+ dev-libs/libltdl:0
+ virtual/mta
+ berkdb? ( sys-libs/db:= )
+ bidi? ( dev-libs/fribidi )
+ gdbm? ( sys-libs/gdbm )
+ guile? ( dev-scheme/guile:12/22 )
+ kerberos? ( virtual/krb5 )
+ kyotocabinet? ( dev-db/kyotocabinet )
+ ldap? ( net-nds/openldap )
+ mysql? ( virtual/mysql )
+ nls? ( sys-devel/gettext )
+ pam? ( virtual/pam )
+ postgres? ( dev-db/postgresql:= )
+ python? ( ${PYTHON_DEPS} )
+ sasl? ( virtual/gsasl )
+ ssl? ( net-libs/gnutls:= )
+ tcpd? ( sys-apps/tcp-wrappers )
+ tokyocabinet? ( dev-db/tokyocabinet )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+ servers? ( tcpd )"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # Disable bytecompilation of Python modules.
+ echo "#!/bin/sh" > build-aux/py-compile
+ eapply "${FILESDIR}/${P}-MH-testsuite.patch" \
+ "${FILESDIR}/${P}-fix-endianness.patch"
+ # add missing tests so that make check doesn't fail
+ cp "${FILESDIR}"/{hdr,nohdr,twomsg,weed}.at "${S}"/readmsg/tests || die
+ if use mysql; then
+ sed -i -e /^INCLUDES/"s:$:$(mysql_config --include):" \
+ sql/Makefile.am || die
+ fi
+ eapply_user
+ eautoreconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+
+ # maildir is the Gentoo default
+ econf MU_DEFAULT_SCHEME=maildir \
+ CURSES_LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" \
+ $(use_with berkdb berkeley-db) \
+ $(use_with bidi fribidi) \
+ $(use_enable ipv6) \
+ $(use_with gdbm) \
+ $(use_with sasl gsasl) \
+ $(use_with guile) \
+ $(use_with kerberos gssapi) \
+ $(use_with ldap) \
+ $(use_with mysql) \
+ $(use_enable nls) \
+ $(use_enable pam) \
+ $(use_with postgres) \
+ $(use_enable python) \
+ $(use_with ssl gnutls) \
+ $(use_enable static-libs static) \
+ $(use_enable threads pthread) \
+ $(use_with tokyocabinet) \
+ $(use_with kyotocabinet) \
+ $(use_with tcpd tcp-wrappers) \
+ $(use_enable servers build-servers) \
+ $(use_enable clients build-clients) \
+ --with-mail-spool=/var/spool/mail \
+ --with-readline \
+ --enable-sendmail \
+ --disable-debug \
+ --disable-rpath
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ insinto /etc
+ # bug 613112
+ newins "${FILESDIR}/mailutils.rc" mailutils.conf
+ keepdir /etc/mailutils.d/
+ insinto /etc/mailutils.d
+ doins "${FILESDIR}/mail"
+
+ if use python; then
+ python_optimize
+ if use static-libs; then
+ rm -r "${D}$(python_get_sitedir)/mailutils"/*.{a,la} || die
+ fi
+ fi
+
+ if use servers; then
+ newinitd "${FILESDIR}"/imap4d.initd imap4d
+ newinitd "${FILESDIR}"/pop3d.initd pop3d
+ newinitd "${FILESDIR}"/comsatd.initd comsatd
+ fi
+
+ dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+
+ # compatibility link
+ use clients && dosym /usr/bin/mail /bin/mail
+
+ use static-libs || find "${D}" -name "*.la" -delete
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index c4c4477b6811..beaa7f622a07 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/electrum/electrum-3.1.3.ebuild b/net-misc/electrum/electrum-3.1.3.ebuild
index 62931caaa390..a425919757a1 100644
--- a/net-misc/electrum/electrum-3.1.3.ebuild
+++ b/net-misc/electrum/electrum-3.1.3.ebuild
@@ -149,6 +149,7 @@ src_prepare() {
eapply_user
+ xdg_environment_reset
distutils-r1_src_prepare
}
diff --git a/net-misc/s3cmd/s3cmd-2.0.0.ebuild b/net-misc/s3cmd/s3cmd-2.0.0.ebuild
index 6086e767ca4f..2b8e1e29806e 100644
--- a/net-misc/s3cmd/s3cmd-2.0.0.ebuild
+++ b/net-misc/s3cmd/s3cmd-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/s3tools/${P/_/-}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ~x86 ~x64-macos"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 89e6a4883b4e..3b734329849b 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/amule/amule-2.3.2-r2.ebuild b/net-p2p/amule/amule-2.3.2-r2.ebuild
new file mode 100644
index 000000000000..b91ba903777e
--- /dev/null
+++ b/net-p2p/amule/amule-2.3.2-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit wxwidgets user
+
+MY_P="${PN/m/M}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="aMule, the all-platform eMule p2p client"
+HOMEPAGE="http://www.amule.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="daemon debug geoip nls remote stats upnp +X"
+
+COMMON_DEPEND="
+ dev-libs/boost:=
+ dev-libs/crypto++:=
+ sys-libs/binutils-libs:0=
+ sys-libs/zlib
+ x11-libs/wxGTK:${WX_GTK_VER}[X?]
+ stats? ( media-libs/gd:=[jpeg,png] )
+ geoip? ( dev-libs/geoip )
+ upnp? ( net-libs/libupnp:* )
+ remote? ( media-libs/libpng:0= )
+ !net-p2p/imule"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.3.2-fix-crash-shared-dir-utf8.patch"
+ "${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-1.patch"
+ "${FILESDIR}/${PN}-2.3.2-fix-crash-closing-last-search-tab-2.patch"
+ "${FILESDIR}/${PN}-2.3.2-cryptopp-6.patch"
+ "${FILESDIR}/${PN}-2.3.2-disable-version-check.patch"
+)
+
+pkg_setup() {
+ if use stats && ! use X; then
+ einfo "Note: You would need both the X and stats USE flags"
+ einfo "to compile aMule Statistics GUI."
+ einfo "I will now compile console versions only."
+ fi
+
+ setup-wxwidgets
+}
+
+pkg_preinst() {
+ if use daemon || use remote; then
+ enewgroup p2p
+ enewuser p2p -1 -1 /home/p2p p2p
+ fi
+}
+
+src_configure() {
+ local myconf
+
+ if use X; then
+ use stats && myconf="${myconf}
+ --enable-wxcas
+ --enable-alc"
+ use remote && myconf="${myconf}
+ --enable-amule-gui"
+ else
+ myconf="
+ --disable-monolithic
+ --disable-amule-gui
+ --disable-wxcas
+ --disable-alc"
+ fi
+
+ econf \
+ --with-denoise-level=0 \
+ --with-wx-config="${WX_CONFIG}" \
+ --enable-amulecmd \
+ --with-boost \
+ $(use_enable debug) \
+ $(use_enable daemon amule-daemon) \
+ $(use_enable geoip) \
+ $(use_enable nls) \
+ $(use_enable remote webserver) \
+ $(use_enable stats cas) \
+ $(use_enable stats alcc) \
+ $(use_enable upnp) \
+ ${myconf}
+}
+
+src_install() {
+ default
+
+ if use daemon; then
+ newconfd "${FILESDIR}"/amuled.confd amuled
+ newinitd "${FILESDIR}"/amuled.initd amuled
+ fi
+ if use remote; then
+ newconfd "${FILESDIR}"/amuleweb.confd amuleweb
+ newinitd "${FILESDIR}"/amuleweb.initd amuleweb
+ fi
+}
diff --git a/net-p2p/amule/files/amule-2.3.2-cryptopp-6.patch b/net-p2p/amule/files/amule-2.3.2-cryptopp-6.patch
new file mode 100644
index 000000000000..d23534475603
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-cryptopp-6.patch
@@ -0,0 +1,25 @@
+From 27c13f3e622b8a3eaaa05bb62b0149604bdcc9e8 Mon Sep 17 00:00:00 2001
+From: Tommy Jerry Mairo
+Date: Wed, 21 Mar 2018 19:56:28 +0100
+Subject: [PATCH] Bugfix: API mismatch with crypto++ 6.0.0
+
+---
+ src/ClientCreditsList.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ClientCreditsList.cpp b/src/ClientCreditsList.cpp
+index 3bea9fe2d..69e881fd8 100644
+--- a/src/ClientCreditsList.cpp
++++ b/src/ClientCreditsList.cpp
+@@ -312,7 +312,7 @@ void CClientCreditsList::InitalizeCrypting()
+ // calculate and store public key
+ CryptoPP::RSASSA_PKCS1v15_SHA_Verifier pubkey(*static_cast(m_pSignkey));
+ CryptoPP::ArraySink asink(m_abyMyPublicKey, 80);
+- pubkey.DEREncode(asink);
++ pubkey.GetMaterial().Save(asink);
+ m_nMyPublicKeyLen = asink.TotalPutLength();
+ asink.MessageEnd();
+ } catch (const CryptoPP::Exception& e) {
+--
+2.16.4
+
diff --git a/net-p2p/amule/files/amule-2.3.2-disable-version-check.patch b/net-p2p/amule/files/amule-2.3.2-disable-version-check.patch
new file mode 100644
index 000000000000..74a0203a993e
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-disable-version-check.patch
@@ -0,0 +1,12 @@
+Disable NewVersionCheck by default
+--- a/src/Preferences.cpp
++++ b/src/Preferences.cpp
+@@ -1210,7 +1210,7 @@ void CPreferences::BuildItemList( const
+ /**
+ * Version check
+ **/
+- NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, true )));
++ NewCfgItem(IDC_NEWVERSION, (new Cfg_Bool( wxT("/eMule/NewVersionCheck"), s_NewVersionCheck, false )));
+
+ /**
+ * Obfuscation
diff --git a/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-1.patch b/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-1.patch
new file mode 100644
index 000000000000..c480165eb983
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-1.patch
@@ -0,0 +1,97 @@
+From 0f0c5c220228aea81142c7c00f73414cdb1b507a Mon Sep 17 00:00:00 2001
+From: gaffa
+Date: Wed, 12 Oct 2016 19:36:21 +0200
+Subject: [PATCH] A workaround for inconsistent behaviour in wxWidgets, where
+ the button release signal is falling through. Instead of calling DeletePage
+ directly an event is added to delete the page after the button release event
+ has been processed by all handlers.
+
+---
+ src/MuleNotebook.cpp | 17 ++++++++++++++++-
+ src/MuleNotebook.h | 13 +++++++++++++
+ 2 files changed, 29 insertions(+), 1 deletion(-)
+
+diff --git a/src/MuleNotebook.cpp b/src/MuleNotebook.cpp
+index ff3ba294e..4ab23ce18 100644
+--- a/src/MuleNotebook.cpp
++++ b/src/MuleNotebook.cpp
+@@ -32,6 +32,7 @@
+
+ DEFINE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING)
+ DEFINE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_ALL_PAGES_CLOSED)
++DEFINE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE)
+
+ BEGIN_EVENT_TABLE(CMuleNotebook, wxNotebook)
+ EVT_RIGHT_DOWN(CMuleNotebook::OnRMButton)
+@@ -44,6 +45,7 @@ BEGIN_EVENT_TABLE(CMuleNotebook, wxNotebook)
+ EVT_LEFT_UP(CMuleNotebook::OnMouseButtonRelease)
+ EVT_MIDDLE_UP(CMuleNotebook::OnMouseButtonRelease)
+ EVT_MOTION(CMuleNotebook::OnMouseMotion)
++ EVT_MULENOTEBOOK_DELETE_PAGE(wxID_ANY, CMuleNotebook::OnDeletePage)
+ END_EVENT_TABLE()
+
+ CMuleNotebook::CMuleNotebook( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name )
+@@ -60,6 +62,12 @@ CMuleNotebook::~CMuleNotebook()
+ DeleteAllPages();
+ }
+
++void CMuleNotebook::OnDeletePage(wxBookCtrlEvent& evt)
++{
++ int page = evt.GetSelection();
++ DeletePage(page);
++}
++
+
+ bool CMuleNotebook::DeletePage(int nPage)
+ {
+@@ -216,7 +224,14 @@ void CMuleNotebook::OnMouseButtonRelease(wxMouseEvent &event)
+ if ((tab != -1) && (((flags == wxNB_HITTEST_ONICON) && event.LeftUp()) ||
+ ((flags == wxNB_HITTEST_ONLABEL) && event.MiddleUp()))) {
+ // User did click on a 'x' or middle click on the label
+- DeletePage(tab);
++
++ /* WORKAROUND: Instead of calling DeletePage, we need to wait for the
++ * mouse release signal to reach Gtk. Inconsistent with normal wxEvent
++ * behaviour the button release handler in wxWidgets don't evaluate
++ * the result of the signal handling. */
++ wxNotebookEvent evt( wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE, GetId(), tab );
++ evt.SetEventObject(this);
++ AddPendingEvent( evt );
+ } else {
+ // Is not a 'x'. Send this event up.
+ event.Skip();
+diff --git a/src/MuleNotebook.h b/src/MuleNotebook.h
+index dda097d07..ab2809d88 100644
+--- a/src/MuleNotebook.h
++++ b/src/MuleNotebook.h
+@@ -31,7 +31,16 @@
+
+ DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING, -1)
+ DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_ALL_PAGES_CLOSED, -1)
++DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE, -1)
+
++#define EVT_MULENOTEBOOK_DELETE_PAGE(id, fn) \
++ DECLARE_EVENT_TABLE_ENTRY( \
++ wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE, \
++ id, \
++ -1, \
++ (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \
++ NULL \
++ ),
+ #define EVT_MULENOTEBOOK_PAGE_CLOSING(id, fn) \
+ DECLARE_EVENT_TABLE_ENTRY( \
+ wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING, \
+@@ -107,6 +116,10 @@ public:
+ */
+ void SetPopupHandler( wxWindow* widget );
+
++private:
++ // Internal handler. Workaround for wxWidgets Tab-Crash bug.
++ void OnDeletePage(wxBookCtrlEvent& evt);
++
+ protected:
+ /**
+ * Event handler for left or middle mouse button release (for closing pages)
+--
+2.16.4
+
diff --git a/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-2.patch b/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-2.patch
new file mode 100644
index 000000000000..e47970beb0c8
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-fix-crash-closing-last-search-tab-2.patch
@@ -0,0 +1,159 @@
+From 4c94c2d9f3be8b9068966f15aebc29b8c9b706ab Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?D=C3=A9vai=20Tam=C3=A1s?=
+Date: Mon, 17 Oct 2016 22:14:26 +0200
+Subject: [PATCH] Apply the workaround only if needed
+
+This way it'll be easy for us to remove the workaround once wxWidgets fixes
+the bug.
+---
+ docs/Changelog | 4 ++++
+ src/MuleNotebook.cpp | 19 ++++++++++++++-----
+ src/MuleNotebook.h | 8 ++++++++
+ 3 files changed, 26 insertions(+), 5 deletions(-)
+
+diff --git a/docs/Changelog b/docs/Changelog
+index 7dbff70b2..e9176dd51 100644
+--- a/docs/Changelog
++++ b/docs/Changelog
+@@ -2,6 +2,10 @@ Version 2.4.0 - The river knows.
+ ----------
+ 201?-??-??
+
++ gaffatape:
++ * Workaround for bug in wxWidgets causing aMule to crash on
++ closing the last search tab
++
+ GonoszTopi:
+ * Fix restoring toolbar orientation on 'Cancel'
+
+diff --git a/src/MuleNotebook.cpp b/src/MuleNotebook.cpp
+index 4ab23ce18..5d3ad0453 100644
+--- a/src/MuleNotebook.cpp
++++ b/src/MuleNotebook.cpp
+@@ -32,7 +32,10 @@
+
+ DEFINE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING)
+ DEFINE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_ALL_PAGES_CLOSED)
++
++#if MULE_NEEDS_DELETEPAGE_WORKAROUND
+ DEFINE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE)
++#endif
+
+ BEGIN_EVENT_TABLE(CMuleNotebook, wxNotebook)
+ EVT_RIGHT_DOWN(CMuleNotebook::OnRMButton)
+@@ -45,9 +48,12 @@ BEGIN_EVENT_TABLE(CMuleNotebook, wxNotebook)
+ EVT_LEFT_UP(CMuleNotebook::OnMouseButtonRelease)
+ EVT_MIDDLE_UP(CMuleNotebook::OnMouseButtonRelease)
+ EVT_MOTION(CMuleNotebook::OnMouseMotion)
++#if MULE_NEEDS_DELETEPAGE_WORKAROUND
+ EVT_MULENOTEBOOK_DELETE_PAGE(wxID_ANY, CMuleNotebook::OnDeletePage)
++#endif
+ END_EVENT_TABLE()
+
++
+ CMuleNotebook::CMuleNotebook( wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name )
+ : wxNotebook(parent, id, pos, size, style, name)
+ {
+@@ -62,11 +68,14 @@ CMuleNotebook::~CMuleNotebook()
+ DeleteAllPages();
+ }
+
++
++#if MULE_NEEDS_DELETEPAGE_WORKAROUND
+ void CMuleNotebook::OnDeletePage(wxBookCtrlEvent& evt)
+ {
+ int page = evt.GetSelection();
+ DeletePage(page);
+ }
++#endif // MULE_NEEDS_DELETEPAGE_WORKAROUND
+
+
+ bool CMuleNotebook::DeletePage(int nPage)
+@@ -208,7 +217,6 @@ void CMuleNotebook::OnPopupCloseOthers(wxCommandEvent& WXUNUSED(evt))
+
+ void CMuleNotebook::OnMouseButtonRelease(wxMouseEvent &event)
+ {
+-
+ if (GetImageList() == NULL) {
+ // This Mulenotebook has no images on tabs, so nothing to do.
+ event.Skip();
+@@ -224,7 +232,7 @@ void CMuleNotebook::OnMouseButtonRelease(wxMouseEvent &event)
+ if ((tab != -1) && (((flags == wxNB_HITTEST_ONICON) && event.LeftUp()) ||
+ ((flags == wxNB_HITTEST_ONLABEL) && event.MiddleUp()))) {
+ // User did click on a 'x' or middle click on the label
+-
++#if MULE_NEEDS_DELETEPAGE_WORKAROUND
+ /* WORKAROUND: Instead of calling DeletePage, we need to wait for the
+ * mouse release signal to reach Gtk. Inconsistent with normal wxEvent
+ * behaviour the button release handler in wxWidgets don't evaluate
+@@ -232,16 +240,18 @@ void CMuleNotebook::OnMouseButtonRelease(wxMouseEvent &event)
+ wxNotebookEvent evt( wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE, GetId(), tab );
+ evt.SetEventObject(this);
+ AddPendingEvent( evt );
++#else
++ DeletePage(tab);
++#endif // MULE_NEEDS_DELETEPAGE_WORKAROUND
+ } else {
+ // Is not a 'x'. Send this event up.
+ event.Skip();
+ }
+-
+ }
+
++
+ void CMuleNotebook::OnMouseMotion(wxMouseEvent &event)
+ {
+-
+ if (GetImageList() == NULL) {
+ // This Mulenotebook has no images on tabs, so nothing to do.
+ event.Skip();
+@@ -263,7 +273,6 @@ void CMuleNotebook::OnMouseMotion(wxMouseEvent &event)
+ // Is not a 'x'. Send this event up.
+ event.Skip();
+ }
+-
+ }
+
+ // File_checked_for_headers
+diff --git a/src/MuleNotebook.h b/src/MuleNotebook.h
+index ab2809d88..14f61ee68 100644
+--- a/src/MuleNotebook.h
++++ b/src/MuleNotebook.h
+@@ -28,9 +28,13 @@
+
+ #include
+
++#define MULE_NEEDS_DELETEPAGE_WORKAROUND wxCHECK_VERSION(3,0,2)
++
+
+ DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING, -1)
+ DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_ALL_PAGES_CLOSED, -1)
++
++#if MULE_NEEDS_DELETEPAGE_WORKAROUND
+ DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE, -1)
+
+ #define EVT_MULENOTEBOOK_DELETE_PAGE(id, fn) \
+@@ -41,6 +45,8 @@ DECLARE_LOCAL_EVENT_TYPE(wxEVT_COMMAND_MULENOTEBOOK_DELETE_PAGE, -1)
+ (wxObjectEventFunction)(wxEventFunction)(wxNotebookEventFunction) &fn, \
+ NULL \
+ ),
++#endif // MULE_NEEDS_DELETEPAGE_WORKAROUND
++
+ #define EVT_MULENOTEBOOK_PAGE_CLOSING(id, fn) \
+ DECLARE_EVENT_TABLE_ENTRY( \
+ wxEVT_COMMAND_MULENOTEBOOK_PAGE_CLOSING, \
+@@ -116,9 +122,11 @@ public:
+ */
+ void SetPopupHandler( wxWindow* widget );
+
++#if MULE_NEEDS_DELETEPAGE_WORKAROUND
+ private:
+ // Internal handler. Workaround for wxWidgets Tab-Crash bug.
+ void OnDeletePage(wxBookCtrlEvent& evt);
++#endif // MULE_NEEDS_DELETEPAGE_WORKAROUND
+
+ protected:
+ /**
+--
+2.16.4
+
diff --git a/net-p2p/amule/files/amule-2.3.2-fix-crash-shared-dir-utf8.patch b/net-p2p/amule/files/amule-2.3.2-fix-crash-shared-dir-utf8.patch
new file mode 100644
index 000000000000..aa92ff6c81ee
--- /dev/null
+++ b/net-p2p/amule/files/amule-2.3.2-fix-crash-shared-dir-utf8.patch
@@ -0,0 +1,78 @@
+From 17816ed02f59bab9c27310e7f24c73266b0a3003 Mon Sep 17 00:00:00 2001
+From: persmule
+Date: Wed, 5 Oct 2016 13:47:46 +0800
+Subject: [PATCH] Add a routine to set file name conversion for amuled which
+ based on wxAppConsole
+
+---
+ src/amule.h | 7 +++++++
+ src/amuled.cpp | 35 +++++++++++++++++++++++++++++++++++
+ 2 files changed, 42 insertions(+)
+
+diff --git a/src/amule.h b/src/amule.h
+index f25702f60..240c02dd9 100644
+--- a/src/amule.h
++++ b/src/amule.h
+@@ -553,6 +553,13 @@ private:
+ int OnExit();
+
+ virtual int InitGui(bool geometry_enable, wxString &geometry_string);
++ // The GTK wxApps sets its file name conversion properly
++ // in wxApp::Initialize(), while wxAppConsole::Initialize()
++ // does not, leaving wxConvFile being set to wxConvLibc. File
++ // name conversion should be set otherwise amuled will abort to
++ // handle non-ASCII file names which monolithic amule can handle.
++ // This function are overrided to perform this.
++ virtual bool Initialize(int& argc_, wxChar **argv_);
+
+ #ifdef AMULED_APPTRAITS
+ struct sigaction m_oldSignalChildAction;
+diff --git a/src/amuled.cpp b/src/amuled.cpp
+index 486da5973..86e1ff8b8 100644
+--- a/src/amuled.cpp
++++ b/src/amuled.cpp
+@@ -704,6 +704,41 @@ int CamuleDaemonApp::InitGui(bool ,wxString &)
+ return 0;
+ }
+
++bool CamuleDaemonApp::Initialize(int& argc_, wxChar **argv_)
++{
++ if ( !wxAppConsole::Initialize(argc_, argv_) ) {
++ return false;
++ }
++
++#ifdef __UNIX__
++ wxString encName;
++#if wxUSE_INTL
++ // if a non default locale is set,
++ // assume that the user wants his
++ // filenames in this locale too
++ encName = wxLocale::GetSystemEncodingName().Upper();
++
++ // But don't consider ASCII in this case.
++ if ( !encName.empty() ) {
++ if ( encName == wxT("US-ASCII") ) {
++ // This means US-ASCII when returned
++ // from GetEncodingFromName().
++ encName.clear();
++ }
++ }
++#endif // wxUSE_INTL
++
++ // in this case, UTF-8 is used by default.
++ if ( encName.empty() ) {
++ encName = wxT("UTF-8");
++ }
++
++ static wxConvBrokenFileNames fileconv(encName);
++ wxConvFileName = &fileconv;
++#endif // __UNIX__
++
++ return true;
++}
+
+ int CamuleDaemonApp::OnExit()
+ {
+--
+2.16.4
+
diff --git a/net-p2p/amule/metadata.xml b/net-p2p/amule/metadata.xml
index 2a3a65502073..836b2cdc312b 100644
--- a/net-p2p/amule/metadata.xml
+++ b/net-p2p/amule/metadata.xml
@@ -1,13 +1,20 @@
-
-
- Enable amule daemon
- Enable remote controlling of the client
- Enable statistic reporting
-
-
- amule
-
+
+ alexander@tsoy.me
+ Alexander Tsoy
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ amule-project/amule
+
+
+ Enable amule daemon
+ Enable remote controlling of the client
+ Enable statistic reporting
+
diff --git a/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild b/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild
index 5474e996bcb5..a65eeca37593 100644
--- a/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild
+++ b/net-p2p/torrentinfo/torrentinfo-1.8.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/Fuuzetsu/torrentinfo/archive/v${PV}.tar.gz -> ${P}.t
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="test"
DEPEND="
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 1ec8ff01fdc3..767548109a1c 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/hplip/hplip-3.18.6.ebuild b/net-print/hplip/hplip-3.18.6.ebuild
index 176401c2373b..0c728bd59bdd 100644
--- a/net-print/hplip/hplip-3.18.6.ebuild
+++ b/net-print/hplip/hplip-3.18.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 812c10f1ebf7..7a591f58f67c 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/squid/squid-3.5.27-r1.ebuild b/net-proxy/squid/squid-3.5.27-r1.ebuild
index d8e27e7b824f..a81007e75347 100644
--- a/net-proxy/squid/squid-3.5.27-r1.ebuild
+++ b/net-proxy/squid/squid-3.5.27-r1.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
IUSE="caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \
ecap esi ssl-crtd \
mysql postgres sqlite \
- qos tproxy \
+ perl qos tproxy \
+htcp +wccp +wccpv2 \
pf-transparent ipf-transparent kqueue \
elibc_uclibc kernel_linux"
@@ -33,13 +33,14 @@ COMMON_DEPEND="caps? ( >=sys-libs/libcap-2.16 )
esi? ( dev-libs/expat dev-libs/libxml2 )
!x86-fbsd? ( logrotate? ( app-admin/logrotate ) )
>=sys-libs/db-4:*
- dev-lang/perl
dev-libs/libltdl:0"
DEPEND="${COMMON_DEPEND}
+ dev-lang/perl
ecap? ( virtual/pkgconfig )
test? ( dev-util/cppunit )"
RDEPEND="${COMMON_DEPEND}
samba? ( net-fs/samba )
+ perl? ( dev-lang/perl )
mysql? ( dev-perl/DBD-mysql )
postgres? ( dev-perl/DBD-Pg )
selinux? ( sec-policy/selinux-squid )
@@ -223,6 +224,21 @@ src_install() {
fowners root:squid /usr/libexec/squid/pinger
fperms 4750 /usr/libexec/squid/pinger
+ # these scripts depend on perl
+ if ! use perl; then
+ local f
+ local PERL_SCRIPTS=(
+ "${D}"/usr/libexec/squid/basic_pop3_auth
+ "${D}"/usr/libexec/squid/log_db_daemon
+ "${D}"/usr/libexec/squid/basic_msnt_multi_domain_auth
+ "${D}"/usr/libexec/squid/storeid_file_rewrite
+ "${D}"/usr/libexec/squid/helper-mux.pl
+ )
+ for f in "${PERL_SCRIPTS[@]}"; do
+ rm -v "${f}" || die
+ done
+ fi
+
# cleanup
rm -f "${D}"/usr/bin/Run*
rm -rf "${D}"/run/squid "${D}"/var/cache/squid
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 0fd69965f9c1..98b92906a035 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/linssid/Manifest b/net-wireless/linssid/Manifest
new file mode 100644
index 000000000000..ed80d155ded1
--- /dev/null
+++ b/net-wireless/linssid/Manifest
@@ -0,0 +1 @@
+DIST linssid_3.5.orig.tar.gz 396769 BLAKE2B f2d04af5d990a51cce8501309fcf14090e262b531ec6b914c3373d4bf0cb2d2bfed9ead81a21e2dfe5a3f7bf2cef3d400aadb216604317946a8dc4938298246a SHA512 874f428a6a6de34404b57601f016f9e417e75578ec5c5c0661fa614f2bde80d732132d31880f7b947a7178b0fcaf6b00bb3c317a652346d50009ce814b46f7b1
diff --git a/net-wireless/linssid/linssid-3.5.ebuild b/net-wireless/linssid/linssid-3.5.ebuild
new file mode 100644
index 000000000000..8ea242d855ae
--- /dev/null
+++ b/net-wireless/linssid/linssid-3.5.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="Graphical wireless scanning for Linux"
+HOMEPAGE="https://sourceforge.net/projects/linssid/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="policykit"
+
+DEPEND="dev-libs/boost:=
+ dev-qt/qtcore:5
+ dev-qt/qtopengl:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ x11-libs/qwt:6[opengl,qt5,svg]"
+
+RDEPEND="net-wireless/iw
+ x11-libs/libxkbcommon[X]
+ policykit? ( sys-auth/polkit )
+ !policykit? ( app-admin/sudo
+ x11-libs/gksu )
+ ${DEPEND}"
+
+S="${WORKDIR}/${P}/${PN}-app"
+
+DOCS=( README_${PV} )
+
+src_prepare() {
+ # Use system qwt for compiling
+ sed -i -e 's/CONFIG += release/CONFIG += release qwt/' linssid-app.pro || die
+
+ # Fix lib path for x11-libs/qwt
+ if use amd64; then
+ sed -i -e "s/lib\/libqwt-qt5.so.6/\/$(get_libdir)\/libqwt6-qt5.so.6/" linssid-app.pro || die
+ fi
+
+ # Enable 'gksu' when a user don't want policykit
+ if ! use policykit; then
+ sed -i -e 's/Exec=.*/Exec=gksu linssid/' linssid.desktop || die
+ fi
+
+ default
+}
+
+src_configure() {
+ eqmake5
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+
+ einstalldocs
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/net-wireless/linssid/metadata.xml b/net-wireless/linssid/metadata.xml
new file mode 100644
index 000000000000..9a5b3da0f39c
--- /dev/null
+++ b/net-wireless/linssid/metadata.xml
@@ -0,0 +1,24 @@
+
+
+
+
+ ck+gentoo@bl4ckb0x.de
+ Conrad Kostecki
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ LinSSID displays the information available
+ from the 'iw list' tool in a graphical format.
+ It displays a table of all of the local wireless networks
+ that your device can receive and information about them.
+ It also displays charts of the signal strength of each network by
+ channel number and over time.
+
+
+ https://sourceforge.net/p/linssid/discussion/bugs/
+ linssid
+
+
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 761e49150b8a..9b1c10e86db2 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 26104352bdc7..d64ab3ca19a1 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -1,6 +1,10 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+# Akinori Hattori (23 Jun 2018)
+# No stable Java
+dev-db/qdbm java
+
# Pacho Ramos (28 May 2018)
# Don't rely on stable inkscape
app-text/dblatex inkscape
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 35aa1a46e827..257e6854bcef 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -6,6 +6,7 @@
app-crypt/pinentry fltk
dev-python/cssselect doc
dev-vcs/subversion kwallet
+app-text/ghostscript-gpl cups
# Michał Górny (08 Aug 2017)
# Required VIDEO_CARDS=i965/radeonsi, both masked in this profile.
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index daa11d4de6af..32ca3073612b 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -38,3 +38,8 @@ MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X1
# 2006/10/05 - Gustavo Zacarias
# Defaults for video drivers
VIDEO_CARDS="fbdev glint mga r128 radeon tdfx voodoo"
+
+# Sergei Trofimovich (24 Jun 2018)
+# Enable USE=libtirpc by default, to ease dependency resolution during
+# the stabilization of glibc-2.26. Bug 657148
+USE="libtirpc"
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index b41ecfa1f279..7c2500320aaf 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
#
# System-wide defaults for the Portage system
@@ -127,7 +127,8 @@ BOOTSTRAP_USE="cxx unicode internal-glib split-usr python_targets_python3_5 pyth
# Mike Gilbert (15 May 2012)
# Default target(s) for python-r1.eclass
-# Updated to python3_5 on 28 Nov 2017
+# Michał Górny (22 Jun 2018)
+# Updated to python3_6
PYTHON_TARGETS="python2_7 python3_5"
PYTHON_SINGLE_TARGET="python3_5"
diff --git a/profiles/desc/lcd_devices.desc b/profiles/desc/lcd_devices.desc
index 9a9b4a7762bd..911ed4c6618a 100644
--- a/profiles/desc/lcd_devices.desc
+++ b/profiles/desc/lcd_devices.desc
@@ -80,7 +80,7 @@ pertelian - Add support for the Pertelian X2040 displays
phanderson - Add support for the PHAnderson serial-to-HD44780 controller
picgraphic - Add support for PIC graphic displays
picolcd - Add support for Mini-Box's picoLCD
-picolcdgraphic Add support for Mini-Box's graphical picoLCD
+picolcdgraphic - Add support for Mini-Box's graphical picoLCD
png - Add support for PNG output
ppm - Add support for PNG output
pyramid - Add support for the Pyramid LCD device
diff --git a/profiles/features/selinux/package.mask b/profiles/features/selinux/package.mask
index cce0476c2e4f..c9535802b6d9 100644
--- a/profiles/features/selinux/package.mask
+++ b/profiles/features/selinux/package.mask
@@ -39,4 +39,5 @@ sys-apps/dbus-broker
# Gilles Dartiguelongue (24 May 2018)
# Packages use systemd unconditionally for now
>=app-admin/abrt-2.10
+app-admin/gnome-abrt
>=dev-libs/libreport-2.9
diff --git a/profiles/license_groups b/profiles/license_groups
index 93840420b616..820a1074a117 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
# License agreements that try to take away your rights. These are more
# restrictive than "all-rights-reserved" or require explicit approval.
-EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 DOOM3 ETQW f.lux FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms Microsemi MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs StarUML-EULA supermicro teamspeak3 TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
+EULA AdobeFlash-11.x ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 DOOM3 ETQW f.lux FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA MARBLEBLAST Mendeley-terms Microsemi MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA Nero-AAC-EULA Nero-EULA-US OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs SPS StarUML-EULA Steam supermicro teamspeak3 TeamViewer THINKTANKS UPEK-SDK-EULA ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
# Local Variables:
# mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index 5b256f744072..174b4e40a61f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,15 @@
#--- END OF EXAMPLES ---
+# Thomas Deutschmann (23 Jun 2018)
+# Doesn't pass QA full boot test
+=sys-kernel/ck-sources-4.16.17
+
+# Mike Auty (22 Jun 2018)
+# Not maintained upstream, at least one bug and three upstream bugs
+# Removal in 30 days. Bug #658264
+dev-vcs/giggle
+
# Matt Turner (20 Jun 2018)
# No reverse deps after removal of app-i18n/fbiterm
# Removal in 30 days. Bug #658528
@@ -77,13 +86,6 @@ dev-java/jdom-jaxen
# in a month.
net-misc/openvpn-auth-ldap
-# Pacho Ramos (17 Jun 2018)
-# Supposedly working with wxGTK:3.0 but with bugs that upstream never fixed,
-# this would be the last package still needing old wxGTK:2.8 to workaround
-# this bugs (#597194). Removal in a month except if someone figures out
-# about how to solve this bugs.
-net-p2p/amule
-
# Pacho Ramos (17 Jun 2018)
# Upstream dead for a long time, bug #606194. Removal in a month.
dev-libs/DirectFB
@@ -350,25 +352,6 @@ app-i18n/ibus-tutcode
# x11-drivers/nvidia-drivers. Work in progress.
media-libs/libglvnd
-# Andreas Sturmlechner (24 May 2018)
-# Depends on dead Qt4. Masked for removal in 30 days. Bug #629018
-dev-libs/libattica
-kde-frameworks/kdelibs
-kde-frameworks/kdelibs-env
-kde-plasma/qguiplatformplugin_kde
-
-# Joonas Niilola (18 May 2018)
-# Unmaintained, bugs open without activity, makes users
-# install ancient version of enlightenment by typing
-# 'emerge enlightenment' due to obnoxious package slotting.
-# Bug #656020. Removal in ~30 days
-=x11-wm/enlightenment-1.0.17
-=x11-wm/enlightenment-0.16.9999
-app-doc/edox-data
-x11-misc/e16keyedit
-x11-misc/e16menuedit2
-x11-plugins/epplets
-
# Andreas Sturmlechner (18 May 2018)
# Breaking consumers by internal header cleanup and removal of deprecated
# qt5_use_modules from Qt5CoreMacros.cmake. File bugs with fixes upstream
@@ -507,15 +490,6 @@ sys-libs/uclibc
# Mask experimental software
=mail-mta/postfix-3.4*
-# Thomas Deutschmann (07 Feb 2018)
-# Intel recommends to pull these versions because they could
-# cause higher than expected reboots and other unpredictable
-# system behavior. Bug #646646
-=sys-firmware/intel-microcode-20171117_p20171215
-=sys-firmware/intel-microcode-20171117_p20171215-r1
-=sys-firmware/intel-microcode-20180108
-=sys-firmware/intel-microcode-20180108-r1
-
# Eray Aslan (22 Jan 2018)
# Vulnerable - see https://bugs.gentoo.org/630684
# Please migrate to cyrus-imapd-3.0 releases
@@ -525,11 +499,6 @@ sys-libs/uclibc
# mpv >= 0.28.0 requires currently masked ffmpeg >= 4.0.
>=media-video/mpv-0.28.0
-# Matthias Maier (26 Dec 2017)
-# gcc depends on mpfr and this version changes soname. Spare users with
-# FEATURES=-preserve-libs from completely frying their system.
->=dev-libs/mpfr-4.0.0
-
# Thomas Beierlein (23 Dec 2017)
# To adapt to changed version naming by upstream
# (pcb-yyyymmdd to pcb-x.y.z) we move the ebuild to
diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults
index 3303288982f5..a50334dc5a41 100644
--- a/profiles/prefix/make.defaults
+++ b/profiles/prefix/make.defaults
@@ -8,6 +8,7 @@
# ssl: encrypted connections are a nice feature
USE="readline zlib ncurses ssl"
+
# Python 3.6 is unmasked for us, build stuff by default with latest to
# avoid unnecessary builds
# NOTE: Both are incremental variables: Need to drop obsolete base values.
diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index aeb4c5eca57e..48ac93c56d50 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -24,11 +24,8 @@ move kde-base/kwin kde-plasma/kwin
slotmove dev-python/pyinsane 0 1
move media-sound/kwave kde-apps/kwave
move app-misc/ddctool app-misc/ddcutil
-move kde-base/qguiplatformplugin_kde kde-plasma/qguiplatformplugin_kde
move media-libs/prison kde-frameworks/prison
move kde-base/kactivities kde-frameworks/kactivities
move kde-base/plasma-workspace kde-plasma/plasma-workspace
move dev-perl/extutils-pkgconfig dev-perl/ExtUtils-PkgConfig
move kde-base/krosspython kde-apps/kross-interpreters
-move kde-base/kde-env kde-frameworks/kdelibs-env
-move kde-base/kdelibs kde-frameworks/kdelibs
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 37ec4e33c179..4f387fcf6cec 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -924,6 +924,9 @@ app-misc/gramps:reports - All external software that is needed for graphical rep
app-misc/graphlcd-base:g15 - Add support for app-misc/g15daemon driver (e.g. Logitech G15 Keybord)
app-misc/irtrans-irserver:mono - Enable mono support
app-misc/jq:oniguruma - Use dev-libs/oniguruma for regular expression support
+app-misc/kryoflux-dtc:demos - Install example floppy game files.
+app-misc/kryoflux-dtc:fast-firmware - Install fast firmware instead of slow firmware.
+app-misc/kryoflux-dtc:gui - Install the Kryoflux GUI
app-misc/lcd4linux:apm - Enable the APM plugin.
app-misc/lcd4linux:asterisk - Enable the Asterisk plugin.
app-misc/lcd4linux:button_exec - Enable the Button plugin, to execute something on keypress.
@@ -2800,6 +2803,7 @@ dev-qt/qttest:exceptions - Add support for exceptions - like catching them insid
dev-qt/qtvirtualkeyboard:handwriting - Adds handwriting recognition integration support
dev-qt/qtwayland:libinput - Enable support for input devices via dev-libs/libinput
dev-qt/qtwebchannel:qml - Build QML/QtQuick bindings and imports
+dev-qt/qtwebengine:designer - Install the QWebEngineView plugin used to add widgets in dev-qt/designer forms that display web pages.
dev-qt/qtwebengine:geolocation - Enable physical position determination via dev-qt/qtpositioning
dev-qt/qtwebengine:pax_kernel - Enable building under a PaX enabled kernel
dev-qt/qtwebengine:system-ffmpeg - Use the system-wide media-video/ffmpeg instead of bundled.
@@ -3581,7 +3585,6 @@ kde-apps/step:qalculate - Enable the libqalculate library for unit conversion
kde-frameworks/frameworkintegration:appstream - Enable AppStream software metadata support
kde-frameworks/kconfigwidgets:man - Build and install man pages
kde-frameworks/kded:man - Build and install man pages
-kde-frameworks/kdelibs:qt3support - Enable kde3support/qt3support for very old applications
kde-frameworks/kdesignerplugin:designer - Build KF5 widgets plugin for QtDesigner
kde-frameworks/kdesignerplugin:webkit - Build kdewebkit plugin for QtDesigner
kde-frameworks/kfilemetadata:epub - Enable support for reading EPUB ebook metadata
@@ -4786,7 +4789,6 @@ media-sound/supercollider:gedit - Enable the SCED user interface
media-sound/supercollider:gpl3 - Build GPL-3 licensed code (recommended)
media-sound/supercollider:server - Build with internal server
media-sound/supercollider:vim - Enable the SCVIM user interface
-media-sound/supercollider:wiimote - Build sclang with Wii Remote support
media-sound/teamspeak-server-bin:tsdns - Install TeamSpeaks own DNS service.
media-sound/tomahawk:hatchet - Enable support for the synchronisation through Hatchet
media-sound/tomahawk:telepathy - Enable support for the real-time communication framework telepathy
@@ -5765,7 +5767,7 @@ net-im/bitlbee:otr - Enable support for encrypted conversations
net-im/bitlbee:plugins - Enable support for plugins
net-im/bitlbee:purple - Use libpurple instead of the built-in IM protocol support
net-im/bitlbee:twitter - Enable Twitter protocol support
-net-im/choqok:attica - Build Open Collaboration Services plugin using dev-libs/libattica
+net-im/choqok:attica - Build Open Collaboration Services plugin using kde-frameworks/attica
net-im/choqok:konqueror - Build Konqueror Choqok plugin
net-im/choqok:telepathy - Enable support for the real-time communication framework telepathy
net-im/climm:otr - Enable encrypted conversations
@@ -8015,6 +8017,7 @@ sys-cluster/torque:munge - Enable authentication via munge
sys-cluster/torque:nvidia - Enable management of Nvidia GPUs
sys-cluster/torque:quickcommit - Enable the QUICKCOMMIT codebase
sys-cluster/torque:server - Enable compilation of pbs_server and pbs_sched
+sys-cluster/ucx:numa - Add support for numa memory allocation
sys-cluster/vzctl:ploop - Add support for ploop devices via sys-cluster/ploop
sys-cluster/vzctl:vzmigrate - Add support for container migration
sys-devel/autogen:libopts - install the libopts tarball (a few packages want this for developing)
@@ -8097,7 +8100,6 @@ sys-fabric/opensm:tools - Install ssld extra tool
sys-firmware/edk2-ovmf:binary - Use pre-built binaries
sys-firmware/intel-microcode:hostonly - only install ucode(s) supported by currently available (=online) processor(s)
sys-firmware/intel-microcode:initramfs - install a small initramfs for use with CONFIG_MICROCODE_EARLY
-sys-firmware/intel-microcode:monolithic - install the large text microcode.dat (used by older kernels via microcode_ctl)
sys-firmware/intel-microcode:split-ucode - install the split binary ucode files (used by the kernel directly)
sys-firmware/intel-microcode:vanilla - install only microcode updates from Intel's official microcode tarball
sys-firmware/ipxe:binary - Use pre-built binaries
@@ -8286,6 +8288,7 @@ sys-libs/libblockdev:dmraid - Support for dmraid devices, also known as ATA-RAID
sys-libs/libblockdev:escrow - Support for building crypto plugin with escrow device support
sys-libs/libblockdev:kbd - Enable kernel block device support.
sys-libs/libblockdev:lvm - Enable support for Logical Volume Management via sys-fs/lvm2.
+sys-libs/libblockdev:vdo - Enable Virtual Data Optimizer support.
sys-libs/libcxx:libcxxabi - Build on top of sys-libs/libcxxabi instead of gcc's libsupc++ (avoids depending on gcc).
sys-libs/libcxx:libcxxrt - Build on top of sys-libs/libcxxrt instead of gcc's libsupc++ (avoids depending on gcc).
sys-libs/libcxx:libunwind - Use libunwind instead of libgcc_s for stack unwinding, thus avoiding dependence on gcc.
@@ -8833,6 +8836,7 @@ x11-terms/gnome-terminal:gnome-shell - Integrate with gnome-base/gnome-shell sea
x11-terms/gnome-terminal:nautilus - Build gnome-base/nautilus extension
x11-terms/kitty:imagemagick - Support displaying images in the terminal with icat
x11-terms/mate-terminal:gtk3 - Build with GTK+3 instead of GTK+2
+x11-terms/mlterm:brltty - Enable support for app-accessibilty/brltty
x11-terms/mlterm:fcitx - Enable support for app-i18n/fcitx
x11-terms/mlterm:gtk2 - Build with x11-libs/gtk+:2 instead of x11-libs/gtk+:3
x11-terms/mlterm:harfbuzz - Enable support for OpenType Layout (media-libs/harfbuzz)
@@ -8843,6 +8847,7 @@ x11-terms/mlterm:scim - Enable support for app-i18n/scim
x11-terms/mlterm:skk - Enable support for SKK (virtual/skkserv or app-i18n/skk-jisyo)
x11-terms/mlterm:uim - Enable support for app-i18n/uim
x11-terms/mlterm:utempter - Enable support for sys-libs/libutempter
+x11-terms/mlterm:wayland - Enable support for Wayland
x11-terms/mrxvt:menubar - Enable mrxvt menubar
x11-terms/mrxvt:utempter - REcords user logins. Useful on multi-user systems
x11-terms/rxvt-unicode:256-color - Enable 256 color support
@@ -8959,9 +8964,7 @@ x11-wm/enlightenment:enlightenment_modules_wl-wl - Wayland-in-Wayland module
x11-wm/enlightenment:enlightenment_modules_wl-x11 - Wayland-in-X11 module
x11-wm/enlightenment:enlightenment_modules_xkbswitch - Keyboard layout configuration and switcher
x11-wm/enlightenment:enlightenment_modules_xwayland - X/Wayland integration
-x11-wm/enlightenment:pango - Enable pango font rendering
x11-wm/enlightenment:ukit - Use upower/udisks to automount devices
-x11-wm/enlightenment:xrandr - Enable support for the X xrandr extension
x11-wm/fluxbox:bidi - Enable bidirectional language support with dev-libs/fribidi
x11-wm/fluxbox:slit - Enables the Fluxbox slit (or dock)
x11-wm/fluxbox:systray - Enables the system tray in the Fluxbox toolbar
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index ecb228940551..3a01a93c8452 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index e12b57b0739f..fbb145dc3c0a 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -47,7 +47,6 @@ DIST sqlite-amalgamation-3200000.zip 2069628 BLAKE2B 97b641fdd143af8bd1f4b7b733f
DIST sqlite-amalgamation-3230100.zip 2183147 BLAKE2B af25542f81ac0592d143695466de785779dc8002ebc5b6cf20cb2d56a66cf12b9d4f73392b6ac696b8107beca0e5c3a3e03efb703fa49fc380355d1e9302e78a SHA512 5784f4dea7f14d7dcf5dd07f0e111c8f0b64ff55c68b32a23fba7a36baf1f095c7a35573fc3b57b84822878218b78f9b0187c4e3f0439d4215471ee5f556eee1
DIST swig-3.0.8.tar.gz 7937213 BLAKE2B 38f17631a36f178a478bf77f1a7ea77b50b91ed95ca0363f0f75d86bf7da6d855db314c1b7e67634b0e6e1438a0d141d0241595987142154ee356d60955248bc SHA512 85605bd98bf2b56f5bfca23ae23d76d764d76a174b05836c8686825e912d6326c370e9cf2134c0bf4f425560be103b16bf9c9d075077f52e713a69082616e906
DIST tensorflow-1.8.0.tar.gz 22649439 BLAKE2B 7384c2cf742fb5a8b4e266e95080ae2513c1b112ab97f74839fa8e81bd91bd24645be8afb02e4447ad5fba9f47c4d146f59aa12085937cd3a364ec34c99590f3 SHA512 7280e65d26fb3f15d95f7217ee3bc08d1424cd144cf25bf638fa114fa835b2505dfaf457c55700067d24f485b77120973d094ec568e6d1b1054857402f9c352d
-DIST tensorflow-1.9.0_rc0.tar.gz 23632522 BLAKE2B 2049f97edb18fe34963c2706dc7249102204bacbd568c7a1ae880d9d94ba2a24b47f577ef71b6bf40e55b4c42537a2184e0ab2ad8e27cdbfcc9508cfa70515a8 SHA512 55b165882ce965c8b46ebb91e26b5828c3b71d6c07b8d5a321e890e9b5c00e896de511fc1d9e9b2f7f4f33311da6add32c7f7b55631eab8fedcc2167186649e3
DIST tensorflow-1.9.0_rc1.tar.gz 23639406 BLAKE2B 94f7254b67ebbcf7a6c46f194bf00ecb4e386cf90b74ef436febdbe1f4e9b4e206aeaabd9392f1023d8486ffd91b9e7814a64f8c7275a198a3040a76181d282e SHA512 3354738c6f6e3c8336bd7186379dc8ef02e12aa83db4b65a93a644f5435254fc253f897dfd2b307b2fe77b1dbe6f506f1fccc4d0ea6e04cdf3e3eb9a52ca81fd
DIST tensorflow-python-license.txt 45132 BLAKE2B 1f572a06eeb4a58a5563b87a2db381a6e9eb0195cf1d006bda0d3da158e62a1e67e889a7d3d0da83d8609c0d048887bcbbd0d7056fd8e4f56b654047f36936fa SHA512 1b8c2f9733fcf27d560879418c366b5c3e44420d42adb3b857ee741793ddc75ad18324b016909457e5311f2143593392ce4404d12962f076e62f6036afbb521e
DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0_rc0.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0_rc0.ebuild
deleted file mode 100644
index 77831fe28628..000000000000
--- a/sci-libs/tensorflow/tensorflow-1.9.0_rc0.ebuild
+++ /dev/null
@@ -1,361 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-MY_PV=${PV/_rc/-rc}
-MY_P=${PN}-${MY_PV}
-
-inherit distutils-r1 multiprocessing toolchain-funcs
-
-DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
-HOMEPAGE="https://www.tensorflow.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="cuda jemalloc mpi +python"
-CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
-for i in $CPU_USE_FLAGS_X86; do
- IUSE+=" cpu_flags_x86_$i"
-done
-
-# distfiles that bazel uses for the workspace, will be copied to basel-distdir
-bazel_external_uris="
- http://pilotfiber.dl.sourceforge.net/project/giflib/giflib-5.1.4.tar.gz
- http://pkgs.fedoraproject.org/repo/pkgs/nasm/nasm-2.12.02.tar.bz2/d15843c3fb7db39af80571ee27ec6fad/nasm-2.12.02.tar.bz2
- http://www.kurims.kyoto-u.ac.jp/~ooura/fft.tgz -> oourafft-20061228.tgz
- https://bitbucket.org/eigen/eigen/get/6913f0cf7d06.tar.gz -> eigen-6913f0cf7d06.tar.gz
- https://github.com/LMDB/lmdb/archive/LMDB_0.9.19.tar.gz
- https://github.com/abseil/abseil-cpp/archive/9613678332c976568272c8f4a78631a29159271d.tar.gz -> abseil-cpp-9613678332c976568272c8f4a78631a29159271d.tar.gz
- https://github.com/bazelbuild/rules_closure/archive/dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz -> bazelbuild-rules_closure-dbb96841cc0a5fb2664c37822803b06dab20c7d1.tar.gz
- https://github.com/glennrp/libpng/archive/v1.6.34.tar.gz -> libpng-v1.6.34.tar.gz
- https://github.com/google/double-conversion/archive/3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip -> double-conversion-3992066a95b823efc8ccc1baf82a1cfc73f6e9b8.zip
- https://github.com/google/farmhash/archive/816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz -> farmhash-816a4ae622e964763ca0862d9dbd19324a1eaf45.tar.gz
- https://github.com/google/gemmlowp/archive/38ebac7b059e84692f53e5938f97a9943c120d98.zip -> gemmlowp-38ebac7b059e84692f53e5938f97a9943c120d98.zip
- https://github.com/google/highwayhash/archive/fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz -> highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz
- https://github.com/google/nsync/archive/0559ce013feac8db639ee1bf776aca0325d28777.tar.gz -> nsync-0559ce013feac8db639ee1bf776aca0325d28777.tar.gz
- https://github.com/google/protobuf/archive/396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz -> protobuf-396336eb961b75f03b25824fe86cf6490fb75e3a.tar.gz
- https://github.com/google/re2/archive/26cd968b735e227361c9703683266f01e5df7857.tar.gz -> re2-26cd968b735e227361c9703683266f01e5df7857.tar.gz
- https://github.com/google/snappy/archive/1.1.7.tar.gz -> snappy-1.1.7.tar.gz
- https://github.com/grpc/grpc/archive/d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz -> grpc-d184fa229d75d336aedea0041bd59cb93e7e267f.tar.gz
- https://github.com/libjpeg-turbo/libjpeg-turbo/archive/1.5.3.tar.gz -> libjpeg_turbo-1.5.3.tar.gz
- https://github.com/open-source-parsers/jsoncpp/archive/11086dd6a7eba04289944367ca82cea71299ed70.tar.gz -> jsoncpp-11086dd6a7eba04289944367ca82cea71299ed70.tar.gz
- https://www.sqlite.org/2018/sqlite-amalgamation-3230100.zip
- https://zlib.net/zlib-1.2.11.tar.gz
- https://github.com/jemalloc/jemalloc/archive/4.4.0.tar.gz -> jemalloc-4.4.0.tar.gz
- python? (
- http://ftp.exim.org/pub/pcre/pcre-8.39.tar.gz
- http://ufpr.dl.sourceforge.net/project/swig/swig/swig-3.0.8/swig-3.0.8.tar.gz
- https://curl.haxx.se/download/curl-7.49.1.tar.gz
- https://github.com/NVlabs/cub/archive/1.8.0.zip -> cub-1.8.0.zip
- https://github.com/abseil/abseil-py/archive/ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz -> abseil-py-ea8c4d2ddbf3fba610c4d613260561699b776db8.tar.gz
- https://github.com/aws/aws-sdk-cpp/archive/1.3.15.tar.gz -> aws_sdk_cpp-1.3.15.tar.gz
- https://github.com/cython/cython/archive/3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz -> cython-3732784c45cfb040a5b0936951d196f83a12ea17.tar.gz
- https://github.com/edenhill/librdkafka/archive/v0.11.1.tar.gz -> librdkafka-v0.11.1.tar.gz
- https://github.com/google/boringssl/archive/a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz -> boringssl-a0fb951d2a26a8ee746b52f3ba81ab011a0af778.tar.gz
- https://github.com/google/flatbuffers/archive/971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz -> flatbuffers-971a68110e4fc1bace10fcb6deeb189e7e1a34ce.tar.gz
- https://github.com/hfp/libxsmm/archive/1.8.1.tar.gz -> libxsmm-1.8.1.tar.gz
- https://github.com/intel/ARM_NEON_2_x86_SSE/archive/0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz -> ARM_NEON_2_x86_SSE-0f77d9d182265259b135dad949230ecbf1a2633d.tar.gz
- https://github.com/intel/mkl-dnn/archive/v0.12.tar.gz -> mkl_dnn-v0.12.tar.gz
- https://github.com/llvm-mirror/llvm/archive/7e78daafdd22f3f17720a103d29d89590534004e.tar.gz -> llvm-7e78daafdd22f3f17720a103d29d89590534004e.tar.gz
- https://mirror.bazel.build/docs.python.org/2.7/_sources/license.txt -> tensorflow-python-license.txt
- https://pypi.python.org/packages/5c/78/ff794fcae2ce8aa6323e789d1f8b3b7765f601e7702726f430e814822b96/gast-0.2.0.tar.gz
- https://pypi.python.org/packages/8a/48/a76be51647d0eb9f10e2a4511bf3ffb8cc1e6b14e9e4fab46173aa79f981/termcolor-1.1.0.tar.gz
- https://pypi.python.org/packages/bc/cc/3cdb0a02e7e96f6c70bd971bc8a90b8463fda83e264fa9c5c1c98ceabd81/backports.weakref-1.0rc1.tar.gz
- https://pypi.python.org/packages/d8/be/c4276b3199ec3feee2a88bc64810fbea8f26d961e0a4cd9c68387a9f35de/astor-0.6.2.tar.gz
- https://pypi.python.org/packages/source/s/six/six-1.10.0.tar.gz
- )"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
- ${bazel_external_uris}"
-
-RDEPEND="
- app-arch/snappy
- dev-db/lmdb
- dev-db/sqlite
- dev-libs/libpcre
- dev-libs/protobuf
- dev-libs/protobuf-c
- >=dev-libs/re2-0.2018.04.01
- media-libs/giflib
- media-libs/libpng:0
- net-libs/grpc[${PYTHON_USEDEP}]
- net-misc/curl
- sys-libs/zlib
- virtual/jpeg:0
- cuda? ( >=dev-util/nvidia-cuda-toolkit-8.0.61[profiler] >=dev-libs/cudnn-6.0 )
- jemalloc? ( >=dev-libs/jemalloc-4.4.0 )
- mpi? ( virtual/mpi )
- python? (
- ${PYTHON_DEPS}
- dev-python/absl-py[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/protobuf-python[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- dev-python/termcolor[${PYTHON_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- !python? ( dev-lang/python )
- app-arch/unzip
- >=dev-util/bazel-0.14.0
- dev-java/java-config
- dev-lang/nasm
- dev-lang/swig
- dev-python/cython
- dev-python/mock"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-PATCHES=(
-)
-
-bazel-get-cpu-flags() {
- local i f=()
- # Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
- for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
- use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
- done
- use cpu_flags_x86_fma3 && f+=( -mfma )
- echo "${f[*]}"
-}
-
-bazel-get-flags() {
- local i fs=()
- for i in ${CFLAGS} $(bazel-get-cpu-flags); do
- fs+=( "--copt=${i}" "--host_copt=${i}" )
- done
- for i in ${CXXFLAGS} $(bazel-get-cpu-flags); do
- fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
- done
- for i in ${CPPFLAGS}; do
- fs+=( "--copt=${i}" "--host_copt=${i}" )
- fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
- done
- for i in ${LDFLAGS}; do
- fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
- done
- echo "${fs[*]}"
-}
-
-setup_bazelrc() {
- if [[ -f "${T}/bazelrc" ]]; then
- return
- fi
-
- # F: fopen_wr
- # P: /proc/self/setgroups
- # Even with standalone enabled, the Bazel sandbox binary is run for feature test:
- # https://github.com/bazelbuild/bazel/blob/7b091c1397a82258e26ab5336df6c8dae1d97384/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java#L61
- # https://github.com/bazelbuild/bazel/blob/76555482873ffcf1d32fb40106f89231b37f850a/src/main/tools/linux-sandbox-pid1.cc#L113
- addpredict /proc
-
- mkdir -p "${T}/bazel-cache" || die
- mkdir -p "${T}/bazel-distdir" || die
-
- cat > "${T}/bazelrc" <<-EOF
- startup --batch
-
- # dont strip HOME, portage sets a temp per-package dir
- build --action_env HOME
-
- # make bazel respect MAKEOPTS
- build --jobs=$(makeopts_jobs) $(bazel-get-flags)
- build --compilation_mode=opt --host_compilation_mode=opt
-
- # Use standalone strategy to deactivate the bazel sandbox, since it
- # conflicts with FEATURES=sandbox.
- build --spawn_strategy=standalone --genrule_strategy=standalone
- test --spawn_strategy=standalone --genrule_strategy=standalone
-
- build --strip=never
- build --verbose_failures --noshow_loading_progress
- test --verbose_test_summary --verbose_failures --noshow_loading_progress
-
- # make bazel only fetch distfiles from the cache
- fetch --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
- build --repository_cache=${T}/bazel-cache/ --experimental_distdir=${T}/bazel-distdir/
- EOF
-}
-
-ebazel() {
- setup_bazelrc
-
- # Use different build folders for each multibuild variant.
- local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
- local output_base="${WORKDIR}/bazel-base${base_suffix}"
- mkdir -p "${output_base}" || die
-
- einfo Running: bazel --output_base="${output_base}" "$@"
- bazel --output_base="${output_base}" $@ || die
-}
-
-load_distfiles() {
- # Populate the bazel distdir to fetch from since it cannot use the network
- local src dst uri rename
-
- while read uri rename dst; do
- src="${uri##*/}"
- [[ -z $src ]] && continue
- if [[ "$rename" != "->" ]]; then
- dst="${src}"
- fi
-
- [[ ${A} =~ ${dst} ]] || continue
-
- if [[ "$dst" == "$src" ]]; then
- einfo "Copying $dst to bazel distdir $src ..."
- else
- einfo "Copying $dst to bazel distdir ..."
- fi
- cp "${DISTDIR}/${dst}" "${T}/bazel-distdir/${src}" || die
- done <<< "$(sed -re 's/!?[A-Za-z]+\?\s+\(\s*//g; s/\s+\)//' <<< "${bazel_external_uris}")"
-}
-
-pkg_setup() {
- export JAVA_HOME=$(java-config --jre-home)
-}
-
-src_unpack() {
- # Only unpack the main distfile
- unpack "${P}.tar.gz"
-}
-
-src_prepare() {
- BAZEL_OUTPUT_BASE="${WORKDIR}/bazel-base"
- mkdir -p "${BAZEL_OUTPUT_BASE}" || die
- setup_bazelrc
- load_distfiles
-
- default
- use python && python_copy_sources
-}
-
-src_configure() {
- do_configure() {
- export CC_OPT_FLAGS=""
- export GCC_HOST_COMPILER_PATH=$(which $(tc-getCC))
- export TF_NEED_JEMALLOC=$(usex jemalloc 1 0)
- export TF_NEED_GCP=0
- export TF_NEED_HDFS=0
- export TF_NEED_S3=0
- export TF_NEED_KAFKA=0
- export TF_ENABLE_XLA=0
- export TF_NEED_GDR=0
- export TF_NEED_VERBS=0
- export TF_NEED_OPENCL_SYCL=0
- export TF_NEED_OPENCL=0
- export TF_NEED_COMPUTECPP=0
- export TF_NEED_MKL=0
- export TF_NEED_MPI=$(usex mpi 1 0)
- export TF_DOWNLOAD_CLANG=0
- export TF_NEED_CUDA=$(usex cuda 1 0)
- export TF_SET_ANDROID_WORKSPACE=0
-
- if use python; then
- python_export PYTHON_SITEDIR
- export PYTHON_BIN_PATH="${PYTHON}"
- export PYTHON_LIB_PATH="${PYTHON_SITEDIR}"
- else
- export PYTHON_BIN_PATH="$(which python)"
- export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
- fi
-
- # Only one bazelrc is read, import our one before configure sets its options
- echo "import ${T}/bazelrc" >> ./.bazelrc
-
- # This is not autoconf
- ./configure || die
-
- sed -i '/strip=always/d' .tf_configure.bazelrc || die
- }
- if use python; then
- python_foreach_impl run_in_build_dir do_configure
- else
- do_configure
- fi
-}
-
-src_compile() {
- if use python; then
- python_setup
- local MULTIBUILD_VARIANT="${EPYTHON/./_}"
- cd "${S}-${MULTIBUILD_VARIANT}" || die
- fi
-
- ebazel build \
- $(usex cuda --config=cuda '') \
- //tensorflow:libtensorflow_framework.so \
- //tensorflow:libtensorflow.so \
- //tensorflow:libtensorflow_cc.so
-
- do_compile() {
- ebazel build \
- $(usex cuda --config=cuda '') \
- //tensorflow/tools/pip_package:build_pip_package
- }
- use python && python_foreach_impl run_in_build_dir do_compile
-}
-
-src_install() {
- do_install() {
- einfo "Installing ${EPYTHON} files"
- local srcdir="${T}/src-${EPYTHON/./_}"
- mkdir -p "${srcdir}" || die
- bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
- cd "${srcdir}" || die
- esetup.py install
-
- # It installs site-packages/external but shouldnt
- python_export PYTHON_SITEDIR
- rm -rf "${D}/${PYTHON_SITEDIR}/external" || die
- sed -i '/^external/d' "${D}/${PYTHON_SITEDIR}"/${P/_rc/rc}-*.egg-info/{SOURCES,top_level}.txt || die
-
- # Symlink to the main .so file
- rm -rf "${D}/${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
- dosym "../../../lib${PN}_framework.so" "${PYTHON_SITEDIR}/${PN}/lib${PN}_framework.so" || die
-
- python_optimize
- }
-
- if use python; then
- python_foreach_impl run_in_build_dir do_install
-
- # Symlink to python-exec scripts
- for i in "${D}"/usr/lib/python-exec/*/*; do
- n="${i##*/}"
- [[ -e "${D}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/$n"
- done
-
- python_setup
- local MULTIBUILD_VARIANT="${EPYTHON/./_}"
- cd "${S}-${MULTIBUILD_VARIANT}" || die
- fi
-
- einfo "Installing headers"
- # Install c c++ and core header files
- for i in $(find ${PN}/{c,cc,core} -name "*.h"); do
- insinto /usr/include/${PN}/${i%/*}
- doins ${i}
- done
-
- # Eigen headers
- insinto /usr/include/${PN}/third_party/eigen3/Eigen/
- doins third_party/eigen3/Eigen/*
-
- einfo "Installing libs"
- # Generate pkg-config file
- ${PN}/c/generate-pc.sh --prefix=/usr --libdir=$(get_libdir) --version=${MY_PV} || die
- insinto /usr/$(get_libdir)/pkgconfig
- doins ${PN}.pc
-
- dolib.so bazel-bin/tensorflow/lib${PN}_framework.so
- dolib.so bazel-bin/tensorflow/lib${PN}.so
- dolib.so bazel-bin/tensorflow/lib${PN}_cc.so
-
- einstalldocs
-}
diff --git a/sci-libs/tensorflow/tensorflow-1.9.0_rc1.ebuild b/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r1.ebuild
similarity index 94%
rename from sci-libs/tensorflow/tensorflow-1.9.0_rc1.ebuild
rename to sci-libs/tensorflow/tensorflow-1.9.0_rc1-r1.ebuild
index 207901b88346..cdd7f2db1800 100644
--- a/sci-libs/tensorflow/tensorflow-1.9.0_rc1.ebuild
+++ b/sci-libs/tensorflow/tensorflow-1.9.0_rc1-r1.ebuild
@@ -111,8 +111,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
S="${WORKDIR}/${MY_P}"
DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
-PATCHES=(
-)
bazel-get-cpu-flags() {
local i f=()
@@ -304,6 +302,7 @@ src_compile() {
}
src_install() {
+ local i j
do_install() {
einfo "Installing ${EPYTHON} files"
local srcdir="${T}/src-${EPYTHON/./_}"
@@ -338,6 +337,9 @@ src_install() {
cd "${S}-${MULTIBUILD_VARIANT}" || die
fi
+ local base_suffix="${MULTIBUILD_VARIANT+-}${MULTIBUILD_VARIANT}"
+ local output_base="${WORKDIR}/bazel-base${base_suffix}"
+
einfo "Installing headers"
# Install c c++ and core header files
for i in $(find ${PN}/{c,cc,core} -name "*.h"); do
@@ -345,9 +347,23 @@ src_install() {
doins ${i}
done
- # Eigen headers
- insinto /usr/include/${PN}/third_party/eigen3/Eigen/
- doins third_party/eigen3/Eigen/*
+ einfo "Installing generated headers"
+ for i in $(find bazel-genfiles/${PN}/{cc,core} -name "*.h"); do
+ j=${i#bazel-genfiles/}
+ insinto /usr/include/${PN}/${j%/*}
+ doins ${i}
+ done
+
+ einfo "Installing Eigen headers"
+ insinto /usr/include/${PN}/third_party/eigen3/
+ doins -r third_party/eigen3/Eigen
+ insinto /usr/include/${PN}/third_party/eigen3/unsupported/
+ doins -r third_party/eigen3/unsupported/Eigen
+
+ insinto /usr/include/${PN}/
+ doins -r "$output_base"/external/eigen_archive/Eigen
+ insinto /usr/include/${PN}/unsupported/
+ doins -r "$output_base"/external/eigen_archive/unsupported/Eigen
einfo "Installing libs"
# Generate pkg-config file
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 8963c3491e65..1b19ca2434ce 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/attr/attr-2.4.48-r1.ebuild b/sys-apps/attr/attr-2.4.48-r2.ebuild
similarity index 100%
rename from sys-apps/attr/attr-2.4.48-r1.ebuild
rename to sys-apps/attr/attr-2.4.48-r2.ebuild
diff --git a/sys-apps/attr/files/xattr-shim.h b/sys-apps/attr/files/xattr-shim.h
index 818b4c1690c7..88a12354318d 100644
--- a/sys-apps/attr/files/xattr-shim.h
+++ b/sys-apps/attr/files/xattr-shim.h
@@ -3,4 +3,7 @@
#define __XATTR_H__
#include
#warning "Please change your includes to "
+# ifndef ENOATTR
+# define ENOATTR ENODATA
+# endif /* ENOATTR */
#endif
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 4fa1a53bfb2d..74fc079beea1 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,3 +1,2 @@
-DIST diffutils-3.3.tar.xz 1197832 BLAKE2B 8819e84f6d1d9ae30dccba01934ba506fd9e2033cc7ac8e2dc827868f6b8ce54c76129167d8754215d0637f9e731ca1176ffa83abd80eb95e37a29776e29afa1 SHA512 b04b998717e45e8fd1ba675957dad1909beeed68ffc41c0d9bbaddaf78965f9e63af5a8d8811bb94f33a3cddcad2fe1ad794e52e545def9ce96c092999a74a83
DIST diffutils-3.5.tar.xz 1360996 BLAKE2B a2348911daff19a73a00985e8528888306f88be36bc2b2433bbd1a2a4dd37da06845df718c797b571e85b7f7fdaac8cb0514098b4c14dd634d531d12ba034be6 SHA512 758229637e3703215adf66c5df04126ae594424abaf2cad8f1fa482bd9759e90838c943ef56e0129beb1396f5932ed9337c8396679da3de32e49bb43d423fd6b
DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d SHA512 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
diff --git a/sys-apps/diffutils/diffutils-3.3.ebuild b/sys-apps/diffutils/diffutils-3.3.ebuild
deleted file mode 100644
index ebe4d3023998..000000000000
--- a/sys-apps/diffutils/diffutils-3.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit flag-o-matic
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://www.gnu.org/software/diffutils/"
-SRC_URI="mirror://gnu-alpha/diffutils/${P}.tar.xz
- mirror://gnu/diffutils/${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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-DEPEND="app-arch/xz-utils
- nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_prepare() {
- # Disable gnulib build test that has no impact on the source.
- # Re-enable w/next version bump (and gnulib is updated). #554728
- [[ ${PV} != "3.3" ]] && die "re-enable test #554728"
- echo 'exit 0' > gnulib-tests/test-update-copyright.sh || die
-
- sed -i 's:@mkdir_p@:@MKDIR_P@:g' po/Makefile.in.in || die #464604
-}
-
-src_configure() {
- use static && append-ldflags -static
-
- # Disable automagic dependency over libsigsegv; see bug #312351.
- export ac_cv_libsigsegv=no
-
- econf \
- --with-packager="Gentoo" \
- --with-packager-version="${PVR}" \
- --with-packager-bug-reports="https://bugs.gentoo.org/" \
- $(use_enable nls)
-}
-
-src_test() {
- # explicitly allow parallel testing
- emake check
-}
diff --git a/sys-apps/diffutils/diffutils-3.5.ebuild b/sys-apps/diffutils/diffutils-3.5.ebuild
index 5a731d693b20..af38207bd6b3 100644
--- a/sys-apps/diffutils/diffutils-3.5.ebuild
+++ b/sys-apps/diffutils/diffutils-3.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${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 ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static"
DEPEND="app-arch/xz-utils
diff --git a/sys-apps/diffutils/diffutils-3.6.ebuild b/sys-apps/diffutils/diffutils-3.6.ebuild
deleted file mode 100644
index 58f25710df80..000000000000
--- a/sys-apps/diffutils/diffutils-3.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic
-
-DESCRIPTION="Tools to make diffs and compare files"
-HOMEPAGE="https://www.gnu.org/software/diffutils/"
-SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
- mirror://gnu-alpha/diffutils/${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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls static"
-
-DEPEND="app-arch/xz-utils
- nls? ( sys-devel/gettext )"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-src_configure() {
- use static && append-ldflags -static
-
- # Disable automagic dependency over libsigsegv; see bug #312351.
- export ac_cv_libsigsegv=no
-
- local myeconfargs=(
- --with-packager="Gentoo"
- --with-packager-version="${PVR}"
- --with-packager-bug-reports="https://bugs.gentoo.org/"
- $(use_enable nls)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_test() {
- # explicitly allow parallel testing
- emake check
-}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index e5fb79cb1b2b..25da8f481e0e 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,2 +1 @@
-DIST file-5.32.tar.gz 797025 BLAKE2B d00196a2331b7325acc1b3f52d011faa3864db526f1962e4fcb769a92a715a1ee9874750cdde8f7c5c48541ecedea36c0fbd788a5ee9eb175cfcfc984acec430 SHA512 315343229fa196335389544ee8010e9e80995ef4721938492dedcfb0465dfc45e1feb96f26dfe53cab484fb5d9bac54d2d72917fbfd28a1d998c6ad8c8f9792f
DIST file-5.33.tar.gz 817060 BLAKE2B 735f176f09085243dacaddda1b734ef2191ff1684f08022ed1874e84fd0c84679b5a765383c5c5ad27a7216abc23b9c2211fb7110846122563e18285de0f0e51 SHA512 36c9f2e2aa814b5557eef114fdd3de159688c7a3c9632a9f5c6355c4d2a5694cee81279bda80897616fca07289a7fedb1f797439a2903c76dc84870694773c9e
diff --git a/sys-apps/file/file-5.32-r1.ebuild b/sys-apps/file/file-5.32-r1.ebuild
deleted file mode 100644
index 389e0e1c2d7f..000000000000
--- a/sys-apps/file/file-5.32-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/glensc/file.git"
- inherit autotools git-r3
-else
- SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
- 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"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="python static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
- python? ( !dev-python/python-magic )"
-
-src_prepare() {
- default
-
- [[ ${PV} == "9999" ]] && eautoreconf
- elibtoolize
-
- # don't let python README kill main README #60043
- mv python/README{,.python} || die
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-fsect-man5
- $(use_enable static-libs static)
- $(use_enable zlib)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # when cross-compiling, we need to build up our own file
- # because people often don't keep matching host/target
- # file versions #362941
- if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
- mkdir -p "${WORKDIR}"/build || die
- cd "${WORKDIR}"/build || die
- tc-export_build_env BUILD_C{C,XX}
- ECONF_SOURCE=${S} \
- ac_cv_header_zlib_h=no \
- ac_cv_lib_z_gzopen=no \
- CHOST=${CBUILD} \
- CFLAGS=${BUILD_CFLAGS} \
- CXXFLAGS=${BUILD_CXXFLAGS} \
- CPPFLAGS=${BUILD_CPPFLAGS} \
- LDFLAGS="${BUILD_LDFLAGS} -static" \
- CC=${BUILD_CC} \
- CXX=${BUILD_CXX} \
- econf --disable-shared
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi ; then
- emake
- else
- cd src || die
- emake magic.h #586444
- emake libmagic.la
- fi
-}
-
-src_compile() {
- if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
- emake -C "${WORKDIR}"/build/src magic.h #586444
- emake -C "${WORKDIR}"/build/src file
- PATH="${WORKDIR}/build/src:${PATH}"
- fi
- multilib-minimal_src_compile
-
- if use python ; then
- cd python || die
- distutils-r1_src_compile
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi ; then
- default
- else
- emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
- fi
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog MAINT README
-
- # Required for `file -C`
- dodir /usr/share/misc/magic
- insinto /usr/share/misc/magic
- doins -r magic/Magdir/*
-
- if use python ; then
- cd python || die
- distutils-r1_src_install
- fi
- prune_libtool_files
-}
diff --git a/sys-apps/file/file-5.33-r1.ebuild b/sys-apps/file/file-5.33-r1.ebuild
deleted file mode 100644
index ffec3650582f..000000000000
--- a/sys-apps/file/file-5.33-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
- EGIT_REPO_URI="https://github.com/glensc/file.git"
- inherit autotools git-r3
-else
- SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
- 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"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="python static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
- python? ( !dev-python/python-magic )"
-
-src_prepare() {
- default
-
- [[ ${PV} == "9999" ]] && eautoreconf
- elibtoolize
-
- # don't let python README kill main README #60043
- mv python/README{,.python} || die
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --disable-libseccomp
- --enable-fsect-man5
- $(use_enable static-libs static)
- $(use_enable zlib)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_configure() {
- # when cross-compiling, we need to build up our own file
- # because people often don't keep matching host/target
- # file versions #362941
- if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
- mkdir -p "${WORKDIR}"/build || die
- cd "${WORKDIR}"/build || die
- tc-export_build_env BUILD_C{C,XX}
- ECONF_SOURCE=${S} \
- ac_cv_header_zlib_h=no \
- ac_cv_lib_z_gzopen=no \
- CHOST=${CBUILD} \
- CFLAGS=${BUILD_CFLAGS} \
- CXXFLAGS=${BUILD_CXXFLAGS} \
- CPPFLAGS=${BUILD_CPPFLAGS} \
- LDFLAGS="${BUILD_LDFLAGS} -static" \
- CC=${BUILD_CC} \
- CXX=${BUILD_CXX} \
- econf --disable-shared --disable-libseccomp
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi ; then
- emake
- else
- cd src || die
- emake magic.h #586444
- emake libmagic.la
- fi
-}
-
-src_compile() {
- if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
- emake -C "${WORKDIR}"/build/src magic.h #586444
- emake -C "${WORKDIR}"/build/src file
- PATH="${WORKDIR}/build/src:${PATH}"
- fi
- multilib-minimal_src_compile
-
- if use python ; then
- cd python || die
- distutils-r1_src_compile
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi ; then
- default
- else
- emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
- fi
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog MAINT README
-
- # Required for `file -C`
- dodir /usr/share/misc/magic
- insinto /usr/share/misc/magic
- doins -r magic/Magdir/*
-
- if use python ; then
- cd python || die
- distutils-r1_src_install
- fi
- prune_libtool_files
-}
diff --git a/sys-apps/file/file-5.33-r2.ebuild b/sys-apps/file/file-5.33-r2.ebuild
index d708cfc8c6e0..c01383f72055 100644
--- a/sys-apps/file/file-5.33-r2.ebuild
+++ b/sys-apps/file/file-5.33-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
- 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/ipmicfg/Manifest b/sys-apps/ipmicfg/Manifest
index e35d9f114709..9d0f7d6dbe56 100644
--- a/sys-apps/ipmicfg/Manifest
+++ b/sys-apps/ipmicfg/Manifest
@@ -1 +1 @@
-DIST IPMICFG_1.27.1_build.170901.zip 1667230 BLAKE2B 6411f735fed2e66f8dc012c480e6f9a4c2c9223643074514ca6fbb0db62df06fd78714c4a95ce92edc22a4473734a1d41a6c3bdb61268c73a628f08e7dc87c0e SHA512 9ed01a8a1eae7a7e41fafdbb3b666e7760057c960b65da547f0cf197b30b1a535fa2fe8357e13e6ccda0e0dd4474170b43ca3bc89f55c2de5df0160adde9377e
+DIST IPMICFG_1.28.0_build.180302.zip 1722771 BLAKE2B fde93f75714aac9f79cb76e0a11f4747a933f28eb06c4daf09113e75e0fb26c57e8cf54ad58cff040d3a37427c74d699eef9532db256fe5ae2344667a542b342 SHA512 764103de5cf7109a20216d5277ba038747cea16dc78563876b38a8c830d8437bcdf06e0e55db68ad44b32b2a3043535f5c307b3bdaca40bcb04ee05bd097610e
diff --git a/sys-apps/ipmicfg/ipmicfg-1.27.1.170901.ebuild b/sys-apps/ipmicfg/ipmicfg-1.28.0.180302.ebuild
similarity index 100%
rename from sys-apps/ipmicfg/ipmicfg-1.27.1.170901.ebuild
rename to sys-apps/ipmicfg/ipmicfg-1.28.0.180302.ebuild
diff --git a/sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild b/sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild
index 6e9bec6bc7b8..b4cf05b00236 100644
--- a/sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild
+++ b/sys-apps/paludis/paludis-3.0.0_pre20180214.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://git.exherbo.org/paludis/paludis.git/snapshot/${MY_P}.tar.xz"
IUSE="doc pbins pink python ruby ruby_targets_ruby${RUBY_VER/./} search-index test +xml"
LICENSE="GPL-2 vim"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
COMMON_DEPEND="
>=app-admin/eselect-1.2.13
diff --git a/sys-apps/sed/sed-4.5.ebuild b/sys-apps/sed/sed-4.5.ebuild
index c2387e587926..0ea277338350 100644
--- a/sys-apps/sed/sed-4.5.ebuild
+++ b/sys-apps/sed/sed-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${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="acl forced-sandbox nls selinux static"
RDEPEND="acl? ( virtual/acl )
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 23817fde3a41..47959ffa234d 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -2,3 +2,4 @@ DIST systemd-236-patches-2.tar.gz 54737 BLAKE2B bce5f9e234c975a2b6e474ca2a0c2c82
DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
DIST systemd-238-patches-1.tar.gz 47512 BLAKE2B 9edf8835ec7bba43bd00b1481b23bc5a4148030724633a8bfe1e82ec48b79699d4822b0bc5ea3a979b404e706efa9c0eae8e0460d76658ba2e901c4853da0c04 SHA512 809d8a3a9a023217b509b738e0d341d060f1343df6159e5acfcededfb452986de140ddf4b879a5157fba1a5646d00db8b6537aba8358c48f75fd6527f881a14c
DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8
+DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f
diff --git a/sys-apps/systemd/systemd-239.ebuild b/sys-apps/systemd/systemd-239.ebuild
new file mode 100644
index 000000000000..779db468b79b
--- /dev/null
+++ b/sys-apps/systemd/systemd-239.ebuild
@@ -0,0 +1,443 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}/${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+ sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+ !=sys-process/audit-2:0= )
+ cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+ curl? ( net-misc/curl:0= )
+ elfutils? ( >=dev-libs/elfutils-0.158:0= )
+ gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+ http? (
+ >=net-libs/libmicrohttpd-0.9.33:0=
+ ssl? ( >=net-libs/gnutls-3.1.4:0= )
+ )
+ idn? (
+ libidn2? ( net-dns/libidn2:= )
+ !libidn2? ( net-dns/libidn:= )
+ )
+ importd? (
+ app-arch/bzip2:0=
+ sys-libs/zlib:0=
+ )
+ kmod? ( >=sys-apps/kmod-15:0= )
+ lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+ nat? ( net-firewall/iptables:0= )
+ pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+ pcre? ( dev-libs/libpcre2 )
+ qrcode? ( media-gfx/qrencode:0= )
+ seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
+ selinux? ( sys-libs/libselinux:0= )
+ xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+ >=sys-apps/baselayout-2.2
+ selinux? ( sec-policy/selinux-base-policy[systemd] )
+ sysv-utils? ( !sys-apps/sysvinit )
+ !sysv-utils? ( sys-apps/sysvinit )
+ resolvconf? ( !net-dns/openresolv )
+ !build? ( || (
+ sys-apps/util-linux[kill(-)]
+ sys-process/procps[kill(+)]
+ sys-apps/coreutils[kill(-)]
+ ) )
+ !sys-auth/nss-myhostname
+ !=sys-apps/dbus-1.9.8[systemd]
+ >=sys-apps/hwids-20150417[udev]
+ >=sys-fs/udev-init-scripts-25
+ policykit? ( sys-auth/polkit )
+ !vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils:0
+ dev-util/gperf
+ >=dev-util/intltool-0.50
+ >=sys-apps/coreutils-8.16
+ >=sys-kernel/linux-headers-${MINKV}
+ virtual/pkgconfig
+ gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+ test? ( sys-apps/dbus )
+ app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt:0
+ $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+ if [[ ${MERGE_TYPE} != buildonly ]]; then
+ local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+ ~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+ ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+ ~TIMERFD ~TMPFS_XATTR ~UNIX
+ ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+ ~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+ ~!SYSFS_DEPRECATED_V2"
+
+ use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+ use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+ kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+ kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+ kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+ if linux_config_exists; then
+ local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+ if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+ ewarn "It's recommended to set an empty value to the following kernel config option:"
+ ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+ fi
+ if linux_chkconfig_present X86; then
+ CONFIG_CHECK+=" ~DMIID"
+ fi
+ fi
+
+ if kernel_is -lt ${MINKV//./ }; then
+ ewarn "Kernel version at least ${MINKV} required"
+ fi
+
+ check_extra_config
+ fi
+}
+
+pkg_setup() {
+ :
+}
+
+src_unpack() {
+ default
+ [[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+ # Do NOT add patches here
+ local PATCHES=()
+
+ [[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+ # Add local patches here
+ PATCHES+=(
+ )
+
+ if ! use vanilla; then
+ PATCHES+=(
+ "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
+ "${FILESDIR}/gentoo-systemd-user-pam.patch"
+ "${FILESDIR}/gentoo-uucp-group-r1.patch"
+ "${FILESDIR}/gentoo-generator-path.patch"
+ )
+ fi
+
+ default
+}
+
+src_configure() {
+ # Prevent conflicts with i686 cross toolchain, bug 559726
+ tc-export AR CC NM OBJCOPY RANLIB
+
+ python_setup
+
+ multilib-minimal_src_configure
+}
+
+meson_use() {
+ usex "$1" true false
+}
+
+meson_multilib() {
+ if multilib_is_native_abi; then
+ echo true
+ else
+ echo false
+ fi
+}
+
+meson_multilib_native_use() {
+ if multilib_is_native_abi && use "$1"; then
+ echo true
+ else
+ echo false
+ fi
+}
+
+multilib_src_configure() {
+ local myconf=(
+ --localstatedir="${EPREFIX}/var"
+ -Dpamlibdir="$(getpam_mod_dir)"
+ # avoid bash-completion dep
+ -Dbashcompletiondir="$(get_bashcompdir)"
+ # make sure we get /bin:/sbin in PATH
+ -Dsplit-usr=$(usex split-usr true false)
+ -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
+ -Dsysvinit-path=
+ -Dsysvrcnd-path=
+ # Avoid infinite exec recursion, bug 642724
+ -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
+ # no deps
+ -Defi=$(meson_multilib)
+ -Dima=true
+ # Optional components/dependencies
+ -Dacl=$(meson_multilib_native_use acl)
+ -Dapparmor=$(meson_multilib_native_use apparmor)
+ -Daudit=$(meson_multilib_native_use audit)
+ -Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+ -Dlibcurl=$(meson_multilib_native_use curl)
+ -Delfutils=$(meson_multilib_native_use elfutils)
+ -Dgcrypt=$(meson_use gcrypt)
+ -Dgnu-efi=$(meson_multilib_native_use gnuefi)
+ -Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
+ -Dmicrohttpd=$(meson_multilib_native_use http)
+ $(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
+ -Dimportd=$(meson_multilib_native_use importd)
+ -Dbzip2=$(meson_multilib_native_use importd)
+ -Dzlib=$(meson_multilib_native_use importd)
+ -Dkmod=$(meson_multilib_native_use kmod)
+ -Dlz4=$(meson_use lz4)
+ -Dxz=$(meson_use lzma)
+ -Dlibiptc=$(meson_multilib_native_use nat)
+ -Dpam=$(meson_use pam)
+ -Dpcre2=$(meson_multilib_native_use pcre)
+ -Dpolkit=$(meson_multilib_native_use policykit)
+ -Dqrencode=$(meson_multilib_native_use qrcode)
+ -Dseccomp=$(meson_multilib_native_use seccomp)
+ -Dselinux=$(meson_multilib_native_use selinux)
+ #-Dtests=$(meson_multilib_native_use test)
+ -Ddbus=$(meson_multilib_native_use test)
+ -Dxkbcommon=$(meson_multilib_native_use xkb)
+ # hardcode a few paths to spare some deps
+ -Dkill-path=/bin/kill
+ -Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+ # Breaks screen, tmux, etc.
+ -Ddefault-kill-user-processes=false
+
+ # multilib options
+ -Dbacklight=$(meson_multilib)
+ -Dbinfmt=$(meson_multilib)
+ -Dcoredump=$(meson_multilib)
+ -Denvironment-d=$(meson_multilib)
+ -Dfirstboot=$(meson_multilib)
+ -Dhibernate=$(meson_multilib)
+ -Dhostnamed=$(meson_multilib)
+ -Dhwdb=$(meson_multilib)
+ -Dldconfig=$(meson_multilib)
+ -Dlocaled=$(meson_multilib)
+ -Dman=$(meson_multilib)
+ -Dnetworkd=$(meson_multilib)
+ -Dquotacheck=$(meson_multilib)
+ -Drandomseed=$(meson_multilib)
+ -Drfkill=$(meson_multilib)
+ -Dsysusers=$(meson_multilib)
+ -Dtimedated=$(meson_multilib)
+ -Dtimesyncd=$(meson_multilib)
+ -Dtmpfiles=$(meson_multilib)
+ -Dvconsole=$(meson_multilib)
+ )
+
+ if multilib_is_native_abi && use idn; then
+ myconf+=(
+ -Dlibidn2=$(usex libidn2 true false)
+ -Dlibidn=$(usex libidn2 false true)
+ )
+ else
+ myconf+=(
+ -Dlibidn2=false
+ -Dlibidn=false
+ )
+ fi
+
+ meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+ eninja
+}
+
+multilib_src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
+ eninja test
+}
+
+multilib_src_install() {
+ DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+ local rootprefix=$(usex split-usr '' /usr)
+
+ # meson doesn't know about docdir
+ mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
+
+ einstalldocs
+ dodoc "${FILESDIR}"/nsswitch.conf
+
+ if ! use resolvconf; then
+ rm -f "${ED%/}${rootprefix}"/sbin/resolvconf || die
+ fi
+
+ if ! use sysv-utils; then
+ rm "${ED%/}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
+ rmdir "${ED%/}${rootprefix}"/sbin || die
+ rm "${ED%/}"/usr/share/man/man1/init.1 || die
+ rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
+ fi
+
+ # Preserve empty dirs in /etc & /var, bug #437008
+ keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
+ keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
+ keepdir /etc/udev/{hwdb.d,rules.d}
+ keepdir /var/log/journal/remote
+
+ # Symlink /etc/sysctl.conf for easy migration.
+ dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+ # If we install these symlinks, there is no way for the sysadmin to remove them
+ # permanently.
+ rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+ rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
+ rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+ rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
+ rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die
+ rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die
+ rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
+
+ local udevdir=/lib/udev
+ use split-usr || udevdir=/usr/lib/udev
+
+ rm -r "${ED%/}${udevdir}/hwdb.d" || die
+
+ if use split-usr; then
+ # Avoid breaking boot/reboot
+ dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+ dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+ fi
+}
+
+migrate_locale() {
+ local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+ local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+ local locale_conf="${EROOT%/}/etc/locale.conf"
+
+ if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+ # If locale.conf does not exist...
+ if [[ -e ${envd_locale} ]]; then
+ # ...either copy env.d/??locale if there's one
+ ebegin "Moving ${envd_locale} to ${locale_conf}"
+ mv "${envd_locale}" "${locale_conf}"
+ eend ${?} || FAIL=1
+ else
+ # ...or create a dummy default
+ ebegin "Creating ${locale_conf}"
+ cat > "${locale_conf}" <<-EOF
+ # This file has been created by the sys-apps/systemd ebuild.
+ # See locale.conf(5) and localectl(1).
+
+ # LANG=${LANG}
+ EOF
+ eend ${?} || FAIL=1
+ fi
+ fi
+
+ if [[ ! -L ${envd_locale} ]]; then
+ # now, if env.d/??locale is not a symlink (to locale.conf)...
+ if [[ -e ${envd_locale} ]]; then
+ # ...warn the user that he has duplicate locale settings
+ ewarn
+ ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+ ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+ ewarn "and create the symlink with the following command:"
+ ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+ ewarn
+ else
+ # ...or just create the symlink if there's nothing here
+ ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+ ln -n -s ../locale.conf "${envd_locale_def}"
+ eend ${?} || FAIL=1
+ fi
+ fi
+}
+
+pkg_postinst() {
+ newusergroup() {
+ enewgroup "$1"
+ enewuser "$1" -1 -1 -1 "$1"
+ }
+
+ enewgroup input
+ enewgroup kvm 78
+ enewgroup render
+ enewgroup systemd-journal
+ newusergroup systemd-bus-proxy
+ newusergroup systemd-coredump
+ newusergroup systemd-journal-gateway
+ newusergroup systemd-journal-remote
+ newusergroup systemd-journal-upload
+ newusergroup systemd-network
+ newusergroup systemd-resolve
+ newusergroup systemd-timesync
+
+ systemd_update_catalog
+
+ # Keep this here in case the database format changes so it gets updated
+ # when required. Despite that this file is owned by sys-apps/hwids.
+ if has_version "sys-apps/hwids[udev]"; then
+ udevadm hwdb --update --root="${EROOT%/}"
+ fi
+
+ udev_reload || FAIL=1
+
+ # Bug 465468, make sure locales are respect, and ensure consistency
+ # between OpenRC & systemd
+ migrate_locale
+
+ systemd_reenable systemd-networkd.service systemd-resolved.service
+
+ if [[ ${FAIL} ]]; then
+ eerror "One of the postinst commands failed. Please check the postinst output"
+ eerror "for errors. You may need to clean up your system and/or try installing"
+ eerror "systemd again."
+ eerror
+ fi
+}
+
+pkg_prerm() {
+ # If removing systemd completely, remove the catalog database.
+ if [[ ! ${REPLACED_BY_VERSION} ]]; then
+ rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+ fi
+}
diff --git a/sys-apps/usbutils/usbutils-009.ebuild b/sys-apps/usbutils/usbutils-009.ebuild
index 6e7fb4004097..55edd2e05387 100644
--- a/sys-apps/usbutils/usbutils-009.ebuild
+++ b/sys-apps/usbutils/usbutils-009.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/usb/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 4db01012881c..807d2104986f 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/whdd/whdd-2.2.ebuild b/sys-block/whdd/whdd-2.2.ebuild
index 170ff794a99e..8f7afc6967d3 100644
--- a/sys-block/whdd/whdd-2.2.ebuild
+++ b/sys-block/whdd/whdd-2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="
- dev-util/dialog
+ dev-util/dialog:=
sys-libs/ncurses:0[unicode]"
RDEPEND="${DEPEND}
sys-apps/smartmontools"
diff --git a/sys-block/whdd/whdd-3.0.ebuild b/sys-block/whdd/whdd-3.0.ebuild
index 93dae25ffdd7..967ab1dc5447 100644
--- a/sys-block/whdd/whdd-3.0.ebuild
+++ b/sys-block/whdd/whdd-3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,7 +23,7 @@ SLOT="0"
IUSE=""
DEPEND="
- dev-util/dialog
+ dev-util/dialog:=
sys-libs/ncurses:0=[unicode]"
RDEPEND="${DEPEND}
sys-apps/smartmontools"
diff --git a/sys-block/whdd/whdd-9999.ebuild b/sys-block/whdd/whdd-9999.ebuild
index 93dae25ffdd7..967ab1dc5447 100644
--- a/sys-block/whdd/whdd-9999.ebuild
+++ b/sys-block/whdd/whdd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,7 +23,7 @@ SLOT="0"
IUSE=""
DEPEND="
- dev-util/dialog
+ dev-util/dialog:=
sys-libs/ncurses:0=[unicode]"
RDEPEND="${DEPEND}
sys-apps/smartmontools"
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index 89931fb38313..7bb9fb202f40 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/unetbootin/Manifest b/sys-boot/unetbootin/Manifest
index 17aef8fed7e2..159bd8d25cfd 100644
--- a/sys-boot/unetbootin/Manifest
+++ b/sys-boot/unetbootin/Manifest
@@ -1,3 +1,2 @@
-DIST unetbootin-657.tar.gz 16258176 BLAKE2B 7124e3a4cace41b1ca61ca468e37adc90ae7d3099f54dc5da200cc7b7d94567afa5b4a597ba7d7e3a1327951fd7e61f320bc676b72ba68c7255e9145e5791adc SHA512 69ffdbc23f372c795e84267dfbed2221783a7efc9b1d5f589e7c308384cdfd0d9cf0950058f665e2c10bf6f17e0efd3eff81a1bedb98da316583f2462dfed2d9
DIST unetbootin-661-qt5.patch.tar.xz 8060 BLAKE2B 58cb323166e344ecabf5d372e80ff0367a1344866a6e8dea4b2677a85ea6ae0b5591480a3bcbbfc3a51d391b07adf0d5f370ee77e4c7e1d6f2b727aedf274cf0 SHA512 c1226575484fa63c94ca4da875a26c7bd64bcb27d8e07ea5b67bb3f2546f31d1360d10c363cd7301476811e332c9524c96d6ba482c894b86a5b28ca8a1c8b385
DIST unetbootin-661.tar.gz 16257579 BLAKE2B 2f92cf286c8010a80d4d4cc48a7ece55e159af9f3729277d97eb99ef2ebe8945023d03c51d6e97d7101d8547240e3c2152004222ec4c825ef4ab954c4018e7b0 SHA512 bbf74a4c4ca9b52f4da672eb54524b7fcb796c65ba80700dc3c6f2677bde37574f42a11c213cc4d4eee38783aed650beee1e2894f60185745e509a2e9571f70a
diff --git a/sys-boot/unetbootin/unetbootin-657.ebuild b/sys-boot/unetbootin/unetbootin-657.ebuild
deleted file mode 100644
index f675b358ca6b..000000000000
--- a/sys-boot/unetbootin/unetbootin-657.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils
-
-DESCRIPTION="UNetbootin installs Linux/BSD distributions to a partition or USB drive"
-HOMEPAGE="https://github.com/unetbootin/unetbootin"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-
-UNBI_LINGUAS="
- am ar ast be bg bn ca cs da de el eo es et eu fa fi fo fr gl he hr hu id it
- ja lt lv ml ms nan nb nl nn pl pt_BR pt ro ru si sk sl sr sv sw tr uk ur vi
- zh_CN zh_TW
-"
-
-for lingua in ${UNBI_LINGUAS}; do
- IUSE="${IUSE} l10n_${lingua/_/-}"
-done
-
-S=${WORKDIR}/${P}/src/${PN}
-
-DEPEND="dev-qt/qtgui:4"
-RDEPEND="
- ${DEPEND}
- app-arch/p7zip
- sys-boot/syslinux
- sys-fs/mtools
-"
-PATCHES=(
- "${FILESDIR}/${PN}-581-desktop.patch"
-)
-
-src_prepare() {
- default
-
- # QA check in case linguas are added or removed
- enum() {
- echo ${#}
- }
- [[ $(enum ${UNBI_LINGUAS}) -eq $(( $(enum $(echo ${PN}_*.ts) ) -1 )) ]] \
- || die "Numbers of recorded and actual linguas do not match"
- unset enum
-
- # Remove localisations
- local lingua
- for lingua in ${UNBI_LINGUAS}; do
- if ! use l10n_${lingua/_/-}; then
- sed -i ${PN}.pro -e "/\.*${PN}_${lingua}\.ts.*/d" || die
- rm ${PN}_${lingua}.ts || die
- fi
- done
-}
-
-src_configure() {
- sed -i -e '/^RESOURCES/d' unetbootin.pro || die
-
- UNBN_QTPATH="$(qt4_get_bindir)/"
- "${UNBN_QTPATH}"lrelease ${PN}.pro || die
-
- eqmake4 ${PN}.pro || die
-}
-
-src_install() {
- dobin ${PN}
-
- domenu ${PN}.desktop
-
- for file in ${PN}*.png; do
- size="${file/${PN}_}"
- size="${size/.png}x${size/.png}"
- insinto /usr/share/icons/hicolor/${size}/apps
- newins ${file} ${PN}.png
- done
-
- local lingua
- for lingua in ${UNBI_LINGUAS}; do
- if use l10n_${lingua/_/-}; then
- insinto /usr/share/${PN}
- doins ${PN}_${lingua}.qm
- fi
- done
-}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 896aabef10db..9465e7e9cada 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/keepalived/Manifest b/sys-cluster/keepalived/Manifest
index 3b13044726b6..78093ce7a9ed 100644
--- a/sys-cluster/keepalived/Manifest
+++ b/sys-cluster/keepalived/Manifest
@@ -1,4 +1,5 @@
DIST keepalived-1.2.24.tar.gz 601873 BLAKE2B d2bbf6189f789dd2b61207e80d4262ca6ff8a653268e9d5f4dada7def7cc6ab7d8f8fd49d9b97b228922ff56495213a22c459a44943a92a14abd91b787c491a8 SHA512 a5e555dd955173887896155a04b1f6bb0c2f2a758008472abd5433b057be3fd85e4f270a7b7eb2f36a1c16e46b235ef930b1844938276528ff61bbdd783bb1f5
DIST keepalived-1.3.5.tar.gz 683183 BLAKE2B 6242cbe61e8cbe80d094dbad3882b0116fc3cd129c5f0f082ec821d794dff53ab22a661feb1c11d2c5386bcea3c2727ed899ea2968dfa8a7ed4272b8596f0839 SHA512 ebd710167becd4b99b665877953d19477c11f1d1c736eb580a05dedd4946363b756553e20607f34aa6c35f57b7252d8a22287beedc316b62a745fccc4243a720
-DIST keepalived-1.4.2.tar.gz 738096 BLAKE2B edfd2c20b4de80a2e15d9598558b0ccfb4d6a7a7eace278ab97358691ed38485017ecca2f2934405930818b54e60f644c575dc4a320a9900bf81b97916268c91 SHA512 325282daea9c6dc9ec38ca405fcba3e55c07f6358c59fae5dc3422c0f987197658d39cda3ed6523ea29a356d74d09fe57e62411bd7498f5ef086cf191eb42fe3
DIST keepalived-1.4.3.tar.gz 744680 BLAKE2B d9ea5ef277bb0d11c489bbc8770f46528f1ddde14b2e8fb72fdccd543ff4583426aa2bb214e00e3964518e726377b049560ed35daf38f4cafcd4e7c43a13b78d SHA512 bbf734123edeee4c807788e8db626975d7b626003ce2a6b901fbac3b7985b11c222db78e2806a7e7211980a748a6a302847736b14f3f8ed32b7337dbde6f4eac
+DIST keepalived-1.4.5.tar.gz 749813 BLAKE2B ff379d46b5f5a4912feeb1e9a039a95a76027a50868ade8ac31bc4dea22573a51489939bb29bc20c0eb912f78b1e57fbc6ac18e4b8e38d6493d271e135f8332f SHA512 0786ecbef6dd840c8852f619cad1ea6a9c98b86a6c26bc6b104b38825212af689fbeb45148404b94dc6e3cdf7626cb6b2c902685b03586d05177578dff957bd5
+DIST keepalived-2.0.4.tar.gz 845498 BLAKE2B f05b25b04e1dddbf5f6a90de6b4088b7fbd453f628130343f0688147ae40094e74a0892f3c30d91e41bad31c029692e7a1be6462d2906cdf53e4b82a98b4935c SHA512 b5df152b49a7b5187612b8719328c05fada57e8625c0e8053261c1d5f7afd09cc9b67200052d7a58ce596d1c718915109f5a9bf03520d80e0710157e938f72fb
diff --git a/sys-cluster/keepalived/keepalived-1.4.2.ebuild b/sys-cluster/keepalived/keepalived-1.4.5.ebuild
similarity index 100%
rename from sys-cluster/keepalived/keepalived-1.4.2.ebuild
rename to sys-cluster/keepalived/keepalived-1.4.5.ebuild
diff --git a/sys-cluster/keepalived/keepalived-2.0.4.ebuild b/sys-cluster/keepalived/keepalived-2.0.4.ebuild
new file mode 100644
index 000000000000..9ec3a8f5d741
--- /dev/null
+++ b/sys-cluster/keepalived/keepalived-2.0.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+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="dbus debug ipv6 -json snmp"
+
+RDEPEND="dev-libs/libnl:=
+ dev-libs/openssl:=
+ dev-libs/popt
+ net-libs/libnfnetlink
+ sys-apps/iproute2
+ dbus? ( sys-apps/dbus )
+ 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() {
+ STRIP=/bin/true \
+ econf \
+ --with-kernel-dir=/usr \
+ --enable-sha1 \
+ --enable-vrrp \
+ $(use_enable dbus) \
+ $(use_enable dbus dbus-create-instance) \
+ $(use_enable debug) \
+ $(use_enable json) \
+ $(use_enable snmp)
+}
+
+src_install() {
+ default
+
+ newinitd "${FILESDIR}"/keepalived.init keepalived
+ newconfd "${FILESDIR}"/keepalived.confd keepalived
+
+ use snmp && dodoc doc/KEEPALIVED-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-cluster/ucx/Manifest b/sys-cluster/ucx/Manifest
index e0076771f8a2..6382831bd8a8 100644
--- a/sys-cluster/ucx/Manifest
+++ b/sys-cluster/ucx/Manifest
@@ -1 +1,2 @@
DIST ucx-1.2.2.tar.gz 1513611 BLAKE2B 488b9b3cecc2c617b1209036e1342e4378459db6a5e93eab1d88dfe80cb0d9c8013c767413206f0fbd0105557ed89994ab510421068d709101336a7b3d2eac5e SHA512 515c382826310b9aa7179ab19ceb76a881a41e6786514219b7f703c6144fa57ca141bceb3b80523ae1b4e2a4b13e9abcb9df063612b376d894c5cd81cdc00571
+DIST ucx-1.3.0.tar.gz 1707317 BLAKE2B 740ab240663a26fde8abe631416dae6233febf3c587ba6bb7b27a9cb0aa041540ce71e106bb3c5618a719de66d479055961908b67125df61a4c7696999c0affb SHA512 0a2e32985e0225fc4ad15dbb1c422dba1d5552638e7329d67572924502e61e1a481ce30cde5ccc83c663fb4ec643df83efc08aed164dfbce6cf38d66a16b3e42
diff --git a/sys-cluster/ucx/metadata.xml b/sys-cluster/ucx/metadata.xml
index d11a30befa7f..6af00b86c7fa 100644
--- a/sys-cluster/ucx/metadata.xml
+++ b/sys-cluster/ucx/metadata.xml
@@ -9,4 +9,7 @@
cluster@gentoo.org
Gentoo Cluster Project
+
+ Add support for numa memory allocation
+
diff --git a/sys-cluster/ucx/ucx-1.2.2.ebuild b/sys-cluster/ucx/ucx-1.2.2-r1.ebuild
similarity index 73%
rename from sys-cluster/ucx/ucx-1.2.2.ebuild
rename to sys-cluster/ucx/ucx-1.2.2-r1.ebuild
index 0b581f7bf566..c3bf36aa7359 100644
--- a/sys-cluster/ucx/ucx-1.2.2.ebuild
+++ b/sys-cluster/ucx/ucx-1.2.2-r1.ebuild
@@ -12,12 +12,16 @@ SRC_URI="https://github.com/openucx/ucx/releases/download/v${PV}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="+numa +openmp"
+
+RDEPEND="
+ numa? ( sys-process/numactl )
+"
src_prepare() {
default
sed \
- -e '/^BASE_CFLAGS/s:=.*:=:g' \
+ -e '/BASE_CFLAGS=/s:=".*":=:g' \
-i config/m4/compiler.m4 || die
eautoreconf
}
@@ -25,5 +29,7 @@ src_prepare() {
src_configure() {
BASE_CFLAGS="" \
econf \
- --disable-compiler-opt
+ --disable-compiler-opt \
+ $(use_enable numa) \
+ $(use_enable openmp)
}
diff --git a/sys-cluster/ucx/ucx-1.3.0.ebuild b/sys-cluster/ucx/ucx-1.3.0.ebuild
new file mode 100644
index 000000000000..eb6c279f6453
--- /dev/null
+++ b/sys-cluster/ucx/ucx-1.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Unified Communication X"
+HOMEPAGE="http://www.openucx.org"
+SRC_URI="https://github.com/openucx/ucx/releases/download/v${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+numa +openmp"
+
+RDEPEND="
+ numa? ( sys-process/numactl )
+"
+
+src_configure() {
+ BASE_CFLAGS="" \
+ econf \
+ --disable-compiler-opt \
+ $(use_enable numa) \
+ $(use_enable openmp)
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 8f50faa24306..81ee3365d7f2 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 68339b6c103e..de8b3b1b3d30 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -11,3 +11,4 @@ DIST binutils-2.29.1.tar.bz2 29123355 BLAKE2B 83de518a27bae0f13c57b1979493dd7f7c
DIST binutils-2.30-patches-2.tar.xz 490272 BLAKE2B a28a5b5bb8faa33fec269f2c69d6ed0e4e7d5a9169861aa4b3c45511794e1e749c216862a8258c2029f1b40c511dcb2a0aeaecda57e75d52418f10d6f345718f SHA512 1686d5b58ee968f2000647acab2bee4c263d1c85fd43fed8c820fccfc0d7024a01211e7853cd5ce452fa90da500bc17309edf6dbc901c7fd6fc7b3e3d6f42581
DIST binutils-2.30-patches-3.tar.xz 548804 BLAKE2B 428a1750233ae3f019e20cb5ed1d8e6fe6455181e8f5961dbfe7b66493d1c42050f889e45c02c1fc1a84d545c9e61f81ad6ffd5afc0b1099a702ccc7637c3abe SHA512 c91e902d1d9fc2e9782df04c93173c3207c771f1c063e2ff12c9336593c954ea3f1b2474a8fc045927d72fe18f7401874059599d100c4a1fd152081f05913d03
DIST binutils-2.30.tar.xz 20286700 BLAKE2B 2dd5436a15a601011a1950e6082ec00082f5916fb82ce95ceab424fd8dc19f6daa7ac32a149f222ccdcc603354165cc206fde070eaa44fe2cc5e57486efc7868 SHA512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839
+DIST binutils-9999-patches-1.tar.xz 10116 BLAKE2B 1ae970fd13ea1b94f554ed5b3fde4b6bdd90efcfc2488efc2f1465511279027c2e7f2a7371069afadb91bf833680a24e1a5df50d3169c9ee132c933b3c1fdba9 SHA512 a5d97d7070b876bf072db2a99a2876c239e03409849b9c93467bd3e70cd97c468110031a09e1c182c05d48004ec3e1651f44a1850b0275a385c3bae598cd98d7
diff --git a/sys-devel/binutils/binutils-2.30-r2.ebuild b/sys-devel/binutils/binutils-2.30-r2.ebuild
index bd063c2a5f4e..e60c18e851be 100644
--- a/sys-devel/binutils/binutils-2.30-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.30-r2.ebuild
@@ -35,7 +35,7 @@ case ${PV} in
;;
esac
SLOT="${BVER}"
-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"
#
# The Gentoo patchset
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index d7ba7c31aa75..c7972aa0b704 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -19,25 +19,25 @@ IUSE="+cxx doc multitarget +nls static-libs test"
# for the patchsets
# Default: dilfridge :)
+PATCH_VER=1
+
case ${PV} in
9999)
- BVER="git"
EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
inherit git-r3
S=${WORKDIR}/binutils
EGIT_CHECKOUT_DIR=${S}
;;
*)
- BVER=${PV}
- SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.xz"
+ SRC_URI="mirror://gnu/binutils/binutils-${PV}.tar.xz"
;;
esac
-SLOT="${BVER}"
+SLOT="${PV}"
#
# The Gentoo patchset
#
-PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${BVER}}
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${PV}}
PATCH_DEV=${PATCH_DEV:-dilfridge}
[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
@@ -80,7 +80,8 @@ MY_BUILDDIR=${WORKDIR}/build
src_unpack() {
case ${PV} in
9999)
- git-r3_src_unpack;
+ git-r3_src_unpack
+ default
;;
*)
default
@@ -136,21 +137,21 @@ toolchain-binutils_bugurl() {
printf "https://bugs.gentoo.org/"
}
toolchain-binutils_pkgversion() {
- printf "Gentoo ${BVER}"
+ printf "Gentoo ${PV}"
[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
}
src_configure() {
# Setup some paths
- LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
+ LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${PV}
INCPATH=${LIBPATH}/include
- DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER}
+ DATAPATH=/usr/share/binutils-data/${CTARGET}/${PV}
if is_cross ; then
TOOLPATH=/usr/${CHOST}/${CTARGET}
else
TOOLPATH=/usr/${CTARGET}
fi
- BINPATH=${TOOLPATH}/binutils-bin/${BVER}
+ BINPATH=${TOOLPATH}/binutils-bin/${PV}
# Make sure we filter $LINGUAS so that only ones that
# actually work make it through #42033
@@ -282,7 +283,7 @@ src_install() {
# Newer versions of binutils get fancy with ${LIBPATH} #171905
cd "${ED}"/${LIBPATH}
for d in ../* ; do
- [[ ${d} == ../${BVER} ]] && continue
+ [[ ${d} == ../${PV} ]] && continue
mv ${d}/* . || die
rmdir ${d} || die
done
@@ -323,10 +324,10 @@ src_install() {
insinto /etc/env.d/binutils
cat <<-EOF > "${T}"/env.d
TARGET="${CTARGET}"
- VER="${BVER}"
+ VER="${PV}"
LIBPATH="${EPREFIX}${LIBPATH}"
EOF
- newins "${T}"/env.d ${CTARGET}-${BVER}
+ newins "${T}"/env.d ${CTARGET}-${PV}
# Handle documentation
if ! is_cross ; then
@@ -358,7 +359,7 @@ src_install() {
pkg_postinst() {
# Make sure this ${CTARGET} has a binutils version selected
[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
- binutils-config ${CTARGET}-${BVER}
+ binutils-config ${CTARGET}-${PV}
}
pkg_postrm() {
@@ -370,7 +371,7 @@ pkg_postrm() {
# rerun binutils-config if this is a remerge, as
# we want the mtimes on the symlinks updated (if
# it is the same as the current selected profile)
- if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then
+ if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${PV} ]] ; then
local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
choice=${choice//$'\n'/ }
choice=${choice/* }
@@ -379,8 +380,8 @@ pkg_postrm() {
else
binutils-config ${choice}
fi
- elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then
- binutils-config ${CTARGET}-${BVER}
+ elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${PV} ]] ; then
+ binutils-config ${CTARGET}-${PV}
fi
}
@@ -410,4 +411,4 @@ pkg_postrm() {
# - at build-time set scriptdir to point to symlinked location:
# ${TOOLPATH}: /usr/${CHOST} (or /usr/${CHOST}/${CTARGET} for cross-case)
# - at install-time set scriptdir to point to slotted location:
-# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
+# ${LIBPATH}: /usr/$(get_libdir)/binutils/${CTARGET}/${PV}
diff --git a/sys-devel/gcc/gcc-7.3.0-r3.ebuild b/sys-devel/gcc/gcc-7.3.0-r3.ebuild
index 5a8535549064..dd3321d084b3 100644
--- a/sys-devel/gcc/gcc-7.3.0-r3.ebuild
+++ b/sys-devel/gcc/gcc-7.3.0-r3.ebuild
@@ -8,7 +8,7 @@ PATCH_VER="1.4"
inherit toolchain
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos"
RDEPEND=""
DEPEND="${RDEPEND}
diff --git a/sys-devel/gdb/gdb-8.1-r1.ebuild b/sys-devel/gdb/gdb-8.1-r1.ebuild
index 6c7a856e418a..a59527b86c91 100644
--- a/sys-devel/gdb/gdb-8.1-r1.ebuild
+++ b/sys-devel/gdb/gdb-8.1-r1.ebuild
@@ -68,7 +68,9 @@ REQUIRED_USE="
|| ( client server )
"
-RDEPEND="server? ( !dev-util/gdbserver )
+RDEPEND="
+ dev-libs/mpfr:=
+ server? ( !dev-util/gdbserver )
client? (
>=sys-libs/ncurses-5.2-r2:0=
sys-libs/readline:0=
@@ -117,6 +119,7 @@ src_configure() {
local myconf=(
--with-pkgversion="$(gdb_branding)"
--with-bugurl='https://bugs.gentoo.org/'
+ --with-mpfr
--disable-werror
# Disable modules that are in a combined binutils/gdb tree. #490566
--disable-{binutils,etc,gas,gold,gprof,ld}
diff --git a/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r1.ebuild
similarity index 80%
rename from sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild
rename to sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r1.ebuild
index 8094a33d1a12..d003e7aadf61 100644
--- a/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0.ebuild
+++ b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -69,3 +69,15 @@ src_install() {
eshopts_pop
}
+
+pkg_postinst() {
+ if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+ eselect compiler-shadow update all
+ fi
+}
+
+pkg_postrm() {
+ if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+ eselect compiler-shadow clean all
+ fi
+}
diff --git a/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r2.ebuild b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r2.ebuild
new file mode 100644
index 000000000000..f670a006b51a
--- /dev/null
+++ b/sys-devel/multilib-gcc-wrapper/multilib-gcc-wrapper-0-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+DESCRIPTION="Wrappers for gcc tools to be used on non-native CHOSTs"
+HOMEPAGE="https://www.gentoo.org"
+SRC_URI=""
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="sys-devel/gcc:="
+
+S=${WORKDIR}
+
+mkwrap() {
+ einfo " ${2}"
+
+ cat > "${T}"/wrapper <<-_EOF_
+ #!${EPREFIX}/bin/sh
+ exec ${1} $(get_abi_CFLAGS) "\${@}"
+ _EOF_
+
+ newbin "${T}"/wrapper "${2}"
+}
+
+src_install() {
+ local host_prefix=${CHOST}
+ # stolen from sys-devel/gcc-config
+ # TODO: check if all of them actually support $(get_ABI_CFLAGS)
+ local tools=(
+ cpp cc gcc c++ g++ f77 g77 gcj gcjh gdc gdmd gfortran gccgo
+ )
+
+ cd "${EROOT%/}"/usr/bin || die
+ shopt -s nullglob
+
+ # same as toolchain.eclass
+ : ${TARGET_DEFAULT_ABI:=${DEFAULT_ABI}}
+ : ${TARGET_MULTILIB_ABIS:=${MULTILIB_ABIS}}
+ local ABI t e
+ for ABI in $(get_all_abis TARGET); do
+ [[ ${ABI} == ${TARGET_DEFAULT_ABI} ]] && continue
+
+ einfo "Creating wrappers for ${ABI} ..."
+ for t in "${tools[@]}"; do
+ # look for both plain *-gcc and e.g. *-gcc-4.8.3
+ # (but avoid *-gcc-nm)
+ # note: nullglob applied above
+ for e in ${host_prefix}[-]${t}{,-[0-9]*}; do
+ local newname=$(get_abi_CHOST)-${e#${host_prefix}-}
+
+ einfo " ${newname}"
+
+ cat > "${T}"/wrapper <<-_EOF_
+ #!${EPREFIX}/bin/sh
+ exec ${e} $(get_abi_CFLAGS) "\${@}"
+ _EOF_
+
+ newbin "${T}"/wrapper "${newname}"
+ done
+ done
+ done
+
+ shopt -u nullglob
+}
+
+pkg_postinst() {
+ if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+ eselect compiler-shadow update all
+ fi
+}
+
+pkg_postrm() {
+ if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+ eselect compiler-shadow clean all
+ fi
+}
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index c7b230fc646f..bd075d462080 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest
index daaca6ae13fe..78f1666053d5 100644
--- a/sys-firmware/intel-microcode/Manifest
+++ b/sys-firmware/intel-microcode/Manifest
@@ -1,18 +1,2 @@
-DIST intel-microcode-collection-20180527.tar.xz 4315096 BLAKE2B 2ab4fe3d8469d98bc890e7f1347e4da442d814e945253e2c400a0ba954925f6c622d259711a9ce89a2d013365c65b002e24e182afc5c53ebd4e14828b2f5631e SHA512 45e46905156a0b4d8b272760d84030651a034feaf2afbc564f99fff89303457c0d7d694f174de5abed666d5107f2f7db93c04acd3cc36a77b1cf1a0495584b1c
DIST intel-microcode-collection-20180616.tar.xz 4413444 BLAKE2B 4ba5371914f64c8a7261720512dff128f83cc25950a4bdf8d41e9eeb724c6d3150212b1a7f2ee966a2b9c835a2622ac885625fada497ec2bc0aa3c435a2968e8 SHA512 5c0cd4e764397f8c2593153256d573db8f57cce1fc062f5e687a108e5a430c7ed506f63d0d324ea2b88cc8bf8762d3fec507252ee9890c55bb9d3b5604151afe
-DIST microcode-20140430.tgz 785594 BLAKE2B e51a187ca99ad496804f117871b50693b03b50759c9dd23002149ff7fa4b74888c83e8e1fcf078a973dea82e6a9439de8415c56c902ed0163e55ceaaff0eaf23 SHA512 12954522629ce15c4b95c158b6288b3877a3d1f87bea838f8138e53987ef1b6c0edc7a8cbb802a981ccca178b70b4323907aafa7479c0c2fed4497f6fb7bbc1c
-DIST microcode-20140624.tgz 787237 BLAKE2B 1c2d8f39bf142570283e80f370f41c502ef04d24b4348ca4b44c881e3b1e54df72a88e09350d45a33d47d9955d84a80ae8a11e44561b1a8944a59f9326d4d81a SHA512 c774006aae639e7fae90bc1f5d8308b407e7cd3b7d0da6e35577560bf6201c2b15f7d7b6b0cd727c50be1e9d508b484b067856631fa2598498982109bff0e44c
-DIST microcode-20140913.tgz 830537 BLAKE2B 665c72fc3a3e1e13d9e58eba0ed202b30856532eee590006c02112df926b879985a97ba9a96b58a6aad0285bff95a3fbb27b22d533f958fe170887f0ab37eef1 SHA512 e179fe0001b1157cc95aee39185f51fd182d53c1bdb30bfc95bc3a70795c32012050f3a4adf06735a77d8ef9c703a330c6a2610b73b70f09f5760e31d39cb89c
-DIST microcode-20150121.tgz 850761 BLAKE2B d5859b98de645ed255ac4244640979b4c197a1d1d9c2b562c052405f487ccd0f0e570c5054cd55870b4eb4d51237b9c2627547e30b7245174f887605cf049b1b SHA512 f62edd1b666cf381605613766d7e123f0c6debee4448c0ff0882d33c144ad2174656d2501a449f24eb3e4708259e7ec0ff42810739b7d1f34a6a1d9950d17bc4
-DIST microcode-20151106.tgz 892805 BLAKE2B e384a445ea645510dbef1e564963509893ec5beefe90f04490aa7d1b91fd036ae928bbb7a68e291b1633e2d671ce8995518967fffddcc3edc336bc06c3f60251 SHA512 606ce97f0fe76f6a34a857923d3432d8e2368e8a5c504ffa0313f9f016d61b0a5dea26e67662ce1283c1f772ace7318e96a34ebeeeff50b25deb3005ccc6978e
-DIST microcode-20160607.tgz 1236385 BLAKE2B 477b8c8df915d8800f1d5836f2882ba63b152d5e67f6c7eecb71539176d77454b2482fe10308fc3b352a03563582f9626296a3eae48496351b54e81435d4e09b SHA512 17f62ebf3e9f262d21ffa00546da4d711a9a810ad0a9bf4b2805c33090d75e9a07df1f3449baf6009ec5ef1f9af470fd32285b6100f0819e0b9989f5c55dc5bd
-DIST microcode-20160714.tgz 1239344 BLAKE2B 9af6d4d7db21d7316a4e331c5e70a81b9a5d0d95c3476b56d2281a2c7e652e800bcdcec9ad8857563abf378512ecf48c06b3112604fe2602d50b71558d608428 SHA512 f9e09b6669a86aafcc77642d6e33acf9326109c3a2bc3e0d62b45a062b9ecbde6605b5a0ae31d4a3ad2b0ed3c6d3aadbd18088431fb72216bfc31fc452b0e342
-DIST microcode-20161104.tgz 1290125 BLAKE2B 9274bebe3f9104f0afc6378ae40810b2a634c85e5d26f8250666a45c6dd0d75e35d051e8702a6ca26c70d8cdfea0144614bca9c5568294817ea8f522e474b8a3 SHA512 73a7310c1da5bec7ce82bce5cf7c2aafa3d0189e7524bdebd20e1ea3568cf8242be39d9041fa055fe06e759f98703c5d0a631e57ff185aae3ba3c91dbe83cf7a
-DIST microcode-20170511.tgz 2143617 BLAKE2B a2185b44cfca9832d2a80f12a189c49365ed323692b8fd94e99a0f4e8d3f0102a21cfce806ad9e53f172c3ae038f4ffafbafc8421bea6668bfbfdd1262bbd8e9 SHA512 4e2066096d56430c2df73631f15cf16f2317c1d8ff745d7b7cdd784ebccc2b797565eb52703cce9b4238774dbfdcaecacd892d729b7869fdfd7644008ce74a60
-DIST microcode-20170707.tgz 2908882 BLAKE2B 545d94ee9292d1ba730932f11660d0e0378b4a6f2a5232cdcc26333a8d707ec13b040d41617fb28c17e4b81f1df5bc4180f1979925d2fa5198f2edfb3623967c SHA512 2f0643c332318e9c818b9a23a996b59086e86e80e649589e43dbab19f13083d6d9505b8557f67b45ce56de0da043c753a14bb146e597b6669f24fe543656c65f
-DIST microcode-20171117.tgz 3594762 BLAKE2B 7a02c28ec6b9b22a367f8fd7d59f244d0195fef3b256fa2542bca734026e869fdefc7b368a230e94ac0554473d18d1b80aa00511ad4ab6580279f512a106c17d SHA512 b1f09dd7bb04c00e456e34bf42bf786c780aba6d2ef3231a45769216a093876e9bb15123c82ddb7d8ef5426fe10b946509f363770af3b4eba16ba76043a064b4
-DIST microcode-20171117_p20171215-r1.tgz 1477015 BLAKE2B 3911aed3bbbd350be69a99bc855cdec6e8dc2a77f64c4d3a6c1aa24455d5c97eb1c03917eddb4cac2018f6da20a1751cc819a5f27f866f64fc56c7279b5ca40f SHA512 05466e16f9778a3ab148fa5485cd605bca7990067040aa9133ec4c3c1b007519cb260fe8811b44df1192ca0e84237f00d7afccfa11103f3dd4a99c08c692ecb0
-DIST microcode-20171117_p20171215.tgz 1468587 BLAKE2B 58777a39f843ae880f7dd8971a9570dbfc176d69541bb9d3cdc948d7be71a7df2559265fb1c8a199bc7567bb5a60176ade1d2c36624d0193dbac98d82401d0dd SHA512 25db94dbf18b1fea9497ec1e61bb5349d7bc78b0578d8869546bc3ec579b96bee7cd62657e66ebd3d4616805e85d790ac7ee7c0fed70b5db30236ffd12b33293
-DIST microcode-20180108.tgz 3676678 BLAKE2B 197e0188e516a3071be9e2e7a6261d78208613db8b746c7df533ce37884197dbd06a4e6ab027cbddba38903f590130f2d974e46da8fbab0613561523653460ab SHA512 f4010d83353948df27beeb804ef11e4f019f63397a4936f9d139e2842f7944d1ae864b9376987eaffc7db5b97201d5de2f4c1d7cc6b0f545ae15ec53a61fce2b
-DIST microcode-20180312.tgz 3789662 BLAKE2B e948d74833fe75b9bbdff1e4676f5d49a13bdd06aa6525c39be3448b822203947a5f55515484401ee0c96e8ade19ea580718949bed65883d983509661a16e637 SHA512 cc2cabf6d12c83b65eeb30fca7eb0b503e037dbee3d7ce9cb307b02ed8ac9426b2bafc2c1f1281dddff0945f8308f0d3cd320edea4596551354188d64760b854
DIST microcode-20180425.tgz 1565473 BLAKE2B 70e0a56f0f5f720e00ab18d6553bc221147589e83df34fdc0c130c6f74a239e48355bfe1845b1de919ed1bce9ade7b7db298883eb3de1d53732a694b15d76f62 SHA512 6cea53cc0f486891fb9ddffc1e03e8e0a6d1d91df6bfda81250b2c60714e7b4111caa9df5afa7f13d8144e591550ef7eb4fd1e153fc67fc904afb83ccc2e3bb0
diff --git a/sys-firmware/intel-microcode/files/intel-microcode2ucode.c b/sys-firmware/intel-microcode/files/intel-microcode2ucode.c
deleted file mode 100644
index caad0323e805..000000000000
--- a/sys-firmware/intel-microcode/files/intel-microcode2ucode.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Convert Intel microcode.dat into individual ucode files
- * named: intel-ucode/$family-$model-$stepping
- *
- * The subdir intel-ucode/ is created in the current working
- * directory. We get multiple ucodes in the same file, so they
- * are appended to an existing file. Make sure the directory
- * is empty before every run of the converter.
- *
- * Kay Sievers
- */
-
-
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-struct microcode_header_intel {
- unsigned int hdrver;
- unsigned int rev;
- unsigned int date;
- unsigned int sig;
- unsigned int cksum;
- unsigned int ldrver;
- unsigned int pf;
- unsigned int datasize;
- unsigned int totalsize;
- unsigned int reserved[3];
-};
-
-union mcbuf {
- struct microcode_header_intel hdr;
- unsigned int i[0];
- char c[0];
-};
-
-int main(int argc, char *argv[])
-{
- char *filename = "/lib/firmware/microcode.dat";
- FILE *f;
- char line[LINE_MAX];
- char buf[4000000];
- union mcbuf *mc;
- size_t bufsize, count, start;
- int rc = EXIT_SUCCESS;
-
- if (argv[1] != NULL)
- filename = argv[1];
-
- count = 0;
- mc = (union mcbuf *) buf;
- f = fopen(filename, "re");
- if (f == NULL) {
- printf("open %s: %m\n", filename);
- rc = EXIT_FAILURE;
- goto out;
- }
-
- while (fgets(line, sizeof(line), f) != NULL) {
- if (sscanf(line, "%x, %x, %x, %x",
- &mc->i[count],
- &mc->i[count + 1],
- &mc->i[count + 2],
- &mc->i[count + 3]) != 4)
- continue;
- count += 4;
- }
- fclose(f);
-
- bufsize = count * sizeof(int);
- printf("%s: %lu(%luk) bytes, %zu integers\n",
- filename,
- bufsize,
- bufsize / 1024,
- count);
-
- if (bufsize < sizeof(struct microcode_header_intel))
- goto out;
-
- mkdir("intel-ucode", 0750);
-
- start = 0;
- for (;;) {
- size_t size;
- unsigned int family, model, stepping;
- unsigned int year, month, day;
-
- mc = (union mcbuf *) &buf[start];
-
- if (mc->hdr.totalsize)
- size = mc->hdr.totalsize;
- else
- size = 2000 + sizeof(struct microcode_header_intel);
-
- if (mc->hdr.ldrver != 1 || mc->hdr.hdrver != 1) {
- printf("unknown version/format:\n");
- rc = EXIT_FAILURE;
- break;
- }
-
- /*
- * 0- 3 stepping
- * 4- 7 model
- * 8-11 family
- * 12-13 type
- * 16-19 extended model
- * 20-27 extended family
- */
- family = (mc->hdr.sig >> 8) & 0xf;
- if (family == 0xf)
- family += (mc->hdr.sig >> 20) & 0xff;
- model = (mc->hdr.sig >> 4) & 0x0f;
- if (family == 0x06)
- model += ((mc->hdr.sig >> 16) & 0x0f) << 4;
- stepping = mc->hdr.sig & 0x0f;
-
- year = mc->hdr.date & 0xffff;
- month = mc->hdr.date >> 24;
- day = (mc->hdr.date >> 16) & 0xff;
-
- asprintf(&filename, "intel-ucode/%02x-%02x-%02x", family, model, stepping);
- printf("\n");
- printf("%s\n", filename);
- printf("signature: 0x%02x\n", mc->hdr.sig);
- printf("flags: 0x%02x\n", mc->hdr.pf);
- printf("revision: 0x%02x\n", mc->hdr.rev);
- printf("date: %04x-%02x-%02x\n", year, month, day);
- printf("size: %zu\n", size);
-
- f = fopen(filename, "ae");
- if (f == NULL) {
- printf("open %s: %m\n", filename);
- rc = EXIT_FAILURE;
- goto out;
- }
- if (fwrite(mc, size, 1, f) != 1) {
- printf("write %s: %m\n", filename);
- rc = EXIT_FAILURE;
- goto out;
- }
- fclose(f);
- free(filename);
-
- start += size;
- if (start >= bufsize)
- break;
- }
- printf("\n");
-out:
- return rc;
-}
diff --git a/sys-firmware/intel-microcode/files/intel-microcode2ucode.c-r1 b/sys-firmware/intel-microcode/files/intel-microcode2ucode.c-r1
deleted file mode 100644
index 4b3ba4b48ed4..000000000000
--- a/sys-firmware/intel-microcode/files/intel-microcode2ucode.c-r1
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Convert Intel microcode.dat into individual ucode files
- * named: intel-ucode/$family-$model-$stepping
- *
- * The subdir intel-ucode/ is created in the current working
- * directory. We get multiple ucodes in the same file, so they
- * are appended to an existing file. Make sure the directory
- * is empty before every run of the converter.
- *
- * Kay Sievers
- */
-
-
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-struct microcode_header_intel {
- unsigned int hdrver;
- unsigned int rev;
- unsigned int date;
- unsigned int sig;
- unsigned int cksum;
- unsigned int ldrver;
- unsigned int pf;
- unsigned int datasize;
- unsigned int totalsize;
- unsigned int reserved[3];
-};
-
-union mcbuf {
- struct microcode_header_intel hdr;
- unsigned int i[0];
- char c[0];
-};
-
-int main(int argc, char *argv[])
-{
- char *filename = "/lib/firmware/microcode.dat";
- FILE *f;
- char line[LINE_MAX];
- char buf[4000000];
- union mcbuf *mc;
- size_t bufsize, count, start;
- int rc = EXIT_SUCCESS;
-
- if (argv[1] != NULL)
- filename = argv[1];
-
- count = 0;
- mc = (union mcbuf *) buf;
- f = fopen(filename, "re");
- if (f == NULL) {
- printf("open %s: %m\n", filename);
- rc = EXIT_FAILURE;
- goto out;
- }
-
- while (fgets(line, sizeof(line), f) != NULL) {
- if (sscanf(line, "%x, %x, %x, %x",
- &mc->i[count],
- &mc->i[count + 1],
- &mc->i[count + 2],
- &mc->i[count + 3]) != 4)
- continue;
- count += 4;
- }
- fclose(f);
-
- bufsize = count * sizeof(int);
- printf("%s: %lu(%luk) bytes, %zu integers\n",
- filename,
- bufsize,
- bufsize / 1024,
- count);
-
- if (bufsize < sizeof(struct microcode_header_intel))
- goto out;
-
- mkdir("intel-ucode", 0750);
-
- start = 0;
- for (;;) {
- size_t size;
- unsigned int family, model, stepping;
- unsigned int year, month, day;
-
- mc = (union mcbuf *) &buf[start];
-
- if (mc->hdr.totalsize)
- size = mc->hdr.totalsize;
- else
- size = 2000 + sizeof(struct microcode_header_intel);
-
- if (mc->hdr.ldrver != 1 || mc->hdr.hdrver != 1) {
- printf("unknown version/format:\n");
- rc = EXIT_FAILURE;
- break;
- }
-
- /*
- * 0- 3 stepping
- * 4- 7 model
- * 8-11 family
- * 12-13 type
- * 16-19 extended model
- * 20-27 extended family
- */
- family = (mc->hdr.sig >> 8) & 0xf;
- if (family == 0xf)
- family += (mc->hdr.sig >> 20) & 0xff;
- model = (mc->hdr.sig >> 4) & 0x0f;
- if (family == 0x06)
- model += ((mc->hdr.sig >> 16) & 0x0f) << 4;
- stepping = mc->hdr.sig & 0x0f;
-
- year = mc->hdr.date & 0xffff;
- month = mc->hdr.date >> 24;
- day = (mc->hdr.date >> 16) & 0xff;
-
- if (asprintf(&filename, "intel-ucode/%02x-%02x-%02x", family, model, stepping) < 0) {
- rc = EXIT_FAILURE;
- goto out;
- }
- printf("\n");
- printf("%s\n", filename);
- printf("signature: 0x%02x\n", mc->hdr.sig);
- printf("flags: 0x%02x\n", mc->hdr.pf);
- printf("revision: 0x%02x\n", mc->hdr.rev);
- printf("date: %04x-%02x-%02x\n", year, month, day);
- printf("size: %zu\n", size);
-
- f = fopen(filename, "ae");
- if (f == NULL) {
- printf("open %s: %m\n", filename);
- rc = EXIT_FAILURE;
- goto out;
- }
- if (fwrite(mc, size, 1, f) != 1) {
- printf("write %s: %m\n", filename);
- rc = EXIT_FAILURE;
- goto out;
- }
- fclose(f);
- free(filename);
-
- start += size;
- if (start >= bufsize)
- break;
- }
- printf("\n");
-out:
- return rc;
-}
diff --git a/sys-firmware/intel-microcode/intel-microcode-20140430.ebuild b/sys-firmware/intel-microcode/intel-microcode-20140430.ebuild
deleted file mode 100644
index 4cfb5a96974f..000000000000
--- a/sys-firmware/intel-microcode/intel-microcode-20140430.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-# Find updates by searching and clicking the first link (hopefully it's the one):
-# http://www.intel.com/content/www/us/en/search.html?keyword=Processor+Microcode+Data+File
-
-NUM="23829"
-DESCRIPTION="Intel IA32 microcode update data"
-HOMEPAGE="http://inertiawar.com/microcode/ https://downloadcenter.intel.com/Detail_Desc.aspx?DwnldID=${NUM}"
-SRC_URI="http://downloadmirror.intel.com/${NUM}/eng/microcode-${PV}.tgz"
-
-LICENSE="intel-ucode"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="!
install a small initramfs for use with CONFIG_MICROCODE_EARLY
only install ucode(s) supported by currently available (=online) processor(s)
- install the large text microcode.dat (used by older kernels via microcode_ctl)
install the split binary ucode files (used by the kernel directly)
install only microcode updates from Intel's official microcode tarball
diff --git a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
index 0d8859a828e8..21b512890ba3 100644
--- a/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
+++ b/sys-firmware/ipxe/ipxe-1.0.0_p20180211.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86"
IUSE="+binary efi ipv6 iso lkrn +qemu undi usb vmware"
REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
diff --git a/sys-firmware/seabios/seabios-1.11.0.ebuild b/sys-firmware/seabios/seabios-1.11.0.ebuild
index 72456e2e53a6..c3a085371320 100644
--- a/sys-firmware/seabios/seabios-1.11.0.ebuild
+++ b/sys-firmware/seabios/seabios-1.11.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* || -n "${EGIT_COMMIT}" ]] ; then
EGIT_REPO_URI="git://git.seabios.org/seabios.git"
inherit git-r3
else
- 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"
# Binary versions taken from fedora:
# http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/Everything/x86_64/os/Packages/s/
diff --git a/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild b/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
index 9176409a528e..290221c8a6a7 100644
--- a/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
+++ b/sys-firmware/sgabios/sgabios-0.1_pre8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
LICENSE="Apache-2.0"
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="+binary"
REQUIRED_USE="!amd64? ( !x86? ( binary ) )"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index fb83dd0abce7..62207012af7a 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
index bc8099d825ce..a2b0838d0cce 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-PYTHON_COMPAT=( python3_{4,5} )
+PYTHON_COMPAT=( python3_{4,5,6} )
inherit eutils flag-o-matic python-r1 toolchain-funcs udev
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23.ebuild
index e0cd68da6b6d..c029c9f648ad 100644
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
LICENSE="GPL-2"
# The subslot matches the SONAME major #.
SLOT="0/87"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
RDEPEND="! ${BLKIO_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${BLKIO_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${BLKIO_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+ use deblob && python-any-r1_pkg_setup
+ kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+ # linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+ sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+ kernel-2_src_prepare
+}
+
+pkg_postinst() {
+ elog "ck-sources previously enabled CPU optimizations by default."
+ elog "USE=\"experimental\" is now required to enable this patch."
+ elog "this can be set in /etc/portage/package.use (or make.conf)"
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.16.17.ebuild b/sys-kernel/ck-sources/ck-sources-4.16.17.ebuild
new file mode 100644
index 000000000000..d16a67711be8
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.16.17.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+ http://kernel.kolivas.org/"
+
+IUSE="experimental"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="18"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+pkg_setup() {
+ use deblob && python-any-r1_pkg_setup
+ kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+ # linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+ sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+ kernel-2_src_prepare
+}
+
+pkg_postinst() {
+ elog "ck-sources previously enabled CPU optimizations by default."
+ elog "USE=\"experimental\" is now required to enable this patch."
+ elog "this can be set in /etc/portage/package.use (or make.conf)"
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 514d83af05e0..485cf0cd9fce 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/binutils-libs/binutils-libs-2.30-r2.ebuild b/sys-libs/binutils-libs/binutils-libs-2.30-r2.ebuild
index a21b1a8327e1..a1eca9cefb12 100644
--- a/sys-libs/binutils-libs/binutils-libs-2.30-r2.ebuild
+++ b/sys-libs/binutils-libs/binutils-libs-2.30-r2.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://gnu/binutils/${MY_P}.tar.xz
LICENSE="|| ( GPL-3 LGPL-3 )"
# The shared lib SONAMEs use the ${PV} in them.
SLOT="0/${PV}"
-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"
IUSE="64-bit-bfd multitarget nls static-libs"
COMMON_DEPEND="sys-libs/zlib[${MULTILIB_USEDEP}]"
diff --git a/sys-libs/glibc/glibc-2.26-r7.ebuild b/sys-libs/glibc/glibc-2.26-r7.ebuild
index ac4106459e4a..04e19e5fc4a4 100644
--- a/sys-libs/glibc/glibc-2.26-r7.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r7.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="git://sourceware.org/git/glibc.git"
inherit git-r3
else
- 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"
SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
fi
diff --git a/sys-libs/gwenhywfar/gwenhywfar-4.20.0.ebuild b/sys-libs/gwenhywfar/gwenhywfar-4.20.0.ebuild
index cddbd2641528..b3b3fb985395 100644
--- a/sys-libs/gwenhywfar/gwenhywfar-4.20.0.ebuild
+++ b/sys-libs/gwenhywfar/gwenhywfar-4.20.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.aquamaniac.de/sites/download/download.php?package=01&releas
LICENSE="LGPL-2.1"
SLOT="0/60" # correspond with libgwenhywfar.so version
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
IUSE="debug designer doc fox gtk libressl qml qt5 sensors serialport test webkit"
REQUIRED_USE="designer? ( qt5 ) qml? ( qt5 ) sensors? ( qt5 ) serialport? ( qt5 ) webkit? ( qt5 )"
diff --git a/sys-libs/ldb/ldb-1.3.3.ebuild b/sys-libs/ldb/ldb-1.3.3.ebuild
index 4cd8446d25dc..1b38c776939c 100644
--- a/sys-libs/ldb/ldb-1.3.3.ebuild
+++ b/sys-libs/ldb/ldb-1.3.3.ebuild
@@ -8,8 +8,8 @@ PYTHON_REQ_USE="threads"
inherit python-single-r1 waf-utils multilib-minimal eutils
DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="http://ldb.samba.org"
-SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
+HOMEPAGE="https://ldb.samba.org"
+SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
diff --git a/sys-libs/ldb/ldb-1.4.0-r1.ebuild b/sys-libs/ldb/ldb-1.4.0-r1.ebuild
index a42012a74531..e50191199d58 100644
--- a/sys-libs/ldb/ldb-1.4.0-r1.ebuild
+++ b/sys-libs/ldb/ldb-1.4.0-r1.ebuild
@@ -8,8 +8,8 @@ PYTHON_REQ_USE="threads"
inherit python-single-r1 waf-utils multilib-minimal eutils
DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="http://ldb.samba.org"
-SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
+HOMEPAGE="https://ldb.samba.org"
+SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0/${PV}"
diff --git a/sys-libs/libblockdev/Manifest b/sys-libs/libblockdev/Manifest
index 0cec0a74f463..d428c73bda00 100644
--- a/sys-libs/libblockdev/Manifest
+++ b/sys-libs/libblockdev/Manifest
@@ -1,4 +1,3 @@
DIST libblockdev-2.14-1.tar.gz 274241 BLAKE2B 64c4c2a298ed95ed24a79716ccef5930f4276faaca02acf883c386b85a662d3fa1dc6f30e00d99bd835832e3c65acb89b445eff6fb35f9090dc949efde737d1a SHA512 fb80e840ed2f247912da93a6cc0cb1846be73dcc16b917f5231f5d7a87eaa7b43d07d5b2110038dd783fefa7ef7df0893785a60079ed02567f1e08bfcbd82343
-DIST libblockdev-2.15-1.tar.gz 279744 BLAKE2B caabeffdc2ee27bec63f0e799c632eab4e02867b866a83b03613e84567dbb0a5a6d8a59b4a34b9130b55a546bfa4a76b439bf901247da2d4d87b88b66c386ed6 SHA512 a58ee6ca75c0ee8706796afb6bf26334cc1716bb3ba9230f35c485643faf4921e70ff3a86ebb2be41b2d0177e68fdc0f8011e198e46d66aca9e9712a228c4ea3
-DIST libblockdev-2.16-1.tar.gz 282247 BLAKE2B 0645ffe9f0cadc6e412de813b32f4e37ead67039a69f7e8938b41f5ea10983a18d31e29653eab50dc41889952b00658b91853908dff3e62b50c1e85a267b4a63 SHA512 d48d4b0e3174ad7b93558534d7f0285b398e47e2c9dce3cc60cbe0a32a78fef32601cca2508f30a882609ceb3cc59efe2761720af191e6394ca1b8c51878b535
DIST libblockdev-2.17-1.tar.gz 300882 BLAKE2B a7300ecf59a3ea37c2bb3245dcb4c0434ed8292e8fca87634224557112183de5fab2e66428d9b769537eebde341a3858182f9e9b9cefa68654c1d580fe4b63b2 SHA512 e882642e124100abf578699272bf1f0a2618b5eeed3ded4582f8535173238f145f3d4a2ea7dbe4b3b464d646f6e98ef0a891e7dfa7dde7e8c3322c883f7264e6
+DIST libblockdev-2.18-1.tar.gz 310870 BLAKE2B afeb904938c9700917e3bf55665bfa5612677b963e4273378046edae15f94b90f2e85c31f12b196317fe26c4befe9ae514822d987fdc8003bc1b0cc49cd61dac SHA512 c7837b0abb7747baf8dc2a21a0a75bc5fb80693a1685ddb310bf7d606d44ea65fa4c934cff6c09c5069806dea3ee056eb53c64122ec43b5c0485cdf92fda58d5
diff --git a/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild b/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
deleted file mode 100644
index 11885ae1c964..000000000000
--- a/sys-libs/libblockdev/libblockdev-2.15-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit autotools python-single-r1
-
-MY_PV="${PV}-1"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A library for manipulating block devices"
-HOMEPAGE="https://github.com/rhinstaller/libblockdev"
-SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bcache +cryptsetup dmraid doc lvm kbd test"
-
-CDEPEND="
- >=dev-libs/glib-2.42.2
- dev-libs/libbytesize
- >=sys-apps/kmod-19
- >=sys-apps/util-linux-2.27
- >=sys-block/parted-3.1
- cryptsetup? (
- >=dev-libs/nss-3.18.0
- dev-libs/volume_key
- >=sys-fs/cryptsetup-1.6.7:=
- )
- dmraid? (
- sys-fs/dmraid
- sys-fs/lvm2
- )
- lvm? (
- sys-fs/lvm2
- virtual/udev
- )
- ${PYTHON_DEPS}
-"
-
-DEPEND="
- ${CDEPEND}
- >=dev-libs/gobject-introspection-1.3.0
- doc? ( dev-util/gtk-doc )
-"
-
-RDEPEND="
- ${CDEPEND}
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --with-btrfs
- --with-fs
- --with-part
- --with-python3
- --without-mpath
- $(use_enable test tests)
- $(use_with bcache)
- $(use_with cryptsetup crypto)
- $(use_with dmraid dm)
- $(use_with doc gtk-doc)
- $(use_with lvm lvm)
- $(use_with lvm lvm-dbus)
- $(use_with kbd)
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/sys-libs/libblockdev/libblockdev-2.16.ebuild b/sys-libs/libblockdev/libblockdev-2.18-r1.ebuild
similarity index 73%
rename from sys-libs/libblockdev/libblockdev-2.16.ebuild
rename to sys-libs/libblockdev/libblockdev-2.18-r1.ebuild
index 9cf4560ec988..839822874e03 100644
--- a/sys-libs/libblockdev/libblockdev-2.16.ebuild
+++ b/sys-libs/libblockdev/libblockdev-2.18-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit autotools python-single-r1
MY_PV="${PV}-1"
@@ -15,17 +15,19 @@ SRC_URI="https://github.com/rhinstaller/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}
LICENSE="LGPL-2+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="bcache +cryptsetup dmraid doc lvm kbd test"
+IUSE="bcache +cryptsetup dmraid doc escrow lvm kbd test vdo"
-CDEPEND="
+RDEPEND="
>=dev-libs/glib-2.42.2
dev-libs/libbytesize
>=sys-apps/kmod-19
>=sys-apps/util-linux-2.27
>=sys-block/parted-3.1
cryptsetup? (
- >=dev-libs/nss-3.18.0
- dev-libs/volume_key
+ escrow? (
+ >=dev-libs/nss-3.18.0
+ dev-libs/volume_key
+ )
>=sys-fs/cryptsetup-1.6.7:=
)
dmraid? (
@@ -36,20 +38,18 @@ CDEPEND="
sys-fs/lvm2
virtual/udev
)
+ vdo? ( dev-libs/libyaml )
${PYTHON_DEPS}
"
DEPEND="
- ${CDEPEND}
+ ${RDEPEND}
>=dev-libs/gobject-introspection-1.3.0
doc? ( dev-util/gtk-doc )
"
-RDEPEND="
- ${CDEPEND}
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+ escrow? ( cryptsetup )"
S="${WORKDIR}/${MY_P}"
@@ -67,16 +67,20 @@ src_configure() {
--with-btrfs
--with-fs
--with-part
- --with-python3
--without-mpath
+ --without-nvdimm
$(use_enable test tests)
$(use_with bcache)
$(use_with cryptsetup crypto)
- $(use_with dmraid dm)
+ $(use_with dmraid)
$(use_with doc gtk-doc)
+ $(use_with escrow)
$(use_with lvm lvm)
$(use_with lvm lvm-dbus)
$(use_with kbd)
+ $(use_with python_single_target_python2_7 python2)
+ $(use_with !python_single_target_python2_7 python3)
+ $(use_with vdo)
)
econf "${myeconfargs[@]}"
}
diff --git a/sys-libs/libblockdev/metadata.xml b/sys-libs/libblockdev/metadata.xml
index 4f133ca27fa9..00d0c434c27c 100644
--- a/sys-libs/libblockdev/metadata.xml
+++ b/sys-libs/libblockdev/metadata.xml
@@ -12,6 +12,7 @@
Support for dmraid devices, also known as ATA-RAID, or Fake RAID.
Enable support for Logical Volume Management via sys-fs/lvm2.
Enable kernel block device support.
+ Enable Virtual Data Optimizer support.
storaged-project/libblockdev
diff --git a/sys-libs/libchipcard/libchipcard-5.0.4.ebuild b/sys-libs/libchipcard/libchipcard-5.0.4.ebuild
index 0b958227933f..eaa041a3d6c5 100644
--- a/sys-libs/libchipcard/libchipcard-5.0.4.ebuild
+++ b/sys-libs/libchipcard/libchipcard-5.0.4.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.aquamaniac.de/sites/download/download.php?package=02&releas
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
IUSE="doc examples"
RDEPEND="
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index 7ba31e0a063a..e1e997f16004 100644
Binary files a/sys-power/Manifest.gz and b/sys-power/Manifest.gz differ
diff --git a/sys-power/acpilight/Manifest b/sys-power/acpilight/Manifest
index 9c9efe338603..334b8c9f546d 100644
--- a/sys-power/acpilight/Manifest
+++ b/sys-power/acpilight/Manifest
@@ -1 +1,2 @@
DIST acpilight-1.0.tar.gz 16452 BLAKE2B 6594612a25974d33d845b9b0dec4ad0a105ea7da0b24dd540385d5a3751058d9b23afe58600082095c041c86cb477f671fcf4bc7f760869f7290e9e62c8c3124 SHA512 f7913f7ebf6cbde95a42165d8bfa237be03d90fc097164b971c92721cc76f1260a6a607d85f3ecb05ec482019f0ed7f0827a473608daf39b0d05b37c1d228a8a
+DIST acpilight-v1.1.tar.gz 17583 BLAKE2B 9505d0b2e1eb6e311b3be7938c455dcca399b2a644856f57593be4da56b637445b796f16300540436645b4dc660f7330b63ff3eecf93ecb49b366d152d5c5faf SHA512 af10a538fec83315aaec3837647622ecea41cb936d38667e4e70689a2b8a968a786fc9ad2be136d5799fa091f07614886decc9044e71aec1e64765e90ddae439
diff --git a/sys-power/acpilight/acpilight-1.0-r1.ebuild b/sys-power/acpilight/acpilight-1.1.ebuild
similarity index 76%
rename from sys-power/acpilight/acpilight-1.0-r1.ebuild
rename to sys-power/acpilight/acpilight-1.1.ebuild
index 8d128ac7d5f6..a4bc1e057d40 100644
--- a/sys-power/acpilight/acpilight-1.0-r1.ebuild
+++ b/sys-power/acpilight/acpilight-1.1.ebuild
@@ -1,25 +1,32 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+PYTHON_COMPAT=( python3_5 python3_6 )
inherit python-r1 udev
+MY_P="${PN}-v${PV}"
+
DESCRIPTION="Replacement for xbacklight that uses the ACPI interface to set brightness"
-HOMEPAGE="https://github.com/wavexx/acpilight/"
-SRC_URI="https://github.com/wavexx/acpilight/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://gitlab.com/wavexx/acpilight/"
+SRC_URI="https://gitlab.com/wavexx/acpilight/-/archive/v${PV}/${MY_P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
+S="${WORKDIR}/${MY_P}"
+
RDEPEND="virtual/udev
${PYTHON_DEPS}
!x11-apps/xbacklight"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-DOCS=( README.rst )
+DOCS=( README.rst NEWS.rst )
+
+# Disable Makefile that installs by default
+src_compile() { :; }
src_install() {
python_foreach_impl python_doscript xbacklight
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 40f9423457c2..164e32352fb4 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/evisum/Manifest b/sys-process/evisum/Manifest
new file mode 100644
index 000000000000..5733757d7670
--- /dev/null
+++ b/sys-process/evisum/Manifest
@@ -0,0 +1 @@
+DIST evisum-0.1.1.tar.xz 77748 BLAKE2B 32c3330586d7d919ff54d8c3166bbece11efb1031617f039e7806dca268a6df3739db27ebc456c3b28e3d7599d325fb8aff16b21cc65b20e6011aa551a10e006 SHA512 dcfa7cdf18e08e63c53baff69c88fc81939534c7b1ecfe6a87567c30334d6f2c2899092c8eb630112f79d36e42cc2f4accc3ed3e389ed8cd0e78f52a566c2ca2
diff --git a/sys-process/evisum/evisum-0.1.1.ebuild b/sys-process/evisum/evisum-0.1.1.ebuild
new file mode 100644
index 000000000000..b495f2d787b7
--- /dev/null
+++ b/sys-process/evisum/evisum-0.1.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="System and process monitor written with EFL"
+HOMEPAGE="https://www.enlightenment.org/"
+SRC_URI="https://download.enlightenment.org/rel/apps/${PN}/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/efl-1.20.0[X]"
+RDEPEND="${DEPEND}"
+
+src_install() {
+ emake PREFIX="${D}"/usr install
+ einstalldocs
+}
diff --git a/sys-process/evisum/metadata.xml b/sys-process/evisum/metadata.xml
new file mode 100644
index 000000000000..4213c69bb418
--- /dev/null
+++ b/sys-process/evisum/metadata.xml
@@ -0,0 +1,27 @@
+
+
+
+
+ juippis@gmail.com
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
+ This is a process monitor and system monitor.
+
+ - Full support across Linux, MacOS, FreeBSD and OpenBSD.
+ - Process Listing.
+ - Single-process view.
+ - Start/stop/kill individual process.
+ - Process PID, UID, name, thread count, memory use, nice, priority, state, CPU ID
+ and CPU usage.
+ - CPU monitoring.
+ - Memory monitoring.
+ - Disk usage monitoring.
+ - Network usage monitoring.
+ - CPU temperature monitoring.
+ - Battery and power status.
+
+
diff --git a/sys-process/psmisc/psmisc-23.1-r1.ebuild b/sys-process/psmisc/psmisc-23.1-r1.ebuild
index 6351521f372c..db80c5b51ba9 100644
--- a/sys-process/psmisc/psmisc-23.1-r1.ebuild
+++ b/sys-process/psmisc/psmisc-23.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
IUSE="ipv6 nls selinux X"
RDEPEND=">=sys-libs/ncurses-5.7-r7:0=
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index e3f3c119b0cf..36bfe447bf04 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/opengl/opengl-7.0-r1.ebuild b/virtual/opengl/opengl-7.0-r1.ebuild
index caf06a13fe4b..c00a058a82e9 100644
--- a/virtual/opengl/opengl-7.0-r1.ebuild
+++ b/virtual/opengl/opengl-7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual for OpenGL implementation"
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"
+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"
RDEPEND="
|| (
diff --git a/virtual/w3m/w3m-0.ebuild b/virtual/w3m/w3m-0.ebuild
index a2fb9e6329e3..00837ac67a44 100644
--- a/virtual/w3m/w3m-0.ebuild
+++ b/virtual/w3m/w3m-0.ebuild
@@ -5,7 +5,7 @@ EAPI="6"
DESCRIPTION="Virtual for the w3m web browser"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
RDEPEND="|| (
www-client/w3m
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 93eef0100555..13f3164fcdfd 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
index 312bc419e294..3fa010ff83bc 100644
--- a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
+++ b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git"
else
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
fi
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 8f3f180307e6..48b50c98bd10 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 0a9c54d484d2..f3d459a2afd9 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_68.0.3440.25-1_amd64.deb 55395758 BLAKE2B 1aa36b7bfbb28e97665a390066edcb418b667d19148802d5a0eafa8f8b1a4c3fa67987e655eb5497e3f95bdea755aa120c6cedf9688bc371062f898ef8d14d14 SHA512 f2813ce077a881275bd74e2d4e7c9a4c6711fa1dd3e29590b8c289003663e93fe0a281b10fd8aef867ccec08043e6761fd52627856bd9f5b86739cbcd1e958d6
+DIST google-chrome-beta_68.0.3440.33-1_amd64.deb 55411906 BLAKE2B ff52b23fe4007ae6c3d80d020a256da3f99168219bb657ffd9163bd6891bd3862b9a36e68aa99d187065ea793eaecd9feef81c777affaacb6b33908db96aadce SHA512 af1beca9b0a4b9391cda86567c7e2cf0dbbb67c68307cdab3451e198113dda354a53a236503ece5497b75d74ad97e4545e166506bf6e93c27906d687be37da55
diff --git a/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.25.ebuild b/www-client/google-chrome-beta/google-chrome-beta-68.0.3440.33.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-68.0.3440.25.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-68.0.3440.33.ebuild
diff --git a/www-client/opera/Manifest b/www-client/opera/Manifest
index c3f374227c59..db69bcead9b8 100644
--- a/www-client/opera/Manifest
+++ b/www-client/opera/Manifest
@@ -2,5 +2,5 @@ DIST opera-12.16-1860.amd64.freebsd.tar.xz 13312684 BLAKE2B 2c4cd52a07999c5beabe
DIST opera-12.16-1860.i386.freebsd.tar.xz 13385696 BLAKE2B 35fef5a5d1784941ce11ff3fed440d9c8f83ce5f9a0a8aad3f68deb470a7d82accfe7c9c93be225b458c0fc8e738ca7841d3d14abcaa201801321f3280f2b58f SHA512 0bb2c0548765ea476cdb8be6c84faf1d60dddb5a2c08b7312027f4cd17fa8ebd4fbc1a97657bbcb0ac07733e5f3b340b181a307a778c38543140adbfe7f8b844
DIST opera-12.16-1860.i386.linux.tar.xz 13154668 BLAKE2B 7f9ef54f44bc143c13173bce92543351c39288058455baf3fde19f9f8766c9acd72971216c8c340fd89e918f18e89320eb8d13c4be9ec71635e2073c94c90067 SHA512 a13ec53311e3e78f35103a9dd5337c0e9a555362860213080211ee9d21de88fbd6aae03bed20b7515874d5a09dfbab108954213745fb82175f5e48e555152613
DIST opera-12.16-1860.x86_64.linux.tar.xz 14018800 BLAKE2B e0cb727ea79868d1c3c692d445fc8949f554c3bbe2bf3c9f222885891458cab7af1a29096cd3caf6936e83068841dda4bff5b8a17eb55a86bebe39ce2b270183 SHA512 c1289f352ea5fc8133b105771f48fdc56ccd770920330b1a0ed939ff909abc68081447673572eabeb1aae6db5194b6ab35c93afad78a91d8f7a9a0f91e81ef8b
-DIST opera-stable_53.0.2907.68_amd64.deb 54558586 BLAKE2B 25cb99e6c7699f85b45ce84cadeaa846fe20189ed0db9037b485104da95c9e8e861e69c67cf0dd4a2d772324168b1b0824ac653cc0c034d845387c814a8d44a3 SHA512 7e6802d7ba77b1a2a706b9d1218615810093adc0843887ece13104fbb6893e8d044d422c4df9746ed93b13de447cb8662d63a9ed2456f4e26aaf15031e809898
+DIST opera-stable_53.0.2907.106_amd64.deb 54160424 BLAKE2B 393137128b05948712da111f30286c6b75928ae4511e42d05bae56156db1322bf393982f1fd50c13da0f1510c78796c0f97a90355e2bd21de192b5febcf339fe SHA512 c724864a4c80776dd3b3aeef250409e86220da8925375081d97ffeb9fac5720554230e7eb435815683d7f8a79a5ec14a77bc8ba9112effb3cf2597d26c1a09f7
DIST opera-stable_53.0.2907.99_amd64.deb 54955596 BLAKE2B 482f18d79c8752fcc73c3aeae7479c886af84adf8345fb8434f46106cb4ac21bcc0e03f7f5359f63b6a0554c5edb6d0d7fde94151ce40a5fe25930a8cf651e63 SHA512 9727e7b75c6ee8ef2f4b9e50d96fa2f074b662b231ab578000f6476cf52ff6ba1ffb4459b55b385bd0aaa92f2b9410a86a57e61d4cfe161ac728a19e38137364
diff --git a/www-client/opera/opera-53.0.2907.68.ebuild b/www-client/opera/opera-53.0.2907.106.ebuild
similarity index 100%
rename from www-client/opera/opera-53.0.2907.68.ebuild
rename to www-client/opera/opera-53.0.2907.106.ebuild
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index c63f55c1bc82..f1553d2ccece 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1,2 @@
-DIST qutebrowser-1.3.1.tar.gz 3533949 BLAKE2B 49055673406acf89f76132c256105e898d7fe3fad797bc919407df4a6174445b459dd74946d7fa9532b301f6421e16e98e947bb407c2d940a753d803ee57dedb SHA512 59cba56a8d0d2813c679841ad835c2badbbde6b27d623288ed4d81e869b52dceaabddd3cb8560b9b7785bdf5759ad841f3c717235d1698d995b19a63333cbb18
DIST qutebrowser-1.3.2.tar.gz 3535391 BLAKE2B 1a6c1299a2ba5ffebaa0c8705732ece3401bfd548b6eb2d53746e610b819bdc9427c96d7c055d0598230c9408f99f1e20f37aa76bcbe7cb19556987afca7443c SHA512 a32a3c347d3a863e4fd19a35551d8acf668aa156e06fc150fc4a09eeaf7a35446bd825d7a99bd2c0fe4369eeeddba3217c6dacf0811c48b000af0dded88b30c3
+DIST qutebrowser-1.3.3.tar.gz 3536053 BLAKE2B 6adbf010a4f8377476f254a81868296a689148df0901653f2f7cbfd683a842cca842c3e40169a1faee88bb5e199762cab89820b89fd2be8558fe213b54e86509 SHA512 db34f8e559471f43f2d567ade36595504c4d1dc804230fae30bdb29a6af9b306e570d9f5b91bdc166ee78367d48912229c46bb48e917ead1e51258d8af18cf39
diff --git a/www-client/qutebrowser/qutebrowser-1.3.1.ebuild b/www-client/qutebrowser/qutebrowser-1.3.3.ebuild
similarity index 100%
rename from www-client/qutebrowser/qutebrowser-1.3.1.ebuild
rename to www-client/qutebrowser/qutebrowser-1.3.3.ebuild
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index b2184ac0a76e..0598f636ca94 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 81e912de02a7..376a694dbd1d 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_68.0.3440.25-1_amd64.deb 55395758 BLAKE2B 1aa36b7bfbb28e97665a390066edcb418b667d19148802d5a0eafa8f8b1a4c3fa67987e655eb5497e3f95bdea755aa120c6cedf9688bc371062f898ef8d14d14 SHA512 f2813ce077a881275bd74e2d4e7c9a4c6711fa1dd3e29590b8c289003663e93fe0a281b10fd8aef867ccec08043e6761fd52627856bd9f5b86739cbcd1e958d6
+DIST google-chrome-beta_68.0.3440.33-1_amd64.deb 55411906 BLAKE2B ff52b23fe4007ae6c3d80d020a256da3f99168219bb657ffd9163bd6891bd3862b9a36e68aa99d187065ea793eaecd9feef81c777affaacb6b33908db96aadce SHA512 af1beca9b0a4b9391cda86567c7e2cf0dbbb67c68307cdab3451e198113dda354a53a236503ece5497b75d74ad97e4545e166506bf6e93c27906d687be37da55
DIST google-chrome-stable_67.0.3396.87-1_amd64.deb 52519028 BLAKE2B bdac58e85ca49d20abdd7e11d25d996d5b44c2af9fec2b8adf17b2966f30e4099d5f3ca55ff44d91d13445fbecbf7a009195911aeab96196d4f39b534b58b089 SHA512 0716e503c2490af1ea76dbbce5e369d5e0461ba4c5c31de1f25b3f383c9494e0f102f9946a245acdb160e7433716da84c6ca18edd725d7ebc656e3ccb8be42ae
DIST google-chrome-unstable_69.0.3464.0-1_amd64.deb 55896748 BLAKE2B 24e568f728c80338d7cbf686c6a5d09dc78da5326dceac94cda58795c99a0177a6de7dd563146d2f121f1eceec4ec82782c62a07c9b298af99adbc33e85d5543 SHA512 a1488bf03b26d35126e296c84125a0367914b852dc13f9ccec6069d5fa12f32e3132c9f8174a8c8f794ba708fe74ca8e120b6a81a30d2bf8149a938baa947892
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.25_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.33_beta.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.25_beta.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-68.0.3440.33_beta.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 9843eb268a66..74abb7a72ca3 100644
Binary files a/www-servers/Manifest.gz and b/www-servers/Manifest.gz differ
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index e6adcc683264..613d35ccc7a0 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -1,12 +1,11 @@
DIST modsecurity-2.9.2.tar.gz 4298993 BLAKE2B 32a92148f0e1a1166cf888b8172fc55340c5712c9b770583703c74db450e77226629640c9db03f32e9f28397e6488669d06a89e4d31cb5ab5fff26b30ad843e0 SHA512 69c87ef6f7b6411f4803eb25af32969a1da59722121257c2edf345a3f5a4ab9ae8a49c886cbbfc722c5bda91c6d6ea55232f968c0a0407d7d7b3af53dc862c21
DIST nginx-1.12.2.tar.gz 981687 BLAKE2B cca2d2b2267fee6feac7e91a5aaec229251e829203b02c207a6a89644fd6b1f2003d75225fadde9fdfc8dda444dc53c7ff0033a1e15a0f25019c878fc716d83f SHA512 3faa2043e237a7e1d15cc5661ac9d002a965220a78c25a863be9f19e01007347e53f776b61c229f6bd3d916cc1ccf92de260811f7b8092ec1b747fba7c0061f7
-DIST nginx-1.13.12.tar.gz 1016311 BLAKE2B 8b56e1e13c2598181153b9fe5f5a9ac6349ba1d6c98cfca708cb7ae1d3b6eec92df0132091107bc20c0ae1bec15020957c820f9414890151b4b1830f00af2d40 SHA512 c61668d4999d43ccd5ed8e99bd2f6992190503bb3c4103a22871e346feb8cbd049b04416ca7eb982c122a9a29bb21c6bb9f934411dd80bc02d946105f7917873
DIST nginx-1.14.0.tar.gz 1016272 BLAKE2B 37d292955dc5f03f6b3b05fd434807ba1033fab73494866e8bacb99df1d595a7665b3722e9bb7227a119cabfea79be08a14e589565cedb78693fc3990cee4466 SHA512 40f086c9f741727e6f55802b6c3a66f081f7c49c38646dc1491aa3e3c35bae12b65ea6594386609fc849bcd99a60d7cd8ecb3f8d519e0e9ab8db01d653e930e9
DIST nginx-1.15.0.tar.gz 1020675 BLAKE2B b8151877d06f96276fc8186dc8c32b8f1479e27c7f6bdba9158b1d945661891e14c39d2ab3ff8991b3906c5fffe721ab4014d709895a6e3f5bc22b687ea3c536 SHA512 7dbdf437d8d546059a8a03aa9c8d2be98dba7306e2daa49611c16f1e56413a25d4c622da13a815e8075a10f4a0cd744167deaeb971c0a69189940a7a05fa32df
DIST nginx-auth-ldap-42d195d7a7575ebab1c369ad3fc5d78dc2c2669c.tar.gz 18457 BLAKE2B 22225ca9e5299b20ab5a93a001cac48e446bd86b3a24ac49e716bc975b128890bdb4b0dbbf5730fbaaeadfd958160093c7a6af798dd0e6de27062f149a760333 SHA512 ec59637fda5acac053e815cb1d04b545fc6b765e5ec63d8c2c9c301abad87afaa2698145acac08e9e14c91e1423ebff7aff0cca2b940b19ccccbf4cf53973269
DIST nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz 17159 BLAKE2B f2209c8b5eb5616a362f2b532245167a5940faad6d66d98a94b3bf2d1e33a73492d42c60a9ddad347a592362a002ff38273a5d1f61f663984a09e14a3fe35e0f SHA512 323abd0ca8e90f5afcaf81a8ff1a8abe3dfcbff3d69f0dd4a1c005fe6436acbf3076c4c57a4df877b3d8e388cbea085d46301bb2df9c0752e2567817ff7cca92
DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 BLAKE2B d37ef9a15c91abe3c6258e420d1f99fa452f9d9966a0e13102174973314a3bac5413957a5fe632a9dcb1163b3be5df8116e05cc053ee061e19319ec25f341570 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529
-DIST ngx_brotli-37ab9b2933a0b756ba3447000b7f31d432ed8228.tar.gz 12692 BLAKE2B 8b969fcd7daf37d790e81ff6dd4d43a210c9097052cc7a2db9f2aa8ad3115ffe175b0839210c234610e5731be35327eb08eb0eb3f28783d272b172df07259651 SHA512 fb12e4b50b9a472ee2f4fe08ffd86c38072a4c254a4f99627d6f2411f915c139f6e7cfe41f29222bc70b57942cde85d8ef2cd5458638201c751cd4c818d65f10
+DIST ngx_brotli-0.1.2.tar.gz 12668 BLAKE2B 904d3f28dcf9f2d5a8eefa2ab8ff991e34624897a9932e351ec4cea05f2b0dbee34ea495de2d546510a556fb10041b388be963f28fecfcd7dc8638f950b36fd0 SHA512 661b4ce5cc678600e5df6be7588b0f0d5d914df9a6788c994cebfa25e211720b9e7d2c08fc34eb6a84743ae2929920ebf2888075e122ac23816ab7c0f3ef4b76
DIST ngx_devel_kit-0.3.0-r1.tar.gz 66455 BLAKE2B e4e987a85b2283ba540b4b894382e65dac7fbca23e233b1031b38828908088370cdb1a9bded4d4ee1ceb1c2e1d506dc2b6f4ba5f6ee94248e863def5a1c8dd1a SHA512 558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614
DIST ngx_http_auth_pam-1.5.1.tar.gz 6863 BLAKE2B 00807cc3db8f6c007c968b8a30d7f6094b7d9db4eaa60d211fcb3ac60aeb28c5f8193578a7e1ca67acbbf57a319c8442fe44efc1e193927c3bce5961539f9c16 SHA512 973b94874d8a58c0df0ac2d31571eafc1e80b11179cba33ec88421a826207fbf7e99b0387e135a1ca48d82daacb78f19a4c21d3a27b49b16dc86b4748bb72261
DIST ngx_http_cache_purge-2.3.tar.gz 12248 BLAKE2B f83b267f4c19a9d4af5964522695814c164d200ecd4108bf8f6b5c21388eba8af989bdda646dee18a03174211e8c090a04736bbeb44043cb0e19fbccdc66278e SHA512 50a31dbf2216a6fae74a186af56dec4600cf55777e76a10ac0075f609e7737135aab063a64f2590dddcd0369ebebd4a523027f3d9ebcca74f7b4355be1c5dcc0
@@ -17,7 +16,6 @@ DIST ngx_http_geoip2_module-2.0.tar.gz 6766 BLAKE2B 338c9503530ebba6076a2222fe9d
DIST ngx_http_headers_more-0.32.tar.gz 28033 BLAKE2B 51cff34f9a690a3c9a2a05b04084cdd51530b1f41baa1d487bd5bd4349d37a6cc48edffb78466572bee3e42aea10f56e1f8bc47d53a2790023ff831eaa72381f SHA512 e42582b45c3111de3940bbeb67ce161aca2d55adcfb00c61c12256fa0e36221d38723013f36edbcf6d1b520f8dfb49d4657df8a956e66d36e68425afad382bd1
DIST ngx_http_headers_more-0.33.tar.gz 28130 BLAKE2B fe3097a7700ce5da087058f7bb44c95164b75137031187400473f6833bf0e33e5c4920807225a6ff94174fe7dbd6186cca176a33a629ca0911faab6804bdd12a SHA512 13165b1b8d4be281b8bd2404fa48d456013d560bace094c81da08a35dc6a4f025a809a3ae3a42be6bbf67abbcbe41e0730aba06f905220f3baeb01e1192a7d37
DIST ngx_http_lua-0.10.10.tar.gz 611973 BLAKE2B c84d039087973cc6f718fd5cfcb043fd96893d790d2d65b448faf63ad7e3b8713d529c7804a436cc972bcabb9d4d3a8a605fe70a4ccf0a696dfc493656ac513c SHA512 3440e3fe714407f0ff61e0da207669655b443f7b70ef8a91693ea05ed96d8fde349d9c8ea30d5ff53ea3f8e4a5c7d0a2834e136c340b1b1365d62006339a1e4d
-DIST ngx_http_lua-0.10.11.tar.gz 616653 BLAKE2B 6985823752755b78b626f597600adf45592ce4c8dc3a513dd43b9f5152c9746a795faa3714124d74814ad88739dd8889de50e764ad2ea808c48570d1e297aeec SHA512 35e1510c9da71c8bdf028f4ac253404550a83bd904f6c5639697d78c76708625bb6deaa858a7d086b5582f71bb46578e8f804887a46ccfbaf5f4de8510cb1511
DIST ngx_http_lua-0.10.13.tar.gz 624102 BLAKE2B 009506e4cd505a2e383e2c6344b62b541b3bbb28410d4ae2e88139227e22e19dd14372a902f172fadaf82a76c5875936caff4a8c98ff740456488e5ac6ff8c53 SHA512 8c316b9d12dc35779fcddc6bb90942c096f19fd8c2e090b8397e1e1ca6f0ebd7a4edddc03fddb31310147ba4e9db9fc4b3749cfd2323046d88045b3b3333f07d
DIST ngx_http_naxsi-0.55.3.tar.gz 187416 BLAKE2B de4b00bcfa3e81b7f339bde9f2517e228d2f914c1ac76babd7db1419168814d30f44623a67c0f79475c232ca456792cbdc8f2b6ef3ebd1524eff3f2acfa87685 SHA512 9e8f41a5cd1342cc9b8aa334a603842d14a256aab1f4a21205bb1278aecbb0c49e39c889d8113a5b41aad2efeaa2ed9f11cba6929173f50add91f54c4c59c8a0
DIST ngx_http_push_stream-0.5.2.tar.gz 182008 BLAKE2B b53c1269a5b96b35054011879dc2288ec7c9dd3965a1d4cea73fb7804626797b3cf7929ffa00fb0fc7479f5d6a7f8d006dbdde1ffa435f878c7cc9278e6cca00 SHA512 ee8bf9ece652da6aa5a39879298bba70d1842696545259f3f5e302cc61397b35f016364805805f9ab1914fc39ed2f07c015e042155789073e3d1fdc02a0783de
@@ -26,13 +24,11 @@ DIST ngx_http_slowfs_cache-1.10.tar.gz 11809 BLAKE2B 54ec1bd0d1cc43cdaafc93ebd46
DIST ngx_http_upload_progress-0.9.2-r1.tar.gz 17268 BLAKE2B 7bbbf52e326c64a008339d2f80f123630fd314f705224c8f1c7d0c90bb4d31a24aaa95df55c9022838179114a031731a894992960aecc727635e0e2a0761d2c4 SHA512 c31c46344d49704389722325a041b9cd170fa290acefe92cfc572c07f711cd3039de78f28df48ca7dcb79b2e4bbe442580aaaf4d92883fd3a14bf41d66dd9d8c
DIST ngx_http_upstream_check-31b1b42873fa56620d8a873ac13f5f26b52d0cd6.tar.gz 130052 BLAKE2B 0ff95fc9780193b514fc7b28f6c5c1a58942cd54472a495a1812a48ef4039390241c20c8a3e8dfd6168e87df3a9e3b37e9c33f11d13bdf5fb0d1f37041fe4ee8 SHA512 e7ea6712c27fd2610e8681b7f687e24c94cd7558d6f19f87568d4c2169115678a61c58b1cd3686a927173b566ff1e10cb1fb767fe63db61f860a77bac9792f9b
DIST ngx_http_upstream_check-9aecf15ec379fe98f62355c57b60c0bc83296f04.tar.gz 130073 BLAKE2B 3c93cef79425a46e22ae39adf13d5ebb0e5d36f5d6be8555ec068dd0017918f5355d82fbbe90ba934e58c52e89c2096e24012f75390c7159d1ebacfaaa112308 SHA512 fad2a0d3ac332b6e67c52e3525f6df8a432df3e92bc173190b8107fba7f24476ab9dae4824630299af68c15e856409bd47a3a79fb5b65e03a5133eb90142b8fc
-DIST ngx_http_vhost_traffic_status-0.1.15-gentoo.tar.gz 371234 BLAKE2B 6c164d8c5ee4f3a6729989d9ab2ba874dd5dc285f5c52baf50b05880f184d1ef779f320efa36db8228ab15a8885e972664aee2b1d367279edbf840e41a4c8108 SHA512 63bb0d576fb896526e13fd624eb61b0562756d9aef9124be3d4e845312885838b96d93a4233b15e1b0449714c9689ef1e88b680f23f5d9c909b31026d8c13d08
-DIST ngx_http_vhost_traffic_status-0.1.16.tar.gz 371717 BLAKE2B 0f29f721ca38788343de52c7462efcfe846161ed8dc8433979a1189ad2d11f6917c552a58113de1306ad657d8cb62a22d0a94c053801c2e4becdbcd2f16f1552 SHA512 a85f17bff4e47d6e4e45b9493d759d493a3b4564c76ce7c526ff9afe99d4bd7191cecf17c3bad2bd19cdf5dfa4c4eba21baff8bdbf08550485ee4956963f9e73
+DIST ngx_http_vhost_traffic_status-0.1.17.tar.gz 380239 BLAKE2B ca642825d02a11d289ca45dfc6231e8ddb13d72bce0343beb2e7fea8f255ac30bdc7751ae1c521f42c5de0245ecd0cff31fea050f7c5b4610620e43c6f4250f2 SHA512 cb9abe922b0494c2587e404b0d603a0441a9a328ef5a83b11e0323e8038010e7d69dfa0d9e5c7122d7bd9b6799a684d4d934e5473442f9f41344c8d38d0d6550
DIST ngx_memc_module-0.18.tar.gz 37113 BLAKE2B e5b89c7c7a3e6f8ee7c1b2623fbec78851a9d7c1c37c1924e8c010b45a4e034afe504a5e228361ad88cf57e83ce06f5f6d635301f8201f1ebd7e99f30447d524 SHA512 8087bd361fb4e522493e66f93d59c9b13245d6eef0fe4a53f619d1826feb02af60769c0a04f87f2faf5308a44b794ef146a445bdbe7cbc7f21c0edaaba08c706
DIST ngx_memc_module-0.19.tar.gz 34654 BLAKE2B 536384c264d88535179634d459d3a47b1d9b11885fbce46fbe9fa4df3dce365320b5963c56aecde3b0039d4f9954943d95f25c5f4fada6256861257f82ebbb12 SHA512 a64ec8dffcd011db2cd12b501271bf5c408f2f31fd2bf477b8db4e88adc5bb5732c4c2181ed8378cab6a937869d8f747ef52b22fe256c90df8440b91890edbe7
DIST ngx_metrics-0.1.1.tar.gz 2964 BLAKE2B 95d71ea26c949c345b83e353bd66a20df18cc8b2b93f692615a1b39c1f327393647f80e7a27e6929799a6e7e3469b61e1cd72f7821f7a820da4dd7cd9a96d85c SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e
DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 BLAKE2B e0729b66554c8890727190a624d4c9aef6499dfc2e301541a9bfc15690caf6d3155c8a4b8f7a1555a7655b47aa0cd1b797aeb8ba82efa92ab80808218a0bdcff SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1
DIST ngx_rtmp-1.2.0.tar.gz 519895 BLAKE2B a5a888473dd2ba2320ff74017e8445d96fa3e361acc559edb270ad075c937ab5630e537a67ad8ed134a7ec5809ae63e38791ac25ceab3e26160469be8cc2e82c SHA512 8965d9bee91a46375516ccd012d1c43cd23f15c0630d11ed01472b9a84504574b476f22c5584f43c972a8f923e9ae025b9b60c64aace0ed159c7279bcbd376c8
DIST ngx_rtmp-1.2.1.tar.gz 519919 BLAKE2B 744ccb8031eb9653f158f9eceba64fc9c8af7b9a42e64ef996ab3bbbe1402e5ffd3efcc8e4aaca437eb5e208e4b6f2d8643fcca953b32f32543eaa1ae4d9505c SHA512 4a0af5e9afa4deb0b53de8de7ddb2cfa6430d372e1ef9e421f01b509548bd134d427345442ac1ce667338cc2a1484dc2ab732e316e878ac7d3537dc527d5f922
-DIST njs-0.2.0.tar.gz 251246 BLAKE2B 76c0be4a98d5782df8d9ecb4b5a6a463a77fd59078f5d25a3763ea5e8633906966fc0a34c98dd9dca2dcc1f54994b0f47d8e80a5903faabbe43865930c2bc267 SHA512 8b1975594f47e49f6d245a99e64e59a3eebf916b9e7e8626e5b1487275688e3dd84691e99ed2207698724dc82d75c54176eb88b9104e847d1cd7db7ead89a391
-DIST njs-0.2.1.tar.gz 252791 BLAKE2B a8507c016cef8481c456e675bd4972a018a049933e5ba2d03027f0c871c264d6848d25a9a715fa4e7920b63bfe86470b4f835790296dba6227aad16b80e5a849 SHA512 b924be63b3d8a996dfd5dd120a3103619c52a9193ca442a21f85f2d5e0a30690fa67401125e775cdf2127f659a61e34b8defe63f7fd33e318cca2a7f99c44154
+DIST njs-0.2.2.tar.gz 253349 BLAKE2B 1ca508677a251ff38f5bca01292f2c7d2c41ac1c5d2cffae8b565694cbed9ebb2811b7e8893ea03384810e169ebb0cccfbf51d36166fcbc32e77fb30ba90d664 SHA512 e309b06b66e955873b82ef6c8881c3a98e0cf22e379b292c7561947db34c28990ade5461f42561e73c79c8e1e7914a990a003926054f884551edc16015ac4792
diff --git a/www-servers/nginx/files/http_vhost_traffic_status-0.1.15-allow-compilation-without-HTTP-cache.patch b/www-servers/nginx/files/http_vhost_traffic_status-0.1.15-allow-compilation-without-HTTP-cache.patch
deleted file mode 100644
index e3ac786a62e6..000000000000
--- a/www-servers/nginx/files/http_vhost_traffic_status-0.1.15-allow-compilation-without-HTTP-cache.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 75118e8998d876b5cd0f285a1fa184c3b6ba7fd6 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann
-Date: Fri, 16 Feb 2018 20:59:07 +0100
-Subject: [PATCH] Fix compilation without HTTP cache.
-
----
- src/ngx_http_vhost_traffic_status_control.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/ngx_http_vhost_traffic_status_control.c b/src/ngx_http_vhost_traffic_status_control.c
-index ade1475..ee5fd3c 100644
---- a/src/ngx_http_vhost_traffic_status_control.c
-+++ b/src/ngx_http_vhost_traffic_status_control.c
-@@ -196,6 +196,7 @@ ngx_http_vhost_traffic_status_node_status_group(
- control->r, *control->buf);
- break;
-
-+#if (NGX_HTTP_CACHE)
- case NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAM_CC:
- *control->buf = ngx_sprintf(*control->buf,
- NGX_HTTP_VHOST_TRAFFIC_STATUS_JSON_FMT_CACHE_S);
-@@ -203,6 +204,7 @@ ngx_http_vhost_traffic_status_node_status_group(
- *control->buf = ngx_http_vhost_traffic_status_display_set_cache(
- control->r, *control->buf, node);
- break;
-+#endif
-
- case NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAM_FG:
- *control->buf = ngx_sprintf(*control->buf,
-@@ -317,10 +319,12 @@ ngx_http_vhost_traffic_status_node_status_zone(
- }
- break;
-
-+#if (NGX_HTTP_CACHE)
- case NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAM_CC:
- *control->buf = ngx_http_vhost_traffic_status_display_set_cache_node(control->r,
- *control->buf, vtsn);
- break;
-+#endif
-
- case NGX_HTTP_VHOST_TRAFFIC_STATUS_UPSTREAM_FG:
- (void) ngx_http_vhost_traffic_status_node_position_key(&dst, 2);
diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index 8315c7922c72..3eb0471b477a 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -21,7 +21,7 @@
NGINX-based Media Streaming Server
- http://nginx.org/en/CHANGES
+ https://nginx.org/en/CHANGES
openresty/memc-nginx-module
nginx-goodies/nginx-sticky-module-ng
diff --git a/www-servers/nginx/nginx-1.13.12-r1.ebuild b/www-servers/nginx/nginx-1.13.12-r1.ebuild
deleted file mode 100644
index e38965dd7ec0..000000000000
--- a/www-servers/nginx/nginx-1.13.12-r1.ebuild
+++ /dev/null
@@ -1,1064 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-# Maintainer notes:
-# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
-# - any http-module activates the main http-functionality and overrides USE=-http
-# - keep the following requirements in mind before adding external modules:
-# * alive upstream
-# * sane packaging
-# * builds cleanly
-# * does not need a patch for nginx core
-# - TODO: test the google-perftools module (included in vanilla tarball)
-
-# prevent perl-module from adding automagic perl DEPENDs
-GENTOO_DEPEND_ON_PERL="no"
-
-# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
-DEVEL_KIT_MODULE_PV="0.3.0"
-DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
-DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
-DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
-
-# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="37ab9b2933a0b756ba3447000b7f31d432ed8228"
-HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
-HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-
-# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
-HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
-HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
-HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
-HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
-
-# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
-HTTP_HEADERS_MORE_MODULE_PV="0.33"
-HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
-HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
-HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
-
-# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
-HTTP_CACHE_PURGE_MODULE_PV="2.3"
-HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
-HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
-
-# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
-HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
-HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
-HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
-
-# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
-HTTP_FANCYINDEX_MODULE_PV="0.4.2"
-HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
-HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
-
-# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.11"
-HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
-HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
-HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
-
-# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
-HTTP_AUTH_PAM_MODULE_PV="1.5.1"
-HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
-HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
-HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
-
-# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
-HTTP_UPSTREAM_CHECK_MODULE_PV="9aecf15ec379fe98f62355c57b60c0bc83296f04"
-HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
-HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
-
-# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
-HTTP_METRICS_MODULE_PV="0.1.1"
-HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
-HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
-
-# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.1.15-gentoo"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/Whissi/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-
-# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
-HTTP_NAXSI_MODULE_PV="0.55.3"
-HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
-HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
-HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
-
-# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
-RTMP_MODULE_PV="1.2.1"
-RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
-RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
-RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
-
-# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
-HTTP_DAV_EXT_MODULE_PV="0.1.0"
-HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
-HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
-HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
-
-# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
-HTTP_ECHO_MODULE_PV="0.61"
-HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
-HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
-HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
-
-# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
-# keep the MODULE_P here consistent with upstream to avoid tarball duplication
-HTTP_SECURITY_MODULE_PV="2.9.2"
-HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
-HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
-HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
-
-# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
-HTTP_PUSH_STREAM_MODULE_PV="0.5.4"
-HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
-HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
-HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
-
-# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
-HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
-HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
-HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
-HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
-
-# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
-HTTP_MOGILEFS_MODULE_PV="1.0.4"
-HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
-HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
-
-# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.18"
-HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
-HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
-HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
-
-# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
-HTTP_LDAP_MODULE_PV="42d195d7a7575ebab1c369ad3fc5d78dc2c2669c"
-HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
-HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
-
-# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.2.0"
-NJS_MODULE_P="njs-${NJS_MODULE_PV}"
-NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
-NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
-
-# We handle deps below ourselves
-SSL_DEPS_SKIP=1
-AUTOTOOLS_AUTO_DEPEND="no"
-
-inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
-
-DESCRIPTION="Robust, small and high performance http and reverse proxy server"
-HOMEPAGE="https://nginx.org"
-SRC_URI="https://nginx.org/download/${P}.tar.gz
- ${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
- nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )
- nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
- nginx_modules_http_brotli? ( ${HTTP_BROTLI_MODULE_URI} -> ${HTTP_BROTLI_MODULE_P}.tar.gz )
- nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
- nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
- nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
- nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
- nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
- nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
- nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
- nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
- nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
- nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
- nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
- nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
- nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
- nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
- nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
- nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
- nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
- nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
- nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
- rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
-
-LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
- nginx_modules_http_security? ( Apache-2.0 )
- nginx_modules_http_push_stream? ( GPL-3 )"
-
-SLOT="mainline"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-
-# Package doesn't provide a real test suite
-RESTRICT="test"
-
-NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
- fastcgi geo grpc gzip limit_req limit_conn map memcached mirror
- proxy referer rewrite scgi ssi split_clients upstream_hash
- upstream_ip_hash upstream_keepalive upstream_least_conn
- upstream_zone userid uwsgi"
-NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
- gzip_static image_filter mp4 perl random_index realip secure_link
- slice stub_status sub xslt"
-NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
- upstream_hash upstream_least_conn upstream_zone"
-NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
-NGINX_MODULES_MAIL="imap pop3 smtp"
-NGINX_MODULES_3RD="
- http_auth_ldap
- http_auth_pam
- http_brotli
- http_cache_purge
- http_dav_ext
- http_echo
- http_fancyindex
- http_headers_more
- http_javascript
- http_lua
- http_memc
- http_metrics
- http_mogilefs
- http_naxsi
- http_push_stream
- http_security
- http_slowfs_cache
- http_sticky
- http_upload_progress
- http_upstream_check
- http_vhost_traffic_status
- stream_javascript
-"
-
-IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
- pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
-
-for mod in $NGINX_MODULES_STD; do
- IUSE="${IUSE} +nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_OPT; do
- IUSE="${IUSE} nginx_modules_http_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_STD; do
- IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_STREAM_OPT; do
- IUSE="${IUSE} nginx_modules_stream_${mod}"
-done
-
-for mod in $NGINX_MODULES_MAIL; do
- IUSE="${IUSE} nginx_modules_mail_${mod}"
-done
-
-for mod in $NGINX_MODULES_3RD; do
- IUSE="${IUSE} nginx_modules_${mod}"
-done
-
-# Add so we can warn users updating about config changes
-# @TODO: jbergstroem: remove on next release series
-IUSE="${IUSE} nginx_modules_http_spdy"
-
-CDEPEND="
- pcre? ( dev-libs/libpcre:= )
- pcre-jit? ( dev-libs/libpcre:=[jit] )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- http2? (
- !libressl? ( >=dev-libs/openssl-1.0.1c:0= )
- libressl? ( dev-libs/libressl:= )
- )
- http-cache? (
- userland_GNU? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- nginx_modules_http_brotli? ( app-arch/brotli:= )
- nginx_modules_http_geoip? ( dev-libs/geoip )
- nginx_modules_http_gunzip? ( sys-libs/zlib )
- nginx_modules_http_gzip? ( sys-libs/zlib )
- nginx_modules_http_gzip_static? ( sys-libs/zlib )
- nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
- nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
- nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
- nginx_modules_http_secure_link? (
- userland_GNU? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:= )
- )
- )
- nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
- nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) )
- nginx_modules_http_auth_pam? ( virtual/pam )
- nginx_modules_http_metrics? ( dev-libs/yajl:= )
- nginx_modules_http_dav_ext? ( dev-libs/expat )
- nginx_modules_http_security? (
- dev-libs/apr:=
- dev-libs/apr-util:=
- dev-libs/libxml2:=
- net-misc/curl
- www-servers/apache
- )
- nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-nginx )
- !www-servers/nginx:0"
-DEPEND="${CDEPEND}
- nginx_modules_http_brotli? ( virtual/pkgconfig )
- nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
- arm? ( dev-libs/libatomic_ops )
- libatomic? ( dev-libs/libatomic_ops )"
-PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
-
-REQUIRED_USE="pcre-jit? ( pcre )
- nginx_modules_http_grpc? ( http2 )
- nginx_modules_http_lua? ( nginx_modules_http_rewrite )
- nginx_modules_http_naxsi? ( pcre )
- nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
- nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
- nginx_modules_http_security? ( pcre )
- nginx_modules_http_push_stream? ( ssl )"
-
-pkg_setup() {
- NGINX_HOME="/var/lib/nginx"
- NGINX_HOME_TMP="${NGINX_HOME}/tmp"
-
- ebegin "Creating nginx user and group"
- enewgroup ${PN}
- enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
- eend $?
-
- if use libatomic; then
- ewarn "GCC 4.1+ features built-in atomic operations."
- ewarn "Using libatomic_ops is only needed if using"
- ewarn "a different compiler or a GCC prior to 4.1"
- fi
-
- if [[ -n $NGINX_ADD_MODULES ]]; then
- ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
- ewarn "This nginx installation is not supported!"
- ewarn "Make sure you can reproduce the bug without those modules"
- ewarn "_before_ reporting bugs."
- fi
-
- if use !http; then
- ewarn "To actually disable all http-functionality you also have to disable"
- ewarn "all nginx http modules."
- fi
-
- if use nginx_modules_http_mogilefs && use threads; then
- eerror "mogilefs won't compile with threads support."
- eerror "Please disable either flag and try again."
- die "Can't compile mogilefs with threads support"
- fi
-}
-
-src_prepare() {
- eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
- eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
-
- if use nginx_modules_http_brotli; then
- cd "${HTTP_BROTLI_MODULE_WD}" || die
- eapply "${FILESDIR}"/http_brotli-detect-brotli-r1.patch
- cd "${S}" || die
- fi
-
- if use nginx_modules_http_upstream_check; then
- eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
- fi
-
- if use nginx_modules_http_cache_purge; then
- cd "${HTTP_CACHE_PURGE_MODULE_WD}" || die
- eapply "${FILESDIR}"/http_cache_purge-1.11.6+.patch
- cd "${S}" || die
- fi
-
- if use nginx_modules_http_security; then
- cd "${HTTP_SECURITY_MODULE_WD}" || die
-
- eautoreconf
-
- if use luajit ; then
- sed -i \
- -e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
- configure || die
- fi
-
- cd "${S}" || die
- fi
-
- if use nginx_modules_http_upload_progress; then
- cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
- eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
- cd "${S}" || die
- fi
-
- find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
- # We have config protection, don't rename etc files
- sed -i 's:.default::' auto/install || die
- # remove useless files
- sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
-
- # don't install to /etc/nginx/ if not in use
- local module
- for module in fastcgi scgi uwsgi ; do
- if ! use nginx_modules_http_${module}; then
- sed -i -e "/${module}/d" auto/install || die
- fi
- done
-
- eapply_user
-}
-
-src_configure() {
- # mod_security needs to generate nginx/modsecurity/config before including it
- if use nginx_modules_http_security; then
- cd "${HTTP_SECURITY_MODULE_WD}" || die
-
- ./configure \
- --enable-standalone-module \
- --disable-mlogc \
- --with-ssdeep=no \
- $(use_enable pcre-jit) \
- $(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
-
- cd "${S}" || die
- fi
-
- local myconf=() http_enabled= mail_enabled= stream_enabled=
-
- use aio && myconf+=( --with-file-aio )
- use debug && myconf+=( --with-debug )
- use http2 && myconf+=( --with-http_v2_module )
- use libatomic && myconf+=( --with-libatomic )
- use pcre && myconf+=( --with-pcre )
- use pcre-jit && myconf+=( --with-pcre-jit )
- use threads && myconf+=( --with-threads )
-
- # HTTP modules
- for mod in $NGINX_MODULES_STD; do
- if use nginx_modules_http_${mod}; then
- http_enabled=1
- else
- myconf+=( --without-http_${mod}_module )
- fi
- done
-
- for mod in $NGINX_MODULES_OPT; do
- if use nginx_modules_http_${mod}; then
- http_enabled=1
- myconf+=( --with-http_${mod}_module )
- fi
- done
-
- if use nginx_modules_http_fastcgi; then
- myconf+=( --with-http_realip_module )
- fi
-
- # third-party modules
- if use nginx_modules_http_upload_progress; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
- fi
-
- if use nginx_modules_http_headers_more; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
- fi
-
- if use nginx_modules_http_cache_purge; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
- fi
-
- if use nginx_modules_http_slowfs_cache; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
- fi
-
- if use nginx_modules_http_fancyindex; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
- fi
-
- if use nginx_modules_http_lua; then
- http_enabled=1
- if use luajit; then
- export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
- export LUAJIT_INC=$(pkg-config --variable includedir luajit)
- else
- export LUA_LIB=$(pkg-config --variable libdir lua)
- export LUA_INC=$(pkg-config --variable includedir lua)
- fi
- myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
- myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
- fi
-
- if use nginx_modules_http_auth_pam; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
- fi
-
- if use nginx_modules_http_upstream_check; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
- fi
-
- if use nginx_modules_http_metrics; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
- fi
-
- if use nginx_modules_http_naxsi ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_NAXSI_MODULE_WD} )
- fi
-
- if use rtmp ; then
- http_enabled=1
- myconf+=( --add-module=${RTMP_MODULE_WD} )
- fi
-
- if use nginx_modules_http_dav_ext ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
- fi
-
- if use nginx_modules_http_echo ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
- fi
-
- if use nginx_modules_http_security ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
- fi
-
- if use nginx_modules_http_push_stream ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
- fi
-
- if use nginx_modules_http_sticky ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
- fi
-
- if use nginx_modules_http_mogilefs ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
- fi
-
- if use nginx_modules_http_memc ; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
- fi
-
- if use nginx_modules_http_auth_ldap; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
- fi
-
- if use nginx_modules_http_vhost_traffic_status; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
- fi
-
- if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
- myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
- fi
-
- if use nginx_modules_http_brotli; then
- http_enabled=1
- myconf+=( --add-module=${HTTP_BROTLI_MODULE_WD} )
- fi
-
- if use http || use http-cache || use http2 || use nginx_modules_http_javascript; then
- http_enabled=1
- fi
-
- if [ $http_enabled ]; then
- use http-cache || myconf+=( --without-http-cache )
- use ssl && myconf+=( --with-http_ssl_module )
- else
- myconf+=( --without-http --without-http-cache )
- fi
-
- # Stream modules
- for mod in $NGINX_MODULES_STREAM_STD; do
- if use nginx_modules_stream_${mod}; then
- stream_enabled=1
- else
- myconf+=( --without-stream_${mod}_module )
- fi
- done
-
- for mod in $NGINX_MODULES_STREAM_OPT; do
- if use nginx_modules_stream_${mod}; then
- stream_enabled=1
- myconf+=( --with-stream_${mod}_module )
- fi
- done
-
- if use nginx_modules_stream_javascript; then
- stream_enabled=1
- fi
-
- if [ $stream_enabled ]; then
- myconf+=( --with-stream )
- use ssl && myconf+=( --with-stream_ssl_module )
- fi
-
- # MAIL modules
- for mod in $NGINX_MODULES_MAIL; do
- if use nginx_modules_mail_${mod}; then
- mail_enabled=1
- else
- myconf+=( --without-mail_${mod}_module )
- fi
- done
-
- if [ $mail_enabled ]; then
- myconf+=( --with-mail )
- use ssl && myconf+=( --with-mail_ssl_module )
- fi
-
- # custom modules
- for mod in $NGINX_ADD_MODULES; do
- myconf+=( --add-module=${mod} )
- done
-
- # https://bugs.gentoo.org/286772
- export LANG=C LC_ALL=C
- tc-export CC
-
- if ! use prefix; then
- myconf+=( --user=${PN} )
- myconf+=( --group=${PN} )
- fi
-
- local WITHOUT_IPV6=
- if ! use ipv6; then
- WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
- fi
-
- if [[ -n "${EXTRA_ECONF}" ]]; then
- myconf+=( ${EXTRA_ECONF} )
- ewarn "EXTRA_ECONF applied. Now you are on your own, good luck!"
- fi
-
- ./configure \
- --prefix="${EPREFIX}"/usr \
- --conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
- --error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
- --pid-path="${EPREFIX}"/run/${PN}.pid \
- --lock-path="${EPREFIX}"/run/lock/${PN}.lock \
- --with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
- --with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
- --http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
- --http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
- --http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
- --http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
- --http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
- --http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
- --with-compat \
- "${myconf[@]}" || die "configure failed"
-
- # A purely cosmetic change that makes nginx -V more readable. This can be
- # good if people outside the gentoo community would troubleshoot and
- # question the users setup.
- sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
-}
-
-src_compile() {
- use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
-
- # https://bugs.gentoo.org/286772
- export LANG=C LC_ALL=C
- emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
- emake DESTDIR="${D%/}" install
-
- cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
-
- newinitd "${FILESDIR}"/nginx.initd-r4 nginx
- newconfd "${FILESDIR}"/nginx.confd nginx
-
- systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
-
- doman man/nginx.8
- dodoc CHANGES* README
-
- # just keepdir. do not copy the default htdocs files (bug #449136)
- keepdir /var/www/localhost
- rm -rf "${D}"usr/html || die
-
- # set up a list of directories to keep
- local keepdir_list="${NGINX_HOME_TMP}"/client
- local module
- for module in proxy fastcgi scgi uwsgi; do
- use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
- done
-
- keepdir /var/log/nginx ${keepdir_list}
-
- # this solves a problem with SELinux where nginx doesn't see the directories
- # as root and tries to create them as nginx
- fperms 0750 "${NGINX_HOME_TMP}"
- fowners ${PN}:0 "${NGINX_HOME_TMP}"
-
- fperms 0700 ${keepdir_list}
- fowners ${PN}:${PN} ${keepdir_list}
-
- fperms 0710 /var/log/nginx
- fowners 0:${PN} /var/log/nginx
-
- # logrotate
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/nginx.logrotate-r1 nginx
-
- if use nginx_modules_http_perl; then
- cd "${S}"/objs/src/http/modules/perl/ || die
- emake DESTDIR="${D}" INSTALLDIRS=vendor
- perl_delete_localpod
- cd "${S}" || die
- fi
-
- if use nginx_modules_http_cache_purge; then
- docinto ${HTTP_CACHE_PURGE_MODULE_P}
- dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
- fi
-
- if use nginx_modules_http_slowfs_cache; then
- docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
- dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
- fi
-
- if use nginx_modules_http_fancyindex; then
- docinto ${HTTP_FANCYINDEX_MODULE_P}
- dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
- fi
-
- if use nginx_modules_http_lua; then
- docinto ${HTTP_LUA_MODULE_P}
- dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
- fi
-
- if use nginx_modules_http_auth_pam; then
- docinto ${HTTP_AUTH_PAM_MODULE_P}
- dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
- fi
-
- if use nginx_modules_http_upstream_check; then
- docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
- dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
- fi
-
- if use nginx_modules_http_naxsi; then
- insinto /etc/nginx
- doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
- fi
-
- if use rtmp; then
- docinto ${RTMP_MODULE_P}
- dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
- fi
-
- if use nginx_modules_http_dav_ext; then
- docinto ${HTTP_DAV_EXT_MODULE_P}
- dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
- fi
-
- if use nginx_modules_http_echo; then
- docinto ${HTTP_ECHO_MODULE_P}
- dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
- fi
-
- if use nginx_modules_http_security; then
- docinto ${HTTP_SECURITY_MODULE_P}
- dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
- fi
-
- if use nginx_modules_http_push_stream; then
- docinto ${HTTP_PUSH_STREAM_MODULE_P}
- dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
- fi
-
- if use nginx_modules_http_sticky; then
- docinto ${HTTP_STICKY_MODULE_P}
- dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
- fi
-
- if use nginx_modules_http_memc; then
- docinto ${HTTP_MEMC_MODULE_P}
- dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
- fi
-
- if use nginx_modules_http_auth_ldap; then
- docinto ${HTTP_LDAP_MODULE_P}
- dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
- fi
-}
-
-pkg_postinst() {
- if use ssl; then
- if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
- install_cert /etc/ssl/${PN}/${PN}
- use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
- fi
- fi
-
- if use nginx_modules_http_spdy; then
- ewarn ""
- ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
- ewarn "Update your configs and package.use accordingly."
- fi
-
- if use nginx_modules_http_lua; then
- ewarn ""
- ewarn "While you can build lua 3rd party module against ${P}"
- ewarn "the author warns that >=${PN}-1.11.11 is still not an"
- ewarn "officially supported target yet. You are on your own."
- ewarn "Expect runtime failures, memory leaks and other problems!"
- fi
-
- if use nginx_modules_http_lua && use http2; then
- ewarn ""
- ewarn "Lua 3rd party module author warns against using ${P} with"
- ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg"
- fi
-
- local _n_permission_layout_checks=0
- local _has_to_adjust_permissions=0
- local _has_to_show_permission_warning=0
-
- # Defaults to 1 to inform people doing a fresh installation
- # that we ship modified {scgi,uwsgi,fastcgi}_params files
- local _has_to_show_httpoxy_mitigation_notice=1
-
- local _replacing_version=
- for _replacing_version in ${REPLACING_VERSIONS}; do
- _n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
-
- if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
- # Should never happen:
- # Package is abusing slots but doesn't allow multiple parallel installations.
- # If we run into this situation it is unsafe to automatically adjust any
- # permission...
- _has_to_show_permission_warning=1
-
- ewarn "Replacing multiple ${PN}' versions is unsupported! " \
- "You will have to adjust permissions on your own."
-
- break
- fi
-
- local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
- debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
-
- # Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
- # This was before we introduced multiple nginx versions so we
- # do not need to distinguish between stable and mainline
- local _need_to_fix_CVE2013_0337=1
-
- if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
- # We are updating an installation which should already be fixed
- _need_to_fix_CVE2013_0337=0
- debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
- else
- _has_to_adjust_permissions=1
- debug-print "Need to adjust permissions to fix CVE-2013-0337!"
- fi
-
- # Do we need to inform about HTTPoxy mitigation?
- # In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
- if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
- # Updating from <1.10
- _has_to_show_httpoxy_mitigation_notice=1
- debug-print "Need to inform about HTTPoxy mitigation!"
- else
- # Updating from >=1.10
- local _fixed_in_pvr=
- case "${_replacing_version_branch}" in
- "1.10")
- _fixed_in_pvr="1.10.1-r2"
- ;;
- "1.11")
- _fixed_in_pvr="1.11.3-r1"
- ;;
- *)
- # This should be any future branch.
- # If we run this code it is safe to assume that the user has
- # already seen the HTTPoxy mitigation notice because he/she is doing
- # an update from previous version where we have already shown
- # the warning. Otherwise, we wouldn't hit this code path ...
- _fixed_in_pvr=
- esac
-
- if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
- # We are updating an installation where we already informed
- # that we are mitigating HTTPoxy per default
- _has_to_show_httpoxy_mitigation_notice=0
- debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
- else
- _has_to_show_httpoxy_mitigation_notice=1
- debug-print "Need to inform about HTTPoxy mitigation!"
- fi
- fi
-
- # Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
- # All branches up to 1.11 are affected
- local _need_to_fix_CVE2016_1247=1
-
- if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
- # Updating from <1.10
- _has_to_adjust_permissions=1
- debug-print "Need to adjust permissions to fix CVE-2016-1247!"
- else
- # Updating from >=1.10
- local _fixed_in_pvr=
- case "${_replacing_version_branch}" in
- "1.10")
- _fixed_in_pvr="1.10.2-r3"
- ;;
- "1.11")
- _fixed_in_pvr="1.11.6-r1"
- ;;
- *)
- # This should be any future branch.
- # If we run this code it is safe to assume that we have already
- # adjusted permissions or were never affected because user is
- # doing an update from previous version which was safe or did
- # the adjustments. Otherwise, we wouldn't hit this code path ...
- _fixed_in_pvr=
- esac
-
- if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
- # We are updating an installation which should already be adjusted
- # or which was never affected
- _need_to_fix_CVE2016_1247=0
- debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
- else
- _has_to_adjust_permissions=1
- debug-print "Need to adjust permissions to fix CVE-2016-1247!"
- fi
- fi
- done
-
- if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
- # We do not DIE when chmod/chown commands are failing because
- # package is already merged on user's system at this stage
- # and we cannot retry without losing the information that
- # the existing installation needs to adjust permissions.
- # Instead we are going to a show a big warning ...
-
- if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
- ewarn ""
- ewarn "The world-readable bit (if set) has been removed from the"
- ewarn "following directories to mitigate a security bug"
- ewarn "(CVE-2013-0337, bug #458726):"
- ewarn ""
- ewarn " ${EPREFIX%/}/var/log/nginx"
- ewarn " ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
- ewarn ""
- ewarn "Check if this is correct for your setup before restarting nginx!"
- ewarn "This is a one-time change and will not happen on subsequent updates."
- ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
- chmod o-rwx \
- "${EPREFIX%/}"/var/log/nginx \
- "${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
- _has_to_show_permission_warning=1
- fi
-
- if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
- ewarn ""
- ewarn "The permissions on the following directory have been reset in"
- ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
- ewarn ""
- ewarn " ${EPREFIX%/}/var/log/nginx"
- ewarn ""
- ewarn "Check if this is correct for your setup before restarting nginx!"
- ewarn "Also ensure that no other log directory used by any of your"
- ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
- ewarn "used by nginx can be abused to escalate privileges!"
- ewarn "This is a one-time change and will not happen on subsequent updates."
- chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
- chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
- fi
-
- if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
- # Should never happen ...
- ewarn ""
- ewarn "*************************************************************"
- ewarn "*************** W A R N I N G ***************"
- ewarn "*************************************************************"
- ewarn "The one-time only attempt to adjust permissions of the"
- ewarn "existing nginx installation failed. Be aware that we will not"
- ewarn "try to adjust the same permissions again because now you are"
- ewarn "using a nginx version where we expect that the permissions"
- ewarn "are already adjusted or that you know what you are doing and"
- ewarn "want to keep custom permissions."
- ewarn ""
- fi
- fi
-
- # Sanity check for CVE-2016-1247
- # Required to warn users who received the warning above and thought
- # they could fix it by unmerging and re-merging the package or have
- # unmerged a affected installation on purpose in the past leaving
- # /var/log/nginx on their system due to keepdir/non-empty folder
- # and are now installing the package again.
- local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
- su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
- if [ $? -eq 0 ] ; then
- # Cleanup -- no reason to die here!
- rm -f "${_sanity_check_testfile}"
-
- ewarn ""
- ewarn "*************************************************************"
- ewarn "*************** W A R N I N G ***************"
- ewarn "*************************************************************"
- ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
- ewarn "(bug #605008) because nginx user is able to create files in"
- ewarn ""
- ewarn " ${EPREFIX%/}/var/log/nginx"
- ewarn ""
- ewarn "Also ensure that no other log directory used by any of your"
- ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
- ewarn "used by nginx can be abused to escalate privileges!"
- fi
-
- if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
- # HTTPoxy mitigation
- ewarn ""
- ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
- ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
- ewarn "the HTTP_PROXY parameter to an empty string per default when you"
- ewarn "are sourcing one of the default"
- ewarn ""
- ewarn " - 'fastcgi_params' or 'fastcgi.conf'"
- ewarn " - 'scgi_params'"
- ewarn " - 'uwsgi_params'"
- ewarn ""
- ewarn "files in your server block(s)."
- ewarn ""
- ewarn "If this is causing any problems for you make sure that you are sourcing the"
- ewarn "default parameters _before_ you set your own values."
- ewarn "If you are relying on user-supplied proxy values you have to remove the"
- ewarn "correlating lines from the file(s) mentioned above."
- ewarn ""
- fi
-}
diff --git a/www-servers/nginx/nginx-1.14.0.ebuild b/www-servers/nginx/nginx-1.14.0-r1.ebuild
similarity index 97%
rename from www-servers/nginx/nginx-1.14.0.ebuild
rename to www-servers/nginx/nginx-1.14.0-r1.ebuild
index 6c27d427217d..d680f978495e 100644
--- a/www-servers/nginx/nginx-1.14.0.ebuild
+++ b/www-servers/nginx/nginx-1.14.0-r1.ebuild
@@ -23,9 +23,9 @@ DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KI
DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="37ab9b2933a0b756ba3447000b7f31d432ed8228"
+HTTP_BROTLI_MODULE_PV="0.1.2"
HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
@@ -59,7 +59,7 @@ HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v
HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
-HTTP_LUA_MODULE_PV="0.10.11"
+HTTP_LUA_MODULE_PV="0.10.13"
HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
@@ -83,9 +83,9 @@ HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HT
HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.1.15-gentoo"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.1.17"
HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/Whissi/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
@@ -138,7 +138,7 @@ HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/ar
HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
-HTTP_MEMC_MODULE_PV="0.18"
+HTTP_MEMC_MODULE_PV="0.19"
HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
@@ -149,8 +149,14 @@ HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+# geoip2 (https://github.com/leev/ngx_http_geoip2_module, BSD-2)
+GEOIP2_MODULE_PV="2.0"
+GEOIP2_MODULE_P="ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOIP2_MODULE_PV}.tar.gz"
+GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
+
# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.2.0"
+NJS_MODULE_PV="0.2.2"
NJS_MODULE_P="njs-${NJS_MODULE_PV}"
NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
@@ -172,6 +178,7 @@ SRC_URI="https://nginx.org/download/${P}.tar.gz
nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+ nginx_modules_http_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
nginx_modules_http_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
@@ -186,6 +193,7 @@ SRC_URI="https://nginx.org/download/${P}.tar.gz
nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
nginx_modules_http_vhost_traffic_status? ( ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI} -> ${HTTP_VHOST_TRAFFIC_STATUS_MODULE_P}.tar.gz )
+ nginx_modules_stream_geoip2? ( ${GEOIP2_MODULE_URI} -> ${GEOIP2_MODULE_P}.tar.gz )
nginx_modules_stream_javascript? ( ${NJS_MODULE_URI} -> ${NJS_MODULE_P}.tar.gz )
rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )"
@@ -219,6 +227,7 @@ NGINX_MODULES_3RD="
http_dav_ext
http_echo
http_fancyindex
+ http_geoip2
http_headers_more
http_javascript
http_lua
@@ -233,6 +242,7 @@ NGINX_MODULES_3RD="
http_upload_progress
http_upstream_check
http_vhost_traffic_status
+ stream_geoip2
stream_javascript
"
@@ -286,6 +296,7 @@ CDEPEND="
)
nginx_modules_http_brotli? ( app-arch/brotli:= )
nginx_modules_http_geoip? ( dev-libs/geoip )
+ nginx_modules_http_geoip2? ( dev-libs/libmaxminddb:= )
nginx_modules_http_gunzip? ( sys-libs/zlib )
nginx_modules_http_gzip? ( sys-libs/zlib )
nginx_modules_http_gzip_static? ( sys-libs/zlib )
@@ -575,6 +586,10 @@ src_configure() {
myconf+=( --add-module=${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD} )
fi
+ if use nginx_modules_http_geoip2 || use nginx_modules_stream_geoip2; then
+ myconf+=( --add-module=${GEOIP2_MODULE_WD} )
+ fi
+
if use nginx_modules_http_javascript || use nginx_modules_stream_javascript; then
myconf+=( --add-module="${NJS_MODULE_WD}/nginx" )
fi
@@ -611,7 +626,7 @@ src_configure() {
fi
done
- if use nginx_modules_stream_javascript; then
+ if use nginx_modules_stream_geoip2 || use nginx_modules_stream_javascript; then
stream_enabled=1
fi
@@ -838,7 +853,7 @@ pkg_postinst() {
if use nginx_modules_http_lua && use http2; then
ewarn ""
ewarn "Lua 3rd party module author warns against using ${P} with"
- ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg"
+ ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
fi
local _n_permission_layout_checks=0
diff --git a/www-servers/nginx/nginx-1.15.0-r1.ebuild b/www-servers/nginx/nginx-1.15.0-r2.ebuild
similarity index 98%
rename from www-servers/nginx/nginx-1.15.0-r1.ebuild
rename to www-servers/nginx/nginx-1.15.0-r2.ebuild
index 7283c4caddd1..5c4536292af2 100644
--- a/www-servers/nginx/nginx-1.15.0-r1.ebuild
+++ b/www-servers/nginx/nginx-1.15.0-r2.ebuild
@@ -23,9 +23,9 @@ DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KI
DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
# ngx_brotli (https://github.com/eustas/ngx_brotli, BSD-2)
-HTTP_BROTLI_MODULE_PV="37ab9b2933a0b756ba3447000b7f31d432ed8228"
+HTTP_BROTLI_MODULE_PV="0.1.2"
HTTP_BROTLI_MODULE_P="ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
-HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/${HTTP_BROTLI_MODULE_PV}.tar.gz"
+HTTP_BROTLI_MODULE_URI="https://github.com/eustas/ngx_brotli/archive/v${HTTP_BROTLI_MODULE_PV}.tar.gz"
HTTP_BROTLI_MODULE_WD="${WORKDIR}/ngx_brotli-${HTTP_BROTLI_MODULE_PV}"
# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
@@ -83,7 +83,7 @@ HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HT
HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
# http_vhost_traffic_status (https://github.com/vozlt/nginx-module-vts, BSD license)
-HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.1.16"
+HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV="0.1.17"
HTTP_VHOST_TRAFFIC_STATUS_MODULE_P="ngx_http_vhost_traffic_status-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
HTTP_VHOST_TRAFFIC_STATUS_MODULE_URI="https://github.com/vozlt/nginx-module-vts/archive/v${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}.tar.gz"
HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD="${WORKDIR}/nginx-module-vts-${HTTP_VHOST_TRAFFIC_STATUS_MODULE_PV}"
@@ -156,7 +156,7 @@ GEOIP2_MODULE_URI="https://github.com/leev/ngx_http_geoip2_module/archive/${GEOI
GEOIP2_MODULE_WD="${WORKDIR}/ngx_http_geoip2_module-${GEOIP2_MODULE_PV}"
# njs-module (https://github.com/nginx/njs, as-is)
-NJS_MODULE_PV="0.2.1"
+NJS_MODULE_PV="0.2.2"
NJS_MODULE_P="njs-${NJS_MODULE_PV}"
NJS_MODULE_URI="https://github.com/nginx/njs/archive/${NJS_MODULE_PV}.tar.gz"
NJS_MODULE_WD="${WORKDIR}/njs-${NJS_MODULE_PV}"
@@ -415,12 +415,6 @@ src_prepare() {
cd "${S}" || die
fi
- if use nginx_modules_http_vhost_traffic_status; then
- cd "${HTTP_VHOST_TRAFFIC_STATUS_MODULE_WD}" || die
- eapply "${FILESDIR}"/http_vhost_traffic_status-0.1.15-allow-compilation-without-HTTP-cache.patch
- cd "${S}" || die
- fi
-
find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
# We have config protection, don't rename etc files
sed -i 's:.default::' auto/install || die
@@ -859,7 +853,7 @@ pkg_postinst() {
if use nginx_modules_http_lua && use http2; then
ewarn ""
ewarn "Lua 3rd party module author warns against using ${P} with"
- ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg"
+ ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see https://git.io/OldLsg"
fi
local _n_permission_layout_checks=0
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index c5c8ff94f57c..756ce1eeb9f1 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.27.1.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.27.1.ebuild
index 7be242bb5b44..40349503513a 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.27.1.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.27.1.ebuild
@@ -7,7 +7,7 @@ inherit linux-info xorg-2
DESCRIPTION="X.org input driver based on libinput"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
RDEPEND=">=dev-libs/libinput-1.5.0:0="
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 5eb126fca8da..4002795441b0 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/libXi/libXi-1.7.9-r1.ebuild b/x11-libs/libXi/libXi-1.7.9-r1.ebuild
index 90e84aacb9d9..07c4fb0b20e4 100644
--- a/x11-libs/libXi/libXi-1.7.9-r1.ebuild
+++ b/x11-libs/libXi/libXi-1.7.9-r1.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
inherit xorg-2
DESCRIPTION="X.Org Xi library"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild b/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
index 265319ee68ef..8f1106a177a2 100644
--- a/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
+++ b/x11-libs/libXpm/libXpm-3.5.12-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xpm library"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild b/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
index ea5d42da85ba..271af5bb90e6 100644
--- a/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.5.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xrandr library"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
index a43801d9c3b7..0f80ab8fea46 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r1.ebuild
@@ -8,7 +8,7 @@ inherit xorg-2
DESCRIPTION="X.Org Xxf86vm library"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-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 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild b/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
index f0b707ef6947..260a06ad7415 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.3-r1.ebuild
@@ -6,7 +6,7 @@ inherit xorg-2
DESCRIPTION="X.Org fontenc library"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="sys-libs/zlib"
diff --git a/x11-libs/libxcb/libxcb-1.13.ebuild b/x11-libs/libxcb/libxcb-1.13.ebuild
index dcb64fbaa989..cccb4a8a0b00 100644
--- a/x11-libs/libxcb/libxcb-1.13.ebuild
+++ b/x11-libs/libxcb/libxcb-1.13.ebuild
@@ -16,7 +16,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/xcb/libxcb.git"
[[ ${PV} != 9999* ]] && \
SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc selinux test xkb"
SLOT="0/1.12"
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
index c624ff0d36f7..74a529e35b09 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.0.9-r2.ebuild
@@ -7,7 +7,7 @@ inherit xorg-2
DESCRIPTION="X.Org xkbfile library"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/pixman/pixman-0.34.0.ebuild b/x11-libs/pixman/pixman-0.34.0.ebuild
index 7ea8007f19cf..f9a23e06bb2f 100644
--- a/x11-libs/pixman/pixman-0.34.0.ebuild
+++ b/x11-libs/pixman/pixman-0.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -9,7 +9,7 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/pixman.git"
DESCRIPTION="Low-level pixel manipulation routines"
if [[ $PV != 9999* ]]; then
- 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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
fi
IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
index c5ea04a317a2..1d3d20515d38 100644
--- a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r2.ebuild
@@ -15,7 +15,7 @@ EGIT_HAS_SUBMODULES=yes
DESCRIPTION="X C-language Bindings sample implementations"
HOMEPAGE="https://xcb.freedesktop.org/"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~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 ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="test"
RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 522c5e826723..0ad4b3eb2545 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/e16keyedit/Manifest b/x11-misc/e16keyedit/Manifest
deleted file mode 100644
index 2bef631fe282..000000000000
--- a/x11-misc/e16keyedit/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST e16keyedit-0.7.tar.gz 88323 BLAKE2B dde8bcfb18f6c2f2c52357b7951cefd2f3e96b272320c0991ea4a665dbadcf5026e74ac59bacdd728b9534b818c73d778a804d3bbf598d82d5c64d30dd0ca75e SHA512 6178977bd9e1dfd337717660be8102f5c3f0a6d29d4b0b1ae67a7fa9a812ab46c4fee67e52282ca38d429d16697935e25e7c046f22d7f3bb06b7b3933e6d557b
diff --git a/x11-misc/e16keyedit/e16keyedit-0.7.ebuild b/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
deleted file mode 100644
index 922f01990443..000000000000
--- a/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Key binding editor for enlightenment 16"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="=x11-libs/gtk+-2*"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_configure() {
- econf --enable-gtk2
-}
diff --git a/x11-misc/e16keyedit/metadata.xml b/x11-misc/e16keyedit/metadata.xml
deleted file mode 100644
index bc4fe6836d29..000000000000
--- a/x11-misc/e16keyedit/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-This is a standalone keybindings editor for enlightenment version 0.16.
-
-
- enlightenment
-
-
diff --git a/x11-misc/e16menuedit2/Manifest b/x11-misc/e16menuedit2/Manifest
deleted file mode 100644
index 567250da001b..000000000000
--- a/x11-misc/e16menuedit2/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST e16menuedit2-0.0.3.tar.gz 370740 BLAKE2B 5d5be198f72afbd7cf22f02d8bb9179c3f877101eccc9b57c3a5e4f2fd05260e807d267d4c7abfd40fc0a41700e876efceb992d27450f2960772321a625c5a85 SHA512 41942028e7d20b5aa46fce8f54f60af46bd08e292a1812d4845d68cbc670699c8fc70a8d71c2749df623a4a083b92bc9539b9241fd7daabbee0deb855ff1be99
diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
deleted file mode 100644
index 5fc26891b700..000000000000
--- a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-
-inherit gnome2 eutils
-
-DESCRIPTION="Menu editor for enlightenment DR16 written in GTK2"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 arm ~ppc sh sparc x86"
-IUSE=""
-
-RDEPEND="
- >=x11-wm/enlightenment-0.16
- >=gnome-base/libglade-2.4
- x11-libs/gtk+:2
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-no-docs.patch
- sed -i '1i#include ' src/e16menuedit2.c
- gnome2_src_prepare
-}
diff --git a/x11-misc/e16menuedit2/files/e16menuedit2-0.0.3-no-docs.patch b/x11-misc/e16menuedit2/files/e16menuedit2-0.0.3-no-docs.patch
deleted file mode 100644
index 764ac8660336..000000000000
--- a/x11-misc/e16menuedit2/files/e16menuedit2-0.0.3-no-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Makefile.in
-+++ Makefile.in
-@@ -220,14 +220,7 @@
- yelphelpdir = @yelphelpdir@
- SUBDIRS = src po pixmaps help
--e16menuedit2docdir = ${prefix}/${packagedocdir}
-+e16menuedit2docdir = ${prefix}
--e16menuedit2doc_DATA = \
-- README\
-- COPYING\
-- AUTHORS\
-- ChangeLog\
-- INSTALL\
-- NEWS\
-- TODO
-+e16menuedit2doc_DATA =
-
- GLADE_FILES = e16menuedit2.glade
- e16menuedit2datadir = ${prefix}/${packagedatadir}/glade
diff --git a/x11-misc/e16menuedit2/metadata.xml b/x11-misc/e16menuedit2/metadata.xml
deleted file mode 100644
index 2031ab52a3ef..000000000000
--- a/x11-misc/e16menuedit2/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
- enlightenment
-
-
diff --git a/x11-misc/i3lock/Manifest b/x11-misc/i3lock/Manifest
index d4b63b12b42e..3dbeed0882f0 100644
--- a/x11-misc/i3lock/Manifest
+++ b/x11-misc/i3lock/Manifest
@@ -1,3 +1,2 @@
DIST i3lock-2.10.tar.bz2 23171 BLAKE2B 1c1d0f8e3a85dcebe4a9ee181e399a4ff447ececfbdf5f9488df849316e47233118b7436c269a986fed4e907e6162f3758c8bdad2d20ac156e95a8be185a744c SHA512 ea865b202668212b58d0b97d0263171847e1bd0c529e2fd3d26c15ef253861b9a8357ff2efaa6a4f342c4d0d1ab03bc00f95f4d4008760ec8e0767ac29195517
DIST i3lock-2.8.tar.bz2 19884 BLAKE2B 67d04d91cae22f14210cbdbcce1a2aecd3eae0d649c8182f044c1c6bec5c8e63ab4cca647fcd3c2ab61c600a83157ce0818b566b59a632b509390f9b4d069a80 SHA512 b0f2f2837e275ffb2874aec75cd5d7c69864f8861de5e3e6090a2bf9254a14f8bc141256b0faac3e30111f9612e97cc087efde0da939854fac975a87deb06e3f
-DIST i3lock-2.9.1.tar.bz2 20959 BLAKE2B 05f35e3cd8fa45dfcb7021d3df19eda85ec3ebc4be9fc5b0900d88569d078bc4a773e6de155f76c13a45c9c914e47171c5ba000e6ed3cbb3b50cd4e847b78aaf SHA512 9b1bfac67a97880e61f8655a9256662ceec51850005298f13247ab570c03715718db84b1afefa979fb9a53a011fa20958f38d05f5378becf7803ece3e804faaf
diff --git a/x11-misc/i3lock/i3lock-2.10.ebuild b/x11-misc/i3lock/i3lock-2.10.ebuild
index 7cc7504d5245..a5cd251837b6 100644
--- a/x11-misc/i3lock/i3lock-2.10.ebuild
+++ b/x11-misc/i3lock/i3lock-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
IUSE=""
RDEPEND="
diff --git a/x11-misc/i3lock/i3lock-2.9.1.ebuild b/x11-misc/i3lock/i3lock-2.9.1.ebuild
deleted file mode 100644
index ee3f80478d45..000000000000
--- a/x11-misc/i3lock/i3lock-2.9.1.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
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simple screen locker"
-HOMEPAGE="https://i3wm.org/i3lock/"
-SRC_URI="https://i3wm.org/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
- >=x11-libs/libxkbcommon-0.5.0[X]
- dev-libs/libev
- virtual/pam
- x11-libs/cairo[xcb]
- x11-libs/libxcb[xkb]
- x11-libs/xcb-util
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
-"
-DOCS=( CHANGELOG README.md )
-
-src_prepare() {
- default
-
- sed -i -e 's:login:system-auth:' ${PN}.pam || die
-
- tc-export CC
-}
-
-src_install() {
- default
- doman ${PN}.1
-}
diff --git a/x11-misc/polybar/polybar-3.1.0.ebuild b/x11-misc/polybar/polybar-3.1.0.ebuild
index 5897c55c919c..d2c4ebbf0f5b 100644
--- a/x11-misc/polybar/polybar-3.1.0.ebuild
+++ b/x11-misc/polybar/polybar-3.1.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jaagr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="alsa curl i3wm ipc mpd network"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -26,7 +26,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
${PYTHON_DEPS}
x11-base/xcb-proto
- x11-libs/cairo
+ x11-libs/cairo[xcb]
x11-libs/libxcb[xkb]
x11-libs/xcb-util-image
x11-libs/xcb-util-wm
diff --git a/x11-misc/polybar/polybar-9999.ebuild b/x11-misc/polybar/polybar-9999.ebuild
index 7bc1f90e2291..3d18bd3871c8 100644
--- a/x11-misc/polybar/polybar-9999.ebuild
+++ b/x11-misc/polybar/polybar-9999.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
${PYTHON_DEPS}
x11-base/xcb-proto
- x11-libs/cairo
+ x11-libs/cairo[xcb]
x11-libs/libxcb[xkb]
x11-libs/xcb-util-image
x11-libs/xcb-util-wm
diff --git a/x11-misc/rofi/Manifest b/x11-misc/rofi/Manifest
index cba38d32bf61..da8220d05b9f 100644
--- a/x11-misc/rofi/Manifest
+++ b/x11-misc/rofi/Manifest
@@ -1,3 +1,2 @@
DIST rofi-1.3.1.tar.xz 211732 BLAKE2B 60a217a47c547b1e59632356f4ddcb37144364a990974cbc013c53b21eae04e9568cc39e2ba6d2ea681501582910fb685bcb865cf011be0b2f00d986f4317c3e SHA512 a96c53ad268883277c4ff0ee3267ff7fab4d4a93a982019ce19ea82771b65c32d56216d777494853bffd18481400af72ed777f88cce4b26d7d1b8980a997f6c6
-DIST rofi-1.5.0.tar.xz 354232 BLAKE2B 2478902542b994ba06c4d436fa9436659366e2416e1a7a3ddd9a48e84d397faff963a4ac0c1bb1011a5f8a8440d1fc257377d28f556a60dc264b29eadadf5c7e SHA512 f24f93224f38e009307912dec19182a04b36a9ac88b26a8657d853cc040e1a59837a56a3e8ff08aa34143f455b5030c73fc28ced96123f3bc7e3943582aee81c
DIST rofi-1.5.1.tar.xz 355912 BLAKE2B 710a35ab82bf960b331431be3cc3acfb5cc27b42d7fa8b02e8c070918679b90612d89f600a6e58215bc0a08dcb60087ea37a5498fa8c4ac39d246d5967f0b314 SHA512 32074e931199ff1529ebab8fef53d339eab09843888f862953b7d661323484ebe66d820feecc42604a16bd683a5af1ec4d1a2e7f097f408efed6cfe91c4eb5ff
diff --git a/x11-misc/rofi/rofi-1.5.0.ebuild b/x11-misc/rofi/rofi-1.5.0.ebuild
deleted file mode 100644
index dc85085b3148..000000000000
--- a/x11-misc/rofi/rofi-1.5.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=6
-inherit autotools toolchain-funcs
-
-DESCRIPTION="A window switcher, run dialog and dmenu replacement"
-HOMEPAGE="https://github.com/DaveDavenport/rofi/"
-SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test windowmode"
-
-RDEPEND="
- dev-libs/glib:2
- gnome-base/librsvg:2
- media-libs/freetype
- x11-libs/cairo[xcb]
- x11-libs/libXft
- x11-libs/libXinerama
- x11-libs/libxcb
- x11-libs/libxkbcommon[X]
- x11-libs/pango[X]
- x11-libs/startup-notification
- x11-libs/xcb-util
- x11-libs/xcb-util-wm
- x11-libs/xcb-util-xrm
-"
-DEPEND="
- ${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto
- test? ( >=dev-libs/check-0.11 )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.15.12-Werror.patch
- "${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
-)
-
-src_prepare() {
- if use test; then
- sed -i -e 's|"/tmp/rofi-test.pid"|"'"$T"'/rofi-test.pid"|g' test/helper-pidfile.c || die
- fi
-
- default
-
- eautoreconf
-}
-
-src_configure() {
- tc-export CC
-
- econf \
- $(use_enable test check) \
- $(use_enable windowmode)
-}
diff --git a/x11-misc/rofi/rofi-1.5.1.ebuild b/x11-misc/rofi/rofi-1.5.1.ebuild
index d9dffef044ca..1d082485acf5 100644
--- a/x11-misc/rofi/rofi-1.5.1.ebuild
+++ b/x11-misc/rofi/rofi-1.5.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
IUSE="test windowmode"
RDEPEND="
diff --git a/x11-misc/sddm/sddm-0.17.0-r3.ebuild b/x11-misc/sddm/sddm-0.17.0-r3.ebuild
deleted file mode 100644
index 623e779a6f1a..000000000000
--- a/x11-misc/sddm/sddm-0.17.0-r3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="ar ca cs da de es et fi fr hi_IN hu it ja kk ko lt lv nb nl nn pl pt_BR pt_PT ro ru sk sr sr@ijekavian sr@ijekavianlatin sr@latin sv tr uk zh_CN zh_TW"
-inherit cmake-utils l10n systemd user
-
-DESCRIPTION="Simple Desktop Display Manager"
-HOMEPAGE="https://github.com/sddm/sddm"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-LICENSE="GPL-2+ MIT CC-BY-3.0 CC-BY-SA-3.0 public-domain"
-SLOT="0"
-IUSE="consolekit elogind +pam systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-RDEPEND="
- >=dev-qt/qtcore-5.6:5
- >=dev-qt/qtdbus-5.6:5
- >=dev-qt/qtdeclarative-5.6:5
- >=dev-qt/qtgui-5.6:5
- >=dev-qt/qtnetwork-5.6:5
- >=x11-base/xorg-server-1.15.1
- x11-libs/libxcb[xkb]
- consolekit? ( >=sys-auth/consolekit-0.9.4 )
- elogind? ( sys-auth/elogind )
- pam? ( sys-libs/pam )
- systemd? ( sys-apps/systemd:= )
- !systemd? ( sys-power/upower )"
-
-DEPEND="${RDEPEND}
- dev-python/docutils
- >=dev-qt/linguist-tools-5.6:5
- kde-frameworks/extra-cmake-modules
- virtual/pkgconfig
- test? ( >=dev-qt/qttest-5.6:5 )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.12.0-respect-user-flags.patch" # fix for flags handling and bug 563108
- "${FILESDIR}/${PN}-0.16.0-Xsession.patch" # bug 611210
- "${FILESDIR}/${PN}-0.16.0-ck2-revert.patch" # bug 633920
- "${FILESDIR}/${P}-logind-race.patch" # bug 656286
- # TODO: not yet upstream
- "${FILESDIR}/${P}-switchtogreeter.patch" # bugs 644718, 649888
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- disable_locale() {
- sed -e "/${1}\.ts/d" -i data/translations/CMakeLists.txt || die
- }
- l10n_find_plocales_changes "data/translations" "" ".ts"
- l10n_for_each_disabled_locale_do disable_locale
-
- use test || cmake_comment_add_subdirectory test
-}
-
-src_configure() {
- local mycmakeargs=(
- -DENABLE_PAM=$(usex pam)
- -DNO_SYSTEMD=$(usex '!systemd')
- -DUSE_ELOGIND=$(usex 'elogind')
- -DBUILD_MAN_PAGES=ON
- -DDBUS_CONFIG_FILENAME="org.freedesktop.sddm.conf"
- )
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
- sed -i -e "/^InputMethod/s/qtvirtualkeyboard//" "${D}"/etc/sddm.conf || die
-}
-
-pkg_postinst() {
- enewgroup ${PN}
- enewuser ${PN} -1 -1 /var/lib/${PN} ${PN},video
-
- systemd_reenable sddm.service
-}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 25c265885b51..3ab1d2e2da2f 100644
Binary files a/x11-plugins/Manifest.gz and b/x11-plugins/Manifest.gz differ
diff --git a/x11-plugins/epplets/Manifest b/x11-plugins/epplets/Manifest
deleted file mode 100644
index 9df1b60e697c..000000000000
--- a/x11-plugins/epplets/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST epplets-0.12.tar.gz 894232 BLAKE2B dc86da84888531a1af5b052c739b4f4d06d0d9013fe9d0f996ea529b2ad77541fa9e0b5c7acf30a2443c56c66a6765c6aab30f1bf36a560968194a85d980c723 SHA512 b8b017ed4199f6a083db4e66090611e24d50428d287b1ef414725e68bc48ecedc3f6a3c9f68d38645e9146739e35e43ca08197d832b38d580039f3a050de93dc
-DIST epplets-0.14.tar.gz 971885 BLAKE2B c9dbbb268ec4580a81f0c7a8a786a5fcf03c88463be997de469892b57798d11c9e0e33196e2e83c2ea648888c5ec61cc964b06ed596b98606292b3719e3af25d SHA512 d83d60521fe06497f109c3fbb5c2e10abd36a43b050c10787a68d9f9f8c2866f57d78a8559a482654d9bb0eaaf3ce791e4839bb0fda88ccbf026d8ec5dc93824
diff --git a/x11-plugins/epplets/epplets-0.12.ebuild b/x11-plugins/epplets/epplets-0.12.ebuild
deleted file mode 100644
index 1b147792f12d..000000000000
--- a/x11-plugins/epplets/epplets-0.12.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Base files for Enlightenment epplets and some epplets"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="mirror://sourceforge/enlightenment/epplets-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- media-libs/freeglut
- media-libs/imlib2
- >=x11-wm/enlightenment-0.16.4"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto"
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc ChangeLog
-}
diff --git a/x11-plugins/epplets/epplets-0.14.ebuild b/x11-plugins/epplets/epplets-0.14.ebuild
deleted file mode 100644
index 416ba6a70a62..000000000000
--- a/x11-plugins/epplets/epplets-0.14.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Base files for Enlightenment epplets and some epplets"
-HOMEPAGE="https://www.enlightenment.org/"
-SRC_URI="mirror://sourceforge/enlightenment/epplets-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
-IUSE="static-libs"
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXext
- media-libs/freeglut
- media-libs/imlib2
- >=x11-wm/enlightenment-0.16.4"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto"
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
- use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/x11-plugins/epplets/metadata.xml b/x11-plugins/epplets/metadata.xml
deleted file mode 100644
index dc98629925af..000000000000
--- a/x11-plugins/epplets/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-Epplets are small, handy Enlightenment applets, similar to 'dockapps'
-or 'applets' for other packages. The epplets package contains the
-base epplet API library and header files, as well as the core set of
-epplets, including CPU monitors, clocks, a mail checker, mixers, a
-slideshow, a URL grabber, a panel-like toolbar, and more.
-
-
- enlightenment
-
-
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index bbe8b8c8f0b3..f93ba531a323 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/mlterm/Manifest b/x11-terms/mlterm/Manifest
index 11e2e8ba1b6c..63f15a191fbb 100644
--- a/x11-terms/mlterm/Manifest
+++ b/x11-terms/mlterm/Manifest
@@ -1,3 +1,3 @@
-DIST mlterm-3.8.0.tar.gz 3756779 BLAKE2B 401695dceb90357f0822346e3d4e00360faded3729fb091b217ed232909f1e2e60bfb554e50d162f38115e77b425041f711f136756fbb2a349512c98dc538be4 SHA512 86d163aaf24668dea77e54ff775cb448c6c699bcc82e1d84fe9a9fbed90d9c834ee3e61348de77713b2dbd229b37b76d2be817d788710f224cd5c53e7f93049f
DIST mlterm-3.8.4.tar.gz 3881872 BLAKE2B 647810585b0143d0f680c99032cf478e02047acc80086b4c9cbadc59df49e09ba1626ee2ff2c8a1842c68047632c61001d31f7282d9eb8619f0260de7f0bb976 SHA512 6afe0a60001f180df18f2d2ad5e2954a1d9423313d7784eb0cf6a9736c6a62545f461d8e3d079aa1f43eb5f27f4b0c060a7da54e08bf758b283005b16aa1e5cd
DIST mlterm-3.8.5.tar.gz 3928532 BLAKE2B e5d13ea0e67d4bce1470f585b419cb073552d68115f08b5051f66a90a9887ffba2794829be52d852ef2ed36502a3ef8ea8235b2b668804599efb74f65392b4e6 SHA512 c43a121ed6572bdd4501a6b27f54df65ff2c09682485c7902c5cbd6b4be64f35efcf8cce3923d77afc412d681a390edc240a6a2503478ea97e0c4953e0b807a7
+DIST mlterm-3.8.6.tar.gz 3952815 BLAKE2B e862bf449c801c260c50391af2e4c7cd541b945b3e77186b3d1a8b9395833613c98603084bfd199773e22dca1299cc3b669325a036dd4e827baa435b91d86e42 SHA512 da87a72fd31dbb1e0a4779ec070a5ef2a62a0861a114b61d57d564069c15eb927f26fb47d4973ac6f6c06d99abc2899502e8210f5f3e1c6d97d0b8b52414dfb1
diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
index f995734984c6..b145ba546ff5 100644
--- a/x11-terms/mlterm/metadata.xml
+++ b/x11-terms/mlterm/metadata.xml
@@ -6,6 +6,7 @@
Cjk
+ Enable support for app-accessibilty/brltty
Enable support for app-i18n/fcitx
Build with x11-libs/gtk+:2 instead of x11-libs/gtk+:3
@@ -18,6 +19,7 @@
Enable support for SKK (virtual/skkserv or app-i18n/skk-jisyo)
Enable support for app-i18n/uim
Enable support for sys-libs/libutempter
+ Enable support for Wayland
mlterm
diff --git a/x11-terms/mlterm/mlterm-3.8.0.ebuild b/x11-terms/mlterm/mlterm-3.8.6.ebuild
similarity index 77%
rename from x11-terms/mlterm/mlterm-3.8.0.ebuild
rename to x11-terms/mlterm/mlterm-3.8.6.ebuild
index 97cb0a380419..a2d6780884a5 100644
--- a/x11-terms/mlterm/mlterm-3.8.0.ebuild
+++ b/x11-terms/mlterm/mlterm-3.8.6.ebuild
@@ -11,15 +11,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="bidi cairo canna debug fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="bidi brltty cairo canna debug fbcon fcitx freewnn gtk gtk2 harfbuzz ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter wayland xft"
RDEPEND="x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
bidi? ( dev-libs/fribidi )
+ brltty? ( app-accessibility/brltty )
cairo? ( x11-libs/cairo[X(+)] )
canna? ( app-i18n/canna )
+ fbcon? ( media-fonts/unifont )
fcitx? ( app-i18n/fcitx )
freewnn? ( app-i18n/freewnn )
gtk? (
@@ -46,18 +48,20 @@ RDEPEND="x11-libs/libICE
)
uim? ( app-i18n/uim )
utempter? ( sys-libs/libutempter )
+ wayland? ( dev-libs/wayland )
xft? ( x11-libs/libXft )"
DEPEND="${RDEPEND}
virtual/pkgconfig
nls? ( sys-devel/gettext )"
REQUIRED_USE="gtk2? ( gtk )"
+PATCHES=( "${FILESDIR}"/${PN}-font.patch )
DOCS=( doc/{en,ja} )
src_prepare() {
# default config
sed -i \
- -e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/mlterm-icon.svg" \
+ -e "/ icon_path =/aicon_path = ${EPREFIX}/usr/share/pixmaps/${PN}-icon.svg" \
-e "/ scrollbar_view_name =/ascrollbar_view_name = sample" \
etc/main
@@ -67,6 +71,7 @@ src_prepare() {
src_configure() {
local myconf=(
$(use_enable bidi fribidi)
+ $(use_enable brltty brlapi)
$(use_enable canna)
$(use_enable debug)
$(use_enable fcitx)
@@ -80,6 +85,7 @@ src_configure() {
$(use_enable skk)
$(use_enable uim)
$(use_enable utempter utmp)
+ --with-gui=xlib$(usex fbcon ",fb" "")$(usex wayland ",wayland" "")
--with-type-engines=xcore$(usex xft ",xft" "")$(usex cairo ",cairo" "")
--enable-optimize-redrawing
--enable-vt52
@@ -87,7 +93,7 @@ src_configure() {
)
local scrollbars="sample,extra"
- local tools="mlclient,mlcc,mlfc,mlmenu,mlterm-zoom"
+ local tools="mlclient,mlcc,mlfc,mlmenu,${PN}-zoom"
if use gtk; then
myconf+=(
$(use_with gtk gtk $(usex gtk2 2.0 3.0))
@@ -117,6 +123,6 @@ src_install () {
docinto contrib/icon
dodoc contrib/icon/README
- doicon contrib/icon/mlterm*
- make_desktop_entry mlterm mlterm mlterm-icon "System;TerminalEmulator"
+ doicon contrib/icon/${PN}*
+ make_desktop_entry ${PN} ${PN} ${PN}-icon "System;TerminalEmulator"
}
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 8223f4a442ff..c4a360aa0df3 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index c41a559a6ae4..a0aa827188a1 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,4 +1,3 @@
-DIST e16-1.0.17.tar.gz 2417299 BLAKE2B 324c8d3cd4b9e18e7c7936065be24897e26838727f64b08d3d371bc898b421831ed37eb30ea859ab33eb58898984e48a580404a6632977d84e564096fba284e4 SHA512 d6ad565cf638de5240fbcd0f1cd37977c69e6af31a4ff9127e9c570fdf57a56bde50978620fbc34508d02661effa17f0c8b91ca23faebc0b77f9d40e166ba021
DIST enlightenment-0.20.5.tar.xz 25039672 BLAKE2B b9f18ecb5afbd4f8675d0c5e9315173d6980e98d77e09c1e818161a92be727a504081c9944dd78519ff2eb02a146b8c3db276bd9a568f82c1584b74c4c7e7d07 SHA512 0d66d23b3462d6bf293229256d88d486d05135ff7bc7ab4258c3923c853f1935a1850b3a3ff0dabb1aae99a31dafb578f5cbb5678d08df490d3c6837b874a911
DIST enlightenment-0.20.6.tar.xz 25030572 BLAKE2B 7ce9b89ec56a741e81bb6ebae690c84ef89b53e7201723f0d74c99b006957f8c26cd8d4b914015aa7956d23f83beeb2ca2a0e9e145d9b2038a6a337acccd43bd SHA512 97179929c039535f6f03fbd1272bde59e25f62b35e17e859379258dac771183562348f7a5c0148c76bcb05b86c21c24950117901f0c2800ac070ba7a27aeee29
DIST enlightenment-0.21.11.tar.xz 25313532 BLAKE2B 3128137fe81a5b3dccc909eee8aac6845648c088b4cc8de9965408445579ed6aa01bdd879b726d21449c674f07a78386348525d61c0c0d786493d638ec4ae2b4 SHA512 3dee0f7a49fff992a81ce82a730cf8f0cec52a9805dcdd643a35a0bb8c7a27c6af82c136219553684c24c8e2ee2e8623f04858fddab56cdff7477ed2c9cc0ddf
diff --git a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
deleted file mode 100644
index 8c16c95bbad6..000000000000
--- a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-if [[ ${PV} == *9999 ]] ; then
- ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/E16/e"
- inherit subversion autotools
- SRC_URI=""
- #KEYWORDS=""
- S=${WORKDIR}/e16/e
-else
- SRC_URI="mirror://sourceforge/enlightenment/e16-${PV/_/-}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
- S=${WORKDIR}/e16-${PV/_pre?}
-fi
-inherit eutils
-
-DESCRIPTION="Enlightenment Window Manager (e16)"
-HOMEPAGE="https://www.enlightenment.org/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="dbus doc nls pango pulseaudio xcomposite xinerama xrandr"
-
-RDEPEND="pulseaudio? ( media-sound/pulseaudio )
- dbus? ( sys-apps/dbus )
- pango? ( x11-libs/pango )
- =media-libs/freetype-2*
- >=media-libs/imlib2-1.3.0[X]
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXdamage
- x11-libs/libXxf86vm
- x11-libs/libXft
- xrandr? ( x11-libs/libXrandr )
- x11-libs/libXrender
- x11-misc/xbitmaps
- xinerama? ( x11-libs/libXinerama )
- xcomposite? ( x11-libs/libXcomposite )
- nls? ( virtual/libintl )
- virtual/libiconv"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto
- nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( app-doc/edox-data )"
-
-src_prepare() {
- if [[ ! -e configure ]] ; then
- eautopoint
- eautoreconf
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable dbus) \
- $(use_enable pulseaudio sound pulse) \
- $(use_enable pango) \
- $(use_enable xinerama) \
- $(use_enable xrandr) \
- $(use_enable xcomposite composite) \
- --disable-docs \
- --enable-zoom
-}
-
-src_install() {
- default
- dodoc COMPLIANCE sample-scripts/*
- dohtml docs/e16.html
-}
diff --git a/x11-wm/enlightenment/enlightenment-1.0.17.ebuild b/x11-wm/enlightenment/enlightenment-1.0.17.ebuild
deleted file mode 100644
index 418b0bc450d8..000000000000
--- a/x11-wm/enlightenment/enlightenment-1.0.17.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-if [[ ${PV} == *9999 ]] ; then
- ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/E16/e"
- inherit subversion autotools
- SRC_URI=""
- #KEYWORDS=""
- S=${WORKDIR}/e16/e
-else
- SRC_URI="mirror://sourceforge/enlightenment/e16-${PV/_/-}.tar.gz"
- KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
- S=${WORKDIR}/e16-${PV/_pre?}
-fi
-inherit eutils
-
-DESCRIPTION="Enlightenment Window Manager (e16)"
-HOMEPAGE="https://www.enlightenment.org/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="dbus doc nls pango pulseaudio xcomposite xinerama xrandr"
-
-RDEPEND="pulseaudio? ( media-sound/pulseaudio )
- dbus? ( sys-apps/dbus )
- pango? ( x11-libs/pango )
- =media-libs/freetype-2*
- >=media-libs/imlib2-1.3.0[X]
- x11-libs/libSM
- x11-libs/libICE
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXdamage
- x11-libs/libXxf86vm
- x11-libs/libXft
- xrandr? ( x11-libs/libXrandr )
- x11-libs/libXrender
- x11-misc/xbitmaps
- xinerama? ( x11-libs/libXinerama )
- xcomposite? ( x11-libs/libXcomposite )
- nls? ( virtual/libintl )
- virtual/libiconv"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- x11-base/xorg-proto
- nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( app-doc/edox-data )"
-
-src_prepare() {
- if [[ ! -e configure ]] ; then
- eautopoint
- eautoreconf
- fi
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable dbus) \
- $(use_enable pulseaudio sound pulse) \
- $(use_enable pango) \
- $(use_enable xinerama) \
- $(use_enable xrandr) \
- $(use_enable xcomposite composite) \
- --disable-docs \
- --enable-zoom
-}
-
-src_install() {
- default
- dodoc COMPLIANCE sample-scripts/*
- dohtml docs/e16.html
-}
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index c5dc2af1c12c..d01bc2f6aaeb 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -10,9 +10,7 @@
Enable EGL rendering
- Enable pango font rendering
Use upower/udisks to automount devices
- Enable support for the X xrandr extension
Gadget that holds the menubar of the foreground application
Backlight control slider gadget
A gadget to visualize your battery status
diff --git a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
index 341c943d041a..a4357937c21a 100644
--- a/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
+++ b/x11-wm/i3-gaps/i3-gaps-4.15.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Airblader/i3/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE=""
CDEPEND="