diff --git a/Manifest.files.gz b/Manifest.files.gz
index eb6f0baf1e14..067636b598de 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 e7432404a59b..20f9370f332e 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 1a15ddba2f39..eaf829a6f710 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,3 +1,3 @@
-DIST sudo-1.8.22.tar.gz 3029051 BLAKE2B c77e05b6e9cee738902d6289327fb5d34d19833d96597f983d8af01434d224dd698f9257b0965a0e480e8d19eb38eef0c8216942ca5217c3fe7516cdf397f7b7 SHA512 5ce10a9302d25bb726e347499d26a0b3697446cfcdf0fd9094ee35198db7b023d5250a53fdcb4184d1a09f5fd2a78fc645bc8e80f265666b05a91f62f49b0695
DIST sudo-1.8.23.tar.gz 3150674 BLAKE2B 11b1c7bfa372005cda8baf651c4662f6fd15e94ca77f7705b23ca6573424796d5c1f8e47e2874c4b54017141d01a632885ac60c92346d932537048373cad0ede SHA512 a9d61850a4857bfd075547a13efb13b054e4736e3ebe3c8a98a90a090b1d9b9688354ec9725fc99d1d256999b6f9c6ae6215ce9770fcdebd7f24731107b48342
DIST sudo-1.8.24.tar.gz 3175719 BLAKE2B 61fc469e2d8146b8bb59709192dc33828f0065d4dcf9625e72ae1da9a2c1d6925a0201e5999e146e2e15f5a103ad5690a88fcabb75f57e76b779fe07de53b459 SHA512 ec6295a456a300e81ea2356080d51a57e3eb5d8070d8aab228cece0100ef54954f6c3dd458316b0c2da6839c0d8dab7cdc1a360aceb2594641e064465ecb1ee8
+DIST sudo-1.8.25.tar.gz 3189660 BLAKE2B 9eeab3ac4ea67a866071750a8cf19e0753ef1b59187f715c69547bbae8ee0039bf15116ef30ed5dc6fc11b17beeff174e08756b2d701e0f2668a05f2e318f623 SHA512 f3f0c9e315484e5ba2d535f41ab722881343b1fa299f75cfad456bd41a555d80080369677e62626307df792aeabc29ba450e6f0b9c284ea2cfb8dc5e3568f46d
diff --git a/app-admin/sudo/sudo-1.8.22-r2.ebuild b/app-admin/sudo/sudo-1.8.22-r2.ebuild
deleted file mode 100644
index 5c8f882a27c0..000000000000
--- a/app-admin/sudo/sudo-1.8.22-r2.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# 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_rootpath() {
- # FIXME: secure_path is a compile time setting. using 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
- ROOTPATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env; echo "${ROOTPATH}")
- if [[ -z ${ROOTPATH} ]] ; then
- ewarn " Failed to find ROOTPATH, 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
- ROOTPATH=${newpath#:}
- }
- cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${ROOTPATH:+:${ROOTPATH}}
-
- # finally, strip gcc paths #136027
- rmpath() {
- local e newpath thisp IFS=:
- for thisp in ${ROOTPATH} ; do
- for e ; do [[ $thisp == $e ]] && continue 2 ; done
- newpath+=:$thisp
- done
- ROOTPATH=${newpath#:}
- }
- rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
-
- einfo "... done"
-}
-
-src_configure() {
- local ROOTPATH
- set_rootpath
-
- # 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="${ROOTPATH}"
- --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
- dosbin plugins/sudoers/sudoers2ldif
-
- 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/sudo/sudo-1.8.23-r1.ebuild b/app-admin/sudo/sudo-1.8.25.ebuild
similarity index 87%
rename from app-admin/sudo/sudo-1.8.23-r1.ebuild
rename to app-admin/sudo/sudo-1.8.25.ebuild
index 8e7d28d69bd5..f4ab4527b4fc 100644
--- a/app-admin/sudo/sudo-1.8.23-r1.ebuild
+++ b/app-admin/sudo/sudo-1.8.25.ebuild
@@ -3,7 +3,11 @@
EAPI=6
-inherit eutils pam multilib libtool
+inherit eutils pam multilib libtool tmpfiles
+if [[ ${PV} == "9999" ]] ; then
+ EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+ inherit mercurial
+fi
MY_P=${P/_/}
MY_P=${MY_P/beta/b}
@@ -15,37 +19,39 @@ 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"
+if [[ ${PV} != "9999" ]] ; then
+ 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"
+ 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
+fi
# 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"
+IUSE="gcrypt ldap nls offensive openssl pam sasl selinux +sendmail skey"
CDEPEND="
+ sys-libs/zlib:=
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
+ openssl? ( dev-libs/openssl:0= )
+ pam? ( virtual/pam )
+ sasl? ( dev-libs/cyrus-sasl )
+ skey? ( >=sys-auth/skey-1.1.5-r1 )
"
RDEPEND="
${CDEPEND}
- selinux? ( sec-policy/selinux-sudo )
- ldap? ( dev-lang/perl )
- pam? ( sys-auth/pambase )
>=app-misc/editor-wrapper-3
virtual/editor
+ ldap? ( dev-lang/perl )
+ pam? ( sys-auth/pambase )
+ selinux? ( sec-policy/selinux-sudo )
sendmail? ( virtual/mta )
"
DEPEND="
@@ -126,10 +132,11 @@ src_configure() {
# basing off other values.
myeconfargs=(
--enable-zlib=system
+ --enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
--with-editor="${EPREFIX}"/usr/libexec/editor
--with-env-editor
--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
- --with-rundir="${EPREFIX}"/var/run/sudo
+ --with-rundir="${EPREFIX}"/run/sudo
--with-secure-path="${SECURE_PATH}"
--with-vardir="${EPREFIX}"/var/db/sudo
--without-linux-audit
@@ -179,12 +186,14 @@ src_install() {
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
+ # Don't install into /run as that is a tmpfs most of the time
# (bug #504854)
- rm -rf "${ED}"/var/run
+ rm -rf "${ED%/}"/run
}
pkg_postinst() {
+ tmpfiles_process sudo.conf
+
#652958
local sudo_db="${EROOT}/var/db/sudo"
if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 6a8d7e027e92..8eb746cf4b71 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index 05dd0f562b1c..9e0cd18709c3 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,3 +1,6 @@
DIST rarlinux-5.6.0_p20180624.tar.gz 552245 BLAKE2B 9988b67d545df89bb7087c2bbec5a6fc47d99f6fd8a97e3581f135dc829a43e5c044248e95f60f7cd29370a0955a3c4c8a6667bfcead17301dc0f45ddae0057f SHA512 a0baba489c9268bc25c814c94747c117de66599f91da875b0e0b8233c24910f0e831f8b407f7a9bd8d709da6bdea4ef50306ce456ea5089f893619b8ee5b780f
+DIST rarlinux-5.6.1_beta1_p20180903.tar.gz 552295 BLAKE2B 45a709780bfbcfbaf0182a02a0c6bdea71ca4162b5e8bd223105fe01219e6053559b983e1aebf859480a62c18d6aa7cf689369b4bb5bedebd87eeb6812a31561 SHA512 daa7ed17f1c5418fd47e285c1cc06d833f2182fd3de89aefafd83a86935f52c61dc067d19521d3154ff07d891b69ace03d43940ae824adabfff82ffee1bda379
DIST rarlinux-x64-5.6.0_p20180624.tar.gz 541604 BLAKE2B 2fd865af38db47c556341bb2482ee9af83857bc196e08f9b47d5a0f8ccae708931c09dcca2115866d37c03b77f7548da87cf2e778f003e9a432634b9ae378aae SHA512 e8427d12016d4298d1e3ca3dc32f367e2b7a407572e48c665eaec796c3538d50349760b5691bc6d58256a5470dc0c6637740fcdc6e8a9bd420193fae16e209eb
+DIST rarlinux-x64-5.6.1_beta1_p20180903.tar.gz 541723 BLAKE2B fc70196124621d729530de31b7a213cf4e63326f7db11d65fe2941ae78dfd6bedcc4884b7f21454bd624a6565d679e95699aec9ee489672c3346198c2aa53c13 SHA512 b91388fd78ee45f7f7e3c1750e739ce28c325dcc3b11d8c507b022ade510d6bf012b00092238c3348933176d783d2ef9b1ce6269779a095b4a2320f27f035903
DIST winrar-x64-5.6.0_p20180624.exe 3180248 BLAKE2B 3ddbef82e2ecee7960c5d282de905a2d4d279c3ebae9ceb9e5b72a822d352a80d189a76514a414840ea5ad8002d718435757c860a0935134b6eba01b70e0f444 SHA512 61896901b580476d4c12d40d42eef725de270beb0b01526e7d5d4e02847a7b67b0380f0a365e92eafe2a2303d60945146457d43430aace51c9a443a8b1ceef48
+DIST winrar-x64-5.6.1_beta1_p20180903.exe 3187440 BLAKE2B c8f008ec746ab941dd41553d7f8004aab3d6a00771278eea76cb2b6c6a92394c93c6bd816e212950b99cdd28184237479eb301c0adc3d11712ebc9ab83b44656 SHA512 98da58d411d2d7c6cc49c62cbed3e3850eeccfee3bb7338777b734cbee14396c765b6c62a1d236e89458559d18b6871c3f97d2d9e600fc88655fa2c11e3eba27
diff --git a/app-arch/rar/rar-5.6.1_beta1_p20180903.ebuild b/app-arch/rar/rar-5.6.1_beta1_p20180903.ebuild
new file mode 100644
index 000000000000..dd4bfdcacc81
--- /dev/null
+++ b/app-arch/rar/rar-5.6.1_beta1_p20180903.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="https://rarlab.com/"
+URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
+URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
+URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
+SRC_URI="x86? ( ${URI_x86} )
+ amd64? ( ${URI_amd64} )
+ all_sfx? (
+ ${URI_x86}
+ ${URI_amd64}
+ ${URI_w64}
+ )"
+
+LICENSE="RAR BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="all_sfx"
+RESTRICT="mirror bindist"
+
+DEPEND="all_sfx? ( app-arch/unrar )"
+RDEPEND="sys-libs/glibc"
+
+S="${WORKDIR}/${PN}"
+
+QA_FLAGS_IGNORED="opt/rar/default.sfx
+ opt/rar/default-elf32.sfx
+ opt/rar/default-elf64.sfx
+ opt/rar/default-win32.sfx
+ opt/rar/default-win64.sfx
+ opt/rar/WinCon.SFX
+ opt/rar/WinCon64.SFX
+ opt/rar/Zip.SFX
+ opt/rar/Zip64.SFX
+ opt/rar/unrar
+ opt/rar/rar"
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+src_unpack() {
+ local _file
+
+ for _file in ${A}; do
+ if [[ "${_file}" == rarli* ]]; then
+ if [[ "${_file}" =~ x64 ]]; then
+ if ! use amd64; then
+ continue
+ fi
+
+ unpack "${_file}"
+ elif [[ ! "${_file}" =~ x64 ]]; then
+ if ! use x86; then
+ continue
+ fi
+
+ unpack "${_file}"
+ else
+ die "Unknown SRC file '${_file}'!"
+ fi
+ fi
+ done
+
+ rm -f "${S}"/license.txt
+
+ if use all_sfx ; then
+ mkdir sfx
+ cd sfx
+ for _file in ${A}; do
+ if [[ "${_file}" == rarli* ]]; then
+ unpack "${_file}"
+ if [[ "${_file}" =~ x64 ]]; then
+ mv rar/default.sfx default-elf64.sfx || die
+ else
+ mv rar/default.sfx default-elf32.sfx || die
+ fi
+ elif [[ "${_file}" == winrar* ]]; then
+ ln -s "${DISTDIR}"/${_file} w64.rar || die
+ unpack ./w64.rar
+ mv Default.SFX default-win32.sfx || die
+ mv Default64.SFX default-win64.sfx || die
+ else
+ die "Unknown SFX file '${_file}'!"
+ fi
+ done
+ fi
+}
+
+src_compile() { :; }
+
+src_install() {
+ exeinto /opt/rar
+ doexe rar unrar || die
+
+ dodir /opt/bin
+ dosym ../rar/rar /opt/bin/rar || die
+ dosym ../rar/unrar /opt/bin/unrar || die
+
+ insinto /opt/rar
+ if use all_sfx ; then
+ doins "${WORKDIR}"/sfx/*.{sfx,SFX} || die
+ else
+ doins default.sfx || die
+ fi
+ doins rarfiles.lst || die
+ dodoc *.txt
+}
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 6faa866a356e..f2dd6831ad52 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,4 +1,3 @@
DIST unrar-5.5.8.tar.gz 222285 BLAKE2B ec6317fc95674a3f282f92762ee89d2fd21d162a96b7b1ea29de9f4ab0ebf0bdb9c3e7141c7146d4bd2e570620db7d7850bc9a8c45a42ef745af1d75d4df5a71 SHA512 9eac83707fa47a03925e5f3e8adf47889064d748304b732d12a2d379ab525b441f1aa33216377d4ef445f45c4e8ad73d2cd0b560601ceac344c60571b77fd6aa
-DIST unrar-5.6.3.tar.gz 225788 BLAKE2B 8baf99ef85052a395fe0f2daed41803587e7d839949488eb3430e3d3a3dbca30ef894530d5ef40757f7ea2ffdfb2d493e8e13d7322e65885cf03f8fa0859b804 SHA512 cd3c97d357242a91917cdd9ee6898527829bff73dd187e58d7490d0d0ed5ffd8f8db651ce63d4bd8307c6a085fa95d72faa7b0cf1348bba191086136232a98fc
-DIST unrar-5.6.4.tar.gz 225849 BLAKE2B 56257ab9482841a1a27e5afd5b00b19e7319eef250168f08826e3cb63eefa063ece8198133d8439fca8d8905d303715751e24ed36a5018f03982c03cda27a53b SHA512 0ff55a82f8593c59c9773ffa7dec00386b762c504a08497bc1a50de5502c52e1c1d1043cb8ba353291aa61a3ebc9f5f0a21d313d89639f400e5fc45f01d62cca
DIST unrar-5.6.5.tar.gz 226296 BLAKE2B c35dfdc10976ee2a7827f9386021f79af6712ae3a6641e83934ef7223e1202c46c59e12d2b78abe230c3f929f2228fe8c0664f05275b905ea06806a02cd685aa SHA512 984340935671913b4d2a765db5c4edc0d08d859fc43f3ae0e97e681c4ea302a51808fefa8c11c3aeecad1c2681541f363c5051813d978b5b14959c2e55f71281
+DIST unrar-5.6.6.tar.gz 226484 BLAKE2B f5facddd5c326c039c02b31ac28ba86d5417a51d00a463da1c6fbb714856ffb275defbe400a0d56a21850c754f06eda615fcab983a206f335422503d76f11427 SHA512 1e1e9dc2ed104ab7819d11ad2249780a4320cb30f3c427ea1669c3769fa3a8369841711a2d46d918049659bc67b2cd7dc7560a12127d810a57614293c24fe25a
diff --git a/app-arch/unrar/unrar-5.6.4.ebuild b/app-arch/unrar/unrar-5.6.4.ebuild
deleted file mode 100644
index 33107fddf68d..000000000000
--- a/app-arch/unrar/unrar-5.6.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PN=${PN}src
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="unRAR"
-# subslot = soname version
-SLOT="0/5"
-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 ~x86-solaris"
-IUSE=""
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S=${WORKDIR}/unrar
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.5.5-build.patch
- "${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
-)
-
-src_prepare() {
- default
-
- local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
- if [[ ${CHOST} == *-darwin* ]] ; then
- sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
- else
- sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
- fi
- sed -i "${sed_args[@]}" makefile || die
-}
-
-src_configure() {
- mkdir -p build-{lib,bin}
- printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
- cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
- unrar_make() {
- emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
- }
-
- unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
- ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
- ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
-
- unrar_make -C build-bin
-}
-
-src_install() {
- dobin build-bin/unrar
- dodoc readme.txt
-
- dolib.so build-lib/libunrar*
-
- insinto /usr/include/libunrar${PV%.*.*}
- doins *.hpp
- dosym libunrar${PV%.*.*} /usr/include/libunrar
-}
diff --git a/app-arch/unrar/unrar-5.6.3.ebuild b/app-arch/unrar/unrar-5.6.6.ebuild
similarity index 96%
rename from app-arch/unrar/unrar-5.6.3.ebuild
rename to app-arch/unrar/unrar-5.6.6.ebuild
index 33107fddf68d..2ebe5d1cc2c2 100644
--- a/app-arch/unrar/unrar-5.6.3.ebuild
+++ b/app-arch/unrar/unrar-5.6.6.ebuild
@@ -3,9 +3,9 @@
EAPI="6"
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic multilib toolchain-funcs
-MY_PN=${PN}src
+MY_PN="${PN}src"
DESCRIPTION="Uncompress rar files"
HOMEPAGE="https://www.rarlab.com/rar_add.htm"
diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 7bbb7d7c5a4d..ff84669d3d96 100644
Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ
diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch b/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch
similarity index 84%
rename from app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch
rename to app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch
index 633c6db1b3fd..6a36bc4adafe 100644
--- a/app-benchmarks/stress-ng/files/stress-ng-0.09.31-makefile.patch
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.09.38-makefile.patch
@@ -1,5 +1,5 @@
---- a/Makefile 2018-06-21 15:39:27.000000000 +0200
-+++ b/Makefile 2018-06-24 14:46:41.773596760 +0200
+--- a/Makefile 2018-08-23 17:55:27.000000000 +0200
++++ b/Makefile 2018-09-01 14:46:51.000000000 +0200
@@ -21,7 +21,7 @@
# Codename "portable pressure producer"
#
@@ -9,7 +9,7 @@
#
# Pedantic flags
-@@ -319,12 +319,10 @@
+@@ -337,12 +337,10 @@
.o: stress-ng.h Makefile
.c.o: stress-ng.h Makefile $(SRC)
@@ -17,14 +17,14 @@
- @$(CC) $(CFLAGS) -c -o $@ $<
+ $(CC) $(CFLAGS) -c -o $@ $<
- stress-ng: info $(OBJS)
+ stress-ng: $(OBJS)
- @echo "LD $@"
- @$(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm $(LDFLAGS) -lc -o $@
@sync
- .PHONY: info
-@@ -344,8 +342,7 @@
+ makeconfig:
+@@ -363,8 +361,7 @@
sed '$$ s/.$$//' >> apparmor-data.c
@echo "};" >> apparmor-data.c
@echo "const size_t g_apparmor_data_len = sizeof(g_apparmor_data);" >> apparmor-data.c
@@ -34,7 +34,7 @@
@rm -rf apparmor-data.c apparmor-data.bin
#
-@@ -360,12 +357,10 @@
+@@ -379,12 +376,10 @@
perf.o: perf.c perf-event.c
@$(CC) $(CFLAGS) -E perf-event.c | grep "PERF_COUNT" | sed 's/,/ /' | \
awk {'print "#define _SNG_" $$1 " (1)"'} > perf-event.h
@@ -49,8 +49,8 @@
@touch stress-ng.c
$(OBJS): stress-ng.h Makefile
-@@ -405,10 +400,10 @@
- STRESS_NG=./stress-ng debian/tests/fast-test-all
+@@ -428,10 +423,10 @@
+ ./stress-ng --seq 0 -t 15 --pathological --verbose --times --tz --metrics
.PHONY: install
-install: stress-ng stress-ng.1.gz
diff --git a/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild b/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild
index ce7b1343e7dc..66c8efa4f87c 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.09.38.ebuild
@@ -25,4 +25,4 @@ RDEPEND="${DEPEND}"
DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-PATCHES=( "${FILESDIR}/${PN}-0.09.31-makefile.patch" )
+PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 04a0d51248ac..10eb68e5a532 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild b/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild
index c2d30f6292ca..d75350ea8bc0 100644
--- a/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild
+++ b/app-dicts/myspell-mi/myspell-mi-20060316-r1.ebuild
@@ -22,5 +22,5 @@ HOMEPAGE="http://lingucomponent.openoffice.org/"
SRC_URI="https://dev.gentoo.org/~jstein/dist/myspell-mi_NZ-${PV}.zip"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 4f921dc637ec..75da0a9cc277 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/okteta/Manifest b/app-editors/okteta/Manifest
index 79a06fb1f0b8..e458c9014a1e 100644
--- a/app-editors/okteta/Manifest
+++ b/app-editors/okteta/Manifest
@@ -1,2 +1,3 @@
DIST okteta-0.25.1.tar.xz 951952 BLAKE2B 180cb7426b85cc8598f774d50556fe26d95d11e7c8b5be542a38fd4fa1c0479b401e6be59e7ca86eabba805c2a5d2ea2d818960cb218d173fd87db23f9c5525f SHA512 67e594ee1674176cbf506ca1191ced748bf6aec268d57211e052552f9673c359ccb3fefd403b5cf63e04f63a4fd3b42b0d21ef8eefcbac999081d58505df2174
DIST okteta-0.25.2.tar.xz 954124 BLAKE2B b880001d6351479accb2f5f2e00a2574337695642bf9082b030d1a56e828fa4cc8e4cf00c6781e12328a20fde004cddaad057b0dbce2fb34a243e24df48ee878 SHA512 78f905479dc5070754b53d8fb7374d162a64479303092ce3f391953a01332946d98151f181a6c9363c68dad7098b58909b4db53724fac9aa848606f9ff3b6511
+DIST okteta-0.25.3.tar.xz 950956 BLAKE2B d177db59b5327f4e75157c99fdac2191de9a7ef63433635ccf8f11ef4dc4ff201942c9f68383d720b18c26a9e7335bc1181ea4f0e36491b34b27e6c7dc469c9e SHA512 f27b0c2ca3c5f1ad838af847e08c53c8f8f3c386921bd2e0d5e833902659477196e6c6b72a428443e2be9013928c2151c1889ef33d59404815a34d81560ef2a7
diff --git a/app-editors/okteta/okteta-0.25.3.ebuild b/app-editors/okteta/okteta-0.25.3.ebuild
new file mode 100644
index 000000000000..89727e9e83b1
--- /dev/null
+++ b/app-editors/okteta/okteta-0.25.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Hex editor by KDE"
+HOMEPAGE="https://www.kde.org/applications/utilities/okteta
+https://utils.kde.org/projects/okteta"
+IUSE="crypt designer"
+
+DEPEND="
+ $(add_frameworks_dep kbookmarks)
+ $(add_frameworks_dep kcmutils)
+ $(add_frameworks_dep kcodecs)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtscript 'scripttools')
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ crypt? ( app-crypt/qca:2[qt5(+)] )
+ designer? ( $(add_qt_dep designer) )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DOMIT_EXAMPLES=ON
+ $(cmake-utils_use_find_package crypt Qca-qt5)
+ -DBUILD_DESIGNERPLUGIN=$(usex designer)
+ )
+
+ kde5_src_configure
+}
+
+src_test() {
+ local myctestargs=( -j1 )
+
+ kde5_src_test
+}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 8c77de6fb43a..a4d0068769ec 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 2268c3a0fc40..8d741121bcbc 100644
--- a/app-emacs/ebuild-mode/Manifest
+++ b/app-emacs/ebuild-mode/Manifest
@@ -1 +1,2 @@
DIST ebuild-mode-1.44.tar.xz 34468 BLAKE2B 05c420979c2e4e145ab6230e9218d2ace8250abcc07e819610e9ac1fbb86147a641b88e69328ff624f9787b87cef56f9fe02a1205a02d01a0157b0293656647e SHA512 4d9b01939af089794255faf747264f948b8b2df47936e364ccfa23da493a33f56fbce1277526089e60b716e38e248b12fac39eca0d59d4974e2e70236ffbcd44
+DIST ebuild-mode-1.45.tar.xz 34520 BLAKE2B 15246a7b0a85d05270e3c4db8dc30c7e7ea704fa62644c11320fad8f25dcae8c17dbae86be5245b6ed9dd7650f247616c7a1fbd07536386ef2841b2351287f7a SHA512 b5842696bd548c11bf6164694c9d0bbd3cbfaa77b8f34cf27544033f39986610a6ec2e030c72da68f7645e851e6e377eb557d3eb721b8ad1b6b920dc8bf80750
diff --git a/app-emacs/ebuild-mode/ebuild-mode-1.45.ebuild b/app-emacs/ebuild-mode/ebuild-mode-1.45.ebuild
new file mode 100644
index 000000000000..3e82ece8f10e
--- /dev/null
+++ b/app-emacs/ebuild-mode/ebuild-mode-1.45.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 9cfe5eea9c45..5edec21466c5 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest
index 20040fb6fa24..c94cbc9afa01 100644
--- a/app-emulation/crossover-bin/Manifest
+++ b/app-emulation/crossover-bin/Manifest
@@ -17,3 +17,4 @@ DIST install-crossover-15.3.1.bin 80774288 BLAKE2B 3d3fd83ee426a66ead3c88f4ca584
DIST install-crossover-16.0.0.bin 197872657 BLAKE2B d500ed4f6a426154b376ead6c2b50eb21a403303561078dc51982a5147af23261dda9892717c16c6e2f3b2a30ffc84e73070cd330bea70ba89c79180c4933297 SHA512 184533679ddf3918ab5fc00b01452d868c694fbc7ccb5484c88822cc52da067fd1a0be0387e4050e40d9b367052158faec27dc06f6a371a044b5a1782950e780
DIST install-crossover-16.2.5.bin 198336730 BLAKE2B a11252dab552846fe0a1527cd59cd62907142385062b744591cef6707213d03945879fc5da6bcfaaa315967c51ae15159ad14d8519407542b82f0eb53c5fd02e SHA512 17cb711e7257f094e9ccf939edc1ca6be362f18b86078fe307b7e1337850e182d02fde087789f13ea2bf96ca89736f941c1a7bd93ff1b37a78fe8f846a1d5e22
DIST install-crossover-17.5.0.bin 198287744 BLAKE2B c594192927874e5a80626ad110f0089f2bf8b7385a16ff7755923d63ebb0559b1aa505ec4e8b6f85253ac13736b7f9af178c64ed042a515d31cd4565295db163 SHA512 8592d2c91c437d62d1fd5fecf6230eeabfe56c38f49ea795bf4d3b51d8ae4399f1b01801d60dcccb94caeb4dd662675c2739f730f39ef178db32dd4f72182197
+DIST install-crossover-17.5.1.bin 198278549 BLAKE2B e53504177eb4a4030a31ae73baf26144375dd559bcd58af3ef05364cfb7a00b8cd68d879e6ef31e92b165876e4c3f85ebcb823dd6585c3edcb8e4cafb76d8e59 SHA512 d1e41c5290c56bbb23a6317e91800d7c23d2b4389ebf08ef4416718103aa06b05b33c655d3ef413fe76773dd3599d8fe3d4ea64274fcc18518923990f980bf2a
diff --git a/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
new file mode 100644
index 000000000000..1d2e3bb99523
--- /dev/null
+++ b/app-emulation/crossover-bin/crossover-bin-17.5.1.ebuild
@@ -0,0 +1,157 @@
+# 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
+
+ # Konqueror in its infinite wisdom decides to try opening things for
+ # writing, which are sandbox violations. This breaks the install process if
+ # it is installed, so we ninja edit it to false so it so doesn't run.
+ sed -i -e 's/cxwhich konqueror/false &/' "${ED}opt/cxoffice/bin/locate_gui.sh" \
+ || die "Could not apply workaround for konqueror"
+
+ # 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"
+
+ # Revert ninja edit
+ sed -i -e 's/false \(cxwhich konqueror\)/\1/' "${ED}opt/cxoffice/bin/locate_gui.sh" \
+ || die "Could not apply workaround for konqueror"
+
+ 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-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 42282984c0c7..f1f6b36c5002 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild
new file mode 100644
index 000000000000..f7446f6ad8ae
--- /dev/null
+++ b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit gnome2-utils python-r1
+
+DESCRIPTION="Chinese Cangjie and Quick engines for IBus"
+HOMEPAGE="http://cangjians.github.io/"
+SRC_URI="https://github.com/Cangjians/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+ app-i18n/libcangjie
+ dev-python/cangjie[${PYTHON_USEDEP}]
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ nls? ( sys-devel/gettext )"
+
+src_configure() {
+ python_foreach_impl default
+}
+
+src_compile() {
+ python_foreach_impl default
+}
+
+src_install() {
+ python_foreach_impl default
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/app-i18n/ibus-cangjie/ibus-cangjie-2.4.ebuild b/app-i18n/ibus-cangjie/ibus-cangjie-2.4.ebuild
deleted file mode 100644
index 766065c32132..000000000000
--- a/app-i18n/ibus-cangjie/ibus-cangjie-2.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit autotools-utils gnome2-utils python-r1 eutils
-
-DESCRIPTION="The IBus engine for users of the Cangjie and Quick input methods"
-HOMEPAGE="http://cangjians.github.io"
-SRC_URI="https://github.com/Cangjians/ibus-cangjie/releases/download/v${PV}/ibus-cangjie-${PV}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
- >=app-i18n/ibus-1.4.1
- app-i18n/libcangjie
- dev-python/cangjie[${PYTHON_USEDEP}]
- dev-util/intltool
- sys-devel/gettext"
-
-RDEPEND=">=app-i18n/ibus-1.4.1
- app-i18n/libcangjie
- dev-python/cangjie[${PYTHON_USEDEP}]
- virtual/libintl
- ${PYTHON_DEPS}"
-
-src_configure() {
- python_foreach_impl autotools-utils_src_configure
-}
-
-src_compile() {
- python_foreach_impl autotools-utils_src_compile
-}
-
-src_install() {
- python_foreach_impl autotools-utils_src_install
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus-cangjie/metadata.xml b/app-i18n/ibus-cangjie/metadata.xml
index 9468326e6f9a..83985854d52a 100644
--- a/app-i18n/ibus-cangjie/metadata.xml
+++ b/app-i18n/ibus-cangjie/metadata.xml
@@ -1,11 +1,11 @@
-
- cjk@gentoo.org
- Cjk
-
-
- Cangjians/ibus-cangjie
-
+
+ cjk@gentoo.org
+ Cjk
+
+
+ Cangjians/ibus-cangjie
+
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.0-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.0-r1.ebuild
index 7b61f434638f..2962cc569f5b 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.0-r1.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.0-r1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit gnome2-utils python-single-r1
-DESCRIPTION="Hangul engine for IBus"
+DESCRIPTION="Korean Hangul engine for IBus"
HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
index 0c0401cb2c0b..a78ae6cb20d5 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.1.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit gnome2-utils python-single-r1
-DESCRIPTION="Hangul engine for IBus"
+DESCRIPTION="Korean Hangul engine for IBus"
HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
diff --git a/app-i18n/ibus-rime/ibus-rime-1.2.ebuild b/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
index 46087ce10e52..c8c71e6b73ad 100644
--- a/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
+++ b/app-i18n/ibus-rime/ibus-rime-1.2.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-DESCRIPTION="Rime Input Method Engine for IBus"
+DESCRIPTION="Chinese Rime Input Method Engine for IBus"
HOMEPAGE="https://rime.im/ https://github.com/rime/ibus-rime"
SRC_URI="http://dl.bintray.com/lotem/rime/${P}.tar.gz"
diff --git a/app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild b/app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild
index 8bea4e437097..5facdd653741 100644
--- a/app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild
+++ b/app-i18n/ibus-rime/ibus-rime-1.3.0.ebuild
@@ -3,7 +3,7 @@
EAPI="6"
-DESCRIPTION="Rime Input Method Engine for IBus"
+DESCRIPTION="Chinese Rime Input Method Engine for IBus"
HOMEPAGE="https://rime.im/ https://github.com/rime/ibus-rime"
SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
diff --git a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
index 5bbaed2f6f60..70ddc8a973c7 100644
--- a/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
+++ b/app-i18n/ibus-sunpinyin/ibus-sunpinyin-3.0.0_rc1.ebuild
@@ -9,7 +9,7 @@ inherit l10n python-single-r1 scons-utils toolchain-funcs vcs-snapshot
MY_P="${P#*-}"
-DESCRIPTION="SunPinyin engine for IBus"
+DESCRIPTION="Chinese SunPinyin engine for IBus"
HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
SRC_URI="https://github.com/${PN#*-}/${PN#*-}/archive/v${PV/_rc/-rc}.tar.gz -> ${MY_P}.tar.gz"
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index a26acf0f874e..540b1ce376bb 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,2 +1,2 @@
DIST ibus-table-1.9.18.tar.gz 585309 BLAKE2B 42d7d130bd2695c1c1a7010c0bcf29c1ecaa3899c8ef8d24b11e10434771415bfd8b91723ef4c489721f0276d05dce08de3472c49632b9d30da5be1a53f82dc7 SHA512 3f28269be1987023402eb6075b8e68b3bbba3c572a94551d072281677fde5fa14f8f4186455f8f9156b252934580c7a3837555d0edb46c76f13c8b109e26aca2
-DIST ibus-table-1.9.20.tar.gz 588045 BLAKE2B 9daba3a91fb2ef4d6ad6ba6bf2c1a7d4db12ae40ebd2ef3a843e68cc9d77791ed9a76550ceef0d7ccb8ad69322b897ebad36ff0bedf1d8a4790c69dec698e2fc SHA512 535008344a423a0c3afacf11206912cbc7b27b7a2724cc0f2dc944d0654a02f0b7d6eda397e95542a41b03fa675820531b12e2b0d8f2091ac6083d707a8ac285
+DIST ibus-table-1.9.21.tar.gz 615801 BLAKE2B f6b3fb4fe67e5f43cc7d21bd03cc530c03b3a161e099fbca0b116319f1590374ddcef2e97c2f4702c2cd8748e8009d703abfff51f93ffb933a1aecb028e03362 SHA512 354f7e8ece5c23b84251bd0d5ff06d7a368678ade25e340341ef9f85571b440c455d56660c743be97ff6776ff041c4da35079ce090955c5f87b8f3b587e35866
diff --git a/app-i18n/ibus-table/ibus-table-1.9.20.ebuild b/app-i18n/ibus-table/ibus-table-1.9.21.ebuild
similarity index 98%
rename from app-i18n/ibus-table/ibus-table-1.9.20.ebuild
rename to app-i18n/ibus-table/ibus-table-1.9.21.ebuild
index 2a357802f975..9552ac56f2b1 100644
--- a/app-i18n/ibus-table/ibus-table-1.9.20.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.9.21.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="nls"
+RESTRICT="test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
diff --git a/app-i18n/ibus/ibus-1.5.18.ebuild b/app-i18n/ibus/ibus-1.5.18.ebuild
index de814523ac9e..1da9fda2462f 100644
--- a/app-i18n/ibus/ibus-1.5.18.ebuild
+++ b/app-i18n/ibus/ibus-1.5.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland"
REQUIRED_USE="emoji? ( gtk )
gtk2? ( gtk )
diff --git a/app-i18n/libcangjie/Manifest b/app-i18n/libcangjie/Manifest
index 68f57b674d62..bfc76d0e46f9 100644
--- a/app-i18n/libcangjie/Manifest
+++ b/app-i18n/libcangjie/Manifest
@@ -1,2 +1 @@
-DIST libcangjie-1.1.tar.xz 573924 BLAKE2B d8d8543e2ab8717deb732a60668a8c66b0769177f4f954572d936b18d13c16cdc6355f82c7ee3bf1b7674fe1ff93f822a6ada381b6942fa15a47ff7b64f0bf78 SHA512 99c2dd055830bbaf6e2ef26cc285dd3edec780561af0799b450cc2fa44c8590217bbf38cd3d087c01cca1b467c7fff722c548b83fcb7c9177cd7c681a22f2901
DIST libcangjie-1.3.tar.xz 575240 BLAKE2B c7e3129a6dd9690223e46f20a7bf06148ed279880461faf031a6542a09e0b21f6740767a8e6fd43acb79175deef437c385df3448e672ebfb0b9f72701afb66a3 SHA512 216ad965cb265d700cc94e6b7892dd9a7d814eba364b7700870b7e704d17d8dc75be4c7af0a7a7fc0088a32e389e62822a05d089f1df714c5ffd347ece8b9f35
diff --git a/app-i18n/libcangjie/libcangjie-1.1.ebuild b/app-i18n/libcangjie/libcangjie-1.1.ebuild
deleted file mode 100644
index 22b48cbbb884..000000000000
--- a/app-i18n/libcangjie/libcangjie-1.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="The library implementing the Cangjie input method"
-HOMEPAGE="http://cangjians.github.io"
-SRC_URI="http://cangjians.github.io/downloads/libcangjie/libcangjie-${PV}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-db/sqlite:3="
-
-RDEPEND="${DEPEND}"
diff --git a/app-i18n/libcangjie/libcangjie-1.3.ebuild b/app-i18n/libcangjie/libcangjie-1.3.ebuild
index 72eb18b96607..e7a4e34570b7 100644
--- a/app-i18n/libcangjie/libcangjie-1.3.ebuild
+++ b/app-i18n/libcangjie/libcangjie-1.3.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI="6"
-DESCRIPTION="The library implementing the Cangjie input method"
-HOMEPAGE="http://cangjians.github.io"
-SRC_URI="https://github.com/Cangjians/libcangjie/releases/download/v${PV}/libcangjie-${PV}.tar.xz"
+DESCRIPTION="Library implementing the Cangjie input method"
+HOMEPAGE="http://cangjians.github.io/"
+SRC_URI="https://github.com/Cangjians/${PN}/releases/download/v${PV}/${P}.tar.xz"
LICENSE="LGPL-3+"
SLOT="0"
KEYWORDS="amd64 x86"
+IUSE=""
-DEPEND="dev-db/sqlite:3="
-
-RDEPEND="${DEPEND}"
+RDEPEND="dev-db/sqlite:3="
+DEPEND="${RDEPEND}"
diff --git a/app-i18n/libcangjie/metadata.xml b/app-i18n/libcangjie/metadata.xml
index bc30147a7b04..f6b9bba14e92 100644
--- a/app-i18n/libcangjie/metadata.xml
+++ b/app-i18n/libcangjie/metadata.xml
@@ -1,11 +1,11 @@
-
- cjk@gentoo.org
- Cjk
-
-
- Cangjians/libcangjie
-
+
+ cjk@gentoo.org
+ Cjk
+
+
+ Cangjians/libcangjie
+
diff --git a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
index 8f2a9fa620cf..3c0f240713cc 100644
--- a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
+++ b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
@@ -13,7 +13,7 @@ fi
LICENSE="unicode"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
index f4641c65853b..6df09e50e43f 100644
--- a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
+++ b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
LICENSE="unicode"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
DEPEND=""
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index ce0d06bb38fa..7ab94f72f76e 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/mtail/Manifest b/app-misc/mtail/Manifest
index 27ace26115d0..f2ac569f3499 100644
--- a/app-misc/mtail/Manifest
+++ b/app-misc/mtail/Manifest
@@ -1,2 +1,3 @@
DIST mtail-1.1.1.tgz 9124 BLAKE2B 804ec168eb5dc5408ffd91fc80a6f080b0575dfb58bc667a3ff3d657cea955a4a697ff3f99470e86e59387e0bb2275cd2a0a6e5ee97bc88f28df4424a4c012b8 SHA512 987816ce5d12996192c881be1ac5a28c3457757e981ab35e657fb226c3980a22091c9fc85f68c13eb1c01939e08e492814b6a03c9b1f4f4bc1878c4f13ec8a0e
+DIST mtail-1.2.0.tgz 10798 BLAKE2B ea822f5430ff67fdc153db5c7d79ecb40f0f9025434eef216e13789ffedf79c00ac3fae1f161805d4ee247f993ab984ffb2e44cb94817e06401ec48820a8272c SHA512 f63686a6b93788ec4e72f5dc59bbd0c5bc5c51cba0812cc894b5bd1af497fd0931f0d5834c0feb5c72a057d3f387e379de6fcd8e3a09c98fc77e5a76ee8da274
DIST mtailrc-syslog.sample 1785 BLAKE2B d060e9baf750505a0908bb18533aad72675962be98875e9f1fed3c734a0339589122ebe2774cc585b05dfde61d8877e05a42184c966050e245bb57ed2dfe500b SHA512 d6bbaafa7c599f443c788697087ebef69a8e279b0715fa4e5b770531cbd254a646014fa98e5e5d444c48d23974201d36a856b34507a91e1b6abbb423f7015c75
diff --git a/app-misc/mtail/mtail-1.2.0.ebuild b/app-misc/mtail/mtail-1.2.0.ebuild
new file mode 100644
index 000000000000..e6a4e3c5e34c
--- /dev/null
+++ b/app-misc/mtail/mtail-1.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="Tail workalike, that performs output colourising"
+HOMEPAGE="http://matt.immute.net/src/mtail/"
+SRC_URI="
+ http://matt.immute.net/src/mtail/mtail-${PV}.tgz
+ http://matt.immute.net/src/mtail/mtailrc-syslog.sample"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DOCS=( CHANGES "${PN}rc.sample" README "${DISTDIR}"/mtailrc-syslog.sample )
+
+src_prepare() {
+ default
+ python_fix_shebang .
+}
+
+src_install() {
+ dobin "${PN}"
+ einstalldocs
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 51235737c343..e9b768934869 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 194f7e89c16b..2916d776b133 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -2,3 +2,5 @@ DIST zsh-5.5-doc.tar.xz 3216400 BLAKE2B 3d07b336222b08d7deff0ded6f603a47bcdcec97
DIST zsh-5.5.1-doc.tar.xz 3216632 BLAKE2B ef1274799604d74eb9cec3c29927703c98bb63bde3aa5ce4880eda45420fe1eb79c54a693fe529c9e79161f924a76bc2a650253216c7b1e565af65f1ac3c0d91 SHA512 e240f6c6aa2efb941c2baaaf749c66c9e304ba54ce2be90586671ba47e380aac89315516e5dce41fa0ae1d8fccfc36f61ed1400b6aab3382927e2715a77d62e6
DIST zsh-5.5.1.tar.gz 4578700 BLAKE2B b58fc763bc64e8ed6de0db2e0fd454aef995fcc86b18c2ffd4b39e037ce1cdeb04e6e2a44b2495ca89218af41ad1dd7d29e429d21fbab39377d95e62d249732e SHA512 c4f7327a3f5480bd9a169fb07e34812e0106fa9de3b5f7d38bb0db85a3e4d01b9a4a8f35553da03a15d7d819108305cfaa2811c945273e2cac84512219e69ebb
DIST zsh-5.5.tar.gz 4576506 BLAKE2B 4f5923d519b0c96475f4832cf0e5cabc1432e765d201c992903ead45b175d5bc76410ebe248c2bd01ad75a5b5939bc5bc58e9263bb4501f9b2c1f5b4d7755896 SHA512 aafa29e1bc29d35fb5822ad4ca5f4c64b1e4a4e3f9bff70e9e5976918fa9e7906467bd11f69291e694dfa77efa1e5433d7839fc668aa572228623f1c131c381f
+DIST zsh-5.6-doc.tar.xz 3198156 BLAKE2B 245cabac955727e519be453e000c7b74d9a8497a894ddc91d0b33f1d1b44ad89c29d76dee60844085dde1eb0197ca1b13811588e1da56cb9c904b8d8c7717b79 SHA512 f3ecd9afc02c5be71c804f5a44282c4d81acb5ced0d4c21f4f4ac6d04f2c2b5c1ccfe003cba64639943cd3b48ec45174c387b0a272ccf7759e325a499272f5f2
+DIST zsh-5.6.tar.xz 3080856 BLAKE2B 747a6bbcc46b78b5092cfa05659f14c86f981032c691faf5a5aed8a7dae87ab2acad9a903f64f6d45b3c5552b0fa0d48ba4bcad98dc44591f12fed04f9e6920f SHA512 791cbeff45a5ef86608341147724f8b301a50eae1500f94eaaef1074c14c516c32d3f5628b8b16dbe42b7ad812c1a221240c1d4c5cd240144a00976c196f0735
diff --git a/app-shells/zsh/zsh-5.6.ebuild b/app-shells/zsh/zsh-5.6.ebuild
new file mode 100644
index 000000000000..f924a3a364f3
--- /dev/null
+++ b/app-shells/zsh/zsh-5.6.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic prefix
+
+if [[ ${PV} == 9999* ]] ; then
+ inherit git-r3 autotools
+ EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"
+else
+ 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
+ doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )"
+fi
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="https://www.zsh.org/"
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND="
+ >=sys-libs/ncurses-5.1:0=
+ static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
+ caps? ( sys-libs/libcap )
+ pcre? (
+ >=dev-libs/libpcre-3.9
+ static? ( >=dev-libs/libpcre-3.9[static-libs] )
+ )
+ gdbm? ( sys-libs/gdbm:= )
+ ! Doc/zshall.1 || die
+
+ # add openrc specific options for init.d completion
+ eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
+ fi
+
+ eapply_user
+
+ if [[ ${PV} == 9999* ]] ; then
+ sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ local myconf=(
+ --bindir="${EPREFIX}"/bin
+ --libdir="${EPREFIX}"/usr/$(get_libdir)
+ --enable-etcdir="${EPREFIX}"/etc/zsh
+ --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
+ --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
+ --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
+ --enable-function-subdirs
+ --with-tcsetpgrp
+ $(use_enable maildir maildir-support)
+ $(use_enable pcre)
+ $(use_enable caps cap)
+ $(use_enable unicode multibyte)
+ $(use_enable gdbm)
+ )
+
+ if use static ; then
+ myconf+=( --disable-dynamic )
+ append-ldflags -static
+ fi
+ if use debug ; then
+ myconf+=(
+ --enable-zsh-debug
+ --enable-zsh-mem-debug
+ --enable-zsh-mem-warning
+ --enable-zsh-secure-free
+ --enable-zsh-hash-debug
+ )
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ myconf+=( --enable-libs=-liconv )
+ append-ldflags -Wl,-x
+ fi
+
+ econf "${myconf[@]}"
+
+ if use static ; then
+ # compile all modules statically, see Bug #27392
+ # removed cap and curses because linking failes
+ sed -e "s,link=no,link=static,g" \
+ -e "/^name=zsh\/cap/s,link=static,link=no," \
+ -e "/^name=zsh\/curses/s,link=static,link=no," \
+ -i "${S}"/config.modules || die
+ if ! use gdbm ; then
+ sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
+ "${S}"/config.modules || die
+ fi
+ fi
+}
+
+src_compile() {
+ default
+
+ if [[ ${PV} == 9999* ]] && use doc ; then
+ emake -C Doc everything
+ fi
+}
+
+src_test() {
+ addpredict /dev/ptmx
+ local i
+ for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
+ rm "${S}"/Test/${i} || die
+ done
+ emake check
+}
+
+src_install() {
+ emake DESTDIR="${D}" install $(usex doc "install.info" "")
+
+ insinto /etc/zsh
+ export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
+ newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile
+
+ keepdir /usr/share/zsh/site-functions
+ insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+ newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
+
+ local i
+
+ # install miscellaneous scripts (bug #54520)
+ sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
+ -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
+ -i {Util,Misc}/* || die
+ for i in Util Misc ; do
+ insinto /usr/share/zsh/${PV%_*}/${i}
+ doins ${i}/*
+ done
+
+ # install header files (bug #538684)
+ insinto /usr/include/zsh
+ doins config.h Src/*.epro
+ for i in Src/{zsh.mdh,*.h} ; do
+ sed -e 's@\.\./config\.h@config.h@' \
+ -e 's@#\(\s*\)include "\([^"]\+\)"@#\1include @' \
+ -i "${i}"
+ doins "${i}"
+ done
+
+ dodoc ChangeLog* META-FAQ NEWS README config.modules
+
+ if use doc ; then
+ pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+ docinto html
+ dodoc Doc/*.html
+ insinto /usr/share/doc/${PF}
+ doins Doc/zsh.{dvi,pdf}
+ popd >/dev/null
+ fi
+
+ docinto StartupFiles
+ dodoc StartupFiles/z*
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]] ; then
+ echo
+ elog "If you want to enable Portage completions and Gentoo prompt,"
+ elog "emerge app-shells/gentoo-zsh-completions and add"
+ elog " autoload -U compinit promptinit"
+ elog " compinit"
+ elog " promptinit; prompt gentoo"
+ elog "to your ~/.zshrc"
+ echo
+ elog "Also, if you want to enable cache for the completions, add"
+ elog " zstyle ':completion::complete:*' use-cache 1"
+ elog "to your ~/.zshrc"
+ echo
+ elog "Note that a system zprofile startup file is installed. This will override"
+ elog "PATH and possibly other variables that a user may set in ~/.zshenv."
+ elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
+ elog "or other user startup files that are sourced after the system zprofile."
+ echo
+ elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
+ elog "one method is to use a separate path-setting file that is conditionally sourced"
+ elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
+ elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
+ echo
+ elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
+ echo
+ fi
+}
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index abc2b8d09237..a03157d98f7e 100644
Binary files a/app-vim/Manifest.gz and b/app-vim/Manifest.gz differ
diff --git a/app-vim/undotree/Manifest b/app-vim/undotree/Manifest
index 206493813ac8..dad4c1b25380 100644
--- a/app-vim/undotree/Manifest
+++ b/app-vim/undotree/Manifest
@@ -1 +1,2 @@
DIST undotree-5.0.tar.gz 13646 BLAKE2B 12fb31433b95ac980cae9d313ccb7cd30d0a63a25f440027ae0dd8cd240a80aa825582f60a88b44346f392f8e52c7ff5d86a87d8891b0adc3fcf17daf0c86ce3 SHA512 093202633000c15db731c9664b606ced7dd4d259f9fac04e886509a440eb5e31de073250eb400be0b1e4cdabb393d1d88bbcb88fa162c89a3783c961b33d33a0
+DIST undotree-6.0.tar.gz 16288 BLAKE2B 38e7d185f0c2d9dd139c0c9b49593e1f6d14f7eab81b984c641b9d6917888510cda6a03d3030e051e257fde72f86d5dddbf65a8b29e4cd68323e9b976281f9ee SHA512 2654206adc8e4f021d5f2f3927ab5cb218e333a34fa5121e5ad48bf9b26e8d15c6b58cf88988407a587fb60cf406a4ed766fc4388672e93d4fceddc8712c4c49
diff --git a/app-vim/undotree/undotree-6.0.ebuild b/app-vim/undotree/undotree-6.0.ebuild
new file mode 100644
index 000000000000..ef1f2f67d99e
--- /dev/null
+++ b/app-vim/undotree/undotree-6.0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit vim-plugin vcs-snapshot
+
+DESCRIPTION="vim plugin: display your undo history in a graph"
+HOMEPAGE="https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree"
+SRC_URI="https://github.com/mbbill/${PN}/archive/rel_${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-xemacs/Manifest.gz b/app-xemacs/Manifest.gz
index 828463565a36..c5fbcefc537d 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 2268c3a0fc40..8d741121bcbc 100644
--- a/app-xemacs/ebuild-mode/Manifest
+++ b/app-xemacs/ebuild-mode/Manifest
@@ -1 +1,2 @@
DIST ebuild-mode-1.44.tar.xz 34468 BLAKE2B 05c420979c2e4e145ab6230e9218d2ace8250abcc07e819610e9ac1fbb86147a641b88e69328ff624f9787b87cef56f9fe02a1205a02d01a0157b0293656647e SHA512 4d9b01939af089794255faf747264f948b8b2df47936e364ccfa23da493a33f56fbce1277526089e60b716e38e248b12fac39eca0d59d4974e2e70236ffbcd44
+DIST ebuild-mode-1.45.tar.xz 34520 BLAKE2B 15246a7b0a85d05270e3c4db8dc30c7e7ea704fa62644c11320fad8f25dcae8c17dbae86be5245b6ed9dd7650f247616c7a1fbd07536386ef2841b2351287f7a SHA512 b5842696bd548c11bf6164694c9d0bbd3cbfaa77b8f34cf27544033f39986610a6ec2e030c72da68f7645e851e6e377eb557d3eb721b8ad1b6b920dc8bf80750
diff --git a/app-xemacs/ebuild-mode/ebuild-mode-1.45.ebuild b/app-xemacs/ebuild-mode/ebuild-mode-1.45.ebuild
new file mode 100644
index 000000000000..b0e82e52e220
--- /dev/null
+++ b/app-xemacs/ebuild-mode/ebuild-mode-1.45.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-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index a1a946a7d59d..81b0239c31c4 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/eigen/Manifest b/dev-cpp/eigen/Manifest
index 42266b4c55d7..1f4447d03b07 100644
--- a/dev-cpp/eigen/Manifest
+++ b/dev-cpp/eigen/Manifest
@@ -1,3 +1,4 @@
DIST eigen-3.2.8.tar.bz2 1161201 BLAKE2B 35bace5138f601e73d56412e87bf591ef2f96778050b0a2a4fc8f1e75f02498fb4eb80bf79988dd4bd6b985945a122d44581ccedd925f398f7d282790da06385 SHA512 53c27ba530c985dfef52188e03273eeef33abbc67e3f150cacd3371c8b9ddbd399228730595821c4c56c061d109cf509266c1dab2b8a7c730902cbd6fb18c100
DIST eigen-3.3.3.tar.bz2 1642001 BLAKE2B 51d870a6bf04865c39642205ac8e12fd638e1d383fb33b064835ce4b5a4d4b056507c1a4fc65d9e665bf659ffd742179415caccac27c203c9388ca267e29e802 SHA512 bb5a8b761371e516f0a344a7c9f6e369e21c2907c8548227933ca6010fc607a66c8d6ff7c41b1aec3dea7d482ce8c2a09e38ae5c7a2c5b16bdd8007e7a81ecc3
DIST eigen-3.3.4.tar.bz2 1657543 BLAKE2B 62ae6e42972fcfe71bfcda359d35674207440813edc856f209f37321c7f8d39498c6c6fb33d80cc14129113c1dff849212f034ab925b6656e99ed192f4af2fbb SHA512 d67a3fd8f7ce811af65fc1d43ec347dadf9c643a49135f7e455fc303773bad09e80a125282c7dfca7a1993b79e1f66576ac92418119fbb0fa50c1a581b957c0d
+DIST eigen-3.3.5.tar.bz2 1663467 BLAKE2B 7f4b6339f8cea815004057361734e53129b5bde45c9c310eab87f0aa20da90e46dd67359e669f8b36477339df7bd7c8bd8eb18baaf0f1a779372ec3623c50aca SHA512 740ed41862c1e422a751b205513754e9c7bd04cc8ad4e3b08e2ccd1c1d30dea43a90896bc8eecd0cb4253b4adf803a814ddd48d6166fb5a53f507cf3e6940a38
diff --git a/dev-cpp/eigen/eigen-3.3.5.ebuild b/dev-cpp/eigen/eigen-3.3.5.ebuild
new file mode 100644
index 000000000000..1e0339541f96
--- /dev/null
+++ b/dev-cpp/eigen/eigen-3.3.5.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED="test"
+inherit cmake-utils cuda fortran-2
+
+DESCRIPTION="C++ template library for linear algebra"
+HOMEPAGE="http://eigen.tuxfamily.org/"
+SRC_URI="https://bitbucket.org/eigen/eigen/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="MPL-2.0"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="altivec c++11 cuda debug doc neon openmp test" #zvector vsx
+RESTRICT="!test? ( test )"
+
+RDEPEND="!dev-cpp/eigen:0"
+DEPEND="
+ doc? ( app-doc/doxygen[dot,latex] )
+ test? (
+ dev-libs/gmp:0
+ dev-libs/mpfr:0
+ media-libs/freeglut
+ media-libs/glew
+ sci-libs/adolc[sparse]
+ sci-libs/cholmod
+ sci-libs/fftw:3.0
+ sci-libs/pastix
+ sci-libs/umfpack
+ sci-libs/scotch
+ sci-libs/spqr
+ sci-libs/superlu
+ virtual/opengl
+ virtual/pkgconfig
+ cuda? ( dev-util/nvidia-cuda-toolkit )
+ )
+"
+# Missing:
+# METIS-5
+# GOOGLEHASH
+
+src_unpack() {
+ default
+ mv ${PN}* ${P} || die
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ sed -e 's:-g2::g' \
+ -i cmake/EigenConfigureTesting.cmake || die
+
+ sed -e "/add_subdirectory(demos/d" \
+ -i CMakeLists.txt || die
+
+ if ! use test; then
+ sed -e "/add_subdirectory(test/d" \
+ -i CMakeLists.txt || die
+
+ sed -e "/add_subdirectory(blas/d" \
+ -e "/add_subdirectory(lapack/d" \
+ -i CMakeLists.txt || die
+ fi
+ sed -e "/Unknown build type/d" \
+ -i CMakeLists.txt || die
+
+ use cuda && cuda_src_prepare
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && cmake-utils_src_compile doc
+}
+
+src_test() {
+ local mycmakeargs=(
+ -DEIGEN_TEST_NOQT=ON
+ -DEIGEN_TEST_ALTIVEC="$(usex altivec)"
+ -DEIGEN_TEST_CXX11="$(usex c++11)"
+ -DEIGEN_TEST_CUDA="$(usex cuda)"
+ -DEIGEN_TEST_OPENMP="$(usex openmp)"
+ -DEIGEN_TEST_NEON64="$(usex neon)"
+ )
+ cmake-utils_src_configure
+ cmake-utils_src_compile blas
+ cmake-utils_src_compile buildtests
+ cmake-utils_src_test
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+ cmake-utils_src_install
+
+ # Debian installs it and some projects started using it.
+ insinto /usr/share/cmake/Modules/
+ doins "${S}/cmake/FindEigen3.cmake"
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index db716be3be4a..61c4d98b11b1 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 8c206311b693..a93c46ab802a 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -7,7 +7,7 @@ DIST mariadb-10.1.31.tar.gz 67982786 BLAKE2B 1fabbea67345024157be4be34a50c4e9c73
DIST mariadb-10.1.33.tar.gz 65292094 BLAKE2B 3223f9476e946112f7c1d23cc82ff52636801244136343413ae00336173ec58bb4af8dc36e065f6cd27e9aa3f9f999b1d19f9257b928bd92555b34b614b9cf76 SHA512 1d30e06d0c19e338bfbbe6815cf5eee8e1b839b525950f7f54c7cf8f89034658a284df4756f54719ab0f55875546d4713b03bab7dd094ec13291732b069f737e
DIST mariadb-10.1.34.tar.gz 65298561 BLAKE2B 3f3af7b8bad68a08f69befd3f3e7bd88b8cf058feb20309dc2cdbd16bf5d015c2cb0d1d9d2fdf831f6183c0b9bb25405124c24b2940467489e05d42c57f7b0a6 SHA512 3c18359006b340dcf724d1fce36dcc19916c42492269a7545e0726172b8f7b84860e10725c74e4458dae34572395f1650bf17838e9058544e0a6cfcbffd54f6d
DIST mariadb-10.1.35.tar.gz 65324620 BLAKE2B 659ad232a1f2f1cfd74ba8aa9b9f67adc6f4a5dc82e5d8b16011dba83155b1223138df273c935c71021f05068cd8fd14538e935847a36640fc4218b86155698c SHA512 88e6049f3bbc3aa047e108f91a2c4f335758e80f25bfa2974b5f8c2e13f5758824d7835dece021b515c531e5641b9998e4de92256ad4b47b7f694da99bd471aa
-DIST mariadb-10.2.16.tar.gz 73363798 BLAKE2B 31b4d21612f72ff2784b038479ccb866f8d870019c1ff86ff8fa11256e56e659203c83ba52294cc16d0d73531f1d30f5e4ab218a1daadd02223cda3e4c984590 SHA512 3ee476987580c9105645936bbbf29e5614753120247d8909833221c66d68bd507c99643b8b17f23e99644825ad03e03c841309731915e9101f3b5cf47c14e902
+DIST mariadb-10.2.17.tar.gz 73409162 BLAKE2B f13d359a4a061ae2ef2fb4dde53ed07dac1735f9577ef67e396a51ac74acec71acf7a0ab07b4e0f84d70c8f7bcacbdc61933957c4936c99d5038f433296af8a3 SHA512 9714f786abde43b418d8b5accbbd485de213b90db18c879625ce30777526d28fdafd3bdb43922ab6872b300cfa06895b5b3fad5eb0c0e804ad66a1fd1793a141
DIST mariadb-10.3.7.tar.gz 71816160 BLAKE2B 213cfe2999b48c088e08e8289a6243d79b91e465fce51850a253a121896f69df03f935940f25ac290e15e29f97b3a16f75711044b8986f6ec3841ef8beafa0b4 SHA512 b1b3ad9ddc45bdfd3d03888ba160f9991b23187341deac402d5dc4b735511e29767a5dc64ca557bea9bf3d3b413b941ef2e1f5fa30be056dfaec4542a43895f1
DIST mariadb-10.3.8.tar.gz 72152953 BLAKE2B 4742be1d533c7958b61efd430411a1e7390faffc25ceccc09c736647fb263dc3797064725335abf17f9362c7a92293ea5fc72bc2ddd70636f83c25e35c4c83aa SHA512 e1b61900a06fa57992a2f8516771f5fb98799ed5a4bbe74f858c0fe87b907cc6b600942d6fe97b6064cb39b610a7213cb3bc9634a336f9ebffe11dfe67746422
DIST mariadb-5.5.61.tar.gz 45839038 BLAKE2B 2755963d51aee3b9b560531e00b9df6f5637c90a44ad181cf826234d27c15e9fd1b61ae4faf4d9a4ff06779e605c6a5757192407e6e402ad68dfb3ae45a94088 SHA512 a2bebb47ec62eb6cd15e003dea7708948cd96fd7f0fc631a85cfc4691b55e220ed78f3e3b16542b5152ad5bcc61e50a831c71cf8f29481f7de86816ec0bae594
diff --git a/dev-db/mariadb/mariadb-10.2.16.ebuild b/dev-db/mariadb/mariadb-10.2.17.ebuild
similarity index 99%
rename from dev-db/mariadb/mariadb-10.2.16.ebuild
rename to dev-db/mariadb/mariadb-10.2.17.ebuild
index cd2563db8cc8..774277f87d32 100644
--- a/dev-db/mariadb/mariadb-10.2.16.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.17.ebuild
@@ -633,7 +633,7 @@ multilib_src_install_all() {
}
# Official test instructions:
-# USE='extraengine perl server static-libs' \
+# USE='extraengine perl server' \
# FEATURES='test userpriv -usersandbox' \
# ebuild mariadb-X.X.XX.ebuild \
# digest clean package
diff --git a/dev-embedded/Manifest.gz b/dev-embedded/Manifest.gz
index 9f7f01b01f7d..e820c1761a85 100644
Binary files a/dev-embedded/Manifest.gz and b/dev-embedded/Manifest.gz differ
diff --git a/dev-embedded/u-boot-tools/u-boot-tools-2018.05.ebuild b/dev-embedded/u-boot-tools/u-boot-tools-2018.05.ebuild
index 1a32e2433fa0..76939bc8bba5 100644
--- a/dev-embedded/u-boot-tools/u-boot-tools-2018.05.ebuild
+++ b/dev-embedded/u-boot-tools/u-boot-tools-2018.05.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="ftp://ftp.denx.de/pub/u-boot/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
IUSE=""
S=${WORKDIR}/${MY_P}
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 1274674fa6ce..cc15245dba9a 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/tiled/Manifest b/dev-games/tiled/Manifest
index 900b28755217..3e2b1fc1cf59 100644
--- a/dev-games/tiled/Manifest
+++ b/dev-games/tiled/Manifest
@@ -1,4 +1 @@
-DIST tiled-1.0.3.tar.gz 6601791 BLAKE2B 86bca36994b8596931b68dace6db61443bfa488444d06d7bae616a1c095da2d8fd476fd7a466d6b7e95b2291a977e4893125fd09091e96733973bfbc5f66a651 SHA512 4f3c97a91794f86f04965a2332e04f51bc588f7bcfef402edb1092c4e58bb6ace9c90ea522a5fa15a46ca39c8249f62818b80be6d65c11a8d41092ead31cd4f7
-DIST tiled-1.1.4.tar.gz 16029257 BLAKE2B 622afd39623af2b713accca5d6ae989224547833e566d1506c90ea846159481f438a484f4a923e9040949bac2d3903e97e23e57f311eb235c68cdad3ee2335f0 SHA512 861f4916968d88bfbf0359db3972994d98608fe9aa4e405a2e89f1c7a11e2521c8c5e18796809db5597b123706dcad0d120221f1e3143dd6e310111487d1aec3
-DIST tiled-1.1.5.tar.gz 16034738 BLAKE2B 7486d6267780ad0ab4bc0e7bb6da9e1e48b9e35e0a22a1c6a534cb21227554cba7ce40c5013db88fe9f3547bdfe9723a14c500f2e55164f684d8a5426e632018 SHA512 4c1d03825c76ba14b0469af564fe5eb78fa51790b41ddc51f3f72a8247b0aba1118142144453f4cbdaeedb54ac23812086eeac91bf61457887f1d9635508dbe7
DIST tiled-1.1.6.tar.gz 16051699 BLAKE2B 61e33682cbd0d3045c12b20fc852ec8ae81103fc1d9818a7e17222615676dd2d3889033d6d6ba536e63e069a44aaeebeaaffb96b94a2cbcb8f1793553a466703 SHA512 d1083a938bbbd87897c5897fe79d424706e719a4319680ed907be481773daea656fc5b3230ba6b674e5ea044e22ee0044df2a07a7c91c56f9521e32b86847830
diff --git a/dev-games/tiled/tiled-1.0.3.ebuild b/dev-games/tiled/tiled-1.0.3.ebuild
deleted file mode 100644
index a0ce9f7613a8..000000000000
--- a/dev-games/tiled/tiled-1.0.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
-
-DESCRIPTION="A general purpose tile map editor"
-HOMEPAGE="https://www.mapeditor.org/"
-SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-qt/qtcore-5.7:5
- >=dev-qt/qtgui-5.7:5
- >=dev-qt/qtnetwork-5.7:5
- >=dev-qt/qtwidgets-5.7:5
- sys-libs/zlib
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS COPYING NEWS.md README.md )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- einstalldocs
-
- if use examples ; then
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r examples
- fi
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/dev-games/tiled/tiled-1.1.4.ebuild b/dev-games/tiled/tiled-1.1.4.ebuild
deleted file mode 100644
index a78bd8eb9206..000000000000
--- a/dev-games/tiled/tiled-1.1.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
-
-DESCRIPTION="A general purpose tile map editor"
-HOMEPAGE="https://www.mapeditor.org/"
-SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-qt/qtcore-5.7:5
- >=dev-qt/qtgui-5.7:5
- >=dev-qt/qtnetwork-5.7:5
- >=dev-qt/qtwidgets-5.7:5
- sys-libs/zlib
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS COPYING NEWS.md README.md )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- einstalldocs
-
- if use examples ; then
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r examples
- fi
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/dev-games/tiled/tiled-1.1.5.ebuild b/dev-games/tiled/tiled-1.1.5.ebuild
deleted file mode 100644
index a78bd8eb9206..000000000000
--- a/dev-games/tiled/tiled-1.1.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils multilib python-single-r1 qmake-utils xdg
-
-DESCRIPTION="A general purpose tile map editor"
-HOMEPAGE="https://www.mapeditor.org/"
-SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- >=dev-qt/qtcore-5.7:5
- >=dev-qt/qtgui-5.7:5
- >=dev-qt/qtnetwork-5.7:5
- >=dev-qt/qtwidgets-5.7:5
- sys-libs/zlib
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS COPYING NEWS.md README.md )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- eqmake5 LIBDIR="/usr/$(get_libdir)" PREFIX="/usr" DISABLE_PYTHON_PLUGIN="$(usex !python)"
-}
-
-src_install() {
- emake INSTALL_ROOT="${D}" install
-
- einstalldocs
-
- if use examples ; then
- docompress -x /usr/share/doc/${PF}/examples
- dodoc -r examples
- fi
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/dev-games/tiled/tiled-1.1.6.ebuild b/dev-games/tiled/tiled-1.1.6.ebuild
index a78bd8eb9206..a0ce9f7613a8 100644
--- a/dev-games/tiled/tiled-1.1.6.ebuild
+++ b/dev-games/tiled/tiled-1.1.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bjorn/tiled/archive/v${PV}/${P}.tar.gz"
LICENSE="BSD BSD-2 GPL-2+"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE="examples python"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 5727092a4d4a..555699802852 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/crystal/crystal-0.26.0.ebuild b/dev-lang/crystal/crystal-0.26.0.ebuild
index 033b3eb6c940..59268e937a68 100644
--- a/dev-lang/crystal/crystal-0.26.0.ebuild
+++ b/dev-lang/crystal/crystal-0.26.0.ebuild
@@ -5,15 +5,15 @@ EAPI=6
inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
-BV=0.25.1
-BV_AMD64=${BV}-1-linux-x86_64
-BV_X86=${BV}-1-linux-i686
+BV=0.25.1-1
+BV_AMD64=${BV}-linux-x86_64
+BV_X86=${BV}-linux-i686
DESCRIPTION="The Crystal Programming Language"
HOMEPAGE="https://crystal-lang.org"
SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
- amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/}/crystal-${BV_AMD64}.tar.gz )
- x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV}/crystal-${BV_X86}.tar.gz )"
+ amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )
+ x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )"
LICENSE="Apache-2.0"
SLOT="0"
diff --git a/dev-lang/crystal/crystal-0.26.1.ebuild b/dev-lang/crystal/crystal-0.26.1.ebuild
index d02b47f0788e..7d0ff4c7b5ba 100644
--- a/dev-lang/crystal/crystal-0.26.1.ebuild
+++ b/dev-lang/crystal/crystal-0.26.1.ebuild
@@ -5,15 +5,15 @@ EAPI=6
inherit bash-completion-r1 llvm multiprocessing toolchain-funcs
-BV=0.26.0
-BV_AMD64=${BV}-1-linux-x86_64
-BV_X86=${BV}-1-linux-i686
+BV=0.26.0-1
+BV_AMD64=${BV}-linux-x86_64
+BV_X86=${BV}-linux-i686
DESCRIPTION="The Crystal Programming Language"
HOMEPAGE="https://crystal-lang.org"
SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz
- amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/}/crystal-${BV_AMD64}.tar.gz )
- x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV}/crystal-${BV_X86}.tar.gz )"
+ amd64? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_AMD64}.tar.gz )
+ x86? ( https://github.com/crystal-lang/crystal/releases/download/${BV/-*}/crystal-${BV_X86}.tar.gz )"
LICENSE="Apache-2.0"
SLOT="0"
@@ -53,6 +53,12 @@ src_prepare() {
}
src_compile() {
+ local bootstrap_path=${WORKDIR}/${PN}-${BV}/bin
+ if [[ ! -d ${bootstrap_path} ]]; then
+ eerror "Binary tarball does not contain expected directory:"
+ die "'${bootstrap_path}' path does not exist."
+ fi
+
emake \
$(usex debug "" release=1) \
progress=true \
@@ -64,7 +70,7 @@ src_compile() {
CXX=$(tc-getCXX) \
AR=$(tc-getAR) \
\
- PATH="${WORKDIR}"/${PN}-${BV}/bin:"${PATH}" \
+ PATH="${bootstrap_path}:${PATH}" \
CRYSTAL_PATH=src \
CRYSTAL_CONFIG_VERSION=${PV} \
CRYSTAL_CONFIG_PATH="lib:${EPREFIX}/usr/$(get_libdir)/crystal"
diff --git a/dev-lang/gprolog/gprolog-1.4.5.ebuild b/dev-lang/gprolog/gprolog-1.4.5.ebuild
index 55a9c9558bba..7e7d7363ac9c 100644
--- a/dev-lang/gprolog/gprolog-1.4.5.ebuild
+++ b/dev-lang/gprolog/gprolog-1.4.5.ebuild
@@ -34,6 +34,11 @@ src_configure() {
append-flags -fno-strict-aliasing
use debug && append-flags -DDEBUG
+ if tc-enables-pie; then
+ # gplc generates its own native ASM; disable PIE
+ append-ldflags -no-pie
+ fi
+
cd "${S}"/src
econf \
CFLAGS_MACHINE="${CFLAGS_MACHINE}" \
diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest
index 88b87cdcf4b0..7b1c97da2191 100644
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@@ -1,4 +1,8 @@
DIST julia-0.6.3-bundled.tar.gz 2099258 BLAKE2B dea1f5d37477e0a612e3901d7d568e8c4b350496f9d2b344cd7e2c2043ae30b4dd26b567803a2cb96d1ec4dbe2ba514fb08b925c695589746691887334330dd2 SHA512 d04cd55ba0dde08f253db3a388cf5ebe87cec8ae321a5af4c1c92f2680aa6e6ef2ebfa771ec74f8f1ff96409e2c0645476acf577859e8718eac4a581f097639d
DIST julia-0.6.3.tar.gz 5542642 BLAKE2B cccd1ee2eb4d9f59382a0d1f6466e77c84b0542456c405c05b718bc8a39ff537a09760a523ee572fc9eee6797158aa00010fc4c931a80deac645fb1e45061c87 SHA512 f529bb30a17989234061cf4c3d87aecc6da720eb494efaca7be4ec1ed5eda60d440896fb76a45b6cb30205030256e7de765e8944f873b31d96f7c9ecac542db8
-DIST julia-1.0.0-bundled.tar.gz 3740215 BLAKE2B 1d230d9f2ba47a1ee3221d1a4c94648bd02a80c30205dd9d438f78261e005ab7ed2173a3c7673489b17ee50050a4cbc0563ce90f16202b8cea65e4c65155cf2c SHA512 be89442366e0ebc789c16485b790368ef8702375bc1c1520d33bda152c8eda988a87f0a389d9b060f51b00ad0c249a95149468ab296811cd7050e110368d256a
+DIST julia-0.7.0.tar.gz 7547849 BLAKE2B 6721e980a5fd84f1a28838a91acdd95e8562dd971903e30776dfb90a6cc0ac1ffbedd22c2bfee45bd2fa616adead82680ebe30f9b86a1d968db2353233b32bc2 SHA512 296dbc71fe5238b0cbdc5c67f7002fbf05abea85dc4298784d74fbfef1c96890ab9cc1bbe874337c01f39ca08a6022f6abcde3a5e2ff1cdc25f2f7493ead1804
DIST julia-1.0.0.tar.gz 7378753 BLAKE2B 1fcf3a63b00b6a49a86ca69b6ee809a28c828287c739405ae180e96645d565de0941b049d319f82f60e1ee63ee89629be213ecb22ab1ea901b306d1e149fa861 SHA512 5a53b16a1ab57cdffa5dadf11e78c413ed9f18af23ae90b64dee8323c2fc9bd6e6918b341f48accbcb7a6eab559811c80d72ac3ac0576c7cf6c9c9057356f6ba
+DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
+DIST julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz 1492695 BLAKE2B ad03512dd1db2c7066b46b5a3a314645b925481d8ace09ac0a0ae23cf5b8a64338ad457f8df229aa82f1d45605b5366883f563f2e22756ce28bb6fb7607d7124 SHA512 1305035b1372bdf234e3c5e673ee4c8ab5bda83ff06bc27704786def52667c3143fe587fca8f6e0855ba0c8b6d4dd90b2faefd33736224173f459d751885683e
+DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
+DIST julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz 156361 BLAKE2B e5e1485b758e959ed78f7fde8b211376da2365e5835708042de57c091b10b59755e1203a9f88c0d761687bf3d166207410de6ec203d80fef4dbdf06a50404cd1 SHA512 1c80dc6e71fdad187b142d02e561dfe1880857baaec08d36240ecb2f275d1bc5467aace84eebe5a10fd3f4c40b0035e65a5db3ec2a9ee6940920b0aad6221c55
diff --git a/dev-lang/julia/files/julia-0.7.0-fix_build_system.patch b/dev-lang/julia/files/julia-0.7.0-fix_build_system.patch
new file mode 100644
index 000000000000..028a2f7e08cc
--- /dev/null
+++ b/dev-lang/julia/files/julia-0.7.0-fix_build_system.patch
@@ -0,0 +1,86 @@
+diff --git a/Make.inc b/Make.inc
+index 8cb2c1014..d3be9de8e 100644
+--- a/Make.inc
++++ b/Make.inc
+@@ -178,7 +178,7 @@ USE_GPL_LIBS ?= 1
+ # Directories where said libraries get installed to
+ prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT)
+ bindir := $(prefix)/bin
+-libdir := $(prefix)/lib
++libdir := $(prefix)/GENTOOLIBDIR
+ libexecdir := $(prefix)/libexec
+ datarootdir := $(prefix)/share
+ docdir := $(datarootdir)/doc/julia
+@@ -410,7 +410,7 @@ ifneq ($(OS), WINNT)
+ JCXXFLAGS += -pedantic
+ endif
+ DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS := -O3 -ggdb2 -falign-functions
++SHIPFLAGS := GENTOOCFLAGS
+ endif
+
+ ifeq ($(USECLANG),1)
+@@ -421,7 +421,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+ JCPPFLAGS := -fasynchronous-unwind-tables
+ JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
+ DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS := -O3 -g
++SHIPFLAGS := GENTOOCFLAGS
+ ifeq ($(OS), Darwin)
+ ifeq ($(USE_LIBCPP), 1)
+ MACOSX_VERSION_MIN := 10.8
+@@ -450,7 +450,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+ JCPPFLAGS :=
+ JCXXFLAGS := -pipe $(fPIC) -fno-rtti
+ DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
+-SHIPFLAGS := -O3 -g -falign-functions
++SHIPFLAGS := GENTOOCFLAGS
+ endif
+
+ ifeq ($(USECCACHE), 1)
+diff --git a/doc/Makefile b/doc/Makefile
+index 89b79880d..c3125fde1 100644
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -29,7 +29,7 @@ deps: UnicodeData.txt
+ $(JLCHECKSUM) UnicodeData.txt
+
+ clean:
+- -rm -rf _build/* deps/* docbuild.log UnicodeData.txt
++ @echo "Do not clean doc/_build/html. Just use it..."
+
+ cleanall: clean
+
+diff --git a/src/Makefile b/src/Makefile
+index 257152d24..240a4a350 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -85,16 +85,7 @@ UV_HEADERS += uv/*.h
+ endif
+ PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS))
+
+-ifeq ($(JULIACODEGEN),LLVM)
+-# In LLVM < 3.4, --ldflags includes both options and libraries, so use it both before and after --libs
+-# In LLVM >= 3.4, --ldflags has only options, and --system-libs has the libraries.
+-ifneq ($(USE_LLVM_SHLIB),1)
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --libs $(LLVM_LIBS)) $(shell $(LLVM_CONFIG_HOST) --ldflags) $(shell $(LLVM_CONFIG_HOST) --system-libs 2> /dev/null)
+-else
+-LLVMLINK += $(shell $(LLVM_CONFIG_HOST) --ldflags) -lLLVM
+-FLAGS += -DLLVM_SHLIB
+-endif # USE_LLVM_SHLIB == 1
+-endif
++LLVMLINK = $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(call exec,$(LLVM_CONFIG) --system-libs)
+
+ COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
+ DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
+
+--- a/base/Makefile 2018-08-10 23:56:13.825429621 -0400
++++ b/base/Makefile 2018-08-10 23:43:29.461769645 -0400
+@@ -207,7 +207,6 @@
+ ln -sf "$$REALPATH" "$@"
+ ifneq ($(USE_SYSTEM_LLVM),0)
+ ifneq ($(USE_LLVM_SHLIB),0)
+-SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
+ endif
+ endif
+
diff --git a/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch b/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch
index 1ed19d6e06e8..028a2f7e08cc 100644
--- a/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch
+++ b/dev-lang/julia/files/julia-1.0.0-fix_build_system.patch
@@ -1,8 +1,8 @@
diff --git a/Make.inc b/Make.inc
-index 8e0df61..5747a1c 100644
+index 8cb2c1014..d3be9de8e 100644
--- a/Make.inc
+++ b/Make.inc
-@@ -181,7 +181,7 @@ USE_GPL_LIBS ?= 1
+@@ -178,7 +178,7 @@ USE_GPL_LIBS ?= 1
# Directories where said libraries get installed to
prefix ?= $(BUILDROOT)/julia-$(JULIA_COMMIT)
bindir := $(prefix)/bin
@@ -11,7 +11,7 @@ index 8e0df61..5747a1c 100644
libexecdir := $(prefix)/libexec
datarootdir := $(prefix)/share
docdir := $(datarootdir)/doc/julia
-@@ -413,7 +413,7 @@ ifneq ($(OS), WINNT)
+@@ -410,7 +410,7 @@ ifneq ($(OS), WINNT)
JCXXFLAGS += -pedantic
endif
DEBUGFLAGS := -O0 -ggdb2 -DJL_DEBUG_BUILD -fstack-protector-all
@@ -20,7 +20,7 @@ index 8e0df61..5747a1c 100644
endif
ifeq ($(USECLANG),1)
-@@ -424,7 +424,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+@@ -421,7 +421,7 @@ JCFLAGS := -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
JCPPFLAGS := -fasynchronous-unwind-tables
JCXXFLAGS := -pipe $(fPIC) -fno-rtti -pedantic
DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
@@ -29,7 +29,7 @@ index 8e0df61..5747a1c 100644
ifeq ($(OS), Darwin)
ifeq ($(USE_LIBCPP), 1)
MACOSX_VERSION_MIN := 10.8
-@@ -453,7 +453,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
+@@ -450,7 +450,7 @@ JCFLAGS := -std=gnu11 -pipe $(fPIC) -fno-strict-aliasing -D_FILE_OFFSET_BITS=64
JCPPFLAGS :=
JCXXFLAGS := -pipe $(fPIC) -fno-rtti
DEBUGFLAGS := -O0 -g -DJL_DEBUG_BUILD -fstack-protector-all
@@ -39,7 +39,7 @@ index 8e0df61..5747a1c 100644
ifeq ($(USECCACHE), 1)
diff --git a/doc/Makefile b/doc/Makefile
-index 89b7988..c3125fd 100644
+index 89b79880d..c3125fde1 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -29,7 +29,7 @@ deps: UnicodeData.txt
@@ -52,10 +52,10 @@ index 89b7988..c3125fd 100644
cleanall: clean
diff --git a/src/Makefile b/src/Makefile
-index 20da34d..84eae21 100644
+index 257152d24..240a4a350 100644
--- a/src/Makefile
+++ b/src/Makefile
-@@ -88,16 +88,7 @@ UV_HEADERS += uv/*.h
+@@ -85,16 +85,7 @@ UV_HEADERS += uv/*.h
endif
PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLIC_HEADERS)) $(UV_HEADERS))
@@ -73,3 +73,14 @@ index 20da34d..84eae21 100644
COMMON_LIBS := -L$(build_shlibdir) -L$(build_libdir) $(LIBUV) $(LIBUTF8PROC) $(NO_WHOLE_ARCHIVE) $(LLVMLINK) $(OSLIBS)
DEBUG_LIBS := $(WHOLE_ARCHIVE) $(BUILDDIR)/flisp/libflisp-debug.a $(WHOLE_ARCHIVE) $(BUILDDIR)/support/libsupport-debug.a $(COMMON_LIBS)
+
+--- a/base/Makefile 2018-08-10 23:56:13.825429621 -0400
++++ b/base/Makefile 2018-08-10 23:43:29.461769645 -0400
+@@ -207,7 +207,6 @@
+ ln -sf "$$REALPATH" "$@"
+ ifneq ($(USE_SYSTEM_LLVM),0)
+ ifneq ($(USE_LLVM_SHLIB),0)
+-SYMLINK_SYSTEM_LIBRARIES += symlink_libLLVM
+ endif
+ endif
+
diff --git a/dev-lang/julia/julia-0.7.0.ebuild b/dev-lang/julia/julia-0.7.0.ebuild
new file mode 100644
index 000000000000..f7b451ce750c
--- /dev/null
+++ b/dev-lang/julia/julia-0.7.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+RESTRICT="test"
+
+inherit llvm pax-utils toolchain-funcs
+
+MY_LIBUV_V="ed3700c849289ed01fe04273a7bf865340b2bd7e"
+MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6"
+MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
+MY_DSFMT_V="2.2.3"
+
+DESCRIPTION="High-performance programming language for technical computing"
+HOMEPAGE="https://julialang.org/"
+SRC_URI="
+ https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
+ https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
+ https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
+ https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
+ http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
+"
+
+S="${WORKDIR}/${PN}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# julia 0.7* needs a patched llvm-6
+RDEPEND="
+ =sys-devel/llvm-6*:=
+ =sys-devel/clang-6*:="
+LLVM_MAX_SLOT=6
+
+RDEPEND+="
+ dev-libs/double-conversion:0=
+ dev-libs/gmp:0=
+ dev-libs/libgit2:0=
+ >=dev-libs/libpcre2-10.23:0=[jit]
+ dev-libs/mpfr:0=
+ dev-libs/openspecfun
+ sci-libs/amd:0=
+ sci-libs/arpack:0=
+ sci-libs/camd:0=
+ sci-libs/ccolamd:0=
+ sci-libs/cholmod:0=
+ sci-libs/colamd:0=
+ sci-libs/fftw:3.0=[threads]
+ sci-libs/openlibm:0=
+ sci-libs/spqr:0=
+ sci-libs/umfpack:0=
+ sci-mathematics/glpk:0=
+ >=sys-libs/libunwind-1.1:7=
+ sys-libs/readline:0=
+ sys-libs/zlib:0=
+ >=virtual/blas-3.6
+ virtual/lapack"
+
+DEPEND="${RDEPEND}
+ dev-vcs/git
+ dev-util/patchelf
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.0.0-fix_build_system.patch
+)
+
+src_unpack() {
+ tounpack=(${A})
+ # the main source tree, followed by deps
+ unpack "${A/%\ */}"
+
+ mkdir -p "${S}/deps/srccache/"
+ for i in "${tounpack[@]:1}"; do
+ cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+ done
+}
+
+src_prepare() {
+ default
+
+ # Sledgehammer:
+ # - prevent fetching of bundled stuff in compile and install phase
+ # - respect CFLAGS
+ # - respect EPREFIX and Gentoo specific paths
+ # - fix BLAS and LAPACK link interface
+
+ sed -i \
+ -e 's|git submodule|${EPREFIX}/bin/true|g' \
+ -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+ -e "s|/usr/include|${EPREFIX%/}/usr/include|g" \
+ deps/Makefile || die
+
+ local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
+ libblas="${libblas%% *}"
+ libblas="lib${libblas#-l}"
+ local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
+ liblapack="${liblapack%% *}"
+ liblapack="lib${liblapack#-l}"
+
+ sed -i \
+ -e "s|GENTOOCFLAGS|${CFLAGS}|g" \
+ -e "s|GENTOOLIBDIR|$(get_libdir)|" \
+ -e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
+ -e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
+ -e "s|= libblas|= ${libblas}|" \
+ -e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
+ -e "s|= liblapack|= ${liblapack}|" \
+ Make.inc || die
+
+ sed -i \
+ -e "s|,lib)|,$(get_libdir))|g" \
+ -e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
+ Makefile || die
+
+ sed -i \
+ -e "s|ar -rcs|$(tc-getAR) -rcs|g" \
+ src/Makefile || die
+
+ # disable doc install starting git fetching
+ sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
+}
+
+src_configure() {
+ # julia does not play well with the system versions of dsfmt, libuv,
+ # and utf8proc
+
+ # USE_SYSTEM_LIBM=0 implies using external openlibm
+ cat <<-EOF > Make.user
+ USE_SYSTEM_ARPACK:=1
+ USE_SYSTEM_BLAS:=1
+ USE_SYSTEM_DSFMT:=0
+ USE_SYSTEM_GMP:=1
+ USE_SYSTEM_GRISU:=1
+ USE_SYSTEM_LAPACK:=1
+ USE_SYSTEM_LIBGIT2:=1
+ USE_SYSTEM_LIBM:=0
+ USE_SYSTEM_LIBUNWIND:=1
+ USE_SYSTEM_LIBUV:=0
+ USE_SYSTEM_LLVM:=1
+ USE_LLVM_SHLIB:=1
+ USE_SYSTEM_MPFR:=1
+ USE_SYSTEM_OPENLIBM:=1
+ USE_SYSTEM_OPENSPECFUN:=1
+ USE_SYSTEM_PATCHELF:=1
+ USE_SYSTEM_PCRE:=1
+ USE_SYSTEM_READLINE:=1
+ USE_SYSTEM_RMATH:=0
+ USE_SYSTEM_SUITESPARSE:=1
+ USE_SYSTEM_UTF8PROC:=0
+ USE_SYSTEM_ZLIB=1
+ VERBOSE=1
+ libdir="${EROOT}/usr/$(get_libdir)"
+ EOF
+
+}
+
+src_compile() {
+
+ # Julia accesses /proc/self/mem on Linux
+ addpredict /proc/self/mem
+
+ emake cleanall
+ emake julia-release \
+ prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
+ emake
+}
+
+src_test() {
+ emake test
+}
+
+src_install() {
+ # Julia is special. It tries to find a valid git repository (that would
+ # normally be cloned during compilation/installation). Just make it
+ # happy...
+ git init && \
+ git config --local user.email "whatyoudoing@example.com" && \
+ git config --local user.name "Whyyyyyy" && \
+ git commit -a --allow-empty -m "initial" || die "git failed"
+
+ emake install \
+ prefix="${EPREFIX}/usr" DESTDIR="${D}" \
+ CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+ cat > 99julia <<-EOF
+ LDPATH=${EROOT%/}/usr/$(get_libdir)/julia
+ EOF
+ doenvd 99julia
+
+ dodoc README.md
+
+ mv "${ED}"/usr/etc/julia "${ED}"/etc || die
+ rmdir "${ED}"/usr/etc || die
+ mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
+ rmdir "${ED}"/usr/share/doc/julia || die
+}
diff --git a/dev-lang/julia/julia-1.0.0.ebuild b/dev-lang/julia/julia-1.0.0.ebuild
index 7d03d2d0b874..f7b451ce750c 100644
--- a/dev-lang/julia/julia-1.0.0.ebuild
+++ b/dev-lang/julia/julia-1.0.0.ebuild
@@ -7,24 +7,33 @@ RESTRICT="test"
inherit llvm pax-utils toolchain-funcs
+MY_LIBUV_V="ed3700c849289ed01fe04273a7bf865340b2bd7e"
+MY_UTF8PROC_V="97ef668b312b96382714dbb8eaac4affce0816e6"
+MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
+MY_DSFMT_V="2.2.3"
+
DESCRIPTION="High-performance programming language for technical computing"
HOMEPAGE="https://julialang.org/"
SRC_URI="
https://github.com/JuliaLang/${PN}/releases/download/v${PV}/${P}.tar.gz
- https://dev.gentoo.org/~tamiko/distfiles/${P}-bundled.tar.gz
+ https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
+ https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
+ https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
+ http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
"
-S="${WORKDIR}/julia"
+S="${WORKDIR}/${PN}"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
+# julia 0.7* needs a patched llvm-6
RDEPEND="
- >=sys-devel/llvm-4.0.0:=
- >=sys-devel/clang-4.0.0:="
-LLVM_MAX_SLOT=5
+ =sys-devel/llvm-6*:=
+ =sys-devel/clang-6*:="
+LLVM_MAX_SLOT=6
RDEPEND+="
dev-libs/double-conversion:0=
@@ -59,12 +68,18 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.0.0-fix_build_system.patch
)
-src_prepare() {
- mv "${WORKDIR}"/bundled/UnicodeData.txt doc || die
- mkdir deps/srccache || die
- mv "${WORKDIR}"/bundled/* deps/srccache || die
- rmdir "${WORKDIR}"/bundled || die
+src_unpack() {
+ tounpack=(${A})
+ # the main source tree, followed by deps
+ unpack "${A/%\ */}"
+
+ mkdir -p "${S}/deps/srccache/"
+ for i in "${tounpack[@]:1}"; do
+ cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
+ done
+}
+src_prepare() {
default
# Sledgehammer:
@@ -115,28 +130,27 @@ src_configure() {
# USE_SYSTEM_LIBM=0 implies using external openlibm
cat <<-EOF > Make.user
- USE_SYSTEM_DSFMT=0
- USE_SYSTEM_LIBUV=0
- USE_SYSTEM_PCRE=1
- USE_SYSTEM_RMATH=0
- USE_SYSTEM_UTF8PROC=0
- USE_LLVM_SHLIB=0
- USE_SYSTEM_ARPACK=1
- USE_SYSTEM_BLAS=1
- USE_SYSTEM_FFTW=1
- USE_SYSTEM_GMP=1
- USE_SYSTEM_GRISU=1
- USE_SYSTEM_LAPACK=1
- USE_SYSTEM_LIBGIT2=1
- USE_SYSTEM_LIBM=0
- USE_SYSTEM_LIBUNWIND=1
- USE_SYSTEM_LLVM=1
- USE_SYSTEM_MPFR=1
- USE_SYSTEM_OPENLIBM=1
- USE_SYSTEM_OPENSPECFUN=1
- USE_SYSTEM_PATCHELF=1
- USE_SYSTEM_READLINE=1
- USE_SYSTEM_SUITESPARSE=1
+ USE_SYSTEM_ARPACK:=1
+ USE_SYSTEM_BLAS:=1
+ USE_SYSTEM_DSFMT:=0
+ USE_SYSTEM_GMP:=1
+ USE_SYSTEM_GRISU:=1
+ USE_SYSTEM_LAPACK:=1
+ USE_SYSTEM_LIBGIT2:=1
+ USE_SYSTEM_LIBM:=0
+ USE_SYSTEM_LIBUNWIND:=1
+ USE_SYSTEM_LIBUV:=0
+ USE_SYSTEM_LLVM:=1
+ USE_LLVM_SHLIB:=1
+ USE_SYSTEM_MPFR:=1
+ USE_SYSTEM_OPENLIBM:=1
+ USE_SYSTEM_OPENSPECFUN:=1
+ USE_SYSTEM_PATCHELF:=1
+ USE_SYSTEM_PCRE:=1
+ USE_SYSTEM_READLINE:=1
+ USE_SYSTEM_RMATH:=0
+ USE_SYSTEM_SUITESPARSE:=1
+ USE_SYSTEM_UTF8PROC:=0
USE_SYSTEM_ZLIB=1
VERBOSE=1
libdir="${EROOT}/usr/$(get_libdir)"
@@ -150,20 +164,7 @@ src_compile() {
addpredict /proc/self/mem
emake cleanall
-
- # Create symlinks...
- local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
- libblas="${libblas%% *}"
- libblas="lib${libblas#-l}"
- local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
- liblapack="${liblapack%% *}"
- liblapack="lib${liblapack#-l}"
- mkdir -p "${S}"/usr/lib/julia || die "mkdir failed"
- for i in ${libblas}.so ${liblapack}.so libumfpack.so libspqr.so; do
- ln -s "${EROOT}/usr/$(get_libdir)/${i}" "${S}"/usr/lib/julia/ || die "ln failed"
- done
-
- emake VERBOSE=1 julia-release \
+ emake julia-release \
prefix="${EPREFIX}/usr" DESTDIR="${D}" \
CC="$(tc-getCC)" CXX="$(tc-getCXX)"
pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
@@ -195,7 +196,6 @@ src_install() {
mv "${ED}"/usr/etc/julia "${ED}"/etc || die
rmdir "${ED}"/usr/etc || die
- mv "${ED}"/usr/share/doc/julia/{examples,html} \
- "${ED}"/usr/share/doc/${PF} || die
+ mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
rmdir "${ED}"/usr/share/doc/julia || die
}
diff --git a/dev-lang/julia/julia-9999.ebuild b/dev-lang/julia/julia-9999.ebuild
index c8aa3e8ec868..5a1d916e2063 100644
--- a/dev-lang/julia/julia-9999.ebuild
+++ b/dev-lang/julia/julia-9999.ebuild
@@ -18,8 +18,8 @@ KEYWORDS=""
IUSE=""
RDEPEND="
- >=sys-devel/llvm-4.0.0:=
- >=sys-devel/clang-4.0.0:="
+ >=sys-devel/llvm-6.0.0:=
+ >=sys-devel/clang-6.0.0:="
RDEPEND+="
dev-libs/double-conversion:0=
@@ -99,28 +99,27 @@ src_configure() {
# USE_SYSTEM_LIBM=0 implies using external openlibm
cat <<-EOF > Make.user
- USE_SYSTEM_DSFMT=0
- USE_SYSTEM_LIBUV=0
- USE_SYSTEM_PCRE=1
- USE_SYSTEM_RMATH=0
- USE_SYSTEM_UTF8PROC=0
- USE_LLVM_SHLIB=0
- USE_SYSTEM_ARPACK=1
- USE_SYSTEM_BLAS=1
- USE_SYSTEM_FFTW=1
- USE_SYSTEM_GMP=1
- USE_SYSTEM_GRISU=1
- USE_SYSTEM_LAPACK=1
- USE_SYSTEM_LIBGIT2=1
- USE_SYSTEM_LIBM=0
- USE_SYSTEM_LIBUNWIND=1
- USE_SYSTEM_LLVM=1
- USE_SYSTEM_MPFR=1
- USE_SYSTEM_OPENLIBM=1
- USE_SYSTEM_OPENSPECFUN=1
- USE_SYSTEM_PATCHELF=1
- USE_SYSTEM_READLINE=1
- USE_SYSTEM_SUITESPARSE=1
+ USE_SYSTEM_ARPACK:=1
+ USE_SYSTEM_BLAS:=1
+ USE_SYSTEM_DSFMT:=0
+ USE_SYSTEM_GMP:=1
+ USE_SYSTEM_GRISU:=1
+ USE_SYSTEM_LAPACK:=1
+ USE_SYSTEM_LIBGIT2:=1
+ USE_SYSTEM_LIBM:=0
+ USE_SYSTEM_LIBUNWIND:=1
+ USE_SYSTEM_LIBUV:=0
+ USE_SYSTEM_LLVM:=1
+ USE_LLVM_SHLIB:=1
+ USE_SYSTEM_MPFR:=1
+ USE_SYSTEM_OPENLIBM:=1
+ USE_SYSTEM_OPENSPECFUN:=1
+ USE_SYSTEM_PATCHELF:=1
+ USE_SYSTEM_PCRE:=1
+ USE_SYSTEM_READLINE:=1
+ USE_SYSTEM_RMATH:=0
+ USE_SYSTEM_SUITESPARSE:=1
+ USE_SYSTEM_UTF8PROC:=0
USE_SYSTEM_ZLIB=1
VERBOSE=1
libdir="${EROOT}/usr/$(get_libdir)"
diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest
index ccc794915f59..1934cb344925 100644
--- a/dev-lang/mercury-extras/Manifest
+++ b/dev-lang/mercury-extras/Manifest
@@ -1,6 +1,6 @@
DIST mercury-extras-13.05.2-gentoo-patchset-3.tar.gz 3538 BLAKE2B b323347ce98ecbc412cbd8683f8236b38b048e331c2b41d74874acdf17cc8b132211c15a2d29f8b98b7238e0e4e7cc1492b8e0a5ade4d348eb679fd322a22b2d SHA512 c151f876768c6b6ab7b46b4e2501569586249f5e185e534ebb5817206ac0844cd081ccae86a26ef85f27eab9d851017393c837728bd194520a549a0a60f738ef
DIST mercury-extras-14.01-gentoo-patchset-1.tar.gz 3856 BLAKE2B 8a0792150a30ee552d1877e8736e25b0554ac68aaa7074e296886ea445c31a4b1593a438220da7bca45f49b2e49b0e4848f1e4ab852502bd3865632d378439c8 SHA512 c584efd4c7af54d2e8d5af0a63acced118f356527a2bf692262e37366e1018247aac8c1bb8f700f08f8f0a2c95d979e215e3c949ec1dc2994ab40048eb5b253c
-DIST mercury-extras-14.01.1-gentoo-patchset-0.tar.gz 3688 BLAKE2B aa78c8390e783a3d6ac9fe47508c4f86918a98c0d27204e7a19cb0bdc6572e34f76167f428f777af9a42b9cb744d93023abd00a6b097724f8438e6622541765d SHA512 02781ca23e72920c932067f7270d06e45909728133588c181b94f7b7580f841b4b0f1dd523e0c100350b191e5b28a7d1f10ad51fdffe2dcb02ff78cd5a906e3b
+DIST mercury-extras-14.01.1-gentoo-patchset-1.tar.gz 3847 BLAKE2B ce30b98c5cfe96ad67bd6fa5a8d03ebdfe6f4539e39a970ce48eb794b663d7164ae38a619beb4ce85d6cc3a1e3b5a5ee8fa59b6acd00dc6d23670fceac87734e SHA512 2afad01fb778d0e84e8d83a507b37080974840c81408827559df455d8082552131cdbfdae59c77f2f7bc3a643a087f1563c6c67d527f7b0bdef3412385bf4818
DIST mercury-srcdist-13.05.2.tar.gz 53847394 BLAKE2B 23d2f8de6e9a4a2803fca9f3dec73215f6636389fdf388ef950042eff2ee43671577120f8324b309786d463e30ba9360d2df07ee498d78800182096f8773697e SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08
DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c
DIST mercury-srcdist-14.01.tar.gz 52683989 BLAKE2B 32fa014f08ad6a7a4ca62dd08a460620f0c60d311021f3643a81868acdd1eb58150caca81b18612f760125c339a25ed908862e17e38b65dd56bde8c8bd0bffb0 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f
diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
index 9d5d603fcfef..55f9783589c1 100644
--- a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
+++ b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
inherit eutils multilib
-PATCHSET_VER="0"
+PATCHSET_VER="1"
MY_P=mercury-srcdist-${PV}
DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3b110c0b774e..628b79fd8ecd 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index a423681b571b..c08c9560ae5a 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,6 +1,6 @@
DIST nss-3.29.5.tar.gz 7480246 BLAKE2B 9ab16cbbd95aa31358b5b686bee64cd81c8343524dad8aac084f7c86883f1eaead78912dc1021b0461d027b0085356c4b7156f1d80010c3a0ece29d542deef50 SHA512 ce18bc7e793d2b3698db412b2e5fcabbfd9862eca3def120d5e44bc67276526bff6b33ffa84b8128f8af6d35101000e6f7bb24194f63a55461b3c245fac11faa
-DIST nss-3.36.1.tar.gz 23026430 BLAKE2B 76eaf5b24f8954a4e14cf556912250a3ddb7b333054a2ea4ee3d218493a8f12c77a37455aae354ef6ddd9bd55c33a269dad515806d70ef38727fa8a382d47fd4 SHA512 096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65
DIST nss-3.37.3.tar.gz 23034239 BLAKE2B 3e30b0fe14501ca0e6b9d14322af73f191164989e6857b9ba46572b7363cdc65c88b672285982f2764ed44fcaf615cb249eea2f45b98050dfc6675003dc74a3b SHA512 11b21818f9fcff11d0e7f4c066ae9fbce0052a30a6b30df9a20022792039b5348554834a472e1b1195e467b9902067f9719678d5ca32efb4e60f1df161feed6f
DIST nss-3.38.tar.gz 23023474 BLAKE2B 72500827955a25c53124ca6054850beef91868019ba155b70f8268fe79261b71e4f11ab42382241c2855478be7e6def57378cda5f398bf5e25f7fa5c035d630e SHA512 06804163daa08f1f65cfe0e9546ddf066ec7f773aa615431a5952f6c04956dd62425fec38d11037ff7fb02b709de03e5a7637c6ba13de5b7686db4f9ecda52ab
+DIST nss-3.39.tar.gz 23048561 BLAKE2B 74214b6ed23a44a0b6e0d52b9a327f908668079413ee637d172e4f0c7769f252a6c6ecca33215c1865606eaebe4630f31b435f2d40cf1a24ab373874508531b9 SHA512 16358c2d8660ca301410b1d39b2eae64fe2ebbbfab797872410e5fcc67f802ef48f4e362edeecb0591626c77013537019094a6a5dfc8d24487b6b6e54564da8f
DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
diff --git a/dev-libs/nss/nss-3.36.1.ebuild b/dev-libs/nss/nss-3.39.ebuild
similarity index 99%
rename from dev-libs/nss/nss-3.36.1.ebuild
rename to dev-libs/nss/nss-3.39.ebuild
index 3a343d29931e..dce724d6b8d8 100644
--- a/dev-libs/nss/nss-3.36.1.ebuild
+++ b/dev-libs/nss/nss-3.39.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
diff --git a/dev-libs/openssl/openssl-1.0.2p.ebuild b/dev-libs/openssl/openssl-1.0.2p.ebuild
index 74788708e982..ddc45aa8700b 100644
--- a/dev-libs/openssl/openssl-1.0.2p.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2p.ebuild
@@ -106,7 +106,7 @@ src_prepare() {
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-e $(has noman FEATURES \
&& echo '/^install:/s:install_docs::' \
- || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+ || echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
Makefile.org \
|| die
# show the actual commands in the log
@@ -131,7 +131,7 @@ src_prepare() {
append-flags $(test-flags-CC -Wa,--noexecstack)
append-cppflags -DOPENSSL_NO_BUF_FREELISTS
- sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906
+ sed -i '1s,^:$,#!'${EPREFIX%/}'/usr/bin/perl,' Configure #141906
# The config script does stupid stuff to prompt the user. Kill it.
sed -i '/stty -icanon min 0 time 50; read waste/d' config || die
./config --test-sanity || die "I AM NOT SANE"
@@ -203,8 +203,8 @@ multilib_src_configure() {
$(use_ssl sslv3 ssl3) \
$(use_ssl tls-heartbeat heartbeats) \
$(use_ssl zlib) \
- --prefix="${EPREFIX}"/usr \
- --openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+ --prefix="${EPREFIX%/}"/usr \
+ --openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
--libdir=$(get_libdir) \
shared threads \
|| die
@@ -239,13 +239,19 @@ multilib_src_test() {
}
multilib_src_install() {
- emake INSTALL_PREFIX="${D}" install
+ # We need to create $D/usr on our own to avoid a race condition #665130
+ if [[ ! -d "${D%/}/usr" ]]; then
+ # We can only create this directory once
+ mkdir "${D%/}"/usr || die
+ fi
+
+ emake INSTALL_PREFIX="${D%/}" install
}
multilib_src_install_all() {
# openssl installs perl version of c_rehash by default, but
# we provide a shell version via app-misc/c_rehash
- rm "${ED}"/usr/bin/c_rehash || die
+ rm "${ED%/}"/usr/bin/c_rehash || die
local -a DOCS=( CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el )
einstalldocs
diff --git a/dev-libs/openssl/openssl-1.1.1_pre9.ebuild b/dev-libs/openssl/openssl-1.1.1_pre9.ebuild
index e16b92f76ff6..e694ab91d167 100644
--- a/dev-libs/openssl/openssl-1.1.1_pre9.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1_pre9.ebuild
@@ -58,7 +58,7 @@ src_prepare() {
-e '/^MAKEDEPPROG/s:=.*:=$(CC):' \
-e $(has noman FEATURES \
&& echo '/^install:/s:install_docs::' \
- || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \
+ || echo '/^MANDIR=/s:=.*:='${EPREFIX%/}'/usr/share/man:') \
-e "/^DOCDIR/s@\$(BASENAME)@&-${PF}@" \
Configurations/unix-Makefile.tmpl \
|| die
@@ -78,7 +78,7 @@ src_prepare() {
# Prefixify Configure shebang (#141906)
sed \
- -e "1s,/usr/bin/env,${EPREFIX}&," \
+ -e "1s,/usr/bin/env,${EPREFIX%/}&," \
-i Configure || die
# Remove test target when FEATURES=test isn't set
if ! use test ; then
@@ -150,8 +150,8 @@ multilib_src_configure() {
$(use_ssl sctp) \
$(use_ssl tls-heartbeat heartbeats) \
$(use_ssl zlib) \
- --prefix="${EPREFIX}"/usr \
- --openssldir="${EPREFIX}"${SSL_CNF_DIR} \
+ --prefix="${EPREFIX%/}"/usr \
+ --openssldir="${EPREFIX%/}"${SSL_CNF_DIR} \
--libdir=$(get_libdir) \
shared threads \
|| die
@@ -185,7 +185,13 @@ multilib_src_test() {
}
multilib_src_install() {
- emake DESTDIR="${D}" install
+ # We need to create $D/usr on our own to avoid a race condition #665130
+ if [[ ! -d "${D%/}/usr" ]]; then
+ # We can only create this directory once
+ mkdir "${D%/}"/usr || die
+ fi
+
+ emake DESTDIR="${D%}" install
}
multilib_src_install_all() {
diff --git a/dev-libs/tinyxml2/tinyxml2-3.0.0.ebuild b/dev-libs/tinyxml2/tinyxml2-3.0.0.ebuild
index 8477f44d99d3..6d692c8193b7 100644
--- a/dev-libs/tinyxml2/tinyxml2-3.0.0.ebuild
+++ b/dev-libs/tinyxml2/tinyxml2-3.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/leethomason/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="ZLIB"
SLOT="0/3"
-KEYWORDS="amd64 ~arm ~hppa ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa sparc ~x86"
IUSE="static-libs test"
src_configure() {
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 5e972a8666e9..98fe781fd6cf 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/adodb/Manifest b/dev-php/adodb/Manifest
index 7ac84d8d56fe..022744eec1a6 100644
--- a/dev-php/adodb/Manifest
+++ b/dev-php/adodb/Manifest
@@ -1,2 +1,3 @@
DIST adodb-5.20.12.tar.gz 464962 BLAKE2B 51b1bec4c9bda427988848cd0ff810058e159c75946ea4d14d1ab639545f0c95a8a1a2b8193c8c0403e37fc2e3b858f97b255b9b615b65786d1593269e9da731 SHA512 ac8f36dba459bac15f16ecfd1ece69edc922e67b6aec3641a0c8ffc50c6b1c437ecce2e5652c31f2e472f7abefb3ac5a8a2bef188959007442799784ab764c1e
+DIST adodb-5.20.13.tar.gz 465568 BLAKE2B 7acfe36586fcf0e0291ce9dd6446c6f0922b9c7144b86d8eb0d78db98247fc9ac6aa9b1623822628096c2be0e0e9c554e9c3acbc05d9ddcda1b5c598b8b3652b SHA512 0824de6abf73a8e3fbdde30ca1455264a49e3b711e81c8232bd82c082c0d3f255aea35a167685cd01e80216622db1167c17a518d57b1ed260eaa498cab0b9fca
DIST adodb-5.20.9.tar.gz 464257 BLAKE2B 38a37e4a5b1ac86b37cbd164c79e2112c78fb22530a225d2cac4f916703d4c2bd300a47a214344d8ae9e5c94467ec34cab96ab36a10ad8dad581ec74c73ae111 SHA512 bc40113012c27b759ff35e7395404d1756720e9daef7df4d33147b9950e9ffd032274ccd8808fe303ba75feeaf727e2deb50fc6d79826db96ce568a70007f30f
diff --git a/dev-php/adodb/adodb-5.20.13.ebuild b/dev-php/adodb/adodb-5.20.13.ebuild
new file mode 100644
index 000000000000..f6b55b30633b
--- /dev/null
+++ b/dev-php/adodb/adodb-5.20.13.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="ADOdb"
+DESCRIPTION="Database abstraction layer for PHP"
+HOMEPAGE="https://github.com/ADOdb"
+SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# If you want to be picky, we should require that PHP be built with at
+# least one database driver enabled; otherwise adodb isn't going to be
+# able to do anything. But, the database USE flags for dev-lang/php are
+# a mess. What we would *like* to do is have a set of USE flags for
+# adodb that then propagate to PHP itself... for example, adodb[mysql]
+# could require php[mysql]. To do that would require that we duplicate
+# the database USE flag mess for adodb -- not desirable. Instead we punt
+# and let the user install adodb unconditionally. If he doesn't have
+# database support in PHP, it just won't work.
+RDEPEND="dev-lang/php:*"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+ DOCS="README.md docs/changelog*.md xmlschema*.dtd session/*.sql"
+ DOCS+=" session/*.txt session/*.xml pear/auth_adodb_example.php"
+ DOCS+=" pear/readme.Auth.txt"
+
+ dodoc $DOCS
+ rm -f $DOCS || die "failed to remove docs before installation"
+
+ insinto "/usr/share/php/${PN}"
+ doins *.php
+ doins -r contrib datadict drivers lang pear perf replicate session xsl
+}
diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest
index 1710f791c87d..5f2fe9c9c054 100644
--- a/dev-php/pecl-event/Manifest
+++ b/dev-php/pecl-event/Manifest
@@ -1,3 +1,4 @@
DIST event-2.2.1.tgz 133147 BLAKE2B 909892c937843821b34cb4d450b06698b23ed8aac59915ef96c72ba08e4afe84856e913527e9b0197d28ebbe5cac8ac45174d8e3fbeae33eae0619e3b3e21959 SHA512 a331e0cbb923b2efe95a366c842929e9ffcdf15d4b95dce83f5d1e9bb33045477f278672835ffc087df89aa3614106cf504f4e6a779a620b94c20d83449e95f2
DIST event-2.3.0.tgz 135401 BLAKE2B a068142854ed908cc482ec48a249a5d213c1806652cffc698bc6dd298c136c5884bbb52b30179ef813af938d0ecb92a5414c93dea3d782d6ebfb4e886128454a SHA512 9e1f41a13a5fc534956561ea481816d6863ebe037cca0ce450cfb16375d6b49cd03c68e115c851ef6fa3022927f2e5850695880c65dd1d339bb747e171cc9f2f
DIST event-2.4.0.tgz 139646 BLAKE2B fe672b5d1f4eabd06456ffb14f11ed978a23a15eba06bc01b22d1784d71d5859e71e3914ab64856dd33a1cccb6618b5926bab446a112d8bf106081c2ab41bc74 SHA512 d238b72764461cf338d20618e4dee80ed8e8519350d17a6c789a68d749d2f4adae991ee43928ab09321caaff321fa21aaa4b5fac6f827974b2f8e9295e948293
+DIST event-2.4.1.tgz 139675 BLAKE2B 47b78868bad327778c917e026456dbbb8955f4910d1b6092132101618e348b064ee33766e7e8a2aec6c6c8bdb5e79a09fbbc7ef841dca0b16826fcc1737dd028 SHA512 d115fa12dfefe164532b39b6a79f01c2c00e2718967c3d675584a0dd193b155cdc74a632f6327239e201720fbabd440b9434bde5de4a9e30373595636dafad94
diff --git a/dev-php/pecl-event/pecl-event-2.4.1.ebuild b/dev-php/pecl-event/pecl-event-2.4.1.ebuild
new file mode 100644
index 000000000000..148533773b8c
--- /dev/null
+++ b/dev-php/pecl-event/pecl-event-2.4.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PHP_EXT_NAME="event"
+PHP_EXT_INI="yes"
+PHP_EXT_ZENDEXT="no"
+DOCS=( README.md )
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+
+inherit php-ext-pecl-r3
+
+KEYWORDS="~amd64 ~ia64 ~x86"
+LICENSE="PHP-3.01"
+
+DESCRIPTION="PHP wrapper for libevent2"
+LICENSE="PHP-3"
+SLOT="0"
+
+DEPEND="
+ >=dev-libs/libevent-2.0.2
+ ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+ php_targets_php5-6? ( dev-lang/php:5.6[sockets?] )
+ php_targets_php7-0? ( dev-lang/php:7.0[sockets?] )
+ php_targets_php7-1? ( dev-lang/php:7.1[sockets?] )
+ php_targets_php7-2? ( dev-lang/php:7.2[sockets?] )
+ php_targets_php7-3? ( dev-lang/php:7.3[sockets?] )"
+
+RDEPEND="${DEPEND} !dev-php/pecl-libevent"
+
+IUSE="debug examples +extra libressl +sockets +ssl threads"
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=(
+ --with-event-core
+ $(use_enable debug event-debug)
+ $(use_with extra event-extra)
+ $(use_with ssl event-openssl)
+ $(use_with threads event-pthreads)
+ $(use_enable sockets event-sockets)
+ )
+ php-ext-source-r3_src_configure
+}
+
+src_test() {
+ local slot
+ for slot in $(php_get_slots); do
+ php_init_slot_env "${slot}"
+ SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test
+ done
+}
diff --git a/dev-python/Coffin/Coffin-2.0.1.ebuild b/dev-python/Coffin/Coffin-2.0.1.ebuild
deleted file mode 100644
index eecd59328f9b..000000000000
--- a/dev-python/Coffin/Coffin-2.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Jinja2 adapter for Django"
-HOMEPAGE="https://pypi.org/project/Coffin/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_prepare_all() {
- # Req'd to avoid file collisions
- sed -e s":find_packages():find_packages(exclude=['tests']):" -i setup.py || die
-
- distutils-r1_python_prepare_all
-}
-# Tests attempt to import an abandoned module
diff --git a/dev-python/Coffin/Manifest b/dev-python/Coffin/Manifest
deleted file mode 100644
index c498b6b40fbb..000000000000
--- a/dev-python/Coffin/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Coffin-2.0.1.tar.gz 9858 BLAKE2B 9ea2e80cff1edfb4b40d69831184c116bb83c710bdf9234ae1df56d7a4255d8d8c57013f8e97ea4a5b8f4fb4ea02ecbe32f30e0b3bb4164ea56904c6e96fdbab SHA512 e618c74a91f84e7f41411c8e34b2c97fad1a59bc5124f0f5b3439abf1b0c2972d5f59d4b71f49393e843cd588ec143c08d659e90d2cfd006d55b5244b5727ccc
diff --git a/dev-python/Coffin/metadata.xml b/dev-python/Coffin/metadata.xml
deleted file mode 100644
index 24ceccaaf4d5..000000000000
--- a/dev-python/Coffin/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- Coffin
- coffin/coffin
-
-
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index c14e2c5762f2..dc87c839bc12 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/RecSQL/Manifest b/dev-python/RecSQL/Manifest
index 4686431ab49b..5fc23c960d7e 100644
--- a/dev-python/RecSQL/Manifest
+++ b/dev-python/RecSQL/Manifest
@@ -1 +1 @@
-DIST RecSQL-0.7.8.tar.gz 140025 BLAKE2B 03070c77765476b4907c53519fc5e54096d8e7dcbbf6771c8524fec18996993a5e6d9d48044d8da6a4267f84733165ea9c3907f7e49cb0d28ae5ded994af322a SHA512 bbe5dc547d8e254eac2513c66cdcbf564e491212ee549cafd5051caf545c4b8b7c6d9f728807ab1fff98a55a5c617f4736dd67b1c5a2ab882408d9289340c33c
+DIST RecSQL-0.7.11.tar.gz 134676 BLAKE2B 47c481dc06ba736560b53e4e44d2774d4059c11e846dd107c89b42687e2fc148a12a2afb818a7edc0023717a12ea928cac9613d7fa375345e9f1d4deff0e548e SHA512 e62b0eabbf74f25f362469a79d48665ad71de06818a2ae20cd2116c7460a5bad6034fa2199c1548394ca22018a6fa8d930fd22e5dccc82bb6a70d4d998fea51c
diff --git a/dev-python/RecSQL/RecSQL-0.7.8.ebuild b/dev-python/RecSQL/RecSQL-0.7.11.ebuild
similarity index 90%
rename from dev-python/RecSQL/RecSQL-0.7.8.ebuild
rename to dev-python/RecSQL/RecSQL-0.7.11.ebuild
index 6df5fe8e285b..b40dfd020dfb 100644
--- a/dev-python/RecSQL/RecSQL-0.7.8.ebuild
+++ b/dev-python/RecSQL/RecSQL-0.7.11.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite"
if [[ $PV = *9999* ]]; then
- scm_eclass=git-2
+ scm_eclass=git-r3
EGIT_REPO_URI="https://github.com/orbeckst/${PN}.git"
SRC_URI=""
KEYWORDS=""
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 100f0d3e6f02..7a2d9d359fb0 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -5,3 +5,4 @@ DIST aiohttp-2.3.2.tar.gz 841030 BLAKE2B a291baa1c5e915815ec80ea1cbd8434b31f4098
DIST aiohttp-3.0.5.tar.gz 738000 BLAKE2B 742d3647a61e21ed8fc7a0a344337c5260b2bc34ffeb84660ddc031ff3872c97d7cadb66a02a4bc2531ca22b54fc1b93e8cf321d696cf4ec21a60170631d866c SHA512 650dbe3e5363c259fc5ce95baec4fd16ca2fd0836236d7d8f65597346f72fec29f803e037ffd6fc4e726a28a973aa09b0a3874a685516fbc4e843ad7f0f08b7b
DIST aiohttp-3.0.6.tar.gz 738111 BLAKE2B 28a3560a7b351ee974db8bbdd372798e01696e66660b6330707c542253c4d8a0405e6e8c2c8ec03c3b0ea8b548516ffb2dfe14b800b5f17e908991244bfd9335 SHA512 43f1b3c2da1bc57ac6e83a01abb3568b71ed5514e9331aaba4b691ff036d2d3e72eeddadd0f2f20608fa1f622a673ce1d4489bced2096ae546a350ad5f438d0d
DIST aiohttp-3.3.0.tar.gz 722307 BLAKE2B 3bf1906e8a518d443a2f1bfff536fe9c4024dd18d12ed791dd4a81cfa3f81260bbbf293ae093086fa45c068f3417bcc797d1ee01e64a890a9427944ac9836760 SHA512 e7dd320abb0d9baa0dd583ce034b2d2dd328aa37750197789207e80eabfaf1e998a58e9aa0a6b98ff213f8c78ca90b85698ac559c57f44ce1b643fc317735a4b
+DIST aiohttp-3.4.3.tar.gz 822045 BLAKE2B 117c70614d9a9da5cc23ec205d104317591e62d8368a2775965d3b5daadbc711eceeefc1fd0e84504a7cc8079e00e7ec426cc6e3f3bf752029a66089a708a384 SHA512 2e50c9f200edfdccfa1b8e338ec9acb30f85f90b37b1fb5acc9834a2df3ad62ac68b9bc3a4d990b9eba939f7afecb00f5798e54d9b1d93ac18c2d51f895d044d
diff --git a/dev-python/aiohttp/aiohttp-3.4.3.ebuild b/dev-python/aiohttp/aiohttp-3.4.3.ebuild
new file mode 100644
index 000000000000..6a3106ded46d
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.4.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="http client/server for asyncio"
+HOMEPAGE="https://pypi.org/project/aiohttp/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+CDEPEND="
+ >=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+ dev-python/chardet[${PYTHON_USEDEP}]
+ >=dev-python/multidict-4.0.0[${PYTHON_USEDEP}]
+ >=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+ dev-python/idna-ssl[${PYTHON_USEDEP}]
+"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/cython[${PYTHON_USEDEP}]
+ doc? (
+ >=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
+ dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx-aiohttp-theme[${PYTHON_USEDEP}]
+ )
+ test? (
+ ${CDEPEND}
+ >=app-arch/brotli-1.0.5[${PYTHON_USEDEP}]
+ >=dev-python/pytest-3.4.0[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ www-servers/gunicorn[${PYTHON_USEDEP}]
+ )
+"
+RDEPEND="${CDEPEND}"
+
+DOCS=( CHANGES.rst CONTRIBUTING.rst CONTRIBUTORS.txt HISTORY.rst README.rst )
+PATCHES=( "${FILESDIR}"/${PN}-3.0.5-tests.patch )
+
+python_prepare_all() {
+ # skip failing tests until cause is determined
+ rm tests/{test_pytest_plugin.py,test_worker.py} || die
+ # AttributeError: 'brotli.Decompressor' object has no attribute 'flush'
+ sed -e 's:test_compression_brotli:_\0:' \
+ -e 's:test_feed_eof_no_err_brotli:_\0:' \
+ -i tests/test_http_parser.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
new file mode 100644
index 000000000000..199c25e15d5a
--- /dev/null
+++ b/dev-python/async_generator/Manifest
@@ -0,0 +1 @@
+DIST async_generator-1.10.tar.gz 29870 BLAKE2B 7f1bea82b1ed9ed87774f1fb42af2c58d8f9e34a02f067fad018680d46c94b811075107396b29e948fa5f72131c79f3b45544fae5aeca9f990e809db85bb28dd SHA512 3874b4e474cc7febec981f704672e233512a999e00e1672e46fe3a18e45168373fabc83142926763b7c6fcaf16948e031702d5854694aab4b5cae96b9b1ef819
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
new file mode 100644
index 000000000000..17b80b09558a
--- /dev/null
+++ b/dev-python/async_generator/async_generator-1.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Making it easy to write async iterators in Python 3.5"
+HOMEPAGE="https://github.com/python-trio/async_generator https://pypi.org/project/async_generator/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+DOCS=( README.rst )
+
+python_test() {
+ py.test -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/async_generator/metadata.xml b/dev-python/async_generator/metadata.xml
new file mode 100644
index 000000000000..0731896574c4
--- /dev/null
+++ b/dev-python/async_generator/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ zmedico@gentoo.org
+
+
+ python-trio/async_generator
+ async_generator
+
+
diff --git a/dev-python/cangjie/Manifest b/dev-python/cangjie/Manifest
index 9f8d21a5a54e..7b9869e0eac3 100644
--- a/dev-python/cangjie/Manifest
+++ b/dev-python/cangjie/Manifest
@@ -1 +1,2 @@
DIST cangjie-1.2.tar.xz 221524 BLAKE2B 149d10c6d1806b08e1de852d7e48807bd027986188555caac1b9c1495573230341e611466563f8fc3072b2cbd6a4913646c44408c91816ce9fa0d67655796bb2 SHA512 4cc3e0e4a77b671c93fe39f17c970d458d6d935c1efa33f9d8de0a0311ed6c3a444fd41431d553f70f3e96065f8136801128d8b16c86d0340c78ab560bd9e63f
+DIST cangjie-1.3.tar.xz 237156 BLAKE2B a94f51df82136edddeeeecb729737a7be1cf4677c86df153ba86b436a404615156e6fe43d6efbb6ae602982763a4cd8ea09850882942a70a3a3737075bde0c01 SHA512 633b0040740105573fe72811c2f763756b67784330520ecadd5e0b24fc51e414f54a71f03444940f20c8a4943a14b65e2f1d18339696e2ea5cf659de8592df2a
diff --git a/dev-python/cangjie/cangjie-1.2-r1.ebuild b/dev-python/cangjie/cangjie-1.2-r1.ebuild
index d3daf09ed18c..9e6a424c171f 100644
--- a/dev-python/cangjie/cangjie-1.2-r1.ebuild
+++ b/dev-python/cangjie/cangjie-1.2-r1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
+EAPI="6"
PYTHON_COMPAT=( python{3_4,3_5,3_6} )
inherit autotools python-r1
-DESCRIPTION="The Python bindings to libcangjie"
-HOMEPAGE="http://cangjians.github.io"
-SRC_URI="https://github.com/Cangjians/pycangjie/releases/download/v${PV}/cangjie-${PV}.tar.xz"
+DESCRIPTION="Python wrapper for libcangjie"
+HOMEPAGE="http://cangjians.github.io/"
+SRC_URI="https://github.com/Cangjians/py${PN}/releases/download/v${PV}/${P#py}.tar.xz"
LICENSE="LGPL-3+"
SLOT="0"
@@ -17,15 +16,13 @@ KEYWORDS="amd64 x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RDEPEND="
- app-i18n/libcangjie
- ${PYTHON_DEPS}"
-DEPEND="
- ${RDEPEND}
+RDEPEND="${PYTHON_DEPS}
+ app-i18n/libcangjie"
+DEPEND="${RDEPEND}
dev-python/cython[${PYTHON_USEDEP}]
virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/${P}-cython-022.patch" )
+PATCHES=( "${FILESDIR}"/${P}-cython-0.22.patch )
src_prepare() {
default
@@ -33,10 +30,10 @@ src_prepare() {
}
src_configure() {
- myeconf() {
- ECONF_SOURCE="${S}" econf PYTHON="${PYTHON}"
+ python_configure() {
+ ECONF_SOURCE="${S}" econf
}
- python_foreach_impl run_in_build_dir myeconf
+ python_foreach_impl run_in_build_dir python_configure
}
src_compile() {
@@ -51,6 +48,5 @@ src_install() {
python_foreach_impl run_in_build_dir default
einstalldocs
- # package only installs python modules
find "${D}" -name '*.la' -delete || die
}
diff --git a/dev-python/cangjie/cangjie-1.3.ebuild b/dev-python/cangjie/cangjie-1.3.ebuild
new file mode 100644
index 000000000000..08b958d139c4
--- /dev/null
+++ b/dev-python/cangjie/cangjie-1.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit autotools python-r1
+
+DESCRIPTION="Python wrapper for libcangjie"
+HOMEPAGE="http://cangjians.github.io/"
+SRC_URI="https://github.com/Cangjians/py${PN}/releases/download/v${PV}/${P#py}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ app-i18n/libcangjie"
+DEPEND="${RDEPEND}
+ dev-python/cython[${PYTHON_USEDEP}]
+ virtual/pkgconfig"
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ python_configure() {
+ ECONF_SOURCE="${S}" econf
+ }
+ python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+ python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+ python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+ python_foreach_impl run_in_build_dir default
+ einstalldocs
+
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-python/cangjie/files/cangjie-1.2-cython-022.patch b/dev-python/cangjie/files/cangjie-1.2-cython-0.22.patch
similarity index 89%
rename from dev-python/cangjie/files/cangjie-1.2-cython-022.patch
rename to dev-python/cangjie/files/cangjie-1.2-cython-0.22.patch
index ac2695c9e139..a681726d98ef 100644
--- a/dev-python/cangjie/files/cangjie-1.2-cython-022.patch
+++ b/dev-python/cangjie/files/cangjie-1.2-cython-0.22.patch
@@ -1,8 +1,6 @@
-diff --git a/Makefile.am b/Makefile.am
-index 6762b97..c0cc699 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -47,19 +47,19 @@ pkgpyexecdir = $(pyexecdir)/cangjie
+@@ -47,19 +47,19 @@
src/cangjie/_core.c: src/cangjie/_core.pyx src/cangjie/_core.pxd
$(MKDIR_P) src/cangjie
diff --git a/dev-python/cangjie/metadata.xml b/dev-python/cangjie/metadata.xml
index f725cd5af33c..5249303a03c1 100644
--- a/dev-python/cangjie/metadata.xml
+++ b/dev-python/cangjie/metadata.xml
@@ -1,11 +1,11 @@
-
- cjk@gentoo.org
- Cjk
-
-
- Cangjians/pycangjie
-
+
+ cjk@gentoo.org
+ Cjk
+
+
+ Cangjians/pycangjie
+
diff --git a/dev-python/django-compressor/Manifest b/dev-python/django-compressor/Manifest
deleted file mode 100644
index 33a69120e345..000000000000
--- a/dev-python/django-compressor/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST django-compressor-1.5.tar.gz 105855 BLAKE2B 18cd7d664a683c44674d89f714e36dc4c7c8f9412567c12b31bc563a16340a11ffc3c4e686fa8d360a40553989ed41aa208e71aa31d0bb2c5fe31f5d7c3261e7 SHA512 d6c7a04263895a4195754a49bd4831053186c99d6fdd07977c26059eb931c982bd3b60848311e8469ad0e0298204a5fc3f0e63697a5af5608abf0b76e521c797
diff --git a/dev-python/django-compressor/django-compressor-1.5.ebuild b/dev-python/django-compressor/django-compressor-1.5.ebuild
deleted file mode 100644
index df8a9a524ca4..000000000000
--- a/dev-python/django-compressor/django-compressor-1.5.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
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/_}"
-
-DESCRIPTION="Compresses linked and inline javascript or CSS into a single cached file"
-HOMEPAGE="https://github.com/django-compressor/django-compressor"
-SRC_URI="https://github.com/jezdez/django_compressor/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="
- =dev-python/django-appconf-0.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/versiontools[${PYTHON_USEDEP}]
- test? (
- dev-python/django[${PYTHON_USEDEP}]
- dev-python/django-discover-runner[${PYTHON_USEDEP}]
- dev-python/unittest2[${PYTHON_USEDEP}]
- dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
- dev-python/html5lib[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/jinja[${PYTHON_USEDEP}]
- dev-python/lxml[${PYTHON_USEDEP}]
- dev-python/Coffin[${PYTHON_USEDEP}]
- dev-python/jingo[${PYTHON_USEDEP}]
- )"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- # https://github.com/django-compressor/django-compressor/issues/531 532
- pushd "${BUILD_DIR}/lib" > /dev/null || die
- if python_is_python3; then
- sed -e s':test_cachekey:_&:' -e s':test_css:_&:g' \
- -i compressor/tests/test_base.py || die
- fi
- set -- django-admin.py test compressor --settings=compressor.test_settings
- echo "$@"
- "$@" || die "Tests failed with ${EPYTHON}"
- popd > /dev/null || die
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/django-compressor/metadata.xml b/dev-python/django-compressor/metadata.xml
deleted file mode 100644
index 52740466c040..000000000000
--- a/dev-python/django-compressor/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
- jezdez/django_compressor
-
-
diff --git a/dev-python/django-openstack-auth/Manifest b/dev-python/django-openstack-auth/Manifest
deleted file mode 100644
index d9d4e6d6616d..000000000000
--- a/dev-python/django-openstack-auth/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST django_openstack_auth-3.2.0.tar.gz 69837 BLAKE2B 4ff5fdf15731668d91a5d0693f57c41ac3c373e45a1fcecc619d621bcbfda53a11e48a3de6afeae276d7320daf8e7eb9fc05e63f60f2b7c79d536b8f9c358f99 SHA512 43e8d19d73c934935f73b6dcb5a5ffbb0ca49c2c7dc892cadd9a04af94091e39bf35f1833d33474f7aeee9a94040424f6ee43c5fd355d8ad971c0b4ff971d4de
diff --git a/dev-python/django-openstack-auth/django-openstack-auth-3.2.0-r1.ebuild b/dev-python/django-openstack-auth/django-openstack-auth-3.2.0-r1.ebuild
deleted file mode 100644
index 5f7292f8f799..000000000000
--- a/dev-python/django-openstack-auth/django-openstack-auth-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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,5}} )
-
-inherit distutils-r1
-
-MY_PN=${PN//-/_}
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Django authentication backend for use with OpenStack Keystone Identity backend"
-HOMEPAGE="https://django-openstack-auth.readthedocs.io/en/latest/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
- >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
- !~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-sphinx-4.7.0[${PYTHON_USEDEP}]"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- >=dev-python/pbr-2.0[${PYTHON_USEDEP}]
- test? (
- >=dev-python/hacking-0.12.0[${PYTHON_USEDEP}]
- =dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
- >=dev-python/coverage-4.0[${PYTHON_USEDEP}]
- >=dev-python/mock-2.0[${PYTHON_USEDEP}]
- >=dev-python/mox3-0.7.0[${PYTHON_USEDEP}]
- >=dev-python/testscenarios-0.4[${PYTHON_USEDEP}] )
- ${CDEPEND}
- doc? ( ${CDEPEND} )
- "
-RDEPEND="
- >=dev-python/django-1.8[${PYTHON_USEDEP}]
- =dev-python/oslo-config-3.22.0[${PYTHON_USEDEP}]
- >=dev-python/oslo-policy-1.17.0[${PYTHON_USEDEP}]
- >=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
- >=dev-python/keystoneauth-2.20.0[${PYTHON_USEDEP}]
- >=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
- # Avoid warning in doc build due to missed file
- if use doc; then
- mkdir doc/source/_static || die
- fi
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- # under sphinx-1.3.1 the build outputs a harmless warning about change of
- # html_theme setting in conf.py. priot versions will have the right setting
- if use doc; then
- sphinx-build -b html -c doc/source/ doc/source/ doc/source/html || die
- fi
-}
-
-python_test() {
- "${PYTHON}" -m openstack_auth.tests.run_tests || die "Testsuite failed"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/source/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/django-openstack-auth/metadata.xml b/dev-python/django-openstack-auth/metadata.xml
deleted file mode 100644
index a15856976eb6..000000000000
--- a/dev-python/django-openstack-auth/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
- prometheanfire@gentoo.org
- Matthew Thode
-
-
- python@gentoo.org
- Python
-
-
- A Django authentication backend for use with the OpenStack Keystone Identity backend.
-
-
- django_openstack_auth
-
-
diff --git a/dev-python/django-tastypie/Manifest b/dev-python/django-tastypie/Manifest
deleted file mode 100644
index d1f64b28fb7a..000000000000
--- a/dev-python/django-tastypie/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST django-tastypie-0.13.3.tar.gz 231373 BLAKE2B a966e7d9f36b3399799afd00f92b4d0bc4041226d7aa3d55fc204c60eb7fd757d1c56ed985f79017754b16b4af92281004b968c75fce69862da8584a78e058bf SHA512 a4497c2212e1ca6614d69c8c847aedd9b9bb88c7c9083c3eae8bd163e9f61f4402c6adc0a3b2a5632e9d2d7e14b2158bce66d8e62257493edfbd9ca9be9355fb
diff --git a/dev-python/django-tastypie/django-tastypie-0.13.3-r1.ebuild b/dev-python/django-tastypie/django-tastypie-0.13.3-r1.ebuild
deleted file mode 100644
index 901a7ba4a769..000000000000
--- a/dev-python/django-tastypie/django-tastypie-0.13.3-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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} )
-
-inherit distutils-r1
-
-DESCRIPTION="A flexible and capable API layer for django utilising serialisers"
-HOMEPAGE="https://pypi.org/project/django-tastypie/ https://github.com/toastdriven/django-tastypie"
-SRC_URI="https://github.com/toastdriven/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE="bip doc test"
-
-LICENSE="BSD"
-SLOT="0"
-
-COMMON_DEPEND=">=dev-python/mimeparse-0.1.4[${PYTHON_USEDEP}]
- !~dev-python/mimeparse-1.5[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
- !~dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
- >=dev-python/django-1.7[${PYTHON_USEDEP}]
- =dev-python/mock-1.1.0[${PYTHON_USEDEP}]' python2_7)
- >=dev-python/pytz-2013b[${PYTHON_USEDEP}]
- !!sci-libs/geos[python] )
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
- $(python_gen_cond_dep '>=dev-python/mock-1.1.0[${PYTHON_USEDEP}]' python2_7)
- dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- cd tests || die
- # keep in sync with tox.ini
- django-admin.py test -v 2 -p '*' core.tests --settings=settings_core ||
- die "core.tests fail with ${EPYTHON}"
- django-admin.py test -v 2 basic.tests --settings=settings_basic ||
- die "basic.tests fail with ${EPYTHON}"
- django-admin.py test -v 2 related_resource.tests --settings=settings_related ||
- die "related_resource.tests fail with ${EPYTHON}"
- django-admin.py test -v 2 alphanumeric.tests --settings=settings_alphanumeric ||
- die "alphanumeric.tests fail with ${EPYTHON}"
- django-admin.py test -v 2 authorization.tests --settings=settings_authorization ||
- die "authorization.tests fail with ${EPYTHON}"
- django-admin.py test -v 2 content_gfk.tests --settings=settings_content_gfk ||
- die "content_gfk.tests fail with ${EPYTHON}"
- django-admin.py test -v 2 customuser.tests --settings=settings_customuser ||
- die "customuser.tests fail with ${EPYTHON}"
- django-admin.py test -v 2 namespaced.tests --settings=settings_namespaced ||
- die "namespaced.tests fail with ${EPYTHON}"
- django-admin.py test -v 2 slashless.tests --settings=settings_slashless ||
- die "slashless.tests fail with ${EPYTHON}"
- django-admin.py test -v 2 validation.tests --settings=settings_validation ||
- die "validation.tests fail with ${EPYTHON}"
-# requires dev-python/geos but django fails at the current version of it
-# django-admin.py test -v 2 gis.tests --settings=settings_gis_spatialite ||
-# die "gis.tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/_build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/django-tastypie/metadata.xml b/dev-python/django-tastypie/metadata.xml
deleted file mode 100644
index 9eaff492187c..000000000000
--- a/dev-python/django-tastypie/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
-
- toastdriven/django-tastypie
-
-
-
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 8a8b1f942ed3..b811f76a821d 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -1,4 +1,3 @@
DIST Django-1.11.15.tar.gz 7843843 BLAKE2B b7713de8136302d8d95929ed449ab01173e28c0d5d20529eaae9d6bd6d323f53b674a4fb6e8398da4b57a223f10ef63e7961accc8fd777313f18b4e2b0f225ed SHA512 4ea18c59f7c74d0b6deb9d292d5de068c6dcc53d9596f321f5a7e823ff5fe423cc8d69c88bf53e3acd9c36c4ecc4447148243a127d5114a4894b0fd4d449f37e
-DIST Django-1.8.19.tar.gz 7359244 BLAKE2B 1c7b857f864527cf5b9cac8e08599e1f4f3306a828bcc253e0e59755da6d464592e627eb3743687b0410d308b3d089359dd79af0146b02e6db7f5eca43f04401 SHA512 cec71f4a1aaa3fcfc43a035e9fcd8d6fabde7aade43491f9205942cbeb251ae394e49ec6b5b2403b74c24b069064d44ae6070b151c0c949b940f2d46aa87774e
DIST Django-2.0.8.tar.gz 7987343 BLAKE2B ab35f50ce1911cb9603c7ac85e7ab01e6019ce9a2dac4cd733b11f35722368946ff3a130c3c791da4d49cf609b5747b4c5de64e29e27a8e12abb7f9e29cd363b SHA512 ac3cc3f58cb977518c6f549834beb35677c2d5541cfb5723045b98165926e826178cb33737c52a0f999be24bc38b84dde489a5f91d1c8d51b8338aa611acb518
-DIST Django-2.1.tar.gz 8583964 BLAKE2B 92a48bbdd45fa94c7b43961bf22bd5521019bf0c9f37f6685c8916d9d1886b77522fb58d7db27989a713445b51e15858161e5b99e636cdadc23860d2d0a8ef56 SHA512 1c75f0ad8ef353fb38d245034f108df5554cc27073f44ef920576b5dba3d2dd685d8905c0bde1701d43cb01b4c9dbb2bfa7c38c57fae3208af5be616d26d39cb
+DIST Django-2.1.1.tar.gz 8595422 BLAKE2B b4d46162b8a48ada2e1321e6731afdfac8c6acbc394991178c33a374ea2d61d0b1f91ede6a56f9e88d20ba2ddbe6910fe452f79fc6cfb342fddc6222c454dad1 SHA512 e29180097cda0de35eb3dac77b7f7f3f31771257b9bfcd6d3fd37d421c572e1226bb1760635ccedee357cee7ca3dcb302de6126a771007a2cdef82970a596813
diff --git a/dev-python/django/django-1.8.19.ebuild b/dev-python/django/django-1.8.19.ebuild
deleted file mode 100644
index 1dda1fe2a773..000000000000
--- a/dev-python/django/django-1.8.19.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-PYTHON_REQ_USE='sqlite?,threads(+)'
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit bash-completion-r1 distutils-r1 eutils eapi7-ver webapp
-
-MY_PN="Django"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="High-level Python web framework"
-HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
-SRC_URI="
- https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
- mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz
- "
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc sqlite test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( >=dev-python/sphinx-1.0.7[${PYTHON_USEDEP}] )
- test? (
- $(python_gen_impl_dep sqlite)
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/numpy[$(python_gen_usedep 'python*')]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.7.6-bashcomp.patch
-)
-
-pkg_setup() {
- webapp_pkg_setup
-}
-
-python_prepare_all() {
- # Prevent d'loading in the doc build
- sed -e '/^ "sphinx.ext.intersphinx",/d' -i docs/conf.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- # Tests have non-standard assumptions about PYTHONPATH,
- # and don't work with ${BUILD_DIR}/lib.
- PYTHONPATH=. "${PYTHON}" tests/runtests.py --settings=test_sqlite -v2 \
- || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- newbashcomp extras/django_bash_completion ${PN}-admin
- bashcomp_alias ${PN}-admin django-admin.py
-
- if use doc; then
- rm -fr docs/_build/html/_sources || die
- local HTML_DOCS=( docs/_build/html/. )
- fi
-
- insinto "${MY_HTDOCSDIR#${EPREFIX}}"
- doins -r django/contrib/admin/static/admin/.
- distutils-r1_python_install_all
-}
-
-src_install() {
- distutils-r1_src_install
- webapp_src_install
-}
-
-pkg_postinst() {
- elog "Additional Backend support can be enabled via"
- optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python
- optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient
- optfeature "PostgreSQL backend support" dev-python/psycopg:2
- echo ""
- elog "Other features can be enhanced by"
- optfeature "GEO Django" sci-libs/gdal[geos]
- optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
- optfeature "ImageField Support" dev-python/pillow
- optfeature "Password encryption" dev-python/bcrypt
- optfeature "High-level abstractions for Django forms" dev-python/django-formtools
- echo ""
- elog "A copy of the admin media is available to webapp-config for installation in a"
- elog "webroot, as well as the traditional location in python's site-packages dir"
- elog "for easy development."
- webapp_pkg_postinst
-}
diff --git a/dev-python/django/django-2.1.ebuild b/dev-python/django/django-2.1.1.ebuild
similarity index 100%
rename from dev-python/django/django-2.1.ebuild
rename to dev-python/django/django-2.1.1.ebuild
diff --git a/dev-python/django/files/django-1.7.6-bashcomp.patch b/dev-python/django/files/django-1.7.6-bashcomp.patch
deleted file mode 100644
index ef76f8a873c7..000000000000
--- a/dev-python/django/files/django-1.7.6-bashcomp.patch
+++ /dev/null
@@ -1,34 +0,0 @@
- extras/django_bash_completion | 16 +---------------
- 1 file changed, 1 insertion(+), 15 deletions(-)
-
-diff --git a/extras/django_bash_completion b/extras/django_bash_completion
-index 3e02d8e..5a33938 100755
---- a/extras/django_bash_completion
-+++ b/extras/django_bash_completion
-@@ -37,7 +37,7 @@ _django_completion()
- COMP_CWORD=$COMP_CWORD \
- DJANGO_AUTO_COMPLETE=1 $1 ) )
- }
--complete -F _django_completion -o default django-admin.py manage.py django-admin
-+complete -F _django_completion -o default django-admin.py django-admin
-
- _python_django_completion()
- {
-@@ -55,17 +55,3 @@ _python_django_completion()
- fi
- fi
- }
--
--# Support for multiple interpreters.
--unset pythons
--if command -v whereis &>/dev/null; then
-- python_interpreters=$(whereis python | cut -d " " -f 2-)
-- for python in $python_interpreters; do
-- pythons="${pythons} ${python##*/}"
-- done
-- pythons=$(echo $pythons | tr " " "\n" | sort -u | tr "\n" " ")
--else
-- pythons=python
--fi
--
--complete -F _python_django_completion -o default $pythons
diff --git a/dev-python/icalendar/icalendar-3.11.7-r1.ebuild b/dev-python/icalendar/icalendar-3.11.7-r1.ebuild
new file mode 100644
index 000000000000..015b5a6c7e04
--- /dev/null
+++ b/dev-python/icalendar/icalendar-3.11.7-r1.ebuild
@@ -0,0 +1,54 @@
+# 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 )
+
+inherit distutils-r1
+
+MY_PN="collective-${PN}"
+
+DESCRIPTION="Package used for parsing and generating iCalendar files (RFC 2445)"
+HOMEPAGE="https://github.com/collective/icalendar"
+SRC_URI="mirror://pypi/i/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="doc test"
+DOCS="README.rst"
+
+RDEPEND="
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]"
+
+DEPEND="
+ ${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/python-dateutil:0[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/coverage[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ # reset conf.py to not read version from an installed instance
+ sed -e "s:pkg_resources.get_distribution('icalendar').version:'3.9.0':" \
+ -i docs/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ if use doc; then
+ pushd docs > /dev/null
+ emake text
+ popd > /dev/null
+ DOCS=( ${DOCS} docs/_build/text/*.txt )
+ fi
+}
+
+python_test() {
+ # From tox.ini
+ coverage run --source=src/icalendar --omit=*/tests/* --module \
+ pytest src/icalendar || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/jingo/Manifest b/dev-python/jingo/Manifest
deleted file mode 100644
index 139a1719fb17..000000000000
--- a/dev-python/jingo/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST jingo-0.9.0.tar.gz 10536 BLAKE2B b7cf8cf544c44dc74d750f85e5abf43a0d58bbb13a814610b7dd970995ec8e2c4b94d6b46f20be7031a1755fa47e9c28aa98f17d08bacdb967373924302c7739 SHA512 ec064df61639a96dcd0f0b8383d93a650928035e8744f600bd55e42e2ca4b2436db9cff3d75780d2803e9a326fa17308c424c693e14553c9b9a3b45e4132989a
diff --git a/dev-python/jingo/jingo-0.9.0.ebuild b/dev-python/jingo/jingo-0.9.0.ebuild
deleted file mode 100644
index 77618d3706d4..000000000000
--- a/dev-python/jingo/jingo-0.9.0.ebuild
+++ /dev/null
@@ -1,19 +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,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="An adapter for using Jinja2 templates with Django"
-HOMEPAGE="https://github.com/jbalogh/jingo/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]"
diff --git a/dev-python/jingo/metadata.xml b/dev-python/jingo/metadata.xml
deleted file mode 100644
index a798b91934e7..000000000000
--- a/dev-python/jingo/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
- jingo
- jbalogh/jingo
-
-
diff --git a/dev-python/jsonfield/Manifest b/dev-python/jsonfield/Manifest
deleted file mode 100644
index ae288af7f363..000000000000
--- a/dev-python/jsonfield/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST jsonfield-1.0.3.tar.gz 7950 BLAKE2B fefaa4f2d3b6abbcb291394baf6147444a6829b15303795856156668a4dc86d4df7a31f7d684783c81467f30de6ca3313b5a86845d088cbbf0ed00bb1cb5a30e SHA512 b69b783266f593d40b588f8deb42828b36fe31f62aba0a80286a24fd788bbea543c74b0566a70fb336fb80105f488a16932bab417a01d3730fa89201f542deb0
-DIST jsonfield-2.0.2.tar.gz 10806 BLAKE2B 67638b380f3356390d93a10b2bd432016ca46d525cbac17c4cc4d1ec901b92d7de00e7ddb6610a97e547728e2c60ddab757e705348b8a8f66ff443b34550f0d5 SHA512 9d4a8a483ea7be4c13c272a959666ca73fdf662ca91373ca5787fc86c0366d074e90fccd61d371898f85e5bf6a1a265820bd9b971e5056c800a27c099835eebf
diff --git a/dev-python/jsonfield/jsonfield-1.0.3.ebuild b/dev-python/jsonfield/jsonfield-1.0.3.ebuild
deleted file mode 100644
index e95f545cfbd8..000000000000
--- a/dev-python/jsonfield/jsonfield-1.0.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Reusable Django field that allows you to store validated JSON in your model"
-HOMEPAGE="https://pypi.org/project/jsonfield/ https://github.com/bradjasper/django-jsonfield"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=""
-DEPEND="test? ( dev-python/django[${PYTHON_USEDEP}] )"
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/jsonfield/jsonfield-2.0.2.ebuild b/dev-python/jsonfield/jsonfield-2.0.2.ebuild
deleted file mode 100644
index 4ea2a180e0b7..000000000000
--- a/dev-python/jsonfield/jsonfield-2.0.2.ebuild
+++ /dev/null
@@ -1,23 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Reusable Django field that allows you to store validated JSON in your model"
-HOMEPAGE="https://pypi.org/project/jsonfield/ https://github.com/bradjasper/django-jsonfield"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-DEPEND="test? ( dev-python/django[${PYTHON_USEDEP}] )"
-
-python_test() {
- esetup.py test
-}
diff --git a/dev-python/jsonfield/metadata.xml b/dev-python/jsonfield/metadata.xml
deleted file mode 100644
index 71182d9ff271..000000000000
--- a/dev-python/jsonfield/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
- jsonfield
- bradjasper/django-jsonfield
-
-
diff --git a/dev-python/kombu/Manifest b/dev-python/kombu/Manifest
index a7d0a649e573..b251c59dafe3 100644
--- a/dev-python/kombu/Manifest
+++ b/dev-python/kombu/Manifest
@@ -1 +1,2 @@
DIST kombu-4.1.0.tar.gz 421875 BLAKE2B 636dab025883bc9465b28e7a6ab4249ae7d079cc57d33b1af8ce8633e12b85027ace9601475f9e2db1782d197f888476ce6006a2d5429e040ee8de0d1c86266c SHA512 fc104a3f974fabf090cc257b1a7623af6048f4630c6c2a9bb693fe69d77b6cdab36135a290a41056c1f854f61cce8fc2aa6b7880e9273581bfdfa162b5724861
+DIST kombu-4.2.1.tar.gz 423926 BLAKE2B 8566e3d81bd77c93982f54300e837e2aaac1d1fbfc716c87607fb83b86bc80148afc37b11145ee33ff3a6cef9fadb6178c370dc5b47c0774a56e6b08b6bf951e SHA512 a480444199aeee4e0048803a49ee85f2b348734eccf0e746189ea7db3787cb27baa89765a71cf88288ec7171252d55e13bc787641a543d3f91d6eb3d30c6a90c
diff --git a/dev-python/kombu/kombu-4.2.1.ebuild b/dev-python/kombu/kombu-4.2.1.ebuild
new file mode 100644
index 000000000000..3a30c9fc6baf
--- /dev/null
+++ b/dev-python/kombu/kombu-4.2.1.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=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="AMQP Messaging Framework for Python"
+HOMEPAGE="https://pypi.org/project/kombu/ https://github.com/celery/kombu"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc examples mongodb msgpack redis sqs test yaml"
+
+# couchdb backend support possible via dev-python/couchdb-python
+# ditto dev-python/kazoo(>=1.3.1)
+RDEPEND="
+ >=dev-python/py-amqp-2.1.4[${PYTHON_USEDEP}]
+ =dev-python/boto3-1.4.4[${PYTHON_USEDEP}] )
+ msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )
+ mongodb? ( >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] )
+ redis? ( >=dev-python/redis-py-2.10.5[${PYTHON_USEDEP}] )
+ yaml? ( >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] )"
+# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2
+DEPEND="${RDEPEND}
+ >=dev-python/setuptools-20.6.7[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/case-1.5.2[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}] )
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/couchdb-python[${PYTHON_USEDEP}]
+ >=dev-python/sphinx_celery-1.1[${PYTHON_USEDEP}] )"
+
+# kazoo is optional for tests.
+# Refrain for now, no established demand for it from users
+
+# Req'd for test phase
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+)
+
+python_prepare_all() {
+ # AttributeError: test_Etcd instance has no attribute 'patch'
+ rm t/unit/transport/test_etcd.py || die
+ # allow use of new (renamed) msgpack
+ sed -i '/msgpack/d' requirements/extras/msgpack.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ # Doc build misses and skips only content re librabbitmq which is not in portage
+ if use doc; then
+ emake -C docs html || die "kombu docs failed installation"
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ if use examples; then
+ docompress -x "/usr/share/doc/${PF}/examples"
+ docinto examples
+ dodoc -r examples/.
+ fi
+ use doc && local HTML_DOCS=( docs/_build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/odfpy/odfpy-1.3.6.ebuild b/dev-python/odfpy/odfpy-1.3.6.ebuild
index 9db00a80e474..b982da4bc024 100644
--- a/dev-python/odfpy/odfpy-1.3.6.ebuild
+++ b/dev-python/odfpy/odfpy-1.3.6.ebuild
@@ -28,6 +28,9 @@ python_test() {
}
python_install_all() {
- use examples && local EXAMPLES=( examples/. )
+ if use examples; then
+ docinto examples
+ dodoc -r examples/.
+ fi
distutils-r1_python_install_all
}
diff --git a/dev-python/osc-placement/Manifest b/dev-python/osc-placement/Manifest
new file mode 100644
index 000000000000..f73aee45e295
--- /dev/null
+++ b/dev-python/osc-placement/Manifest
@@ -0,0 +1 @@
+DIST osc-placement-1.3.0.tar.gz 41728 BLAKE2B 1950d3180903b42d8833c1fce1d5cf28310429e18c28b828cbbc84191bae0ff77d182e4c8c4515bff6697f0b3064a687a066e4ba84300ffdcacafeec7ba8e52d SHA512 ad7e783bb32bd3519462906f50d7e9d2d537872aaf11f4b4cf30bd60233004cd01b1561aaf24b99c30aa368879cf537196955482e706d544e525c03cdb27bb1c
diff --git a/dev-python/osc-placement/metadata.xml b/dev-python/osc-placement/metadata.xml
new file mode 100644
index 000000000000..c7a698414268
--- /dev/null
+++ b/dev-python/osc-placement/metadata.xml
@@ -0,0 +1,19 @@
+
+
+
+
+ prometheanfire@gentoo.org
+ Matthew Thode
+
+
+ openstack@gentoo.org
+ Openstack
+
+
+ This is an OpenStackClient plugin, that provides CLI for the Placement service. Python API binding is not implemented - Placement API consumers are encouraged to use the REST API directly, CLI is provided only for convenience of users.
+
+
+ osc-placement
+ openstack/osc-placement
+
+
diff --git a/dev-python/osc-placement/osc-placement-1.3.0.ebuild b/dev-python/osc-placement/osc-placement-1.3.0.ebuild
new file mode 100644
index 000000000000..1666a5234249
--- /dev/null
+++ b/dev-python/osc-placement/osc-placement-1.3.0.ebuild
@@ -0,0 +1,27 @@
+# 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="OpenStackClient plugin for the Placement service"
+HOMEPAGE="https://github.com/openstack/osc-placement"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/keystoneauth-3.3.0[${PYTHON_USEDEP}]
+ >=dev-python/osc-lib-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index c1defd783762..b040ec0ea91c 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1 +1,2 @@
DIST oslo.db-4.33.1.tar.gz 169088 BLAKE2B e386d8c71669569256d88e2ad654e017dfae5cfc0635fa7c7f9e41a11d7114f6f7d0e826a6855113f8e672d5e57ed8b645e8c6d3a54c30aa78d45e53894fe8bf SHA512 b627bef035c13aa32afded20ff1e5198bc94d5ce96384c7eff44992d7f5c7178bb5e9ae398c53a04be6f280f433c688ae28fa72d6c617fc7c9299bd7c6a02eff
+DIST oslo.db-4.40.0.tar.gz 171545 BLAKE2B 34172325f99938595b36cbbabea421f8e51f8c5916a908ade56a2cd072ea532ec08b884c2ee74481f3651855f9c1432be145df3689569b06a6597e9eb9bdd6d2 SHA512 b1a0db1d3624ffc86eb41b49f76a4afe3737d943b6465a1b66a2aed18524c463e52130f1d6fe27cd382f04633df327bba07254b6d4bfb300cdaeb51b608745f0
diff --git a/dev-python/oslo-db/oslo-db-4.40.0.ebuild b/dev-python/oslo-db/oslo-db-4.40.0.ebuild
new file mode 100644
index 000000000000..0655daf7242c
--- /dev/null
+++ b/dev-python/oslo-db/oslo-db-4.40.0.ebuild
@@ -0,0 +1,68 @@
+# 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="OpenStack Common DB Code"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
+S="${WORKDIR}/oslo.db-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+sqlite mysql postgres"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/alembic-0.9.6[${PYTHON_USEDEP}]
+ >=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+ sqlite? (
+ >=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
+ )
+ mysql? (
+ || (
+ dev-python/pymysql[${PYTHON_USEDEP}]
+ dev-python/mysql-python[$(python_gen_usedep 'python2_7')]
+ )
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+ )
+ postgres? (
+ dev-python/psycopg:2[${PYTHON_USEDEP}]
+ >=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
+ !~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
+ )
+ >=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
+ >=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+ sed -i '/^testresources/d' requirements.txt || die
+ sed -i '/^testscenarios/d' requirements.txt || die
+ distutils-r1_python_prepare_all
+}
diff --git a/dev-python/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index 7796f632bda0..7c26ab5ba2fc 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1 +1,2 @@
DIST oslo.service-1.29.0.tar.gz 74957 BLAKE2B b56869cb28704718952c5e151eaf0442b1a4295b8e25a422d91baa241a990d031cd408474e44bd5ea2af2b7451e0c13ec491ed4c2ccf0b07c78b65a81bec4527 SHA512 84f1b8e6abc7c8c95433da53b1a1992570695b80e182f5cb7d87ab394857d8d47c0ef0528b7a45221c897eb4c5c13112d86b8a929efc2988d22844a4c712a340
+DIST oslo.service-1.31.3.tar.gz 71511 BLAKE2B 80cd0824b4e07fe834a41d3918dab2361d9c317a8eec143cf1e3831dbc2fb352c803c7f99fef5047960fc90e3826dbeff7e5f0fc642bc2b58bdfe656bd74925e SHA512 8ddff8c52a3b0eba83c420476d7a420f071d5770b7a9b9e0744a4b9ba216304d81d38268ac0aff889b08572d69d992d883b21df8de6739cba6ddf43ea1563263
diff --git a/dev-python/oslo-service/oslo-service-1.31.3.ebuild b/dev-python/oslo-service/oslo-service-1.31.3.ebuild
new file mode 100644
index 000000000000..71fb414d08f2
--- /dev/null
+++ b/dev-python/oslo-service/oslo-service-1.31.3.ebuild
@@ -0,0 +1,63 @@
+# 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="Library for running OpenStack services"
+HOMEPAGE="https://pypi.org/project/oslo.service/"
+SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
+S="${WORKDIR}/oslo.service-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+ !~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ ${CDEPEND}
+ test? (
+ >=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+ >=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+ >=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+ >=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+ >=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
+ !~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
+ >=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
+ >=dev-python/doc8-0.6.0[${PYTHON_USEDEP}]
+ >=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+ >=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+ !~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+ >=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+ )"
+RDEPEND="
+ ${CDEPEND}
+ >=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
+ >=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+ !~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+ >=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
+ >=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+ >=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+ >=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+ >=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+ >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+ >=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
+ >=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+ sed -i '/^hacking/d' test-requirements.txt || die
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
index 662fa344e146..35574a62ce0a 100644
--- a/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
+++ b/dev-python/pytest-relaxed/pytest-relaxed-1.1.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="BSD-2"
-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 ~m68k-mint ~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 ~m68k-mint ~sparc-solaris"
IUSE="test"
RDEPEND="
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
new file mode 100644
index 000000000000..03d16a6d9ccf
--- /dev/null
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -0,0 +1 @@
+DIST aiohttp-theme-0.1.4.tar.gz 10723 BLAKE2B afc398bb65e69fcc931f214c613f789da07c89bafd26ff207d4c5666edbe323f77c4a6fec09817d4dc6bb1d40e21ddd82f0b7b5c25dc5fe89b8b83c1c423bad7 SHA512 b487c9095a677baf9471b93be5b9cc3a697f62d2674d27ea4a7aee043e5dd75c5543a0e0a2e51c28e36e5bbf324bcb6d06786b31ae3b492ad2f972c6776c40af
diff --git a/dev-python/sphinx-aiohttp-theme/metadata.xml b/dev-python/sphinx-aiohttp-theme/metadata.xml
new file mode 100644
index 000000000000..b7700e6c436f
--- /dev/null
+++ b/dev-python/sphinx-aiohttp-theme/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ zmedico@gentoo.org
+
+
+ aio-libs/aiohttp-theme
+ aiohttp-theme
+
+
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.4.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.4.ebuild
new file mode 100644
index 000000000000..e4a37d75b9e1
--- /dev/null
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+inherit distutils-r1
+
+MY_PN="aiohttp-theme"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Sphinx theme for aiohttp"
+HOMEPAGE="https://github.com/aio-libs/aiohttp-theme"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 4791c19b74e2..6a3cdfa4ea60 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
index 98972468ba2d..038f92f9ecc6 100644
--- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
+++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20180120.ebuild
@@ -106,12 +106,14 @@ src_configure() {
local mycmakeargs=(
-DPORT=Qt
-DENABLE_API_TESTS=OFF
+ -DENABLE_TOOLS=OFF
-DENABLE_GEOLOCATION=$(usex geolocation)
-DUSE_GSTREAMER=$(usex gstreamer)
-DENABLE_JIT=$(usex jit)
-DUSE_QT_MULTIMEDIA=$(usex multimedia)
-DENABLE_NETSCAPE_PLUGIN_API=$(usex nsplugin)
-DENABLE_OPENGL=$(usex opengl)
+ -DENABLE_PRINT_SUPPORT=$(usex printsupport)
-DENABLE_DEVICE_ORIENTATION=$(usex orientation)
-DENABLE_WEBKIT2=$(usex qml)
$(cmake-utils_use_find_package webp WebP)
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index b5ca2150a923..d4bb89f5016c 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 994880b1e04f..62b4f319a7fa 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,3 +1,4 @@
+DIST ox-2.10.0.tar.gz 199144 BLAKE2B e2d175c379e4c860d540313642ab4ea39cca1eed7d5a0a896f6eb09786d0c421f5a2a0e4af5880c07b757a1604a8ede47ef4737739eaf53f9ba733b67b3e0091 SHA512 0fc7809f86528c745cc6719fd92bb51fe7c895c62b2cd27c02f2b596c19078f04aacfee90e489bede0ecd47876e36280e6852509f6d34f9b4a6292441745763a
DIST ox-2.8.2.tar.gz 193670 BLAKE2B 70e38754594a40ed35aa43aad32806d5c9eec7d3f60ee18a846a99f28b558173ea99b554f7f3a4f2b848686536d194035fd345ab33b9d7b5e12a246a472463d4 SHA512 18a887db70962a1dd1c6ea18461eca0efbcffdb231f934c3603e63537e9911e820465ce5e4ab86cbedd65b396a9a12b0ad7e60ea7ae687c4ebe8436e0c37988c
DIST ox-2.9.3.tar.gz 198296 BLAKE2B 90f3e3b159caf8aede8233d49dc67a42bf9d5d7348769f50ad042fdb54e01f2672fb3f04d6062663e35cc1819389a16457905c80891846fca859334e0f6d0863 SHA512 fb342376c5d01029ee6ec18deb10561e7e4e123707bda7f1ab4c8782beee7493a7dd3f7745c179ec04d868c9787899715edd2f74b26ad4f769b14d1e6b54da1f
DIST ox-2.9.4.tar.gz 198547 BLAKE2B 4a088fb9d8ff0aa89c6496f8d1228ca33445e34fd66476de288c4373401421b27fceced671d4754b23ddc4da0b49b1ddba1ce060c5468723a146e4d5d10b7a0f SHA512 babb1e4a88596553ddba79afeaa2bad0221e90e08cc0505c8297b61b6a1acb7c9e458ee71da420ee49378c4ac8d3b8545d1ab7e05710da556c452f3f7bb133f1
diff --git a/dev-ruby/ox/ox-2.10.0.ebuild b/dev-ruby/ox/ox-2.10.0.ebuild
new file mode 100644
index 000000000000..f03cb3bed818
--- /dev/null
+++ b/dev-ruby/ox/ox-2.10.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="http://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_configure() {
+ ${RUBY} -Cext/ox extconf.rb || die
+}
+
+each_ruby_compile() {
+ emake V=1 -Cext/ox
+ cp ext/ox/ox$(get_modname) lib/ox/ || die
+}
+
+each_ruby_test() {
+ ${RUBY} test/tests.rb || die
+}
diff --git a/dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild b/dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild
index 6810f7aa2f52..44346f7ba08a 100644
--- a/dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild
+++ b/dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -24,7 +24,5 @@ ruby_add_rdepend ">=dev-ruby/sinatra-1.4"
ruby_add_bdepend "test? ( dev-ruby/haml dev-ruby/rack-test dev-ruby/rspec-its dev-ruby/timecop )"
all_ruby_prepare() {
- # Use a rack version consistent with sinatra
- sed -i -e '2igem "rack", "~>1.0"' \
- -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
+ sed -i -e '/simplecov/,/^end/ s:^:#:' spec/spec_helper.rb || die
}
diff --git a/dev-ruby/six/six-0.2.0.ebuild b/dev-ruby/six/six-0.2.0.ebuild
index beb43f942e72..92a38686592b 100644
--- a/dev-ruby/six/six-0.2.0.ebuild
+++ b/dev-ruby/six/six-0.2.0.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
RUBY_FAKEGEM_RECIPE_DOC=""
diff --git a/dev-ruby/stamp/stamp-0.6.0.ebuild b/dev-ruby/stamp/stamp-0.6.0.ebuild
index 42f25e85d6a3..6eee587d06d0 100644
--- a/dev-ruby/stamp/stamp-0.6.0.ebuild
+++ b/dev-ruby/stamp/stamp-0.6.0.ebuild
@@ -3,7 +3,7 @@
EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_TEST="cucumber"
RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/subexec/subexec-0.2.3-r1.ebuild b/dev-ruby/subexec/subexec-0.2.3-r1.ebuild
index 0154b8bee659..e2020c1f8862 100644
--- a/dev-ruby/subexec/subexec-0.2.3-r1.ebuild
+++ b/dev-ruby/subexec/subexec-0.2.3-r1.ebuild
@@ -3,12 +3,12 @@
EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
inherit ruby-fakegem eutils
diff --git a/dev-ruby/syslogger/syslogger-1.6.5.ebuild b/dev-ruby/syslogger/syslogger-1.6.5.ebuild
index 308f73107041..f97cce32978b 100644
--- a/dev-ruby/syslogger/syslogger-1.6.5.ebuild
+++ b/dev-ruby/syslogger/syslogger-1.6.5.ebuild
@@ -1,8 +1,8 @@
-# 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="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
diff --git a/dev-ruby/tidy_table/tidy_table-0.0.5-r4.ebuild b/dev-ruby/tidy_table/tidy_table-0.0.5-r4.ebuild
index d676c249fc01..1b47836e3910 100644
--- a/dev-ruby/tidy_table/tidy_table-0.0.5-r4.ebuild
+++ b/dev-ruby/tidy_table/tidy_table-0.0.5-r4.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
diff --git a/dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild b/dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild
index b325d29339c3..c74a7193d928 100644
--- a/dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild
+++ b/dev-ruby/typed-array/typed-array-0.1.2-r1.ebuild
@@ -6,9 +6,9 @@ EAPI=5
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
inherit ruby-fakegem
DESCRIPTION="Gem provides enforced-type functionality to Arrays"
diff --git a/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild b/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
index d51c2a60206f..1a22074b10bb 100644
--- a/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
+++ b/dev-ruby/ultraviolet/ultraviolet-1.0.1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a3a11eb5d472..9777c1fdeda9 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 040b0e26bd3b..538e0523710a 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,3 +1,3 @@
DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
-DIST ccache-3.4.2.tar.xz 324340 BLAKE2B e49582b4ff254dd4cd210634342d7b21d5c099892d4c7f3240122a3b9de013477f6c440eaf73d06fc0445020e225562528babfb41d10ca1fab68052c1e726531 SHA512 9bf07269df6785bb92758093f46f3be4df45de532e431e0bc3a68a7170d1782376a9b4495acf77569549062c84f61621c21c5d200e271cd064dbda4a73276f8e
+DIST ccache-3.4.3.tar.xz 328824 BLAKE2B f2ff3276cbadde642a362400b32291f59f60c274861c4c706f0bced801aec7aeeafeeb611331bc23e96fc8790a1d1ffd39df58f24f6a5384d8ddda0da54c9339 SHA512 8a92ef3f3b3688bb4c0b39106bea387ec3065a074327c1fa793e511192acd5cf9aeb5c0065ee8868a944ec63463c2b59fb84edd952102468cd12fcbb1ee16c49
diff --git a/dev-util/ccache/ccache-3.3.4.ebuild b/dev-util/ccache/ccache-3.3.4.ebuild
deleted file mode 100644
index e320f86f1d07..000000000000
--- a/dev-util/ccache/ccache-3.3.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils readme.gentoo-r1
-
-DESCRIPTION="fast compiler cache"
-HOMEPAGE="https://ccache.samba.org/"
-SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="app-arch/xz-utils
- sys-libs/zlib"
-RDEPEND="${DEPEND}
- sys-apps/gentoo-functions"
-
-src_prepare() {
- # make sure we always use system zlib
- rm -rf zlib || die
- epatch "${FILESDIR}"/${PN}-3.3-size-on-disk.patch #456178
- sed \
- -e "/^EPREFIX=/s:'':'${EPREFIX}':" \
- "${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_install() {
- DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.md )
- default
-
- dobin ccache-config
-
- DOC_CONTENTS="
-To use ccache with **non-Portage** C compiling, add
-${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin.
-Portage 2.0.46-r11+ will automatically take advantage of ccache with
-no additional steps. If this is your first install of ccache, type
-something like this to set a maximum cache size of 2GB:\\n
-# ccache -M 2G\\n
-If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
-# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
-ccache now supports sys-devel/clang and dev-lang/icc, too!"
-
- readme.gentoo_create_doc
-}
-
-pkg_prerm() {
- if [[ -z ${REPLACED_BY_VERSION} ]] ; then
- "${EROOT}"/usr/bin/ccache-config --remove-links
- "${EROOT}"/usr/bin/ccache-config --remove-links ${CHOST}
- fi
-}
-
-pkg_postinst() {
- "${EROOT}"/usr/bin/ccache-config --install-links
- "${EROOT}"/usr/bin/ccache-config --install-links ${CHOST}
-
- # nuke broken symlinks from previous versions that shouldn't exist
- rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die
- rm -rf "${EROOT}"/usr/lib/ccache.backup || die
-
- readme.gentoo_print_elog
-}
diff --git a/dev-util/ccache/ccache-3.4.2.ebuild b/dev-util/ccache/ccache-3.4.3.ebuild
similarity index 100%
rename from dev-util/ccache/ccache-3.4.2.ebuild
rename to dev-util/ccache/ccache-3.4.3.ebuild
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index 8b1de61bf44b..1ed66d04d7a0 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,2 +1 @@
-DIST gource-0.48.tar.gz 873333 BLAKE2B 95b876b486f0215f7516cb2bb940dd00771f67659cb2d10ad23e9da0732a51e3f2030d8f7599a8be901f0211bf1c484964f1fb66696be01c990a7b99d1123084 SHA512 5b638cac9b464c0d8f0df87ae0115c36d314cce9cd0ce269b05e0a635ff6f23e62d06d0def484b796267299041e4de675cb13a0381b19d9144bbdc1d3b7f1b16
DIST gource-0.49.tar.gz 874349 BLAKE2B b7d24f415944921deb7df33be4e9918291f5df6dd4813bf98727894e0192b881a583a1dacec2d6e8f2d1a0d6b644bc3b735ef8d7c0b7882d77bcd80913fe08c5 SHA512 cb3482dd06cf38bd775f2ac4b8f3bee78e480dd51e37527024df6e59d6e613290297d65e167a21364aa6251eff78a50ecc8a5fd3772a6e9a4ad22ca21b4b615e
diff --git a/dev-util/gource/gource-0.48.ebuild b/dev-util/gource/gource-0.48.ebuild
deleted file mode 100644
index 34639205e93e..000000000000
--- a/dev-util/gource/gource-0.48.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="A software version control visualization tool"
-HOMEPAGE="http://gource.io/"
-SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
- >=dev-libs/boost-1.46:=[threads(+)]
- >=media-libs/glew-1.5:0=
- >=media-libs/libpng-1.2:0=
- media-libs/libsdl2[video,opengl,X]
- media-libs/sdl2-image[jpeg,png]
- dev-libs/libpcre:3
- dev-libs/tinyxml
- media-libs/freetype:2
- media-libs/mesa
- virtual/glu:0
-"
-RDEPEND="${COMMON_DEPEND}
- media-fonts/freefont
-"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
- >=media-libs/glm-0.9.3
-"
-
-DOCS=( README ChangeLog THANKS )
-
-src_configure() {
- # fix bug #386525
- # this enables gource to be compiled against dev-libs/tinyxml[stl]
- if has_version dev-libs/tinyxml[stl]; then
- append-cppflags -DTIXML_USE_STL;
- fi
-
- econf \
- --enable-ttf-font-dir=/usr/share/fonts/freefont/ \
- --with-tinyxml
-}
diff --git a/dev-util/gource/gource-0.49.ebuild b/dev-util/gource/gource-0.49.ebuild
index cd54b4eb2266..34639205e93e 100644
--- a/dev-util/gource/gource-0.49.ebuild
+++ b/dev-util/gource/gource-0.49.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
COMMON_DEPEND="
diff --git a/dev-util/kdevelop/kdevelop-5.2.4.ebuild b/dev-util/kdevelop/kdevelop-5.2.4.ebuild
index 361ca0737b8f..f07d8b229fdc 100644
--- a/dev-util/kdevelop/kdevelop-5.2.4.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.2.4.ebuild
@@ -12,11 +12,9 @@ inherit kde5
DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
LICENSE="GPL-2 LGPL-2"
-IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage"
+IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit"
[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
-REQUIRED_USE="test? ( welcomepage )"
-
COMMON_DEPEND="
$(add_frameworks_dep karchive)
$(add_frameworks_dep kbookmarks)
@@ -49,7 +47,7 @@ COMMON_DEPEND="
$(add_frameworks_dep threadweaver)
$(add_kdeapps_dep libkomparediff2)
$(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtdeclarative 'widgets')
$(add_qt_dep qtgui)
$(add_qt_dep qthelp)
$(add_qt_dep qtnetwork)
@@ -74,7 +72,6 @@ COMMON_DEPEND="
)
webkit? ( $(add_qt_dep qtwebkit) )
!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
- welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
@@ -109,7 +106,6 @@ src_configure() {
$(cmake-utils_use_find_package reviewboard KF5Purpose)
$(cmake-utils_use_find_package subversion SubversionLibrary)
$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
- $(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
)
use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
diff --git a/dev-util/molecule-plugins/Manifest b/dev-util/molecule-plugins/Manifest
index f65a3121f1c9..14f5e024b048 100644
--- a/dev-util/molecule-plugins/Manifest
+++ b/dev-util/molecule-plugins/Manifest
@@ -1 +1 @@
-DIST molecule-plugins-1.0.2.tar.bz2 17428 BLAKE2B 60fac83a501bd8f0c05588dcace522c59093cd0fcebcc87d86c8b8301f775d4cb6367e2d83c3146b1514e53f800dd2a34185d48575636c401724dc4e471b230a SHA512 65b75c23f3c662812be2ab4fe0c92bd99aba48da6e05aad6175ba3fe1cd8106d9085ed53f27c738ef6af1b327ac8ac872ef7c3c48728366b510b7a82bb90c866
+DIST molecule-plugins-1.0.3.tar.bz2 17662 BLAKE2B 6bbbd484ec7fc8441bfccc8c716475e9bf831804a79a0add1dedd428f2dadbbd1a3025966db25619c34364f2a0b6873946c121f1df6fd3a2dc041a3a7341565a SHA512 e00bb7ed9a19452f0363e3453b56a86c22b2f96b843798ad20c6c61a87acf72a389158bb7c8b1b09cbcdfbcbb4b081996c47b6327d790b72c98a13270ce4cb6c
diff --git a/dev-util/molecule-plugins/molecule-plugins-1.0.2-r1.ebuild b/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
similarity index 94%
rename from dev-util/molecule-plugins/molecule-plugins-1.0.2-r1.ebuild
rename to dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
index 746d3b7fc28e..c06bd99700c7 100644
--- a/dev-util/molecule-plugins/molecule-plugins-1.0.2-r1.ebuild
+++ b/dev-util/molecule-plugins/molecule-plugins-1.0.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"
diff --git a/dev-util/perf/perf-4.14.33.ebuild b/dev-util/perf/perf-4.14.33.ebuild
index 609530402717..dc982eb33d6c 100644
--- a/dev-util/perf/perf-4.14.33.ebuild
+++ b/dev-util/perf/perf-4.14.33.ebuild
@@ -37,7 +37,7 @@ SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 9ad91784d21d..e2217ecd111a 100644
Binary files a/dev-vcs/Manifest.gz and b/dev-vcs/Manifest.gz differ
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 313e78c2bc11..1bdf20d7768e 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -1,9 +1,9 @@
DIST git-2.16.4.tar.xz 4968252 BLAKE2B 77f76408bde02bfacdb99d22baca05893f63c96d1fb7508c7e92541f8f7ec9ced0dad650be788fd28a1e03b5d88b88708652d07a47bedaae60a9cbd4e2eec858 SHA512 f54e431e78289349dcb927ec34873dfb801c49a41cbb3d0138346d603af26bd7d86f9ac95e7a61a4831017f3503f33374510ccf68b0e62b0691fc5a43283f1ac
-DIST git-2.17.1.tar.xz 5015484 BLAKE2B d3a61023872a15e3176e4dae6df83d4c2369a377244d44dfd7a63a15ecc3a7b145093afd5d6fa72e4eca98ba4f81f7ccd89ac2400c9cf8107ac04fd35d8bf6e4 SHA512 77c27569d40fbae1842130baa0cdda674a02e384631bd8fb1f2ddf67ce372dd4903b2ce6b4283a4ae506cdedd5daa55baa2afe6a6689528511e24e4beb864960
DIST git-2.18.0.tar.xz 5102264 BLAKE2B 94a8469a0e489d517136233301f1af622a3e612967316620800a771721f4e558dfb9159f158ddd07d294fce3ceb256038483f5a8c1fe6a84f661710857945dce SHA512 db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46
+DIST git-2.19.0.rc1.tar.xz 5182228 BLAKE2B 48249229d5932c891bb201aed224584b6be05c1658128305614028bec182cc456e714a0285acf601ce02d65ef0bd947ea7a1ab1edf6b63cb930bd0afa8d51b1f SHA512 d628387d78a34ee5b182c0f34ae9e0f2ecf63ce6c969400ad0d472b86eef90577046a137261c4ce504ad970a86e46d73302e2cce665f69f35a2e9715cd2cd459
DIST git-htmldocs-2.16.4.tar.xz 1164256 BLAKE2B 88a7ab5b094f15bc2b6c0f4d4c3eae185f6e6c0f00f4aca75492f0cc964428d1bf53002e0e43468b60b62058af5f13b061231061247e19b32bc70c2c8adb04eb SHA512 8f4a8c51656559af81296fb064ecf0f88444952c7f8ee91b85e5a61b20d200267d7432f720ded12046bab986361cff48cf7a2f5d21e05c1ac7648cc3168a0049
-DIST git-htmldocs-2.17.1.tar.xz 1173296 BLAKE2B 5133a86fb73cd58d6a9d4ed05d32949f642c9a670a49ea67c7170dfb39c4ff3f63d5f220abebcc979f87a360ec2990ccf5a9e3c18e8fcb07082bac111ecb12c7 SHA512 69054b087ffd1c88532672c6edea3cd27e08421f25c09a1a304420ec6aa20806888f71e4ef21aac1bc2fed81a045a64ae164a9dc377eb48d61887bf8d787782c
DIST git-htmldocs-2.18.0.tar.xz 1201076 BLAKE2B f5d592cadf1eb9a24b6d6fb3c68c1ead385a350e4bfc97eee775f1921c7bf47f8790d1eea803d69cde8e381d7aa0ae4c53aebeda464c32cdd7a6558a46a9c8e7 SHA512 e227673216b67cf0e5d0abacc305a3b2a30844a6fe31aab18e37643f27c0fce7d3628366732f1518784d095eb33c1bb60b4eb00024d9ccc662deca2962db5324
+DIST git-htmldocs-2.19.0.rc1.tar.xz 1221080 BLAKE2B 68e6f4848f80f26dad5f8b422a361c641a21ae88f92a29cc9fd40c0d3644267bf0c72664fbac3a72a9c7ecac4c469508f8907d9bac85b1697c272b2a9df2c441 SHA512 2254d22b9279fca4659c0dbd8b9d1e2c5ac9a28ddfaf1b0c94dcf4a56126967bc6bfc424af6ffc5ca718d07ca008720b7ff4cb66e8ce28935fb9c32d4fc8ad75
DIST git-manpages-2.16.4.tar.xz 417136 BLAKE2B 9a75913dae62fa2eb31cf48e77e266aa8d91c67b8a753c1740283b1d626dea1e9aa8d7cea06d9b97887f801b4d1f1b927014851105cefd3241ca7ab7330bfc8b SHA512 8029e9fac1eca542e809da1247f4eec3a2c81c0eb12d03aa816dcf120677011d3e409b06c28c8e7dbf41cbbcca873ec93846dc317bc73e57f4d4701ce7abf73d
-DIST git-manpages-2.17.1.tar.xz 419400 BLAKE2B af8cef1ac43c6b5ee073c7e18c161ba3ebe0669e474833211c95e72b33524050c30ca133ada98e07c8b481ffc4a5cbce1e7d68427b7aeb9bb80534c2ef3623f0 SHA512 fbdd4ef99419d244bc7c03b10cf09e92d1f0894879fe159ee1f53262daebdc7fe72d6c2bbe9e21fe354f8afb26fa06b35788e54b0c078b686706b511bf7c33ee
DIST git-manpages-2.18.0.tar.xz 425516 BLAKE2B ff979aa0c99716da279cd4001d5907cec95e93ac93f1f2dc5dd79d456a185e0d8610a121b08b07c3c886132e94334114932881d78c7307ff287c256f993938e5 SHA512 8ae353083288e58752e6e6ff505cde6f4fa0be20465443c0517a87af28867d748eb29fc9d3dcb805b29c4e422cf4eae124b7fec5c339888ab4ebaff6360ada15
+DIST git-manpages-2.19.0.rc1.tar.xz 431844 BLAKE2B 3a5477dbf9e5b8b11c347a93cd8f1ed3c9e28c8317d56b909dcb77c2b25c140aaf3bf897a9c65e1d55e5581c755a679051249d2684a8532e1ccfa0bfcb068fd8 SHA512 82dd782f7fbc5a7d7ae5f8caa201ca48b04d279683671f790db9a777723c50d9fa4d2be239e273af99cd0f72f2c9d9da763dff54934b94564aad05e9a8502e1e
diff --git a/dev-vcs/git/files/git-2.17.0-mw_install_path_fix.patch b/dev-vcs/git/files/git-2.17.0-mw_install_path_fix.patch
deleted file mode 100644
index 5a66a4c89be0..000000000000
--- a/dev-vcs/git/files/git-2.17.0-mw_install_path_fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From cfb3a47cada99d1bdccd08426f122ded2a63834e Mon Sep 17 00:00:00 2001
-From: Christian Hesse
-Date: Tue, 10 Apr 2018 15:36:41 +0200
-Subject: [PATCH] perl: fix installing modules from contrib
-
-Commit 20d2a30f (Makefile: replace perl/Makefile.PL with simple make rules)
-removed a target that allowed Makefiles from contrib/ to get the correct
-install path. This introduces a new target for main Makefile and fixes
-installation for Mediawiki module.
-
-v2: Pass prefix as that can have influence as well, add single quotes
- for _SQ variant.
-
-Signed-off-by: Christian Hesse
----
- Makefile | 2 ++
- contrib/mw-to-git/Makefile | 5 +++--
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 2091f5f892cc8..75b9ad3b480cb 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1973,6 +1973,8 @@ GIT-PERL-DEFINES: FORCE
- echo "$$FLAGS" >$@; \
- fi
-
-+perllibdir:
-+ @echo '$(perllibdir_SQ)'
-
- .PHONY: gitweb
- gitweb:
-diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile
-index a4b6f7a2cd412..4e603512a39fe 100644
---- a/contrib/mw-to-git/Makefile
-+++ b/contrib/mw-to-git/Makefile
-@@ -21,8 +21,9 @@ HERE=contrib/mw-to-git/
- INSTALL = install
-
- SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
--INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/perl \
-- -s --no-print-directory instlibdir)
-+INSTLIBDIR=$(shell $(MAKE) -C $(GIT_ROOT_DIR)/ \
-+ -s --no-print-directory prefix=$(prefix) \
-+ perllibdir=$(perllibdir) perllibdir)
- DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
- INSTLIBDIR_SQ = $(subst ','\'',$(INSTLIBDIR))
-
diff --git a/dev-vcs/git/git-2.17.1-r1.ebuild b/dev-vcs/git/git-2.19.0_rc1.ebuild
similarity index 99%
rename from dev-vcs/git/git-2.17.1-r1.ebuild
rename to dev-vcs/git/git-2.19.0_rc1.ebuild
index ac72e5259972..186cdcff1c84 100644
--- a/dev-vcs/git/git-2.17.1-r1.ebuild
+++ b/dev-vcs/git/git-2.19.0_rc1.ebuild
@@ -137,9 +137,7 @@ REQUIRED_USE="
PATCHES=(
# bug #350330 - automagic CVS when we don't want it is bad.
- "${FILESDIR}"/git-2.17.0_rc1-optional-cvs.patch
-
- "${FILESDIR}"/git-2.17.0-mw_install_path_fix.patch #655960
+ "${FILESDIR}"/git-2.18.0_rc1-optional-cvs.patch
"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 595b6e6556ca..3556a1013e39 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index b8b2dd91a858..b22a98646b70 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -22,16 +22,16 @@ HOMEPAGE="https://www.dolphin-emu.org/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="alsa ao bluetooth discord-presence doc egl +evdev ffmpeg libav log lto openal portaudio profile pulseaudio +qt5 sdl systemd upnp"
+IUSE="alsa bluetooth discord-presence doc egl +evdev ffmpeg libav log lto profile pulseaudio +qt5 sdl systemd upnp"
RDEPEND="
- >=media-libs/libsfml-2.1
- >net-libs/enet-1.3.7
- >=net-libs/mbedtls-2.1.1:=
dev-libs/hidapi:0=
dev-libs/lzo:2=
dev-libs/pugixml:0=
media-libs/libpng:0=
+ media-libs/libsfml
+ net-libs/enet:1.3
+ net-libs/mbedtls
net-misc/curl:0=
sys-libs/readline:0=
sys-libs/zlib:0=
@@ -41,7 +41,6 @@ RDEPEND="
virtual/libusb:1
virtual/opengl
alsa? ( media-libs/alsa-lib )
- ao? ( media-libs/libao )
bluetooth? ( net-wireless/bluez )
egl? ( media-libs/mesa[egl] )
evdev? (
@@ -52,11 +51,6 @@ RDEPEND="
libav? ( media-video/libav:= )
!libav? ( media-video/ffmpeg:= )
)
- openal? (
- media-libs/openal
- media-libs/libsoundtouch
- )
- portaudio? ( media-libs/portaudio )
profile? ( dev-util/oprofile )
pulseaudio? ( media-sound/pulseaudio )
qt5? (
@@ -66,7 +60,7 @@ RDEPEND="
)
sdl? ( media-libs/libsdl2[haptic,joystick] )
systemd? ( sys-apps/systemd:0= )
- upnp? ( >=net-libs/miniupnpc-1.7 )
+ upnp? ( net-libs/miniupnpc )
"
DEPEND="${RDEPEND}
app-arch/zip
@@ -78,26 +72,6 @@ DEPEND="${RDEPEND}
src_prepare() {
cmake-utils_src_prepare
- # Remove automatic dependencies to prevent building without flags enabled.
- if use !alsa; then
- sed -i -e '/include(FindALSA/d' CMakeLists.txt || die
- fi
- if use !ao; then
- sed -i -e '/check_lib(AO/d' CMakeLists.txt || die
- fi
- if use !bluetooth; then
- sed -i -e '/check_lib(BLUEZ/d' CMakeLists.txt || die
- fi
- if use !openal; then
- sed -i -e '/include(FindOpenAL/d' CMakeLists.txt || die
- fi
- if use !portaudio; then
- sed -i -e '/CMAKE_REQUIRED_LIBRARIES portaudio/d' CMakeLists.txt || die
- fi
- if use !pulseaudio; then
- sed -i -e '/check_lib(PULSEAUDIO/d' CMakeLists.txt || die
- fi
-
# Remove all the bundled libraries that support system-installed
# preference. See CMakeLists.txt for conditional 'add_subdirectory' calls.
local KEEP_SOURCES=(
@@ -141,19 +115,23 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DUSE_SHARED_ENET=ON
- -DUSE_DISCORD_PRESENCE=$(usex discord-presence)
- -DENCODE_FRAMEDUMPS=$(usex ffmpeg)
- -DFASTLOG=$(usex log)
- -DOPROFILING=$(usex profile)
-
+ # Use ccache only when user did set FEATURES=ccache (or similar)
+ # not when ccache binary is present in system (automagic).
+ -DCCACHE_BIN=CCACHE_BIN-NOTFOUND
+ -DENABLE_ALSA=$(usex alsa)
+ -DENABLE_BLUEZ=$(usex bluetooth)
-DENABLE_EVDEV=$(usex evdev)
+ -DENCODE_FRAMEDUMPS=$(usex ffmpeg)
-DENABLE_LLVM=OFF
-DENABLE_LTO=$(usex lto)
+ -DENABLE_PULSEAUDIO=$(usex pulseaudio)
-DENABLE_QT=$(usex qt5)
-DENABLE_SDL=$(usex sdl)
-
+ -DFASTLOG=$(usex log)
+ -DOPROFILING=$(usex profile)
+ -DUSE_DISCORD_PRESENCE=$(usex discord-presence)
-DUSE_EGL=$(usex egl)
+ -DUSE_SHARED_ENET=ON
-DUSE_UPNP=$(usex upnp)
)
@@ -176,12 +154,6 @@ src_install() {
pkg_postinst() {
# Add pax markings for hardened systems
pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
-
- if ! use portaudio; then
- ewarn "If you want microphone capabilities in dolphin-emu, rebuild with"
- ewarn "USE=\"portaudio\""
- fi
-
gnome2_icon_cache_update
}
diff --git a/games-emulation/jrommanager/Manifest b/games-emulation/jrommanager/Manifest
index 158fd6ea7e8b..3d6bbee60d2d 100644
--- a/games-emulation/jrommanager/Manifest
+++ b/games-emulation/jrommanager/Manifest
@@ -1,2 +1,3 @@
DIST JRomManager-1.6b20.zip 9284236 BLAKE2B a874837e90bdd8ec6c55850fd0e61cabeb767f4b4eba6517a11f3de036a6fd95f7507593da7b5247824c38077b12ac52c490f5ec0e72077bd972c78810c58ebd SHA512 5d4a98989bd9eb2ba94dd50fe451308d9a628414e33cdc84814c55bf9679c3779253a8fab895e2f7922e3b837949e8065f2799707aeaab94d79a12ba73d83638
DIST JRomManager-1.7b24.zip 9293410 BLAKE2B e73456273e6b2ef960bf94f9c0b4f241829474187fbe7205f98f1bf03abfc3e5eeed4803303ede6e937168daf9eed0ea47499addc00eb153269e9228f4bded61 SHA512 e10ad63348d9eba20175b5d620b32876730900abbe2d8bf9add1ba58f2b7f1d54fbd5a94ec937ab8b94f69c29979302630f2e81cba8d10176b83ec65ba55333f
+DIST JRomManager-1.8b27.zip 9382160 BLAKE2B a7508d7beef0939c99c18688a07f4dd41e5bef00c8c27d2b3cc2e46089c99a0a1b90a8ff67050c3f4ea223d48c5b39615a2457a369dbd8484344d55244e79016 SHA512 a3688760565ef3a6514b433eeba5850352d5159ab27243053ebdf2280f8edd0d5cfb014859925c1a9c74bc873dfd18a871789a5d13a9a34a2582de89747b1561
diff --git a/games-emulation/jrommanager/jrommanager-1.8_p27-r1.ebuild b/games-emulation/jrommanager/jrommanager-1.8_p27-r1.ebuild
new file mode 100644
index 000000000000..5a3f091d0147
--- /dev/null
+++ b/games-emulation/jrommanager/jrommanager-1.8_p27-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=JRomManager
+MY_PV=${PV/_p/b}
+MY_P="${MY_PN}-${MY_PV}"
+
+inherit desktop
+
+DESCRIPTION="A Mame and Retrogaming Rom Manager, Java alternative to ClrMamePro"
+HOMEPAGE="https://github.com/optyfr/JRomManager"
+SRC_URI="https://github.com/optyfr/${MY_PN}/releases/download/${MY_PV}/${MY_P}.zip"
+QA_PREBUILT="*"
+
+S="${WORKDIR}"
+
+LICENSE="GPL-2 GPL-2-with-classpath-exception BSD-2 MIT Apache-2.0 LGPL-2.1 unRAR"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND="${DEPEND}
+ app-arch/unzip"
+
+src_prepare() {
+ default
+
+ sed -e "/cd.*/s:.*:cd \"${EROOT}/usr/share/${PN}\" || exit:" -i *.sh || die "sed failed!"
+ unzip -j ${MY_PN}.jar "jrm/resources/rom.png" || die
+}
+
+src_install() {
+ insinto "/usr/share/${PN}"
+ doins *.jar
+ doins -r lib
+ newbin "${MY_PN}-multi.sh" "${PN}"
+ newicon "rom.png" "${PN}.png"
+ make_desktop_entry "${PN}" '' '' 'Utility'
+}
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 0d6e54943c7b..3b7eb8719df9 100644
Binary files a/kde-plasma/Manifest.gz and b/kde-plasma/Manifest.gz differ
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest
index 321ef45b30b1..138674a6247d 100644
--- a/kde-plasma/bluedevil/Manifest
+++ b/kde-plasma/bluedevil/Manifest
@@ -1,3 +1,3 @@
DIST bluedevil-5.12.5.tar.xz 149604 BLAKE2B 3be0b934e91bc7bd739284674d2bd734db0b1d6d76e1cb1e75b92e72cab46dd86a0e17f455dd570f1c05881826ebaabd6c42653a2b352e8dfc783a5ba60634b1 SHA512 e99ac736110dde8042920ced22aeee965c2080766f2043b20b26937c9573310ebee9db71c347f3e7ebcd46798871b2c14f47ac2177241d3b2d539fe7bffda017
DIST bluedevil-5.12.6.tar.xz 149504 BLAKE2B 6ad4b44102c79012a58bfafbdb05c29709e45117e89775de38cb45e0da5f85a5d48880e7fc79e31fb46f93b8422fdc5864b7dfeddcedacf0a43f9b060608c33d SHA512 940328b7249d9198bf87a4a7437b615e40280c27a60988975ea569bb3f23609fa2c86eb7cc0aa8c4532611ddf9f0f7a15b1090ab69ce9601569918ee4ff99396
-DIST bluedevil-5.13.4.tar.xz 149424 BLAKE2B 82ca790d3bb71dae3b0edf33134c3e952781525de1545d003c287d45fc3543e33cf25f5596a718b2408755d6bc37caacdc7312e8ae14e8125f0313abccd9eb6a SHA512 7341182ef792d71e2f5e119efc336a5a46e921436bfb4abb461a2664b14d8a801d559f1f0a4fcd3588f01ee1b15ffe819fe74b20fb32ef6aa82012c5f67bc604
+DIST bluedevil-5.13.5.tar.xz 149356 BLAKE2B 5c56c17c920b5d10ef8e221917a43d78ccbb9c5006dcddff3ef8e14e07e38519eeeb5acbc5272e790c4a4424e4580876343abf1f0cd58f420dbc21b5ee5e85ea SHA512 757d7886225d2d3698fc743fe9b04d833a82c394d28b0d3708867bcb34e06cc6bbc46e6a2f3f2bab83126bcd13293c158cc0b9527b79677d53f389758cd9cdd9
diff --git a/kde-plasma/bluedevil/bluedevil-5.13.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/bluedevil/bluedevil-5.13.4.ebuild
rename to kde-plasma/bluedevil/bluedevil-5.13.5.ebuild
diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest
index 150876233e5a..e0eae508ef06 100644
--- a/kde-plasma/breeze-grub/Manifest
+++ b/kde-plasma/breeze-grub/Manifest
@@ -1,3 +1,3 @@
DIST breeze-grub-5.12.5.tar.xz 3140852 BLAKE2B 66ded1641a181eb1cc888c890030f46f4b36292917fda7fd32a6e61a36123580c3191a997a92438e51f38f4169cbc80c10a1851fb9602c269e6019713d52e598 SHA512 27dad6a97ae128c8827d65324ea5975718489e5b1961861dcb72dbc17bbb1e38d9d6065583d49fe96d0bdd5ecba31f61efbb3a222191b8b5420e2023ed339aa8
DIST breeze-grub-5.12.6.tar.xz 3141952 BLAKE2B dc86d799730409933db5892be6848ecf06ae8865069a8b103e780c48463b04749ce4e6c5b9aaf326ed7b87414f7c8ac6147d66c641815b9bd0a453d1636e238a SHA512 50701fa321f6770e94ed8c713ff629e45876c3e2c2c44b53307acf51dc74b3978443e017d7517d62c6d00c67fcd849b1a40f7b3e172d2bb485fbe2b46236dd05
-DIST breeze-grub-5.13.4.tar.xz 3148512 BLAKE2B b2733c35fc359d3b3395d6efc25998debc4a1d222bdb41cf0401df390e85272a0fb2da0fe0bde9ed627a67304b47fc43536e107645e1da825e37148679edec6f SHA512 6c660682d2e67f6bded69618ddaafe63ae0583df0f64cf89ebc805bc8b1c59e85c96ffc8b785608f713c48c754046e023fde8f9312bd20d4be64217f55a7bd55
+DIST breeze-grub-5.13.5.tar.xz 3142644 BLAKE2B 40c0c2327c0a6bbd0c1f3420b6f9ba7e8fe9876263835eb6ba7ff4b443ea40fa72635f9c5a64e91ca291f6faafa8bbc11a0b8a1f79961f8c7cf498861c86f09b SHA512 aebb9e02b40c1d3701c3f279122e5110e62a00b55c6c5a7908ea2828aa49c64afa663950c723fa81433ed6542f74797a39813cf3fdd9fc8ab0e4b39a807b8f51
diff --git a/kde-plasma/breeze-grub/breeze-grub-5.13.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/breeze-grub/breeze-grub-5.13.4.ebuild
rename to kde-plasma/breeze-grub/breeze-grub-5.13.5.ebuild
diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest
index 03b44f67fd7d..fbf57f2a25e2 100644
--- a/kde-plasma/breeze-gtk/Manifest
+++ b/kde-plasma/breeze-gtk/Manifest
@@ -1,3 +1,3 @@
DIST breeze-gtk-5.12.5.tar.xz 213800 BLAKE2B b13c218af535b4c7f469c52f76e1bafee7ac89fdc9f75eab43b25930ce8e3ba0759681cf0dfa586b09c987c7af1d1de6c3eadcd3b1bb4f3efe89c5771ab234ab SHA512 448b66642587bddf9a49c64ff7b1fd01aab63283f91d16b572105cda39811edbfeccb13131cb3f0bebdd16dc8ba2f2d0bc4e2970690fa958a1fac1ca1357c1b8
DIST breeze-gtk-5.12.6.tar.xz 213832 BLAKE2B 2a6e9dcba1e3d17ae7ebfdf97e2cb206a0e0448ac021ce29f0f3eda80dd1e49bc5856345c1e948fae8fe877303d017a828c91bdc49057c176544c7dd8438958d SHA512 59c4f9433011a6699a2e9b8eef4053aa3c7b25d1cb8668a14fcba42c513d232501988ca5c4cedc00375cde917dd7cd1f8e8948c2d3447083f51fdfc4bd061adb
-DIST breeze-gtk-5.13.4.tar.xz 201920 BLAKE2B d85ed443576edd09178abccc1877be62161350636fc464b6fa9fa219e868e6686012a37033936203d294daf91d397102f3a237cf8b13c62e7c6c1511c3ded019 SHA512 a92e15be18eb95e9f96ec4333e77a1a390a88ad61e407de954a202b86e3e04d51692a78137d4a43d16cea2ff44d5b2073f509a74e49eddc8905ec6d186d5da97
+DIST breeze-gtk-5.13.5.tar.xz 202192 BLAKE2B ab1ac52e77a43219517659e76917817e845e3a4a6e90e6720f17369fdf10862d5d0c2834b043b07d6800a005c1d497238f9f653474da90c70e97eb045a60edc5 SHA512 6d760e3ccc2f987590c6285736a859ab06e4bbbbdf7a885bbe08b34ef3846d5be34607b25d5ded0f1d7b9af240f2903da6bf053a3d16afeae8fbe0ce28da0087
diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.13.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/breeze-gtk/breeze-gtk-5.13.4.ebuild
rename to kde-plasma/breeze-gtk/breeze-gtk-5.13.5.ebuild
diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest
index 80c361abf2f4..b36aa3755e43 100644
--- a/kde-plasma/breeze-plymouth/Manifest
+++ b/kde-plasma/breeze-plymouth/Manifest
@@ -1,3 +1,3 @@
DIST breeze-plymouth-5.12.5.tar.xz 105636 BLAKE2B 733011a010c8e142e1572031b06093d4285e870448d2ca4035366959e343cada9f2bc7c3fe3db1eef32164b39eccee74bbe655669a4e22e45f479487dfcbb20b SHA512 cafc0df15d1b429d7e5d3253940039d118467fd6fa9ebaad9ff2c1ff9f747a7d82f5311ea181aca675d03f0b7067d7602517378e5e0bfb6476291229dd96deb3
DIST breeze-plymouth-5.12.6.tar.xz 105504 BLAKE2B ba4f6701e61031f85578f243b5fb8ba5abcd2f01b5596d0edca07ca5058a9a34a9b0b66f3be09900d223cd1eb2b9b72c1b1ea332dea657b3cb3fc6c6d6f262f5 SHA512 1a487020ecc954648c8524cbcc5c10fd07c9d4f6fc2c03145e0d12b327db0359fb2aa42da7fdbbc6425c97bcfc81baaffc5e8b934da2dc06517e8dd7723f17a4
-DIST breeze-plymouth-5.13.4.tar.xz 105704 BLAKE2B 6853114f26c3850aeb416b83a33b3f2caca6ac305e40e3552e4bae2e77ca3403a697503f61bd3723021abdab57d794e305fccb002a16663301a0b7ae42a0862f SHA512 9b009ad148317c9f48224ba85339bc0f90cdf07ba5d7089f9a8ade5844b8e99e3422fee74d2faa7d0daa21999d2a9fa11e1c2b02d4faa0ef98713cfaffeb7c52
+DIST breeze-plymouth-5.13.5.tar.xz 105628 BLAKE2B 652b09b80dbe45535a7e5ad417c09aa02418ae2117d5a4d612f2bfa1f7a74a207fcea8a83eceeedb422b351b4a205e9be68583edddcc8cd18b22805a00cce5be SHA512 13495b3cdace829fbf8e9b0b6888f9b3e50856209e2f172a29e812705d5df23f983aec04a9b2e0fad7a9a54b255158707df452fd2cd9d5c539ea6318f51969f2
diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.13.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/breeze-plymouth/breeze-plymouth-5.13.4.ebuild
rename to kde-plasma/breeze-plymouth/breeze-plymouth-5.13.5.ebuild
diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest
index 548509218553..3fdb9cf1ed96 100644
--- a/kde-plasma/breeze/Manifest
+++ b/kde-plasma/breeze/Manifest
@@ -1,3 +1,3 @@
DIST breeze-5.12.5.tar.xz 22207864 BLAKE2B a3963b4e236391d1e8ea0709f7fe68ebc1f4b644a8fc33f83992bba2675853c25addde43edfdf01700eea06c4121f23eebfa0ee64259da31a298d78592f975af SHA512 5d21fe948c8a480ce04c45ce21b56a3b2517c7642de588debfd1e76d2b53bd1e1ef1204cbb28398d5a673a986698baf91dbfb49d95e8810188f21c104e185d46
DIST breeze-5.12.6.tar.xz 22208872 BLAKE2B c529a92d46f26f9106dbaa00e200b281f14f774794fcafeca98ac99ea51d6395f8c8939dba4d99b949d8c5026910feffab528bbd3500fbe53ebd82eae2e81f58 SHA512 8353ff97a4a85e5c21bb2e5b234f60a272679d0ec204a30a9afe808fdd3ccf92df10dc8fd04bb87ff8f885460813bbac08f5a92d592d002a2f3a44539f00d4bf
-DIST breeze-5.13.4.tar.xz 24780900 BLAKE2B 0d28440448d0ad8ef63abf4edb8d56396626ce8127c9d09e9683888b3f73d513defeadd75a76edfb60af9144ab6d2c34838adad445c6fcae0afe31bc9723db8d SHA512 4eca2a3b85e1905dbdcf9c86fca0e745c2bec558832a0bdfdbedc39fde07264690bc544c556bbd054d605f9da42935ef686c1efb1fe42929e1659d1bd849dd6d
+DIST breeze-5.13.5.tar.xz 24781812 BLAKE2B 6e68d26297f958045b1ffde4c08b0b7ba9a927f51c8f62bc30ea29cb79d0f48dc793f7faa1bdef8cce0408beda67165df52896dc94d87c41675d276957d11628 SHA512 7e2ba028070062602314798151320595e81b2bfae47040885939a0f61cf74e6159b646cf91296d0aad092250d90eb3d94cd6b2081e2debcb3b1813b8cca3aad4
diff --git a/kde-plasma/breeze/breeze-5.13.4.ebuild b/kde-plasma/breeze/breeze-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/breeze/breeze-5.13.4.ebuild
rename to kde-plasma/breeze/breeze-5.13.5.ebuild
diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest
index 8f4eff36c44a..b3d2f61e0294 100644
--- a/kde-plasma/drkonqi/Manifest
+++ b/kde-plasma/drkonqi/Manifest
@@ -1,3 +1,3 @@
DIST drkonqi-5.12.5.tar.xz 737996 BLAKE2B e16e9dd2b902e68bfbac2618152cafe978adeac53007b3e79f4a3f05ecd34b8a5652888e6875e05b4ffa1d1fb6a016389c27e19b7c880c48d271a4040e9698a7 SHA512 eb6a24a3c3b6dd8e2451b0a0ce365ec9c17a00864ba54f26796d195af0f7194a72eb31c816b77a5a6c86f0c9df0e5438cbc4fc0bcdc6415194ca54290b20a7a4
DIST drkonqi-5.12.6.tar.xz 735872 BLAKE2B 8d86c9dd53e100913f1f2e363b39d5eceb56223e33f011194c3c5cc99a30526410e215f31af09b6e551a3c16e98c05942d9fbee7597416778ec05bb182d887f1 SHA512 92866e56ffbcbc1df3cff7b52195e5b78d4abb17772871d326de77d8f9dd33b7cd50df220aef3213b2a75be284b2cf6c13f5ff76b83a2f69232901351f3d85d6
-DIST drkonqi-5.13.4.tar.xz 738628 BLAKE2B 52dc9bb8d927a0e45d8ef4d4d718403127b5812f20ed32d1509577fa7905d785fdcc957cdfaf7c63bb3b75d473c4d0c00793712138d03e7e68958b3c7e77fd8b SHA512 e1923a21ac6d8d212b190afc3ca733b3c2cb0187a856a3ce4f71d842c52c619573246aae19311dd7ffd95a8392cc3e3f73e106fb10a7148d4be4a59d45350099
+DIST drkonqi-5.13.5.tar.xz 736196 BLAKE2B e7d9eaa299c4988d08dfdb9c95965a3cdd2e9b2a5eb76b46f98083713efd0f29fcf3bacbaedd40fe599e1bbcc1dfa62832b1ab5a2a6c256854f81cc6181dc121 SHA512 2318e82afb2bf776dee5c61b502f7554d796705ae2fc77d3b7166c24b5f577a7a4dc1322ef42e57b085a0b7cb48eeda638da2cb697dca828cc6c8d5c4042861f
diff --git a/kde-plasma/drkonqi/drkonqi-5.13.4.ebuild b/kde-plasma/drkonqi/drkonqi-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/drkonqi/drkonqi-5.13.4.ebuild
rename to kde-plasma/drkonqi/drkonqi-5.13.5.ebuild
diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest
index c5fe323a382f..8d6b3748e4e2 100644
--- a/kde-plasma/kactivitymanagerd/Manifest
+++ b/kde-plasma/kactivitymanagerd/Manifest
@@ -1,3 +1,3 @@
DIST kactivitymanagerd-5.12.5.tar.xz 85024 BLAKE2B 568ef25da41bfe8edb0a07d9c6f72d73640331262ed50f8952d0efc44404c7f8702157146ae24d2ebcc1c1f5520ab7646b5e43269757240511286ab73140d2f6 SHA512 59c3d0dfd07f5bf620860c0a5e6d5989855ba323134e826c2ae79b3e40fc62768ef179f6969d9abace249963d99ba0db0eaea0de23686b67eb0fafcd2f1af84f
DIST kactivitymanagerd-5.12.6.tar.xz 85448 BLAKE2B 5020eac2f3a2c69250c41a9573f5a6f7128371a364b640f59af39d802bf87c51b615469ddb940c4989a0305764ad76933efe5bbc51d2d5be10329e9b31356ec7 SHA512 2ddd088b7d947e589e173eeefc005d6ab6c58f6588a851d21b5c27e9d106881c4950045b74592dd56749465ca46c10762fd704a86a97588b1c34cdc6fd9d72d2
-DIST kactivitymanagerd-5.13.4.tar.xz 85204 BLAKE2B 23b2ca06d5936fc6ada86ea6367d454a700d6ff5a85a524bdd5b3479a9fec809426e9524e703268c1913b16a66bcd9ddc1c8e7bddf3c8eddc67b66950afa160d SHA512 86d7016be1bbb5b1d8e8748e301eceaf8bbfdae5f3e77643ace1f052ff78150acd4498bf7ac4fc59ab2164597e9f0c449dba0ae7ded24951970eefb6f52a911a
+DIST kactivitymanagerd-5.13.5.tar.xz 85412 BLAKE2B 37c74f63c38cfee000ebe293b1b6f2d4fab90184325ed23c25b9affa078ac7a548e46ba88822f4e948d359e92b47372f6b2efeb6832811252f83e69dee96b328 SHA512 e0f0518bdc8397139c445dfd4bc604cb924add54fc00b44b9b9bdce514bb579fd6c600926b213e5f4b4735714a2f402cfe259c17712c9f71be2dc184012d1713
diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.13.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/kactivitymanagerd/kactivitymanagerd-5.13.4.ebuild
rename to kde-plasma/kactivitymanagerd/kactivitymanagerd-5.13.5.ebuild
diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest
index e6d0c11e3a3a..f60710bcb584 100644
--- a/kde-plasma/kde-cli-tools/Manifest
+++ b/kde-plasma/kde-cli-tools/Manifest
@@ -1,3 +1,3 @@
DIST kde-cli-tools-5.12.5.tar.xz 572368 BLAKE2B 3ae149989fa56a1a4e5bc77c2c3233c956fa31cbb23ceb2cbaa0eec1683d0135083ab7cd99d3d69f96c1ec925fbee7a18a8a23ea7d17de3929b5f8844f124125 SHA512 821cc978ad460f357dcb994de0cd92f0ef52c8de70731533a624ec62c6daf24846ef603eb9142f94712527cc9aaeaa4ef0b62c03f798ef53b7afbfec1f33cb6c
DIST kde-cli-tools-5.12.6.tar.xz 578096 BLAKE2B cbf5b0dae1b008fb14d26c01c187b15179194b59fa16010f75513060c83972b1deca3f87dc33d064ea78ac771d2c30d3637b8048709d64214122c63686caf847 SHA512 f45a0781660609bbbfa3a7b1cf3fe16cc8a29797061f0ddaeab1182d3065442c167a5fdfa43fab84d5dcc382a6b393138d63ea68e5615fbd93c5cd76b121872d
-DIST kde-cli-tools-5.13.4.tar.xz 587020 BLAKE2B de97e2041843e46fc8409b95a15c5d610a5ea062c7bed832d4ecfbc3da1bd178962080095b8149de343b52ae3c4540d5ff0826fc009ad09b80bddab7a903246b SHA512 bd1a236768330d816632e8ee16650ba49840f4c06aa35b5e45ed26a7d1751df2ec0a98390333678ebced3d8e53275a5d39f1b57c5d63b9e81939e32018a0a82b
+DIST kde-cli-tools-5.13.5.tar.xz 585436 BLAKE2B d288e55297428a2535e073fd82509658dda1c9da8e671c70c2bdce080268950ad8d7901cf173b09c0b4978852686e193daba15c9506366bc87a481c2bafe4554 SHA512 88aaa5c5a70da7d7f43f9d1b01d61d68c60e87942556955927cfb8655a8f6219d5220aff0c1a937f00444b3d03877d539bf544488a432108bf74434fc89566d7
diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.13.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/kde-cli-tools/kde-cli-tools-5.13.4.ebuild
rename to kde-plasma/kde-cli-tools/kde-cli-tools-5.13.5.ebuild
diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest
index e2a777144121..7cfb84674010 100644
--- a/kde-plasma/kde-gtk-config/Manifest
+++ b/kde-plasma/kde-gtk-config/Manifest
@@ -1,3 +1,3 @@
DIST kde-gtk-config-5.12.5.tar.xz 156896 BLAKE2B 72a8b5430bffd08bc7714ca65bc2eacd757862b207300a35c451f311afb183cc5c1cd189cb73cea60784c16bfb2aa23ad53c4195d39e39e1ae2f13ee23784576 SHA512 bd433166e65d65c0978ed01d2f1a891a2ea8fdcc2687af0eb02bd593c87ba05f33361623b4a984dc752c0a5cc88e1d68093bd28bd32f79370fa66835b13c1698
DIST kde-gtk-config-5.12.6.tar.xz 156860 BLAKE2B 83d2e5bf9f37705a66d9a5929c0f116bb7d8d62a53030016b3d73465009bf5eff09a0d5baea4ce218e33c6af22a6f50beaca48c29f0c16495b67b4905426ab2d SHA512 05682cf2acef5532aef62b68ca4c3602df1a0141fe791cc0ad3b7ea7893e00327b3b98d515c95db4333e4e6a7c19b3b98f7d9a47e551c571d5492591f7225882
-DIST kde-gtk-config-5.13.4.tar.xz 156468 BLAKE2B 1083f493f64466a04ac5b5ba94b55ae434db7ec2d92d58fb5e3906a2bcf39f243ab4a252fd0e8cb32ca9810234dc989095d6ea772ec8c78dfd75023b26d28a48 SHA512 2dcd227e9852a0a348ebee80f41fa26fd4732e88b25ba065d1d3d76c6dc8739ba2af5bc0089e9ee77a6506c7dfed18d9a6f1c862e48a6120bba1396fb9118ddf
+DIST kde-gtk-config-5.13.5.tar.xz 156428 BLAKE2B 54461c4e58c9abf6ac7bc96a12e7a92f5615ab0cb00ce76f07bbba1d48dd40e7651643ed3c22af948efea873e5a1a68dde1759f261575a3fa482f4f3efb5da08 SHA512 bc9b75961a0a0efd9824a1913266831c27a9840af1f87fdef46527065321731b3c35b550cff2727f62c360ee72f9495d96cfab3a38c06b661bae9bdf7d739575
diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.13.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/kde-gtk-config/kde-gtk-config-5.13.4.ebuild
rename to kde-plasma/kde-gtk-config/kde-gtk-config-5.13.5.ebuild
diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest
index 551e65ada09e..fedf7cb74c3e 100644
--- a/kde-plasma/kdecoration/Manifest
+++ b/kde-plasma/kdecoration/Manifest
@@ -1,3 +1,3 @@
DIST kdecoration-5.12.5.tar.xz 35572 BLAKE2B ac84eddfe6a095aa611d61ef4bbf3f823e780d9c1e4503cc4cd76a7eed6a670235650b07a0d9ae55b9ff1b39835c5f75c2372ede2b3aba377e6aa2a8b77f5f02 SHA512 4e13f61c46f5fc825f9b759ee5406fbbad6eb040b737c7994e5c60d5daf5c035877df9cb84c53ab672dafd035c3e67c5b27b8107d0383bfdaf61f4d9388ccada
DIST kdecoration-5.12.6.tar.xz 35304 BLAKE2B 4fa426fa7346729af98f7d6aade4195a62f288d4124c721a21a229d93b7fc49128d9b12c03fde2ece98d818dee5fc14b4c817cf4b8fceeb997f5c5f882f2f129 SHA512 1d31414f8d2bd8b82c1c09aca1b76f5efb60200411f1606d543f5b27ed470df4dcb891481cf58d80d2f411ccccf2f6eb4dae6064d5e3a7a2a7c51d354b562691
-DIST kdecoration-5.13.4.tar.xz 41804 BLAKE2B b4919a9b7232aae94d6e7d3b2ac8e36f7eb956487eff38c1f051e5e2fb7ed888e3166a14a70181ef74733820f4ad9226a792b0d31994d3e934a2ea7b5c4ebb36 SHA512 b886dc7b9e6d27729b154631e84edaad5e25b69ae59b1cc1cd5bc8d588074d4cd45f9f72bb1ca28c4f2881942689dd4fef0b6dd759019882948f9e052019ce2f
+DIST kdecoration-5.13.5.tar.xz 41808 BLAKE2B 319094f68cfb8ac9f6664f6b0548c60a3961e29571386e0acc22956d83bd8ce6b98aab37b281751c2c35c168c344c906a36d7531a64c5c6616c0c80b3d96683e SHA512 a40dc81dc51fda184253986e2b9e4b9b4e5e0ac543a03ae67c80d7ec6dad07f857d05bfa757fd37a77cbe51ee4c43c7185e52a62ed344ddca6f8f10e54cf4ad8
diff --git a/kde-plasma/kdecoration/kdecoration-5.13.4.ebuild b/kde-plasma/kdecoration/kdecoration-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/kdecoration/kdecoration-5.13.4.ebuild
rename to kde-plasma/kdecoration/kdecoration-5.13.5.ebuild
diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index ba116a239e8e..1a222402fd47 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,3 +1,3 @@
DIST kdeplasma-addons-5.12.5.tar.xz 567064 BLAKE2B 19f7c5401f371af7fbda416076b48454de134bc511e1f76e25e8f7544857181a65f9614247b9bac2df11e67f0505b3820fbcc83758e19c56624e7060dedafcd4 SHA512 38a2f5c5d3296167337d8288e52eb0d5045db755df4ae85e3dceba1fa8456eff8b82dc34384a4bae23054daeee39221440c27a0d17548933f325e8d47acb13d7
DIST kdeplasma-addons-5.12.6.tar.xz 567872 BLAKE2B 491bc252caa9d81436508c4ecf0143feb60ff78fc43b75c90d12659aac10a22680a0a306f4b638283c17a050639d0a7207edf6b28980991beae494d3e3eecaa4 SHA512 5bf0834d204b4ec1dfeb80ca52d4babd067768e77f5937280573608b59099f535065c2804bf2359651f9d8d78e310fec598de55bbcb0089a54e3c8d52c00daf9
-DIST kdeplasma-addons-5.13.4.tar.xz 598836 BLAKE2B feaa7e8cde363b7e74ff7cce88edbf60b517120f08e7e76159e2ef16db99eb95b8193cc5e10eb0e7e045e3677a2e12f34c4e29eda10e0b5ecb03e73bbaa3c865 SHA512 92515dc56453612c16e80c961c1258d8a642cddbbfb87e84b719cfe858a0ac83a412ddf134b6f76ce5548b350e51cc489187716c4d0784ae561b8fefbb4484ad
+DIST kdeplasma-addons-5.13.5.tar.xz 602896 BLAKE2B 62494961cc1e5c61656a566ac558747378feb44161e26df31692a68c5e1d3154997facbbebd584af437e29e6448c4c4ca1863e0611ff7afc8237c85036217689 SHA512 e7f8f3b5c149519ba49ed3bab49a72995c5c16cd2cb426daa104d52c3eef924f698267d741ecefcdd9455894d19b1d66ab3bc940d5e8137c13ae213b1ef03e85
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.13.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/kdeplasma-addons/kdeplasma-addons-5.13.4.ebuild
rename to kde-plasma/kdeplasma-addons/kdeplasma-addons-5.13.5.ebuild
diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest
index a7bf5f1ae6c4..6d8ce071d5e5 100644
--- a/kde-plasma/kgamma/Manifest
+++ b/kde-plasma/kgamma/Manifest
@@ -1,3 +1,3 @@
DIST kgamma5-5.12.5.tar.xz 60520 BLAKE2B 32b57acb6304cf68dea7c4c61902f7646fbab40a26e70e1ecc0df13a7b417c6f40cb16ff33e9f3a0306bf8328f35faf0821373a64d2936a9763ec2a05ff9c50c SHA512 dc1bc7fe868548a4136bf981dfa086cf9a0d20b0b01905608646f99e29f5e57a5e5b4fff704df79e8d8fc5b500d21c440e6172b99f6175fc959eadf7e0566790
DIST kgamma5-5.12.6.tar.xz 60620 BLAKE2B c987717208d0193c849100a9c0ff407ad46536b727a75580fcf244fdb8766571cea3c3a8da9e24a617551ec08d3c0a8291e0617353d95571930718d91fe12f69 SHA512 afc659f4de1cc247837c519ca3a245d15c459eb1b5be6675a24381e1bace6b3e981e2e4f7f9bbc982b5a8e7a780e33b9f2a1684d5a915ee47d3e835ca78cc921
-DIST kgamma5-5.13.4.tar.xz 79420 BLAKE2B c1032bfca891c44e11237f0ee0c7d862a5d4848f6ab1fcf53e77b3e2ff8678fbd3e5bee7dab10eb124884b3b10eb94c4b55ef1841bb0870ea7cf2d8b2b154f90 SHA512 82733c7c20a11ebc0c713d0bb0521c57a17f4f9f127f0b86f3bcea05dd3bf89537c6787ba34dec4e7555e0cadf6279280554f853742b47d84b0a3de21e045f20
+DIST kgamma5-5.13.5.tar.xz 79232 BLAKE2B 52542622a30aef92b38d15d38128a2b9fcbfeffcb9624dc2aafdd93814d749f3049adb19ac38047d8dd3c1c3593ecae5a2b3a0577e29c8789934a05b52deb91f SHA512 98f5fa770303f57e548b6110ad8bbc3af75705a9a103b0cb0370e25dcda209d9b405051611f2f21941b95a428760580fd2cafad0af76e1528c0672b8511aba8a
diff --git a/kde-plasma/kgamma/kgamma-5.13.4.ebuild b/kde-plasma/kgamma/kgamma-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/kgamma/kgamma-5.13.4.ebuild
rename to kde-plasma/kgamma/kgamma-5.13.5.ebuild
diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest
index 64c1706f3f14..53b8c5717376 100644
--- a/kde-plasma/khotkeys/Manifest
+++ b/kde-plasma/khotkeys/Manifest
@@ -1,3 +1,3 @@
DIST khotkeys-5.12.5.tar.xz 1064388 BLAKE2B f57451b0fceef79c99e238d8abc68ad8081c42ff48ac6ab1a82aa37785696a6eddae228d1909d7ceec9552ddcae7c507cb1319f90f0169cdb7f741b81dc1bdd9 SHA512 7d69a90900e644a38d3b905b019b4cd0038626c1dfd55755483b1a6f02b05b4c93bb59011cd9163293a8a3603b77c21c9c03c4312d45d0cf7bdfab7817974e18
DIST khotkeys-5.12.6.tar.xz 1434448 BLAKE2B c553adb03a06bda89b369906a4e59013728f17b8e15a502dd824b528a6e8e46a8ae6bdd0ab4c1a19e50465ebcec928aa5281ba42776f3d26334c755ac3d030c6 SHA512 31057bff8eedc43c52ec71d91a2b4d5dda6759f7325918d905dece24ea4012a3979757c2337571acb9678661122db91258261a5139e20db402ec332a111fda39
-DIST khotkeys-5.13.4.tar.xz 1382036 BLAKE2B b5c2aba593d40d620eb897d5d856059184416cd257b5e1032459bd4017e6f94f5d136b707dd2e02bb94dbf147ee7184579669b7732a1a3122f41ffc19693cabb SHA512 ee17889763b7a1a05c47f1f2ee95c8bf007266437b8a165b7775248fcf39e6b896ccb124c8e6b4df21145dd28ccd3571de4c1e9020de7100a2c9e87b16484be3
+DIST khotkeys-5.13.5.tar.xz 1381272 BLAKE2B 490ed8a323249a6eacfc10025bb49b4c792f8d1347d35348230e7ef079389da54b17965d544f9b0467bc516dd7bcdae7211bdf24f0604d6894f3ede2005ec638 SHA512 1eb22e42ecc43d2f78d67e0b6c7e86104c484b1597e063e1d78b7ebfb28950d09583c84d60b261791e282cc14fed63c99f0d070690ed0b43eaf2f23a5e01dfa1
diff --git a/kde-plasma/khotkeys/khotkeys-5.13.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/khotkeys/khotkeys-5.13.4.ebuild
rename to kde-plasma/khotkeys/khotkeys-5.13.5.ebuild
diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest
index 859e22e4a7b6..543a8f6844f2 100644
--- a/kde-plasma/kinfocenter/Manifest
+++ b/kde-plasma/kinfocenter/Manifest
@@ -1,4 +1,4 @@
DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48
DIST kinfocenter-5.12.5.tar.xz 1270224 BLAKE2B 5c2b0148f82862d32393804bd98ca99ec71f476d4103f015f159420223bb695b8d237673aa94c12d9be4147b36c52d9cbbd0d8f0e69208f6afcb18363283a50f SHA512 f8178452b2611473733ec707be1683234bcd22bac381d6d8fa47e695653c5d2983dab37dd24dea19024cd4a68e4736bb08a3b197c8a6932a45c927ee7a61638d
DIST kinfocenter-5.12.6.tar.xz 1276012 BLAKE2B 633f47373b7439ae48720c97debedd1e134c07d3a7b9028b0d7aa13e952c8945e2499c9c9d4582d25b275cdff57ceb8727ad0f58e7ffac063efcab66664f0490 SHA512 521d588d73bb32fa2020b8c4faacbdaa86e65fca421829566fb9a21a15750f6d9c912c2d948f8a11ffcd304d51d5f062c79147fc8703c345fd4a1153dc937ff6
-DIST kinfocenter-5.13.4.tar.xz 1288580 BLAKE2B 6ee51648c4802a192995f430a2ea2f2653b79acf5d3a8219f08caeddea4a677cba03ab93353e488db0f751d20744f97a9a42a5852d48bfd0d2540c4ffd0c6b9e SHA512 d871a2c4bbd20b2ce2d23887aeccfd999b6df549afb5cc6188d8b719600482623c6b049ce06190458251482be0834f1ab9a02b7c773b06594ea3fc7aaf0df01c
+DIST kinfocenter-5.13.5.tar.xz 1286000 BLAKE2B d8e9278f3c7214e13403970e86ac72f5cad3ed2506752c297860d91f26e986b6bce806a7498b78e4517b8d6c8a0ff31e2d2b6f0117babb93839dc8c923cf6bbd SHA512 a54b3ef5df1855f3002965f70c2e627ddc0b1e69eaa36461da1018b9ffd6e033ca61c4890a358ddc22f6f9e66cab5cdbaa1ff5386dda29fe87248f8af5567e50
diff --git a/kde-plasma/kinfocenter/kinfocenter-5.13.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.13.5.ebuild
similarity index 90%
rename from kde-plasma/kinfocenter/kinfocenter-5.13.4.ebuild
rename to kde-plasma/kinfocenter/kinfocenter-5.13.5.ebuild
index e0627f416eeb..7a0e2a4a61bc 100644
--- a/kde-plasma/kinfocenter/kinfocenter-5.13.4.ebuild
+++ b/kde-plasma/kinfocenter/kinfocenter-5.13.5.ebuild
@@ -87,9 +87,9 @@ src_install() {
pkg_postinst() {
if ! has_version "net-fs/nfs-utils"; then
- einfo "Installing net-fs/nfs-utils will enable the NFS information module."
+ elog "Installing net-fs/nfs-utils will enable the NFS information module."
fi
- if ! has_version "net-fs/samba" || ! has_version "net-fs/samba[server]"; then
- einfo "Installing net-fs/samba[server(+)] will enable the Samba status information module."
+ if ! has_version "net-fs/samba"; then
+ elog "Installing net-fs/samba will enable the Samba status information module."
fi
}
diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest
index 11a7c1aa0ee2..6976ef165f56 100644
--- a/kde-plasma/kmenuedit/Manifest
+++ b/kde-plasma/kmenuedit/Manifest
@@ -1,3 +1,3 @@
DIST kmenuedit-5.12.5.tar.xz 652192 BLAKE2B cabbc2849e6311ce14b83bfff52e03b73f32443eda49e652f94604f9d71f1894a8b75f2e8eca25edd16939c05dfcd5e7985461c5ffad2e785c2af1ed337a2122 SHA512 d73ee3d80ac9954f7e636ebeda3a8306dc4f2ea6b0b4430a0bc87a57afc2fed760fbd4b7e20543ce17303aac65dd8ca9035aae0bd148ced78c5ec8c71b96abd1
DIST kmenuedit-5.12.6.tar.xz 657044 BLAKE2B e7db78098360f97799b546cec03ae7586e4322294073c4e14f39623c67f8a40d2d23ee25324612d68c1e5e4c04913e346637c62276f2c8e2e2cc4adb2db48d0a SHA512 42414774c4c50f72c6ab5357039f5b64ec05283c6d7b279f80b1a5be23aa4171149d77969c7cce7d22753e398cbd4a016ff9c6a7f8f2ce98853b7582c556b1e7
-DIST kmenuedit-5.13.4.tar.xz 775100 BLAKE2B 16d49119d1a6c6a4911ceb4e4ee36aa5fa5b3771e008870dee8094ed08d16dfc2fe1f65c17936ebc2a32cf364f117a2e77ee32c97bb29570015998e5aea7f064 SHA512 18b250ff68e23c2ac9509d0976013005d39b80562f12e16029f69f257d5ed3e75bfa10618d2f91aec4c6993f6c9ac70a080379243ec230f2129ec02b7c73bda2
+DIST kmenuedit-5.13.5.tar.xz 774524 BLAKE2B 1ae7f9f1b507f719054000a918b7d6ad16eb5b73eb201e3cb4c19b6d6e29333c2fea8a54f6d32fdf94f5fb87d945db8c50eab92fb817dbc50b8471874954b382 SHA512 3289003f986d9e92708e0af49f9425ea71ec679377ece863e6f5411a00854bae56c86f0fb8b4398fa477829074c55474f9ca47f0d92a8ae314bd3701261d08c9
diff --git a/kde-plasma/kmenuedit/kmenuedit-5.13.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/kmenuedit/kmenuedit-5.13.4.ebuild
rename to kde-plasma/kmenuedit/kmenuedit-5.13.5.ebuild
diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest
index 0d02d276d08b..b85c300c0fe7 100644
--- a/kde-plasma/kscreen/Manifest
+++ b/kde-plasma/kscreen/Manifest
@@ -1,3 +1,3 @@
DIST kscreen-5.12.5.tar.xz 117820 BLAKE2B c7c073a9fa6e982f5474f11ab5073ce5279bd8f67faa20cfec18e18b8ea01228b508f642e4b0c0d00168ff9b3033b75935fc3e00603cea7e91340fd0b3b922a9 SHA512 d2f7bd25c93409e6198a1a3f65c3a85ae22e1031daf3115814e5f4f5252e1f6c6e0c7d94e3208840598a4ef2ec7bec31f8728f96eb735a887b00ce5e34c4466e
DIST kscreen-5.12.6.tar.xz 118028 BLAKE2B 34c9838c078c2fb40d87bf572d59129d00fc0bfdd4ad408e824bb98a1b67243f11a08bc2a3fe335f1b71873b204c3440a1cbccacac32d898d538610525a2fc9b SHA512 3d7dea7734aecedac49078b64ccd62081eace836800dec24d2a9cd18bc9799405bcc029d93734e9037e31e8cd4cf5695ee66485827b364c60ec08ff4b56f5e85
-DIST kscreen-5.13.4.tar.xz 113420 BLAKE2B 16e103cef3733b24819be1fdea18ba3f5a914b78727a046ab4ba1a9283d00c6aa857226ee6d34ee0c3fb2eb482ab5b321890b67a3a69ee53166dea19c02714f3 SHA512 9f9572c47c990c42b8328ac95663e5b9ee10adb7298630687d81a3f84ee6a6ef062b3f78dd9d943946aae261c6090bc8401edcdde1407122e45a288883d7d6b0
+DIST kscreen-5.13.5.tar.xz 112972 BLAKE2B b8c61e651efefd4517d5fa75965d481c21aab9d9f9f3b5c757a80c388114db4fc352c62ccad28c5215cd97b381a31b56b17c47e11d3fd46124c686b6572d9268 SHA512 86e0edbd6f4ad9639fc79198fde74ba7c0872878ee3eddf9edcb9515a4d68e09699777c1dc8cabb77cb2f1360e7b294a15edd84c0bdc32e985faa9cbcb174e37
diff --git a/kde-plasma/kscreen/kscreen-5.13.4.ebuild b/kde-plasma/kscreen/kscreen-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/kscreen/kscreen-5.13.4.ebuild
rename to kde-plasma/kscreen/kscreen-5.13.5.ebuild
diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index 54d5d94ed9a9..ac55706f4e77 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,3 +1,3 @@
DIST kscreenlocker-5.12.5.tar.xz 118332 BLAKE2B 87705ff5aff4d73c8b7823f4aa505be282fa9a152352aacf1682d5d7f4dff06fdca1b39d30a43dddd6c0dbfd267586d2a74bbdbd8bdacf487a251cb496311dce SHA512 c07cae22cc4500aeb4d38388d2033a677171659a76d81ff55155a97aca439babcb912f47586697657c7944c80b0d250770ed3a080fad0ed9463058dc879f390a
DIST kscreenlocker-5.12.6.tar.xz 119116 BLAKE2B 3c83018188e0fe321aff84f2a6f93222238f417cd0c1dbee88e6a46f293001092bb43d39345c3c1c26878b00c1b9410271a970303ecbb8bdf39231a319dea458 SHA512 4d9320027b8c3150f75bb2afeb4c708f0230a9cfe239c28edf5db1c90e247a391a7643f876b3d9afd9e6afadb830f962b05c05125d11253f5542aac2b48f8956
-DIST kscreenlocker-5.13.4.tar.xz 121644 BLAKE2B 67ba7b8774e43c7dc8e7173419fa1491bc7f538b1ac2350886448a8c3eccbd9ad7ec375b07b3582b9f82724a3582032dcf2b417c141a6d8e58d6552e08236c2e SHA512 478c0d11021f8f202be8ee60631bcaf010eb11bc953812d538285d6ecb2cd96b769a4afd34797806b7e345a22c351d5bbc049c9d17e65b05048e165015cca46e
+DIST kscreenlocker-5.13.5.tar.xz 122112 BLAKE2B 4effbfd26b15ca9a0225031b11b892092351a95eddf2bad659b7a97e347db402d5f28415d6d8fb11eb3ad095faa7ad430e949d5f21abaf33da8cc8f47ba8e26e SHA512 c09f55da12893f162fcdc7559e55fa50d48bb642673de84809939e695ee93843e97a5224cfc79cb6bea6a1146ac757c45eab0bd1aa20e36206290c0155d8dfe2
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.13.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/kscreenlocker/kscreenlocker-5.13.4.ebuild
rename to kde-plasma/kscreenlocker/kscreenlocker-5.13.5.ebuild
diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest
index 2ff696be90da..edfc37ce4520 100644
--- a/kde-plasma/ksshaskpass/Manifest
+++ b/kde-plasma/ksshaskpass/Manifest
@@ -1,3 +1,3 @@
DIST ksshaskpass-5.12.5.tar.xz 21200 BLAKE2B 70d134502538dc5aed5ff8d65a1b5c3c3f9e714f849e9cd9b66f43b170db4ea4e23c2a011ad2dec81d05bc26090e64453b592a5677969a2b3ed812e7d1459f4a SHA512 4e798ac709d656104cddcb637aaf352c3f55660256f7edecd2caa6c78cb2ccba065c1c9e17e39a14fab72ca760c18b729035598fc6f9055fa1a6d6b9fe6ea453
DIST ksshaskpass-5.12.6.tar.xz 21264 BLAKE2B 41c0d67308041c5eaf40c925e303f7ae5f1d0c0aaf654df18bc45c30e9d444ec950323a356ae60d98581a5e2670cec79d672b843e040539fa0d0543cd7775887 SHA512 d01ab87ba927e4e46f84ace3cec09431148fb0312cda2bd8972d185fbd3408525f01d90ade9865b481b19486c75ecb13cef47fbe2f41a37fdbc99b502a3b7433
-DIST ksshaskpass-5.13.4.tar.xz 21460 BLAKE2B 62d383ddeeb22e8806a1fb54c791cd7634c83d83daba7e4d9fb99d02234ada73e277222327d9fe981ad715e6f51573a95fb69e8246dd490efd7fe5de72a88e09 SHA512 1572e60bc3e748009f591227147da479909835a408b19bfd1d7d46be452d461d94e583a53eafd1241be90be2faa86852268cd5d109420877eaff4d055d10b402
+DIST ksshaskpass-5.13.5.tar.xz 21408 BLAKE2B f69798427ca5e4681543580158fc0ded5c4c3d352e31476cbc7832e99844cd30d8134785c460900724fdbd922ef526974dfc28d76ef89369ac309bcbf495e334 SHA512 88712a268710bac6c60bb111d79bf52f5b34e0a7e0f27ea1affb32bc1a18925998a5040e1b96907e4e1648304706ca2c3c2815d98b7807d972fbf8f57f285e96
diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.13.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/ksshaskpass/ksshaskpass-5.13.4.ebuild
rename to kde-plasma/ksshaskpass/ksshaskpass-5.13.5.ebuild
diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest
index fd98f2747cef..34fe93b5d428 100644
--- a/kde-plasma/ksysguard/Manifest
+++ b/kde-plasma/ksysguard/Manifest
@@ -1,3 +1,3 @@
DIST ksysguard-5.12.5.tar.xz 486676 BLAKE2B 4c706d719920beaf1ec831d23d918a254e01281e89232b1b36e9ca0f5a3134b3b688f7b37af3f41836808a3a3d8ac8052da65df80198ab8ad20fcfa288e868db SHA512 02f5b64a39e395869479ab93ef683136b7017dfb51e55dc03206641bd46052e656547244fc2b6cd86902d5a4f08a5a8fd7d1d5ba0fed73c765a2cfbc39f4bd32
DIST ksysguard-5.12.6.tar.xz 490700 BLAKE2B 983efe089236f929f0eaef8c43c17a57223c1710d153240b10a76cdacbda974b4c135b3002a89edc72be605fcf07a61e02de9c00aa7291d84777b71190a2e86b SHA512 ca0d21e6ed8fc8b042c6a0fbbfd0fa57811bf0e90da323df32c7905f8ce96155b67916d3038f8a993ab8e12383c1a3131d5d3bfb028cc374ea46129046f5ad81
-DIST ksysguard-5.13.4.tar.xz 498168 BLAKE2B 89ea8ba2b3406d7c379737bb264b454a337dbe294376d73730c780515ad7ee7ca96712c2bf62ca51480df8f08ac9b22e944d18f8e0e0c048df32764c75d9542e SHA512 9b4035bda56d111f17d7751fde127a99dcb54c5b21f0f3b6881aafbd9f6e38ac76d54158cb6b4f36ecdb1d1f7eb992e6f58114396d843bb078b6ec82f8b15c5e
+DIST ksysguard-5.13.5.tar.xz 497776 BLAKE2B 15daec09221993a9c5f39845a3cd168d01ee9a367020312507ac96615722fdf0e5244b3130dd5f09905db8a95b7ddf5df58cdada64a1e291c069f1b58912e684 SHA512 3df272468c6ea1a1211fd9f1e40bab5be8cdff8cb02556999cde8dde81042d6a0d8ad3958faf507323d7770f6dc2631d9ceba7ade796f8927719ce4a8659ca21
diff --git a/kde-plasma/ksysguard/ksysguard-5.13.4.ebuild b/kde-plasma/ksysguard/ksysguard-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/ksysguard/ksysguard-5.13.4.ebuild
rename to kde-plasma/ksysguard/ksysguard-5.13.5.ebuild
diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest
index 6c55034a171a..c8ce8019a444 100644
--- a/kde-plasma/kwallet-pam/Manifest
+++ b/kde-plasma/kwallet-pam/Manifest
@@ -1,3 +1,3 @@
DIST kwallet-pam-5.12.5.tar.xz 18584 BLAKE2B aa5cef35532288e4ff01c483ec2971c4729bd6d3a039981f5873348a39a6b618d43e635cd24a1d8e10f50ff0e9df005ee7aa31c2f1a9695e93733d6157577128 SHA512 b62518019ec2c8c5251198f9498c66b4768cf91851dd112dea1ac5d2e6ef1a500905afcdc2ff88cf4d26efaed7af508af022b811ba42424a71b4199ae03b0eec
DIST kwallet-pam-5.12.6.tar.xz 18596 BLAKE2B 5ec1638bd71518eaf91becb548392e4df78ff56922c0574ee8981dcc35a3f8d4c00562bbd5cabe9192a727f127cd66ecd3e5b2c3a1a1c59082d5fc1f8ad95d7b SHA512 d0fb215b40ed3bc7c5b6236a4c9e34cf1ecca2ceadfe411c51747d72c503712258ab70e67e2b0025ec0f4488caa6c21bcd4573e2eab98be5b9aae70ae3b5ce48
-DIST kwallet-pam-5.13.4.tar.xz 18752 BLAKE2B d546e79a0102760c0b4bb22540b487e44fad33615a2a8e57254944803666558040197d6815b639508c41753c3a630b6df4b9892f3f2ba699ed7f0fb5ac495c58 SHA512 acdc9803b03a29afe1dce50fd62e3df482710f292d9da9b7f71f22ff57248ed3a6f7eba430011fcde7432f49aecbadcae1ace31bd3bd55ab4db333c6e4b372c0
+DIST kwallet-pam-5.13.5.tar.xz 18668 BLAKE2B 4dac7c037fe8ad89be884d5e4c7e850b62d2838161a9086e6f193345d4001860e7ff286e4052009f2010f6517ee30b3f6838c955bef5efc30c9e6999076b231e SHA512 cdd273d13406a927f93ce4f6189484b67d7ad146c5eb42f4d99d85c95938fe457082790453709c3d7129b2321c723e12ef93468e8febb68a19132f6f0fe72f62
diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.13.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/kwallet-pam/kwallet-pam-5.13.4.ebuild
rename to kde-plasma/kwallet-pam/kwallet-pam-5.13.5.ebuild
diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest
index 9bd841aa34c5..8d2b85f25e4b 100644
--- a/kde-plasma/kwayland-integration/Manifest
+++ b/kde-plasma/kwayland-integration/Manifest
@@ -1,3 +1,3 @@
DIST kwayland-integration-5.12.5.tar.xz 18580 BLAKE2B a40a33e09af47fcc036167a4d7228a7a160b0e7fa6a2520afbef1cdaf707b96a7cbda52c0a4486bb44d4dd9129834fe48bb582fe31adc0b3d01e73d364eb94f3 SHA512 6fab883acaf5bd7dc5d1cf4e5eda78240b358e3e4aec8c0ec53f9e5b20db613df04cb9547dc5a977811421a121a623a121dbeda183ce2f9a415a781275b98de0
DIST kwayland-integration-5.12.6.tar.xz 18508 BLAKE2B aaf8ea243200b692233afeeb678d0a891bd10c2580a6727b76892d9f59d8efd63eddaf8f89e368a32b91ac7d19e642552fe35e00f71f7bda92d0722fdc21d120 SHA512 697279d6ecbb9d1287ef864a9e522e4930163442235ef81902d6ca60e28acfa58ca4878b1d823a35d0c07d6f2157c037fa645314f97c16d5b74f2135a9a23940
-DIST kwayland-integration-5.13.4.tar.xz 18580 BLAKE2B dbab9101ddddd04c1be1b6908ddf7a81227bc2b9fdea1d8b967eed35a4f0082ad1c01ccce17654d38a7b2ff89503745a12f77de2a0a419efc706ac97af8e2201 SHA512 aa01f4bd8f647813c40a11f05f9384dd32ec5833d9f365288cf7dcde3bc87dbcf638b58d486a3d3a014f4f77f04ad33e0fed0c1c7d3b6c3a9e2742402fd235ad
+DIST kwayland-integration-5.13.5.tar.xz 18512 BLAKE2B 44be32c2a9b233a7abf646234091656a24a0053112e4750b3317fc59fd7a3c6bfaaf4bc92a8c27d6ec2ef95a3e3b04baa971cfd135c4a36dd1ad8db151a271fd SHA512 1347bdc52e53fcc7f2b9dee859836ea232120736834a31b54efb188a6332cca429164d2a2139ab6e578bc3befd056e75e113ef3e72b2c4d15f2bf7d0ede01f16
diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.13.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/kwayland-integration/kwayland-integration-5.13.4.ebuild
rename to kde-plasma/kwayland-integration/kwayland-integration-5.13.5.ebuild
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index a3c7d188d011..a142d3275b0d 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,3 +1,3 @@
DIST kwin-5.12.5.tar.xz 4981704 BLAKE2B 0631d7cd1f387ef63512601be39fcc280ad3dd751fa0ac8836da969fe526b68a95e81027d1943d8f0679a78ae9e9e062f4d292482497ba19227997a5d746a35e SHA512 9a99645455f17b14ede45d656a83eb753fcd02c2ed4cca10045db84a75c610ba0732ffacca780805b3f990ab1ada6861f9036588d45c1bf487dbf1ff5bf9ba22
DIST kwin-5.12.6.tar.xz 6514844 BLAKE2B ae159163a3be8e46a63ad2e2b8bf0aa8ab45d4b1fd9d5ef2506fd674824cd650bc4f4ab7c1e328d61883f06427f2704643494a8464146c8d93d12b24e5742290 SHA512 ee9edab9d63d86e95c7853ecfb60e440c6cfcb49252040a36fb9bd61b78ee90290fe276be4cc504acf2a31abdafd8693f23b6165432fd9aa23f5cdb08d3706ee
-DIST kwin-5.13.4.tar.xz 6521664 BLAKE2B 93dcedf19296358ab7041c1753fb6aeab71c686b61233e1c58e75b71224a711d15ed0041c2ecb4d9e1c0672103d84715bbb0c7e0ad4538fcd877bd1290933e9a SHA512 fce3f6fa426dccbd0683ab2de2707a673e2bcf7f3d5a032adf92ba09065e5cb3a1975359fabef71502b57308a1af38b758588ed9ba7e2da883d6bad7448e71dc
+DIST kwin-5.13.5.tar.xz 6525660 BLAKE2B b159dd8223f018e7a17d8e17296c8f6bd40d95ed666839198a82b6c65c13965e0ba49af45ac13ac579567a4f2e3f088c571f2f300103a4477284327609076272 SHA512 73f2d16403b7972db8ebe228569504d1e6345a633f8b006b6399575b0ed26dc5a3d047be0f476dedfce16acaaba0e3870e62059d96e4f8471fecafca7eee5a14
diff --git a/kde-plasma/kwin/kwin-5.13.4.ebuild b/kde-plasma/kwin/kwin-5.13.5.ebuild
similarity index 98%
rename from kde-plasma/kwin/kwin-5.13.4.ebuild
rename to kde-plasma/kwin/kwin-5.13.5.ebuild
index 1f924f5f1f42..a692b36f42e2 100644
--- a/kde-plasma/kwin/kwin-5.13.4.ebuild
+++ b/kde-plasma/kwin/kwin-5.13.5.ebuild
@@ -70,6 +70,7 @@ COMMON_DEPEND="
caps? ( sys-libs/libcap )
"
RDEPEND="${COMMON_DEPEND}
+ $(add_qt_dep qtquickcontrols)
$(add_qt_dep qtvirtualkeyboard)
multimedia? ( $(add_qt_dep qtmultimedia 'gstreamer,qml') )
!kde-plasma/kwin:4
diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest
index ecd1323509e0..3dd4f74278c7 100644
--- a/kde-plasma/kwrited/Manifest
+++ b/kde-plasma/kwrited/Manifest
@@ -1,3 +1,3 @@
DIST kwrited-5.12.5.tar.xz 20376 BLAKE2B eb9f017b3611c3c1b67c0015f956d54848a270e53a452b4caf362026c2ed6a393182df531c48f23f7e5a183fb1e710cb13ed883793d00069794aa20ddc35cea5 SHA512 4b076761fec04b38cf8690e1aa9c3d600343c8945b9d1fbad1ed9184f3edfc1a02ddc1867024c7d3d2b29b9c608037d24b14b2ca59fbb03418ff5e48e26404ef
DIST kwrited-5.12.6.tar.xz 20332 BLAKE2B 7a56539ec5ea48282c22acd17beb102aadce9a4456097dccebfdb716574aba42c7fae5e9ea80a48bdedfbfe52ccf6d3cfb76ea0f737ba2224f3c9b055b01e8ee SHA512 abd4d415d1fdabb6cc4cae88182cbf6c8426d958ba2704f8760dec9a13a487973bdb1755743a854ecce2941ade2e100ebcfc8f5e7de3eb08647094d02e502c65
-DIST kwrited-5.13.4.tar.xz 19928 BLAKE2B 2d99b91f01bc0547684318351c74e507255e696c9ff683d0525a8f2259a3ee19c76cc7cf4f88b46981202f31db7f57bc2b8e52b8f929231fe634096555840b05 SHA512 09fa0a2fb72c56311a47111bc6ce5f7217522c0cd1288b5b9719f9cd0f57e951e409245a1139124080fbc391f4c98f757ade2a78756c60b95cb7fdd3deb37627
+DIST kwrited-5.13.5.tar.xz 19796 BLAKE2B 0e0487bd18b6cdccaacc598f544af7f3af8591e59fb753f7351542f453601e8ce7b1544511921ff4e6c2361b38902ddb7e004c35ea8bd5f74e0339f5ff84b985 SHA512 d4d006de0d029ff8103e6b9d7d8771bd5703f6a1b190bafad7b5358e7ad12ecc52fb883947b93a7f3391d28bf063f797d5eca9422c4fb9bd1549ca2c57060388
diff --git a/kde-plasma/kwrited/kwrited-5.13.4.ebuild b/kde-plasma/kwrited/kwrited-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/kwrited/kwrited-5.13.4.ebuild
rename to kde-plasma/kwrited/kwrited-5.13.5.ebuild
diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest
index 34b33d109fea..986bc48032cc 100644
--- a/kde-plasma/libkscreen/Manifest
+++ b/kde-plasma/libkscreen/Manifest
@@ -1,3 +1,3 @@
DIST libkscreen-5.12.5.tar.xz 94848 BLAKE2B b5d50776596cbbcb3b2bb93e00041fe385f98eab04bacb556077c91dd9ab7a191449f051be17d78b60bc207843afe2b4edbf33c9e72a828e2cd35787438908da SHA512 67d74a8b422559099bbaa55b547bc4de05952512dfb76ad73cfe209b8f3e13ba09e23b64f4fc4f2a992dd04e47d99f8dced9a24583349067fde8d9949dfb1ad3
DIST libkscreen-5.12.6.tar.xz 94500 BLAKE2B 0b82b172288567934aa958a5718302735ac91b43a23708098bc686d256466ba0aff707ab2af0f7f7f43d0059a0eac2110fcb5e52241d36671aa52702ab590c43 SHA512 71c600e0a5d310fe075c9a82360ee176c575b7860e15372882126847e9b7a103ed088a5d616a0168139c7b36f81312ad1f5fd6371894e56d7a900db81c8e2316
-DIST libkscreen-5.13.4.tar.xz 78500 BLAKE2B 5e3421bf057a1aa5ca0103f8794bda5525ca9d083151036c5abe50dff4ea7c50b544e8a815726256a3894e362adf4189099c7e915465672d1ba4ce52434ca4a8 SHA512 446a939f4e3bcb6ddc2ef8c53b4f98a9d36c8057ac1e32fb4361e69d3cb193cf00e6682e73974054aa0187a9f22ecaef5546c392ad45dc7f43042501419222dc
+DIST libkscreen-5.13.5.tar.xz 78380 BLAKE2B 701fd156edacab9941b102a7ce4e36c1038ac6efa1410be5a3317b03771a61bce1c3dede247021b034ffe9a1ab2b9490ccf24bbd0c6e1e21decdfd9a9a2fe97f SHA512 1089eba583490807e87ea02e33e63c89b750585f0c612bc70517b36e88779dc4a3a8d300d4295735967ee04689a7a9361910c67f3f3d5cb2511304e9e05657d2
diff --git a/kde-plasma/libkscreen/libkscreen-5.13.4.ebuild b/kde-plasma/libkscreen/libkscreen-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/libkscreen/libkscreen-5.13.4.ebuild
rename to kde-plasma/libkscreen/libkscreen-5.13.5.ebuild
diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest
index 6e1cb1af44de..6257dc4bdd78 100644
--- a/kde-plasma/libksysguard/Manifest
+++ b/kde-plasma/libksysguard/Manifest
@@ -1,3 +1,3 @@
DIST libksysguard-5.12.5.tar.xz 570008 BLAKE2B 201e722ca5313ce228eb3a8ae488416b904c672c029c632bee909b1cadc286d359b21fc7c79ef8f6bde8e57913bbe97f320a4506385ae03c88de3e948240de1f SHA512 61d3d42d5cebc06f775bd2737a4195ea790392906d007e2f08ed3455f63526bdb9fbfb40add63e97b107ece7aabfed056e56bb3f4dfee34e3514a391428633f7
DIST libksysguard-5.12.6.tar.xz 568416 BLAKE2B 1adbb486ce82df95ceea3be33fc65045df250951e0a0759e068a4909555a46f6adbbd8535b3e2852532d85c0d5b91c538b9653184c01747da6706e565e4c30b4 SHA512 3dc937f43f03352df6f503eb0b2d493a8f7b9ab9f017e06ce5f8d111ca10690f98736b0f7c6b8942e99f192e9c9ba98b1c0fd2d8515e0ce416c775e000a13d9e
-DIST libksysguard-5.13.4.tar.xz 571548 BLAKE2B 153ba211fb1e314270a36c366689c4034b57f351720f1639b08477e185e4da6ea54d57c53f595e1cb887bfd6d39f5d7cc115fe2802c2bddedeab83e24606ee93 SHA512 64274c57ae3c8dbe7060b1f4e2ca642532400a7f1a0acc9e308ba8d448b9c98aaf8fa90408d511593b3250bb297f16d2c09ffcba43be04d9f25aa871879a3144
+DIST libksysguard-5.13.5.tar.xz 568200 BLAKE2B aafe167cca39ce33eaa56579a228c3d4b9a1a25c55ee268f9e54bfa33162233a242bec0ba9c2adafe238bdaa0b37573d8846c50338e91ec9a1cea797c308a0d9 SHA512 4be616ee2c6e3293f95c3f63ed2722395a6a78510765bcdb3112f37402507a2b7aa9e7bc58fb84bc6d294863e033c1843b228801a3bb534763ca96c1ec729978
diff --git a/kde-plasma/libksysguard/libksysguard-5.13.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/libksysguard/libksysguard-5.13.4.ebuild
rename to kde-plasma/libksysguard/libksysguard-5.13.5.ebuild
diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest
index b28ad62c3d94..5c5b7a1c4581 100644
--- a/kde-plasma/milou/Manifest
+++ b/kde-plasma/milou/Manifest
@@ -1,3 +1,3 @@
DIST milou-5.12.5.tar.xz 57492 BLAKE2B eb1315c0794674b70bf7a1ebd19c60c1a5cf94cd053f80920586cfde78ce328ccd889b480c9955ea035f71fe1d80066482797a23bcda5f14fcf984c081bea3af SHA512 7c96c7dbe8b4c45362a0e5a2152892776c2cfa52c748811459c280737f8695f4ee63332a38ce6618b2c4eb7773e2f5e21d9e4d366a22b89f749b42195828774d
DIST milou-5.12.6.tar.xz 57460 BLAKE2B 0d29e21c60d7ba9714dcf46427285f68652d3713037643d29d26965eb2614df9c17ad3561206ad57725eda31e9a2e4bb3123a78e4c3353b5ce35327f2c4a8165 SHA512 3feb387c9698117a7646132d43f0ae5dfb42341b2725a3bbeb6cd8653fb1e6a2fe79aa538aa532b1b808140376f665a7c746b923fc8fcc2fa4ef5015757da6ff
-DIST milou-5.13.4.tar.xz 57924 BLAKE2B 7bbae043d16dc54993ce6b716b4bb1ae276e59d88042edb95ed8616d8c2cb342343236766591b90609e84fac5e2d9df79985e13d6f381065e1724bf86eb86374 SHA512 d75e19db409b8659f515a9f8ccf5f7db9e03dc61675329dd40863d23daa96903721d79b5ca3d9f58bdc230459cf37f5e4a647e8f1697e05e745c2cb0401db86c
+DIST milou-5.13.5.tar.xz 57880 BLAKE2B 30501efa72fbe339865b4a2eb82ad8cc5031ec6f698403c5f1930fc45e7c4f4b24c49ad30374a81a4e9b0ab29b86c1dd5272c002a0749811c9629b2be9d42fca SHA512 b03e6568698e510c5069fa5c9e99d2de38abd725c2a78d183957f32a2cd59ae0620d99258736c9c8e46bd005e084fb0f19051a112f6133ef35803ea06867113f
diff --git a/kde-plasma/milou/milou-5.13.4.ebuild b/kde-plasma/milou/milou-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/milou/milou-5.13.4.ebuild
rename to kde-plasma/milou/milou-5.13.5.ebuild
diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest
index c1b0987f3377..6930e2fcfb41 100644
--- a/kde-plasma/oxygen/Manifest
+++ b/kde-plasma/oxygen/Manifest
@@ -1,3 +1,3 @@
DIST oxygen-5.12.5.tar.xz 4467896 BLAKE2B f9477184cc13553086f6b828ab953dc91e42aa9bd50a85d553ed7347e2e588dfc8b5aaab9eec12481e20121044ebd4412fc728e22d437ede54451c0a2245c6be SHA512 92acb2cc2033a8b07a0ac75772f696f5c1196e0c5a424ba6146d576bc956fcfc172b4a65a79551b2d43be4b56d5289bee091ebb837fe40dc60f076ca7d5898b4
DIST oxygen-5.12.6.tar.xz 4467020 BLAKE2B 4112d881bba6b30ab295af576678068227c2831459c21eabbd59c9c57e7cc2a1c08cf2d40cc6496bd0ee38c2384ad8f91a4246e6cb3b33328406019c62dab539 SHA512 7f558f92dc218a8218c6b87fd432985ef446d88e7a73911bc557481bd7d0ccdda7a9ebb350c6f71547f3c35cda1f844cda8aa735e0fcbdb413aedb25b9d0d8de
-DIST oxygen-5.13.4.tar.xz 4469624 BLAKE2B 3071b9e5a9fe4d5335f804ca996204c69e0a491c724af78b496e142789c6700c8cde3d50b6691a2cf8f1cc0eeb092f7209baf3c79a6ac96ac0472f0c0842d54d SHA512 43e69f539064b51c63184682b8df2793cd3246a5906cb38aad60d83a63f19c56cab9529de2365d5d5b3035617ff91eecd90b14a3fcda1fadb527744fe9fd4a7b
+DIST oxygen-5.13.5.tar.xz 4468116 BLAKE2B 9e71ca71cfe5acef6b5344e0ab89a63b0ef68119251515534a7841d67ad0d7e5141ed48cfaef828870d9cb0ad9bcfb1188214fae3eaec13f84379ba710a09a5a SHA512 322188223d03b48f09123ef8b8e13dff3b256f190a42d81655707b9fd4707d8ca147a2f859346ba691a54a76b8b3cc5504485aca8f0bd7bd7bf0f13cfba1692e
diff --git a/kde-plasma/oxygen/oxygen-5.13.4.ebuild b/kde-plasma/oxygen/oxygen-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/oxygen/oxygen-5.13.4.ebuild
rename to kde-plasma/oxygen/oxygen-5.13.5.ebuild
diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest
index 83299089e374..5de7fa932be5 100644
--- a/kde-plasma/plasma-browser-integration/Manifest
+++ b/kde-plasma/plasma-browser-integration/Manifest
@@ -1 +1 @@
-DIST plasma-browser-integration-5.13.4.tar.xz 99700 BLAKE2B 1f13552374a41f59e81375392276135fc6ad90615df94c4bac6d58947e63f75f1560fd176611e3769a2a7720e8c1102e08b265e84037ed47926ccc98801d7482 SHA512 b050309e160d71e0f7a7c2b32d9d01696d4d3d52aa895debec268d050a03e4b0fff9b3d7e10a271d8650c23bc73698aa1c9cdd99e994df46831b8ba56c17552a
+DIST plasma-browser-integration-5.13.5.tar.xz 102032 BLAKE2B c6ad31b940fd2981a5d88c4d9f6d9c1cbdc6fd6753bc92c2a741f81fb8297af81a44c5c534ae1a08541ac8eead544a9be97d5704ada9e4621a586a5dae4f1253 SHA512 ab679c3cd899cec72cc02e878d9a2d1fe1c7c8ab866a140da66049857a7482ffd395da8269106c4d0e699bfe8b7c74a111084f91e70ae3af5279294b23a8001c
diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.4.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.4.ebuild
rename to kde-plasma/plasma-browser-integration/plasma-browser-integration-5.13.5.ebuild
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index d3a191eee4b1..f85a12fd40d2 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,3 +1,3 @@
DIST plasma-desktop-5.12.5.tar.xz 8558436 BLAKE2B ecd8a0ce7532dadde5f435e4c620333572b30e50a5003493495784bb31f7e9a4c1b0b1a023290b0443fa90ee7e663fefb9854016bb8eb5a03f82f879d6522fc6 SHA512 d19f8d640304bc1ffa0839e8ba453ddea76710f26fe580789c64e1b97d2a67c151ec62b2d0503fc35ad31cb8da4ef1125f3154e366b7f2bb4b8fb9bb2e0a6abb
DIST plasma-desktop-5.12.6.tar.xz 9172156 BLAKE2B 054045e1264926e5d0c87876c87cf48164a99c343f7c3fdb22dbae036cdc7e6fbb147c97c33a047c0a5c0cb75b62c88b802ccb79bcce022f9ccf9abeebde419b SHA512 435add4f2133f3e54023ad42b1360dc3ea3c44789692a38e5d95fcc825a1b7a9e3bdc05d03a375c687f3f0544c8f2ea4ccf047ec099ea3da32ed539ca57c8d76
-DIST plasma-desktop-5.13.4.tar.xz 9155072 BLAKE2B e2cf970b2a1c521f2207fb9869501ff616e94d679221b12a18448d402085aacf2f5fc4ac2fdb018bc662060054b61ff754abbae4ede562a1b6da0dcc8f49bd9d SHA512 c990b5d5ffbec70a1f410688c1304c2cdeabd5be017ab9b2a382abd57719505902938e43e5bddd046618f9143d8ee0a61b80aeb53a892315d92897dd80d66b24
+DIST plasma-desktop-5.13.5.tar.xz 9141164 BLAKE2B f48ab6648cb1c7c289b5a2cce670db774aa53cbd81095cd4aa60414d05a0fac1e460fde115d5d38dd639a7746b1ad83971e38b28841aa430cec3f318e3509930 SHA512 3dd8f27e0127f7568aeee3871ce2f0732267ef50f9659a4a2715eca65bdf8cc5cbd2ca5e39a261cbbf0d1127c9c153f1c2d279729b636184353c6fbb699c4383
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch
new file mode 100644
index 000000000000..a495b075ca6b
--- /dev/null
+++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.13.5-activityswitcher.patch
@@ -0,0 +1,62 @@
+From c1f3b45cabe0cf89e13a5b1c9b7a673992320826 Mon Sep 17 00:00:00 2001
+From: Thomas Surrel
+Date: Tue, 22 May 2018 14:20:25 -0600
+Subject: Activity switcher auto-hide when using Meta-Tab
+
+Summary:
+Commit 174aa217180434ab93b899d9c7cf967bd2daff7e created a new
+issue where the activity switcher would not hide anymore when
+switching activities with the Meta-Tab global shortcut and
+releasing the keys under one second.
+
+This patch fixes this by unconditionnal toggling the activity
+switcher visibility if it should be hidden, but keeping the
+timestamp condition before showing it, so that both Meta-q and
+Meta-Tab behaves correctly.
+
+BUG: 393912
+
+Reviewers: mart, ngraham
+
+Reviewed By: mart, ngraham
+
+Subscribers: ngraham, plasma-devel
+
+Tags: #plasma
+
+Differential Revision: https://phabricator.kde.org/D13012
+---
+ desktoppackage/contents/views/Desktop.qml | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/desktoppackage/contents/views/Desktop.qml b/desktoppackage/contents/views/Desktop.qml
+index 3272a89..3539050 100644
+--- a/desktoppackage/contents/views/Desktop.qml
++++ b/desktoppackage/contents/views/Desktop.qml
+@@ -73,17 +73,16 @@ Item {
+ property int lastToggleActivityManagerTimestamp: 0
+
+ function toggleActivityManager() {
+- var currentTimestamp = new Date().getTime() / 1000;
++ if (sidePanelStack.state == "activityManager") {
++ sidePanelStack.state = "closed";
++ } else {
++ var currentTimestamp = new Date().getTime() / 1000;
+
+- if (currentTimestamp - lastToggleActivityManagerTimestamp > 1) {
+- if (sidePanelStack.state == "activityManager") {
+- sidePanelStack.state = "closed";
+- } else {
++ if (currentTimestamp - lastToggleActivityManagerTimestamp > 1) {
+ sidePanelStack.state = "activityManager";
+ sidePanelStack.setSource(Qt.resolvedUrl("../activitymanager/ActivityManager.qml"))
++ lastToggleActivityManagerTimestamp = currentTimestamp;
+ }
+-
+- lastToggleActivityManagerTimestamp = currentTimestamp;
+ }
+ }
+
+--
+cgit v0.11.2
+
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.13.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5.ebuild
similarity index 98%
rename from kde-plasma/plasma-desktop/plasma-desktop-5.13.4.ebuild
rename to kde-plasma/plasma-desktop/plasma-desktop-5.13.5.ebuild
index 649e0d876dc4..6074f6affe7a 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.13.4.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.13.5.ebuild
@@ -124,6 +124,8 @@ RDEPEND="${COMMON_DEPEND}
!kde-plasma/systemsettings:4
"
+PATCHES=( "${FILESDIR}/${P}-activityswitcher.patch" )
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package appstream AppStreamQt)
diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest
index 727f9c4c5366..cf9fa0eadd50 100644
--- a/kde-plasma/plasma-integration/Manifest
+++ b/kde-plasma/plasma-integration/Manifest
@@ -1,3 +1,3 @@
DIST plasma-integration-5.12.5.tar.xz 53664 BLAKE2B e37d44a0a33116ab1b2b1f1edb74a8616ba33aa41438b93f9bf2f45abe5bb49cda57a579b35b8af94a171074387178888f5b80909e50e9c2be4a7a11a1eb0198 SHA512 5ae667a11ea85c6e9f353939bc22d84c36cbb53f053244a93e7c1d185d20452a7fc3d2afed65427ef938910fa537648006c2dda77346419a6a4492a2e292c787
DIST plasma-integration-5.12.6.tar.xz 53412 BLAKE2B 3acee7e76786ab570f5c001589137f85decf42bd6857c21a2448269d4735309dcdb7d1f5233ed8c95de4ff5c783a07950f9627525966ba33a47c889da658ddec SHA512 df231e8041fb94f01b0950890f784d118ca0aa1a34e7e483f78351de237cc2ba46a05be9c7addc5a2c5d319be7e17b6e2c5f171da28aa7cfd9b34b585a3c8155
-DIST plasma-integration-5.13.4.tar.xz 53700 BLAKE2B 483dc26c457c9967208c055c6ef36c488010484c9bd56669ba2e5128550f36465d347a2985e3a9e329cddbf5e5c7c9edcb9eac64db47c43b02bc9be83515b14f SHA512 9ad91ff2d66f2b7058add7d13a601042660a7cd1f4fe41a368b0599ab35f8de45c6462d6010c1b0a76c0abae5046458919511649531463588afe7501bb19aefc
+DIST plasma-integration-5.13.5.tar.xz 53704 BLAKE2B e3bc607fa7270e8f4c7ea686fc4c44f1c47a476a596fa1db646fd3fa729cdd47adb13ae158f4bb2dcf6fecf4ae9feed982438a80b34cb11b9e9abada40d8d67a SHA512 84fadaadda3d91d0ce9a17a2e52dcbb459925a2b20555891219f878df490a52101591da956a06e6362e427a3298499f503924406c28286b4c1b1594f864a6db2
diff --git a/kde-plasma/plasma-integration/plasma-integration-5.13.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/plasma-integration/plasma-integration-5.13.4.ebuild
rename to kde-plasma/plasma-integration/plasma-integration-5.13.5.ebuild
diff --git a/kde-plasma/plasma-meta/plasma-meta-5.13.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/plasma-meta/plasma-meta-5.13.4.ebuild
rename to kde-plasma/plasma-meta/plasma-meta-5.13.5.ebuild
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 104da5457c5f..d1b352a0ecdf 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,3 +1,3 @@
DIST plasma-nm-5.12.5.tar.xz 703236 BLAKE2B f522d11a182b589beae46a2aae6c59b6964da7d073e8bae14464cd99fb29d9fc0188113a7a00ed568646daf7a22ef2000c3ccaee848361f50caaff6087364c40 SHA512 7c61743d028d27ead7b7c373757f5ea82703808702d31546477558a631607c15d867140624391b803a72f5675c96853e1eea07c7af3001718a96c36d6c3191c6
DIST plasma-nm-5.12.6.tar.xz 704664 BLAKE2B 5dd1741873d4b79a8d69d32065e95e9133244b01cce43e7242f07a4039e96cdbc93d864627cd6876f03a396da6d636cc877fe73fd879be14d65e839cf2b2e26d SHA512 aa1554ebf73bd0495722ebd58da5d12b6703335b6fa395f5a330911bbe563f113ed5fc3d78e20427b6af932da6e39faea539a6e6a1e3db9f61eb64bab7b62c60
-DIST plasma-nm-5.13.4.tar.xz 705288 BLAKE2B 9ce40696f69f0858b1669dd19819f496c04f2b199815f0fdfee02f28b65870bf8c1f9ee931d9a159cfce3ce9e141bcfc6650d69977cb2dad1009592017ab496c SHA512 088182a80df38f4a12be6cfa410dfbcff28c6838f8d346c6ae006e7369752a0c69fd07dc973c80b6a6f8cd9b49f687581c41028334f524f1e53cb091f169e985
+DIST plasma-nm-5.13.5.tar.xz 705984 BLAKE2B 0a00bb3696ebc4ee5f26746cb1c1e9ef14e456abf448faf17d8ddb919f272354a88969ac54447ac626640d260c8bc1c4ffe3a578e3d2683c5efdf80d9b7d9a4b SHA512 13c0c5c27a5d01cf20093f314ff620658688fb10dfa052419b54f37e6de20fc947b120c7c9f3df5b3e8f3d92a1e701674c917456dbfb681c94e06a1da0456ead
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.13.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.13.5.ebuild
similarity index 89%
rename from kde-plasma/plasma-nm/plasma-nm-5.13.4.ebuild
rename to kde-plasma/plasma-nm/plasma-nm-5.13.5.ebuild
index 626c931ef3d1..8c18a229c479 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.13.4.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.13.5.ebuild
@@ -68,8 +68,8 @@ pkg_postinst() {
kde5_pkg_postinst
if ! has_version "kde-plasma/plasma-workspace:5"; then
- einfo "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
- einfo "However, the networkmanagement KCM can be called from either systemsettings"
- einfo "or manually: $ kcmshell5 kcm_networkmanagement"
+ elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
+ elog "However, the networkmanagement KCM can be called from either systemsettings"
+ elog "or manually: $ kcmshell5 kcm_networkmanagement"
fi
}
diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest
index 753a98329574..b619b524f683 100644
--- a/kde-plasma/plasma-pa/Manifest
+++ b/kde-plasma/plasma-pa/Manifest
@@ -1,3 +1,3 @@
DIST plasma-pa-5.12.5.tar.xz 86068 BLAKE2B 5133b667527e083d390b8d0e4352fdbb2d6ccc7abf6676e07b5f141787372bd8c00cb600f08e4fd20707476108fe661c779820645f06e895c53e4aa1411bc3a1 SHA512 7fedeaaeafaba7e2d7568fddcaff1793640979090aaf8ab7131c462b2bc0c2766f76d37cd0133c02c05a23efeb9e11b11350848d59b9869bf7bfcbd55924163e
DIST plasma-pa-5.12.6.tar.xz 87396 BLAKE2B 9fdb9426e1e9ba1e92d8e9bd724930de6f5f4055ebb6f74e2b5f6abf4efcc012ef9a6193762232abc063dd17bb7cd1d7e3b12e2a7250d3e9a9f6fdbb270fa24f SHA512 6d5cb3c5ab911d286782b84c7904e6317d2346e2fdcef5611704aa64967dbe0fd3b5794f35c4744ce1a5617d9c873d0ac39c30bfaf0e56fbbbe64cfa55a1df22
-DIST plasma-pa-5.13.4.tar.xz 90504 BLAKE2B 1413d0424742d6dfed9a4d902e6d0685d94eba5ce7e615f95f1775d30c629bf93117670ac3e72e2aef0517755de6db1ee4cabea56abf0160d86412d18700255d SHA512 347ec79201403eeb5859c54d29e7d1daee273972afce1014e3b8c81ae6256877e945c0748ab10e4ca1b195f085248c9f03c3db0c27d978506e8eb71fb5bc37a0
+DIST plasma-pa-5.13.5.tar.xz 90692 BLAKE2B 783fcf99ca9547818564370d1745c99b943409d8c0617844462fd74af94e34d00f392765525f422c245429838e75fae846e938e6bb039b7c27a0817ccf821eda SHA512 58667b60b4c9dc8f81d7defe35b7dab23f52b8e6e2bde3ce242b6d3e3f959335d3dadc855a12d2b04fa01da9243bf0408011e87a649bd6132b48c2eec964813f
diff --git a/kde-plasma/plasma-pa/plasma-pa-5.13.4-r1.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.13.5.ebuild
similarity index 99%
rename from kde-plasma/plasma-pa/plasma-pa-5.13.4-r1.ebuild
rename to kde-plasma/plasma-pa/plasma-pa-5.13.5.ebuild
index 81b3f937328b..3e7504c19b4c 100644
--- a/kde-plasma/plasma-pa/plasma-pa-5.13.4-r1.ebuild
+++ b/kde-plasma/plasma-pa/plasma-pa-5.13.5.ebuild
@@ -23,6 +23,7 @@ DEPEND="
media-libs/libcanberra
media-sound/pulseaudio
"
+
RDEPEND="${DEPEND}"
PATCHES=( "${FILESDIR}/${PN}-5.13.3-automagic_gconf.patch" )
diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest
index 3845234277e7..0175b41ef8cc 100644
--- a/kde-plasma/plasma-sdk/Manifest
+++ b/kde-plasma/plasma-sdk/Manifest
@@ -1,3 +1,3 @@
DIST plasma-sdk-5.12.5.tar.xz 243568 BLAKE2B a8c5b448843c14a1d0f4dfde1ae7857edcdc61e5ad8c295c42ba3d96e1721162e6ece0de2f4bcd50fbd48e7d5c5a497686313c67838c8b1d3e676d7d58e4aa2c SHA512 c04d5d5fd1782fb3dbf53ff3ca1f05a79b399fbc43ac2698ca68ae713d98c93b87519c10b879b8afe0c8e8cf900016ef42b531bfff40c16951fbe3dad225965b
DIST plasma-sdk-5.12.6.tar.xz 244444 BLAKE2B bfa5401015489a873168e6f18035f3f95224c65301e406a6ac4146d942fc9fb622d8e2b166500edfcde576141a954eeb30c5917b5d704847803230499241de9d SHA512 29684df360941f863a064c104855f21d8b455ba098946c8600aae1064d0bbd3da39e10b4b07f65abb9babc512d24ed925b07b244fcd015966474aeebaaf4cb00
-DIST plasma-sdk-5.13.4.tar.xz 249044 BLAKE2B 223262c03e6738560e403c36573137a2a9f7a0c91494a50d7dacf319eb9515ca70322d012a60b536d568a7b065cca39ceff260a493566413a22cf5462b00a191 SHA512 cff77edc0326180d7ef3f5a0477515912ed94e737950c22f683d7d5c4d41ab8cb359ab1970f9b76b86126727d54efc31b3bdce63fc15b9e95aecb5bd10f65ac9
+DIST plasma-sdk-5.13.5.tar.xz 250032 BLAKE2B 0269457091da4d462450883eeb7a7d7ccc26bb59804a8fe6ce04c131a77f2f0146060717479ace02f2f9b629b77188f44ac8d1217094e2a6d2429a3dc2b86c00 SHA512 bf73297d8d62c5336c1cb8c6c3e5918efce0a2a069c1b76f4e0c2b6d421aa3ee37f427a3f22c17d2b045af9a807a4104ab142d95b5c92f71237a72ffacd709f6
diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.13.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/plasma-sdk/plasma-sdk-5.13.4.ebuild
rename to kde-plasma/plasma-sdk/plasma-sdk-5.13.5.ebuild
diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest
index d93ad587f72d..ee4c0645b7d3 100644
--- a/kde-plasma/plasma-vault/Manifest
+++ b/kde-plasma/plasma-vault/Manifest
@@ -1,3 +1,3 @@
DIST plasma-vault-5.12.5.tar.xz 105108 BLAKE2B 4a4d574a08e52e3bad11ccc58cb509bc2a837767b10ea2cdf78320ab725d797a7a769c13209f06dfdc827ce1095a7ae3c73fe0bd3110430070e9b1957392f1ca SHA512 bb28a762b318707d61d7ae8621e0da31db9efb9171503c6f2ed9d53f29e78caf5716a86f7c9a6ae00cba2f6a1135456e5664e2f284d5a25214788b1099fa8345
DIST plasma-vault-5.12.6.tar.xz 104956 BLAKE2B 812d9e3dbc28ef9bfa636b739fecae4f60fa67d3e153554e70886bd865a27a50daffbc29fe9fd53fb5132ceb9a8d5b85be02264b7099baa2fac91c5c78852ec9 SHA512 5241d6a13099fe69fa279de6a6058ff4479b6f59d5348854de5a113304c5be333191d820802466ec75ccb43833e6abdb543b9b9089b12dd8bd78a69a8cce34bb
-DIST plasma-vault-5.13.4.tar.xz 115100 BLAKE2B 0bfc21b28cc53c6a1afd81100350a415a49bb7baa682ee76771f2608d66c721bf0c0ebd1d2413a07c5b8b322a2c3c1850aa20ccb114e3df589b4eb4091eb0fd1 SHA512 bdb8fcadd8980ace532ce8dbdda7c10c37fb2201060e94d366c8541d3be5e9e48974d1569fb51ad1f706e45741369ecb5d5514b64af7e934865752ed1ca8d28b
+DIST plasma-vault-5.13.5.tar.xz 114908 BLAKE2B 8043b46b5f8c0d2b6f22e6afedabc3b8116aadf47a5cdd1ca690ba2a232e5b6b7deb8de3bfd58a3566880f0b6c445e5d8ddec3165a6b74ecbf5d51ee3c981422 SHA512 f6579fd9134039c105f3399818520077e080a603459ad20d08825f00f341930dd84c0e6cb1ced8d722efd941a40751e7025a74098c4c1d4daca3b8f284fe38bd
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.13.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/plasma-vault/plasma-vault-5.13.4.ebuild
rename to kde-plasma/plasma-vault/plasma-vault-5.13.5.ebuild
diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest
index cecd968b8405..71c6b1d021d9 100644
--- a/kde-plasma/plasma-workspace-wallpapers/Manifest
+++ b/kde-plasma/plasma-workspace-wallpapers/Manifest
@@ -1,3 +1,3 @@
DIST plasma-workspace-wallpapers-5.12.5.tar.xz 45917408 BLAKE2B c8591cabf917153e317516b9b186259e1712aefc5597172f1c13228bb55bddcb91f00eb1f1c35d39f43ee2674bc58a8f197838f81c450b757b65bca608d149c6 SHA512 f6e30b638a09a7d704c70d19c52c8faabe72a28cd74a0ab2ffd9fd665edd8481d58df3afa0068ac2cc3fc5d9d91a4d2b0b4ec5491cd87f0f785dc16525d43f86
DIST plasma-workspace-wallpapers-5.12.6.tar.xz 45916176 BLAKE2B 790558df9b03dbafc0987e791c66ccdd30d2257cd249ace4b5efb64c705d28ca013db592e8ea8d3ca21f82882f3ffe2414a109767aa4aabc1a535327b1cf39a4 SHA512 3985927ad538b74a5b9ff9b00cf9ba9838103acbe6091040c3f2a489876805dcfa28547bf30e5f7b9fe608ded53bf52addf1a741314855b5e1aa7916890bafed
-DIST plasma-workspace-wallpapers-5.13.4.tar.xz 45917464 BLAKE2B ef05d8742098a36941b840e85c6f435348b71c5dd82f51fbd9e9af326f1058123b2f1b6acec030faeb3d63b13ff30c1385dfe4bfab1ee964ee78b8883df9c0b1 SHA512 f8e0d57cb427c34748aad676172022beb3760c3fb0c668f4e0d8ba89fce08c5cb3e8b55ae2fad864ff8f37187fabf41839cda2f8030e5a6202063d034f5afff2
+DIST plasma-workspace-wallpapers-5.13.5.tar.xz 45916196 BLAKE2B e483fcdff5d72867ed0e6a10ba004b748f89b04d71b320910a5654c8dc7ebf3658a97050c619a9115cc5a26fe3fe13baf812cb8f2ab58fa1a9a5f06436c8cb6b SHA512 51010cc3da749dc494bc5677b42efba408149110feb1320175fdc71044b777f13cd700511d1766b7dfdbdb98c29b7bdae6898f08ccd05517bd991de7c83974f3
diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.13.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.13.4.ebuild
rename to kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.13.5.ebuild
diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index d5375cbfe037..3b3abd289f02 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,3 +1,3 @@
DIST plasma-workspace-5.12.5.tar.xz 4564204 BLAKE2B fe821adb76f7bca59f03c50a8da649c0a063a0ab61952f48c259d256b7cdfc9ec799625e2ef6b66732ffb9472148dd40d9cedc2f728a4b0fdf127ce3b61cca3b SHA512 c086b13893ab422b701e31652015618d8e3752e4ee5a8b9721eee7085307d251ea716e72bab52f458655cbf49d9a1a94deb47482fd6ecb030b20d7ea1bb52deb
DIST plasma-workspace-5.12.6.tar.xz 4565260 BLAKE2B 72e539b1688c0c58c5fcb02b9de14edc36c849040baf7cd69a79e8d4f2e9a1e0b4cdca1086af3804de36969cb61a41e7def169862f890debab5d3bf5ead95ff5 SHA512 efa67214814a0193c3359bc7599174eab29f93826dcad61310f0fc7ce946ac779f35f2e8d0b231360dfd2ddeda398b8b12bf4a155ad6746e60e56a388f446488
-DIST plasma-workspace-5.13.4.tar.xz 4579896 BLAKE2B f9faf4f2cd09abc4bfb79d15e6d8aae88dd5b5505d183737e0762ad5603cb61d23f40cd040bf9b89200ddf9a7797221f833d1ecb52af0aca84959c3684c77508 SHA512 23fa64101389741470df308bb346c89d25b465a662acf08463852690727405b3c379936f7fea1ec658a6b20ee631548f99b3e23f2b30d9c0f71edca32763b7ad
+DIST plasma-workspace-5.13.5.tar.xz 4577444 BLAKE2B 4aef4cc12762113bb193f62a2a400b6cc53390ec1ff800048bc6f41391ed8a9228e1afd6379425d6e636f1d229d9cc9bb3d976515026c874fa27a3fe29bc0499 SHA512 f30dc3ea83ec3e2a754fb531be24b1f573e743724abcd7df88f83daba07b3bf360f2e6b5c7d2a54a8dd5c15a39e73123d6f2a00730d09f1caed08002c2da24d6
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.13.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/plasma-workspace/plasma-workspace-5.13.4.ebuild
rename to kde-plasma/plasma-workspace/plasma-workspace-5.13.5.ebuild
diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest
index d333c186d7b2..b17aa79d2d1f 100644
--- a/kde-plasma/plymouth-kcm/Manifest
+++ b/kde-plasma/plymouth-kcm/Manifest
@@ -1,3 +1,3 @@
DIST plymouth-kcm-5.12.5.tar.xz 38968 BLAKE2B 5707e49bcf9a03cc1546523075dc8c60dd00277c92866350babb36bbceff34b9612369d034c6983db0622821a6eb0025bedd0be7cd0412be010ca4e486a2a9af SHA512 67c630182eaf891bf4b28c9889f76b40c61525a992d3f80985f69ecdf831d9869456ff59b0c3f0cb9581b1f2412a56d907e9af3a8beaee3b1966ab64254b8c69
DIST plymouth-kcm-5.12.6.tar.xz 39448 BLAKE2B dc0d3292ed4f92ff6d731e5057db04202b869f2ecd7a59583f7894cd8120785acb8f0938944e47a523b3ea8b2272248d76544d9db03761a59817a9b1303461dd SHA512 1c6f1eabc9c814e908903c2fdc5372a73e5b579c743e99e5fc44d72dde70d95a582ee80d1ff9b930aa5e6df26d0c185bcee466604d7102e91332bcebf7e3d7bb
-DIST plymouth-kcm-5.13.4.tar.xz 39548 BLAKE2B 6f111d00db068693d075ab5a6dd13583b02b3435cb58d39a437040cc40fc142b0b3aee36f180cea12075ead252e4fb6b83101a26e380d0c04f4c2df19bf25a6d SHA512 ec8977e44e923b5d8dad64d30f144061ee20b8296926c1835d6c782a669da2ce59bb1204203488c820fe5bf9442adfe4fce7af75eb7757c6301b238e26abd75c
+DIST plymouth-kcm-5.13.5.tar.xz 39612 BLAKE2B 7b47ac2c6eccbd423180110b70ee2bd4f68da541ac6538e7ae8c2adbce2d0ceb1170abe6c35a8ee3b15f5c974879364f1249b57c626b9a1be5c76b0a0941fc5e SHA512 4f97e85782454a80d9e08ed472d26b6e25ba4681b44a9a1abb3664a52a1cb11c43dd35f043ed3dfd289becfcccd42ca45be354498b2128d3f2d28fed557854a0
diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.13.4.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/plymouth-kcm/plymouth-kcm-5.13.4.ebuild
rename to kde-plasma/plymouth-kcm/plymouth-kcm-5.13.5.ebuild
diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest
index e2b8757a1ec7..2c9970503138 100644
--- a/kde-plasma/polkit-kde-agent/Manifest
+++ b/kde-plasma/polkit-kde-agent/Manifest
@@ -1,3 +1,3 @@
DIST polkit-kde-agent-1-5.12.5.tar.xz 41624 BLAKE2B 6f9e105afa00715064765087084f3b3d5fb8c0c78ccce6466ebc59e7a40b11ea9be36c8f165c86bee1af3071b26fd3d0e6db0ab3cd3579b61d93ac5ab1146e79 SHA512 fba769258b3c461bef83d8f978e6033119bbe5479b8efc349d2fd48955e5d9fa73fa928867fa08110941f01e27ada438b375005083b84a2be9bda6589b999562
DIST polkit-kde-agent-1-5.12.6.tar.xz 42120 BLAKE2B 8f8ea94f1b9558461f198c2b9c085886d225fb3fb4d7bb5a9c480b40376a1e9ac5696122c09d30e5245e00c93679e84488f72e7790052eec0d4e15cdaa7a080e SHA512 7a156c6674dd453a5a1f2e00de0b451fcf25f3524d72762bbf09b047257e0a5b63ef6ecac33302ef0122630bd326c88841b553a7090891583eec8514810671f3
-DIST polkit-kde-agent-1-5.13.4.tar.xz 42784 BLAKE2B e3a4da1717c1064b3e5e9ed646e7d80eb79c34f29b344074b60ae62ce0f66fcffda953c12478a1f4d092a3745a9407c50f4e65a999ac7d2d66cb9b0ebe9ab974 SHA512 fc9e9b3cedaf31d777e32cd1c93783681f963c606ed6bc59299e4410c4ef59ceda8f75bb8f95fa733f6aca2d24680b036ce30f04fb7312dadbcfc0c0afcb055b
+DIST polkit-kde-agent-1-5.13.5.tar.xz 42916 BLAKE2B 7ce6b938fe5acba332b565eabc67eef337ba74e6c393768c64cb09288c0273fb8940fe6de1ae0126881e781449e9b8ac24cc8062a1442c77cd8172894568f9ac SHA512 a66c410bf55d64088287de4b29fdc4ee8e41e283df3bd9e49b2403c54a6433d3d4638f7902374b8d2d5e3c0bf6add42c55b80ccc53bf886df3cbda4613902955
diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.13.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/polkit-kde-agent/polkit-kde-agent-5.13.4.ebuild
rename to kde-plasma/polkit-kde-agent/polkit-kde-agent-5.13.5.ebuild
diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest
index c7dcc5e66701..7269c1f6d9d8 100644
--- a/kde-plasma/powerdevil/Manifest
+++ b/kde-plasma/powerdevil/Manifest
@@ -1,3 +1,3 @@
DIST powerdevil-5.12.5.tar.xz 382664 BLAKE2B f94788e91455dcf17340f1b3041f15db218481360e5d0979d0a785acedd74378ea195610a9b01457f06259176db998e328c2d05cb67d706d456b671bf6a110e4 SHA512 e40342c5565276671c9752b071c84b1c5d648c8c8c56dd127bc57d690be28518cd5782809ffe0253bbb1241034c14652ea29880c1ba0266e1df300e771a4d117
DIST powerdevil-5.12.6.tar.xz 536436 BLAKE2B b3470bd3655087a3889ba3b2f8a644172af49b52243443cffd490122f67c1e075dccbef550d85b977517333c73d05bd4fee6dcfda3e74d2ee0c1858921e2ab4a SHA512 b77e1990e59bae684d19fd796789aa0216d111952941642c354fc760e862cd5008c923aa5f1783c8699818fdfd36333a2ad56832834e3ce2232905ec399e0846
-DIST powerdevil-5.13.4.tar.xz 598948 BLAKE2B c0a7ef685b758981bf94283fe4b3ee21ddb7f2061d0eac3186303c33d40a2ad392342bed638a2833a69858ebbcba5f248b89932ced6edabbeee785be1303eaaf SHA512 291ede3ddbeb4683bf69e7cbb7908d036e0836f3e6d855122ad7e5aaa67f42aba91472882146c27f4ddd5957cae629ea1aa23c71e7c39072df4d716a3b02ead9
+DIST powerdevil-5.13.5.tar.xz 597764 BLAKE2B 910422fb97a732f640800dd786566ab4029fca7b4dabae776ed4fa0fe85eaeb81338f6421607af113fcf509a831170061b92c1352af5fc24d87ca8640dc4a0f1 SHA512 d2ac3196b80297da62872f6078dc65ebaca7805cff3a0325c45127d6e19d4d54f305e5a6b190e03414c2a189bb236bb8e04353fe5403ea38e54077fc7dd2e167
diff --git a/kde-plasma/powerdevil/powerdevil-5.13.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.13.5.ebuild
similarity index 97%
rename from kde-plasma/powerdevil/powerdevil-5.13.4.ebuild
rename to kde-plasma/powerdevil/powerdevil-5.13.5.ebuild
index ed23ce04aed6..6e4e8693a80b 100644
--- a/kde-plasma/powerdevil/powerdevil-5.13.4.ebuild
+++ b/kde-plasma/powerdevil/powerdevil-5.13.5.ebuild
@@ -20,7 +20,6 @@ DEPEND="
$(add_frameworks_dep kcoreaddons)
$(add_frameworks_dep kcrash)
$(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep kglobalaccel)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kidletime)
diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest
index 367709636a8a..6420d73d10be 100644
--- a/kde-plasma/sddm-kcm/Manifest
+++ b/kde-plasma/sddm-kcm/Manifest
@@ -1,3 +1,3 @@
DIST sddm-kcm-5.12.5.tar.xz 60164 BLAKE2B 87bb31f9b057c944d91ab49d848fbb20f72a6843e6a151d309d0d9d039956b662f059551929ff81cdcace084553c7bf699f843649024c3ff653aec2462880b82 SHA512 a2b03c35d0234764a76a1bcf525cac68a91678c952731a2aa929d596f6454135d347af5985f8dceb8834ef6fe9e91380349be073457a53ed43c9ec4e0278d262
DIST sddm-kcm-5.12.6.tar.xz 60480 BLAKE2B c580dc68500d49a3decdd02bbb8cf02194d02aaa98b920232431b0c2645f9b163a1e113c2f94acb0991e8a62562888a61e6946d86c2746885b391f21df0f501a SHA512 f9b43d4dba83c80b6cac1a55f8a7e99c500a01578a67354d8c54d049ff42ffb1a7b0ba2912e089a382b960397b4031b46e49882ba272d9ebd5c60dde843077fd
-DIST sddm-kcm-5.13.4.tar.xz 60660 BLAKE2B abb8865608050deae7fed415d5e58345b6e16d735660406ccffd44c4c137201f09949cd72c1541e2d710802adc1b62f9a560df26f0038f938d0e2c96f15281ea SHA512 6b3da32e99242864f2a25ce34c5a46ec3c7fed8e929b351b08a07e97f7368a3afa27d81d6d1b017a9671b95c2cb6b2e724a42cb1f4f58d14c1308727fd8d0ad7
+DIST sddm-kcm-5.13.5.tar.xz 60560 BLAKE2B 8a335f49471fc4f763247b1f207eb15eb0d30ca1268dd5fa855301f2cd691319859dc1291c0156ed8053a8910eebea24d8f1f47a270a9106e8ae57fe6959b64f SHA512 b535efa9115bf6c8ce9351f89e09b90f445fb5cbbd931a68af8f7f09633af87f2ffe4545eab53778012c2e45a8214f11383b4e41c5e92724a171e1ab1843c479
diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.13.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/sddm-kcm/sddm-kcm-5.13.4.ebuild
rename to kde-plasma/sddm-kcm/sddm-kcm-5.13.5.ebuild
diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest
index 453a36299bcd..22fdce3465fd 100644
--- a/kde-plasma/systemsettings/Manifest
+++ b/kde-plasma/systemsettings/Manifest
@@ -1,3 +1,3 @@
DIST systemsettings-5.12.5.tar.xz 172136 BLAKE2B 7ed9f5909e202a7be792502abc816430db8921335753c8631a9486eb2c95ea1d0c56646a709a25541e0f8edc0d63325c7d829535cd4032454bd8234dac1f4892 SHA512 c08170379d776724d2bb3d0426483b841f4e491c0c410ac7e258f9c43461791102ab5209674e50ce716f01ad528d1e4d942e13d16caf67b9c53e21905ff716c9
DIST systemsettings-5.12.6.tar.xz 175140 BLAKE2B d67d2246338da0712ffc984104d365966b464f455597ee99db402bce9e9c0f4483f472965560ba38459dcc40b9a10ebf8cbd71ccc4f89f0bc5c014a131eb8c00 SHA512 a34cf8277751f956d9d7369c99d9999d8315f34b1d0975dbed375a12b35727dcaefd78582ba627f2c649fdf3371fa99acddcfe7fe262545795b4a7f10c4f53b3
-DIST systemsettings-5.13.4.tar.xz 179912 BLAKE2B 922364ac29257d8a189d0930f7bd190970a806e06ece5db57eccac7cdbc51f4907e73e7633f1d9570fdde12b02c2790fced602725d758044a467be7fc77593f6 SHA512 a77dc00fcfc7103d68d08f06bbae8e5c631254fbed5e55fea6f7cefb6408b77ee0d1c2478e30128e434ae2e05cb9936fe1b8bba792c2a1abe57f07ce769509ad
+DIST systemsettings-5.13.5.tar.xz 179436 BLAKE2B fcbb0983bae9bd29a2e11bfa0083eea6b1275853985c8210d953041d0d82b8bb89af7400dff98fe79092c3b4b6ec03477815206bd153537a53d616501766d0c7 SHA512 cbe254dfff2d9637626586ad4df5da581f01acc16b24883269cc4c11a1ddd6d9dd3fb3e45680729f3b1197ddc30e185f7a2fdb2199f9f696e8eb6ea72ea88d79
diff --git a/kde-plasma/systemsettings/systemsettings-5.13.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/systemsettings/systemsettings-5.13.4.ebuild
rename to kde-plasma/systemsettings/systemsettings-5.13.5.ebuild
diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest
index cbc18b8174dc..4c07a06f44a6 100644
--- a/kde-plasma/user-manager/Manifest
+++ b/kde-plasma/user-manager/Manifest
@@ -1,3 +1,3 @@
DIST user-manager-5.12.5.tar.xz 544812 BLAKE2B e885a9be4ecbedb04ea0b957606a3b8d91cf0b0b71f5efe7fd68c29d3c577dd1c2394653dbe5948f40f74f8e2f478a2feb38d05003de762ae1e88eafae7f5932 SHA512 c553287b20d0d25c79972b2de375696c8759026a4f8d2203c3f2e9b547461bd93e27a5e14a5584ccb045a25ac107bc875dbe105e97d59aefdd588406a41c515e
DIST user-manager-5.12.6.tar.xz 545144 BLAKE2B 4e8173992d8ec22709423cae01a50c7d005cc241dc71ea25cce8e8de8e287e685594e0241f980f49aee71da4dba86da08d9eadadbb6e905cf04d658a0743db26 SHA512 17aa16065209059b21ea8e35ce25f646319e9aecd8c7ea2ae8903a5cd0005c9d1b0ceccec57449d4a257624f8ddf9d08a664454914fb083e39d7266f34df8eff
-DIST user-manager-5.13.4.tar.xz 544976 BLAKE2B cfa8dfcbf05c242318566f1cc4ba863677d1178739ac39d3b7400d568ae358f2403db1b91301a5fea59bb0ebf7312ede669e3e03ca40530b2bdbf65e39450c3f SHA512 0e7f6ca5ff02cba06b4cae831083fe999e127659156947b8c48fe0c279dd7939cf05c1f420380b0e65882c1c7f87db0aa230c3cc62290735658c07070da3399a
+DIST user-manager-5.13.5.tar.xz 545008 BLAKE2B 47a2e5cf4e2ee26f7337ab89716519ab248422b686be1acaf75306d44044bdbd931b4d032057a10a243fa12e237cc1dae5aaaeba57012b7e09d048c5ec0a1ca2 SHA512 e18902843b7b6079ad712996cc90850c2e662c710b67e1d54dbec7db9194b1c7c640b6ced0bdf51c1f0974ba24edbff691cad347689e202e4478681a194e5172
diff --git a/kde-plasma/user-manager/user-manager-5.13.4.ebuild b/kde-plasma/user-manager/user-manager-5.13.5.ebuild
similarity index 100%
rename from kde-plasma/user-manager/user-manager-5.13.4.ebuild
rename to kde-plasma/user-manager/user-manager-5.13.5.ebuild
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index dff9b900771f..8b7de7bd1152 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/spamassassin/files/3.4.1-spamd.conf b/mail-filter/spamassassin/files/3.4.1-spamd.conf
deleted file mode 100644
index 0cb7cbbfc471..000000000000
--- a/mail-filter/spamassassin/files/3.4.1-spamd.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# Config file for /etc/init.d/spamd
-#
-# ***WARNING***
-#
-# spamd was not designed to listed to an untrusted network. spamd
-# is vulnerable to DoS attacks (and eternal doom) if used to listen
-# to an untrusted network.
-#
-# ***WARNING***
-#
-
-# Additional options to pass to the spamd daemon. The spamd(1) man
-# page explains the available options. If you choose to listen on a
-# non-default interface, you will need to use OpenRC's "rc_need"
-# mechanism to ensure that your interface comes up before spamd
-# starts. The openrc-run(8) man page describes rc_need.
-SPAMD_OPTS="--max-children=5 --create-prefs --helper-home-dir"
-
-# Sets the 'nice' level of the spamd process.
-SPAMD_NICELEVEL=0
-
-# How long (in seconds) should we wait for spamd to stop after we've
-# asked it to? After this amount of time, if spamd is still running,
-# we will assume that it has failed to stop.
-SPAMD_TIMEOUT=15
diff --git a/mail-filter/spamassassin/files/3.4.1-spamd.init b/mail-filter/spamassassin/files/3.4.1-spamd.init
deleted file mode 100644
index cbe91e93231d..000000000000
--- a/mail-filter/spamassassin/files/3.4.1-spamd.init
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PIDDIR=/run/spamd
-PIDFILE=${PIDDIR}/spamd.pid
-
-extra_started_commands="reload"
-
-depend() {
- before mta
- use logger
-@USEPOSTGRES@ use postgresql
-@USEMYSQL@ use mysql
-}
-
-start() {
- ebegin "Starting spamd"
-
- # Ensure that the PID file's directory exists.
- checkpath --directory "${PIDDIR}"
-
- # Reloading spamd causes its PID to change, so we track it by
- # name instead.
- start-stop-daemon --start --quiet \
- --name spamd \
- --nicelevel ${SPAMD_NICELEVEL} \
- --pidfile ${PIDFILE} \
- --exec /usr/sbin/spamd -- \
- --daemonize \
- --pidfile=${PIDFILE} \
- ${SPAMD_OPTS}
-
- retval=$?
-
- eend ${retval} "Failed to start spamd"
-}
-
-stop() {
- ebegin "Stopping spamd"
- # Retry after SPAMD_TIMEOUT seconds because spamd can take a
- # while to kill off all of its children. This was bug 322025.
- start-stop-daemon --stop \
- --quiet \
- --retry ${SPAMD_TIMEOUT} \
- --pidfile ${PIDFILE}
- eend $? "Failed to stop spamd"
-}
-
-reload() {
- ebegin "Reloading configuration"
- # Warning: causes the PID of the spamd process to change.
- start-stop-daemon --signal HUP --quiet --pidfile ${PIDFILE}
- eend $?
-}
diff --git a/mail-filter/spamassassin/files/spamassassin.service-r1 b/mail-filter/spamassassin/files/spamassassin.service-r1
deleted file mode 100644
index 3d145817f129..000000000000
--- a/mail-filter/spamassassin/files/spamassassin.service-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Spamassassin daemon
-After=syslog.target network.target
-
-[Service]
-Type=forking
-PIDFile=/run/spamd.pid
-ExecStart=/usr/sbin/spamd -d --pidfile /run/spamd.pid -m 5 $SPAMD_OPTS
-ExecReload=/bin/kill -HUP $MAINPID
-StandardOutput=syslog
-StandardError=syslog
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/mail-filter/spamassassin/files/spamassassin.service.conf b/mail-filter/spamassassin/files/spamassassin.service.conf
deleted file mode 100644
index 9fc1f6294525..000000000000
--- a/mail-filter/spamassassin/files/spamassassin.service.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Here you can append some options to spamd process, please
-# double check that you make needed changes in service file if
-# you use options requiring it
-# Some options:
-#
-# -c to create a per user configuration file
-# -H [dir] to switch home dirs for helper apps, dir optional
-
-[Service]
-Environment="SPAMD_OPTS= -c -H"
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 3a481516a9ab..4ee582297167 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/graphite2/graphite2-1.3.11.ebuild b/media-gfx/graphite2/graphite2-1.3.11-r1.ebuild
similarity index 96%
rename from media-gfx/graphite2/graphite2-1.3.11.ebuild
rename to media-gfx/graphite2/graphite2-1.3.11-r1.ebuild
index 2eef1c685687..64d56a70455a 100644
--- a/media-gfx/graphite2/graphite2-1.3.11.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.11-r1.ebuild
@@ -62,7 +62,8 @@ src_prepare() {
multilib_src_configure() {
local mycmakeargs=(
- "-DVM_MACHINE_TYPE=direct"
+ # Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
+ "-DGRAPHITE2_VM_TYPE=direct"
# https://sourceforge.net/p/silgraphite/bugs/49/
$([[ ${CHOST} == powerpc*-apple* ]] && \
echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")
diff --git a/media-gfx/graphite2/graphite2-1.3.12.ebuild b/media-gfx/graphite2/graphite2-1.3.12-r1.ebuild
similarity index 96%
rename from media-gfx/graphite2/graphite2-1.3.12.ebuild
rename to media-gfx/graphite2/graphite2-1.3.12-r1.ebuild
index 2eef1c685687..64d56a70455a 100644
--- a/media-gfx/graphite2/graphite2-1.3.12.ebuild
+++ b/media-gfx/graphite2/graphite2-1.3.12-r1.ebuild
@@ -62,7 +62,8 @@ src_prepare() {
multilib_src_configure() {
local mycmakeargs=(
- "-DVM_MACHINE_TYPE=direct"
+ # Renamed VM_MACHINE_TYPE to GRAPHITE2_VM_TYPE
+ "-DGRAPHITE2_VM_TYPE=direct"
# https://sourceforge.net/p/silgraphite/bugs/49/
$([[ ${CHOST} == powerpc*-apple* ]] && \
echo "-DGRAPHITE2_NSEGCACHE:BOOL=ON")
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 9b08cf5354a4..d0523e0b6439 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/chromaprint/chromaprint-1.4.3.ebuild b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
index 2d24d62657ed..47c4df6743e0 100644
--- a/media-libs/chromaprint/chromaprint-1.4.3.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/acoustid/${PN}/releases/download/v${PV}/${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0/1"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd"
IUSE="libav test tools"
# note: use ffmpeg or libav instead of fftw because it's recommended and required for tools
diff --git a/media-libs/libmpdclient/Manifest b/media-libs/libmpdclient/Manifest
index 9525c530fde8..b4d05d7e6f03 100644
--- a/media-libs/libmpdclient/Manifest
+++ b/media-libs/libmpdclient/Manifest
@@ -2,3 +2,4 @@ DIST libmpdclient-2.10.tar.xz 261792 BLAKE2B e8200d1a8db0370417924a92a83cd7c51d7
DIST libmpdclient-2.11.tar.xz 274836 BLAKE2B 2a3cf2a5dddb6586edc9bf28752b8575dab51e37aa13aee138ef239ca741bba844c1ec6fdf09727f25be073b3909250bb22a34602a0bf8b0d61ab4bcf09a8566 SHA512 0503db31262acfb871578278d6526e12ee2ffbbe414425ab5ebac61f27da8ad4503d948b4d192421d301bd0a29b9b460f195e82a44608f984697a8aa47b2eb9b
DIST libmpdclient-2.13.tar.xz 56964 BLAKE2B fdd393543ac3c15572a6f6d56ec0113dae301c90e852620ef4e17ac6bee1a26eb20580859ea59cb78d6ff7b5b9fc9e5374d407e017c35bf767a824fc7a6612df SHA512 a2aa4e1e4fcb4ab390a0a38e745e59a9764c40bfcd07d449fdc7fef7b0c5fc0c2e795ef545b6fa6d62c00861d306cab41ea43011510ad1e3a60603873a3c1b28
DIST libmpdclient-2.14.tar.xz 58268 BLAKE2B 0152b34cc29e5c3c96136f00ea5ff3dc1d60f64ab6e8aab2b6ada0fa2d90742b32025be85e12703057a00014d72c035177de03345f9c16e151242a26eee9e314 SHA512 50bf27a739ca784d5f182cc90b24fad4dbc35752e455c1ce7c2fcda78342bac5480927af199c7f790feff136dc1fe16e4eb19803ba5760ec508ba65c9737e13a
+DIST libmpdclient-2.15.tar.xz 59212 BLAKE2B 35ca605681c98d1aa97fb9ef11b8a29244cab7ccb3d5743b5f7e49e4dc3ef28b8c14534ee793af4a76ea5dcb01487804d9f08d6ecaf6d7b80c5b37bf157408db SHA512 244b89f4976b62b41c95263479771162d9c059808aa143efc9fa0a092e110b9be98ce1ab2bb1ae100b15019df826b9a8e510e3819e3fd89f6d664deea3c6260a
diff --git a/media-libs/libmpdclient/libmpdclient-2.15.ebuild b/media-libs/libmpdclient/libmpdclient-2.15.ebuild
new file mode 100644
index 000000000000..70d69fc459da
--- /dev/null
+++ b/media-libs/libmpdclient/libmpdclient-2.15.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson
+
+DESCRIPTION="A library for interfacing Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc examples test"
+
+RDEPEND=""
+DEPEND="
+ doc? ( app-doc/doxygen )
+ test? ( dev-libs/check )
+"
+
+src_prepare() {
+ default
+
+ sed -i "s:@top_srcdir@:.:" doc/doxygen.conf.in || die
+
+ # meson doesn't support setting docdir
+ sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+ -e "/^install_data(/s/'COPYING', //" \
+ -i meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddocumentation=$(usex doc true false)
+ -Dtest=$(usex test true false)
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ use examples && dodoc src/example.c
+ use doc || rm -rf "${ED}"/usr/share/doc/${PF}/html
+}
diff --git a/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.2.0-gcc8.patch b/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.2.0-gcc8.patch
new file mode 100644
index 000000000000..74c97982e4c7
--- /dev/null
+++ b/media-libs/libqaccessibilityclient/files/libqaccessibilityclient-0.2.0-gcc8.patch
@@ -0,0 +1,100 @@
+From 34f6084ff3ba1dd025cae17e5d114caff1d7fa6f Mon Sep 17 00:00:00 2001
+From: Frederik Gladhorn
+Date: Tue, 25 Jul 2017 16:27:12 +0200
+Subject: Compile with clang and make sure qHash works with AccessibleObject
+
+Clang didn't like the complicated friend declaration. To make sure it's
+not broken again, add one test to verify that we can use AO in hashes,
+since apps might want to do that.
+---
+ src/qaccessibilityclient/accessibleobject.cpp | 4 ----
+ src/qaccessibilityclient/accessibleobject.h | 17 ++++++++++-------
+ tests/auto/tst_accessibilityclient.cpp | 9 +++++++++
+ 3 files changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/src/qaccessibilityclient/accessibleobject.cpp b/src/qaccessibilityclient/accessibleobject.cpp
+index b2b005b..b8c9d33 100644
+--- a/src/qaccessibilityclient/accessibleobject.cpp
++++ b/src/qaccessibilityclient/accessibleobject.cpp
+@@ -534,7 +534,3 @@ QACCESSIBILITYCLIENT_EXPORT QDebug QAccessibleClient::operator<<(QDebug d, const
+ return d.space();
+ }
+ #endif
+-
+-uint qHash(const QAccessibleClient::AccessibleObject& object) {
+- return qHash(object.d);
+-}
+diff --git a/src/qaccessibilityclient/accessibleobject.h b/src/qaccessibilityclient/accessibleobject.h
+index a0d0db4..ee2e5ad 100644
+--- a/src/qaccessibilityclient/accessibleobject.h
++++ b/src/qaccessibilityclient/accessibleobject.h
+@@ -27,8 +27,6 @@ namespace QAccessibleClient {
+ class AccessibleObject;
+ }
+
+-uint qHash(const QAccessibleClient::AccessibleObject& object);
+-
+ #include
+ #include
+ #include
+@@ -40,6 +38,11 @@ namespace QAccessibleClient {
+ class AccessibleObjectPrivate;
+ class RegistryPrivate;
+
++
++#ifndef QT_NO_DEBUG_STREAM
++ QACCESSIBILITYCLIENT_EXPORT QDebug operator<<(QDebug, const AccessibleObject &);
++#endif
++
+ /**
+ This class represents an accessible object.
+
+@@ -746,13 +749,13 @@ private:
+ friend class RegistryPrivate;
+ friend class CacheWeakStrategy;
+ friend class CacheStrongStrategy;
+- friend QDebug QAccessibleClient::operator<<(QDebug, const AccessibleObject &);
+- friend uint ::qHash(const AccessibleObject& object);
+-};
+-
+ #ifndef QT_NO_DEBUG_STREAM
+-QACCESSIBILITYCLIENT_EXPORT QDebug operator<<(QDebug, const AccessibleObject &);
++ friend QDebug QAccessibleClient::operator<<(QDebug, const AccessibleObject &);
+ #endif
++ friend uint qHash(const QAccessibleClient::AccessibleObject& object) {
++ return qHash(object.d);
++ }
++};
+
+ }
+
+diff --git a/tests/auto/tst_accessibilityclient.cpp b/tests/auto/tst_accessibilityclient.cpp
+index ad98c0e..c377982 100644
+--- a/tests/auto/tst_accessibilityclient.cpp
++++ b/tests/auto/tst_accessibilityclient.cpp
+@@ -75,6 +75,7 @@ private Q_SLOTS:
+
+ void tst_registry();
+ void tst_accessibleObject();
++ void tst_hashable();
+ void tst_application();
+ void tst_navigation();
+ void tst_focus();
+@@ -145,6 +146,14 @@ void AccessibilityClientTest::tst_accessibleObject()
+ QVERIFY(!invalid2.isValid());
+ }
+
++void AccessibilityClientTest::tst_hashable()
++{
++ AccessibleObject testObject;
++ QHash testHash;
++ testHash[testObject] = 1;
++ QCOMPARE(testHash[testObject], 1);
++}
++
+ void AccessibilityClientTest::tst_application()
+ {
+ QString appName = QLatin1String("Lib QAccessibleClient test");
+--
+cgit v0.11.2
+
diff --git a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild
index de1d15f27a17..e18e8169c11e 100644
--- a/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.2.0.ebuild
+++ b/media-libs/libqaccessibilityclient/libqaccessibilityclient-0.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
@@ -22,6 +22,8 @@ DEPEND="
"
RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/${P}-gcc8.patch" )
+
src_prepare() {
kde5_src_prepare
cmake_comment_add_subdirectory tests
diff --git a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
index 57e4e38805e2..5d368bee1fc8 100644
--- a/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.5.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}.mirror/${P}.tar.gz"
LICENSE="BSD-2"
SLOT="0/5" # based on SONAME
-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="doc static-libs test"
RDEPEND="
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 3fc61b834f91..e832b095e4be 100644
Binary files a/media-plugins/Manifest.gz and b/media-plugins/Manifest.gz differ
diff --git a/media-plugins/kodi-inputstream-adaptive/Manifest b/media-plugins/kodi-inputstream-adaptive/Manifest
index 94a87b99f9f5..7e3cb13fedaf 100644
--- a/media-plugins/kodi-inputstream-adaptive/Manifest
+++ b/media-plugins/kodi-inputstream-adaptive/Manifest
@@ -1,3 +1,4 @@
DIST kodi-inputstream-adaptive-1.0.6.tar.gz 556505 BLAKE2B 0b093850cf61ed75627d024f28fca93a6b0426decd3d99b94a60f9a86f611d59a6b2a7bee7e5db52095d99d0a0d092d60c3051a77294cb5a47e8cdcd13359a61 SHA512 10accc94d3cb68b0cf89d4703ed05b4c0b1fbd02415b6721c372933ba629eb13c034d4336a9c8e5ffb4c8150a798b29c184f0d475069cad82adbd6e63d63b712
DIST kodi-inputstream-adaptive-2.0.19.tar.gz 881342 BLAKE2B afa1341e9f45d5b97338d21359e4527c3a19ac8ca30066ea2c83ea0eb8e2a34a72bc179cfc222612579ee1b1be12bda52325b3f32c85b53c7a9cefd8461d238c SHA512 0453998749df691071bd54e22eda8042f15f0ab1a11b04a260c7005048b533b51b6c82311bcb364fb10e68816512610a08db5331f974a042bb8967939d759d99
DIST kodi-inputstream-adaptive-2.0.20.tar.gz 881743 BLAKE2B 210b23fe42a262696b2dc10efeee5303b3c859a5d1cb4a94cb3628f6d2ca17fb29d170c728a51e1ea6767ecaa79b2c56831169d960da569fe71f18fc474cb2d5 SHA512 51d65fc83f50f7544198666123eb82bcd55a6524b7bbbec403375013264d24ecf8c3f326c815df98f77458af121dc4d81e863cd5f6b9ae49a1fcd50207a37bbe
+DIST kodi-inputstream-adaptive-2.0.25.tar.gz 881743 BLAKE2B 210b23fe42a262696b2dc10efeee5303b3c859a5d1cb4a94cb3628f6d2ca17fb29d170c728a51e1ea6767ecaa79b2c56831169d960da569fe71f18fc474cb2d5 SHA512 51d65fc83f50f7544198666123eb82bcd55a6524b7bbbec403375013264d24ecf8c3f326c815df98f77458af121dc4d81e863cd5f6b9ae49a1fcd50207a37bbe
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.25.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.25.ebuild
new file mode 100644
index 000000000000..962f5efbfe14
--- /dev/null
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-2.0.25.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils kodi-addon
+
+DESCRIPTION="Kodi's Adaptive inputstream addon"
+HOMEPAGE="https://github.com/peak3d/inputstream.adaptive.git"
+SRC_URI=""
+
+case ${PV} in
+9999)
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/peak3d/inputstream.adaptive.git"
+ inherit git-r3
+ ;;
+*)
+ KEYWORDS="~amd64 ~x86"
+ GIT_COMMIT="c51b9a9b58a645f820883e6d99982277fc58aac5"
+ SRC_URI="https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz/${GIT_COMMIT} -> ${P}.tar.gz"
+ S="${WORKDIR}/inputstream.adaptive-${GIT_COMMIT}"
+ ;;
+esac
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ dev-libs/expat
+ =media-tv/kodi-17*
+ =media-libs/kodi-platform-17*
+ =dev-libs/libplatform-2*
+ "
+RDEPEND="
+ ${DEPEND}
+ "
diff --git a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
index 53da96d3acc9..2764806685e0 100644
--- a/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
+++ b/media-plugins/kodi-inputstream-adaptive/kodi-inputstream-adaptive-9999.ebuild
@@ -28,8 +28,8 @@ IUSE=""
DEPEND="
dev-libs/expat
- =media-tv/kodi-9999
- =media-libs/kodi-platform-9999
+ ~media-tv/kodi-9999
+ ~media-libs/kodi-platform-9999
=dev-libs/libplatform-2*
"
RDEPEND="
diff --git a/media-plugins/vdr-satip/Manifest b/media-plugins/vdr-satip/Manifest
index 22208e5bd3e0..b6076d3a73dc 100644
--- a/media-plugins/vdr-satip/Manifest
+++ b/media-plugins/vdr-satip/Manifest
@@ -1,3 +1 @@
-DIST vdr-satip-1.0.2.tgz 59480 BLAKE2B 9f7c1ee20c32df348cea5e004b792db05814c79d79d4ef8d7aaa55067c65f3d70057a31cd679ec148282d55382f7cf90534cff904da1aee55715d27aa7dd3a7a SHA512 a8630c1ebfbbe74eb7f78d350bd487bf67256d2d01ee05c631351d5a0891fd0ea5dcd1bbf8a2c26be806ee6dfbb1415bf8616914a6bb9a46a3fac213a6c60c94
-DIST vdr-satip-2.2.0.tgz 60496 BLAKE2B 453cd4748b7c5c98ed9b977af6ce069be20fd3367074777d99e02b0231c987ccfe49b2f23af5dc932b5eda69f15ab3b2e6f405b297e2ad39c02fc2b7bbd1814b SHA512 9a32297c48650ee6ce22aebc0e6f59774a39aba7b1c75942833bba6e65b518c0bc6b50d3deba95fecec34dbfcb092e905a04eade92ce7658f2ca452131e9210e
DIST vdr-satip-2.2.3.tgz 62722 BLAKE2B 408fe520b4210fa24667d4244560d5132260ce08067d482a50b12446c42c0c34fd922b3429d00c4e3550a7b1dc1d21bfac534cae9de478594751b9cf0f558d52 SHA512 451606b52831c009aaec894f0547c59a9447279d7f96a4b2291614eab09a3539849abcb6974b7c2c4b34e7b43a2f9c782ab1ea6bfd4e35f9747349065fb6a5e7
diff --git a/media-plugins/vdr-satip/files/vdr-satip-2.2.3_missinginclude.patch b/media-plugins/vdr-satip/files/vdr-satip-2.2.3_missinginclude.patch
new file mode 100644
index 000000000000..4d0b32329e23
--- /dev/null
+++ b/media-plugins/vdr-satip/files/vdr-satip-2.2.3_missinginclude.patch
@@ -0,0 +1,15 @@
+fix: isspace was not declared in this scope
+https://github.com/rofafor/vdr-plugin-satip/commit/c10372bb4f1
+
+Signed-of by: Joerg Bornkessel (03/Sep/2018)
+diff -Naur satip-2.2.3.orig/satip.c satip-2.2.3/satip.c
+--- satip-2.2.3.orig/satip.c 2018-09-03 13:00:20.000000000 +0200
++++ satip-2.2.3/satip.c 2018-09-03 13:00:54.000000000 +0200
+@@ -5,6 +5,7 @@
+ *
+ */
+
++#include
+ #include
+ #include
+ #include "common.h"
diff --git a/media-plugins/vdr-satip/vdr-satip-1.0.2-r1.ebuild b/media-plugins/vdr-satip/vdr-satip-1.0.2-r1.ebuild
deleted file mode 100644
index 8e3078d571cf..000000000000
--- a/media-plugins/vdr-satip/vdr-satip-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: integrates SAT>IP network devices seamlessly into VDR"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/${P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2
- >=net-misc/curl-7.36
- || ( dev-libs/tinyxml
- dev-libs/pugixml )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- vdr-plugin-2_src_prepare
-
- if has_version "dev-libs/tinyxml" ; then
- sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile
- #BUILD_PARAMS+=" SATIP_USE_TINYXML = 1 "
- fi
-}
diff --git a/media-plugins/vdr-satip/vdr-satip-2.2.0.ebuild b/media-plugins/vdr-satip/vdr-satip-2.2.0.ebuild
deleted file mode 100644
index 8214e2462b17..000000000000
--- a/media-plugins/vdr-satip/vdr-satip-2.2.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: integrates SAT>IP network devices seamlessly into VDR"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/${P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.2.0
- >=net-misc/curl-7.36
- || ( dev-libs/tinyxml
- dev-libs/pugixml )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- vdr-plugin-2_src_prepare
-
- if has_version "dev-libs/tinyxml" ; then
- sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile
- #BUILD_PARAMS+=" SATIP_USE_TINYXML = 1 "
- fi
-}
diff --git a/media-plugins/vdr-satip/vdr-satip-2.2.3-r1.ebuild b/media-plugins/vdr-satip/vdr-satip-2.2.3-r2.ebuild
similarity index 85%
rename from media-plugins/vdr-satip/vdr-satip-2.2.3-r1.ebuild
rename to media-plugins/vdr-satip/vdr-satip-2.2.3-r2.ebuild
index 75160254218a..805adb773dd9 100644
--- a/media-plugins/vdr-satip/vdr-satip-2.2.3-r1.ebuild
+++ b/media-plugins/vdr-satip/vdr-satip-2.2.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit vdr-plugin-2
@@ -26,6 +26,9 @@ src_prepare() {
# c++11 compile fix
eapply "${FILESDIR}/${P}_c++11.patch"
+ #gcc 7 compile fix
+ eapply "${FILESDIR}/${P}_missinginclude.patch"
+
if has_version "dev-libs/tinyxml" ; then
sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile
fi
diff --git a/media-plugins/vdr-satip/vdr-satip-2.2.3.ebuild b/media-plugins/vdr-satip/vdr-satip-2.2.3.ebuild
deleted file mode 100644
index 8214e2462b17..000000000000
--- a/media-plugins/vdr-satip/vdr-satip-2.2.3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit vdr-plugin-2
-
-DESCRIPTION="VDR Plugin: integrates SAT>IP network devices seamlessly into VDR"
-HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
-SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/${P}.tgz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.2.0
- >=net-misc/curl-7.36
- || ( dev-libs/tinyxml
- dev-libs/pugixml )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
- vdr-plugin-2_src_prepare
-
- if has_version "dev-libs/tinyxml" ; then
- sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile
- #BUILD_PARAMS+=" SATIP_USE_TINYXML = 1 "
- fi
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 97c7ddae12b3..f40b819e4c7f 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 28f944978e8d..3104e3b18829 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1,2 @@
DIST cantata-2.2.0.tar.bz2 2251649 BLAKE2B 9b28a4e3a77245fcf00f81780adecdc51e066f068798f92300ef8527872313f5fb56d4b90a6f5511caf951ba9fcd5c094dd5e9062fe3d314b75412b3e8e03d37 SHA512 519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd
-DIST cantata-2.3.1.tar.bz2 2414702 BLAKE2B c44f7e95091dd4f84e630236e7f681d2ea47cd90705cdeeb17d3e892d4e0b978f88d4cb648841543494670c5dbc1a00ba9e2377dfd684b2fdee9223d4b6b28e3 SHA512 8199b08b1f3d2111fc50fbc4e5b1edced6ac480fd213a11eee569deeebf3a3f1167c2b53c3117bb90b2b81b46792c56b99b65eae5d2b290c0f3b3f90736108e5
+DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589 SHA512 d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4
diff --git a/media-sound/cantata/cantata-2.2.0-r2.ebuild b/media-sound/cantata/cantata-2.2.0-r2.ebuild
deleted file mode 100644
index c9cd47b8623e..000000000000
--- a/media-sound/cantata/cantata-2.2.0-r2.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
-
-PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN"
-inherit cmake-utils gnome2-utils l10n qmake-utils xdg
-
-DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
-HOMEPAGE="https://github.com/CDrummond/cantata"
-SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks"
-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 )
-"
-
-COMMON_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(+)]
- media-libs/taglib-extras
- udisks? ( sys-fs/udisks:2 )
- )
-"
-RDEPEND="${COMMON_DEPEND}
- dev-lang/perl[ithreads]
-"
-DEPEND="${COMMON_DEPEND}
- dev-qt/qtconcurrent:5
- dev-qt/linguist-tools:5
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${P}-headers.patch"
- "${FILESDIR}/${P}-qtsql-5.10.patch" # bug 642196
-)
-
-src_prepare() {
- remove_locale() {
- rm "translations/${PN}_${1}".ts || die
- }
-
- cmake-utils_src_prepare
-
- # Unbundle 3rd party libs
- rm -r 3rdparty/{ebur128,qtsingleapplication} || die
-
- l10n_find_plocales_changes "translations" "${PN}_" ".ts"
- l10n_for_each_disabled_locale_do remove_locale
-}
-
-src_configure() {
- local mycmakeargs=(
- -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
- -DENABLE_CDPARANOIA=$(usex cdda)
- -DENABLE_CDDB=$(usex cddb)
- -DENABLE_CDIOPARANOIA=$(usex cdio)
- -DENABLE_HTTP_SERVER=$(usex http-server)
- -DENABLE_MTP=$(usex mtp)
- -DENABLE_MUSICBRAINZ=$(usex musicbrainz)
- -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
- -DENABLE_FFMPEG=$(usex replaygain)
- -DENABLE_MPG123=$(usex replaygain)
- -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
- -DENABLE_TAGLIB=$(usex taglib)
- -DENABLE_TAGLIB_EXTRAS=$(usex taglib)
- -DENABLE_DEVICES_SUPPORT=$(usex udisks)
- -DENABLE_REMOTE_DEVICES=OFF
- -DENABLE_UDISKS2=ON
- )
-
- cmake-utils_src_configure
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
- xdg_pkg_preinst
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_pkg_postinst
-
- has_version media-sound/mpd || \
- elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata."
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_pkg_postrm
-}
diff --git a/media-sound/cantata/cantata-2.3.1.ebuild b/media-sound/cantata/cantata-2.3.2.ebuild
similarity index 95%
rename from media-sound/cantata/cantata-2.3.1.ebuild
rename to media-sound/cantata/cantata-2.3.2.ebuild
index 4bc76c731c18..db85ccf2fbc9 100644
--- a/media-sound/cantata/cantata-2.3.1.ebuild
+++ b/media-sound/cantata/cantata-2.3.2.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PLOCALES="cs da de en_GB es fr hu it ja ko pl ru zh_CN"
+PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
inherit cmake-utils gnome2-utils l10n qmake-utils xdg-utils
DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
@@ -46,7 +46,7 @@ COMMON_DEPEND="
media-sound/mpg123
virtual/ffmpeg
)
- streaming? ( media-video/vlc:0= )
+ streaming? ( dev-qt/qtmultimedia:5 )
taglib? (
media-libs/taglib[asf(+),mp4(+)]
udisks? ( sys-fs/udisks:2 )
@@ -66,6 +66,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}/${PN}-2.2.0-headers.patch"
+ "${FILESDIR}/${P}-opusfile.patch"
)
src_prepare() {
diff --git a/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch b/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch
deleted file mode 100644
index 16cb6d8c2d1f..000000000000
--- a/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a Mon Sep 17 00:00:00 2001
-From: Craig Drummond
-Date: Tue, 28 Nov 2017 22:37:01 +0000
-Subject: [PATCH] Create QSqlQuery, then call prepare Issue #1130
-
----
- db/librarydb.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/db/librarydb.cpp b/db/librarydb.cpp
-index 603d8abc1..4f75dc28f 100644
---- a/db/librarydb.cpp
-+++ b/db/librarydb.cpp
-@@ -453,7 +453,8 @@ class SqlQuery
- if (limit>0) {
- sql+=" LIMIT "+QString::number(limit);
- }
-- query=QSqlQuery(sql, db);
-+ query = QSqlQuery(db);
-+ query.prepare(sql);
-
- for (const QVariant &value: boundValues) {
- query.addBindValue(value);
diff --git a/media-sound/cantata/files/cantata-2.3.2-opusfile.patch b/media-sound/cantata/files/cantata-2.3.2-opusfile.patch
new file mode 100644
index 000000000000..956edf1d5133
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.3.2-opusfile.patch
@@ -0,0 +1,22 @@
+From cdf4363df91475b091ad20000078ca8ef21ce91f Mon Sep 17 00:00:00 2001
+From: Craig Drummond
+Date: Sat, 11 Aug 2018 08:31:40 +0100
+Subject: [PATCH] Add '.opus' to list of recognised extensions for local files.
+
+---
+ models/playqueuemodel.cpp | 2 +-
+ 1 file changed, 1 insertions(+), 1 deletion(-)
+
+diff --git a/models/playqueuemodel.cpp b/models/playqueuemodel.cpp
+index deaaa78f3..c6c4c4130 100644
+--- a/models/playqueuemodel.cpp
++++ b/models/playqueuemodel.cpp
+@@ -89,7 +89,7 @@ QSet PlayQueueModel::constFileExtensions = QSet()
+ << QLatin1String("m4b") << QLatin1String("mp4") << QLatin1String("m4p") << QLatin1String("wav") << QLatin1String("wv")
+ << QLatin1String("wvp") << QLatin1String("aiff") << QLatin1String("aif") << QLatin1String("aifc") << QLatin1String("ape")
+ << QLatin1String("spx") << QLatin1String("tta") << QLatin1String("mpc") << QLatin1String("mpp") << QLatin1String("mp+")
+- << QLatin1String("dff") << QLatin1String("dsf")
++ << QLatin1String("dff") << QLatin1String("dsf") << QLatin1String("opus")
+ // And playlists...
+ << QLatin1String("m3u") << QLatin1String("m3u8") << constPlsPlaylist << constXspfPlaylist;
+
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index db4963715846..5910a01e531c 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1 +1,2 @@
DIST kid3-3.6.1.tar.gz 1428799 BLAKE2B 055743c06bf28188c16e627556e1c23cb724f6a1601975f259a912445063a23f3c6d8101cbb3f582fac66c56bbcbaf243e637132b20930f718f2c5b1056b7dc9 SHA512 026be02c3dea1f05af0f24a26ee9d6b775f7e408db6de8afbb3dda5f66ee465263fb1c3763d4e8ab52b1856a58c1ea21228d24cdb754508e68c04f7d5cccfb77
+DIST kid3-3.6.2.tar.gz 1430880 BLAKE2B f27d8e332639b72ccc0ace8afe05391c3edc0b470430477407138a90a2b3b0a6cefe0e740b0862d29cc61c866503b5df9b1333f26cd1f7f67797007d6117ce58 SHA512 96e9686d5af8c06867bc4d3b2ca51ddf89b6ba9a622236f79de53bef6b3ef518ef64fef3ab9af4e63ac9161bea8dc1c79d0417fe1ac433a9dfe36331089ab548
diff --git a/media-sound/kid3/kid3-3.6.2.ebuild b/media-sound/kid3/kid3-3.6.2.ebuild
new file mode 100644
index 000000000000..59ad6ac10814
--- /dev/null
+++ b/media-sound/kid3/kid3-3.6.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ECM_KDEINSTALLDIRS="false"
+KDE_HANDBOOK="false" # buildsystem applies broken python hacks, bug #614950
+inherit kde5
+
+DESCRIPTION="Simple tag editor based on Qt"
+HOMEPAGE="https://kid3.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64 ~x86"
+IUSE="acoustid flac kde mp3 mp4 +taglib vorbis"
+
+REQUIRED_USE="flac? ( vorbis )"
+
+COMMON_DEPEND="
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtmultimedia)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtxml)
+ sys-libs/readline:0=
+ acoustid? (
+ media-libs/chromaprint
+ virtual/ffmpeg
+ )
+ flac? (
+ media-libs/flac[cxx]
+ media-libs/libvorbis
+ )
+ kde? (
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ )
+ mp3? ( media-libs/id3lib )
+ mp4? ( media-libs/libmp4v2:0 )
+ taglib? ( >=media-libs/taglib-1.9.1 )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ !media-sound/kid3:4
+"
+DEPEND="${COMMON_DEPEND}
+ $(add_qt_dep linguist-tools)
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.3.2-libdir.patch"
+)
+
+src_prepare() {
+ # overengineered upstream build system
+ # kde5 eclass src_prepare leads to compile failure
+
+ # only enable handbook when required
+ if ! use_if_iuse handbook ; then
+ cmake_comment_add_subdirectory ${KDE_DOC_DIR}
+ fi
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_PHONON=OFF
+ -DWITH_QT4=OFF
+ -DWITH_QT5=ON
+ -DWITH_CHROMAPRINT=$(usex acoustid)
+ -DWITH_FLAC=$(usex flac)
+ -DWITH_ID3LIB=$(usex mp3)
+ -DWITH_MP4V2=$(usex mp4)
+ -DWITH_TAGLIB=$(usex taglib)
+ -DWITH_VORBIS=$(usex vorbis)
+ )
+
+ if use kde ; then
+ mycmakeargs+=( "-DWITH_APPS=KDE;CLI" )
+ else
+ mycmakeargs+=( "-DWITH_APPS=Qt;CLI" )
+ fi
+
+ kde5_src_configure
+}
diff --git a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
index 0a537ca16236..0c248cb9fa1e 100644
--- a/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
+++ b/media-sound/mpg123/mpg123-1.25.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-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 ~x86-solaris"
+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 ~x86-solaris"
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
diff --git a/media-sound/teamspeak-client/Manifest b/media-sound/teamspeak-client/Manifest
index af25b788a916..cbf8f525d498 100644
--- a/media-sound/teamspeak-client/Manifest
+++ b/media-sound/teamspeak-client/Manifest
@@ -1,2 +1,2 @@
-DIST TeamSpeak3-Client-linux_amd64-3.1.10.run 75971703 BLAKE2B 0b48b15d15af5b78d06a3c80b4aae964883bed5508685d22dbfeba30adecf5bc4b7e3dab54ca13f828eae7d2c24640037fb378581d726d81f4df26d5aa8f8929 SHA512 5a83c8a24e5af0353d15c28fdc8cfd840fbf071f5a25fbbc8f672bdec0afd374663826d42901329657596a6f3fa88774b3a1d9acad9fcc9fa0f41fc426043b3e
-DIST TeamSpeak3-Client-linux_x86-3.1.10.run 75706398 BLAKE2B 534079d00510d1d12fbdfd759b9e1f730da0afb4df813afaf389b2f63781d2d27bdaf6bc9ea1f3a92ab31b07a7f1bd190f647a1fc2491f43946396d2db68596f SHA512 81e70223c3257b74334b78928060bf7204ef4d79e5a09dd8b196c628361cdce88d6e8908bc99c2b40997d218fcfc0185073637275c1712a03b241537be3e56e6
+DIST TeamSpeak3-Client-linux_amd64-3.2.1.run 76215644 BLAKE2B 81e3aa54f88182ff79113d994a2ef4d9e6d3ba38078879a19f21bca6637cf1d2f7bf7cf66a15edf957bc25413760f67d343db7fbbb8aa678e1aa55e8ae48d75c SHA512 b77d77daf8806bd48580abcc4721a6dbe5e30f55ed0ececc57215405d6607c3457d7ab628d4cb607d78c6f206f7093745842692176ca199bd95578f8b6fa81a8
+DIST TeamSpeak3-Client-linux_x86-3.2.1.run 75958520 BLAKE2B 2cdc92e740c3951d434f9545da670892b5f16c27fcf1c20b5fb9feb0d2bdbebabda08f2c8216b12a02a4248e685a006ef8f711ec7eb9f27e18550dc8f0e5422b SHA512 761210985b0c2f6674ae7da5bceb57783f7bba0827799fd291e951716ac7490aa3ee88d4030b985b67d5397353b459bceef42e6b41467513440ffeeaaa265d54
diff --git a/media-sound/teamspeak-client/teamspeak-client-3.1.10.ebuild b/media-sound/teamspeak-client/teamspeak-client-3.2.1.ebuild
similarity index 93%
rename from media-sound/teamspeak-client/teamspeak-client-3.1.10.ebuild
rename to media-sound/teamspeak-client/teamspeak-client-3.2.1.ebuild
index 806dc9b21dca..f3e33c771106 100644
--- a/media-sound/teamspeak-client/teamspeak-client-3.1.10.ebuild
+++ b/media-sound/teamspeak-client/teamspeak-client-3.2.1.ebuild
@@ -67,11 +67,8 @@ src_install() {
exeinto /opt/teamspeak3-client/soundbackends
doexe soundbackends/*.so
- local folders=( "gfx" "html" "resources" "sound" "styles" "translations" )
- for folder in ${folders[@]}; do
- insinto /opt/teamspeak3-client
- doins -r ${folder}
- done
+ insinto /opt/teamspeak3-client
+ doins -r gfx html resources sound styles translations
dosym ../../usr/$(get_libdir)/qt5/libexec/QtWebEngineProcess /opt/teamspeak3-client/QtWebEngineProcess
diff --git a/media-sound/teamspeak-server/Manifest b/media-sound/teamspeak-server/Manifest
index e723192c1d12..8378fbd711be 100644
--- a/media-sound/teamspeak-server/Manifest
+++ b/media-sound/teamspeak-server/Manifest
@@ -1,2 +1,2 @@
-DIST teamspeak3-server_linux_amd64-3.3.0.tar.bz2 8383889 BLAKE2B 7397f1c084c7487b613db7c2a71670320636b1c3c5fa353f255d721404dabee39f4f876440613772a1c784947393907c58fb7f275bf212ac3ae46957feb0c5a2 SHA512 375d1476fcbc507aec75a781ee071ccb99753290ecbfb2f2709c9a14556502f27adbbfc31abc9905e33eab3796a6addbde3f81e4714969e18204873c62c0647f
-DIST teamspeak3-server_linux_x86-3.3.0.tar.bz2 8257788 BLAKE2B d23dab70b2f847cf8c1e52b36dd72afa8c6f463b7439d3fd0b10e62586e6678c70eced16c934f87cd8fcc18ee1d2013189a9e60c56dfebf356bb4975f0fce821 SHA512 9b85b75d55f0ea2c89bfc0925de008268cb0c82894dc6909588dd2de6d0c271ad19102f7cc6f5d5f1143be3e3e9c56ac6206fb19d120eede1fc9f4ec67a58142
+DIST teamspeak3-server_linux_amd64-3.3.1.tar.bz2 8415114 BLAKE2B 22908295d78677ecd09778c85b3e8dae6acd2170732759760884b76bb3614c4af8553910b9c62800bf5ab9cd32423acfe3c9bb476b7b6d7450330626f9f8ad8e SHA512 4335ed9a3ba11a8b26385f5c0b73c01da8c7374b3c0fa24bdeefc66bc297dd241e012ab30e9d0185c44a6c575a38d6c131dfdd8819147dd34f7e79d940ec49cb
+DIST teamspeak3-server_linux_x86-3.3.1.tar.bz2 8289228 BLAKE2B 3bdc1fcc29b9650ab6b1eda9d7cb9c201993fed0d194bf75071562d4f553b21098a31d1081113da7b8269056af4bcc3761acff17cf133c9fce874f63c2f4ec75 SHA512 734abdc9e0f3b6bda4fe5c71da51167745d2bdf56890a93c3b4d6d944231e9a561735224d4541f2b70584810aeca8f73f97334d26949fcd1000a708664c44eeb
diff --git a/media-sound/teamspeak-server/teamspeak-server-3.3.0.ebuild b/media-sound/teamspeak-server/teamspeak-server-3.3.1.ebuild
similarity index 100%
rename from media-sound/teamspeak-server/teamspeak-server-3.3.0.ebuild
rename to media-sound/teamspeak-server/teamspeak-server-3.3.1.ebuild
diff --git a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
index b743418df1ea..dabcdf61ba8f 100644
--- a/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
+++ b/media-sound/timidity++/timidity++-2.14.0-r3.ebuild
@@ -16,7 +16,9 @@ SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="motif oss nas X gtk vorbis tk slang alsa jack emacs ao selinux speex flac ncurses"
+IUSE="alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X"
+
+REQUIRED_USE="tk? ( X )"
DEPEND="
alsa? ( media-libs/alsa-lib )
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 4a08cf9dcb79..1b5375d802ae 100644
Binary files a/media-tv/Manifest.gz and b/media-tv/Manifest.gz differ
diff --git a/media-tv/plex-media-server/metadata.xml b/media-tv/plex-media-server/metadata.xml
index 68319c2b587c..bca0744b282e 100644
--- a/media-tv/plex-media-server/metadata.xml
+++ b/media-tv/plex-media-server/metadata.xml
@@ -1,8 +1,5 @@
-
- fearedbliss@gentoo.org
- Jonathan Vasquez
-
+
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index b39503a99517..67225c718e80 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest
index dac0f69a4e80..671820be3723 100644
--- a/media-video/vdr/Manifest
+++ b/media-video/vdr/Manifest
@@ -1,2 +1,5 @@
+DIST extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2 69472 BLAKE2B 60669e9c20b2bd573eb05733bbf9548d2e643b36693be8b15a377b38470708a71b29e2a16baf7ed378132265f814ec9d35dae749ccf6ae204cd9beb787dc8f57 SHA512 f4ecb786ec5a026fa75fcf539518e80273bf43fc325c13a380c70eb85351910efa991b3ee71ca477e597bc2b4598a18620b6cf00fc02714acfcc4e6112d84b6c
DIST extpng-vdr-2.2.0-gentoo-edition-v1.patch.bz2 34664 BLAKE2B 81b68ebe0ef4588c3676f0b7a2c766d8d4d4f754a987b3be5868f3c6eff9158d4cea8e492ca81df535e637dbdc5baff638d1fafb4163e9d9a2d0125aba17e2e1 SHA512 16d6fbb8201f003dfe653b6a49424b794d7e697e27ad6f2383dbe17b76712ea5a3da88a676900b84d75ff7425bf3eb9084d60a89a4598758f482dc1f013f7b3e
+DIST vdr-2.0.6.tar.bz2 839575 BLAKE2B 40de46d8465b7008bc29c7e2c1c241d4114aa3d62aa6a0acd81636133c295cd87c2fc618e725885c98f47445220e897c23188373457a96b51cf832ca417c9842 SHA512 070ebbfb85478887088567872a71744305dbf9c75de8b095a8fe46d883b0b4fe140539caeb2243715f42793a45790a127542655f549f7ea3cb71c4f9912fa07d
+DIST vdr-2.0.7.tar.bz2 841511 BLAKE2B bde06dd038ea2ebfa8768742c02bc7046448ade29032a90130f721af1c4c5d2301ff52065a04c51b31f14250d8ae252d796d93e3012ea1057f2359b1ef9c327c SHA512 cba35f62162cd681179872915023890f492e95cc94d65aadd3cb4d03d7e3c7e2f197e7f35149cdf872169af35c2b841e1042e054f28164860b7cea8367793ce0
DIST vdr-2.2.0.tar.bz2 922708 BLAKE2B 975e07d6d4c5bd13ee92be5d6a1826d6404b0c59e20fa2e30689b185a61e02d54782ad528e6a4f15e0d36806b30bcf48aa336d63adb3604e78056ff318e0fd2c SHA512 183f58133915c6c0fe8ec2b88becbcb2a36418210e6dcf7931053d3771d727c3581593f9eb5c9693abf39e22e728f7b41c42079cd704610c3636ec05134ea93d
diff --git a/media-video/vdr/files/vdr-2.0.6_gentoo.patch b/media-video/vdr/files/vdr-2.0.6_gentoo.patch
new file mode 100644
index 000000000000..1641fc8e2ee6
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.0.6_gentoo.patch
@@ -0,0 +1,68 @@
+diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile
+--- vdr-2.0.6.orig/Makefile 2014-09-22 22:17:23.000000000 +0200
++++ vdr-2.0.6/Makefile 2014-09-24 15:22:43.000000000 +0200
+@@ -109,7 +109,7 @@
+ VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+ APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h)
+
+-all: vdr i18n plugins
++all: vdr i18n
+
+ # Implicit rules:
+
+@@ -162,7 +162,7 @@
+
+ PODIR = po
+ LOCALEDIR = locale
+-I18Npo = $(wildcard $(PODIR)/*.po)
++I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po))
+ I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+ I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+ I18Npot = $(PODIR)/vdr.pot
+@@ -185,7 +185,7 @@
+
+ install-i18n: i18n
+ @mkdir -p $(DESTDIR)$(LOCDIR)
+- cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR)
++ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done)
+
+ # The 'include' directory (for plugins):
+
+@@ -247,7 +247,7 @@
+
+ # Install the files (note that 'install-pc' must be first!):
+
+-install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes
++install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes
+
+ # VDR binary:
+
+@@ -259,11 +259,12 @@
+
+ install-dirs:
+ @mkdir -p $(DESTDIR)$(VIDEODIR)
+- @mkdir -p $(DESTDIR)$(CONFDIR)
+- @mkdir -p $(DESTDIR)$(CACHEDIR)
++# @mkdir -p $(DESTDIR)$(CONFDIR)
++# @mkdir -p $(DESTDIR)$(CACHEDIR)
+ @mkdir -p $(DESTDIR)$(RESDIR)
+
+ install-conf:
++ @mkdir -p $(DESTDIR)$(CONFDIR)
+ @cp -pn *.conf $(DESTDIR)$(CONFDIR)
+
+ # Documentation:
+@@ -290,8 +291,11 @@
+ # Includes:
+
+ install-includes: include-dir
+- @mkdir -p $(DESTDIR)$(INCDIR)
+- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++# @mkdir -p $(DESTDIR)$(INCDIR)
++# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR)
++ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi
++ @cp -pLR include/vdr $(DESTDIR)$(INCDIR)
++ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr
+
+ # pkg-config file:
+
diff --git a/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch
new file mode 100644
index 000000000000..de9f4b90163f
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch
@@ -0,0 +1,438 @@
+diff -Naur vdr-2.0.7.orig/HISTORY vdr-2.0.7/HISTORY
+--- vdr-2.0.7.orig/HISTORY 2015-01-23 09:16:13.735620000 +0100
++++ vdr-2.0.7/HISTORY 2015-01-23 09:17:29.038614491 +0100
+@@ -7916,6 +7916,16 @@
+ - The APIVERSION has been increased to 2.0.6 due to the changes to pat.h, sdt.h and
+ the functional modification to cFont::CreateFont().
+
++2015-01-18: Version 2.0.6 + backport of systemd support from versions 2.1.6 and 2.1.7
++
++- Added support for systemd (thanks to Christopher Reimer). To activate this you
++ need to add "SDNOTIFY=1" to the 'make' call.
++
++2015-01-18: Version 2.0.6 + backport of reading command line arguments from files, from version 2.1$
++
++- VDR now reads command line options from *.conf files in /etc/vdr/conf.d (thanks
++ to Lars Hanisch). See vdr.1 and vdr.5 for details.
++
+ 2015-01-20: Version 2.0.7
+
+ - Fixed a possible division by zero in frame rate detection.
+diff -Naur vdr-2.0.7.orig/Make.config.template vdr-2.0.7/Make.config.template
+--- vdr-2.0.7.orig/Make.config.template 2015-01-23 09:16:13.736620000 +0100
++++ vdr-2.0.7/Make.config.template 2015-01-23 09:16:34.199618503 +0100
+@@ -38,6 +38,7 @@
+
+ #VIDEODIR = /srv/vdr/video
+ #CONFDIR = /var/lib/vdr
++#ARGSDIR = /etc/vdr/conf.d
+ #CACHEDIR = /var/cache/vdr
+
+ # Overrides for preset/legacy configurations:
+diff -Naur vdr-2.0.7.orig/Makefile vdr-2.0.7/Makefile
+--- vdr-2.0.7.orig/Makefile 2015-01-23 09:16:13.724620001 +0100
++++ vdr-2.0.7/Makefile 2015-01-23 09:17:58.588612330 +0100
+@@ -31,6 +31,7 @@
+ DESTDIR ?=
+ VIDEODIR ?= /srv/vdr/video
+ CONFDIR ?= /var/lib/vdr
++ARGSDIR ?= /etc/vdr/conf.d
+ CACHEDIR ?= /var/cache/vdr
+
+ PREFIX ?= /usr/local
+@@ -66,7 +67,7 @@
+
+ SILIB = $(LSIDIR)/libsi.a
+
+-OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
++OBJS = args.o audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
+ dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
+ lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o\
+ receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
+@@ -111,12 +112,18 @@
+ DEFINES += -DBIDI
+ LIBS += $(shell pkg-config --libs fribidi)
+ endif
++ifdef SDNOTIFY
++INCLUDES += $(shell pkg-config --cflags libsystemd-daemon)
++DEFINES += -DSDNOTIFY
++LIBS += $(shell pkg-config --libs libsystemd-daemon)
++endif
+
+ LIRC_DEVICE ?= /var/run/lirc/lircd
+
+ DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\"
+ DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
+ DEFINES += -DCONFDIR=\"$(CONFDIR)\"
++DEFINES += -DARGSDIR=\"$(ARGSDIR)\"
+ DEFINES += -DCACHEDIR=\"$(CACHEDIR)\"
+ DEFINES += -DRESDIR=\"$(RESDIR)\"
+ DEFINES += -DPLUGINDIR=\"$(LIBDIR)\"
+@@ -161,6 +168,7 @@
+ @echo "mandir=$(MANDIR)" >> $@
+ @echo "configdir=$(CONFDIR)" >> $@
+ @echo "videodir=$(VIDEODIR)" >> $@
++ @echo "argsdir=$(ARGSDIR)" >> $@
+ @echo "cachedir=$(CACHEDIR)" >> $@
+ @echo "resdir=$(RESDIR)" >> $@
+ @echo "libdir=$(LIBDIR)" >> $@
+@@ -278,6 +286,7 @@
+ install-dirs:
+ @mkdir -p $(DESTDIR)$(VIDEODIR)
+ # @mkdir -p $(DESTDIR)$(CONFDIR)
++ @mkdir -p $(DESTDIR)$(ARGSDIR)
+ # @mkdir -p $(DESTDIR)$(CACHEDIR)
+ @mkdir -p $(DESTDIR)$(RESDIR)
+
+diff -Naur vdr-2.0.7.orig/args.c vdr-2.0.7/args.c
+--- vdr-2.0.7.orig/args.c 1970-01-01 01:00:00.000000000 +0100
++++ vdr-2.0.7/args.c 2015-01-23 09:16:34.199618503 +0100
+@@ -0,0 +1,129 @@
++/*
++ * args.c: Read arguments from files
++ *
++ * See the main source file 'vdr.c' for copyright information and
++ * how to reach the author.
++ *
++ * Original version written by Lars Hanisch .
++ *
++ * $Id$
++ */
++
++#include "args.h"
++#include
++
++cArgs::cArgs(const char *Argv0)
++{
++ argv0 = Argv0;
++ argc = 0;
++ argv = NULL;
++}
++
++cArgs::~cArgs(void)
++{
++ if (argv != NULL)
++ delete [] argv;
++}
++
++bool cArgs::AddArg(const char *s)
++{
++ if (inVdrSection)
++ args.Append(strdup(s));
++ else if (*lastArg == NULL)
++ return false;
++ else
++ lastArg = cString::sprintf("%s %s", *lastArg, s);
++ return true;
++}
++
++bool cArgs::ReadDirectory(const char *Directory)
++{
++ if (argv != NULL)
++ delete [] argv;
++ argc = 0;
++ argv = NULL;
++ args.Clear();
++ lastArg = NULL;
++ inVdrSection = false;
++ cFileNameList files(Directory, false);
++ if (files.Size() == 0)
++ return false;
++ for (int i = 0; i < files.Size(); i++) {
++ const char *fileName = files.At(i);
++ if (startswith(fileName, ".") || !endswith(fileName, ".conf"))
++ continue;
++ cString fullFileName = AddDirectory(Directory, fileName);
++ struct stat fs;
++ if ((access(*fullFileName, F_OK) != 0) || (stat(*fullFileName, &fs) != 0) || S_ISDIR(fs.st_mode))
++ continue;
++ bool ok = true;
++ int line = 0;
++ FILE *f = fopen(*fullFileName, "r");
++ if (f) {
++ char *s;
++ cReadLine ReadLine;
++ while ((s = ReadLine.Read(f)) != NULL) {
++ line++;
++ s = stripspace(skipspace(s));
++ if (!isempty(s) && (s[0] != '#')) {
++ if (startswith(s, "[") && endswith(s, "]")) {
++ s[strlen(s) - 1] = 0;
++ s++;
++ if (*lastArg) {
++ args.Append(strdup(*lastArg));
++ lastArg = NULL;
++ }
++ if (strcmp(s, "vdr") == 0)
++ inVdrSection = true;
++ else {
++ inVdrSection = false;
++ lastArg = cString::sprintf("--plugin=%s", s);
++ }
++ }
++ else {
++ if ((strlen(s) > 2) && (s[0] == '-') && (s[1] != '-')) { // short option, split at first space
++ char *p = strchr(s, ' ');
++ if (p == NULL) {
++ ok = AddArg(s);
++ if (!ok)
++ break;
++ }
++ else {
++ *p = 0;
++ p++;
++ ok = AddArg(s);
++ if (!ok)
++ break;
++ ok = AddArg(p);
++ if (!ok)
++ break;
++ }
++ }
++ else {
++ ok = AddArg(s);
++ if (!ok)
++ break;
++ }
++ }
++ }
++ }
++ fclose(f);
++ }
++ if (!ok) {
++ esyslog("ERROR: args file %s, line %d", *fullFileName, line);
++ return false;
++ }
++ }
++ if (*lastArg) {
++ args.Append(strdup(*lastArg));
++ lastArg = NULL;
++ }
++ argv = new char*[args.Size() + 1];
++ argv[0] = strdup(*argv0);
++ argc = 1;
++ for (int i = 0; i < args.Size(); i++) {
++ argv[argc] = args.At(i);
++ argc++;
++ }
++ return true;
++}
+diff -Naur vdr-2.0.7.orig/args.h vdr-2.0.7/args.h
+--- vdr-2.0.7.orig/args.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr-2.0.7/args.h 2015-01-23 09:16:34.199618503 +0100
+@@ -0,0 +1,34 @@
++/*
++ * args.h: Read arguments from files
++ *
++ * See the main source file 'vdr.c' for copyright information and
++ * how to reach the author.
++ *
++ * Original version written by Lars Hanisch .
++ *
++ * $Id$
++ */
++
++#ifndef __ARGS_H
++#define __ARGS_H
++
++#include "tools.h"
++
++class cArgs {
++private:
++ cString argv0;
++ cStringList args;
++ cString lastArg;
++ bool inVdrSection;
++ int argc;
++ char **argv;
++ bool AddArg(const char *s);
++public:
++ cArgs(const char *Argv0);
++ ~cArgs(void);
++ bool ReadDirectory(const char *Directory);
++ int GetArgc(void) const { return argc; };
++ char **GetArgv(void) const { return argv; };
++ };
++
++#endif //__ARGS_H
+diff -Naur vdr-2.0.7.orig/interface.c vdr-2.0.7/interface.c
+--- vdr-2.0.7.orig/interface.c 2015-01-23 09:16:13.725620001 +0100
++++ vdr-2.0.7/interface.c 2015-01-23 09:16:34.199618503 +0100
+@@ -10,6 +10,9 @@
+ #include "interface.h"
+ #include
+ #include
++#ifdef SDNOTIFY
++#include
++#endif
+ #include
+ #include "i18n.h"
+ #include "status.h"
+@@ -159,6 +162,9 @@
+ bool known = Keys.KnowsRemote(Remote->Name());
+ dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys");
+ if (!known) {
++#ifdef SDNOTIFY
++ sd_notify(0, "READY=1\nSTATUS=Learning keys...");
++#endif
+ cSkinDisplayMenu *DisplayMenu = Skins.Current()->DisplayMenu();
+ DisplayMenu->SetMenuCategory(mcUnknown);
+ char Headline[256];
+diff -Naur vdr-2.0.7.orig/vdr.1 vdr-2.0.7/vdr.1
+--- vdr-2.0.7.orig/vdr.1 2015-01-23 09:16:13.730620000 +0100
++++ vdr-2.0.7/vdr.1 2015-01-23 09:16:34.200618503 +0100
+@@ -178,6 +178,10 @@
+ Read resource files from \fIdir\fR
+ (default is to read them from the config directory).
+ .TP
++.BI \-\-showargs[= dir ]
++Read command line arguments from \fIdir\fR (default is \fI/etc/vdr/conf.d\fR),
++display them to the console and exit.
++.TP
+ .BI \-s\ cmd ,\ \-\-shutdown= cmd
+ Call \fIcmd\fR to shutdown the computer. See the file \fIINSTALL\fR for more
+ information.
+@@ -213,6 +217,10 @@
+ .BI \-w\ sec ,\ \-\-watchdog= sec
+ Activate the watchdog timer with a timeout of \fIsec\fR seconds.
+ A value of \fB0\fR (default) disables the watchdog.
++.P
++If started without any options, vdr tries to read command line options
++from files named '*.conf' in the directory /etc/vdr/conf.d. Files are
++read in alphabetical order. See vdr(5) for details.
+ .SH SIGNALS
+ .TP
+ .B SIGINT, SIGTERM
+diff -Naur vdr-2.0.7.orig/vdr.5 vdr-2.0.7/vdr.5
+--- vdr-2.0.7.orig/vdr.5 2015-01-23 09:16:13.732620000 +0100
++++ vdr-2.0.7/vdr.5 2015-01-23 09:16:34.200618503 +0100
+@@ -895,6 +895,33 @@
+ just 16 bit wide. The internal representation in VDR allows for 32 bit to
+ be used, so that external tools can generate EPG data that is guaranteed
+ not to collide with the ids of existing data.
++.SS COMMANDLINE OPTIONS
++If started without any options, vdr tries to read any files in the directory
++/etc/vdr/conf.d with names that do not begin with a '.' and that end with '.conf'.
++These files are read in alphabetical order. The format of these files is
++
++# comment
++.br
++[name]
++.br
++-a
++.br
++-b 123
++.br
++--long
++.br
++--longarg=123
++.br
++
++Any lines that begin with '#' as the first non-whitespace character are considered
++comments and are ignored.
++A command line option file consists of one or more sections, indicated by '[name]',
++where 'name' is either the fixed word 'vdr' (if this section contains options for
++the main VDR program) or the name of the plugin this section applies to.
++Each option must be written on a separate line, including the leading '-' (for
++a short option) or '--' (for a long option). If the option has additional arguments,
++they have to be written on the same line as the option itself, separated from the
++option with a blank (short option) or equal sign (long option).
+ .SH SEE ALSO
+ .BR vdr (1)
+ .SH AUTHOR
+diff -Naur vdr-2.0.7.orig/vdr.c vdr-2.0.7/vdr.c
+--- vdr-2.0.7.orig/vdr.c 2015-01-23 09:16:13.732620000 +0100
++++ vdr-2.0.7/vdr.c 2015-01-23 09:16:34.200618503 +0100
+@@ -34,8 +34,12 @@
+ #include
+ #include
+ #include
++#ifdef SDNOTIFY
++#include
++#endif
+ #include
+ #include
++#include "args.h"
+ #include "audio.h"
+ #include "channels.h"
+ #include "config.h"
+@@ -192,6 +196,7 @@
+ #define DEFAULTWATCHDOG 0 // seconds
+ #define DEFAULTVIDEODIR VIDEODIR
+ #define DEFAULTCONFDIR dd(CONFDIR, VideoDirectory)
++#define DEFAULTARGSDIR dd(ARGSDIR, "/etc/vdr/conf.d")
+ #define DEFAULTCACHEDIR dd(CACHEDIR, VideoDirectory)
+ #define DEFAULTRESDIR dd(RESDIR, ConfigDirectory)
+ #define DEFAULTPLUGINDIR PLUGINDIR
+@@ -229,6 +234,15 @@
+ VdrUser = VDR_USER;
+ #endif
+
++ cArgs *Args = NULL;
++ if (argc == 1) {
++ Args = new cArgs(argv[0]);
++ if (Args->ReadDirectory(DEFAULTARGSDIR)) {
++ argc = Args->GetArgc();
++ argv = Args->GetArgv();
++ }
++ }
++
+ SetVideoDirectory(VideoDirectory);
+ cPluginManager PluginManager(DEFAULTPLUGINDIR);
+
+@@ -256,6 +270,7 @@
+ { "port", required_argument, NULL, 'p' },
+ { "record", required_argument, NULL, 'r' },
+ { "resdir", required_argument, NULL, 'r' | 0x100 },
++ { "showargs", optional_argument, NULL, 's' | 0x200 },
+ { "shutdown", required_argument, NULL, 's' },
+ { "split", no_argument, NULL, 's' | 0x100 },
+ { "terminal", required_argument, NULL, 't' },
+@@ -428,6 +443,19 @@
+ case 's' | 0x100:
+ Setup.SplitEditedFiles = 1;
+ break;
++ case 's' | 0x200: {
++ const char *ArgsDir = optarg ? optarg : DEFAULTARGSDIR;
++ cArgs Args(argv[0]);
++ if (!Args.ReadDirectory(ArgsDir)) {
++ fprintf(stderr, "vdr: can't read arguments from directory: %s\n", ArgsDir);
++ return 2;
++ }
++ int c = Args.GetArgc();
++ char **v = Args.GetArgv();
++ for (int i = 1; i < c; i++)
++ printf("%s\n", v[i]);
++ return 0;
++ }
+ case 't': Terminal = optarg;
+ if (access(Terminal, R_OK | W_OK) < 0) {
+ fprintf(stderr, "vdr: can't access terminal: %s\n", Terminal);
+@@ -541,6 +569,8 @@
+ " -s CMD, --shutdown=CMD call CMD to shutdown the computer\n"
+ " --split split edited files at the editing marks (only\n"
+ " useful in conjunction with --edit)\n"
++ " --showargs[=DIR] print the arguments read from DIR and exit\n"
++ " (default: %s)\n"
+ " -t TTY, --terminal=TTY controlling tty\n"
+ " -u USER, --user=USER run as user USER; only applicable if started as\n"
+ " root\n"
+@@ -563,6 +593,7 @@
+ DEFAULTLOCDIR,
+ DEFAULTSVDRPPORT,
+ DEFAULTRESDIR,
++ DEFAULTARGSDIR,
+ DEFAULTVIDEODIR,
+ DEFAULTWATCHDOG
+ );
+@@ -848,6 +879,10 @@
+ alarm(WatchdogTimeout); // Initial watchdog timer start
+ }
+
++#ifdef SDNOTIFY
++ sd_notify(0, "READY=1\nSTATUS=Ready");
++#endif
++
+ // Main program loop:
+
+ #define DELETE_MENU ((IsInfoMenu &= (Menu == NULL)), delete Menu, Menu = NULL)
diff --git a/media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch
new file mode 100644
index 000000000000..f7bae16fdd40
--- /dev/null
+++ b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch
@@ -0,0 +1,438 @@
+diff -Naur vdr-2.0.7.orig/HISTORY vdr-2.0.7/HISTORY
+--- vdr-2.0.7.orig/HISTORY 2015-01-23 09:07:52.777656645 +0100
++++ vdr-2.0.7/HISTORY 2015-01-23 09:09:57.798647500 +0100
+@@ -7916,6 +7916,16 @@
+ - The APIVERSION has been increased to 2.0.6 due to the changes to pat.h, sdt.h and
+ the functional modification to cFont::CreateFont().
+
++2015-01-18: Version 2.0.6 + backport of systemd support from versions 2.1.6 and 2.1.7
++
++- Added support for systemd (thanks to Christopher Reimer). To activate this you
++ need to add "SDNOTIFY=1" to the 'make' call.
++
++2015-01-18: Version 2.0.6 + backport of reading command line arguments from files, from version 2.1$
++
++- VDR now reads command line options from *.conf files in /etc/vdr/conf.d (thanks
++ to Lars Hanisch). See vdr.1 and vdr.5 for details.
++
+ 2015-01-20: Version 2.0.7
+
+ - Fixed a possible division by zero in frame rate detection.
+diff -Naur vdr-2.0.7.orig/Make.config.template vdr-2.0.7/Make.config.template
+--- vdr-2.0.7.orig/Make.config.template 2015-01-23 09:07:52.765656646 +0100
++++ vdr-2.0.7/Make.config.template 2015-01-23 09:08:15.775654963 +0100
+@@ -38,6 +38,7 @@
+
+ #VIDEODIR = /srv/vdr/video
+ #CONFDIR = /var/lib/vdr
++#ARGSDIR = /etc/vdr/conf.d
+ #CACHEDIR = /var/cache/vdr
+
+ # Overrides for preset/legacy configurations:
+diff -Naur vdr-2.0.7.orig/Makefile vdr-2.0.7/Makefile
+--- vdr-2.0.7.orig/Makefile 2015-01-23 09:07:52.778656645 +0100
++++ vdr-2.0.7/Makefile 2015-01-23 09:11:11.158642134 +0100
+@@ -31,6 +31,7 @@
+ DESTDIR ?=
+ VIDEODIR ?= /srv/vdr/video
+ CONFDIR ?= /var/lib/vdr
++ARGSDIR ?= /etc/vdr/conf.d
+ CACHEDIR ?= /var/cache/vdr
+
+ PREFIX ?= /usr/local
+@@ -66,7 +67,7 @@
+
+ SILIB = $(LSIDIR)/libsi.a
+
+-OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
++OBJS = args.o audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\
+ dvbplayer.o dvbspu.o dvbsubtitle.o eit.o eitscan.o epg.o filter.o font.o i18n.o interface.o keys.o\
+ lirc.o menu.o menuitems.o nit.o osdbase.o osd.o pat.o player.o plugin.o\
+ receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sdt.o sections.o shutdown.o\
+@@ -93,12 +94,18 @@
+ DEFINES += -DBIDI
+ LIBS += $(shell pkg-config --libs fribidi)
+ endif
++ifdef SDNOTIFY
++INCLUDES += $(shell pkg-config --cflags libsystemd-daemon)
++DEFINES += -DSDNOTIFY
++LIBS += $(shell pkg-config --libs libsystemd-daemon)
++endif
+
+ LIRC_DEVICE ?= /var/run/lirc/lircd
+
+ DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\"
+ DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
+ DEFINES += -DCONFDIR=\"$(CONFDIR)\"
++DEFINES += -DARGSDIR=\"$(ARGSDIR)\"
+ DEFINES += -DCACHEDIR=\"$(CACHEDIR)\"
+ DEFINES += -DRESDIR=\"$(RESDIR)\"
+ DEFINES += -DPLUGINDIR=\"$(LIBDIR)\"
+@@ -143,6 +150,7 @@
+ @echo "mandir=$(MANDIR)" >> $@
+ @echo "configdir=$(CONFDIR)" >> $@
+ @echo "videodir=$(VIDEODIR)" >> $@
++ @echo "argsdir=$(ARGSDIR)" >> $@
+ @echo "cachedir=$(CACHEDIR)" >> $@
+ @echo "resdir=$(RESDIR)" >> $@
+ @echo "libdir=$(LIBDIR)" >> $@
+@@ -260,6 +268,7 @@
+ install-dirs:
+ @mkdir -p $(DESTDIR)$(VIDEODIR)
+ # @mkdir -p $(DESTDIR)$(CONFDIR)
++ @mkdir -p $(DESTDIR)$(ARGSDIR)
+ # @mkdir -p $(DESTDIR)$(CACHEDIR)
+ @mkdir -p $(DESTDIR)$(RESDIR)
+
+diff -Naur vdr-2.0.7.orig/args.c vdr-2.0.7/args.c
+--- vdr-2.0.7.orig/args.c 1970-01-01 01:00:00.000000000 +0100
++++ vdr-2.0.7/args.c 2015-01-23 09:08:15.775654963 +0100
+@@ -0,0 +1,129 @@
++/*
++ * args.c: Read arguments from files
++ *
++ * See the main source file 'vdr.c' for copyright information and
++ * how to reach the author.
++ *
++ * Original version written by Lars Hanisch .
++ *
++ * $Id$
++ */
++
++#include "args.h"
++#include
++
++cArgs::cArgs(const char *Argv0)
++{
++ argv0 = Argv0;
++ argc = 0;
++ argv = NULL;
++}
++
++cArgs::~cArgs(void)
++{
++ if (argv != NULL)
++ delete [] argv;
++}
++
++bool cArgs::AddArg(const char *s)
++{
++ if (inVdrSection)
++ args.Append(strdup(s));
++ else if (*lastArg == NULL)
++ return false;
++ else
++ lastArg = cString::sprintf("%s %s", *lastArg, s);
++ return true;
++}
++
++bool cArgs::ReadDirectory(const char *Directory)
++{
++ if (argv != NULL)
++ delete [] argv;
++ argc = 0;
++ argv = NULL;
++ args.Clear();
++ lastArg = NULL;
++ inVdrSection = false;
++ cFileNameList files(Directory, false);
++ if (files.Size() == 0)
++ return false;
++ for (int i = 0; i < files.Size(); i++) {
++ const char *fileName = files.At(i);
++ if (startswith(fileName, ".") || !endswith(fileName, ".conf"))
++ continue;
++ cString fullFileName = AddDirectory(Directory, fileName);
++ struct stat fs;
++ if ((access(*fullFileName, F_OK) != 0) || (stat(*fullFileName, &fs) != 0) || S_ISDIR(fs.st_mode))
++ continue;
++ bool ok = true;
++ int line = 0;
++ FILE *f = fopen(*fullFileName, "r");
++ if (f) {
++ char *s;
++ cReadLine ReadLine;
++ while ((s = ReadLine.Read(f)) != NULL) {
++ line++;
++ s = stripspace(skipspace(s));
++ if (!isempty(s) && (s[0] != '#')) {
++ if (startswith(s, "[") && endswith(s, "]")) {
++ s[strlen(s) - 1] = 0;
++ s++;
++ if (*lastArg) {
++ args.Append(strdup(*lastArg));
++ lastArg = NULL;
++ }
++ if (strcmp(s, "vdr") == 0)
++ inVdrSection = true;
++ else {
++ inVdrSection = false;
++ lastArg = cString::sprintf("--plugin=%s", s);
++ }
++ }
++ else {
++ if ((strlen(s) > 2) && (s[0] == '-') && (s[1] != '-')) { // short option, split at first space
++ char *p = strchr(s, ' ');
++ if (p == NULL) {
++ ok = AddArg(s);
++ if (!ok)
++ break;
++ }
++ else {
++ *p = 0;
++ p++;
++ ok = AddArg(s);
++ if (!ok)
++ break;
++ ok = AddArg(p);
++ if (!ok)
++ break;
++ }
++ }
++ else {
++ ok = AddArg(s);
++ if (!ok)
++ break;
++ }
++ }
++ }
++ }
++ fclose(f);
++ }
++ if (!ok) {
++ esyslog("ERROR: args file %s, line %d", *fullFileName, line);
++ return false;
++ }
++ }
++ if (*lastArg) {
++ args.Append(strdup(*lastArg));
++ lastArg = NULL;
++ }
++ argv = new char*[args.Size() + 1];
++ argv[0] = strdup(*argv0);
++ argc = 1;
++ for (int i = 0; i < args.Size(); i++) {
++ argv[argc] = args.At(i);
++ argc++;
++ }
++ return true;
++}
+diff -Naur vdr-2.0.7.orig/args.h vdr-2.0.7/args.h
+--- vdr-2.0.7.orig/args.h 1970-01-01 01:00:00.000000000 +0100
++++ vdr-2.0.7/args.h 2015-01-23 09:08:15.775654963 +0100
+@@ -0,0 +1,34 @@
++/*
++ * args.h: Read arguments from files
++ *
++ * See the main source file 'vdr.c' for copyright information and
++ * how to reach the author.
++ *
++ * Original version written by Lars Hanisch .
++ *
++ * $Id$
++ */
++
++#ifndef __ARGS_H
++#define __ARGS_H
++
++#include "tools.h"
++
++class cArgs {
++private:
++ cString argv0;
++ cStringList args;
++ cString lastArg;
++ bool inVdrSection;
++ int argc;
++ char **argv;
++ bool AddArg(const char *s);
++public:
++ cArgs(const char *Argv0);
++ ~cArgs(void);
++ bool ReadDirectory(const char *Directory);
++ int GetArgc(void) const { return argc; };
++ char **GetArgv(void) const { return argv; };
++ };
++
++#endif //__ARGS_H
+diff -Naur vdr-2.0.7.orig/interface.c vdr-2.0.7/interface.c
+--- vdr-2.0.7.orig/interface.c 2015-01-23 09:07:52.765656646 +0100
++++ vdr-2.0.7/interface.c 2015-01-23 09:08:15.775654963 +0100
+@@ -10,6 +10,9 @@
+ #include "interface.h"
+ #include
+ #include
++#ifdef SDNOTIFY
++#include
++#endif
+ #include
+ #include "i18n.h"
+ #include "status.h"
+@@ -159,6 +162,9 @@
+ bool known = Keys.KnowsRemote(Remote->Name());
+ dsyslog("remote control %s - %s", Remote->Name(), known ? "keys known" : "learning keys");
+ if (!known) {
++#ifdef SDNOTIFY
++ sd_notify(0, "READY=1\nSTATUS=Learning keys...");
++#endif
+ cSkinDisplayMenu *DisplayMenu = Skins.Current()->DisplayMenu();
+ DisplayMenu->SetMenuCategory(mcUnknown);
+ char Headline[256];
+diff -Naur vdr-2.0.7.orig/vdr.1 vdr-2.0.7/vdr.1
+--- vdr-2.0.7.orig/vdr.1 2015-01-23 09:07:52.770656646 +0100
++++ vdr-2.0.7/vdr.1 2015-01-23 09:08:15.776654963 +0100
+@@ -178,6 +178,10 @@
+ Read resource files from \fIdir\fR
+ (default is to read them from the config directory).
+ .TP
++.BI \-\-showargs[= dir ]
++Read command line arguments from \fIdir\fR (default is \fI/etc/vdr/conf.d\fR),
++display them to the console and exit.
++.TP
+ .BI \-s\ cmd ,\ \-\-shutdown= cmd
+ Call \fIcmd\fR to shutdown the computer. See the file \fIINSTALL\fR for more
+ information.
+@@ -213,6 +217,10 @@
+ .BI \-w\ sec ,\ \-\-watchdog= sec
+ Activate the watchdog timer with a timeout of \fIsec\fR seconds.
+ A value of \fB0\fR (default) disables the watchdog.
++.P
++If started without any options, vdr tries to read command line options
++from files named '*.conf' in the directory /etc/vdr/conf.d. Files are
++read in alphabetical order. See vdr(5) for details.
+ .SH SIGNALS
+ .TP
+ .B SIGINT, SIGTERM
+diff -Naur vdr-2.0.7.orig/vdr.5 vdr-2.0.7/vdr.5
+--- vdr-2.0.7.orig/vdr.5 2015-01-23 09:07:52.772656646 +0100
++++ vdr-2.0.7/vdr.5 2015-01-23 09:08:15.776654963 +0100
+@@ -889,6 +889,33 @@
+ just 16 bit wide. The internal representation in VDR allows for 32 bit to
+ be used, so that external tools can generate EPG data that is guaranteed
+ not to collide with the ids of existing data.
++.SS COMMANDLINE OPTIONS
++If started without any options, vdr tries to read any files in the directory
++/etc/vdr/conf.d with names that do not begin with a '.' and that end with '.conf'.
++These files are read in alphabetical order. The format of these files is
++
++# comment
++.br
++[name]
++.br
++-a
++.br
++-b 123
++.br
++--long
++.br
++--longarg=123
++.br
++
++Any lines that begin with '#' as the first non-whitespace character are considered
++comments and are ignored.
++A command line option file consists of one or more sections, indicated by '[name]',
++where 'name' is either the fixed word 'vdr' (if this section contains options for
++the main VDR program) or the name of the plugin this section applies to.
++Each option must be written on a separate line, including the leading '-' (for
++a short option) or '--' (for a long option). If the option has additional arguments,
++they have to be written on the same line as the option itself, separated from the
++option with a blank (short option) or equal sign (long option).
+ .SH SEE ALSO
+ .BR vdr (1)
+ .SH AUTHOR
+diff -Naur vdr-2.0.7.orig/vdr.c vdr-2.0.7/vdr.c
+--- vdr-2.0.7.orig/vdr.c 2015-01-23 09:07:52.772656646 +0100
++++ vdr-2.0.7/vdr.c 2015-01-23 09:08:15.776654963 +0100
+@@ -34,8 +34,12 @@
+ #include
+ #include
+ #include
++#ifdef SDNOTIFY
++#include
++#endif
+ #include
+ #include
++#include "args.h"
+ #include "audio.h"
+ #include "channels.h"
+ #include "config.h"
+@@ -186,6 +190,7 @@
+ #define DEFAULTWATCHDOG 0 // seconds
+ #define DEFAULTVIDEODIR VIDEODIR
+ #define DEFAULTCONFDIR dd(CONFDIR, VideoDirectory)
++#define DEFAULTARGSDIR dd(ARGSDIR, "/etc/vdr/conf.d")
+ #define DEFAULTCACHEDIR dd(CACHEDIR, VideoDirectory)
+ #define DEFAULTRESDIR dd(RESDIR, ConfigDirectory)
+ #define DEFAULTPLUGINDIR PLUGINDIR
+@@ -223,6 +228,15 @@
+ VdrUser = VDR_USER;
+ #endif
+
++ cArgs *Args = NULL;
++ if (argc == 1) {
++ Args = new cArgs(argv[0]);
++ if (Args->ReadDirectory(DEFAULTARGSDIR)) {
++ argc = Args->GetArgc();
++ argv = Args->GetArgv();
++ }
++ }
++
+ SetVideoDirectory(VideoDirectory);
+ cPluginManager PluginManager(DEFAULTPLUGINDIR);
+
+@@ -250,6 +264,7 @@
+ { "port", required_argument, NULL, 'p' },
+ { "record", required_argument, NULL, 'r' },
+ { "resdir", required_argument, NULL, 'r' | 0x100 },
++ { "showargs", optional_argument, NULL, 's' | 0x200 },
+ { "shutdown", required_argument, NULL, 's' },
+ { "split", no_argument, NULL, 's' | 0x100 },
+ { "terminal", required_argument, NULL, 't' },
+@@ -422,6 +437,19 @@
+ case 's' | 0x100:
+ Setup.SplitEditedFiles = 1;
+ break;
++ case 's' | 0x200: {
++ const char *ArgsDir = optarg ? optarg : DEFAULTARGSDIR;
++ cArgs Args(argv[0]);
++ if (!Args.ReadDirectory(ArgsDir)) {
++ fprintf(stderr, "vdr: can't read arguments from directory: %s\n", ArgsDir);
++ return 2;
++ }
++ int c = Args.GetArgc();
++ char **v = Args.GetArgv();
++ for (int i = 1; i < c; i++)
++ printf("%s\n", v[i]);
++ return 0;
++ }
+ case 't': Terminal = optarg;
+ if (access(Terminal, R_OK | W_OK) < 0) {
+ fprintf(stderr, "vdr: can't access terminal: %s\n", Terminal);
+@@ -535,6 +563,8 @@
+ " -s CMD, --shutdown=CMD call CMD to shutdown the computer\n"
+ " --split split edited files at the editing marks (only\n"
+ " useful in conjunction with --edit)\n"
++ " --showargs[=DIR] print the arguments read from DIR and exit\n"
++ " (default: %s)\n"
+ " -t TTY, --terminal=TTY controlling tty\n"
+ " -u USER, --user=USER run as user USER; only applicable if started as\n"
+ " root\n"
+@@ -557,6 +587,7 @@
+ DEFAULTLOCDIR,
+ DEFAULTSVDRPPORT,
+ DEFAULTRESDIR,
++ DEFAULTARGSDIR,
+ DEFAULTVIDEODIR,
+ DEFAULTWATCHDOG
+ );
+@@ -837,6 +868,10 @@
+ alarm(WatchdogTimeout); // Initial watchdog timer start
+ }
+
++#ifdef SDNOTIFY
++ sd_notify(0, "READY=1\nSTATUS=Ready");
++#endif
++
+ // Main program loop:
+
+ #define DELETE_MENU ((IsInfoMenu &= (Menu == NULL)), delete Menu, Menu = NULL)
diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index f9813be524f5..62b1c32b1a8c 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -8,16 +8,25 @@
diff --git a/media-video/vdr/vdr-2.0.6-r1.ebuild b/media-video/vdr/vdr-2.0.6-r1.ebuild
new file mode 100644
index 000000000000..63de150c12f6
--- /dev/null
+++ b/media-video/vdr/vdr-2.0.6-r1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft
+ jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift permashift_v1
+ pinplugin rotor ttxtsubs vasarajanauloja wareagleicon yaepg"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
+
+IUSE="bidi debug html vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_P="extpng-${P}-gentoo-edition-v6"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.tvdr.de/"
+SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
+
+KEYWORDS="amd64 ~arm ~ppc x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+REQUIRED_USE="
+ permashift? ( !permashift_v1 )
+ permashift_v1? ( !permashift )"
+
+COMMON_DEPEND="virtual/jpeg:*
+ sys-libs/libcap
+ >=media-libs/fontconfig-2.4.2
+ >=media-libs/freetype-2"
+
+DEPEND="${COMMON_DEPEND}
+ >=virtual/linuxtv-dvb-headers-5.3
+ sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+ dev-lang/perl
+ >=media-tv/gentoo-vdr-scripts-2.5_rc1
+ media-fonts/corefonts
+ bidi? ( dev-libs/fribidi )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+ use debug && append-flags -g
+
+ PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+ tc-export CC CXX AR
+}
+
+add_cap() {
+ local arg
+ for arg; do
+ CAPS="${CAPS}\n${arg}=1"
+ done
+}
+
+enable_patch() {
+ local arg ARG_UPPER
+ for arg; do
+ ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
+ echo "${ARG_UPPER} = 1" >> Make.config
+
+ # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
+ echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
+ cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
+ export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+ done
+}
+
+extensions_add_make_conf()
+{
+ # copy all ifdef for extensions-patch to Make.config
+ sed -e '1,/need to touch the following:/d' \
+ -e '/need to touch the following/,/^$/d' \
+ Make.config.template >> Make.config
+}
+
+extensions_all_defines() {
+ # extract all possible settings for extensions-patch
+ sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+ Make.config.template \
+ | sort \
+ | tr '[:upper:]' '[:lower:]'
+}
+
+lang_po() {
+ LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+src_prepare() {
+ # apply maintainace-patches
+ ebegin "Changing paths for gentoo"
+
+ local DVBDIR=/usr/include
+ local i
+ for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+ [[ -d ${i} ]] || continue
+ if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+ einfo "Found DVB header files in ${i}"
+ DVBDIR=${i}
+ break
+ fi
+ done
+
+ # checking for s2api headers
+ local api_version
+ api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+ api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+ if [[ ${api_version:-0} -lt 5*3 ]]; then
+ eerror "DVB header files do not contain s2api support or too old for ${P}"
+ eerror "You cannot compile VDR against old dvb-header"
+ die "DVB headers too old"
+ fi
+
+ cat > Make.config <<-EOT
+ #
+ # Generated by ebuild ${PF}
+ #
+ PREFIX = /usr
+ DVBDIR = ${DVBDIR}
+ PLUGINLIBDIR = ${PLUGIN_LIBDIR}
+ CONFDIR = ${CONF_DIR}
+ VIDEODIR = /var/vdr/video
+ LOCDIR = \$(PREFIX)/share/locale
+ INCDIR = \$(PREFIX)/include
+
+ DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
+ INCLUDES += -I\$(DVBDIR)
+
+ # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+ # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
+ LIBDIR = ${PLUGIN_LIBDIR}
+ PCDIR = /usr/$(get_libdir)/pkgconfig
+ EOT
+ eend 0
+
+ # support languages, written from right to left
+ BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
+
+ epatch "${FILESDIR}/${PN}-2.0.6_gentoo.patch"
+
+ if ! use vanilla; then
+
+ # Now apply extensions patch
+ epatch "${WORKDIR}/${EXT_P}.patch"
+
+ # This allows us to start even if some plugin does not exist
+ # or is not loadable.
+ enable_patch PLUGINMISSING
+ enable_patch CHANNELBIND
+
+ if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+ einfo "Doing maintainer checks:"
+
+ # we do not support these patches
+ # (or have them already hard enabled)
+ local IGNORE_PATCHES="pluginmissing channelbind"
+
+ extensions_all_defines > "${T}"/new.IUSE
+ echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
+ $IGNORE_PATCHES | \
+ tr ' ' '\n' |sort > "${T}"/old.IUSE
+ local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
+ if [[ -z ${DIFFS} ]]; then
+ einfo "EXT_PATCH_FLAGS is up to date."
+ else
+ ewarn "IUSE differences!"
+ local diff
+ for diff in $DIFFS; do
+ ewarn "$diff"
+ done
+ fi
+ fi
+
+ ebegin "Enabling selected patches"
+ local flag
+ for flag in $EXT_PATCH_FLAGS; do
+ use $flag && enable_patch ${flag}
+ done
+
+ eend 0
+
+ extensions_add_make_conf
+
+ # add defined use-flags compile options to vdr.pc
+ sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
+ -i Makefile
+
+ ebegin "Make depend"
+ emake .dependencies >/dev/null
+ eend $? "make depend failed"
+ fi
+
+ epatch_user
+
+ add_cap CAP_UTF8
+
+ add_cap CAP_IRCTRL_RUNTIME_PARAM \
+ CAP_VFAT_RUNTIME_PARAM \
+ CAP_CHUID \
+ CAP_SHUTDOWN_AUTO_RETRY
+
+ echo -e ${CAPS} > "${CAP_FILE}"
+
+ # LINGUAS support
+ einfo "\n \t VDR supports the LINGUAS values"
+
+ lang_po
+
+ einfo "\t Please set one of this values in your sytem make.conf"
+ einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+ if [[ -z ${LINGUAS} ]]; then
+ einfo "\n \t No values in LINGUAS="
+ einfo "\t You will get only english text on OSD \n"
+ fi
+
+ strip-linguas ${LING_PO} en
+}
+
+src_install() {
+# # trick makefile not to create a videodir by supplying it with an existing
+# # directory
+ emake \
+ VIDEODIR="/" \
+ DESTDIR="${D}" install || die "emake install failed"
+
+ keepdir "${PLUGIN_LIBDIR}"
+
+ keepdir "${CONF_DIR}"/plugins
+ keepdir "${CONF_DIR}"/themes
+
+ if use html; then
+ dohtml *.html
+ fi
+
+ dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+
+ insinto /usr/share/vdr
+ doins "${CAP_FILE}"
+
+ if use alternatechannel; then
+ insinto /etc/vdr
+ doins "${FILESDIR}"/channel_alternative.conf
+ fi
+
+ chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+pkg_postinst() {
+ elog "It is a good idea to run vdrplugin-rebuild now."
+
+ elog "To get nice symbols in OSD we recommend to install"
+ elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+ elog "\t2. select font VDRSymbolsSans in Setup"
+ elog ""
+ elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+ elog "\thttps://wiki.gentoo.org/wiki/VDR"
+}
diff --git a/media-video/vdr/vdr-2.0.7.ebuild b/media-video/vdr/vdr-2.0.7.ebuild
new file mode 100644
index 000000000000..f5d9d5ed815d
--- /dev/null
+++ b/media-video/vdr/vdr-2.0.7.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+# Switches supported by extensions-patch
+EXT_PATCH_FLAGS="alternatechannel ddepgentry dvlvidprefer graphtft
+ jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift permashift_v1
+ pinplugin rotor ttxtsubs vasarajanauloja wareagleicon yaepg"
+
+# names of the use-flags
+EXT_PATCH_FLAGS_RENAMED=""
+
+# names ext-patch uses internally, here only used for maintainer checks
+EXT_PATCH_FLAGS_RENAMED_EXT_NAME=""
+
+IUSE="bidi debug html systemd vanilla ${EXT_PATCH_FLAGS} ${EXT_PATCH_FLAGS_RENAMED}"
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
+
+EXT_P="extpng-${PN}-2.0.6-gentoo-edition-v6"
+
+DESCRIPTION="Video Disk Recorder - turns a pc into a powerful set top box for DVB"
+HOMEPAGE="http://www.tvdr.de/"
+SRC_URI="ftp://ftp.tvdr.de/vdr/${MY_P}.tar.bz2
+ https://dev.gentoo.org/~hd_brummy/distfiles/${EXT_P}.patch.bz2"
+
+KEYWORDS="~arm ~amd64 ~ppc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+REQUIRED_USE="
+ permashift? ( !permashift_v1 )
+ permashift_v1? ( !permashift )"
+
+COMMON_DEPEND="virtual/jpeg:*
+ sys-libs/libcap
+ >=media-libs/fontconfig-2.4.2
+ >=media-libs/freetype-2"
+
+DEPEND="${COMMON_DEPEND}
+ >=virtual/linuxtv-dvb-headers-5.3
+ sys-devel/gettext"
+
+RDEPEND="${COMMON_DEPEND}
+ dev-lang/perl
+ >=media-tv/gentoo-vdr-scripts-2.5
+ media-fonts/corefonts
+ bidi? ( dev-libs/fribidi )
+ systemd? ( sys-apps/systemd )"
+
+CONF_DIR=/etc/vdr
+CAP_FILE=${S}/capabilities.sh
+CAPS="# Capabilities of the vdr-executable for use by startscript etc."
+
+pkg_setup() {
+ use debug && append-flags -g
+
+ PLUGIN_LIBDIR="/usr/$(get_libdir)/vdr/plugins"
+
+ tc-export CC CXX AR
+}
+
+add_cap() {
+ local arg
+ for arg; do
+ CAPS="${CAPS}\n${arg}=1"
+ done
+}
+
+enable_patch() {
+ local arg ARG_UPPER
+ for arg; do
+ ARG_UPPER=$(echo $arg|tr '[:lower:]' '[:upper:]')
+ echo "${ARG_UPPER} = 1" >> Make.config
+
+ # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS
+ echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp
+ cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE
+ export DEFINES_IUSE=$( cat ${T}/defines.IUSE )
+ done
+}
+
+extensions_add_make_conf()
+{
+ # copy all ifdef for extensions-patch to Make.config
+ sed -e '1,/need to touch the following:/d' \
+ -e '/need to touch the following/,/^$/d' \
+ Make.config.template >> Make.config
+}
+
+extensions_all_defines() {
+ # extract all possible settings for extensions-patch
+ sed -e '/^#\?[A-Z].*= 1/!d' -e 's/^#\?//' -e 's/ .*//' \
+ Make.config.template \
+ | sort \
+ | tr '[:upper:]' '[:lower:]'
+}
+
+lang_po() {
+ LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' )
+}
+
+src_prepare() {
+ # apply maintainace-patches
+ ebegin "Changing paths for gentoo"
+
+ local DVBDIR=/usr/include
+ local i
+ for i in ${DVB_HEADER_PATH} /usr/include/v4l-dvb-hg /usr/include; do
+ [[ -d ${i} ]] || continue
+ if [[ -f ${i}/linux/dvb/dmx.h ]]; then
+ einfo "Found DVB header files in ${i}"
+ DVBDIR=${i}
+ break
+ fi
+ done
+
+ # checking for s2api headers
+ local api_version
+ api_version=$(awk -F' ' '/define DVB_API_VERSION / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+ api_version=${api_version}*$(awk -F' ' '/define DVB_API_VERSION_MINOR / {print $3}' "${DVBDIR}"/linux/dvb/version.h)
+
+ if [[ ${api_version:-0} -lt 5*3 ]]; then
+ eerror "DVB header files do not contain s2api support or too old for ${P}"
+ eerror "You cannot compile VDR against old dvb-header"
+ die "DVB headers too old"
+ fi
+
+ cat > Make.config <<-EOT
+ #
+ # Generated by ebuild ${PF}
+ #
+ PREFIX = /usr
+ DVBDIR = ${DVBDIR}
+ PLUGINLIBDIR = ${PLUGIN_LIBDIR}
+ CONFDIR = ${CONF_DIR}
+ VIDEODIR = /var/vdr/video
+ LOCDIR = \$(PREFIX)/share/locale
+ INCDIR = \$(PREFIX)/include
+
+ DEFINES += -DCONFDIR=\"\$(CONFDIR)\"
+ INCLUDES += -I\$(DVBDIR)
+
+ # >=vdr-1.7.36-r1; parameter only used for compiletime on vdr
+ # PLUGINLIBDIR (plugin Makefile old) = LIBDIR (plugin Makefile new)
+ LIBDIR = ${PLUGIN_LIBDIR}
+ PCDIR = /usr/$(get_libdir)/pkgconfig
+ EOT
+ eend 0
+
+ # support languages, written from right to left
+ BUILD_PARAMS+=" BIDI=$(usex bidi 1 0)"
+
+ # systemd support
+ use systemd && BUILD_PARAMS+=" SDNOTIFY=$(usex systemd 1 0)"
+
+ if ! use vanilla; then
+
+ # Now apply extensions patch
+ epatch "${WORKDIR}/${EXT_P}.patch"
+
+ # This allows us to start even if some plugin does not exist
+ # or is not loadable.
+ enable_patch PLUGINMISSING
+ enable_patch CHANNELBIND
+
+ if [[ -n ${VDR_MAINTAINER_MODE} ]]; then
+ einfo "Doing maintainer checks:"
+
+ # we do not support these patches
+ # (or have them already hard enabled)
+ local IGNORE_PATCHES="pluginmissing channelbind"
+
+ extensions_all_defines > "${T}"/new.IUSE
+ echo $EXT_PATCH_FLAGS $EXT_PATCH_FLAGS_RENAMED_EXT_NAME \
+ $IGNORE_PATCHES | \
+ tr ' ' '\n' |sort > "${T}"/old.IUSE
+ local DIFFS=$(diff -u "${T}"/old.IUSE "${T}"/new.IUSE|grep '^[+-][^+-]')
+ if [[ -z ${DIFFS} ]]; then
+ einfo "EXT_PATCH_FLAGS is up to date."
+ else
+ ewarn "IUSE differences!"
+ local diff
+ for diff in $DIFFS; do
+ ewarn "$diff"
+ done
+ fi
+ fi
+
+ ebegin "Enabling selected patches"
+ local flag
+ for flag in $EXT_PATCH_FLAGS; do
+ use $flag && enable_patch ${flag}
+ done
+
+ eend 0
+
+ extensions_add_make_conf
+
+ # add defined use-flags compile options to vdr.pc
+ sed -e "s:\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR):\$(CDEFINES) \$(CINCLUDES) \$(HDRDIR) \$(DEFINES_IUSE):" \
+ -i Makefile
+
+ ebegin "Make depend"
+ emake .dependencies >/dev/null
+ eend $? "make depend failed"
+ fi
+
+ epatch "${FILESDIR}/${PN}-2.0.6-r2_gentoo.patch"
+
+ # backport from vdr-2.1.7 for better systemd support
+ if use vanilla; then
+ epatch "${FILESDIR}/${P}_systemd_argsdir_vanilla.patch"
+ else
+ epatch "${FILESDIR}/${P}_systemd_argsdir.patch"
+ fi
+
+ epatch_user
+
+ add_cap CAP_UTF8
+
+ add_cap CAP_IRCTRL_RUNTIME_PARAM \
+ CAP_VFAT_RUNTIME_PARAM \
+ CAP_CHUID \
+ CAP_SHUTDOWN_AUTO_RETRY
+
+ echo -e ${CAPS} > "${CAP_FILE}"
+
+ # LINGUAS support
+ einfo "\n \t VDR supports the LINGUAS values"
+
+ lang_po
+
+ einfo "\t Please set one of this values in your sytem make.conf"
+ einfo "\t LINGUAS=\"${LING_PO}\"\n"
+
+ if [[ -z ${LINGUAS} ]]; then
+ einfo "\n \t No values in LINGUAS="
+ einfo "\t You will get only english text on OSD \n"
+ fi
+
+ strip-linguas ${LING_PO} en
+}
+
+src_install() {
+# # trick makefile not to create a videodir by supplying it with an existing
+# # directory
+ emake \
+ VIDEODIR="/" \
+ DESTDIR="${D}" install || die "emake install failed"
+
+ keepdir "${PLUGIN_LIBDIR}"
+
+ # backup for plugins they don't be able to create this dir
+ keepdir "${CONF_DIR}"/plugins
+
+ if use html; then
+ dohtml *.html
+ fi
+
+ dodoc MANUAL INSTALL README* HISTORY CONTRIBUTORS
+
+ insinto /usr/share/vdr
+ doins "${CAP_FILE}"
+
+ if use alternatechannel; then
+ insinto /etc/vdr
+ doins "${FILESDIR}"/channel_alternative.conf
+ fi
+
+ chown -R vdr:vdr "${D}/${CONF_DIR}"
+}
+
+pkg_postinst() {
+ elog "It is a good idea to run vdrplugin-rebuild now."
+
+ elog "To get nice symbols in OSD we recommend to install"
+ elog "\t1. emerge media-fonts/vdrsymbols-ttf"
+ elog "\t2. select font VDRSymbolsSans in Setup"
+ elog ""
+ elog "To get an idea how to proceed now, have a look at our vdr-guide:"
+ elog "\thttps://wiki.gentoo.org/wiki/VDR"
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 359a0e25beb5..9dad66724ebd 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 9c06c1af03e1..363878b75a9e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 03 Sep 2018 10:08:31 +0000
+Wed, 05 Sep 2018 04:38:33 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 9c06c1af03e1..363878b75a9e 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 03 Sep 2018 10:08:31 +0000
+Wed, 05 Sep 2018 04:38:33 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 5e33490a96ac..20b47a4c4502 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 51c2cb19f412..0bdff7e9c257 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/sudo-1.8.22-r2 b/metadata/md5-cache/app-admin/sudo-1.8.22-r2
deleted file mode 100644
index a7a62a96a6af..000000000000
--- a/metadata/md5-cache/app-admin/sudo-1.8.22-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-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.22.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.22.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool 0081a71a261724730ec4c248494f044d ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=63697c31e3c98574d4e4bcb5af00cda0
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.23-r1 b/metadata/md5-cache/app-admin/sudo-1.8.23-r1
deleted file mode 100644
index 24334c457121..000000000000
--- a/metadata/md5-cache/app-admin/sudo-1.8.23-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-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 b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool 0081a71a261724730ec4c248494f044d ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6e89eaa76815f3cd963efa270768e8fc
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.25 b/metadata/md5-cache/app-admin/sudo-1.8.25
new file mode 100644
index 000000000000..e19c99faa25a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.8.25
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) 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 offensive openssl pam 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=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
+REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
+SLOT=0
+SRC_URI=https://www.sudo.ws/sudo/dist/sudo-1.8.25.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.8.25.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool 0081a71a261724730ec4c248494f044d ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 tmpfiles c8f9ea76ade103890e42d0f339afb64c toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=4287de7ee7c7b7f86ecbf2c7af70182b
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 1fb805974c63..ab7f226b39cf 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/rar-5.6.1_beta1_p20180903 b/metadata/md5-cache/app-arch/rar-5.6.1_beta1_p20180903
new file mode 100644
index 000000000000..4a55ff2fe2ac
--- /dev/null
+++ b/metadata/md5-cache/app-arch/rar-5.6.1_beta1_p20180903
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install unpack
+DEPEND=all_sfx? ( app-arch/unrar )
+DESCRIPTION=RAR compressor/uncompressor
+EAPI=6
+HOMEPAGE=https://rarlab.com/
+IUSE=all_sfx
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=RAR BSD BSD-2
+RDEPEND=sys-libs/glibc
+RESTRICT=mirror bindist
+SLOT=0
+SRC_URI=x86? ( https://mirror.whissi.de/distfiles/rar/rarlinux-5.6.1_beta1_p20180903.tar.gz ) amd64? ( https://mirror.whissi.de/distfiles/rar/rarlinux-x64-5.6.1_beta1_p20180903.tar.gz ) all_sfx? ( https://mirror.whissi.de/distfiles/rar/rarlinux-5.6.1_beta1_p20180903.tar.gz https://mirror.whissi.de/distfiles/rar/rarlinux-x64-5.6.1_beta1_p20180903.tar.gz https://mirror.whissi.de/distfiles/rar/winrar-x64-5.6.1_beta1_p20180903.exe )
+_md5_=f714dd4053e1ebd49df792ee0d53f65f
diff --git a/metadata/md5-cache/app-arch/unrar-5.6.4 b/metadata/md5-cache/app-arch/unrar-5.6.4
deleted file mode 100644
index e20f810f6e89..000000000000
--- a/metadata/md5-cache/app-arch/unrar-5.6.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Uncompress rar files
-EAPI=6
-HOMEPAGE=https://www.rarlab.com/rar_add.htm
-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 ~x86-solaris
-LICENSE=unRAR
-RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
-SLOT=0/5
-SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.6.4.tar.gz -> unrar-5.6.4.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9222129d67579d3b385bf2aa10ad0136
diff --git a/metadata/md5-cache/app-arch/unrar-5.6.3 b/metadata/md5-cache/app-arch/unrar-5.6.6
similarity index 87%
rename from metadata/md5-cache/app-arch/unrar-5.6.3
rename to metadata/md5-cache/app-arch/unrar-5.6.6
index e8d6f0f50d2a..4855aab2311f 100644
--- a/metadata/md5-cache/app-arch/unrar-5.6.3
+++ b/metadata/md5-cache/app-arch/unrar-5.6.6
@@ -6,6 +6,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
LICENSE=unRAR
RDEPEND=!<=app-arch/unrar-gpl-0.0.1_p20080417
SLOT=0/5
-SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.6.3.tar.gz -> unrar-5.6.3.tar.gz
+SRC_URI=https://www.rarlab.com/rar/unrarsrc-5.6.6.tar.gz -> unrar-5.6.6.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9222129d67579d3b385bf2aa10ad0136
+_md5_=69f38c7c9a95fb13bf56c42449a15cf2
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index c1a68b62aa4d..da4bbe5c3b2c 100644
Binary files a/metadata/md5-cache/app-benchmarks/Manifest.gz and b/metadata/md5-cache/app-benchmarks/Manifest.gz differ
diff --git a/metadata/md5-cache/app-benchmarks/stress-ng-0.09.38 b/metadata/md5-cache/app-benchmarks/stress-ng-0.09.38
index 7e3fa4f56056..85f2302d1e66 100644
--- a/metadata/md5-cache/app-benchmarks/stress-ng-0.09.38
+++ b/metadata/md5-cache/app-benchmarks/stress-ng-0.09.38
@@ -8,4 +8,4 @@ LICENSE=GPL-2
RDEPEND=dev-libs/libaio dev-libs/libbsd dev-libs/libgcrypt:0= net-misc/lksctp-tools sys-apps/attr sys-apps/keyutils sys-libs/libapparmor sys-libs/libcap sys-libs/zlib:=
SLOT=0
SRC_URI=http://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-0.09.38.tar.xz
-_md5_=1989a975f2cefd1f23f615f114c41451
+_md5_=7d22690091da313ecf0957312d4335fa
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 8a2c4a084cd4..44c16dafed5c 100644
Binary files a/metadata/md5-cache/app-dicts/Manifest.gz and b/metadata/md5-cache/app-dicts/Manifest.gz differ
diff --git a/metadata/md5-cache/app-dicts/myspell-mi-20060316-r1 b/metadata/md5-cache/app-dicts/myspell-mi-20060316-r1
index b9a99df27c81..d0493589a8d1 100644
--- a/metadata/md5-cache/app-dicts/myspell-mi-20060316-r1
+++ b/metadata/md5-cache/app-dicts/myspell-mi-20060316-r1
@@ -3,9 +3,9 @@ DEPEND=app-arch/unzip
DESCRIPTION=Maori dictionaries for myspell/hunspell
EAPI=6
HOMEPAGE=http://lingucomponent.openoffice.org/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=LGPL-2.1
SLOT=0
SRC_URI=https://dev.gentoo.org/~jstein/dist/myspell-mi_NZ-20060316.zip
_eclasses_=myspell-r2 d7a80fcc3949917840a5c8f1a967004c
-_md5_=7f77395b1f0d212f5c0c968572d1d70c
+_md5_=8fec10f8d6f4c8ae4b9cb39201bdc90f
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index bb79411661a4..9186db8d2fc1 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/okteta-0.25.3 b/metadata/md5-cache/app-editors/okteta-0.25.3
new file mode 100644
index 000000000000..f0c10decca73
--- /dev/null
+++ b/metadata/md5-cache/app-editors/okteta-0.25.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-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/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/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.9.4:5 ) 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 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Hex editor by KDE
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/utilities/okteta https://utils.kde.org/projects/okteta
+IUSE=crypt designer test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-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/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/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtscript-5.9.4:5[scripttools] >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 crypt? ( app-crypt/qca:2[qt5(+)] ) designer? ( >=dev-qt/designer-5.9.4:5 ) >=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/okteta/0.25.3/src/okteta-0.25.3.tar.xz
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=bd59eb01dc544aca2208054374321931
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 05f628a445f3..a6818f2c0835 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.45 b/metadata/md5-cache/app-emacs/ebuild-mode-1.45
new file mode 100644
index 000000000000..47b8f329b002
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/ebuild-mode-1.45
@@ -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.45.tar.xz
+_eclasses_=elisp efe1c459331d853614b12c63ab169a32 elisp-common 23f47b2e1de7abf387105eddd1318738 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190
+_md5_=ed28283578474c330cb478200e3eb7f7
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 0cf9eb793090..e5064ad66bcd 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.1 b/metadata/md5-cache/app-emulation/crossover-bin-17.5.1
new file mode 100644
index 000000000000..307deae97404
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/crossover-bin-17.5.1
@@ -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_python3_7(-),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_python3_7(-),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_python3_7(-),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_python3_7(-),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.1.bin
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 unpacker ee2f5086cd7e7b747b061f58db14d89e vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=8aed360e99a6afca955ccdeb00322061
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 74e28429a462..a87214376b47 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/ibus-1.5.18 b/metadata/md5-cache/app-i18n/ibus-1.5.18
index 011eb437f710..f34e45d40b33 100644
--- a/metadata/md5-cache/app-i18n/ibus-1.5.18
+++ b/metadata/md5-cache/app-i18n/ibus-1.5.18
@@ -4,11 +4,11 @@ DESCRIPTION=Intelligent Input Bus for Linux / Unix OS
EAPI=6
HOMEPAGE=https://github.com/ibus/ibus/wiki
IUSE=+X +emoji gconf +gtk +gtk2 +introspection kde +libnotify nls +python test +unicode vala wayland python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd
LICENSE=LGPL-2.1
RDEPEND=app-text/iso-codes dev-libs/glib:2 gnome-base/dconf gnome-base/librsvg:2 sys-apps/dbus[X?] X? ( x11-libs/libX11 !gtk? ( x11-libs/gtk+:2 ) ) gconf? ( gnome-base/gconf:2 ) gtk? ( x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXi gtk2? ( x11-libs/gtk+:2 ) ) introspection? ( dev-libs/gobject-introspection ) kde? ( dev-qt/qtgui:5 ) libnotify? ( x11-libs/libnotify ) nls? ( virtual/libintl ) 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(-)] 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(-)] ) wayland? ( dev-libs/wayland x11-libs/libxkbcommon ) python? ( gtk? ( x11-libs/gtk+:3[introspection] ) )
REQUIRED_USE=emoji? ( gtk ) gtk2? ( gtk ) kde? ( gtk ) libnotify? ( gtk ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) introspection ) test? ( gtk ) vala? ( introspection )
SLOT=0
SRC_URI=https://github.com/ibus/ibus/releases/download/1.5.18/ibus-1.5.18.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 libtool 0081a71a261724730ec4c248494f044d ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vala 2f3804278870542119da624a5eded505 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=4446c8d4429496db135a52b39e7d7000
+_md5_=2e5315fb1287477720a879fad35ad71a
diff --git a/metadata/md5-cache/app-i18n/ibus-cangjie-2.4 b/metadata/md5-cache/app-i18n/ibus-cangjie-2.4
deleted file mode 100644
index 700879af1f85..000000000000
--- a/metadata/md5-cache/app-i18n/ibus-cangjie-2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare test
-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(-)] >=app-i18n/ibus-1.4.1 app-i18n/libcangjie dev-python/cangjie[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/intltool sys-devel/gettext >=app-portage/elt-patches-20170422 >=sys-apps/sed-4
-DESCRIPTION=The IBus engine for users of the Cangjie and Quick input methods
-EAPI=5
-HOMEPAGE=http://cangjians.github.io
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=>=app-i18n/ibus-1.4.1 app-i18n/libcangjie dev-python/cangjie[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(-)] virtual/libintl 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/Cangjians/ibus-cangjie/releases/download/v2.4/ibus-cangjie-2.4.tar.xz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-utils 696393cddf6200db17a31641f597b403 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 libtool 0081a71a261724730ec4c248494f044d ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=b3b7df6fc37237f35de6f5d8283f58c4
diff --git a/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r1 b/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r1
new file mode 100644
index 000000000000..1a22818dc7ab
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/ibus-cangjie-2.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm
+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(-)] app-i18n/ibus[python(+),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(-)] app-i18n/libcangjie dev-python/cangjie[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(-)] nls? ( virtual/libintl ) dev-util/intltool nls? ( sys-devel/gettext ) >=sys-apps/sed-4
+DESCRIPTION=Chinese Cangjie and Quick engines for IBus
+EAPI=6
+HOMEPAGE=http://cangjians.github.io/
+IUSE=nls python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=amd64 x86
+LICENSE=GPL-3+
+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(-)] app-i18n/ibus[python(+),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(-)] app-i18n/libcangjie dev-python/cangjie[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(-)] nls? ( virtual/libintl )
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/Cangjians/ibus-cangjie/releases/download/v2.4/ibus-cangjie-2.4.tar.xz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=f6d4cfa4df0884f5b51098dce6491acf
diff --git a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.0-r1 b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.0-r1
index ecef795457f3..6ec89aaf7685 100644
--- a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.0-r1
+++ b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.0-r1
@@ -1,6 +1,6 @@
DEFINED_PHASES=configure postinst postrm prepare 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 ) 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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),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_python3_7(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
-DESCRIPTION=Hangul engine for IBus
+DESCRIPTION=Korean Hangul engine for IBus
EAPI=6
HOMEPAGE=https://github.com/libhangul/ibus-hangul/wiki
IUSE=nls python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
SLOT=0
SRC_URI=https://github.com/libhangul/ibus-hangul/releases/download/1.5.0/ibus-hangul-1.5.0.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=1941d9d9658d638e86b583dab84e0161
+_md5_=1aa0f622b2c68fd2ac34eef3caf63a57
diff --git a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1 b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1
index 305f34a5f841..d975742a38f3 100644
--- a/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1
+++ b/metadata/md5-cache/app-i18n/ibus-hangul-1.5.1
@@ -1,6 +1,6 @@
DEFINED_PHASES=configure postinst postrm 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 ) 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_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[python(+),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_python3_7(-),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_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) dev-util/intltool virtual/pkgconfig nls? ( sys-devel/gettext ) >=sys-apps/sed-4
-DESCRIPTION=Hangul engine for IBus
+DESCRIPTION=Korean Hangul engine for IBus
EAPI=6
HOMEPAGE=https://github.com/libhangul/ibus-hangul/wiki
IUSE=nls python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
@@ -11,4 +11,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
SLOT=0
SRC_URI=https://github.com/libhangul/ibus-hangul/releases/download/1.5.1/ibus-hangul-1.5.1.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=dac360e6b3c45ba53ada420c99073ba1
+_md5_=77d5620632257ab84307ddb754ba7f89
diff --git a/metadata/md5-cache/app-i18n/ibus-rime-1.2 b/metadata/md5-cache/app-i18n/ibus-rime-1.2
index bf31275b4b8b..214608904657 100644
--- a/metadata/md5-cache/app-i18n/ibus-rime-1.2
+++ b/metadata/md5-cache/app-i18n/ibus-rime-1.2
@@ -1,6 +1,6 @@
DEFINED_PHASES=prepare
DEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify dev-util/cmake virtual/pkgconfig
-DESCRIPTION=Rime Input Method Engine for IBus
+DESCRIPTION=Chinese Rime Input Method Engine for IBus
EAPI=6
HOMEPAGE=https://rime.im/ https://github.com/rime/ibus-rime
KEYWORDS=~amd64 ~x86
@@ -8,4 +8,4 @@ LICENSE=GPL-3
RDEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify app-i18n/rime-data
SLOT=0
SRC_URI=http://dl.bintray.com/lotem/rime/ibus-rime-1.2.tar.gz
-_md5_=36dfb743a29551d8f919b5b29933bb53
+_md5_=3b19b80e22abf9d612a197726633356b
diff --git a/metadata/md5-cache/app-i18n/ibus-rime-1.3.0 b/metadata/md5-cache/app-i18n/ibus-rime-1.3.0
index 289fc80cf97e..8818e193a49c 100644
--- a/metadata/md5-cache/app-i18n/ibus-rime-1.3.0
+++ b/metadata/md5-cache/app-i18n/ibus-rime-1.3.0
@@ -1,6 +1,6 @@
DEFINED_PHASES=prepare
DEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify dev-util/cmake virtual/pkgconfig
-DESCRIPTION=Rime Input Method Engine for IBus
+DESCRIPTION=Chinese Rime Input Method Engine for IBus
EAPI=6
HOMEPAGE=https://rime.im/ https://github.com/rime/ibus-rime
KEYWORDS=~amd64 ~x86
@@ -8,4 +8,4 @@ LICENSE=GPL-3
RDEPEND=app-i18n/ibus app-i18n/librime x11-libs/libnotify app-i18n/rime-data
SLOT=0
SRC_URI=https://github.com/rime/ibus-rime/archive/1.3.0.tar.gz -> ibus-rime-1.3.0.tar.gz
-_md5_=8088219d16475bd32a609ba603dacd24
+_md5_=13a8cd9ee28621801aa0c991e95d244f
diff --git a/metadata/md5-cache/app-i18n/ibus-sunpinyin-3.0.0_rc1 b/metadata/md5-cache/app-i18n/ibus-sunpinyin-3.0.0_rc1
index 8773a87a3e59..26c7acc3008a 100644
--- a/metadata/md5-cache/app-i18n/ibus-sunpinyin-3.0.0_rc1
+++ b/metadata/md5-cache/app-i18n/ibus-sunpinyin-3.0.0_rc1
@@ -1,6 +1,6 @@
DEFINED_PHASES=compile install prepare setup 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_python3_7(-),python_single_target_python2_7(+)] app-i18n/ibus[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_python3_7(-),python_single_target_python2_7(+)] ~app-i18n/sunpinyin-3.0.0_rc1:= nls? ( virtual/libintl ) virtual/pkgconfig nls? ( sys-devel/gettext ) dev-util/scons[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_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=SunPinyin engine for IBus
+DESCRIPTION=Chinese SunPinyin engine for IBus
EAPI=6
HOMEPAGE=https://github.com/sunpinyin/sunpinyin
IUSE=+nls python_targets_python2_7
@@ -11,4 +11,4 @@ REQUIRED_USE=python_targets_python2_7
SLOT=0
SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/v3.0.0-rc1.tar.gz -> sunpinyin-3.0.0_rc1.tar.gz
_eclasses_=l10n 97f2753e3f1f3753d53d856c7c0bbb0b multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 scons-utils 741000d14c0b59263aac3f3cf6e39909 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-snapshot b77011b62e2053c646ad720defe6d921
-_md5_=73d5b14be397894ff7b15901d3bcd229
+_md5_=e2aaa1dd5f44957cef150dd251834e8e
diff --git a/metadata/md5-cache/app-i18n/ibus-table-1.9.20 b/metadata/md5-cache/app-i18n/ibus-table-1.9.21
similarity index 97%
rename from metadata/md5-cache/app-i18n/ibus-table-1.9.20
rename to metadata/md5-cache/app-i18n/ibus-table-1.9.21
index 81239f72511d..5625dc38925e 100644
--- a/metadata/md5-cache/app-i18n/ibus-table-1.9.20
+++ b/metadata/md5-cache/app-i18n/ibus-table-1.9.21
@@ -8,7 +8,8 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 LGPL-2.1
RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite(+)] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite(+)] ) python_single_target_python3_6? ( dev-lang/python:3.6[sqlite(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-i18n/ibus[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] virtual/libiconv nls? ( virtual/libintl )
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/kaio/ibus-table/releases/download/1.9.20/ibus-table-1.9.20.tar.gz
+SRC_URI=https://github.com/kaio/ibus-table/releases/download/1.9.21/ibus-table-1.9.21.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=9448c79434d01e450c08e9af26385fd9
+_md5_=4acbc7e45c3c8265266735f03aeba593
diff --git a/metadata/md5-cache/app-i18n/libcangjie-1.1 b/metadata/md5-cache/app-i18n/libcangjie-1.1
deleted file mode 100644
index 6aa0381903fd..000000000000
--- a/metadata/md5-cache/app-i18n/libcangjie-1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-db/sqlite:3=
-DESCRIPTION=The library implementing the Cangjie input method
-EAPI=5
-HOMEPAGE=http://cangjians.github.io
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-RDEPEND=dev-db/sqlite:3=
-SLOT=0
-SRC_URI=http://cangjians.github.io/downloads/libcangjie/libcangjie-1.1.tar.xz
-_md5_=73fab33039c15da05a283e7e75ce391c
diff --git a/metadata/md5-cache/app-i18n/libcangjie-1.3 b/metadata/md5-cache/app-i18n/libcangjie-1.3
index 0a54bb60d2bb..7539f4cdfe69 100644
--- a/metadata/md5-cache/app-i18n/libcangjie-1.3
+++ b/metadata/md5-cache/app-i18n/libcangjie-1.3
@@ -1,11 +1,11 @@
DEFINED_PHASES=-
DEPEND=dev-db/sqlite:3=
-DESCRIPTION=The library implementing the Cangjie input method
-EAPI=5
-HOMEPAGE=http://cangjians.github.io
+DESCRIPTION=Library implementing the Cangjie input method
+EAPI=6
+HOMEPAGE=http://cangjians.github.io/
KEYWORDS=amd64 x86
LICENSE=LGPL-3+
RDEPEND=dev-db/sqlite:3=
SLOT=0
SRC_URI=https://github.com/Cangjians/libcangjie/releases/download/v1.3/libcangjie-1.3.tar.xz
-_md5_=49facf05435583c0371fca2c131fe88c
+_md5_=a959aa707ba6ba9789f4ae22304e382f
diff --git a/metadata/md5-cache/app-i18n/unicode-cldr-33.0 b/metadata/md5-cache/app-i18n/unicode-cldr-33.0
index 1366320207ca..52bb3d07fbd3 100644
--- a/metadata/md5-cache/app-i18n/unicode-cldr-33.0
+++ b/metadata/md5-cache/app-i18n/unicode-cldr-33.0
@@ -3,8 +3,8 @@ DEPEND=app-arch/unzip
DESCRIPTION=Unicode Common Locale Data Repository
EAPI=6
HOMEPAGE=http://cldr.unicode.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=unicode
SLOT=0
SRC_URI=https://unicode.org/Public/cldr/33/cldr-common-33.0.zip -> unicode-cldr-common-33.0.zip
-_md5_=caefaa983c00be97dc4cda5145223996
+_md5_=e24716580d1e49612b88474aee98c5f9
diff --git a/metadata/md5-cache/app-i18n/unicode-emoji-11.0 b/metadata/md5-cache/app-i18n/unicode-emoji-11.0
index 2df9fa55069c..fd388abb5b0e 100644
--- a/metadata/md5-cache/app-i18n/unicode-emoji-11.0
+++ b/metadata/md5-cache/app-i18n/unicode-emoji-11.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install unpack
DESCRIPTION=UTS #51 Unicode Emoji
EAPI=6
HOMEPAGE=https://unicode.org/emoji/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
LICENSE=unicode
SLOT=0
SRC_URI=https://unicode.org/Public/emoji/11.0/emoji-data.txt -> unicode-emoji-data-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-sequences.txt -> unicode-emoji-sequences-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-test.txt -> unicode-emoji-test-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-variation-sequences.txt -> unicode-emoji-variation-sequences-11.0.txt https://unicode.org/Public/emoji/11.0/emoji-zwj-sequences.txt -> unicode-emoji-zwj-sequences-11.0.txt
-_md5_=01108b329b99e0a818035c725c44b586
+_md5_=4ee8a435664656bbcbe7d1568d0640e5
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index c4344fd21f6f..3386942308c2 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/mtail-1.2.0 b/metadata/md5-cache/app-misc/mtail-1.2.0
new file mode 100644
index 000000000000..6d2c798a3880
--- /dev/null
+++ b/metadata/md5-cache/app-misc/mtail-1.2.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DESCRIPTION=Tail workalike, that performs output colourising
+EAPI=7
+HOMEPAGE=http://matt.immute.net/src/mtail/
+IUSE=python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=HPND
+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_python3_7(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://matt.immute.net/src/mtail/mtail-1.2.0.tgz http://matt.immute.net/src/mtail/mtailrc-syslog.sample
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
+_md5_=ab4ccd23532f1317d85f5024c7a77e11
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 6e044410bcf6..fd23831a7696 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/zsh-5.6 b/metadata/md5-cache/app-shells/zsh-5.6
new file mode 100644
index 000000000000..77b4d549dbc5
--- /dev/null
+++ b/metadata/md5-cache/app-shells/zsh-5.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=sys-apps/groff >=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= ) !=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: display your undo history in a graph
+EAPI=6
+HOMEPAGE=https://www.vim.org/scripts/script.php?script_id=4177 https://github.com/mbbill/undotree
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+SLOT=0
+SRC_URI=https://github.com/mbbill/undotree/archive/rel_6.0.tar.gz -> undotree-6.0.tar.gz
+_eclasses_=estack 43ddf5aaffa7a8d0482df54d25a66a1f vcs-snapshot b77011b62e2053c646ad720defe6d921 vim-doc af2c81a1feeb0a99e91bee3e20769edb vim-plugin 3160d9cb05ef44497be1485db0fe7590
+_md5_=5258e18d106ad1c929ab1239aa532706
diff --git a/metadata/md5-cache/app-xemacs/Manifest.gz b/metadata/md5-cache/app-xemacs/Manifest.gz
index 8c6c1a35cd7c..4820e027c286 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.45 b/metadata/md5-cache/app-xemacs/ebuild-mode-1.45
new file mode 100644
index 000000000000..0533474f48ed
--- /dev/null
+++ b/metadata/md5-cache/app-xemacs/ebuild-mode-1.45
@@ -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.45.tar.xz
+_eclasses_=xemacs-elisp ec6a89e5b3d4b998d328d445d1c7ec06 xemacs-elisp-common 5ad47e1940fe7ffbdeeb002a3912bf79
+_md5_=88eb99e8ef5020a6e684fe940b9658bc
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 35dc3d1cdd31..8cfaf5c72992 100644
Binary files a/metadata/md5-cache/dev-cpp/Manifest.gz and b/metadata/md5-cache/dev-cpp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-cpp/eigen-3.3.5 b/metadata/md5-cache/dev-cpp/eigen-3.3.5
new file mode 100644
index 000000000000..effae549a282
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/eigen-3.3.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=doc? ( app-doc/doxygen[dot,latex] ) test? ( dev-libs/gmp:0 dev-libs/mpfr:0 media-libs/freeglut media-libs/glew sci-libs/adolc[sparse] sci-libs/cholmod sci-libs/fftw:3.0 sci-libs/pastix sci-libs/umfpack sci-libs/scotch sci-libs/spqr sci-libs/superlu virtual/opengl virtual/pkgconfig cuda? ( dev-util/nvidia-cuda-toolkit ) ) sys-devel/make >=dev-util/cmake-3.9.6 test? ( virtual/fortran )
+DESCRIPTION=C++ template library for linear algebra
+EAPI=6
+HOMEPAGE=http://eigen.tuxfamily.org/
+IUSE=altivec c++11 cuda debug doc neon openmp test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MPL-2.0
+RDEPEND=!dev-cpp/eigen:0
+RESTRICT=!test? ( test )
+SLOT=3
+SRC_URI=https://bitbucket.org/eigen/eigen/get/3.3.5.tar.bz2 -> eigen-3.3.5.tar.bz2
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee cuda e73256026102c4924bbba2ae5bf87978 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e fortran-2 68fcf50e02640de6eb5698ea038d9537 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=39627c91212cf39135fe070aa0148c0b
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index fd8ade676a44..8d70721b9c7e 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.2.16 b/metadata/md5-cache/dev-db/mariadb-10.2.17
similarity index 98%
rename from metadata/md5-cache/dev-db/mariadb-10.2.16
rename to metadata/md5-cache/dev-db/mariadb-10.2.17
index 8ed10eb4d85b..0c68672dc8d7 100644
--- a/metadata/md5-cache/dev-db/mariadb-10.2.16
+++ b/metadata/md5-cache/dev-db/mariadb-10.2.17
@@ -11,6 +11,6 @@ RDEPEND=selinux? ( sec-policy/selinux-mysql ) client-libs? ( !dev-db/mariadb-con
REQUIRED_USE=jdbc? ( extraengine server !static ) server? ( tokudb? ( jemalloc !tcmalloc ) ) !server? ( !extraengine ) ?? ( tcmalloc jemalloc ) static? ( yassl !pam )
RESTRICT=!bindist? ( bindist ) libressl? ( test )
SLOT=0/18
-SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.16/source/mariadb-10.2.16.tar.gz mirror://gentoo/mysql-extras-20180809-1700Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180809-1700Z.tar.bz2
+SRC_URI=https://downloads.mariadb.org/interstitial/mariadb-10.2.17/source/mariadb-10.2.17.tar.gz mirror://gentoo/mysql-extras-20180809-1700Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20180809-1700Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20180809-1700Z.tar.bz2
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=be8f85383d0a351b2b2edb7c558a36fd
+_md5_=33aa39bab48ada4b9b44b298b94432e3
diff --git a/metadata/md5-cache/dev-embedded/Manifest.gz b/metadata/md5-cache/dev-embedded/Manifest.gz
index 8e617004a2ee..bd1d09c1b171 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/u-boot-tools-2018.05 b/metadata/md5-cache/dev-embedded/u-boot-tools-2018.05
index 532d3d8d9561..86a03045a94d 100644
--- a/metadata/md5-cache/dev-embedded/u-boot-tools-2018.05
+++ b/metadata/md5-cache/dev-embedded/u-boot-tools-2018.05
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
DESCRIPTION=utilities for working with Das U-Boot
EAPI=6
HOMEPAGE=http://www.denx.de/wiki/U-Boot/WebHome
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 arm ~arm64 x86
LICENSE=GPL-2
SLOT=0
SRC_URI=ftp://ftp.denx.de/pub/u-boot/u-boot-2018.05.tar.bz2
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=205e21f0e3cc771c9092b87485774ffd
+_md5_=c5322f039c8c8f298e3686009df17234
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 642cc4e688af..c772af13e253 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/tiled-1.0.3 b/metadata/md5-cache/dev-games/tiled-1.0.3
deleted file mode 100644
index bbde675bb3c7..000000000000
--- a/metadata/md5-cache/dev-games/tiled-1.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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_python3_7(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A general purpose tile map editor
-EAPI=6
-HOMEPAGE=https://www.mapeditor.org/
-IUSE=examples python python_targets_python2_7
-KEYWORDS=amd64
-LICENSE=BSD BSD-2 GPL-2+
-RDEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/bjorn/tiled/archive/v1.0.3/tiled-1.0.3.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=771d473f25e4908d3ebdb7661950d584
diff --git a/metadata/md5-cache/dev-games/tiled-1.1.4 b/metadata/md5-cache/dev-games/tiled-1.1.4
deleted file mode 100644
index a357e98b311a..000000000000
--- a/metadata/md5-cache/dev-games/tiled-1.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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_python3_7(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A general purpose tile map editor
-EAPI=6
-HOMEPAGE=https://www.mapeditor.org/
-IUSE=examples python python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=BSD BSD-2 GPL-2+
-RDEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/bjorn/tiled/archive/v1.1.4/tiled-1.1.4.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=2d3d90a26dacd05eb55c418fd1009cc8
diff --git a/metadata/md5-cache/dev-games/tiled-1.1.5 b/metadata/md5-cache/dev-games/tiled-1.1.5
deleted file mode 100644
index 4e69f6bc232c..000000000000
--- a/metadata/md5-cache/dev-games/tiled-1.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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_python3_7(-),python_single_target_python2_7(+)] ) dev-qt/linguist-tools:5 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A general purpose tile map editor
-EAPI=6
-HOMEPAGE=https://www.mapeditor.org/
-IUSE=examples python python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=BSD BSD-2 GPL-2+
-RDEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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_python3_7(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/bjorn/tiled/archive/v1.1.5/tiled-1.1.5.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=2d3d90a26dacd05eb55c418fd1009cc8
diff --git a/metadata/md5-cache/dev-games/tiled-1.1.6 b/metadata/md5-cache/dev-games/tiled-1.1.6
index 37981584722b..f9217d1c563e 100644
--- a/metadata/md5-cache/dev-games/tiled-1.1.6
+++ b/metadata/md5-cache/dev-games/tiled-1.1.6
@@ -4,11 +4,11 @@ DESCRIPTION=A general purpose tile map editor
EAPI=6
HOMEPAGE=https://www.mapeditor.org/
IUSE=examples python python_targets_python2_7
-KEYWORDS=~amd64
+KEYWORDS=amd64
LICENSE=BSD BSD-2 GPL-2+
RDEPEND=>=dev-qt/qtcore-5.7:5 >=dev-qt/qtgui-5.7:5 >=dev-qt/qtnetwork-5.7:5 >=dev-qt/qtwidgets-5.7:5 sys-libs/zlib 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_python3_7(-),python_single_target_python2_7(+)] )
REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0
SRC_URI=https://github.com/bjorn/tiled/archive/v1.1.6/tiled-1.1.6.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=2d3d90a26dacd05eb55c418fd1009cc8
+_md5_=771d473f25e4908d3ebdb7661950d584
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index 305bbc045b50..85bb3deb6c1b 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/crystal-0.26.0 b/metadata/md5-cache/dev-lang/crystal-0.26.0
index 831f9d97bc86..f163f3b62c67 100644
--- a/metadata/md5-cache/dev-lang/crystal-0.26.0
+++ b/metadata/md5-cache/dev-lang/crystal-0.26.0
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/llvm:6 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatom
SLOT=0
SRC_URI=https://github.com/crystal-lang/crystal/archive/0.26.0.tar.gz -> crystal-0.26.0.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.25.1/crystal-0.25.1-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.25.1/crystal-0.25.1-1-linux-i686.tar.gz )
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb llvm 01fccd3367b527770b74bfbf59d616c6 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=d12683c6d832536b80103559bdab3fc1
+_md5_=9b44b89a060bf32f8649813870c28c58
diff --git a/metadata/md5-cache/dev-lang/crystal-0.26.1 b/metadata/md5-cache/dev-lang/crystal-0.26.1
index 7324119d8491..080b1e21f810 100644
--- a/metadata/md5-cache/dev-lang/crystal-0.26.1
+++ b/metadata/md5-cache/dev-lang/crystal-0.26.1
@@ -10,4 +10,4 @@ RDEPEND=sys-devel/llvm:6 dev-libs/boehm-gc[static-libs,threads] dev-libs/libatom
SLOT=0
SRC_URI=https://github.com/crystal-lang/crystal/archive/0.26.1.tar.gz -> crystal-0.26.1.tar.gz amd64? ( https://github.com/crystal-lang/crystal/releases/download/0.26.0/crystal-0.26.0-1-linux-x86_64.tar.gz ) x86? ( https://github.com/crystal-lang/crystal/releases/download/0.26.0/crystal-0.26.0-1-linux-i686.tar.gz )
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb llvm 01fccd3367b527770b74bfbf59d616c6 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=6681d2e76bad1cbb208fa4f38ee93738
+_md5_=3c862641c7047f934beca62c39c46945
diff --git a/metadata/md5-cache/dev-lang/gprolog-1.4.5 b/metadata/md5-cache/dev-lang/gprolog-1.4.5
index 731e0afa6552..58d6ec9339ad 100644
--- a/metadata/md5-cache/dev-lang/gprolog-1.4.5
+++ b/metadata/md5-cache/dev-lang/gprolog-1.4.5
@@ -8,4 +8,4 @@ LICENSE=|| ( GPL-2+ LGPL-3+ )
SLOT=0
SRC_URI=http://www.gprolog.org/gprolog-1.4.5.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d00d109474eb7ef7b57cab92aceccd38
+_md5_=8ae44a0ee47eb59f41c07a5dc2d7db46
diff --git a/metadata/md5-cache/dev-lang/julia-0.7.0 b/metadata/md5-cache/dev-lang/julia-0.7.0
new file mode 100644
index 000000000000..6ca1d5e97b5a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/julia-0.7.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND==sys-devel/llvm-6*:= =sys-devel/clang-6*:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack dev-vcs/git dev-util/patchelf virtual/pkgconfig
+DESCRIPTION=High-performance programming language for technical computing
+EAPI=6
+HOMEPAGE=https://julialang.org/
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND==sys-devel/llvm-6*:= =sys-devel/clang-6*:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/JuliaLang/julia/releases/download/v0.7.0/julia-0.7.0.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/ed3700c849289ed01fe04273a7bf865340b2bd7e -> julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/97ef668b312b96382714dbb8eaac4affce0816e6 -> julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz
+_eclasses_=llvm 01fccd3367b527770b74bfbf59d616c6 multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils e85f015e815dd463b0c206d781ef45a5 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
+_md5_=7bb1495647d8b640fb41aafd06c5780c
diff --git a/metadata/md5-cache/dev-lang/julia-1.0.0 b/metadata/md5-cache/dev-lang/julia-1.0.0
index 85d336e5d0c4..38484150f8ab 100644
--- a/metadata/md5-cache/dev-lang/julia-1.0.0
+++ b/metadata/md5-cache/dev-lang/julia-1.0.0
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=sys-devel/llvm-4.0.0:= >=sys-devel/clang-4.0.0:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack dev-vcs/git dev-util/patchelf virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND==sys-devel/llvm-6*:= =sys-devel/clang-6*:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack dev-vcs/git dev-util/patchelf virtual/pkgconfig
DESCRIPTION=High-performance programming language for technical computing
EAPI=6
HOMEPAGE=https://julialang.org/
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=MIT
-RDEPEND=>=sys-devel/llvm-4.0.0:= >=sys-devel/clang-4.0.0:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
+RDEPEND==sys-devel/llvm-6*:= =sys-devel/clang-6*:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
RESTRICT=test
SLOT=0
-SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.0.0/julia-1.0.0.tar.gz https://dev.gentoo.org/~tamiko/distfiles/julia-1.0.0-bundled.tar.gz
+SRC_URI=https://github.com/JuliaLang/julia/releases/download/v1.0.0/julia-1.0.0.tar.gz https://api.github.com/repos/JuliaLang/libuv/tarball/ed3700c849289ed01fe04273a7bf865340b2bd7e -> julia-libuv-ed3700c849289ed01fe04273a7bf865340b2bd7e.tar.gz https://api.github.com/repos/JuliaLang/utf8proc/tarball/97ef668b312b96382714dbb8eaac4affce0816e6 -> julia-utf8proc-97ef668b312b96382714dbb8eaac4affce0816e6.tar.gz https://api.github.com/repos/vtjnash/libwhich/tarball/81e9723c0273d78493dc8c8ed570f68d9ce7e89e -> julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-2.2.3.tar.gz -> julia-dsfmt-2.2.3.tar.gz
_eclasses_=llvm 01fccd3367b527770b74bfbf59d616c6 multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils e85f015e815dd463b0c206d781ef45a5 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=6149bf3f2a499ea691d0d6a6679f8f28
+_md5_=7bb1495647d8b640fb41aafd06c5780c
diff --git a/metadata/md5-cache/dev-lang/julia-9999 b/metadata/md5-cache/dev-lang/julia-9999
index 897a4450b8dd..2945c549eb2a 100644
--- a/metadata/md5-cache/dev-lang/julia-9999
+++ b/metadata/md5-cache/dev-lang/julia-9999
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=sys-devel/llvm-4.0.0:= >=sys-devel/clang-4.0.0:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack dev-util/patchelf virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=sys-devel/llvm-6.0.0:= >=sys-devel/clang-6.0.0:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack dev-util/patchelf virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=High-performance programming language for technical computing
EAPI=6
HOMEPAGE=https://julialang.org/
LICENSE=MIT
-RDEPEND=>=sys-devel/llvm-4.0.0:= >=sys-devel/clang-4.0.0:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
+RDEPEND=>=sys-devel/llvm-6.0.0:= >=sys-devel/clang-6.0.0:= dev-libs/double-conversion:0= dev-libs/gmp:0= dev-libs/libgit2:0= >=dev-libs/libpcre2-10.23:0=[jit] dev-libs/mpfr:0= dev-libs/openspecfun sci-libs/amd:0= sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/fftw:3.0=[threads] sci-libs/openlibm:0= sci-libs/spqr:0= sci-libs/umfpack:0= sci-mathematics/glpk:0= >=sys-libs/libunwind-1.1:7= sys-libs/readline:0= sys-libs/zlib:0= >=virtual/blas-3.6 virtual/lapack
RESTRICT=test
SLOT=0
_eclasses_=git-r3 918d6a744039c29af2cadc7317459765 llvm 01fccd3367b527770b74bfbf59d616c6 multilib 97f470f374f2e94ccab04a2fb21d811e pax-utils e85f015e815dd463b0c206d781ef45a5 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=ad5a1c38bca729863d4c0dee9b61e9fd
+_md5_=3425b0684adb1bd0780f2ec8d9ffbe4d
diff --git a/metadata/md5-cache/dev-lang/mercury-extras-14.01.1 b/metadata/md5-cache/dev-lang/mercury-extras-14.01.1
index c4b386bb186b..1254b483a8bd 100644
--- a/metadata/md5-cache/dev-lang/mercury-extras-14.01.1
+++ b/metadata/md5-cache/dev-lang/mercury-extras-14.01.1
@@ -8,6 +8,6 @@ KEYWORDS=amd64 ~x86
LICENSE=GPL-2 LGPL-2
RDEPEND=~dev-lang/mercury-14.01.1 cairo? ( >=x11-libs/cairo-1.10.0 ) glut? ( media-libs/freeglut ) odbc? ( dev-db/unixODBC ) iodbc? ( !odbc? ( dev-db/libiodbc ) ) ncurses? ( sys-libs/ncurses:= ) opengl? ( virtual/opengl virtual/glu ) tcl? ( tk? ( dev-lang/tcl:0 dev-lang/tk:0 x11-libs/libX11 x11-libs/libXmu ) )
SLOT=0
-SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-14.01.1.tar.gz mirror://gentoo/mercury-extras-14.01.1-gentoo-patchset-0.tar.gz
+SRC_URI=http://dl.mercurylang.org/release/mercury-srcdist-14.01.1.tar.gz mirror://gentoo/mercury-extras-14.01.1-gentoo-patchset-1.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0dcc4e127b0ae3e367f387eec0cf3eb1
+_md5_=8f30c9094cb1ae3b9eab420e9ef0fb93
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index b15e0bf59b83..07cc8e5249b6 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/nss-3.36.1 b/metadata/md5-cache/dev-libs/nss-3.39
similarity index 70%
rename from metadata/md5-cache/dev-libs/nss-3.36.1
rename to metadata/md5-cache/dev-libs/nss-3.39
index 3f5ddbcb6b9f..e7c972f4162b 100644
--- a/metadata/md5-cache/dev-libs/nss-3.36.1
+++ b/metadata/md5-cache/dev-libs/nss-3.39
@@ -1,7 +1,7 @@
DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
DEPEND=>=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/nspr-4.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(-)?] >=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(-)?]
DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
-EAPI=6
+EAPI=7
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
@@ -9,6 +9,6 @@ LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
RDEPEND=>=dev-libs/nspr-4.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(-)?] >=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_36_1_RTM/src/nss-3.36.1.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 b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4f296ca8f3ab1f51a08ede60e43b3274
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_39_RTM/src/nss-3.39.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_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
+_md5_=277719ed2a714d6ad6feeaed37c1ba19
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2p b/metadata/md5-cache/dev-libs/openssl-1.0.2p
index da42b3ce7195..20c9240dc65e 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2p
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2p
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
SLOT=0
SRC_URI=mirror://openssl/source/openssl-1.0.2p.tar.gz !vanilla? ( mirror://gentoo/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~chutzpah/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~whissi/dist/openssl/openssl-1.0.2-patches-1.5.tar.xz https://dev.gentoo.org/~polynomial-c/dist/openssl-1.0.2-patches-1.5.tar.xz ) bindist? ( https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//hobble-openssl?h=f25 -> openssl-1.0.2p_hobble-openssl https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ec_curve.c?h=f25 -> openssl-1.0.2p_ec_curve.c https://src.fedoraproject.org/cgit/rpms/openssl.git/plain//ectest.c?h=f25 -> openssl-1.0.2p_ectest.c )
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=23eb7f0b7a34483a6666508d96f4bf63
+_md5_=a10b0f44ff48cbf3f949a975404d62c3
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1_pre9 b/metadata/md5-cache/dev-libs/openssl-1.1.1_pre9
index 7afd54b668aa..90b725c9663c 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1_pre9
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1_pre9
@@ -11,4 +11,4 @@ RESTRICT=!bindist? ( bindist )
SLOT=0/1.1
SRC_URI=mirror://openssl/source/openssl-1.1.1-pre9.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a646af3f8cfa7fa62f7e62196d8bad7b
+_md5_=cc4dbc3e7c6ea2c50af06b0b3bea58f0
diff --git a/metadata/md5-cache/dev-libs/tinyxml2-3.0.0 b/metadata/md5-cache/dev-libs/tinyxml2-3.0.0
index 5e66b443959b..013226e8b66d 100644
--- a/metadata/md5-cache/dev-libs/tinyxml2-3.0.0
+++ b/metadata/md5-cache/dev-libs/tinyxml2-3.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=A simple, small, efficient, C++ XML parser
EAPI=6
HOMEPAGE=http://www.grinninglizard.com/tinyxml2/ https://github.com/leethomason/tinyxml2/
IUSE=static-libs test
-KEYWORDS=amd64 ~arm ~hppa ~sparc ~x86
+KEYWORDS=amd64 ~arm ~hppa sparc ~x86
LICENSE=ZLIB
SLOT=0/3
SRC_URI=https://github.com/leethomason/tinyxml2/archive/3.0.0.tar.gz -> tinyxml2-3.0.0.tar.gz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=aa63abf7b348c3348ef7975f1e129c2e
+_md5_=9533be17d9dafd3071ad007d96d023a5
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 6afbb7f35fd5..21f299e0d237 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/adodb-5.20.13 b/metadata/md5-cache/dev-php/adodb-5.20.13
new file mode 100644
index 000000000000..1738d18db06f
--- /dev/null
+++ b/metadata/md5-cache/dev-php/adodb-5.20.13
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Database abstraction layer for PHP
+EAPI=6
+HOMEPAGE=https://github.com/ADOdb
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD LGPL-2.1+
+RDEPEND=dev-lang/php:*
+SLOT=0
+SRC_URI=https://github.com/ADOdb/ADOdb/archive/v5.20.13.tar.gz -> adodb-5.20.13.tar.gz
+_md5_=cc98ab2cba67533ca7cc4765b9d010f5
diff --git a/metadata/md5-cache/dev-php/pecl-event-2.4.1 b/metadata/md5-cache/dev-php/pecl-event-2.4.1
new file mode 100644
index 000000000000..fd743612e3a4
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-event-2.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libevent-2.0.2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php5-6? ( dev-lang/php:5.6[sockets?] ) php_targets_php7-0? ( dev-lang/php:7.0[sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) php_targets_php7-2? ( dev-lang/php:7.2[sockets?] ) php_targets_php7-3? ( dev-lang/php:7.3[sockets?] ) >=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 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+DESCRIPTION=PHP wrapper for libevent2
+EAPI=6
+HOMEPAGE=https://pecl.php.net/event
+IUSE=debug examples +extra libressl +sockets +ssl threads php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3
+KEYWORDS=~amd64 ~ia64 ~x86
+LICENSE=PHP-3
+RDEPEND=>=dev-libs/libevent-2.0.2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) php_targets_php5-6? ( dev-lang/php:5.6[sockets?] ) php_targets_php7-0? ( dev-lang/php:7.0[sockets?] ) php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) php_targets_php7-2? ( dev-lang/php:7.2[sockets?] ) php_targets_php7-3? ( dev-lang/php:7.3[sockets?] ) !dev-php/pecl-libevent 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 ) php_targets_php7-3? ( dev-lang/php:7.3 )
+REQUIRED_USE=|| ( php_targets_php5-6 php_targets_php7-0 php_targets_php7-1 php_targets_php7-2 php_targets_php7-3 )
+SLOT=0
+SRC_URI=https://pecl.php.net/get/event-2.4.1.tgz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e php-ext-pecl-r3 a59741d3df8ea9f17afcdcfb7edaee6d php-ext-source-r3 378dc4ea30db21411f4d1a32d21a6302 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
+_md5_=ad03b07f3f03c989f96be4f009b838b9
diff --git a/metadata/md5-cache/dev-python/Coffin-2.0.1 b/metadata/md5-cache/dev-python/Coffin-2.0.1
deleted file mode 100644
index bc091eff846b..000000000000
--- a/metadata/md5-cache/dev-python/Coffin-2.0.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_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(-)]
-DESCRIPTION=Jinja2 adapter for Django
-EAPI=5
-HOMEPAGE=https://pypi.org/project/Coffin/
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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/C/Coffin/Coffin-2.0.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=316560149f46bd08f0b8fce0459c208c
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index ece650643a7f..7ba68ddc673f 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/RecSQL-0.7.8 b/metadata/md5-cache/dev-python/RecSQL-0.7.11
similarity index 91%
rename from metadata/md5-cache/dev-python/RecSQL-0.7.8
rename to metadata/md5-cache/dev-python/RecSQL-0.7.11
index b2621d0df447..5a7cfbfe554c 100644
--- a/metadata/md5-cache/dev-python/RecSQL-0.7.8
+++ b/metadata/md5-cache/dev-python/RecSQL-0.7.11
@@ -1,7 +1,7 @@
DEFINED_PHASES=compile configure install prepare test unpack
DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
DESCRIPTION=Simple SQL analysis of python records
-EAPI=5
+EAPI=6
HOMEPAGE=https://orbeckst.github.com/RecSQL/
IUSE=python_targets_python2_7
KEYWORDS=~amd64 ~x86
@@ -9,6 +9,6 @@ LICENSE=GPL-3
RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
REQUIRED_USE=|| ( python_targets_python2_7 )
SLOT=0
-SRC_URI=https://github.com/orbeckst/RecSQL/archive/release-0.7.8.tar.gz -> RecSQL-0.7.8.tar.gz
+SRC_URI=https://github.com/orbeckst/RecSQL/archive/release-0.7.11.tar.gz -> RecSQL-0.7.11.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=04f28eed163454f7f073171ad30bad26
+_md5_=7ddd0023db904867814732e608692fa0
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.4.3 b/metadata/md5-cache/dev-python/aiohttp-3.4.3
new file mode 100644
index 000000000000..7dda75bec09e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aiohttp-3.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/cython[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( >=dev-python/async_timeout-3.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/attrs-17.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-4.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna-ssl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-arch/brotli-1.0.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-3.4.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-mock[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-timeout[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] www-servers/gunicorn[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=http client/server for asyncio
+EAPI=6
+HOMEPAGE=https://pypi.org/project/aiohttp/
+IUSE=doc test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/async_timeout-3.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/attrs-17.3.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/multidict-4.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/yarl-1.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/idna-ssl[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.4.3.tar.gz -> aiohttp-3.4.3.tar.gz
+_eclasses_=distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=50bb05338b665cecac91deeddf5596c1
diff --git a/metadata/md5-cache/dev-python/async_generator-1.10 b/metadata/md5-cache/dev-python/async_generator-1.10
new file mode 100644
index 000000000000..542d41e6965d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/async_generator-1.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Making it easy to write async iterators in Python 3.5
+EAPI=6
+HOMEPAGE=https://github.com/python-trio/async_generator https://pypi.org/project/async_generator/
+IUSE=test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( MIT Apache-2.0 )
+RDEPEND=python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/a/async_generator/async_generator-1.10.tar.gz
+_eclasses_=distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=1705b7278730865396079818a011fe83
diff --git a/metadata/md5-cache/dev-python/cangjie-1.2-r1 b/metadata/md5-cache/dev-python/cangjie-1.2-r1
index 2d6f2a9558a2..8ca09844920f 100644
--- a/metadata/md5-cache/dev-python/cangjie-1.2-r1
+++ b/metadata/md5-cache/dev-python/cangjie-1.2-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-i18n/libcangjie 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/cython[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(-)] 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=The Python bindings to libcangjie
+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(-)] app-i18n/libcangjie dev-python/cython[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(-)] 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=Python wrapper for libcangjie
EAPI=6
-HOMEPAGE=http://cangjians.github.io
+HOMEPAGE=http://cangjians.github.io/
IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=amd64 x86
LICENSE=LGPL-3+
-RDEPEND=app-i18n/libcangjie 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(-)]
+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(-)] app-i18n/libcangjie
REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
SLOT=0
SRC_URI=https://github.com/Cangjians/pycangjie/releases/download/v1.2/cangjie-1.2.tar.xz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=26c321c024dc65344b6f0f31329fdbe3
+_md5_=067f281e5b194c4559af38123a317bab
diff --git a/metadata/md5-cache/dev-python/cangjie-1.3 b/metadata/md5-cache/dev-python/cangjie-1.3
new file mode 100644
index 000000000000..3027ec1c217f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cangjie-1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+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(-)] app-i18n/libcangjie dev-python/cython[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(-)] 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=Python wrapper for libcangjie
+EAPI=6
+HOMEPAGE=http://cangjians.github.io/
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+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(-)] app-i18n/libcangjie
+REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/Cangjians/pycangjie/releases/download/v1.3/cangjie-1.3.tar.xz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
+_md5_=a5b4938be28a8c0251532396313e7611
diff --git a/metadata/md5-cache/dev-python/django-1.8.19 b/metadata/md5-cache/dev-python/django-1.8.19
deleted file mode 100644
index 0055a4ac605d..000000000000
--- a/metadata/md5-cache/dev-python/django-1.8.19
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare prerm setup test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/sphinx-1.0.7[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite] ) 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] ) dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/numpy[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(-)] dev-python/pillow[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=app-admin/webapp-config-1.50.15
-DESCRIPTION=High-level Python web framework
-EAPI=6
-HOMEPAGE=https://www.djangoproject.com/ https://pypi.org/project/Django/
-IUSE=doc sqlite test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[sqlite?,threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite?,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://www.djangoproject.com/m/releases/1.8/Django-1.8.19.tar.gz mirror://pypi/D/Django/Django-1.8.19.tar.gz
-_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 6ae2395d7f341093c36057cb4f69101a xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=17e19f1e58053facfc78b990857513a5
diff --git a/metadata/md5-cache/dev-python/django-2.1 b/metadata/md5-cache/dev-python/django-2.1.1
similarity index 99%
rename from metadata/md5-cache/dev-python/django-2.1
rename to metadata/md5-cache/dev-python/django-2.1.1
index 8ed9063f2615..98a03ec38952 100644
--- a/metadata/md5-cache/dev-python/django-2.1
+++ b/metadata/md5-cache/dev-python/django-2.1.1
@@ -9,6 +9,6 @@ LICENSE=BSD Apache-2.0 MIT
RDEPEND=dev-python/pytz[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_5? ( dev-lang/python:3.5[sqlite?,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
-SRC_URI=https://www.djangoproject.com/m/releases/2.1/Django-2.1.tar.gz
+SRC_URI=https://www.djangoproject.com/m/releases/2.1/Django-2.1.1.tar.gz
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
_md5_=7b20cb36d794d2e15c24da3aa898f538
diff --git a/metadata/md5-cache/dev-python/django-compressor-1.5 b/metadata/md5-cache/dev-python/django-compressor-1.5
deleted file mode 100644
index 9e8e49eb33dd..000000000000
--- a/metadata/md5-cache/dev-python/django-compressor-1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND==dev-python/django-appconf-0.4[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[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/versiontools[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/django[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/django-discover-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/unittest2[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/beautifulsoup:4[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/html5lib[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/mock[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/jinja[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/lxml[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/Coffin[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/jingo[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=Compresses linked and inline javascript or CSS into a single cached file
-EAPI=5
-HOMEPAGE=https://github.com/django-compressor/django-compressor
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND==dev-python/django-appconf-0.4[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/jezdez/django_compressor/archive/1.5.tar.gz -> django-compressor-1.5.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=ddd4a891b27f283666b466131b48635f
diff --git a/metadata/md5-cache/dev-python/django-openstack-auth-3.2.0-r1 b/metadata/md5-cache/dev-python/django-openstack-auth-3.2.0-r1
deleted file mode 100644
index fcab099190b7..000000000000
--- a/metadata/md5-cache/dev-python/django-openstack-auth-3.2.0-r1
+++ /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/pbr-2.0[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/hacking-0.12.0[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/Babel-2.3.4[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/coverage-4.0[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/mock-2.0[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/mox3-0.7.0[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/testscenarios-0.4[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/sphinx-1.1.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(-)] !~dev-python/sphinx-1.2.0[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/oslo-sphinx-4.7.0[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-1.1.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(-)] !~dev-python/sphinx-1.2.0[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/oslo-sphinx-4.7.0[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=Django authentication backend for use with OpenStack Keystone Identity backend
-EAPI=6
-HOMEPAGE=https://django-openstack-auth.readthedocs.io/en/latest/
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=dev-python/django-1.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/oslo-config-3.22.0[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/oslo-policy-1.17.0[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/python-keystoneclient-3.8.0[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/keystoneauth-2.20.0[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-1.9.0[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/d/django_openstack_auth/django_openstack_auth-3.2.0.tar.gz
-_eclasses_=distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=ad1a83f698eec4c2b19f910a2549ff7a
diff --git a/metadata/md5-cache/dev-python/django-tastypie-0.13.3-r1 b/metadata/md5-cache/dev-python/django-tastypie-0.13.3-r1
deleted file mode 100644
index bc8f23b982b4..000000000000
--- a/metadata/md5-cache/dev-python/django-tastypie-0.13.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/mimeparse-0.1.4[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/mimeparse-1.5[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/python-dateutil-1.5[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/python-dateutil-2.0[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/django-1.7[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/mock-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pytz-2013b[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(-)] !!sci-libs/geos[python] ) 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-python/mock-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/sphinx_rtd_theme[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=A flexible and capable API layer for django utilising serialisers
-EAPI=6
-HOMEPAGE=https://pypi.org/project/django-tastypie/ https://github.com/toastdriven/django-tastypie
-IUSE=bip doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=dev-python/mimeparse-0.1.4[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/mimeparse-1.5[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/python-dateutil-1.5[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/python-dateutil-2.0[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/django-1.7[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-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/toastdriven/django-tastypie/archive/v0.13.3.tar.gz -> django-tastypie-0.13.3.tar.gz
-_eclasses_=distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=68be0e28173eb8f4daad4ab3de80f3b6
diff --git a/metadata/md5-cache/dev-python/icalendar-3.11.7-r1 b/metadata/md5-cache/dev-python/icalendar-3.11.7-r1
new file mode 100644
index 000000000000..3a273c2e421d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/icalendar-3.11.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pytz[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(-)] dev-python/python-dateutil[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(-)] doc? ( 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(-)] ) test? ( dev-python/python-dateutil:0[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/pytest[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/coverage[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(-)]
+DESCRIPTION=Package used for parsing and generating iCalendar files (RFC 2445)
+EAPI=6
+HOMEPAGE=https://github.com/collective/icalendar
+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 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=dev-python/pytz[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(-)] dev-python/python-dateutil[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/i/icalendar/icalendar-3.11.7.tar.gz
+_eclasses_=distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=38929f1b3b7a8410eaad3cf037615030
diff --git a/metadata/md5-cache/dev-python/jingo-0.9.0 b/metadata/md5-cache/dev-python/jingo-0.9.0
deleted file mode 100644
index 1091b69306ac..000000000000
--- a/metadata/md5-cache/dev-python/jingo-0.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_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(-)]
-DESCRIPTION=An adapter for using Jinja2 templates with Django
-EAPI=6
-HOMEPAGE=https://github.com/jbalogh/jingo/
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/jinja[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/j/jingo/jingo-0.9.0.tar.gz
-_eclasses_=distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=1f71c4dac1db09323da5a4f9fa0fbd3a
diff --git a/metadata/md5-cache/dev-python/jsonfield-1.0.3 b/metadata/md5-cache/dev-python/jsonfield-1.0.3
deleted file mode 100644
index fc1e266eaf1e..000000000000
--- a/metadata/md5-cache/dev-python/jsonfield-1.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/django[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=Reusable Django field that allows you to store validated JSON in your model
-EAPI=5
-HOMEPAGE=https://pypi.org/project/jsonfield/ https://github.com/bradjasper/django-jsonfield
-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
-LICENSE=MIT
-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/j/jsonfield/jsonfield-1.0.3.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=713f54c35221bd19718d47e854d91f72
diff --git a/metadata/md5-cache/dev-python/jsonfield-2.0.2 b/metadata/md5-cache/dev-python/jsonfield-2.0.2
deleted file mode 100644
index 77073c245b5a..000000000000
--- a/metadata/md5-cache/dev-python/jsonfield-2.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/django[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=Reusable Django field that allows you to store validated JSON in your model
-EAPI=6
-HOMEPAGE=https://pypi.org/project/jsonfield/ https://github.com/bradjasper/django-jsonfield
-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
-LICENSE=MIT
-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/j/jsonfield/jsonfield-2.0.2.tar.gz
-_eclasses_=distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=259f63e0590573a0dc7d767ff7f49d7b
diff --git a/metadata/md5-cache/dev-python/kombu-4.2.1 b/metadata/md5-cache/dev-python/kombu-4.2.1
new file mode 100644
index 000000000000..068b173a7d61
--- /dev/null
+++ b/metadata/md5-cache/dev-python/kombu-4.2.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/py-amqp-2.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(-)] =dev-python/boto3-1.4.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(-)] ) msgpack? ( >=dev-python/msgpack-0.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(-)] ) mongodb? ( >=dev-python/pymongo-3.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(-)] ) redis? ( >=dev-python/redis-py-2.10.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(-)] ) yaml? ( >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-20.6.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(-)] test? ( >=dev-python/case-1.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/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/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/unittest2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/couchdb-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/sphinx_celery-1.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-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=AMQP Messaging Framework for Python
+EAPI=6
+HOMEPAGE=https://pypi.org/project/kombu/ https://github.com/celery/kombu
+IUSE=doc examples mongodb msgpack redis sqs test yaml python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/py-amqp-2.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(-)] =dev-python/boto3-1.4.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(-)] ) msgpack? ( >=dev-python/msgpack-0.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(-)] ) mongodb? ( >=dev-python/pymongo-3.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(-)] ) redis? ( >=dev-python/redis-py-2.10.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(-)] ) yaml? ( >=dev-python/pyyaml-3.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/k/kombu/kombu-4.2.1.tar.gz
+_eclasses_=distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=52e6d492dad8614ba14a03cffa219b69
diff --git a/metadata/md5-cache/dev-python/odfpy-1.3.6 b/metadata/md5-cache/dev-python/odfpy-1.3.6
index de0db056e001..71ccce5368e3 100644
--- a/metadata/md5-cache/dev-python/odfpy-1.3.6
+++ b/metadata/md5-cache/dev-python/odfpy-1.3.6
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
SLOT=0
SRC_URI=mirror://pypi/o/odfpy/odfpy-1.3.6.tar.gz
_eclasses_=distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=c5700601e94c9a5202aa21a73226e9fa
+_md5_=8036586775df4e32103d6fe8c8604c7d
diff --git a/metadata/md5-cache/dev-python/osc-placement-1.3.0 b/metadata/md5-cache/dev-python/osc-placement-1.3.0
new file mode 100644
index 000000000000..eb743ae2f0d3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/osc-placement-1.3.0
@@ -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/pbr-2.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/pbr-2.1.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_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=OpenStackClient plugin for the Placement service
+EAPI=6
+HOMEPAGE=https://github.com/openstack/osc-placement
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.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/pbr-2.1.0 >=dev-python/six-1.10.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/keystoneauth-3.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/osc-lib-1.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(-)] 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/osc-placement/osc-placement-1.3.0.tar.gz
+_eclasses_=distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=a18f05a4f8642c5e220e351252b00733
diff --git a/metadata/md5-cache/dev-python/oslo-db-4.40.0 b/metadata/md5-cache/dev-python/oslo-db-4.40.0
new file mode 100644
index 000000000000..eda8f3b7a565
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-db-4.40.0
@@ -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/pbr-2.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/pbr-2.1.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(-)]
+DESCRIPTION=OpenStack Common DB Code
+EAPI=6
+HOMEPAGE=https://launchpad.net/oslo
+IUSE=+sqlite mysql postgres python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pbr-2.1.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/alembic-0.9.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/debtcollector-1.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/oslo-i18n-3.15.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/oslo-config-5.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/oslo-utils-3.33.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(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-1.1.5[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-1.1.6[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-1.1.7[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-1.1.8[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) mysql? ( || ( dev-python/pymysql[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-1.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/sqlalchemy-1.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/sqlalchemy-1.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/sqlalchemy-1.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(-)] ) postgres? ( dev-python/psycopg: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/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-1.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/sqlalchemy-1.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/sqlalchemy-1.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/sqlalchemy-1.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/sqlalchemy-migrate-0.11.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.20.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/six-1.10.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=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/o/oslo.db/oslo.db-4.40.0.tar.gz
+_eclasses_=distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=aeacc620aeaad9e3e10bfc0fdc31e48d
diff --git a/metadata/md5-cache/dev-python/oslo-service-1.31.3 b/metadata/md5-cache/dev-python/oslo-service-1.31.3
new file mode 100644
index 000000000000..a9a41896c0de
--- /dev/null
+++ b/metadata/md5-cache/dev-python/oslo-service-1.31.3
@@ -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/pbr-2.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/pbr-2.1.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/fixtures-3.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/mock-2.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/oslotest-3.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/requests-2.14.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/stestr-2.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/sphinx-1.6.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/sphinx-1.6.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/openstackdocstheme-1.18.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/doc8-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/reno-2.5.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/coverage-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/coverage-4.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/bandit-1.1.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(-)]
+DESCRIPTION=Library for running OpenStack services
+EAPI=6
+HOMEPAGE=https://pypi.org/project/oslo.service/
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pbr-2.1.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/webob-1.7.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/eventlet-0.18.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/eventlet-0.20.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/greenlet-0.4.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/monotonic-0.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/oslo-utils-3.33.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/oslo-concurrency-3.25.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/oslo-config-5.1.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/oslo-log-3.36.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/six-1.10.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/oslo-i18n-3.15.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/pastedeploy-1.5.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/routes-2.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(-)] >=dev-python/paste-2.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(-)] 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/oslo.service/oslo.service-1.31.3.tar.gz
+_eclasses_=distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=5f5367d9ef00efa781aed1433fa663c5
diff --git a/metadata/md5-cache/dev-python/pytest-relaxed-1.1.4 b/metadata/md5-cache/dev-python/pytest-relaxed-1.1.4
index 344483ced927..a9e8737c4a94 100644
--- a/metadata/md5-cache/dev-python/pytest-relaxed-1.1.4
+++ b/metadata/md5-cache/dev-python/pytest-relaxed-1.1.4
@@ -4,7 +4,7 @@ DESCRIPTION=py.test plugin for relaxed test discovery and organization
EAPI=7
HOMEPAGE=https://pypi.org/project/pytest-relaxed/ https://github.com/bitprophet/pytest-relaxed
IUSE=test python_targets_python2_7 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 ~m68k-mint ~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 ~m68k-mint ~sparc-solaris
LICENSE=BSD-2
RDEPEND=>=dev-python/pytest-3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/six-1[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/decorator-4[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://pypi/p/pytest-relaxed/pytest-relaxed-1.1.4.tar.gz
_eclasses_=distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=5b2026d68b2424931dbe1fa9f53ca870
+_md5_=652a98dcd016ae25985674db83d16a95
diff --git a/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.4 b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.4
new file mode 100644
index 000000000000..82e09d9bf384
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-aiohttp-theme-0.1.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Sphinx theme for aiohttp
+EAPI=6
+HOMEPAGE=https://github.com/aio-libs/aiohttp-theme
+IUSE=python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/sphinx[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/a/aiohttp-theme/aiohttp-theme-0.1.4.tar.gz
+_eclasses_=distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=9bf87d980a818373be8ae8def52e852d
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 6d40bd5c5bad..820b75a42bea 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/qtwebkit-5.212.0_pre20180120 b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
index c5f7c3d34e25..241df38ab883 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.212.0_pre20180120
@@ -11,4 +11,4 @@ REQUIRED_USE=nsplugin? ( X ) qml? ( opengl ) ?? ( gstreamer multimedia )
SLOT=5/5.212
SRC_URI=http://code.qt.io/cgit/qt/qtwebkit.git/snapshot/72cfbd7664f21fcc0e62b869a6b01bf73eb5e7da.tar.gz -> qtwebkit-5.212.0_pre20180120.tar.gz
_eclasses_=check-reqs 21aa24510a44d259c03425a957336b3b cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 ruby-single e6530f43a549f120f9396ccb852288f5 ruby-utils a43d6cd7f05b4d013e7e40104ddfd3c7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=b35cc030a6d28d08270303e7efd0f879
+_md5_=f968cd7251b2738f3f57edae2422e6b3
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index b35987151cd0..0f4e0c45f012 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/ox-2.10.0 b/metadata/md5-cache/dev-ruby/ox-2.10.0
new file mode 100644
index 000000000000..c0f7319e426a
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ox-2.10.0
@@ -0,0 +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_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/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[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=A fast XML parser and Object marshaller
+EAPI=6
+HOMEPAGE=http://www.ohler.com/ox/ https://github.com/ohler55/ox
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=BSD
+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=https://github.com/ohler55/ox/archive/v2.10.0.tar.gz -> ox-2.10.0.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem b71c34d64e24dcf087f9d6a84bb32dbe ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils a43d6cd7f05b4d013e7e40104ddfd3c7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_md5_=586f14cfd6e27057fd4b3759b4d221bd
diff --git a/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1 b/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1
index f0c75c7b2c97..ab764d7980df 100644
--- a/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1
+++ b/metadata/md5-cache/dev-ruby/sinatra-partial-1.0.1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/sinatra-1.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sinatra-1.4[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/haml[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] dev-ruby/timecop[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/haml[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] 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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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=test? ( ruby_targets_ruby23? ( >=dev-ruby/sinatra-1.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sinatra-1.4[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sinatra-1.4[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/haml[ruby_targets_ruby23] dev-ruby/rack-test[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] dev-ruby/timecop[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/haml[ruby_targets_ruby24] dev-ruby/rack-test[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] dev-ruby/timecop[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/haml[ruby_targets_ruby25] dev-ruby/rack-test[ruby_targets_ruby25] dev-ruby/rspec-its[ruby_targets_ruby25] dev-ruby/timecop[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? ( 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=Just the partials helper in a gem
EAPI=6
HOMEPAGE=https://github.com/yb66/Sinatra-Partial
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
KEYWORDS=~amd64
LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/sinatra-1.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sinatra-1.4[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/sinatra-1.4[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/sinatra-1.4[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/sinatra-1.4[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/sinatra-partial-1.0.1.gem
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem b71c34d64e24dcf087f9d6a84bb32dbe ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils a43d6cd7f05b4d013e7e40104ddfd3c7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=86a4eed422574ff5be2d963ed246a30c
+_md5_=f49fe276128835d82d22f94aaa694d58
diff --git a/metadata/md5-cache/dev-ruby/six-0.2.0 b/metadata/md5-cache/dev-ruby/six-0.2.0
index ee4cba328f92..5ec737e453dd 100644
--- a/metadata/md5-cache/dev-ruby/six-0.2.0
+++ b/metadata/md5-cache/dev-ruby/six-0.2.0
@@ -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? ( 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_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[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=An ultra lite authorization library
EAPI=5
HOMEPAGE=https://github.com/randx/six
-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
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=https://github.com/randx/six/archive/v0.2.0.tar.gz -> six-0.2.0.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem b71c34d64e24dcf087f9d6a84bb32dbe ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils a43d6cd7f05b4d013e7e40104ddfd3c7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=f199a473ad6a42f26fb56cad60595be6
+_md5_=2b93d88c6922f052285fd6da44ee96af
diff --git a/metadata/md5-cache/dev-ruby/stamp-0.6.0 b/metadata/md5-cache/dev-ruby/stamp-0.6.0
index 1d2c6b692824..45ec3f79a490 100644
--- a/metadata/md5-cache/dev-ruby/stamp-0.6.0
+++ b/metadata/md5-cache/dev-ruby/stamp-0.6.0
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[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? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/redcarpet[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/redcarpet[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? ( test? ( dev-util/cucumber[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[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=Date and time formatting for humans
EAPI=5
HOMEPAGE=https://github.com/jeremyw/stamp
-IUSE=doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=doc elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
KEYWORDS=~amd64
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=https://github.com/jeremyw/stamp/archive/v0.6.0.tar.gz -> stamp-0.6.0.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem b71c34d64e24dcf087f9d6a84bb32dbe ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils a43d6cd7f05b4d013e7e40104ddfd3c7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=00b450b716722b4135b46d4ffb680e27
+_md5_=0011f30182c648282ea99f0cdeec347b
diff --git a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1 b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
index 7c39f7fe8489..119eb78f656c 100644
--- a/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
+++ b/metadata/md5-cache/dev-ruby/subexec-0.2.3-r1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/shoulda[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/shoulda[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] ) )
+DEPEND=ruby_targets_ruby23? ( test? ( dev-ruby/shoulda[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/shoulda[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/shoulda[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? ( 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=Subexec spawns an external command with a timeout
EAPI=5
HOMEPAGE=https://github.com/nulayer/subexec
-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
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=https://github.com/nulayer/subexec/archive/v0.2.3.tar.gz -> subexec-0.2.3.tgz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem b71c34d64e24dcf087f9d6a84bb32dbe ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils a43d6cd7f05b4d013e7e40104ddfd3c7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=95fc84b44215cc4735d3fbc491754a9a
+_md5_=ba4e8a6195e0fc9573ec2d1cfe1a407b
diff --git a/metadata/md5-cache/dev-ruby/syslogger-1.6.5 b/metadata/md5-cache/dev-ruby/syslogger-1.6.5
index d04d599e5a07..960f07ab66c9 100644
--- a/metadata/md5-cache/dev-ruby/syslogger-1.6.5
+++ b/metadata/md5-cache/dev-ruby/syslogger-1.6.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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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? ( 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=Drop-in replacement for the standard Logger, that logs to the syslog
EAPI=6
HOMEPAGE=https://github.com/crohr/syslogger
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
KEYWORDS=~amd64
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/syslogger-1.6.5.gem
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem b71c34d64e24dcf087f9d6a84bb32dbe ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils a43d6cd7f05b4d013e7e40104ddfd3c7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=4ea872eb2b50cf659f7b402b27932dbc
+_md5_=b9d1094ca59ed74555b889951aa6ef27
diff --git a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4 b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
index d84dfaf96898..8764291d2066 100644
--- a/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
+++ b/metadata/md5-cache/dev-ruby/tidy_table-0.0.5-r4
@@ -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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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: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_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[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=Tool to convert an array of struct into an HTML table
EAPI=5
HOMEPAGE=https://github.com/topfunky/tidy_table
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc 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/tidy_table-0.0.5.gem
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem b71c34d64e24dcf087f9d6a84bb32dbe ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils a43d6cd7f05b4d013e7e40104ddfd3c7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=701e084529932830b372721eeaaef556
+_md5_=94c145040592d8394f0365f448f4f55d
diff --git a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1 b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
index 33dfcf116c26..e6fe176cf54e 100644
--- a/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
+++ b/metadata/md5-cache/dev-ruby/typed-array-0.1.2-r1
@@ -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? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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=Gem provides enforced-type functionality to Arrays
EAPI=5
HOMEPAGE=https://github.com/yaauie/typed-array
-IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc 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/typed-array-0.1.2.gem
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem b71c34d64e24dcf087f9d6a84bb32dbe ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils a43d6cd7f05b4d013e7e40104ddfd3c7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=1a15c2d88e16a1f6f496c763fe6aea35
+_md5_=0086ac0e5a65b433226778ba2551b907
diff --git a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1 b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
index e11bc20f7fb9..5d3894f8b3eb 100644
--- a/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
+++ b/metadata/md5-cache/dev-ruby/ultraviolet-1.0.1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) 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=test? ( ruby_targets_ruby23? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/textpow-1.3.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? ( 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: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_ruby25? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby25] >=dev-ruby/rspec-core-2.14.8-r2[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=A syntax highlighting engine based on Textpow
EAPI=5
HOMEPAGE=https://github.com/grosser/ultraviolet
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/textpow-1.3.0[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/textpow-1.3.0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/textpow-1.3.0[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/textpow-1.3.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/ultraviolet-1.0.1.gem
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 0ee72667014428e01a01df2345244cf3 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem b71c34d64e24dcf087f9d6a84bb32dbe ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils a43d6cd7f05b4d013e7e40104ddfd3c7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=2c393a4bd5984584499c13c05e406f25
+_md5_=ac9348b677907b769b2023886b44316c
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 1e57e7a0a051..d02ca955e4fd 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/ccache-3.3.4 b/metadata/md5-cache/dev-util/ccache-3.3.4
deleted file mode 100644
index 2e45d9052813..000000000000
--- a/metadata/md5-cache/dev-util/ccache-3.3.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm
-DEPEND=app-arch/xz-utils sys-libs/zlib
-DESCRIPTION=fast compiler cache
-EAPI=5
-HOMEPAGE=https://ccache.samba.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=app-arch/xz-utils sys-libs/zlib sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.3.4.tar.xz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0094b2be15078b5bbb9b06c7a3fcade7
diff --git a/metadata/md5-cache/dev-util/ccache-3.4.2 b/metadata/md5-cache/dev-util/ccache-3.4.3
similarity index 88%
rename from metadata/md5-cache/dev-util/ccache-3.4.2
rename to metadata/md5-cache/dev-util/ccache-3.4.3
index 906b0d370ca9..f8149bae1137 100644
--- a/metadata/md5-cache/dev-util/ccache-3.4.2
+++ b/metadata/md5-cache/dev-util/ccache-3.4.3
@@ -7,6 +7,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~am
LICENSE=GPL-3
RDEPEND=app-arch/xz-utils sys-libs/zlib dev-util/shadowman sys-apps/gentoo-functions
SLOT=0
-SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.4.2.tar.xz
+SRC_URI=https://www.samba.org/ftp/ccache/ccache-3.4.3.tar.xz
_eclasses_=readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190
_md5_=160f50b92f9e96cfa46213783012d7fc
diff --git a/metadata/md5-cache/dev-util/gource-0.48 b/metadata/md5-cache/dev-util/gource-0.48
deleted file mode 100644
index 61a9fa5aea3f..000000000000
--- a/metadata/md5-cache/dev-util/gource-0.48
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=dev-libs/boost-1.46:=[threads(+)] >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre:3 dev-libs/tinyxml media-libs/freetype:2 media-libs/mesa virtual/glu:0 virtual/pkgconfig >=media-libs/glm-0.9.3
-DESCRIPTION=A software version control visualization tool
-EAPI=6
-HOMEPAGE=http://gource.io/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/boost-1.46:=[threads(+)] >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre:3 dev-libs/tinyxml media-libs/freetype:2 media-libs/mesa virtual/glu:0 media-fonts/freefont
-SLOT=0
-SRC_URI=https://github.com/acaudwell/Gource/releases/download/gource-0.48/gource-0.48.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b045cfbfca6a6a427b7719cb9fb29d9
diff --git a/metadata/md5-cache/dev-util/gource-0.49 b/metadata/md5-cache/dev-util/gource-0.49
index f852fe0f5266..7636f578842a 100644
--- a/metadata/md5-cache/dev-util/gource-0.49
+++ b/metadata/md5-cache/dev-util/gource-0.49
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/boost-1.46:=[threads(+)] >=media-libs/glew-1.5:0= >=media-libs
DESCRIPTION=A software version control visualization tool
EAPI=6
HOMEPAGE=http://gource.io/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=>=dev-libs/boost-1.46:=[threads(+)] >=media-libs/glew-1.5:0= >=media-libs/libpng-1.2:0= media-libs/libsdl2[video,opengl,X] media-libs/sdl2-image[jpeg,png] dev-libs/libpcre:3 dev-libs/tinyxml media-libs/freetype:2 media-libs/mesa virtual/glu:0 media-fonts/freefont
SLOT=0
SRC_URI=https://github.com/acaudwell/Gource/releases/download/gource-0.49/gource-0.49.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=85c1efa3f4c79c41f6cb390f9b9bce43
+_md5_=8b045cfbfca6a6a427b7719cb9fb29d9
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.2.4 b/metadata/md5-cache/dev-util/kdevelop-5.2.4
index c62b80aceaeb..08da430d129f 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.2.4
+++ b/metadata/md5-cache/dev-util/kdevelop-5.2.4
@@ -1,15 +1,14 @@
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/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-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/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-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 >=kde-frameworks/sonnet-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=kde-apps/libkomparediff2-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qthelp-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.12.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.46.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) welcomepage? ( >=dev-qt/qtdeclarative-5.9.4:5[widgets] ) dev-libs/boost >=dev-qt/qtconcurrent-5.9.4:5 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 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-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/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-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 >=kde-frameworks/sonnet-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=kde-apps/libkomparediff2-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qthelp-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.12.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.46.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) dev-libs/boost >=dev-qt/qtconcurrent-5.9.4:5 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 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=Integrated Development Environment, supporting KF5/Qt, C/C++ and much more
EAPI=6
HOMEPAGE=https://www.kdevelop.org/
-IUSE=cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage test debug +handbook test
+IUSE=cvs +gdbui hex +plasma +qmake reviewboard subversion webkit test debug +handbook test
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-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/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-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 >=kde-frameworks/sonnet-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=kde-apps/libkomparediff2-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qthelp-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.12.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.46.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) welcomepage? ( >=dev-qt/qtdeclarative-5.9.4:5[widgets] ) >=kde-apps/kapptemplate-17.12.3:5 >=kde-apps/kio-extras-17.12.3:5 dev-util/ninja >=sys-devel/gdb-7.0[python] cvs? ( dev-vcs/cvs ) reviewboard? ( >=kde-apps/ktp-accounts-kcm-17.12.3:5 ) !dev-util/kdevelop:4 !dev-util/kdevelop-clang !dev-util/kdevelop-cppcheck !dev-util/kdevelop-qmake !dev-util/kdevelop-qmljs !dev-util/kdevplatform >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=test? ( welcomepage )
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-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/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-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 >=kde-frameworks/sonnet-5.46.0:5 >=kde-frameworks/threadweaver-5.46.0:5 >=kde-apps/libkomparediff2-17.12.3:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5[widgets] >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qthelp-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 dev-libs/grantlee:5 >=sys-devel/clang-3.8.0:= x11-misc/shared-mime-info gdbui? ( >=kde-plasma/libksysguard-5.12.5:5 ) hex? ( app-editors/okteta:5 ) plasma? ( >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 ) qmake? ( dev-util/kdevelop-pg-qt:5 ) reviewboard? ( >=kde-frameworks/purpose-5.46.0:5 ) subversion? ( dev-libs/apr:1 dev-libs/apr-util:1 dev-vcs/subversion ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) !webkit? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) >=kde-apps/kapptemplate-17.12.3:5 >=kde-apps/kio-extras-17.12.3:5 dev-util/ninja >=sys-devel/gdb-7.0[python] cvs? ( dev-vcs/cvs ) reviewboard? ( >=kde-apps/ktp-accounts-kcm-17.12.3:5 ) !dev-util/kdevelop:4 !dev-util/kdevelop-clang !dev-util/kdevelop-cppcheck !dev-util/kdevelop-qmake !dev-util/kdevelop-qmljs !dev-util/kdevplatform >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
RESTRICT=test
SLOT=5
SRC_URI=mirror://kde/stable/kdevelop/5.2.4/src/kdevelop-5.2.4.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=de494b3d19502640d0b5d7bd394219c5
+_md5_=dfbb42743e658b489239dc4c8c2be985
diff --git a/metadata/md5-cache/dev-util/molecule-plugins-1.0.2-r1 b/metadata/md5-cache/dev-util/molecule-plugins-1.0.3
similarity index 92%
rename from metadata/md5-cache/dev-util/molecule-plugins-1.0.2-r1
rename to metadata/md5-cache/dev-util/molecule-plugins-1.0.3
index 78a002ee9aae..fbdeb3710e9e 100644
--- a/metadata/md5-cache/dev-util/molecule-plugins-1.0.2-r1
+++ b/metadata/md5-cache/dev-util/molecule-plugins-1.0.3
@@ -9,6 +9,6 @@ LICENSE=GPL-2
RDEPEND=>=dev-util/molecule-core-1.0.1 !=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://sabayon/dev-util/molecule-plugins-1.0.2.tar.bz2
+SRC_URI=mirror://sabayon/dev-util/molecule-plugins-1.0.3.tar.bz2
_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=9ec622592e812de7b8cecded9efc6325
+_md5_=66039c6496b4f847fe0865d2dde2e043
diff --git a/metadata/md5-cache/dev-util/perf-4.14.33 b/metadata/md5-cache/dev-util/perf-4.14.33
index cfb0838d7199..b37c0155273f 100644
--- a/metadata/md5-cache/dev-util/perf-4.14.33
+++ b/metadata/md5-cache/dev-util/perf-4.14.33
@@ -4,11 +4,11 @@ DESCRIPTION=Userland tools for Linux Performance Counters
EAPI=6
HOMEPAGE=https://perf.wiki.kernel.org/
IUSE=audit debug +demangle +doc gtk numa perl python slang unwind python_targets_python2_7 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=audit? ( sys-process/audit ) demangle? ( sys-libs/binutils-libs:= ) gtk? ( x11-libs/gtk+:2 ) numa? ( sys-process/numactl ) perl? ( dev-lang/perl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_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_python3_7(-),python_single_target_python2_7(+)] ) slang? ( dev-libs/newt ) unwind? ( sys-libs/libunwind ) dev-libs/elfutils
REQUIRED_USE=python? ( python_targets_python2_7 )
SLOT=0
SRC_URI=mirror://kernel/linux/kernel/v4.x/patch-4.14.33.xz mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 linux-info 915cae3d7d636732918d18827fb1c226 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=780b21326c5264724673cc55b8d388e6
+_md5_=eaeb52672805c1cd580b7065ed1d3fb3
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index a0a0a419c90f..ed8a23e1361a 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.17.1-r1 b/metadata/md5-cache/dev-vcs/git-2.19.0_rc1
similarity index 86%
rename from metadata/md5-cache/dev-vcs/git-2.17.1-r1
rename to metadata/md5-cache/dev-vcs/git-2.19.0_rc1
index 6af8f02a903b..5a33afb85d6e 100644
--- a/metadata/md5-cache/dev-vcs/git-2.17.1-r1
+++ b/metadata/md5-cache/dev-vcs/git-2.19.0_rc1
@@ -4,11 +4,10 @@ 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 ~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=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_python3_7(-),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/git-2.17.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.17.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.17.1.tar.xz )
+SRC_URI=mirror://kernel/software/scm/git/testing/git-2.19.0.rc1.tar.xz mirror://kernel/software/scm/git/testing/git-manpages-2.19.0.rc1.tar.xz doc? ( mirror://kernel/software/scm/git/testing/git-htmldocs-2.19.0.rc1.tar.xz )
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module ee5593d6e2d067fafac171106655b5ce preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9274cc658bfc835cf6cfb74c3dee7d78
+_md5_=2a1709c59f4272ce5798262006860a7e
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 69cf53146775..575159dfa041 100644
Binary files a/metadata/md5-cache/games-emulation/Manifest.gz and b/metadata/md5-cache/games-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/games-emulation/dolphin-9999 b/metadata/md5-cache/games-emulation/dolphin-9999
index 1ec65082c072..4a3b8040b9ce 100644
--- a/metadata/md5-cache/games-emulation/dolphin-9999
+++ b/metadata/md5-cache/games-emulation/dolphin-9999
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1:= dev-libs/hidapi:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) systemd? ( sys-apps/systemd:0= ) upnp? ( >=net-libs/miniupnpc-1.7 ) app-arch/zip dev-util/vulkan-headers media-libs/freetype sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/hidapi:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml net-libs/enet:1.3 net-libs/mbedtls net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) app-arch/zip dev-util/vulkan-headers media-libs/freetype sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Gamecube and Wii game emulator
EAPI=6
HOMEPAGE=https://www.dolphin-emu.org/
-IUSE=alsa ao bluetooth discord-presence doc egl +evdev ffmpeg libav log lto openal portaudio profile pulseaudio +qt5 sdl systemd upnp
+IUSE=alsa bluetooth discord-presence doc egl +evdev ffmpeg libav log lto profile pulseaudio +qt5 sdl systemd upnp
LICENSE=GPL-2
-RDEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1:= dev-libs/hidapi:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) systemd? ( sys-apps/systemd:0= ) upnp? ( >=net-libs/miniupnpc-1.7 )
+RDEPEND=dev-libs/hidapi:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml net-libs/enet:1.3 net-libs/mbedtls net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc )
SLOT=0
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 918d6a744039c29af2cadc7317459765 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pax-utils e85f015e815dd463b0c206d781ef45a5 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=e6a41e312442621c74d06e87775378df
+_md5_=8b625da38d9a4a604b871844d3c38692
diff --git a/metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r1 b/metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r1
new file mode 100644
index 000000000000..4694da684292
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/jrommanager-1.8_p27-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip
+DESCRIPTION=A Mame and Retrogaming Rom Manager, Java alternative to ClrMamePro
+EAPI=7
+HOMEPAGE=https://github.com/optyfr/JRomManager
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 GPL-2-with-classpath-exception BSD-2 MIT Apache-2.0 LGPL-2.1 unRAR
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=https://github.com/optyfr/JRomManager/releases/download/1.8b27/JRomManager-1.8b27.zip
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d
+_md5_=b49ada96d49f17d7572aeda3635c0d60
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index b7f3dcf11f86..69cc7cdb2406 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/bluedevil-5.13.4 b/metadata/md5-cache/kde-plasma/bluedevil-5.13.5
similarity index 95%
rename from metadata/md5-cache/kde-plasma/bluedevil-5.13.4
rename to metadata/md5-cache/kde-plasma/bluedevil-5.13.5
index df4b78cef811..a97f2ea7b138 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.13.4
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.13.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://cgit.kde.org/bluedevil.git
IUSE=debug
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-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/kded-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/kio-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/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.13.4:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/bluez-qt-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/kded-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/kio-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/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.13.5:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/bluedevil-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/bluedevil-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=327fe4aaf6cfe0f35575ffa20c84c8f0
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.13.4 b/metadata/md5-cache/kde-plasma/breeze-5.13.5
similarity index 92%
rename from metadata/md5-cache/kde-plasma/breeze-5.13.4
rename to metadata/md5-cache/kde-plasma/breeze-5.13.5
index e234b8754471..8a293a39ff03 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.13.4
+++ b/metadata/md5-cache/kde-plasma/breeze-5.13.5
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.46.0: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 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kpackage-5.46.0: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 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=Breeze visual style for the Plasma desktop
EAPI=6
HOMEPAGE=https://cgit.kde.org/breeze.git
IUSE=wayland X debug
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=GPL-2
-PDEPEND=>=kde-frameworks/breeze-icons-5.46.0:5 >=kde-plasma/kde-cli-tools-5.13.4:5
-RDEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+PDEPEND=>=kde-frameworks/breeze-icons-5.46.0:5 >=kde-plasma/kde-cli-tools-5.13.5:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/breeze-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/breeze-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=76478bfdc7579004b37923992e0c9bd3
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.13.4 b/metadata/md5-cache/kde-plasma/breeze-grub-5.13.5
similarity index 95%
rename from metadata/md5-cache/kde-plasma/breeze-grub-5.13.4
rename to metadata/md5-cache/kde-plasma/breeze-grub-5.13.5
index e8c98c641ac9..6f275303fae7 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.13.4
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.13.5
@@ -6,6 +6,6 @@ HOMEPAGE=https://www.kde.org/
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-3+
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/breeze-grub-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/breeze-grub-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=6fdf18bfe569ca5ec4b257cbf248a838
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.4 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.5
similarity index 96%
rename from metadata/md5-cache/kde-plasma/breeze-gtk-5.13.4
rename to metadata/md5-cache/kde-plasma/breeze-gtk-5.13.5
index cf3c3cffe2e2..a76618ace895 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.4
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
LICENSE=LGPL-2.1+
RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/breeze-gtk-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/breeze-gtk-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=aa4e75ba1788ac8e8c89c738a570dca9
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.4 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.5
similarity index 95%
rename from metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.4
rename to metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.5
index 681dcf39c89b..e7afb1c418fe 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.4
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2+ GPL-3+
RDEPEND=sys-boot/plymouth
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/breeze-plymouth-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/breeze-plymouth-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=71cd4b752982067f0bf4291ced279e2e
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.13.4 b/metadata/md5-cache/kde-plasma/drkonqi-5.13.5
similarity index 97%
rename from metadata/md5-cache/kde-plasma/drkonqi-5.13.4
rename to metadata/md5-cache/kde-plasma/drkonqi-5.13.5
index 050ec880435d..489c34438c64 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.13.4
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=GPL-2
RDEPEND=>=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/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlrpcclient-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 X? ( >=dev-qt/qtx11extras-5.11.1:5 ) !kde-apps/drkonqi:4 !=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/drkonqi-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/drkonqi-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=9e2c7f630747e5e7d1a55a324f24fe66
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.4 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.5
similarity index 97%
rename from metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.4
rename to metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.5
index a658cc312b49..4c3843f0e1b6 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.4
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=|| ( GPL-2 GPL-3 )
RDEPEND=>=kde-frameworks/kconfig-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/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwidgets-5.11.1:5 !=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/kactivitymanagerd-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/kactivitymanagerd-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=2c84087786f761af2f2f91291fef6658
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.4 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.5
similarity index 94%
rename from metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.4
rename to metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.5
index 459ffa3b44c0..9a1558161824 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.4
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.13.5
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcmutils-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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kdesu? ( >=kde-frameworks/kdesu-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 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 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcmutils-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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kdesu? ( >=kde-frameworks/kdesu-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 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 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=Tools based on KDE Frameworks 5 to better interact with the system
EAPI=6
HOMEPAGE=https://cgit.kde.org/kde-cli-tools.git
IUSE=+kdesu X test debug +handbook test
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcmutils-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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kdesu? ( >=kde-frameworks/kdesu-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcmutils-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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/plasma-workspace-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 kdesu? ( >=kde-frameworks/kdesu-5.46.0:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
RESTRICT=test
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/kde-cli-tools-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/kde-cli-tools-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=7766ef7426560bed48a8528cda42b03a
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.4 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.5
similarity index 95%
rename from metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.4
rename to metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.5
index f9f96bccdbed..ea00491cd971 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.4
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.13.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://cgit.kde.org/kde-gtk-config.git
IUSE=test debug test
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-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/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.13.4:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-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/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 dev-libs/glib:2 gnome-base/gsettings-desktop-schemas x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.13.5:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/kde-gtk-config-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/kde-gtk-config-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=4615265b593490c44a10248e0671c5f0
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.13.4 b/metadata/md5-cache/kde-plasma/kdecoration-5.13.5
similarity index 96%
rename from metadata/md5-cache/kde-plasma/kdecoration-5.13.4
rename to metadata/md5-cache/kde-plasma/kdecoration-5.13.5
index b918fb5809f9..6d5192c3531e 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.13.4
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=|| ( LGPL-2.1 LGPL-3 )
RDEPEND=>=kde-frameworks/ki18n-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/kdecoration-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/kdecoration-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=1f930e6e4a11e943d9c208acbe1d17d0
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.4 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.5
similarity index 96%
rename from metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.4
rename to metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.5
index 6dc7d9ae4d9d..24fe1ceaedcc 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.4
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.13.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
IUSE=share webengine debug
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kholidays-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/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kunitconversion-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 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 share? ( >=kde-frameworks/purpose-5.46.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcmutils-5.46.0:5 >=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kholidays-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/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kross-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kunitconversion-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 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 share? ( >=kde-frameworks/purpose-5.46.0:5 ) webengine? ( >=dev-qt/qtwebengine-5.11.1:5 ) >=kde-plasma/plasma-workspace-5.13.5:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtquickcontrols2-5.11.1:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/kdeplasma-addons-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/kdeplasma-addons-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=643b80ca8bc9361c1adeeb577c8559d1
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.13.4 b/metadata/md5-cache/kde-plasma/kgamma-5.13.5
similarity index 97%
rename from metadata/md5-cache/kde-plasma/kgamma-5.13.4
rename to metadata/md5-cache/kde-plasma/kgamma-5.13.5
index cf5bbeba72ce..65fee6ca178e 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.13.4
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~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/ki18n-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/kgamma5-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/kgamma5-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=71795ef780600c9b60f785d8c08261e7
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.13.4 b/metadata/md5-cache/kde-plasma/khotkeys-5.13.5
similarity index 92%
rename from metadata/md5-cache/kde-plasma/khotkeys-5.13.4
rename to metadata/md5-cache/kde-plasma/khotkeys-5.13.5
index 89358ef6e7f3..429ce2d5e9f2 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.13.4
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.13.5
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5[X] >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-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 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst 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.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5[X] >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-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 >=kde-plasma/plasma-workspace-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto x11-libs/libxcb x11-libs/libXtst 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.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=KDE Plasma workspace hotkey module
EAPI=6
HOMEPAGE=https://www.kde.org/
IUSE=debug +handbook
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
-RDEPEND=>=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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5[X] >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-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 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.46.0:5 >=kde-plasma/kde-cli-tools-5.13.4:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5[X] >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kservice-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 >=kde-plasma/plasma-workspace-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.46.0:5 >=kde-plasma/kde-cli-tools-5.13.5:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/khotkeys-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/khotkeys-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=6904c3c4af1d547e44c11ad829adad24
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.13.4 b/metadata/md5-cache/kde-plasma/kinfocenter-5.13.5
similarity index 95%
rename from metadata/md5-cache/kde-plasma/kinfocenter-5.13.4
rename to metadata/md5-cache/kde-plasma/kinfocenter-5.13.5
index 8e2aa1f25d28..c8c3d6a977e6 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.13.4
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.13.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/applications/system/kinfocenter/
IUSE=gles2 ieee1394 +opengl +pci wayland debug +handbook
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-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/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.46.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.13.4:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-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/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.11.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.46.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.13.5:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/kinfocenter-5.13.4.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
+SRC_URI=mirror://kde/stable/plasma/5.13.5/kinfocenter-5.13.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=d4c09e9e77d487bf576a2b29a2adabd7
+_md5_=8c8ba906da974d727243c54ca4ffe47a
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.13.4 b/metadata/md5-cache/kde-plasma/kmenuedit-5.13.5
similarity index 93%
rename from metadata/md5-cache/kde-plasma/kmenuedit-5.13.4
rename to metadata/md5-cache/kde-plasma/kmenuedit-5.13.5
index 981de8c8c84e..fb9030d6323b 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.13.4
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.13.5
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-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/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.13.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.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-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/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.13.5: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.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=KDE Plasma menu editor
EAPI=6
HOMEPAGE=https://cgit.kde.org/kmenuedit.git
IUSE=+hotkeys debug +handbook
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
-RDEPEND=>=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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-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/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.13.4:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-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/kservice-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.13.5:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/kmenuedit-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/kmenuedit-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=79dd695df3d092cb71cb68fa0a40922e
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.13.4 b/metadata/md5-cache/kde-plasma/kscreen-5.13.5
similarity index 91%
rename from metadata/md5-cache/kde-plasma/kscreen-5.13.4
rename to metadata/md5-cache/kde-plasma/kscreen-5.13.5
index 1bd8ec7b3cdd..f82ac067f19b 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.13.4
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.13.5
@@ -1,14 +1,14 @@
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/kdeclarative-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/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/libkscreen-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1: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 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-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/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/libkscreen-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1: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 test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=KDE Plasma screen management
EAPI=6
HOMEPAGE=https://cgit.kde.org/kscreen.git
IUSE=debug test
KEYWORDS=~amd64 ~arm ~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/kdeclarative-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/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/libkscreen-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.13.4:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-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/kiconthemes-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/libkscreen-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-plasma/kde-cli-tools-5.13.5:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
RESTRICT=test
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/kscreen-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/kscreen-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=115ed4bc0c1b07387834e50e1c40a24a
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.4 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.5
similarity index 97%
rename from metadata/md5-cache/kde-plasma/kscreenlocker-5.13.4
rename to metadata/md5-cache/kde-plasma/kscreenlocker-5.13.5
index b41edcd40ed8..58ac75c34678 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.4
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.13.5
@@ -6,11 +6,11 @@ HOMEPAGE=https://www.kde.org/
IUSE=+pam seccomp test debug test
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.13.4:5
+PDEPEND=>=kde-plasma/kde-cli-tools-5.13.5:5
RDEPEND=>=kde-frameworks/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwayland-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.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) !=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
REQUIRED_USE=seccomp? ( pam )
RESTRICT=test
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/kscreenlocker-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/kscreenlocker-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=88661cc25861daf2570bc8defeeb0fb8
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.4 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.5
similarity index 96%
rename from metadata/md5-cache/kde-plasma/ksshaskpass-5.13.4
rename to metadata/md5-cache/kde-plasma/ksshaskpass-5.13.5
index 4494c3dffedc..b91636aed722 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.4
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/ksshaskpass-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/ksshaskpass-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=49a7fbc618003d798a48ed7a5583f88a
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.13.4 b/metadata/md5-cache/kde-plasma/ksysguard-5.13.5
similarity index 93%
rename from metadata/md5-cache/kde-plasma/ksysguard-5.13.4
rename to metadata/md5-cache/kde-plasma/ksysguard-5.13.5
index 39266ce87d4c..d280adfeca57 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.13.4
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.13.5
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-plasma/libksysguard-5.13.4:5[-minimal(-)] >=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/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knewstuff-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 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors ) 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.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-plasma/libksysguard-5.13.5:5[-minimal(-)] >=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/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knewstuff-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 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors ) 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.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=Network-enabled task manager and system monitor
EAPI=6
HOMEPAGE=https://www.kde.org/
IUSE=lm_sensors debug +handbook
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=GPL-2+
-RDEPEND=>=kde-plasma/libksysguard-5.13.4:5[-minimal(-)] >=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/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knewstuff-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 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-plasma/libksysguard-5.13.5:5[-minimal(-)] >=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/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/knewstuff-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 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/ksysguard-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/ksysguard-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=422e45360735caf62d25b7cc991f0c4b
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.4 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.5
similarity index 96%
rename from metadata/md5-cache/kde-plasma/kwallet-pam-5.13.4
rename to metadata/md5-cache/kde-plasma/kwallet-pam-5.13.5
index 7c19e87099f6..c3d32f614fc5 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.4
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
LICENSE=LGPL-2.1
RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/kwallet-pam-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/kwallet-pam-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=08268d68786c887fb10c1371dbf55a14
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.4 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.5
similarity index 96%
rename from metadata/md5-cache/kde-plasma/kwayland-integration-5.13.4
rename to metadata/md5-cache/kde-plasma/kwayland-integration-5.13.5
index c7c5dfa736fc..4ec98380544d 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.4
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
LICENSE=LGPL-2.1
RDEPEND=>=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/kwayland-integration-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/kwayland-integration-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=b16aa1be100a377eab4994c0259dfc82
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.13.4 b/metadata/md5-cache/kde-plasma/kwin-5.13.5
similarity index 86%
rename from metadata/md5-cache/kde-plasma/kwin-5.13.4
rename to metadata/md5-cache/kde-plasma/kwin-5.13.5
index 4184753d3d7a..731ea49ce641 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.13.4
+++ b/metadata/md5-cache/kde-plasma/kwin-5.13.5
@@ -1,15 +1,15 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-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/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5[X] >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/breeze-5.13.4:5 >=kde-plasma/kdecoration-5.13.4:5 >=kde-plasma/kscreenlocker-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[gles2=] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsensors-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=dev-qt/designer-5.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 x11-base/xorg-proto 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 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-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/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5[X] >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/breeze-5.13.5:5 >=kde-plasma/kdecoration-5.13.5:5 >=kde-plasma/kscreenlocker-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[gles2=] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsensors-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=dev-qt/designer-5.11.1:5 >=dev-qt/qtconcurrent-5.11.1:5 x11-base/xorg-proto 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 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=KDE window manager
EAPI=6
HOMEPAGE=https://www.kde.org/
IUSE=caps gles2 multimedia test debug +handbook test
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=GPL-2+
-PDEPEND=>=kde-plasma/kde-cli-tools-5.13.4:5
-RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-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/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5[X] >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/breeze-5.13.4:5 >=kde-plasma/kdecoration-5.13.4:5 >=kde-plasma/kscreenlocker-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[gles2=] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsensors-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=dev-qt/qtvirtualkeyboard-5.11.1:5 multimedia? ( >=dev-qt/qtmultimedia-5.11.1:5[gstreamer,qml] ) !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+PDEPEND=>=kde-plasma/kde-cli-tools-5.13.5:5
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-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/kinit-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5[X] >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-plasma/breeze-5.13.5:5 >=kde-plasma/kdecoration-5.13.5:5 >=kde-plasma/kscreenlocker-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[gles2=] >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsensors-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-libs/libinput-1.9 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm caps? ( sys-libs/libcap ) >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtvirtualkeyboard-5.11.1:5 multimedia? ( >=dev-qt/qtmultimedia-5.11.1:5[gstreamer,qml] ) !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
RESTRICT=test
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/kwin-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/kwin-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=2e2dc432b48a6a9045dbd4e950856d0c
+_md5_=05365068d1c0e091e2e54b097683f007
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.13.4 b/metadata/md5-cache/kde-plasma/kwrited-5.13.5
similarity index 96%
rename from metadata/md5-cache/kde-plasma/kwrited-5.13.4
rename to metadata/md5-cache/kde-plasma/kwrited-5.13.5
index 6e6eeec67458..1b1b115919d0 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.13.4
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kpty-5.46.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/kwrited-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/kwrited-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=941469a5fbde947061e37aea560400cf
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.13.4 b/metadata/md5-cache/kde-plasma/libkscreen-5.13.5
similarity index 96%
rename from metadata/md5-cache/kde-plasma/libkscreen-5.13.4
rename to metadata/md5-cache/kde-plasma/libkscreen-5.13.5
index c32c99abd46f..b5f73cec0eb3 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.13.4
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.13.5
@@ -9,6 +9,6 @@ LICENSE=GPL-2
RDEPEND=>=kde-frameworks/kwayland-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
RESTRICT=test
SLOT=5/7
-SRC_URI=mirror://kde/stable/plasma/5.13.4/libkscreen-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/libkscreen-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=0cbd0b147bc072fa9c56d5e7406a806d
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.13.4 b/metadata/md5-cache/kde-plasma/libksysguard-5.13.5
similarity index 97%
rename from metadata/md5-cache/kde-plasma/libksysguard-5.13.4
rename to metadata/md5-cache/kde-plasma/libksysguard-5.13.5
index 9b3aee6fc52f..1f88c79fa6e7 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.13.4
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=LGPL-2+
RDEPEND=>=kde-frameworks/kauth-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/ki18n-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.9.1:5 ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/libksysguard-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/libksysguard-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=d1df790fea6be84d5725f1b6abfa61d8
diff --git a/metadata/md5-cache/kde-plasma/milou-5.13.4 b/metadata/md5-cache/kde-plasma/milou-5.13.5
similarity index 97%
rename from metadata/md5-cache/kde-plasma/milou-5.13.4
rename to metadata/md5-cache/kde-plasma/milou-5.13.5
index 5ade8ccba740..15d68791a40d 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.13.4
+++ b/metadata/md5-cache/kde-plasma/milou-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=GPL-2 LGPL-2.1
RDEPEND=>=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/milou-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/milou-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=71cb10636550c1dd4c981ad9f34d9512
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.13.4 b/metadata/md5-cache/kde-plasma/oxygen-5.13.5
similarity index 91%
rename from metadata/md5-cache/kde-plasma/oxygen-5.13.4
rename to metadata/md5-cache/kde-plasma/oxygen-5.13.5
index adbd7f28ebd1..f9da6e815e68 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.13.4
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.13.5
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) >=kde-frameworks/kservice-5.46.0: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 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) >=kde-frameworks/kservice-5.46.0: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 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=Oxygen visual style for the Plasma desktop
EAPI=6
HOMEPAGE=https://cgit.kde.org/oxygen.git
IUSE=wayland debug
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) >=kde-plasma/kde-cli-tools-5.13.4:5 !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.46.0:5 >=kde-frameworks/kcmutils-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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=kde-plasma/kdecoration-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb wayland? ( >=kde-frameworks/kwayland-5.46.0:5 ) >=kde-plasma/kde-cli-tools-5.13.5:5 !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/oxygen-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/oxygen-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=0c09a9de33a307799ada206672743127
diff --git a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.5
similarity index 96%
rename from metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.4
rename to metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.5
index 60e93ff00318..aa88b436c6f3 100644
--- a/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.4
+++ b/metadata/md5-cache/kde-plasma/plasma-browser-integration-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-3+
RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-browser-integration-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/plasma-browser-integration-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=5ba4283e4817210af2858a2ff7992a5c
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.5
similarity index 92%
rename from metadata/md5-cache/kde-plasma/plasma-desktop-5.13.4
rename to metadata/md5-cache/kde-plasma/plasma-desktop-5.13.5
index c60cc8e247c9..b68c7a784d51 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.4
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.13.5
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.46.0:5 >=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/kglobalaccel-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/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpeople-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-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/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-plasma/kwin-5.13.4:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.11.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev x11-drivers/xf86-input-libinput ) 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 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/attica-5.46.0:5 >=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/kglobalaccel-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/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpeople-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-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/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-plasma/kwin-5.13.5:5 >=kde-plasma/plasma-workspace-5.13.5:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.11.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) dev-libs/boost x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) mouse? ( x11-drivers/xf86-input-evdev x11-drivers/xf86-input-libinput ) 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 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=KDE Plasma desktop
EAPI=6
HOMEPAGE=https://www.kde.org/
IUSE=appstream +fontconfig ibus +mouse pulseaudio scim +semantic-desktop touchpad test debug +handbook test
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-5.46.0:5 >=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/kglobalaccel-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/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpeople-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-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/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-plasma/kwin-5.13.4:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.11.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.46.0:5 >=kde-plasma/breeze-5.13.4:5 >=kde-plasma/kde-cli-tools-5.13.4:5 >=kde-plasma/oxygen-5.13.4:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap pulseaudio? ( >=kde-plasma/plasma-pa-5.13.4:5 ) !kde-apps/kcontrol !=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/attica-5.46.0:5 >=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-5.46.0:5 >=kde-frameworks/kcmutils-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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kemoticons-5.46.0:5 >=kde-frameworks/kglobalaccel-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/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kpeople-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-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/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-frameworks/sonnet-5.46.0:5 >=kde-plasma/kwin-5.13.5:5 >=kde-plasma/plasma-workspace-5.13.5:5 >=dev-qt/qtconcurrent-5.11.1:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtsvg-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.11.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.46.0:5 >=kde-plasma/breeze-5.13.5:5 >=kde-plasma/kde-cli-tools-5.13.5:5 >=kde-plasma/oxygen-5.13.5:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap pulseaudio? ( >=kde-plasma/plasma-pa-5.13.5:5 ) !kde-apps/kcontrol !=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-desktop-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/plasma-desktop-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=aee173a9ebd60518375c8bab2a2ca4e8
+_md5_=ca83588feaee285dc64bbf6433d47b5b
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-integration-5.13.5
similarity index 93%
rename from metadata/md5-cache/kde-plasma/plasma-integration-5.13.4
rename to metadata/md5-cache/kde-plasma/plasma-integration-5.13.5
index 8162ffdfbdd6..8e69015ff1d6 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.13.4
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.13.5
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwayland-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-plasma/breeze-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libXcursor x11-libs/libxcb 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 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwayland-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-plasma/breeze-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libXcursor x11-libs/libxcb 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 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=Qt Platform Theme integration plugins for the Plasma workspaces
EAPI=6
HOMEPAGE=https://www.kde.org/
IUSE=test debug
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=LGPL-2+
-RDEPEND=>=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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwayland-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-plasma/breeze-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kwayland-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-plasma/breeze-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
RESTRICT=test
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-integration-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/plasma-integration-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=49567c5d3af294f6eda67b114d1c7794
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-meta-5.13.4
deleted file mode 100644
index 093c76504f1b..000000000000
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.13.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Merge this to pull in all Plasma 5 packages
-EAPI=6
-HOMEPAGE=https://www.kde.org/workspaces/plasmadesktop/
-IUSE=bluetooth +browser-integration crypt +display-manager grub gtk +handbook legacy-systray networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=metapackage
-RDEPEND=>=kde-plasma/breeze-5.13.4:5 >=kde-plasma/drkonqi-5.13.4:5 >=kde-plasma/kactivitymanagerd-5.13.4:5 >=kde-plasma/kde-cli-tools-5.13.4:5 >=kde-plasma/kdecoration-5.13.4:5 >=kde-plasma/kdeplasma-addons-5.13.4:5 >=kde-plasma/kgamma-5.13.4:5 >=kde-plasma/khotkeys-5.13.4:5 >=kde-plasma/kinfocenter-5.13.4:5 >=kde-plasma/kmenuedit-5.13.4:5 >=kde-plasma/kscreen-5.13.4:5 >=kde-plasma/kscreenlocker-5.13.4:5 >=kde-plasma/ksshaskpass-5.13.4:5 >=kde-plasma/ksysguard-5.13.4:5 >=kde-plasma/kwayland-integration-5.13.4:5 >=kde-plasma/kwin-5.13.4:5 >=kde-plasma/kwrited-5.13.4:5 >=kde-plasma/libkscreen-5.13.4:5 >=kde-plasma/libksysguard-5.13.4:5 >=kde-plasma/milou-5.13.4:5 >=kde-plasma/oxygen-5.13.4:5 >=kde-plasma/plasma-desktop-5.13.4:5 >=kde-plasma/plasma-integration-5.13.4:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=kde-plasma/polkit-kde-agent-5.13.4:5 >=kde-plasma/powerdevil-5.13.4:5 >=kde-plasma/systemsettings-5.13.4:5 >=kde-plasma/user-manager-5.13.4:5 bluetooth? ( >=kde-plasma/bluedevil-5.13.4:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.13.4:5 ) crypt? ( >=kde-plasma/plasma-vault-5.13.4:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.13.4:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.13.4:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.13.4:5 >=kde-plasma/kde-gtk-config-5.13.4:5 legacy-systray? ( dev-libs/libappindicator:3 dev-libs/libappindicator:2 ) ) handbook? ( >=kde-apps/khelpcenter-17.12.3:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.13.4:5 ) pam? ( >=kde-plasma/kwallet-pam-5.13.4:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.13.4:5 >=kde-plasma/plymouth-kcm-5.13.4:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.13.4:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.13.4:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.13.4:5 )
-REQUIRED_USE=legacy-systray? ( gtk )
-SLOT=5
-_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=29deb41a52a2338f6aa32aa945599041
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.13.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.13.5
new file mode 100644
index 000000000000..4aa4cca00b1e
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.13.5
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DESCRIPTION=Merge this to pull in all Plasma 5 packages
+EAPI=6
+HOMEPAGE=https://www.kde.org/workspaces/plasmadesktop/
+IUSE=bluetooth +browser-integration crypt +display-manager grub gtk +handbook legacy-systray networkmanager pam plymouth pulseaudio +sddm sdk +wallpapers
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=metapackage
+RDEPEND=>=kde-plasma/breeze-5.13.5:5 >=kde-plasma/drkonqi-5.13.5:5 >=kde-plasma/kactivitymanagerd-5.13.5:5 >=kde-plasma/kde-cli-tools-5.13.5:5 >=kde-plasma/kdecoration-5.13.5:5 >=kde-plasma/kdeplasma-addons-5.13.5:5 >=kde-plasma/kgamma-5.13.5:5 >=kde-plasma/khotkeys-5.13.5:5 >=kde-plasma/kinfocenter-5.13.5:5 >=kde-plasma/kmenuedit-5.13.5:5 >=kde-plasma/kscreen-5.13.5:5 >=kde-plasma/kscreenlocker-5.13.5:5 >=kde-plasma/ksshaskpass-5.13.5:5 >=kde-plasma/ksysguard-5.13.5:5 >=kde-plasma/kwayland-integration-5.13.5:5 >=kde-plasma/kwin-5.13.5:5 >=kde-plasma/kwrited-5.13.5:5 >=kde-plasma/libkscreen-5.13.5:5 >=kde-plasma/libksysguard-5.13.5:5 >=kde-plasma/milou-5.13.5:5 >=kde-plasma/oxygen-5.13.5:5 >=kde-plasma/plasma-desktop-5.13.5:5 >=kde-plasma/plasma-integration-5.13.5:5 >=kde-plasma/plasma-workspace-5.13.5:5 >=kde-plasma/polkit-kde-agent-5.13.5:5 >=kde-plasma/powerdevil-5.13.5:5 >=kde-plasma/systemsettings-5.13.5:5 >=kde-plasma/user-manager-5.13.5:5 bluetooth? ( >=kde-plasma/bluedevil-5.13.5:5 ) browser-integration? ( >=kde-plasma/plasma-browser-integration-5.13.5:5 ) crypt? ( >=kde-plasma/plasma-vault-5.13.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.13.5:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.13.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.13.5:5 >=kde-plasma/kde-gtk-config-5.13.5:5 legacy-systray? ( dev-libs/libappindicator:3 dev-libs/libappindicator:2 ) ) handbook? ( >=kde-apps/khelpcenter-17.12.3:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.13.5:5 ) pam? ( >=kde-plasma/kwallet-pam-5.13.5:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.13.5:5 >=kde-plasma/plymouth-kcm-5.13.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.13.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.13.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.13.5:5 )
+REQUIRED_USE=legacy-systray? ( gtk )
+SLOT=5
+_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs e4a9360924c5ce9f52e61342cde58512
+_md5_=29deb41a52a2338f6aa32aa945599041
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-nm-5.13.5
similarity index 95%
rename from metadata/md5-cache/kde-plasma/plasma-nm-5.13.4
rename to metadata/md5-cache/kde-plasma/plasma-nm-5.13.5
index b6b33304b526..e6b4ad631cb0 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.13.4
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.13.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
IUSE=modemmanager openconnect teamd debug
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdelibs4support-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/knotifications-5.46.0:5 >=kde-frameworks/kservice-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/networkmanager-qt-5.46.0:5[teamd=] >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.46.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.13.4:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdelibs4support-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/knotifications-5.46.0:5 >=kde-frameworks/kservice-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/networkmanager-qt-5.46.0:5[teamd=] >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=app-crypt/qca-2.1.1:2[qt5(+)] net-misc/networkmanager[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.46.0:5 >=dev-qt/qtxml-5.11.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.11.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/kde-cli-tools-5.13.5:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-nm-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/plasma-nm-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=09751f65ed040a5c61670fb82f060dc1
+_md5_=28ba5487a7c55f24f1d9bc0df54ba6f8
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.13.4-r1 b/metadata/md5-cache/kde-plasma/plasma-pa-5.13.5
similarity index 95%
rename from metadata/md5-cache/kde-plasma/plasma-pa-5.13.4-r1
rename to metadata/md5-cache/kde-plasma/plasma-pa-5.13.5
index 9ab5b1049ea6..1968b84f392c 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.13.4-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
RDEPEND=>=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 media-libs/libcanberra media-sound/pulseaudio >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-pa-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/plasma-pa-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=c0b8aaf21c9620af55f6ac8a7729834a
+_md5_=986ec51422ba10c20a205fd16660f794
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.5
similarity index 97%
rename from metadata/md5-cache/kde-plasma/plasma-sdk-5.13.4
rename to metadata/md5-cache/kde-plasma/plasma-sdk-5.13.5
index a63c6032be19..15131ed020b1 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.4
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
RDEPEND=>=kde-frameworks/karchive-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/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-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/kpackage-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-5.46.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-sdk-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/plasma-sdk-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=1912402c18a065c9290e91bbcae8aa35
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-vault-5.13.5
similarity index 93%
rename from metadata/md5-cache/kde-plasma/plasma-vault-5.13.4
rename to metadata/md5-cache/kde-plasma/plasma-vault-5.13.5
index ef17d312d522..2c8601399f2b 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.13.4
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.13.5
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcodecs-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/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-plasma/libksysguard-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.46.0: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 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcodecs-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/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-plasma/libksysguard-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.46.0: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 >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=Plasma applet and services for creating encrypted vaults
EAPI=6
HOMEPAGE=https://www.kde.org/ https://cukic.co/2017/02/03/vaults-encryption-in-plasma/
IUSE=networkmanager debug
KEYWORDS=~amd64 ~arm ~x86
LICENSE=LGPL-3
-RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcodecs-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/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-plasma/libksysguard-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.46.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kcodecs-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/kdbusaddons-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/plasma-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-plasma/libksysguard-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-5.46.0:5 ) || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-vault-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/plasma-vault-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=51140a239b643c5b7478c7d671ec9a8f
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.13.5
similarity index 93%
rename from metadata/md5-cache/kde-plasma/plasma-workspace-5.13.4
rename to metadata/md5-cache/kde-plasma/plasma-workspace-5.13.5
index f29c3bbb7483..36ce329976a8 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.13.4
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.13.5
@@ -1,16 +1,16 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kglobalaccel-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/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kjs-5.46.0:5 >=kde-frameworks/kjsembed-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwayland-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 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/kscreenlocker-5.13.4:5 >=kde-plasma/kwin-5.13.4:5 >=kde-plasma/libksysguard-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5[jpeg] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.46.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.46.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.46.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) >=dev-qt/qtconcurrent-5.11.1:5 x11-base/xorg-proto 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 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kglobalaccel-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/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kjs-5.46.0:5 >=kde-frameworks/kjsembed-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwayland-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 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/kscreenlocker-5.13.5:5 >=kde-plasma/kwin-5.13.5:5 >=kde-plasma/libksysguard-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5[jpeg] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.46.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.46.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.46.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) >=dev-qt/qtconcurrent-5.11.1:5 x11-base/xorg-proto 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 ) test? ( >=dev-qt/qttest-5.11.1:5 ) >=dev-qt/qtcore-5.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=KDE Plasma workspace
EAPI=6
HOMEPAGE=https://www.kde.org/
IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd test debug +handbook test
KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=GPL-2
-PDEPEND=>=kde-plasma/kde-cli-tools-5.13.4:5
-RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kglobalaccel-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/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kjs-5.46.0:5 >=kde-frameworks/kjsembed-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwayland-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 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/kscreenlocker-5.13.4:5 >=kde-plasma/kwin-5.13.4:5 >=kde-plasma/libksysguard-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5[jpeg] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.46.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.46.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.46.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdesu-5.46.0:5 >=kde-apps/kio-extras-17.12.3:5 >=kde-plasma/ksysguard-5.13.4:5 >=kde-plasma/milou-5.13.4:5 >=kde-plasma/plasma-integration-5.13.4:5 >=dev-qt/qdbus-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtpaths-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+PDEPEND=>=kde-plasma/kde-cli-tools-5.13.5:5
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kbookmarks-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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kglobalaccel-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/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemmodels-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kjs-5.46.0:5 >=kde-frameworks/kjsembed-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kpackage-5.46.0:5 >=kde-frameworks/krunner-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktexteditor-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwayland-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 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/kscreenlocker-5.13.5:5 >=kde-plasma/kwin-5.13.5:5 >=kde-plasma/libksysguard-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5[jpeg] >=dev-qt/qtnetwork-5.11.1:5 >=dev-qt/qtscript-5.11.1:5 >=dev-qt/qtsql-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-frameworks/kholidays-5.46.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.46.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.46.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.46.0:5 ) >=kde-frameworks/kded-5.46.0:5 >=kde-frameworks/kdesu-5.46.0:5 >=kde-apps/kio-extras-17.12.3:5 >=kde-plasma/ksysguard-5.13.5:5 >=kde-plasma/milou-5.13.5:5 >=kde-plasma/plasma-integration-5.13.5:5 >=dev-qt/qdbus-5.11.1:5 >=dev-qt/qtgraphicaleffects-5.11.1:5 >=dev-qt/qtpaths-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
REQUIRED_USE=gps? ( geolocation )
RESTRICT=test
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-workspace-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/plasma-workspace-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=958a76cb5aaf27336de7ee44c530c73d
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.4 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.5
similarity index 94%
rename from metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.4
rename to metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.5
index b1d02486c408..7c37aa3ee2a2 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.4
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.13.5
@@ -6,6 +6,6 @@ HOMEPAGE=https://www.kde.org/
KEYWORDS=~amd64 ~arm ~ppc64 ~x86
LICENSE=GPL-2
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/plasma-workspace-wallpapers-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/plasma-workspace-wallpapers-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=189842381304d5baa13bc42dfdb0ddb1
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.4 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.5
similarity index 94%
rename from metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.4
rename to metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.5
index 95a4367d3a4a..85588204b543 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.4
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.13.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://cgit.kde.org/plymouth-kcm.git
IUSE=debug
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.13.4:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kdeclarative-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtquickcontrols-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.13.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/plymouth-kcm-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/plymouth-kcm-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=80e3cae09e6e4b2b7c840ce4dd99cc81
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.4 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.5
similarity index 96%
rename from metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.4
rename to metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.5
index 95c32c7816ab..7d28bdbd810e 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.4
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~x86
LICENSE=GPL-2
RDEPEND=>=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/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kwindowsystem-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/polkit-kde-agent-1-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/polkit-kde-agent-1-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=baccf1318cfd16b51009d71874e36a4f
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.13.4 b/metadata/md5-cache/kde-plasma/powerdevil-5.13.4
deleted file mode 100644
index 5a0c9aa7672a..000000000000
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.13.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5[policykit] >=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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/libkscreen-5.13.4:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.46.0:5 >=kde-frameworks/networkmanager-qt-5.46.0: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.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Power management for KDE Plasma Shell
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/powerdevil.git
-IUSE=brightness-control consolekit +wireless debug +handbook
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5[policykit] >=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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdelibs4support-5.46.0:5 >=kde-frameworks/kglobalaccel-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/libkscreen-5.13.4:5 >=kde-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.46.0:5 >=kde-frameworks/networkmanager-qt-5.46.0:5 ) >=kde-plasma/kde-cli-tools-5.13.4:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/powerdevil-5.13.4.tar.xz
-_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=96e86f41303c2c97fb2f3467d4103bf2
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.13.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.13.5
new file mode 100644
index 000000000000..9d75fa3084d7
--- /dev/null
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.13.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5[policykit] >=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/kcrash-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/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/libkscreen-5.13.5:5 >=kde-plasma/plasma-workspace-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.46.0:5 >=kde-frameworks/networkmanager-qt-5.46.0: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.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Power management for KDE Plasma Shell
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/powerdevil.git
+IUSE=brightness-control consolekit +wireless debug +handbook
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5[policykit] >=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/kcrash-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/kidletime-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/knotifyconfig-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/kwayland-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/solid-5.46.0:5 >=kde-plasma/libkscreen-5.13.5:5 >=kde-plasma/plasma-workspace-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil ) wireless? ( >=kde-frameworks/bluez-qt-5.46.0:5 >=kde-frameworks/networkmanager-qt-5.46.0:5 ) >=kde-plasma/kde-cli-tools-5.13.5:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/plasma/5.13.5/powerdevil-5.13.5.tar.xz
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=a28e422ebbc2ec9cd2c211312f0e6b93
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.4 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.5
similarity index 95%
rename from metadata/md5-cache/kde-plasma/sddm-kcm-5.13.4
rename to metadata/md5-cache/kde-plasma/sddm-kcm-5.13.5
index 55d456f758ad..dbbc6699cea4 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.4
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.13.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://cgit.kde.org/sddm-kcm.git
IUSE=debug
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.13.4:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/karchive-5.46.0:5 >=kde-frameworks/kauth-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/ki18n-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.13.5:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/sddm-kcm-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/sddm-kcm-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=ea6912c8a78f1d0f346c2a08f71d50dc
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.13.4 b/metadata/md5-cache/kde-plasma/systemsettings-5.13.5
similarity index 92%
rename from metadata/md5-cache/kde-plasma/systemsettings-5.13.4
rename to metadata/md5-cache/kde-plasma/systemsettings-5.13.5
index 0e5c1182e4ad..b94642a56fcf 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.13.4
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.13.5
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-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/kpackage-5.46.0:5 >=kde-frameworks/kservice-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-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 classic? ( >=kde-frameworks/khtml-5.46.0: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.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-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/kpackage-5.46.0:5 >=kde-frameworks/kservice-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-plasma/plasma-workspace-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 classic? ( >=kde-frameworks/khtml-5.46.0: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.11.1:5 dev-util/desktop-file-utils app-arch/xz-utils
DESCRIPTION=System settings utility
EAPI=6
HOMEPAGE=https://www.kde.org/
IUSE=classic gtk debug +handbook
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-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/kpackage-5.46.0:5 >=kde-frameworks/kservice-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-plasma/plasma-workspace-5.13.4:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 classic? ( >=kde-frameworks/khtml-5.46.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.46.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.13.4:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.46.0:5 >=kde-frameworks/kactivities-stats-5.46.0:5 >=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-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/kcrash-5.46.0:5 >=kde-frameworks/kdbusaddons-5.46.0:5 >=kde-frameworks/kdeclarative-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/kpackage-5.46.0:5 >=kde-frameworks/kservice-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-plasma/plasma-workspace-5.13.5:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 classic? ( >=kde-frameworks/khtml-5.46.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.46.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.13.5:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/systemsettings-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/systemsettings-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=acef3411943f0cdf3d4c0209314283af
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.13.4 b/metadata/md5-cache/kde-plasma/user-manager-5.13.5
similarity index 97%
rename from metadata/md5-cache/kde-plasma/user-manager-5.13.4
rename to metadata/md5-cache/kde-plasma/user-manager-5.13.5
index a589389c2d5a..97f8d2bda159 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.13.4
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.13.5
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
RDEPEND=>=kde-frameworks/kauth-5.46.0:5 >=kde-frameworks/kcmutils-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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=dev-qt/qtdbus-5.11.1:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
-SRC_URI=mirror://kde/stable/plasma/5.13.4/user-manager-5.13.4.tar.xz
+SRC_URI=mirror://kde/stable/plasma/5.13.5/user-manager-5.13.5.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
_md5_=5303ae307bcec7f95030e927dfe2d521
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 1c11d2fd591f..678c2f204210 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/graphite2-1.3.11 b/metadata/md5-cache/media-gfx/graphite2-1.3.11-r1
similarity index 98%
rename from metadata/md5-cache/media-gfx/graphite2-1.3.11
rename to metadata/md5-cache/media-gfx/graphite2-1.3.11-r1
index f2cae09613df..bf0453bec6a3 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.3.11
+++ b/metadata/md5-cache/media-gfx/graphite2-1.3.11-r1
@@ -10,4 +10,4 @@ RDEPEND=perl? ( dev-lang/perl:= )
SLOT=0
SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.3.11.tgz
_eclasses_=cmake-multilib a2ef7e88c0043ca9dcbe33db04c84f23 cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module ee5593d6e2d067fafac171106655b5ce preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=1c160b68405755c618f4fb9c9f447f4a
+_md5_=8b6d5a72cf72b1d67e056ceda41d60ae
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.3.12 b/metadata/md5-cache/media-gfx/graphite2-1.3.12-r1
similarity index 98%
rename from metadata/md5-cache/media-gfx/graphite2-1.3.12
rename to metadata/md5-cache/media-gfx/graphite2-1.3.12-r1
index a48c3471409b..62f66b797093 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.3.12
+++ b/metadata/md5-cache/media-gfx/graphite2-1.3.12-r1
@@ -10,4 +10,4 @@ RDEPEND=perl? ( dev-lang/perl:= )
SLOT=0
SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.3.12.tgz
_eclasses_=cmake-multilib a2ef7e88c0043ca9dcbe33db04c84f23 cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module ee5593d6e2d067fafac171106655b5ce preserve-libs ef207dc62baddfddfd39a164d9797648 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=1c160b68405755c618f4fb9c9f447f4a
+_md5_=8b6d5a72cf72b1d67e056ceda41d60ae
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 1d29da2a5061..cc51aaaed3dc 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/chromaprint-1.4.3 b/metadata/md5-cache/media-libs/chromaprint-1.4.3
index bbcf8ba5f689..7e4f1641f0f0 100644
--- a/metadata/md5-cache/media-libs/chromaprint-1.4.3
+++ b/metadata/md5-cache/media-libs/chromaprint-1.4.3
@@ -4,10 +4,10 @@ DESCRIPTION=A client-side library that implements a custom algorithm for extract
EAPI=6
HOMEPAGE=https://acoustid.org/chromaprint
IUSE=libav test tools abi_x86_32 abi_x86_64 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 ~amd64-fbsd
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd
LICENSE=LGPL-2.1
RDEPEND=libav? ( >=media-video/libav-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(-)?] ) !libav? ( >=media-video/ffmpeg-2.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0/1
SRC_URI=https://github.com/acoustid/chromaprint/releases/download/v1.4.3/chromaprint-1.4.3.tar.gz test? ( https://github.com/google/googletest/archive/release-1.8.0.tar.gz -> gtest-1.8.0.tar.gz )
_eclasses_=cmake-multilib a2ef7e88c0043ca9dcbe33db04c84f23 cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=118b4b15f41a7ff1fcc65f5534207c2d
+_md5_=c967c657738f241c21b7fb7f1d70d864
diff --git a/metadata/md5-cache/media-libs/libmpdclient-2.15 b/metadata/md5-cache/media-libs/libmpdclient-2.15
new file mode 100644
index 000000000000..e424d4b4cc58
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmpdclient-2.15
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-doc/doxygen ) test? ( dev-libs/check ) >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DESCRIPTION=A library for interfacing Music Player Daemon (media-sound/mpd)
+EAPI=6
+HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/libmpdclient
+IUSE=doc examples test
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=https://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.15.tar.xz
+_eclasses_=meson b953e9f7b0c7db44d8b115086b11ba16 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
+_md5_=1582694c483f91c482768098bb6cdaa2
diff --git a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0 b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
index 2207c8cdc357..fc7300494ece 100644
--- a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
+++ b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:
SLOT=5
SRC_URI=mirror://kde/unstable/libqaccessibilityclient/libqaccessibilityclient-0.2.0.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=c10e811ff203b1d64b5667f4d803305a
+_md5_=3c7e8936093a6f374d30ba182fafd283
diff --git a/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1 b/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
index 8f2f34f7aae4..4ba14cfc392f 100644
--- a/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
+++ b/metadata/md5-cache/media-libs/openjpeg-1.5.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=An open-source JPEG 2000 library
EAPI=6
HOMEPAGE=http://www.openjpeg.org
IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~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-2
RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
RESTRICT=test
SLOT=0/5
SRC_URI=mirror://sourceforge/openjpeg.mirror/openjpeg-1.5.2.tar.gz
_eclasses_=cmake-multilib a2ef7e88c0043ca9dcbe33db04c84f23 cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=daef18fec48693970981a9787b33609a
+_md5_=f321c6d86bf192effcba54b1025480e2
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index ba271ea69e26..c8ce6af5dcad 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/kodi-inputstream-adaptive-2.0.25 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.25
new file mode 100644
index 000000000000..fcafdc779183
--- /dev/null
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-2.0.25
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/expat =media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Kodi's Adaptive inputstream addon
+EAPI=6
+HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/expat =media-tv/kodi-17* =media-libs/kodi-platform-17* =dev-libs/libplatform-2*
+SLOT=0
+SRC_URI=https://codeload.github.com/peak3d/inputstream.adaptive/tar.gz/c51b9a9b58a645f820883e6d99982277fc58aac5 -> kodi-inputstream-adaptive-2.0.25.tar.gz
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e kodi-addon bc015cf49b6539f5f5ef3f0bced1ad62 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=961cd8974c79b8c93d82671083c3e94e
diff --git a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999 b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
index 9798bfd31d6b..527b9443afa6 100644
--- a/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
+++ b/metadata/md5-cache/media-plugins/kodi-inputstream-adaptive-9999
@@ -1,10 +1,10 @@
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/expat =media-tv/kodi-9999 =media-libs/kodi-platform-9999 =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/expat ~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 =dev-libs/libplatform-2* sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Kodi's Adaptive inputstream addon
EAPI=6
HOMEPAGE=https://github.com/peak3d/inputstream.adaptive.git
LICENSE=GPL-2
-RDEPEND=dev-libs/expat =media-tv/kodi-9999 =media-libs/kodi-platform-9999 =dev-libs/libplatform-2*
+RDEPEND=dev-libs/expat ~media-tv/kodi-9999 ~media-libs/kodi-platform-9999 =dev-libs/libplatform-2*
SLOT=0
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 918d6a744039c29af2cadc7317459765 kodi-addon bc015cf49b6539f5f5ef3f0bced1ad62 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=b4d3e1a167f28968c86b5781078c3d68
+_md5_=e180ae8b4e208337949b71356b99a51a
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-1.0.2-r1 b/metadata/md5-cache/media-plugins/vdr-satip-1.0.2-r1
deleted file mode 100644
index 2526449181b0..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-satip-1.0.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: integrates SAT>IP network devices seamlessly into VDR
-EAPI=5
-HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/satip/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/vdr-satip-1.0.2.tgz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 unpacker ee2f5086cd7e7b747b061f58db14d89e vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vdr-plugin-2 fbdfa56b71cf0193ab303e13ea40b188
-_md5_=e21f1a5b1fc702f899d98d8e2d36daff
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.2.0 b/metadata/md5-cache/media-plugins/vdr-satip-2.2.0
deleted file mode 100644
index 61653f0de42c..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.2.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: integrates SAT>IP network devices seamlessly into VDR
-EAPI=5
-HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/satip/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/vdr-satip-2.2.0.tgz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 unpacker ee2f5086cd7e7b747b061f58db14d89e vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vdr-plugin-2 fbdfa56b71cf0193ab303e13ea40b188
-_md5_=38c71dad01b4b3dd78365472c54c09fd
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.2.3 b/metadata/md5-cache/media-plugins/vdr-satip-2.2.3
deleted file mode 100644
index bb87289b3149..000000000000
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.2.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
-DEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
-DESCRIPTION=VDR Plugin: integrates SAT>IP network devices seamlessly into VDR
-EAPI=5
-HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/satip/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
-SLOT=0
-SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/vdr-satip-2.2.3.tgz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 unpacker ee2f5086cd7e7b747b061f58db14d89e vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vdr-plugin-2 fbdfa56b71cf0193ab303e13ea40b188
-_md5_=38c71dad01b4b3dd78365472c54c09fd
diff --git a/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r1 b/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2
similarity index 53%
rename from metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r1
rename to metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2
index cc2d9337a742..3db9e128959e 100644
--- a/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r1
+++ b/metadata/md5-cache/media-plugins/vdr-satip-2.2.3-r2
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile config install postinst postrm prepare setup unpack
DEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
DESCRIPTION=VDR Plugin: integrates SAT>IP network devices seamlessly into VDR
-EAPI=6
+EAPI=7
HOMEPAGE=http://www.saunalahti.fi/~rahrenbe/vdr/satip/
KEYWORDS=~amd64 ~arm ~x86
LICENSE=GPL-2
RDEPEND=>=media-video/vdr-2.2.0 >=net-misc/curl-7.36 || ( dev-libs/tinyxml dev-libs/pugixml ) >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-eselect/eselect-vdr-0.0.2
SLOT=0
SRC_URI=http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/vdr-satip-2.2.3.tgz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 unpacker ee2f5086cd7e7b747b061f58db14d89e vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vdr-plugin-2 fbdfa56b71cf0193ab303e13ea40b188
-_md5_=7d68b02cc5119f7fc8b9c3953be58bf4
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs e4a9360924c5ce9f52e61342cde58512 unpacker ee2f5086cd7e7b747b061f58db14d89e vdr-plugin-2 fbdfa56b71cf0193ab303e13ea40b188
+_md5_=17fa586ddd75f265fb01bc8d1232731d
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index f33da8570787..300acd44ba49 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.2.0-r2 b/metadata/md5-cache/media-sound/cantata-2.2.0-r2
deleted file mode 100644
index 8d21da958ce3..000000000000
--- a/metadata/md5-cache/media-sound/cantata-2.2.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst 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(+)] media-libs/taglib-extras udisks? ( sys-fs/udisks:2 ) ) dev-qt/qtconcurrent:5 dev-qt/linguist-tools:5 sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-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
-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(+)] media-libs/taglib-extras udisks? ( sys-fs/udisks:2 ) ) 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.2.0/cantata-2.2.0.tar.bz2
-_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=87d37f344812336c43f61d9b0e351d51
diff --git a/metadata/md5-cache/media-sound/cantata-2.3.1 b/metadata/md5-cache/media-sound/cantata-2.3.2
similarity index 80%
rename from metadata/md5-cache/media-sound/cantata-2.3.1
rename to metadata/md5-cache/media-sound/cantata-2.3.2
index c4fbe894e94a..9ba7cb4378da 100644
--- a/metadata/md5-cache/media-sound/cantata-2.3.1
+++ b/metadata/md5-cache/media-sound/cantata-2.3.2
@@ -1,15 +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
+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? ( dev-qt/qtmultimedia:5 ) 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]
+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? ( dev-qt/qtmultimedia:5 ) 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
+SRC_URI=https://github.com/CDrummond/cantata/releases/download/v2.3.2/cantata-2.3.2.tar.bz2
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=e1bc9bbccedb3f645ab2a8a0ab527100
+_md5_=76fe31989caac3667eb054713db33036
diff --git a/metadata/md5-cache/media-sound/kid3-3.6.2 b/metadata/md5-cache/media-sound/kid3-3.6.2
new file mode 100644
index 000000000000..cab2a495939e
--- /dev/null
+++ b/metadata/md5-cache/media-sound/kid3-3.6.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=dev-qt/linguist-tools-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 >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Simple tag editor based on Qt
+EAPI=6
+HOMEPAGE=https://kid3.sourceforge.io/
+IUSE=acoustid flac kde mp3 mp4 +taglib vorbis debug
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtmultimedia-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 sys-libs/readline:0= acoustid? ( media-libs/chromaprint virtual/ffmpeg ) flac? ( media-libs/flac[cxx] media-libs/libvorbis ) kde? ( >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 ) mp3? ( media-libs/id3lib ) mp4? ( media-libs/libmp4v2:0 ) taglib? ( >=media-libs/taglib-1.9.1 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) !media-sound/kid3: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
+REQUIRED_USE=flac? ( vorbis )
+SLOT=5
+SRC_URI=mirror://sourceforge/kid3/kid3-3.6.2.tar.gz
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=4a75b23c8d5330ada09ede12622f7301
diff --git a/metadata/md5-cache/media-sound/mpg123-1.25.10-r1 b/metadata/md5-cache/media-sound/mpg123-1.25.10-r1
index efa19972a726..3408f26cca8a 100644
--- a/metadata/md5-cache/media-sound/mpg123-1.25.10-r1
+++ b/metadata/md5-cache/media-sound/mpg123-1.25.10-r1
@@ -4,10 +4,10 @@ DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
EAPI=6
HOMEPAGE=https://www.mpg123.org/
IUSE=cpu_flags_x86_3dnow cpu_flags_x86_3dnowext alsa altivec coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse abi_x86_32 abi_x86_64 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 ~x86-solaris
+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 ~x86-solaris
LICENSE=GPL-2 LGPL-2.1
RDEPEND=app-eselect/eselect-mpg123 dev-libs/libltdl:0 alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
SLOT=0
SRC_URI=https://www.mpg123.org/download/mpg123-1.25.10.tar.bz2
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool 0081a71a261724730ec4c248494f044d ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=199f84f12421c28c1ef811916063a03c
+_md5_=776086a72eb396d9584cf07bc49986d4
diff --git a/metadata/md5-cache/media-sound/teamspeak-client-3.1.10 b/metadata/md5-cache/media-sound/teamspeak-client-3.2.1
similarity index 82%
rename from metadata/md5-cache/media-sound/teamspeak-client-3.1.10
rename to metadata/md5-cache/media-sound/teamspeak-client-3.2.1
index bfe5141a28cb..9f64e7d8c982 100644
--- a/metadata/md5-cache/media-sound/teamspeak-client-3.1.10
+++ b/metadata/md5-cache/media-sound/teamspeak-client-3.2.1
@@ -9,6 +9,6 @@ RDEPEND=app-arch/snappy:= =media-libs/libao-0.8.5 ) emacs? ( v
DESCRIPTION=A handy MIDI to WAV converter with OSS and ALSA output support
EAPI=6
HOMEPAGE=http://timidity.sourceforge.net/
-IUSE=motif oss nas X gtk vorbis tk slang alsa jack emacs ao selinux speex flac ncurses
+IUSE=alsa ao emacs flac gtk jack motif nas ncurses oss selinux slang speex tk vorbis X
KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd
LICENSE=GPL-2
PDEPEND=|| ( media-sound/timidity-eawpatches media-sound/timidity-freepats )
RDEPEND=alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.5 ) emacs? ( virtual/emacs ) flac? ( media-libs/flac ) gtk? ( x11-libs/gtk+:2 ) jack? ( virtual/jack ) motif? ( >=x11-libs/motif-2.3:0 ) nas? ( >=media-libs/nas-1.4 ) ncurses? ( sys-libs/ncurses:0= ) slang? ( sys-libs/slang ) speex? ( media-libs/speex ) tk? ( dev-lang/tk:0= ) vorbis? ( media-libs/libvorbis ) X? ( media-libs/libpng:0= x11-libs/libXaw x11-libs/libXext ) app-eselect/eselect-timidity alsa? ( media-sound/alsa-utils ) selinux? ( sec-policy/selinux-timidity )
+REQUIRED_USE=tk? ( X )
SLOT=0
SRC_URI=mirror://sourceforge/timidity/TiMidity++-2.14.0.tar.xz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 user 8bc2845510e2109af75e3eeac607ec81 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=dbaf2b28ea93140dfe84f3c7f1980a2c
+_md5_=0697f987ee9a3baa03abdfb7ddf7952c
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 5f054681638f..7a47cf88d7ae 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/vdr-2.0.6-r1 b/metadata/md5-cache/media-video/vdr-2.0.6-r1
new file mode 100644
index 000000000000..287dc7c1b1d7
--- /dev/null
+++ b/metadata/md5-cache/media-video/vdr-2.0.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 >=virtual/linuxtv-dvb-headers-5.3 sys-devel/gettext
+DESCRIPTION=Video Disk Recorder - turns a pc into a powerful set top box for DVB
+EAPI=5
+HOMEPAGE=http://www.tvdr.de/
+IUSE=bidi debug html vanilla alternatechannel ddepgentry dvlvidprefer graphtft jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift permashift_v1 pinplugin rotor ttxtsubs vasarajanauloja wareagleicon yaepg
+KEYWORDS=amd64 ~arm ~ppc x86
+LICENSE=GPL-2
+RDEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 dev-lang/perl >=media-tv/gentoo-vdr-scripts-2.5_rc1 media-fonts/corefonts bidi? ( dev-libs/fribidi )
+REQUIRED_USE=permashift? ( !permashift_v1 ) permashift_v1? ( !permashift )
+SLOT=0
+SRC_URI=ftp://ftp.tvdr.de/vdr/vdr-2.0.6.tar.bz2 https://dev.gentoo.org/~hd_brummy/distfiles/extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=aea717453871cf5ae9f4ab512ba0cfb4
diff --git a/metadata/md5-cache/media-video/vdr-2.0.7 b/metadata/md5-cache/media-video/vdr-2.0.7
new file mode 100644
index 000000000000..dbf7ba1509de
--- /dev/null
+++ b/metadata/md5-cache/media-video/vdr-2.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare setup
+DEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 >=virtual/linuxtv-dvb-headers-5.3 sys-devel/gettext
+DESCRIPTION=Video Disk Recorder - turns a pc into a powerful set top box for DVB
+EAPI=5
+HOMEPAGE=http://www.tvdr.de/
+IUSE=bidi debug html systemd vanilla alternatechannel ddepgentry dvlvidprefer graphtft jumpplay jumpingseconds mainmenuhooks menuorg naludump permashift permashift_v1 pinplugin rotor ttxtsubs vasarajanauloja wareagleicon yaepg
+KEYWORDS=~arm ~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/jpeg:* sys-libs/libcap >=media-libs/fontconfig-2.4.2 >=media-libs/freetype-2 dev-lang/perl >=media-tv/gentoo-vdr-scripts-2.5 media-fonts/corefonts bidi? ( dev-libs/fribidi ) systemd? ( sys-apps/systemd )
+REQUIRED_USE=permashift? ( !permashift_v1 ) permashift_v1? ( !permashift )
+SLOT=0
+SRC_URI=ftp://ftp.tvdr.de/vdr/vdr-2.0.7.tar.bz2 https://dev.gentoo.org/~hd_brummy/distfiles/extpng-vdr-2.0.6-gentoo-edition-v6.patch.bz2
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=3af11d6eaefbd45f9b32227441984f43
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 517226921ca2..9c2183950f92 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/icinga2-2.9.1-r1 b/metadata/md5-cache/net-analyzer/icinga2-2.9.1-r1
new file mode 100644
index 000000000000..ca9eaf8765b4
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/icinga2-2.9.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl sys-devel/bison >=sys-devel/flex-2.5.35 apache2? ( =www-servers/apache-2* ) sys-devel/make >=dev-util/cmake-3.9.6 virtual/pkgconfig
+DESCRIPTION=Distributed, general purpose, network monitoring engine
+EAPI=6
+HOMEPAGE=http://icinga.org/icinga2
+IUSE=+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax apache2
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) classicui? ( net-analyzer/icinga[web] ) apache2? ( =www-servers/apache-2* )
+REQUIRED_USE=!minimal? ( || ( mysql postgres ) )
+SLOT=0
+SRC_URI=https://github.com/Icinga/icinga2/archive/v2.9.1.tar.gz -> icinga2-2.9.1.tar.gz
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets ed63935305b6de2210ae97a407719d89 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=24ebee83f10bbd0ab25120cd8c5a9b6f
diff --git a/metadata/md5-cache/net-analyzer/icinga2-9999 b/metadata/md5-cache/net-analyzer/icinga2-9999
index ad95f20c6216..7eb856f603ab 100644
--- a/metadata/md5-cache/net-analyzer/icinga2-9999
+++ b/metadata/md5-cache/net-analyzer/icinga2-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) sys-devel/bison >=sys-devel/flex-2.5.35 apache2? ( =www-servers/apache-2* ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl sys-devel/bison >=sys-devel/flex-2.5.35 apache2? ( =www-servers/apache-2* ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
DESCRIPTION=Distributed, general purpose, network monitoring engine
EAPI=6
HOMEPAGE=http://icinga.org/icinga2
IUSE=+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax apache2
LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) classicui? ( net-analyzer/icinga[web] ) apache2? ( =www-servers/apache-2* )
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=dev-libs/boost-1.58-r1 console? ( dev-libs/libedit ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql:= ) dev-libs/yajl plugins? ( || ( net-analyzer/monitoring-plugins net-analyzer/nagios-plugins ) ) mail? ( virtual/mailx ) classicui? ( net-analyzer/icinga[web] ) apache2? ( =www-servers/apache-2* )
REQUIRED_USE=!minimal? ( || ( mysql postgres ) )
SLOT=0
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 918d6a744039c29af2cadc7317459765 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf wxwidgets ed63935305b6de2210ae97a407719d89 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=6d6804aaaa0124c6a63ea8cd9791a8bf
+_md5_=24ebee83f10bbd0ab25120cd8c5a9b6f
diff --git a/metadata/md5-cache/net-analyzer/nagios-4.4.2 b/metadata/md5-cache/net-analyzer/nagios-4.4.2
new file mode 100644
index 000000000000..b8524df5e40a
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagios-4.4.2
@@ -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.2 || ( net-analyzer/nagios-plugins net-analyzer/monitoring-plugins )
+SLOT=0
+_md5_=4228c5a1c2da0c98f8d9144da69ad485
diff --git a/metadata/md5-cache/net-analyzer/nagios-core-4.4.2 b/metadata/md5-cache/net-analyzer/nagios-core-4.4.2
new file mode 100644
index 000000000000..3acece02e0fd
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/nagios-core-4.4.2
@@ -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.2.tar.gz web? ( https://dev.gentoo.org/~mjo/distfiles/nagios-core-gentoo-icons-20141125.tar )
+_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs e4a9360924c5ce9f52e61342cde58512 user 8bc2845510e2109af75e3eeac607ec81
+_md5_=1cba7f464dcceaedd129d27fd864c7b4
diff --git a/metadata/md5-cache/net-analyzer/sec-2.7.11 b/metadata/md5-cache/net-analyzer/sec-2.8.0
similarity index 78%
rename from metadata/md5-cache/net-analyzer/sec-2.7.11
rename to metadata/md5-cache/net-analyzer/sec-2.8.0
index a1eebe8710cc..67c3f1b9431a 100644
--- a/metadata/md5-cache/net-analyzer/sec-2.7.11
+++ b/metadata/md5-cache/net-analyzer/sec-2.8.0
@@ -1,10 +1,10 @@
DEFINED_PHASES=install
DESCRIPTION=Simple Event Correlator
-EAPI=5
+EAPI=6
HOMEPAGE=https://github.com/simple-evcorr/sec
KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux
LICENSE=GPL-2
RDEPEND=>=dev-lang/perl-5.8.0
SLOT=0
-SRC_URI=https://github.com/simple-evcorr/sec/releases/download/2.7.11/sec-2.7.11.tar.gz
-_md5_=64964d26911e7a04ba28270cefd1bc4e
+SRC_URI=https://github.com/simple-evcorr/sec/releases/download/2.8.0/sec-2.8.0.tar.gz
+_md5_=a77126e59b7008a7954d8b7c1a0407d0
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.6.3 b/metadata/md5-cache/net-analyzer/wireshark-2.6.3
index e8ea337c3f06..60c16ecfb25b 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.6.3
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.6.3
@@ -4,10 +4,10 @@ DESCRIPTION=A network protocol analyzer formerly known as ethereal
EAPI=6
HOMEPAGE=https://www.wireshark.org/
IUSE=adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc +dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ia64 ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~ppc64 x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) bcg729? ( media-libs/bcg729 ) filecaps? ( sys-libs/libcap ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) sshdump? ( >=net-libs/libssh-0.6 ) ciscodump? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) maxminddb? ( dev-libs/libmaxminddb ) nghttp2? ( net-libs/nghttp2 ) pcap? ( net-libs/libpcap ) portaudio? ( media-libs/portaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=media-libs/speex-1.2.0 media-libs/speexdsp x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
SLOT=0/2.6.3
SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.6.3.tar.xz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fcaps 9445d60c1eb084a91c38ef4c070b2f16 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=fc5a4788895447d0ce47af45b6cc1db2
+_md5_=d8946692221eaf617b1b6ece6c96aaff
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index 6acf0100d5cf..b806aaa3698c 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/ddclient-3.9.0 b/metadata/md5-cache/net-dns/ddclient-3.9.0-r1
similarity index 94%
rename from metadata/md5-cache/net-dns/ddclient-3.9.0
rename to metadata/md5-cache/net-dns/ddclient-3.9.0-r1
index ce74410298a4..31e214dc8627 100644
--- a/metadata/md5-cache/net-dns/ddclient-3.9.0
+++ b/metadata/md5-cache/net-dns/ddclient-3.9.0-r1
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/perl dev-perl/Data-Validate-IP dev-perl/Digest-SHA1 dev-perl/IO
SLOT=0
SRC_URI=mirror://sourceforge/ddclient/ddclient-3.9.0.tar.gz
_eclasses_=multilib 97f470f374f2e94ccab04a2fb21d811e systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=0def6ff4d1ef8cb0352473d35eda2175
+_md5_=7a9a20d33478709f8d984be6604e34fc
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index f18bbb87edee..79937478d1ad 100644
Binary files a/metadata/md5-cache/net-ftp/Manifest.gz and b/metadata/md5-cache/net-ftp/Manifest.gz differ
diff --git a/metadata/md5-cache/net-ftp/tlswrap-1.04-r3 b/metadata/md5-cache/net-ftp/tlswrap-1.04-r3
index 050e219d5dcd..ba2febd69929 100644
--- a/metadata/md5-cache/net-ftp/tlswrap-1.04-r3
+++ b/metadata/md5-cache/net-ftp/tlswrap-1.04-r3
@@ -2,12 +2,12 @@ DEFINED_PHASES=install prepare
DEPEND=!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=FTP wrapper which supports TLS with every FTP client
EAPI=6
-HOMEPAGE=http://www.tlswrap.com/
+HOMEPAGE=https://www.tlswrap.com/
IUSE=libressl
KEYWORDS=~amd64 ~x86
LICENSE=BSD GPL-2
RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= )
SLOT=0
-SRC_URI=http://www.tlswrap.com/tlswrap-1.04.tar.gz
+SRC_URI=https://www.tlswrap.com/tlswrap-1.04.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=a7b54d4462e175edbfffb0120336017b
+_md5_=36cc38903ec61b27e825138ebdb9d159
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 9bf58a2d7f4d..4a9409c06f05 100644
Binary files a/metadata/md5-cache/net-irc/Manifest.gz and b/metadata/md5-cache/net-irc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-irc/hexchat-2.14.2 b/metadata/md5-cache/net-irc/hexchat-2.14.2
new file mode 100644
index 000000000000..11967c4d0b7b
--- /dev/null
+++ b/metadata/md5-cache/net-irc/hexchat-2.14.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst setup test
+DEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) app-arch/xz-utils app-text/iso-codes sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2
+DESCRIPTION=Graphical IRC client based on XChat
+EAPI=6
+HOMEPAGE=https://hexchat.github.io/
+IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2 plugin-fishlim? ( MIT )
+RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
+SLOT=0
+SRC_URI=https://dl.hexchat.net/hexchat/hexchat-2.14.2.tar.xz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e meson b953e9f7b0c7db44d8b115086b11ba16 mono-env 1f24c032c78290b0d9a07d5b343051a7 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=7a30f51f6332c9d622cde295d2bb5c63
diff --git a/metadata/md5-cache/net-irc/hexchat-9999 b/metadata/md5-cache/net-irc/hexchat-9999
index 8c2a2595e70a..cac454826276 100644
--- a/metadata/md5-cache/net-irc/hexchat-9999
+++ b/metadata/md5-cache/net-irc/hexchat-9999
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile configure install postinst postrm preinst setup test unpack
-DEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( 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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) app-arch/xz-utils app-text/iso-codes sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) app-arch/xz-utils app-text/iso-codes sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4 >=dev-util/meson-0.45.1 >=dev-util/ninja-1.7.2 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Graphical IRC client based on XChat
EAPI=6
HOMEPAGE=https://hexchat.github.io/
-IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager 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
+IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7
LICENSE=GPL-2 plugin-fishlim? ( MIT )
-RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( 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_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) )
-REQUIRED_USE=python? ( ^^ ( 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 ) )
+RDEPEND=dev-libs/glib:2 dbus? ( dev-libs/dbus-glib ) gtk? ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( 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 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?,python_single_target_python3_7(+)?] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_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 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
SLOT=0
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 918d6a744039c29af2cadc7317459765 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e meson b953e9f7b0c7db44d8b115086b11ba16 mono-env 1f24c032c78290b0d9a07d5b343051a7 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=8e6b85647c6be92dcecccb44400d7350
+_md5_=7a30f51f6332c9d622cde295d2bb5c63
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 95d01cbbf098..22467f25e8d4 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/libad9361-iio-0.1-r2 b/metadata/md5-cache/net-libs/libad9361-iio-0.1-r2
new file mode 100644
index 000000000000..f9d260c63a7d
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libad9361-iio-0.1-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-libs/libiio:= sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=IIO AD9361 library for filter design and handling, multi-chip sync, etc.
+EAPI=6
+HOMEPAGE=https://github.com/analogdevicesinc/libad9361-iio
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=net-libs/libiio:=
+SLOT=0/0.1
+SRC_URI=https://github.com/analogdevicesinc/libad9361-iio/archive/v0.1.tar.gz -> libad9361-iio-0.1.tar.gz
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=a9ee53f3efecb8c4e8598bae4fc6281b
diff --git a/metadata/md5-cache/net-libs/libad9361-iio-9999 b/metadata/md5-cache/net-libs/libad9361-iio-9999
new file mode 100644
index 000000000000..7fb54a471da4
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libad9361-iio-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=net-libs/libiio:= sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=IIO AD9361 library for filter design and handling, multi-chip sync, etc.
+EAPI=6
+HOMEPAGE=https://github.com/analogdevicesinc/libad9361-iio
+LICENSE=LGPL-2.1
+RDEPEND=net-libs/libiio:=
+SLOT=0/9999
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 918d6a744039c29af2cadc7317459765 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=a9ee53f3efecb8c4e8598bae4fc6281b
diff --git a/metadata/md5-cache/net-libs/libiio-0.15-r1 b/metadata/md5-cache/net-libs/libiio-0.15-r1
new file mode 100644
index 000000000000..cfedf527ecbd
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libiio-0.15-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) avahi? ( net-dns/avahi ) sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Library for interfacing with IIO devices
+EAPI=6
+HOMEPAGE=https://github.com/analogdevicesinc/libiio
+IUSE=+aio +avahi
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) avahi? ( net-dns/avahi )
+SLOT=0/0.15
+SRC_URI=https://github.com/analogdevicesinc/libiio/archive/v0.15.tar.gz -> libiio-0.15.tar.gz
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=5ae092314e87999c2ee80648c0575359
diff --git a/metadata/md5-cache/net-libs/libiio-9999 b/metadata/md5-cache/net-libs/libiio-9999
new file mode 100644
index 000000000000..7b4a929ff7d3
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libiio-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) avahi? ( net-dns/avahi ) sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Library for interfacing with IIO devices
+EAPI=6
+HOMEPAGE=https://github.com/analogdevicesinc/libiio
+IUSE=+aio +avahi
+LICENSE=LGPL-2.1
+RDEPEND=dev-libs/libxml2:= virtual/libusb:1= aio? ( dev-libs/libaio ) avahi? ( net-dns/avahi )
+SLOT=0/9999
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 918d6a744039c29af2cadc7317459765 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=5ae092314e87999c2ee80648c0575359
diff --git a/metadata/md5-cache/net-libs/libssh-0.8.2 b/metadata/md5-cache/net-libs/libssh-0.8.2
new file mode 100644
index 000000000000..efde79d84959
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libssh-0.8.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-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(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-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(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) doc? ( app-doc/doxygen ) test? ( >=dev-util/cmocka-0.3.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-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Access a working SSH implementation by means of a library
+EAPI=6
+HOMEPAGE=https://www.libssh.org/
+IUSE=debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=!gcrypt? ( !mbedtls? ( !libressl? ( >=dev-libs/openssl-1.0.1h-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(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gssapi? ( >=virtual/krb5-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(-)?] ) mbedtls? ( net-libs/mbedtls[abi_x86_32(-)?,abi_x86_64(-)?,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=?? ( gcrypt mbedtls )
+SLOT=0/4
+SRC_URI=https://www.libssh.org/files/0.8/libssh-0.8.2.tar.xz
+_eclasses_=cmake-multilib a2ef7e88c0043ca9dcbe33db04c84f23 cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=0241fa5aa5abf7ea04e40afc2bc8a156
diff --git a/metadata/md5-cache/net-libs/libtirpc-1.0.3 b/metadata/md5-cache/net-libs/libtirpc-1.0.3
index bff7eb1f9288..c04fc76724bd 100644
--- a/metadata/md5-cache/net-libs/libtirpc-1.0.3
+++ b/metadata/md5-cache/net-libs/libtirpc-1.0.3
@@ -10,4 +10,4 @@ RDEPEND=kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
SLOT=0/3
SRC_URI=mirror://sourceforge/libtirpc/libtirpc-1.0.3.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=1c2b4a1c18ba41fcc851198010a2ba65
+_md5_=523569261170f47908a595aa9027bcf1
diff --git a/metadata/md5-cache/net-libs/libtirpc-1.1.4 b/metadata/md5-cache/net-libs/libtirpc-1.1.4
new file mode 100644
index 000000000000..3c44059be056
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libtirpc-1.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=kerberos? ( >=virtual/krb5-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(-)?] ) app-arch/xz-utils >=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(-)?] >=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=Transport Independent RPC library (SunRPC replacement)
+EAPI=6
+HOMEPAGE=http://libtirpc.sourceforge.net/
+IUSE=ipv6 kerberos 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-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=kerberos? ( >=virtual/krb5-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(-)?] )
+SLOT=0/3
+SRC_URI=mirror://sourceforge/libtirpc/libtirpc-1.1.4.tar.bz2 mirror://gentoo/libtirpc-glibc-nfs.tar.xz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
+_md5_=523569261170f47908a595aa9027bcf1
diff --git a/metadata/md5-cache/net-libs/nghttp2-1.32.0 b/metadata/md5-cache/net-libs/nghttp2-1.33.0
similarity index 98%
rename from metadata/md5-cache/net-libs/nghttp2-1.32.0
rename to metadata/md5-cache/net-libs/nghttp2-1.33.0
index 6ed30ed88a89..c1cda48a4cc3 100644
--- a/metadata/md5-cache/net-libs/nghttp2-1.32.0
+++ b/metadata/md5-cache/net-libs/nghttp2-1.33.0
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install test
DEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,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/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,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/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.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(-)?] ) virtual/pkgconfig test? ( >=dev-util/cunit-2.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(-)?] )
DESCRIPTION=HTTP/2 C Library
-EAPI=6
+EAPI=7
HOMEPAGE=https://nghttp2.org/
IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd
LICENSE=MIT
RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,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/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,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/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.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(-)?] )
SLOT=0/1.14
-SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.32.0/nghttp2-1.32.0.tar.xz
+SRC_URI=https://github.com/nghttp2/nghttp2/releases/download/v1.33.0/nghttp2-1.33.0.tar.xz
_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=7ae1cb86f897c9e0f6e53619ec7acb81
+_md5_=9c86c6e2bcf8793aaff5e7e260e54615
diff --git a/metadata/md5-cache/net-libs/nghttp2-9999 b/metadata/md5-cache/net-libs/nghttp2-9999
index 6d5e720c1569..c9c7613b8cd2 100644
--- a/metadata/md5-cache/net-libs/nghttp2-9999
+++ b/metadata/md5-cache/net-libs/nghttp2-9999
@@ -1,11 +1,12 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,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/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,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/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.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(-)?] ) virtual/pkgconfig test? ( >=dev-util/cunit-2.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(-)?] ) >=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 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,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/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,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/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.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(-)?] ) virtual/pkgconfig test? ( >=dev-util/cunit-2.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(-)?] ) >=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=HTTP/2 C Library
-EAPI=6
+EAPI=7
HOMEPAGE=https://nghttp2.org/
IUSE=cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
LICENSE=MIT
RDEPEND=cxx? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,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/boost:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,threads] ) hpack-tools? ( >=dev-libs/jansson-2.5 ) jemalloc? ( dev-libs/jemalloc[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) utils? ( !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,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/libev-4.15[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] net-dns/c-ares:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xml? ( >=dev-libs/libxml2-2.7.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(-)?] )
SLOT=0/1.14
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 git-r3 918d6a744039c29af2cadc7317459765 libtool 0081a71a261724730ec4c248494f044d multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=c1fbe40a2ba5ca58221f933f1f3f272d
+_md5_=869ac0fe6fb627417fd19057f84e245a
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 20111d5d8942..be1356e2b21b 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/chrony-3.4_pre1 b/metadata/md5-cache/net-misc/chrony-3.4_pre1-r1
similarity index 97%
rename from metadata/md5-cache/net-misc/chrony-3.4_pre1
rename to metadata/md5-cache/net-misc/chrony-3.4_pre1-r1
index 725123c43a8f..9f826ab432d2 100644
--- a/metadata/md5-cache/net-misc/chrony-3.4_pre1
+++ b/metadata/md5-cache/net-misc/chrony-3.4_pre1-r1
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://download.tuxfamily.org/chrony/chrony-3.4-pre1.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3df716d109138cbeaca71c42c3709822
+_md5_=b65d744f682ac55a5e58acad336ccef1
diff --git a/metadata/md5-cache/net-misc/ntpsec-1.1.2 b/metadata/md5-cache/net-misc/ntpsec-1.1.2
new file mode 100644
index 000000000000..447ed401be63
--- /dev/null
+++ b/metadata/md5-cache/net-misc/ntpsec-1.1.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=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(-)] sys-libs/libcap 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(-)] libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) app-text/asciidoc app-text/docbook-xsl-stylesheets sys-devel/bison rclock_oncore? ( net-misc/pps-tools ) rclock_pps? ( net-misc/pps-tools ) virtual/pkgconfig
+DESCRIPTION=The NTP reference implementation, refactored
+EAPI=6
+HOMEPAGE=https://www.ntpsec.org/
+IUSE=rclock_oncore rclock_trimble rclock_truetime rclock_gpsd rclock_jjy rclock_generic rclock_spectracom rclock_shm rclock_pps rclock_hpgps rclock_zyfer rclock_arbiter rclock_nmea rclock_neoclock rclock_modem rclock_local debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=HPND MIT BSD-2 BSD CC-BY-SA-4.0
+RDEPEND=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(-)] sys-libs/libcap 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(-)] libressl? ( dev-libs/libressl:0= ) !libressl? ( dev-libs/openssl:0= ) seccomp? ( sys-libs/libseccomp ) ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts ) !net-misc/ntp !net-misc/openntpd
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=ftp://ftp.ntpsec.org/pub/releases/ntpsec-1.1.2.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf waf-utils 77ee347982e4e1d405ed64356b80201a
+_md5_=fb45b015e3fc3ff245dee0c026b2e549
diff --git a/metadata/md5-cache/net-misc/smb4k-2.1.1 b/metadata/md5-cache/net-misc/smb4k-2.1.1
new file mode 100644
index 000000000000..4ba6ffc6ef49
--- /dev/null
+++ b/metadata/md5-cache/net-misc/smb4k-2.1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-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/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/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-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/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-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 network neighborhood browser
+EAPI=6
+HOMEPAGE=https://sourceforge.net/p/smb4k/home/Home/
+IUSE=plasma debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kauth-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/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/kio-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/knotifications-5.46.0:5 >=kde-frameworks/kparts-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/qtdeclarative-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qttest-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 net-fs/samba[cups] plasma? ( >=kde-frameworks/plasma-5.46.0:5 ) >=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://sourceforge/smb4k/smb4k-2.1.1.tar.xz
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=862582e96a1fde9b8179252df859307e
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.09.01 b/metadata/md5-cache/net-misc/youtube-dl-2018.09.01
new file mode 100644
index 000000000000..05005252139a
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2018.09.01
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst 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-python/nose[coverage(+)] ) 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=Download videos from YouTube.com (and more sites...)
+EAPI=6
+HOMEPAGE=https://rg3.github.com/youtube-dl/
+IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://youtube-dl.org/downloads/2018.09.01/youtube-dl-2018.09.01.tar.gz
+_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=6d304b7cf100f4ddb916374d6200c3eb
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 45d2dfd0d8ab..acb7ba766962 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/cups-filters-1.19.0 b/metadata/md5-cache/net-print/cups-filters-1.21.2
similarity index 66%
rename from metadata/md5-cache/net-print/cups-filters-1.19.0
rename to metadata/md5-cache/net-print/cups-filters-1.21.2
index f394bec2b22c..a82bbe030632 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.19.0
+++ b/metadata/md5-cache/net-print/cups-filters-1.21.2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] ) dev-util/gdbus-codegen test? ( media-fonts/dejavu ) virtual/pkgconfig
+DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.1.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-8.1.0:= ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] ) dev-util/gdbus-codegen test? ( media-fonts/dejavu ) virtual/pkgconfig
DESCRIPTION=Cups filters
EAPI=6
HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
IUSE=dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint
LICENSE=MIT GPL-2
-RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
+RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.1.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-8.1.0:= ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
SLOT=0
-SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.19.0.tar.xz
+SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.21.2.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module ee5593d6e2d067fafac171106655b5ce preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e46eed5c6b88f096b6451e612041a251
+_md5_=299023c1a8e71e4f4e28699786d1b7ae
diff --git a/metadata/md5-cache/net-print/cups-filters-9999 b/metadata/md5-cache/net-print/cups-filters-9999
index 5566856c1539..aad57eea0cb3 100644
--- a/metadata/md5-cache/net-print/cups-filters-9999
+++ b/metadata/md5-cache/net-print/cups-filters-9999
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] ) dev-util/gdbus-codegen test? ( media-fonts/dejavu ) virtual/pkgconfig >=dev-vcs/bzr-2.6.0 >=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=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.1.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-8.1.0:= ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] ) dev-util/gdbus-codegen test? ( media-fonts/dejavu ) virtual/pkgconfig >=dev-vcs/bzr-2.6.0 >=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=Cups filters
EAPI=6
HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
IUSE=dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
LICENSE=MIT GPL-2
-RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
+RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-8.1.0:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-8.1.0:= ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
SLOT=0
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 bzr a1b66b9c760a0ab5113e62cf9b64d1fe desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool 0081a71a261724730ec4c248494f044d ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module ee5593d6e2d067fafac171106655b5ce preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e46eed5c6b88f096b6451e612041a251
+_md5_=299023c1a8e71e4f4e28699786d1b7ae
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index 27f23e9d65fa..098a2b48e5d2 100644
Binary files a/metadata/md5-cache/net-vpn/Manifest.gz and b/metadata/md5-cache/net-vpn/Manifest.gz differ
diff --git a/metadata/md5-cache/net-vpn/tinc-1.1_pre15 b/metadata/md5-cache/net-vpn/tinc-1.1_pre15
deleted file mode 100644
index ac65d381ef0b..000000000000
--- a/metadata/md5-cache/net-vpn/tinc-1.1_pre15
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gui? ( dev-python/wxpython:3.0[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_python3_7(-),python_single_target_python2_7(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc ) zlib? ( sys-libs/zlib ) >=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=tinc is an easy to configure VPN implementation
-EAPI=6
-HOMEPAGE=http://www.tinc-vpn.org/
-IUSE=+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gui? ( dev-python/wxpython:3.0[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_python3_7(-),python_single_target_python2_7(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc ) zlib? ( sys-libs/zlib ) vde? ( net-misc/vde )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.1pre15.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=967fe01d3aad72f43d0d71faddc2559c
diff --git a/metadata/md5-cache/net-vpn/tinc-1.1_pre16 b/metadata/md5-cache/net-vpn/tinc-1.1_pre16
deleted file mode 100644
index 51002a764835..000000000000
--- a/metadata/md5-cache/net-vpn/tinc-1.1_pre16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gui? ( dev-python/wxpython:3.0[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_python3_7(-),python_single_target_python2_7(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc ) zlib? ( sys-libs/zlib ) >=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=tinc is an easy to configure VPN implementation
-EAPI=6
-HOMEPAGE=http://www.tinc-vpn.org/
-IUSE=+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gui? ( dev-python/wxpython:3.0[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_python3_7(-),python_single_target_python2_7(+)] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc ) zlib? ( sys-libs/zlib ) vde? ( net-misc/vde )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.1pre16.tar.gz
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
-_md5_=7fcb15236171ff6682098756f246ead6
diff --git a/metadata/md5-cache/net-vpn/tinc-1.1_pre16-r1 b/metadata/md5-cache/net-vpn/tinc-1.1_pre16-r1
new file mode 100644
index 000000000000..74acd6cbb9ff
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/tinc-1.1_pre16-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc ) zlib? ( sys-libs/zlib ) >=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=tinc is an easy to configure VPN implementation
+EAPI=6
+HOMEPAGE=http://www.tinc-vpn.org/
+IUSE=+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc ) zlib? ( sys-libs/zlib ) vde? ( net-misc/vde )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.1pre16.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512
+_md5_=d4b0a6cf7f23fdb2294e97b4ed141ab8
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20180809 b/metadata/md5-cache/net-vpn/wireguard-0.0.20180904
similarity index 98%
rename from metadata/md5-cache/net-vpn/wireguard-0.0.20180809
rename to metadata/md5-cache/net-vpn/wireguard-0.0.20180904
index 5aa6dee0d3e7..b8dc8da12243 100644
--- a/metadata/md5-cache/net-vpn/wireguard-0.0.20180809
+++ b/metadata/md5-cache/net-vpn/wireguard-0.0.20180904
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
LICENSE=GPL-2
RDEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) )
SLOT=0
-SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20180809.tar.xz
+SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20180904.tar.xz
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 linux-info 915cae3d7d636732918d18827fb1c226 linux-mod 8ce5c5f548ed010d6499eb792ac1a638 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
_md5_=fa1632ac9dd5c198b03eb99016b0a7f9
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index f2814ab18c7b..7782f47a2880 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/gr-iio-0.3-r2 b/metadata/md5-cache/net-wireless/gr-iio-0.3-r2
new file mode 100644
index 000000000000..d661a4e4b5b1
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-iio-0.3-r2
@@ -0,0 +1,13 @@
+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_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7.0:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:= sys-devel/flex:= sys-devel/bison:= dev-util/cppunit:= dev-lang/swig:0 sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=GNU Radio IIO Blocks
+EAPI=6
+HOMEPAGE=https://github.com/analogdevicesinc/gr-iio
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=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_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7.0:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:=
+SLOT=0
+SRC_URI=https://github.com/analogdevicesinc/gr-iio/archive/v0.3.tar.gz -> gr-iio-0.3.tar.gz
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=9f41931101b8c6f844a2051f82ea5382
diff --git a/metadata/md5-cache/net-wireless/gr-iio-9999 b/metadata/md5-cache/net-wireless/gr-iio-9999
new file mode 100644
index 000000000000..c94182e359e2
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-iio-9999
@@ -0,0 +1,11 @@
+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_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7.0:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:= sys-devel/flex:= sys-devel/bison:= dev-util/cppunit:= dev-lang/swig:0 sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=GNU Radio IIO Blocks
+EAPI=6
+HOMEPAGE=https://github.com/analogdevicesinc/gr-iio
+IUSE=python_targets_python2_7
+LICENSE=GPL-3+
+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_python3_7(-),python_single_target_python2_7(+)] >=net-wireless/gnuradio-3.7.0:= dev-libs/boost:= net-libs/libiio:= net-libs/libad9361-iio:=
+SLOT=0
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 918d6a744039c29af2cadc7317459765 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=9f41931101b8c6f844a2051f82ea5382
diff --git a/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r1 b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r1
new file mode 100644
index 000000000000..fa2cd6bec48b
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-osmosdr-0.1.4_p20180626-r1
@@ -0,0 +1,13 @@
+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_python3_7(-),python_single_target_python2_7(+)] dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,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_python3_7(-),python_single_target_python2_7(+)] bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iio? ( net-wireless/gr-iio ) iqbalance? ( net-wireless/gr-iqbal:=[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_python3_7(-),python_single_target_python2_7(+)] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr ) uhd? ( net-wireless/uhd:=[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_python3_7(-),python_single_target_python2_7(+)] ) dev-python/cheetah sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=GNU Radio source block for OsmoSDR and rtlsdr and hackrf
+EAPI=6
+HOMEPAGE=http://sdr.osmocom.org/trac/wiki/GrOsmoSDR
+IUSE=bladerf fcd hackrf iio iqbalance mirisdr python rtlsdr sdrplay soapy uhd python_targets_python2_7
+LICENSE=GPL-3
+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_python3_7(-),python_single_target_python2_7(+)] dev-libs/boost:= >=net-wireless/gnuradio-3.7_rc:0=[fcd?,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_python3_7(-),python_single_target_python2_7(+)] bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= ) hackrf? ( net-libs/libhackrf:= ) iio? ( net-wireless/gr-iio ) iqbalance? ( net-wireless/gr-iqbal:=[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_python3_7(-),python_single_target_python2_7(+)] ) mirisdr? ( net-libs/libmirisdr:= ) rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= ) sdrplay? ( net-wireless/sdrplay ) soapy? ( net-wireless/soapysdr ) uhd? ( net-wireless/uhd:=[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_python3_7(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0/0.1.4_p20180626
+SRC_URI=https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-0.1.4_p20180626.tar.xz
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=a557c287a063e2f9277146e5cd7882a7
diff --git a/metadata/md5-cache/net-wireless/soapyplutosdr-0.0_p20180825 b/metadata/md5-cache/net-wireless/soapyplutosdr-0.0_p20180825
new file mode 100644
index 000000000000..1d75aadd9499
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/soapyplutosdr-0.0_p20180825
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-wireless/soapysdr net-libs/libiio:= net-libs/libad9361-iio:= sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=Soapy SDR plugin for the Pluto SDR
+EAPI=6
+HOMEPAGE=https://github.com/pothosware/SoapyPlutoSDR
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=net-wireless/soapysdr net-libs/libiio:= net-libs/libad9361-iio:=
+SLOT=0
+SRC_URI=https://github.com/pothosware/SoapyPlutoSDR/archive/782650597b18f311cc97fbb7c6813539e6adef16.tar.gz -> soapyplutosdr-0.0_p20180825.tar.gz
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=33bd2b2ddee8d81ddeb6473cf9ea55c2
diff --git a/metadata/md5-cache/net-wireless/soapyplutosdr-9999 b/metadata/md5-cache/net-wireless/soapyplutosdr-9999
new file mode 100644
index 000000000000..695eb65e701f
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/soapyplutosdr-9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=net-wireless/soapysdr net-libs/libiio:= net-libs/libad9361-iio:= sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+DESCRIPTION=Soapy SDR plugin for the Pluto SDR
+EAPI=6
+HOMEPAGE=https://github.com/pothosware/SoapyPlutoSDR
+LICENSE=LGPL-2.1+
+RDEPEND=net-wireless/soapysdr net-libs/libiio:= net-libs/libad9361-iio:=
+SLOT=0
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 918d6a744039c29af2cadc7317459765 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=33bd2b2ddee8d81ddeb6473cf9ea55c2
diff --git a/metadata/md5-cache/net-wireless/soapysdr-0.6.1 b/metadata/md5-cache/net-wireless/soapysdr-0.6.1-r1
similarity index 88%
rename from metadata/md5-cache/net-wireless/soapysdr-0.6.1
rename to metadata/md5-cache/net-wireless/soapysdr-0.6.1-r1
index eff9f7a64545..50984e8b9f2f 100644
--- a/metadata/md5-cache/net-wireless/soapysdr-0.6.1
+++ b/metadata/md5-cache/net-wireless/soapysdr-0.6.1-r1
@@ -3,13 +3,13 @@ DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) py
DESCRIPTION=vendor and platform neutral SDR support library
EAPI=6
HOMEPAGE=https://github.com/pothosware/SoapySDR
-IUSE=bladerf hackrf python rtlsdr uhd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+IUSE=bladerf hackrf python rtlsdr plutosdr uhd python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
KEYWORDS=~amd64 ~x86
LICENSE=Boost-1.0
-PDEPEND=bladerf? ( net-wireless/soapybladerf ) hackrf? ( net-wireless/soapyhackrf ) rtlsdr? ( net-wireless/soapyrtlsdr ) uhd? ( net-wireless/soapyuhd )
+PDEPEND=bladerf? ( net-wireless/soapybladerf ) hackrf? ( net-wireless/soapyhackrf ) rtlsdr? ( net-wireless/soapyrtlsdr ) plutosdr? ( net-wireless/soapyplutosdr ) uhd? ( net-wireless/soapyuhd )
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=0
SRC_URI=https://github.com/pothosware/SoapySDR/archive/soapy-sdr-0.6.1.tar.gz -> soapysdr-0.6.1.tar.gz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=f23c9526ae7f16416850125eff84c52a
+_md5_=a092e25a445bcb4848b250dc6f88d0eb
diff --git a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.3.1 b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.3.1
deleted file mode 100644
index 2cd955f94b67..000000000000
--- a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.3.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/matplotlib-0.91.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/RecSQL-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sci-libs/scipy-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python framework for Gromacs
-EAPI=5
-HOMEPAGE=https://orbeckst.github.com/GromacsWrapper/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-python/matplotlib-0.91.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/RecSQL-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sci-libs/scipy-0.9[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/orbeckst/GromacsWrapper/archive/release-0.3.1.tar.gz -> GromacsWrapper-0.3.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=391de03515f3c8a5dd2933589fd4195a
diff --git a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.3.2 b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.3.2
deleted file mode 100644
index 60d3acc4a3c9..000000000000
--- a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/matplotlib-0.91.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/RecSQL-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sci-libs/scipy-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python framework for Gromacs
-EAPI=5
-HOMEPAGE=https://orbeckst.github.com/GromacsWrapper/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-python/matplotlib-0.91.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/RecSQL-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sci-libs/scipy-0.9[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/orbeckst/GromacsWrapper/archive/release-0.3.2.tar.gz -> GromacsWrapper-0.3.2.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=33af38381822cf4cbc69c643ed3b6525
diff --git a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.5.1 b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.5.1
deleted file mode 100644
index 1fa8ab0e9b38..000000000000
--- a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/matplotlib-0.91.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/RecSQL-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sci-libs/scipy-0.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python framework for Gromacs
-EAPI=6
-HOMEPAGE=https://orbeckst.github.com/GromacsWrapper/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-python/matplotlib-0.91.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/RecSQL-0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sci-libs/scipy-0.9[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/orbeckst/GromacsWrapper/archive/release-0.5.1.tar.gz -> GromacsWrapper-0.5.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=6474bf6d012709e361f4b195d481caef
diff --git a/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.7.0 b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.7.0
new file mode 100644
index 000000000000..fca807f0587a
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/GromacsWrapper-0.7.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-python/matplotlib-0.91.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.9[python_targets_python2_7(-)?,python_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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python framework for Gromacs
+EAPI=6
+HOMEPAGE=https://gromacswrapper.readthedocs.io
+IUSE=python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 LGPL-3
+RDEPEND=>=dev-python/matplotlib-0.91.3[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sci-libs/scipy-0.9[python_targets_python2_7(-)?,python_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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://github.com/Becksteinlab/GromacsWrapper/archive/release-0.7.0.tar.gz -> GromacsWrapper-0.7.0.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=a9d4690552f590503ce659c78737f079
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 3a80f676a82e..11d464dc0023 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/ParmEd-3.0.3 b/metadata/md5-cache/sci-chemistry/ParmEd-3.0.3
new file mode 100644
index 000000000000..4faee59c41a8
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/ParmEd-3.0.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=Parameter/topology editor and molecular simulator
+EAPI=6
+HOMEPAGE=https://parmed.github.io/ParmEd/html/index.html
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2
+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(-)] sci-libs/scipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/ParmEd/ParmEd/archive/3.0.3.tar.gz -> ParmEd-3.0.3.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921 xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=607b31630e78dc7fb3a8fa8e4c8aacd8
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index d3237234ddbd..3f1d8eddf2ef 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
new file mode 100644
index 000000000000..21b094619f52
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare
+DEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig test? ( sys-devel/bc ) virtual/pkgconfig >=dev-util/scons-1.2.1[python_targets_python2_7]
+DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
+EAPI=5
+HOMEPAGE=http://catb.org/gpsd/
+IUSE=gpsd_protocols_aivdm gpsd_protocols_ashtech gpsd_protocols_earthmate gpsd_protocols_evermore gpsd_protocols_fury gpsd_protocols_fv18 gpsd_protocols_garmin gpsd_protocols_garmintxt gpsd_protocols_geostar gpsd_protocols_gpsclock gpsd_protocols_isync gpsd_protocols_itrax gpsd_protocols_mtk3301 gpsd_protocols_navcom gpsd_protocols_nmea0183 gpsd_protocols_nmea2000 gpsd_protocols_ntrip gpsd_protocols_oceanserver gpsd_protocols_oncore gpsd_protocols_passthrough gpsd_protocols_rtcm104v2 gpsd_protocols_rtcm104v3 gpsd_protocols_sirf gpsd_protocols_skytraq gpsd_protocols_superstar2 gpsd_protocols_tnt gpsd_protocols_tripmate gpsd_protocols_tsip gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X python_targets_python2_7
+KEYWORDS=amd64 arm ~ppc ~ppc64 x86
+LICENSE=BSD
+RDEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) ) qt5? ( cxx )
+SLOT=0/23
+SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 scons-utils 741000d14c0b59263aac3f3cf6e39909 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 udev 7af0412965eeadeee9e3b7ad98adabdf user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=a45f32ffc45f4159c9bc087c054d3750
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-9999 b/metadata/md5-cache/sci-geosciences/gpsd-9999
index 95b83ebc7b1e..ba1de61e227a 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-9999
+++ b/metadata/md5-cache/sci-geosciences/gpsd-9999
@@ -3,10 +3,10 @@ DEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-gli
DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping clients
EAPI=5
HOMEPAGE=http://catb.org/gpsd/
-IUSE=gpsd_protocols_aivdm gpsd_protocols_ashtech gpsd_protocols_earthmate gpsd_protocols_evermore gpsd_protocols_fury gpsd_protocols_fv18 gpsd_protocols_garmin gpsd_protocols_garmintxt gpsd_protocols_geostar gpsd_protocols_gpsclock gpsd_protocols_isync gpsd_protocols_itrax gpsd_protocols_mtk3301 gpsd_protocols_navcom gpsd_protocols_nmea0183 gpsd_protocols_nmea2000 gpsd_protocols_ntrip gpsd_protocols_oceanserver gpsd_protocols_oncore gpsd_protocols_passthrough gpsd_protocols_rtcm104v2 gpsd_protocols_rtcm104v3 gpsd_protocols_sirf gpsd_protocols_skytraq gpsd_protocols_superstar2 gpsd_protocols_tnt gpsd_protocols_tripmate gpsd_protocols_tsip gpsd_protocols_ublox bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X python_targets_python2_7
+IUSE=gpsd_protocols_aivdm gpsd_protocols_ashtech gpsd_protocols_earthmate gpsd_protocols_evermore gpsd_protocols_fury gpsd_protocols_fv18 gpsd_protocols_garmin gpsd_protocols_garmintxt gpsd_protocols_geostar gpsd_protocols_gpsclock gpsd_protocols_isync gpsd_protocols_itrax gpsd_protocols_mtk3301 gpsd_protocols_navcom gpsd_protocols_nmea0183 gpsd_protocols_nmea2000 gpsd_protocols_ntrip gpsd_protocols_oceanserver gpsd_protocols_oncore gpsd_protocols_passthrough gpsd_protocols_rtcm104v2 gpsd_protocols_rtcm104v3 gpsd_protocols_sirf gpsd_protocols_skytraq gpsd_protocols_superstar2 gpsd_protocols_tnt gpsd_protocols_tripmate gpsd_protocols_tsip gpsd_protocols_ublox bluetooth +cxx dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X python_targets_python2_7
LICENSE=BSD
RDEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork:5 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) )
+REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) ) qt5? ( cxx )
SLOT=0/23
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-2 249c1a0962573f4ce2c28f0d5b6b35d4 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 scons-utils 741000d14c0b59263aac3f3cf6e39909 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 udev 7af0412965eeadeee9e3b7ad98adabdf user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=afc626a8f2a187e5e1ac2b5c70cbecf0
+_md5_=d97f08201899392fe8f4a2877467d616
diff --git a/metadata/md5-cache/sci-geosciences/gpxsee-5.13 b/metadata/md5-cache/sci-geosciences/gpxsee-5.17
similarity index 89%
rename from metadata/md5-cache/sci-geosciences/gpxsee-5.13
rename to metadata/md5-cache/sci-geosciences/gpxsee-5.17
index 0e42ee8f5ded..fbf365a6495f 100644
--- a/metadata/md5-cache/sci-geosciences/gpxsee-5.13
+++ b/metadata/md5-cache/sci-geosciences/gpxsee-5.17
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-qt/qtwidgets:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtnetwork:5 dev-qt/qtcore:5
SLOT=0
-SRC_URI=mirror://sourceforge/gpxsee/Source/GPXSee-5.13.tar.gz
+SRC_URI=https://github.com/tumic0/GPXSee/archive/5.17.tar.gz -> gpxsee-5.17.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=e99127b7c2e817aa1406674f2ddf64e6
+_md5_=4f1d542d6ce5400d66275fe5eaf0685a
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 405b1d5319ed..360a23c6edfc 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/xdrfile-1.1.4 b/metadata/md5-cache/sci-libs/xdrfile-1.1.4
new file mode 100644
index 000000000000..336fb9cb6d59
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/xdrfile-1.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure setup
+DEPEND=fortran? ( virtual/fortran )
+DESCRIPTION=Library to read gromacs trajectory and topology files
+EAPI=6
+HOMEPAGE=http://www.gromacs.org/Developer_Zone/Programming_Guide/XTC_Library
+IUSE=fortran static-libs
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=fortran? ( virtual/fortran )
+SLOT=0
+SRC_URI=ftp://ftp.gromacs.org/pub/contrib/xdrfile-1.1.4.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fortran-2 68fcf50e02640de6eb5698ea038d9537 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=480fc5c33d333910f6836a4d7ee1e3f1
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index eb1453a57fe1..f05a9d342687 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/labplot-2.5.0 b/metadata/md5-cache/sci-visualization/labplot-2.5.0
new file mode 100644
index 000000000000..5f75598ffd44
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/labplot-2.5.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-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/kdelibs4support-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/knewstuff-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-17.12.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) sys-devel/bison sys-devel/gettext x11-misc/shared-mime-info 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 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Scientific data analysis and visualisation based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/labplot/
+IUSE=cantor fftw fits hdf5 libcerf netcdf debug +handbook test
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/karchive-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/kdelibs4support-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/knewstuff-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-17.12.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) !sci-visualization/labplot: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/labplot/2.5.0/labplot-2.5.0.tar.xz
+_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=e3604f1d5c793d6b905604f2ba82ee66
diff --git a/metadata/md5-cache/sci-visualization/labplot-9999 b/metadata/md5-cache/sci-visualization/labplot-9999
index 0836d8541318..db721e4705d2 100644
--- a/metadata/md5-cache/sci-visualization/labplot-9999
+++ b/metadata/md5-cache/sci-visualization/labplot-9999
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-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/kdelibs4support-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/knewstuff-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-17.12.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) netcdf? ( sci-libs/netcdf:= ) sys-devel/gettext x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl] >=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
+DEPEND=>=kde-frameworks/karchive-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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-apps/cantor-17.12.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) root? ( app-arch/lz4 sys-libs/zlib ) sys-devel/bison sys-devel/gettext x11-misc/shared-mime-info sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl] >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils
DESCRIPTION=Scientific data analysis and visualisation based on KDE Frameworks
EAPI=6
HOMEPAGE=https://www.kde.org/applications/education/labplot/
-IUSE=cantor fftw fits hdf5 netcdf debug +handbook
+IUSE=cantor fftw fits hdf5 libcerf netcdf root debug +handbook test
LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-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/kdelibs4support-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/knewstuff-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-17.12.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) netcdf? ( sci-libs/netcdf:= ) !sci-visualization/labplot: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
+RDEPEND=>=kde-frameworks/karchive-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/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/knewstuff-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=kde-frameworks/syntax-highlighting-5.46.0:5 >=dev-qt/qtconcurrent-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtprintsupport-5.9.4:5 >=dev-qt/qtserialport-5.9.4:5 >=dev-qt/qtsvg-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-apps/cantor-17.12.3:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) libcerf? ( sci-libs/libcerf ) netcdf? ( sci-libs/netcdf:= ) root? ( app-arch/lz4 sys-libs/zlib ) !sci-visualization/labplot: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
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 918d6a744039c29af2cadc7317459765 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 13d3b96a32511c767537abe037b05d16 kde5-functions 07abfd76b57ade4c7869f4cf94216f72 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=ba73274018beb2a2ca066402348f5337
+_md5_=cd2f3d3bf3c67bc0551b769badd42783
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 12fae8c7dffd..6d34b77ac3aa 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/busybox-1.28.0 b/metadata/md5-cache/sys-apps/busybox-1.28.0
deleted file mode 100644
index b19408545cc6..000000000000
--- a/metadata/md5-cache/sys-apps/busybox-1.28.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) ) >=sys-kernel/linux-headers-2.6.39
-DESCRIPTION=Utilities for rescue and embedded systems
-EAPI=5
-HOMEPAGE=https://www.busybox.net/
-IUSE=debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd savedconfig
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=!static? ( selinux? ( sys-libs/libselinux ) ) pam? ( sys-libs/pam ) mdev? ( !=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
SLOT=0
SRC_URI=http://www.greenwoodsoftware.com/less/less-531.tar.gz
-_md5_=473a5de1ba5d76b532249f1af73ce21c
+_md5_=24dfdf43c9cb67ad0961c8f44c457bc3
diff --git a/metadata/md5-cache/sys-apps/less-534 b/metadata/md5-cache/sys-apps/less-534
new file mode 100644
index 000000000000..d0c68d336306
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/less-534
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install preinst
+DEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
+DESCRIPTION=Excellent text file viewer
+EAPI=6
+HOMEPAGE=http://www.greenwoodsoftware.com/less/
+IUSE=pcre unicode
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( GPL-3 BSD-2 )
+RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
+SLOT=0
+SRC_URI=http://www.greenwoodsoftware.com/less/less-534.tar.gz
+_md5_=473a5de1ba5d76b532249f1af73ce21c
diff --git a/metadata/md5-cache/sys-apps/nix-2.1 b/metadata/md5-cache/sys-apps/nix-2.1
new file mode 100644
index 000000000000..58ff3ae49817
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/nix-2.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= >=dev-libs/boost-1.66:0=[context] net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium:0= ) >=sys-devel/bison-2.6 >=sys-devel/flex-2.5.35 >=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 purely functional package manager
+EAPI=6
+HOMEPAGE=https://nixos.org/nix
+IUSE=+etc_profile +gc doc sodium
+LICENSE=LGPL-2.1
+RDEPEND=app-arch/brotli app-arch/bzip2 app-arch/xz-utils dev-db/sqlite dev-libs/openssl:0= >=dev-libs/boost-1.66:0=[context] net-misc/curl sys-libs/libseccomp sys-libs/zlib gc? ( dev-libs/boehm-gc[cxx] ) doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets ) sodium? ( dev-libs/libsodium:0= )
+SLOT=0
+SRC_URI=http://nixos.org/releases/nix/nix-2.1/nix-2.1.tar.xz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool 0081a71a261724730ec4c248494f044d ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=5752ba87031e46f6c3f7d20bb22e59f8
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.4.1 b/metadata/md5-cache/sys-apps/pciutils-3.4.1
deleted file mode 100644
index 3528c8c51bd7..000000000000
--- a/metadata/md5-cache/sys-apps/pciutils-3.4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) ) !static-libs? ( 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(-)?] ) ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kmod? ( virtual/pkgconfig )
-DESCRIPTION=Various utilities dealing with the PCI bus
-EAPI=5
-HOMEPAGE=http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
-IUSE=dns +kmod static-libs +udev 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 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) ) !static-libs? ( 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(-)?] ) ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,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/hwids
-SLOT=0
-SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.4.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2367fdb63cbc3adddaf7b3c20066b5ae
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.5.6 b/metadata/md5-cache/sys-apps/pciutils-3.5.6
index 0b195d1bc76b..a306f7b5df28 100644
--- a/metadata/md5-cache/sys-apps/pciutils-3.5.6
+++ b/metadata/md5-cache/sys-apps/pciutils-3.5.6
@@ -4,10 +4,10 @@ DESCRIPTION=Various utilities dealing with the PCI bus
EAPI=6
HOMEPAGE=http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
IUSE=dns +kmod static-libs +udev 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 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=kmod? ( sys-apps/kmod ) static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[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(-)?] ) udev? ( >=virtual/libudev-208[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(-)?] ) ) !static-libs? ( 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(-)?] ) udev? ( >=virtual/libudev-208[abi_x86_32(-)?,abi_x86_64(-)?,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/hwids
SLOT=0
SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-3.5.6.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5400cdf9d61724873915a4313ff1986d
+_md5_=3e7392d6419e72dfaff9a10f1d7dd4a1
diff --git a/metadata/md5-cache/sys-apps/portage-2.3.49 b/metadata/md5-cache/sys-apps/portage-2.3.49
new file mode 100644
index 000000000000..81f221ff2147
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-2.3.49
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=!build? ( 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(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[ssl(+)] ) ) >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/sed-4.0.5 sys-devel/patch doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=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_targets_python3_7(-)?,-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_python3_7(-)] virtual/pkgconfig
+DESCRIPTION=Portage is the package management and distribution system for Gentoo
+EAPI=5
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Portage
+IUSE=build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd
+LICENSE=GPL-2
+PDEPEND=!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
+RDEPEND=>=app-arch/tar-1.27 dev-lang/python-exec:2 !build? ( >=sys-apps/sed-4.0.5 app-shells/bash:0[readline] >=app-admin/eselect-1.2 python_targets_pypy? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),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_python2_7? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),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_4? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),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_5? ( dev-python/pyblake2[python_targets_pypy(-)?,-python_single_target_pypy(-),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(-)] ) rsync-verify? ( >=app-portage/gemato-14[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_python3_7(-)] >=app-crypt/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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_python3_7(-)] ) xattr? ( kernel_linux? ( >=sys-apps/install-xattr-0.3 python_targets_pypy? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pyxattr[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) ) !=virtual/pypy-5:0=[bzip2(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[bzip2(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[bzip2(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[bzip2(+),threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[bzip2(+),threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[bzip2(+),threads(+)] ) >=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_targets_python3_7(-)?,-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_python3_7(-)]
+REQUIRED_USE=epydoc? ( python_targets_python2_7 ) || ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
+SLOT=0
+SRC_URI=mirror://gentoo/portage-2.3.49.tar.bz2 https://dev.gentoo.org/~zmedico/portage/archives/portage-2.3.49.tar.bz2
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=9ac2e3b4551be9dcd83e8872e326c1ac
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 41263436e274..f3905034a1a0 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/knem-1.1.1 b/metadata/md5-cache/sys-cluster/knem-1.1.3
similarity index 91%
rename from metadata/md5-cache/sys-cluster/knem-1.1.1
rename to metadata/md5-cache/sys-cluster/knem-1.1.3
index 9bbdc8030579..d515d1a686d6 100644
--- a/metadata/md5-cache/sys-cluster/knem-1.1.1
+++ b/metadata/md5-cache/sys-cluster/knem-1.1.3
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
DEPEND=sys-apps/hwloc virtual/linux-sources >=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 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig
DESCRIPTION=High-Performance Intra-Node MPI Communication
-EAPI=5
+EAPI=6
HOMEPAGE=http://runtime.bordeaux.inria.fr/knem/
IUSE=debug modules kernel_linux kernel_linux kernel_linux
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2 LGPL-2
RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
SLOT=0
-SRC_URI=http://runtime.bordeaux.inria.fr/knem/download/knem-1.1.1.tar.gz
+SRC_URI=http://gforge.inria.fr/frs/download.php/37186/knem-1.1.3.tar.gz
_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 libtool 0081a71a261724730ec4c248494f044d linux-info 915cae3d7d636732918d18827fb1c226 linux-mod 8ce5c5f548ed010d6499eb792ac1a638 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 udev 7af0412965eeadeee9e3b7ad98adabdf vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=144181cf8a433f5d1086f308647f41f1
+_md5_=7eefcb7d9ca2f55c6defdba8d2f7274a
diff --git a/metadata/md5-cache/sys-cluster/knem-9999 b/metadata/md5-cache/sys-cluster/knem-9999
index f25b05cd9cd7..8488cf9eefbf 100644
--- a/metadata/md5-cache/sys-cluster/knem-9999
+++ b/metadata/md5-cache/sys-cluster/knem-9999
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=sys-apps/hwloc virtual/linux-sources >=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 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig dev-vcs/git
+DEPEND=sys-apps/hwloc virtual/linux-sources >=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 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources virtual/libelf ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=High-Performance Intra-Node MPI Communication
-EAPI=5
+EAPI=6
HOMEPAGE=http://runtime.bordeaux.inria.fr/knem/
IUSE=debug modules kernel_linux kernel_linux kernel_linux
LICENSE=GPL-2 LGPL-2
RDEPEND=sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
SLOT=0
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-2 249c1a0962573f4ce2c28f0d5b6b35d4 libtool 0081a71a261724730ec4c248494f044d linux-info 915cae3d7d636732918d18827fb1c226 linux-mod 8ce5c5f548ed010d6499eb792ac1a638 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 udev 7af0412965eeadeee9e3b7ad98adabdf vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=144181cf8a433f5d1086f308647f41f1
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 918d6a744039c29af2cadc7317459765 libtool 0081a71a261724730ec4c248494f044d linux-info 915cae3d7d636732918d18827fb1c226 linux-mod 8ce5c5f548ed010d6499eb792ac1a638 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 udev 7af0412965eeadeee9e3b7ad98adabdf vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=2c75e4547c52c64f76e5fab9c00376bd
diff --git a/metadata/md5-cache/sys-cluster/slurm-17.02.11 b/metadata/md5-cache/sys-cluster/slurm-17.02.11
deleted file mode 100644
index d539d6a32615..000000000000
--- a/metadata/md5-cache/sys-cluster/slurm-17.02.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo !sys-cluster/pmix[pmi] mysql? ( virtual/mysql ) munge? ( sys-auth/munge ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) >=sys-apps/hwloc-1.1.1-r1 >=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 dev-lang/perl:=
-DESCRIPTION=A Highly Scalable Resource Manager
-EAPI=6
-HOMEPAGE=https://www.schedmd.com
-IUSE=debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo !sys-cluster/pmix[pmi] mysql? ( virtual/mysql ) munge? ( sys-auth/munge ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) >=sys-apps/hwloc-1.1.1-r1 dev-libs/libcgroup dev-lang/perl:=
-REQUIRED_USE=torque? ( perl )
-RESTRICT=primaryuri test
-SLOT=0
-SRC_URI=https://www.schedmd.com/download/latest/slurm-17.02.11.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool 0081a71a261724730ec4c248494f044d ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 pam 3e788d86170dfcd5b06824d898315e18 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module ee5593d6e2d067fafac171106655b5ce prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=5f969b9d64d70c4a1d820e16a8e370de
diff --git a/metadata/md5-cache/sys-cluster/slurm-17.11.7 b/metadata/md5-cache/sys-cluster/slurm-17.11.7
deleted file mode 100644
index 311026d8fc1d..000000000000
--- a/metadata/md5-cache/sys-cluster/slurm-17.11.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
-DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo sys-cluster/pmix[-pmi] mysql? ( virtual/mysql ) munge? ( sys-auth/munge ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 >=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 dev-lang/perl:=
-DESCRIPTION=A Highly Scalable Resource Manager
-EAPI=6
-HOMEPAGE=https://www.schedmd.com
-IUSE=debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque X
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo sys-cluster/pmix[-pmi] mysql? ( virtual/mysql ) munge? ( sys-auth/munge ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 dev-libs/libcgroup dev-lang/perl:=
-REQUIRED_USE=torque? ( perl )
-RESTRICT=primaryuri test
-SLOT=0
-SRC_URI=https://download.schedmd.com/slurm/slurm-17.11.7.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool 0081a71a261724730ec4c248494f044d ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 pam 3e788d86170dfcd5b06824d898315e18 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module ee5593d6e2d067fafac171106655b5ce prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=8842fd6826542dfbf6609caf54dad875
diff --git a/metadata/md5-cache/sys-cluster/slurm-17.11.9 b/metadata/md5-cache/sys-cluster/slurm-17.11.9
new file mode 100644
index 000000000000..c47014b3949a
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/slurm-17.11.9
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( virtual/mysql ) munge? ( sys-auth/munge ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( sys-apps/netloc ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= sys-libs/readline:0= html? ( sys-apps/man2html ) >=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 dev-lang/perl:= virtual/pkgconfig
+DESCRIPTION=A Highly Scalable Resource Manager
+EAPI=6
+HOMEPAGE=https://www.schedmd.com
+IUSE=debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl ssl static-libs torque X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( virtual/mysql ) munge? ( sys-auth/munge ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( sys-apps/netloc ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= sys-libs/readline:0= dev-libs/libcgroup dev-lang/perl:=
+REQUIRED_USE=torque? ( perl )
+RESTRICT=primaryuri test
+SLOT=0
+SRC_URI=https://download.schedmd.com/slurm/slurm-17.11.9.tar.bz2
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool 0081a71a261724730ec4c248494f044d ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 pam 3e788d86170dfcd5b06824d898315e18 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module ee5593d6e2d067fafac171106655b5ce prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=25efa282b1ccba9d4faf0077b30c2fd5
diff --git a/metadata/md5-cache/sys-cluster/slurm-18.08.0 b/metadata/md5-cache/sys-cluster/slurm-18.08.0
new file mode 100644
index 000000000000..163c58edc220
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/slurm-18.08.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( virtual/mysql ) munge? ( sys-auth/munge ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( sys-apps/netloc ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= sys-libs/readline:0= html? ( sys-apps/man2html ) >=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 dev-lang/perl:= virtual/pkgconfig
+DESCRIPTION=A Highly Scalable Resource Manager
+EAPI=6
+HOMEPAGE=https://www.schedmd.com
+IUSE=debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl ssl static-libs torque X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-cluster/torque !net-analyzer/slurm !net-analyzer/sinfo || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 ) mysql? ( virtual/mysql ) munge? ( sys-auth/munge ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl:0= ) lua? ( dev-lang/lua:0= ) !lua? ( !dev-lang/lua ) ipmi? ( sys-libs/freeipmi ) json? ( dev-libs/json-c:= ) amd64? ( netloc? ( sys-apps/netloc ) ) hdf5? ( sci-libs/hdf5:= ) numa? ( sys-process/numactl ) ofed? ( sys-fabric/ofed ) X? ( net-libs/libssh2 ) >=sys-apps/hwloc-1.1.1-r1 sys-libs/ncurses:0= app-arch/lz4:0= sys-libs/readline:0= dev-libs/libcgroup dev-lang/perl:=
+REQUIRED_USE=torque? ( perl )
+RESTRICT=primaryuri test
+SLOT=0
+SRC_URI=https://download.schedmd.com/slurm/slurm-18.08.0.tar.bz2
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 bash-completion-r1 47a7402d95930413ce25ba8d857339bb desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool 0081a71a261724730ec4c248494f044d ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 pam 3e788d86170dfcd5b06824d898315e18 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module ee5593d6e2d067fafac171106655b5ce prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
+_md5_=25efa282b1ccba9d4faf0077b30c2fd5
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 5151f2192822..1de71c5d87b8 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/bison-3.0.5-r1 b/metadata/md5-cache/sys-devel/bison-3.0.5-r1
index be9392e2465b..058330a6aa58 100644
--- a/metadata/md5-cache/sys-devel/bison-3.0.5-r1
+++ b/metadata/md5-cache/sys-devel/bison-3.0.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A general-purpose (yacc-compatible) parser generator
EAPI=6
HOMEPAGE=https://www.gnu.org/software/bison/
IUSE=examples nls static 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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=>=sys-devel/m4-1.4.16
SLOT=0
SRC_URI=mirror://gnu/bison/bison-3.0.5.tar.xz https://dev.gentoo.org/~whissi/dist/bison/bison-3.0.5-patches-1.1.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cc8a6308c19d77ef5c4571c57f207c5c
+_md5_=551c01e1ebebe97c276f80a7926bc337
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index a33cc366041f..e06c6cbbe5ee 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/encfs-1.9.2 b/metadata/md5-cache/sys-fs/encfs-1.9.2
index bb1e4cfe3114..9d460a49538c 100644
--- a/metadata/md5-cache/sys-fs/encfs-1.9.2
+++ b/metadata/md5-cache/sys-fs/encfs-1.9.2
@@ -4,11 +4,11 @@ DESCRIPTION=An implementation of encrypted filesystem in user-space using FUSE
EAPI=6
HOMEPAGE=https://vgough.github.io/encfs/
IUSE=libressl nls
-KEYWORDS=amd64 ~arm ~sparc ~x86
+KEYWORDS=amd64 ~arm sparc ~x86
LICENSE=GPL-3 LGPL-3
RDEPEND=!libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) dev-libs/tinyxml2:0= sys-fs/fuse:= sys-libs/zlib
RESTRICT=test
SLOT=0
SRC_URI=https://github.com/vgough/encfs/archive/v1.9.2.tar.gz -> encfs-1.9.2.tar.gz
_eclasses_=cmake-utils ec27c4d90ac99a1a0fb77d97bfc597ee desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=f87c4336eb103c66d720465a66deef25
+_md5_=d2ee16b402eef714323e583edea31a3d
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index fb16a411abb8..351cecd91713 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/at-3.1.23 b/metadata/md5-cache/sys-process/at-3.1.23
new file mode 100644
index 000000000000..522e70ec831b
--- /dev/null
+++ b/metadata/md5-cache/sys-process/at-3.1.23
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=virtual/mta >=sys-devel/autoconf-2.64 sys-devel/bison >=sys-devel/flex-2.5.4a pam? ( virtual/pam ) >=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=Queues jobs for later execution
+EAPI=7
+HOMEPAGE=https://packages.qa.debian.org/a/at.html
+IUSE=pam selinux
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/mta virtual/logger selinux? ( sec-policy/selinux-at )
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/at/at_3.1.23.orig.tar.gz
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool 0081a71a261724730ec4c248494f044d multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 user 8bc2845510e2109af75e3eeac607ec81
+_md5_=29479ebda8f241cf5f80cef50c28b540
diff --git a/metadata/md5-cache/sys-process/glances-3.0 b/metadata/md5-cache/sys-process/glances-3.0
new file mode 100644
index 000000000000..141fb1c022d1
--- /dev/null
+++ b/metadata/md5-cache/sys-process/glances-3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=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/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=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=CLI curses based monitoring tool
+EAPI=6
+HOMEPAGE=https://github.com/nicolargo/glances
+IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 kernel_linux
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=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/sphinx_rtd_theme[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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(-)] >=dev-python/psutil-2.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[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) python_targets_python3_6? ( dev-lang/python:3.6[ncurses] ) >=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/G/Glances/Glances-3.0.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 8595c9c7530ac3963f3aa0d77aa7e2d8 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 linux-info 915cae3d7d636732918d18827fb1c226 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib 97f470f374f2e94ccab04a2fb21d811e multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=a5cc0ce4c63e01c27c2d29a32cbb5b29
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 4054968a2008..ad37b5ac1e38 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/nextcloud-12.0.11 b/metadata/md5-cache/www-apps/nextcloud-12.0.11
new file mode 100644
index 000000000000..a50cb1427f2a
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-12.0.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=6
+HOMEPAGE=http://nextcloud.com
+IUSE=+curl mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND==app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=12.0.11
+SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-12.0.11.tar.bz2
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 6ae2395d7f341093c36057cb4f69101a
+_md5_=7cf468114efe2c404282baf2ffcbd299
diff --git a/metadata/md5-cache/www-apps/nextcloud-13.0.6 b/metadata/md5-cache/www-apps/nextcloud-13.0.6
new file mode 100644
index 000000000000..bcf77479cc71
--- /dev/null
+++ b/metadata/md5-cache/www-apps/nextcloud-13.0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=Personal cloud that runs on your own server
+EAPI=6
+HOMEPAGE=http://nextcloud.com
+IUSE=+curl mysql postgres +sqlite vhosts
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=AGPL-3
+RDEPEND=dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip] virtual/httpd-php >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysql postgres sqlite )
+SLOT=13.0.6
+SRC_URI=http://download.nextcloud.com/server/releases/nextcloud-13.0.6.tar.bz2
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf webapp 6ae2395d7f341093c36057cb4f69101a
+_md5_=6f4bad2fa3b0a97b6782c03c50e4195a
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 549fda74c37e..0a4a5da67b2b 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/opera-developer-57.0.3065.0 b/metadata/md5-cache/www-client/opera-developer-57.0.3065.0
new file mode 100644
index 000000000000..3e49ad544573
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-developer-57.0.3065.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare setup unpack
+DEPEND=>=sys-apps/sed-4 >=app-arch/rpm2targz-9.0.0.3g
+DESCRIPTION=A fast and secure web browser
+EAPI=5
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+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+:3 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=amd64? ( https://download1.operacdn.com/pub/opera-developer/57.0.3065.0/linux/opera-developer_57.0.3065.0_amd64.rpm https://download2.operacdn.com/pub/opera-developer/57.0.3065.0/linux/opera-developer_57.0.3065.0_amd64.rpm https://download3.operacdn.com/pub/opera-developer/57.0.3065.0/linux/opera-developer_57.0.3065.0_amd64.rpm https://download4.operacdn.com/pub/opera-developer/57.0.3065.0/linux/opera-developer_57.0.3065.0_amd64.rpm )
+_eclasses_=chromium-2 3d468f3fc7ed63c78db7408ea04246e3 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 linux-info 915cae3d7d636732918d18827fb1c226 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 rpm f52cfa3a435468d86d3b49c357b9cb35 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=6fd83e223adcfac52cf69a374e54102b
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index cb91b90c2fba..6b431e5be4c1 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/passff-1.3 b/metadata/md5-cache/www-plugins/passff-1.5.1
similarity index 84%
rename from metadata/md5-cache/www-plugins/passff-1.3
rename to metadata/md5-cache/www-plugins/passff-1.5.1
index fb271d296976..69fc3ea9dcdf 100644
--- a/metadata/md5-cache/www-plugins/passff-1.3
+++ b/metadata/md5-cache/www-plugins/passff-1.5.1
@@ -9,6 +9,6 @@ LICENSE=GPL-2
RDEPEND=www-plugins/passff-host[firefox]
REQUIRED_USE=|| ( firefox firefox-bin )
SLOT=0
-SRC_URI=https://addons.mozilla.org/firefox/downloads/file/914592/passff-1.3-an+fx-linux.xpi
+SRC_URI=https://addons.mozilla.org/firefox/downloads/file/1056515/passff-1.5.1-an+fx-linux.xpi
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e mozextension 89a560beaf496e7cb89f3d79d4aef09e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6ff8b0a4172ec584c57608a3f968f340
+_md5_=5e431da83509872b72f354019a4e81a6
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index 8328ca3081a8..0aef55fc01f0 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/lightdm-1.28.0 b/metadata/md5-cache/x11-misc/lightdm-1.28.0
new file mode 100644
index 000000000000..08e5213de486
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/lightdm-1.28.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig gnome? ( gnome-base/gnome-common ) vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) >=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=A lightweight display manager
+EAPI=6
+HOMEPAGE=https://www.freedesktop.org/wiki/Software/LightDM
+IUSE=audit +gnome +gtk +introspection qt5 vala
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-3 LGPL-3
+PDEPEND=gtk? ( x11-misc/lightdm-gtk-greeter )
+RDEPEND=>=dev-libs/glib-2.44.0:2 dev-libs/libxml2 virtual/pam x11-libs/libX11 >=x11-libs/libxklavier-5 audit? ( sys-process/audit ) gnome? ( sys-apps/accountsservice ) introspection? ( >=dev-libs/gobject-introspection-1 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 ) >=sys-auth/pambase-20101024-r2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/CanonicalLtd/lightdm/releases/download/1.28.0/lightdm-1.28.0.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool 0081a71a261724730ec4c248494f044d ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 readme.gentoo-r1 22ae82e140bdd95d17a34fd5fd733190 systemd 47c677ae1d7b69031f11f630ac09f0d1 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vala 2f3804278870542119da624a5eded505 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
+_md5_=5b155d55b0ffec203575586927f9d1a7
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index 4feb625e9991..e8a1901c2c5b 100644
Binary files a/metadata/md5-cache/xfce-base/Manifest.gz and b/metadata/md5-cache/xfce-base/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-base/xfwm4-4.13.1-r1 b/metadata/md5-cache/xfce-base/xfwm4-4.13.1-r1
index d847b19613a3..467a65c8928e 100644
--- a/metadata/md5-cache/xfce-base/xfwm4-4.13.1-r1
+++ b/metadata/md5-cache/xfce-base/xfwm4-4.13.1-r1
@@ -3,11 +3,11 @@ DEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= x11-l
DESCRIPTION=Window manager for the Xfce desktop environment
EAPI=6
HOMEPAGE=https://www.xfce.org/projects/
-IUSE=opengl startup-notification +xcomposite xpresent
+IUSE=opengl startup-notification +xcomposite +xpresent
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
LICENSE=GPL-2
RDEPEND=dev-libs/dbus-glib:= >=dev-libs/glib-2.20:= >=x11-libs/gtk+-3.20:3= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/pango:= >=x11-libs/libwnck-3.14:3= >=xfce-base/libxfce4util-4.10:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/xfconf-4.13:= opengl? ( media-libs/libepoxy:=[X(+)] ) startup-notification? ( x11-libs/startup-notification:= ) xpresent? ( x11-libs/libXpresent ) xcomposite? ( x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXfixes:= )
SLOT=0
SRC_URI=https://archive.xfce.org/src/xfce/xfwm4/4.13/xfwm4-4.13.1.tar.bz2 https://dev.gentoo.org/~mgorny/dist/xfwm4-4.13.1-patchset.tar.bz2
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib 97f470f374f2e94ccab04a2fb21d811e preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs e4a9360924c5ce9f52e61342cde58512 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 89bb9f083a2590d9b447fd0b78a96186
-_md5_=130820a90633ceea6c57e2da7930eb46
+_md5_=1517b7928a11cabc0a08e9f5db6fdf0a
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9c06c1af03e1..363878b75a9e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 03 Sep 2018 10:08:31 +0000
+Wed, 05 Sep 2018 04:38:33 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 8933c3490165..bd257fd9b57c 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -2891,16 +2891,6 @@ developers and volunteer mentors.
Craig Andrews
Member
-
- dlan@gentoo.org
- Yixun Lan
- Member
-
-
- dlan@gentoo.org
- Lan Yixun
- Member
-
gyakovlev@gentoo.org
Georgy Yakovlev
@@ -2911,11 +2901,6 @@ developers and volunteer mentors.
Jonas Stein
Deputy lead
-
- k_f@gentoo.org
- Kristian Fiskerstrand
- Member
-
maksbotan@gentoo.org
Maxim Koltsov
@@ -2961,16 +2946,6 @@ developers and volunteer mentors.
Virgil Dupras
Member
-
- wraeth@gentoo.org
- Sam Jorna
- Member
-
-
- xmw@gentoo.org
- Michael Weber
- Member
-
zlogene@gentoo.org
Mikle Kolyada
diff --git a/metadata/timestamp b/metadata/timestamp
index 4e9b8034cb56..5a903a5efe1c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Sep 3 10:08:31 UTC 2018
+Wed Sep 5 04:38:33 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6be4b3885de3..90f73723c143 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 03 Sep 2018 10:30:02 +0000
+Wed, 05 Sep 2018 05:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index ad958b0e580e..900aa2505391 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-90ac5a509565a54d762ad85de93a1733309bf137 1535967734 2018-09-03T09:42:14+00:00
+9167d7d244d9ee01fb3c7f77a28f1512d6154462 1536118477 2018-09-05T03:34:37+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index ebdaca75c0b4..ecaa56207200 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1535969101 Mon 03 Sep 2018 10:05:01 AM UTC
+1536122101 Wed 05 Sep 2018 04:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 9c06c1af03e1..363878b75a9e 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 03 Sep 2018 10:08:31 +0000
+Wed, 05 Sep 2018 04:38:33 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index b95b3d6577e3..37dedd9a2cd4 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild b/net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild
new file mode 100644
index 000000000000..635111837e4c
--- /dev/null
+++ b/net-analyzer/icinga2/icinga2-2.9.1-r1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+if [[ ${PV} != 9999 ]]; then
+ inherit cmake-utils depend.apache eutils systemd toolchain-funcs user wxwidgets
+ SRC_URI="https://github.com/Icinga/icinga2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+else
+ inherit cmake-utils depend.apache eutils git-r3 systemd toolchain-funcs user wxwidgets
+ EGIT_REPO_URI="https://github.com/Icinga/icinga2.git"
+ EGIT_BRANCH="master"
+ KEYWORDS=""
+fi
+
+DESCRIPTION="Distributed, general purpose, network monitoring engine"
+HOMEPAGE="http://icinga.org/icinga2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+mysql postgres classicui console libressl lto mail minimal nano-syntax +plugins systemd +vim-syntax"
+WX_GTK_VER="3.0"
+
+CDEPEND="
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ >=dev-libs/boost-1.58-r1
+ console? ( dev-libs/libedit )
+ mysql? ( virtual/mysql )
+ postgres? ( dev-db/postgresql:= )
+ dev-libs/yajl"
+
+DEPEND="
+ ${CDEPEND}
+ sys-devel/bison
+ >=sys-devel/flex-2.5.35"
+
+RDEPEND="
+ ${CDEPEND}
+ plugins? ( || (
+ net-analyzer/monitoring-plugins
+ net-analyzer/nagios-plugins
+ ) )
+ mail? ( virtual/mailx )
+ classicui? ( net-analyzer/icinga[web] )"
+
+REQUIRED_USE="!minimal? ( || ( mysql postgres ) )"
+
+want_apache2
+
+pkg_setup() {
+ depend.apache_pkg_setup
+ enewgroup icinga
+ enewgroup icingacmd
+ enewgroup nagios # for plugins
+ enewuser icinga -1 -1 /var/lib/icinga2 "icinga,icingacmd,nagios"
+}
+
+src_configure() {
+ sed -i 's/FLAGS\}\ \-g/FLAGS\}\ \-lpthread\ /g' CMakeLists.txt || die
+ local mycmakeargs=(
+ -DICINGA2_UNITY_BUILD=FALSE
+ -DCMAKE_VERBOSE_MAKEFILE=ON
+ -DCMAKE_BUILD_TYPE=None
+ -DCMAKE_INSTALL_PREFIX=/usr
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc
+ -DCMAKE_INSTALL_LOCALSTATEDIR=/var
+ -DICINGA2_SYSCONFIGFILE=/etc/conf.d/icinga2
+ -DICINGA2_PLUGINDIR="/usr/$(get_libdir)/nagios/plugins"
+ -DICINGA2_USER=icinga
+ -DICINGA2_GROUP=icingacmd
+ -DICINGA2_COMMAND_GROUP=icingacmd
+ -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=yes
+ -DUSE_SYSTEMD=$(usex systemd ON OFF)
+ -DLOGROTATE_HAS_SU=ON
+ )
+ # default to off if minimal, allow the flags to be set otherwise
+ if use minimal; then
+ mycmakeargs+=(
+ -DICINGA2_WITH_MYSQL=OFF
+ -DICINGA2_WITH_PGSQL=OFF
+ )
+ else
+ mycmakeargs+=(
+ -DICINGA2_WITH_PGSQL=$(usex postgres ON OFF)
+ -DICINGA2_WITH_MYSQL=$(usex mysql ON OFF)
+ )
+ fi
+ # LTO
+ if use lto; then
+ mycmakeargs+=(
+ -DICINGA2_LTO_BUILD=ON
+ )
+ else
+ mycmakeargs+=(
+ -DICINGA2_LTO_BUILD=OFF
+ )
+ fi
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ BUILDDIR="${WORKDIR}"/icinga2-${PV}_build
+ cd "${BUILDDIR}" || die
+
+ emake DESTDIR="${D}" install
+
+ einstalldocs
+
+ newinitd "${FILESDIR}"/icinga2.initd-2 icinga2
+
+ if use mysql ; then
+ docinto schema
+ newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/mysql.sql mysql.sql
+ docinto schema/upgrade
+ dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_mysql/schema/upgrade/*
+ elif use postgres ; then
+ docinto schema
+ newdoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/pgsql.sql pgsql.sql
+ docinto schema/upgrade
+ dodoc "${WORKDIR}"/icinga2-${PV}/lib/db_ido_pgsql/schema/upgrade/*
+ fi
+
+ keepdir /etc/icinga2
+ keepdir /var/lib/icinga2/api/zones
+ keepdir /var/lib/icinga2/api/repository
+ keepdir /var/lib/icinga2/api/log
+ keepdir /var/spool/icinga2/perfdata
+
+ rm -r "${D}/var/run" || die "failed to remove /var/run"
+ rm -r "${D}/var/cache" || die "failed to remove /var/cache"
+
+ fowners root:icinga /etc/icinga2
+ fperms 0750 /etc/icinga2
+ fowners icinga:icinga /var/lib/icinga2
+ fowners icinga:icinga /var/spool/icinga2
+ fowners -R icinga:icingacmd /var/lib/icinga2/api
+ fowners icinga:icinga /var/spool/icinga2/perfdata
+ fowners icinga:icingacmd /var/log/icinga2
+
+ fperms ug+rwX,o-rwx /etc/icinga2
+ fperms ug+rwX,o-rwx /var/lib/icinga2
+ fperms ug+rwX,o-rwx /var/spool/icinga2
+ fperms ug+rwX,o-rwx /var/log/icinga2
+
+ if use vim-syntax; then
+ insinto /usr/share/vim/vimfiles
+ doins -r "${WORKDIR}"/${P}/tools/syntax/vim/ftdetect
+ doins -r "${WORKDIR}"/${P}/tools/syntax/vim/syntax
+ fi
+
+ if use nano-syntax; then
+ insinto /usr/share/nano
+ doins "${WORKDIR}"/${P}/tools/syntax/nano/icinga2.nanorc
+ fi
+}
+
+pkg_postinst() {
+ if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} && ${REPLACING_VERSIONS} != ${PV} ]]; then
+ elog "DB IDO schema upgrade may be required required.
+ https://www.icinga.com/docs/icinga2/latest/doc/16-upgrading-icinga-2/"
+ fi
+}
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index cedd09e7dce0..635111837e4c 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-9999.ebuild
@@ -27,7 +27,8 @@ CDEPEND="
>=dev-libs/boost-1.58-r1
console? ( dev-libs/libedit )
mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql:= )"
+ postgres? ( dev-db/postgresql:= )
+ dev-libs/yajl"
DEPEND="
${CDEPEND}
diff --git a/net-analyzer/nagios-core/Manifest b/net-analyzer/nagios-core/Manifest
index 11a8055082ab..bb184319683c 100644
--- a/net-analyzer/nagios-core/Manifest
+++ b/net-analyzer/nagios-core/Manifest
@@ -2,4 +2,5 @@ DIST nagios-4.3.3.tar.gz 11101531 BLAKE2B 537d49ecf28b457fbc1e24eaaa9c5d9e8c4db5
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-4.4.1.tar.gz 11296403 BLAKE2B fdbaec5f913d18d5591f44cd1e0622b9741d7415b591f24f1521f2897b8a1bdbff00e9378ef6b3a6a99ab8d639960abd3d734fd66b665ea88ea1de169b552ace SHA512 d84f22a8fd21a573b4162f232c3a6bb2ba0b7d3a470e5fd80183a1862d2ae666956cfc2dd4c7fe6319ee7ccedb9f8a6920ba39a6b499ed9ff5b8be60a9779fa9
+DIST nagios-4.4.2.tar.gz 11301454 BLAKE2B 1b5ffa775bbf147e96d07edd36a387db271802d58cc1a1d1eb867645955aec0044e757785578a60c12549bd4e66e4c95ef06dd0f3f8be3599187d0ef0bcc8a4b SHA512 a6ddb2d8ca1c523d02659a2af0b9c67a3802893c946279bb15be53645dc64c997cd5562b77eab9dae03e756ec6622a9a641f7bd68269aba4ddd56ee21f50959e
DIST nagios-core-gentoo-icons-20141125.tar 40960 BLAKE2B 31c1953e1160c7c7b89606b72b1a80407e4c1b7a7938b40bd1c577cd0c309dd88ca6b775d692a9b846dbf67736537fa9c91e56aa15fdd447769608ca525bff09 SHA512 bf109879cddd6136b76baba55d0b60b2596e37431dcf5ce0905d34a9fa292ebf7e4bde82d9a084362c486e8fac344c76d88f9298b1b85541ed70ffd608493766
diff --git a/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch b/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch
new file mode 100644
index 000000000000..3c5eb030547c
--- /dev/null
+++ b/net-analyzer/nagios-core/files/nagios-4.4.3-pre.patch
@@ -0,0 +1,42 @@
+diff --git a/Changelog b/Changelog
+index c695bd54..4c348894 100644
+--- a/Changelog
++++ b/Changelog
+@@ -2,6 +2,11 @@
+ Nagios Core 4 Change Log
+ ########################
+
++4.4.3 - 2018-XX-XX
++------------------
++FIXES
++* Fixed services sending recovery emails when they recover if host in down state (#572) (Scott Wilkerson)
++
+ 4.4.2 - 2018-08-16
+ ------------------
+ FIXES
+diff --git a/base/notifications.c b/base/notifications.c
+index d4574c41..58ad140f 100644
+--- a/base/notifications.c
++++ b/base/notifications.c
+@@ -591,10 +591,6 @@ int check_service_notification_viability(service *svc, int type, int options) {
+ return ERROR;
+ }
+
+- /***** RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT *****/
+- if(svc->current_state == STATE_OK)
+- return OK;
+-
+ /* don't notify contacts about this service problem again if the notification interval is set to 0 */
+ if(svc->no_more_notifications == TRUE) {
+ log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify contacts about this service problem.\n");
+@@ -1501,10 +1497,6 @@ int check_host_notification_viability(host *hst, int type, int options) {
+ return ERROR;
+ }
+
+- /***** RECOVERY NOTIFICATIONS ARE GOOD TO GO AT THIS POINT *****/
+- if(hst->current_state == HOST_UP)
+- return OK;
+-
+ /* check if we shouldn't renotify contacts about the host problem */
+ if(hst->no_more_notifications == TRUE) {
+ log_debug_info(DEBUGL_NOTIFICATIONS, 1, "We shouldn't re-notify contacts about this host problem.\n");
diff --git a/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
new file mode 100644
index 000000000000..cb47956dba4d
--- /dev/null
+++ b/net-analyzer/nagios-core/nagios-core-4.4.2.ebuild
@@ -0,0 +1,218 @@
+# 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 )"
+
+PATCHES=(
+ "${FILESDIR}/nagios-4.4.3-pre.patch"
+)
+
+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.2.ebuild b/net-analyzer/nagios/nagios-4.4.2.ebuild
new file mode 100644
index 000000000000..a29da55bee71
--- /dev/null
+++ b/net-analyzer/nagios/nagios-4.4.2.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-analyzer/sec/Manifest b/net-analyzer/sec/Manifest
index 27043d2fdab6..f8b92529c902 100644
--- a/net-analyzer/sec/Manifest
+++ b/net-analyzer/sec/Manifest
@@ -1,3 +1,3 @@
-DIST sec-2.7.11.tar.gz 134533 BLAKE2B ec50f1d4c930f17aa64f1de57a1af54867da6e189b3a36a979e87502ba4366d419a8f8e8d03df799a278833667294890357d9a6a92b41c0b8e975b1b5ab8928f SHA512 2de3c131f85029a91e7db1405be236b8ef31454bdffa28d5a2f912af73a2d0b0fbfb37a2f1548f7899ae3c43248e9c20084b7cb55a6b309c00d103d8b8019e80
DIST sec-2.7.12.tar.gz 134197 BLAKE2B 9997788c61a35c87036e6347c93782aacdd34e4cd3f6ec5d457a571237d5594b3f7860ab7be4ef37638c2dc1b22f7de666bdd287ae634d8ab259e0c0dd04d8bf SHA512 927ce602057c58993d7abd0aca0a7cde7ce6f77af01f72a414d165b93326a8e0a12bb5bc8c1f8d7737416beb16de92911db5ea20a8109e343e2e26e8efc649bd
DIST sec-2.7.6.tar.gz 121621 BLAKE2B 43dbccd05aa274459ba8746c8aba33bae0307929524a9ad77087a6c28305b2f0b7d34f9cb79b7503d2269b84524687b24441263ee99a7061c0e033e15e4b9f01 SHA512 9c050b89970663784f5c149d46c6c6ab941590ef4300ca09ea35b347b2eaa3bad12083bd6e619f25d5024a35de69e020c354b507ac49e3faef1013336ea2d5f5
+DIST sec-2.8.0.tar.gz 143621 BLAKE2B f547635ee42860b6e9caa2d2a0604e91d3ae5c0846e10d5c9352650d822d9e2d884892c455b9cef3b39e649258720f4761055dd78d74ec6c6be4455438a4fb60 SHA512 e0a4bdc07c80ef6b061b20d4b444ff8dc406a63cf48a77defa3563d6980f5b5bc9f6ff8d70b2ff51e9f40955655ad3c750be5a01726a848b80a84aec0d6d1bad
diff --git a/net-analyzer/sec/sec-2.7.11.ebuild b/net-analyzer/sec/sec-2.8.0.ebuild
similarity index 92%
rename from net-analyzer/sec/sec-2.7.11.ebuild
rename to net-analyzer/sec/sec-2.8.0.ebuild
index e109badd5d25..e7f3b225461f 100644
--- a/net-analyzer/sec/sec-2.7.11.ebuild
+++ b/net-analyzer/sec/sec-2.8.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
DESCRIPTION="Simple Event Correlator"
HOMEPAGE="https://github.com/simple-evcorr/sec"
diff --git a/net-analyzer/wireshark/wireshark-2.6.3.ebuild b/net-analyzer/wireshark/wireshark-2.6.3.ebuild
index abfa5bc13ee5..5b6d3b5de968 100644
--- a/net-analyzer/wireshark/wireshark-2.6.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.6.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}download/src/all-versions/${P/_/}.tar.xz"
LICENSE="GPL-2"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~ppc64 x86"
IUSE="
adns androiddump bcg729 +capinfos +captype ciscodump +dftest doc
+dumpcap +editcap gtk kerberos libxml2 lua lz4 maxminddb +mergecap +netlink
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 52f6e065a419..4941bfcf6413 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/ddclient/ddclient-3.9.0.ebuild b/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
similarity index 89%
rename from net-dns/ddclient/ddclient-3.9.0.ebuild
rename to net-dns/ddclient/ddclient-3.9.0-r1.ebuild
index 850df0d44449..5e18aacab160 100644
--- a/net-dns/ddclient/ddclient-3.9.0.ebuild
+++ b/net-dns/ddclient/ddclient-3.9.0-r1.ebuild
@@ -46,15 +46,13 @@ src_prepare() {
src_install() {
dobin ddclient
- newinitd "${FILESDIR}"/ddclient.initd-r5 ddclient
- systemd_newunit "${FILESDIR}"/ddclient.service-r1 ddclient
-
insinto /etc/ddclient
insopts -m 0600 -o ddclient -g ddclient
newins sample-etc_ddclient.conf ddclient.conf
newinitd "${FILESDIR}"/ddclient.initd-r5 ddclient
- systemd_dounit "${FILESDIR}"/ddclient.service
+ systemd_newunit "${FILESDIR}"/ddclient.service-r1 ddclient.service
+ systemd_newtmpfilesd "${FILESDIR}"/ddclient.tmpfiles ddclient.conf
dodoc Change* README* RELEASENOTE TODO UPGRADE
diff --git a/net-dns/ddclient/files/ddclient.service-r1 b/net-dns/ddclient/files/ddclient.service-r1
index 77cc3f7aa5e1..d183b4f2a6c7 100644
--- a/net-dns/ddclient/files/ddclient.service-r1
+++ b/net-dns/ddclient/files/ddclient.service-r1
@@ -4,7 +4,7 @@ ConditionPathExists=/etc/ddclient/ddclient.conf
Description=DDclient
[Service]
-ExecStart=/usr/sbin/ddclient --foreground
+ExecStart=/usr/bin/ddclient --foreground
Group=ddclient
Type=simple
User=ddclient
diff --git a/net-dns/ddclient/files/ddclient.tmpfiles b/net-dns/ddclient/files/ddclient.tmpfiles
new file mode 100644
index 000000000000..4c6cc19ab943
--- /dev/null
+++ b/net-dns/ddclient/files/ddclient.tmpfiles
@@ -0,0 +1,3 @@
+z /etc/ddclient/ddclient.conf 0600 ddclient ddclient - -
+d /run/ddclient 0700 ddclient ddclient - -
+d /var/cache/ddclient 0700 ddclient ddclient - -
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 25e0fdec11ae..d438727513d5 100644
Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ
diff --git a/net-ftp/tlswrap/tlswrap-1.04-r3.ebuild b/net-ftp/tlswrap/tlswrap-1.04-r3.ebuild
index f560a6c65370..4bb88bbe38ec 100644
--- a/net-ftp/tlswrap/tlswrap-1.04-r3.ebuild
+++ b/net-ftp/tlswrap/tlswrap-1.04-r3.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,8 +6,8 @@ EAPI=6
inherit autotools
DESCRIPTION="FTP wrapper which supports TLS with every FTP client"
-HOMEPAGE="http://www.tlswrap.com/"
-SRC_URI="http://www.tlswrap.com/${P}.tar.gz"
+HOMEPAGE="https://www.tlswrap.com/"
+SRC_URI="https://www.tlswrap.com/${P}.tar.gz"
# GPL-2 for Gentoo init script
LICENSE="BSD GPL-2"
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index ffb74aaa6d0f..6dbaaa5c46b9 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index d498e28b7f19..6a319e29c690 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -1,2 +1,3 @@
DIST hexchat-2.12.4.tar.xz 1451468 BLAKE2B 91db1486b421f9707f9dddfe8aba812aa283d5e3cc3c12815faa7e515d00b803bde0bbf30e1ca5c0b69fe954dd30a6f69e5094dabe1dc641ae4f0742ad1965b4 SHA512 48d30c23973a19efc7a8e6d00a3e9675e8556a6fa9da046175b3d87bdab0bebbc6caf58970d654e270421d0d49c2cd9f498b425b7e3a49dd81670dc4825fca40
DIST hexchat-2.14.1.tar.xz 1281872 BLAKE2B e450fe7391b8b51a7aebeaeacdb5f1fb6c00184f668813920d98ed6a00dd4c0308863657467b7608987feb0739ac85256d93ca9ef8a220e6c7a5545d8386f25d SHA512 2728d6f084530c1a65ddb7960db6574fef2bca77e726a2155c8b5724256f37b47421e990b1bf7c9fad7987027b2f6de4534a8df28a98cb3d28da726e16ac32dd
+DIST hexchat-2.14.2.tar.xz 1288732 BLAKE2B 93001bf48516e0326c4df16945ff8a157e7a410ca202d1231657c9fb439ddd4a7515aacea0b0fff92365d477aa24c90d37aa61466495354dcdf5578d7accfa65 SHA512 488799700e439a137ad469f618cb1abf75d1f1ebf223c750d658004ef7b2c728543a5a9ae4e6317d6447428dc59e12dded619346a5d8bba12c92dab653512fca
diff --git a/net-irc/hexchat/hexchat-2.14.2.ebuild b/net-irc/hexchat/hexchat-2.14.2.ebuild
new file mode 100644
index 000000000000..ee382d60463e
--- /dev/null
+++ b/net-irc/hexchat/hexchat-2.14.2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+
+inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
+
+DESCRIPTION="Graphical IRC client based on XChat"
+HOMEPAGE="https://hexchat.github.io/"
+
+if [[ "${PV}" == "9999" ]] ; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+else
+ SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+fi
+
+LICENSE="GPL-2 plugin-fishlim? ( MIT )"
+SLOT="0"
+IUSE="dbus debug +gtk libcanberra libnotify libproxy libressl lua perl plugin-checksum plugin-fishlim plugin-sysinfo python ssl theme-manager"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+ dev-libs/glib:2
+ dbus? ( dev-libs/dbus-glib )
+ gtk? (
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:2
+ x11-libs/libX11
+ x11-libs/pango
+ )
+ libcanberra? ( media-libs/libcanberra )
+ libproxy? ( net-libs/libproxy )
+ libnotify? ( x11-libs/libnotify )
+ lua? ( dev-lang/lua:= )
+ perl? ( dev-lang/perl )
+ plugin-sysinfo? ( sys-apps/pciutils )
+ python? ( ${PYTHON_DEPS} )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ theme-manager? (
+ || (
+ ( dev-lang/mono[minimal] dev-dotnet/libgdiplus )
+ dev-lang/mono[-minimal]
+ )
+ )"
+
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="
+ ${COMMON_DEPEND}
+ app-arch/xz-utils
+ app-text/iso-codes
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ if use theme-manager ; then
+ mono-env_pkg_setup
+ export XDG_CACHE_HOME="${T}/.cache"
+ fi
+}
+
+src_configure() {
+ local emesonargs=(
+ -Dwith-gtk="$(usex gtk true false)"
+ -Dwith-text="$(usex gtk false true)"
+ -Dwith-ssl="$(usex ssl true false)"
+ -Dwith-plugin=true
+ -Dwith-dbus="$(usex dbus true false)"
+ -Dwith-libproxy="$(usex libproxy true false)"
+ -Dwith-libnotify="$(usex libnotify true false)"
+ -Dwith-libcanberra="$(usex libcanberra true false)"
+ -Dwith-theme-manager="$(usex theme-manager true false)"
+ -Ddbus-service-use-appid=false
+ -Dwith-checksum="$(usex plugin-checksum true false)"
+ -Dwith-fishlim="$(usex plugin-fishlim true false)"
+ -Dwith-lua="$(usex lua lua false)"
+ -Dwith-perl="$(usex perl "${EPREFIX}"/usr/bin/perl false)"
+ -Dwith-python="$(usex python "${EPYTHON/.*}" false)"
+ -Dwith-sysinfo="$(usex plugin-sysinfo true false)"
+ -Dwith-appdata=false
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ dodoc readme.md
+ find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+ if use gtk ; then
+ gnome2_icon_savelist
+ fi
+}
+
+pkg_postinst() {
+ if use gtk ; then
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ else
+ elog "You have disabled the gtk USE flag. This means you don't have"
+ elog "the GTK-GUI for HexChat but only a text interface called \"hexchat-text\"."
+ fi
+
+ if use theme-manager ; then
+ elog "Themes are available at:"
+ elog " https://hexchat.github.io/themes.html"
+ fi
+
+ elog
+ elog "optional dependencies:"
+ elog " media-sound/sox (sound playback if you don't have libcanberra"
+ elog " enabled)"
+ elog " x11-plugins/hexchat-javascript (javascript support)"
+ elog " x11-themes/sound-theme-freedesktop (default BEEP sound,"
+ elog " needs libcanberra enabled)"
+}
+
+pkg_postrm() {
+ if use gtk ; then
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ fi
+}
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index b35c166c0a0d..ee382d60463e 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
inherit gnome2-utils meson mono-env python-single-r1 xdg-utils
@@ -83,9 +83,10 @@ src_configure() {
-Dwith-checksum="$(usex plugin-checksum true false)"
-Dwith-fishlim="$(usex plugin-fishlim true false)"
-Dwith-lua="$(usex lua lua false)"
- -Dwith-perl="$(usex perl true false)"
+ -Dwith-perl="$(usex perl "${EPREFIX}"/usr/bin/perl false)"
-Dwith-python="$(usex python "${EPYTHON/.*}" false)"
-Dwith-sysinfo="$(usex plugin-sysinfo true false)"
+ -Dwith-appdata=false
)
meson_src_configure
}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index e33aae81bb9e..1069e2885c33 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libad9361-iio/Manifest b/net-libs/libad9361-iio/Manifest
new file mode 100644
index 000000000000..ade8b02deb78
--- /dev/null
+++ b/net-libs/libad9361-iio/Manifest
@@ -0,0 +1 @@
+DIST libad9361-iio-0.1.tar.gz 27495 BLAKE2B d46873d69c494835e028ba1de7d17d48e5ed6bf1a73e96cf958dcfe44142cd39a9df3b00d61d3d3b8934bcb59fff3bd33c82f5c11de65f332185fe0e8c296f54 SHA512 64df3d4ce5e1c10fb44b6e39c11bac119ef77f2cc5b9785023b22670ca4905a1afd13c6923b3056f957789a911a3cae3cb7208770e1a112d849e7e3d2feb2fdc
diff --git a/net-libs/libad9361-iio/files/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch b/net-libs/libad9361-iio/files/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch
new file mode 100644
index 000000000000..6b1668f0a0e5
--- /dev/null
+++ b/net-libs/libad9361-iio/files/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch
@@ -0,0 +1,36 @@
+From 7206bb2a9b655be3bdb66c6cf03aa504817ed240 Mon Sep 17 00:00:00 2001
+From: Lars-Peter Clausen
+Date: Tue, 14 Aug 2018 09:48:59 +0200
+Subject: [PATCH] Fix building outside git repository
+
+Currently when building the project on a machine that has git installed,
+but the source is not inside a git repository cmake fails with the
+following error.
+
+ CMake Error at CMakeLists.txt:35 (if):
+ if given arguments:
+
+ "STREQUAL" "/home/lars/libad9361-iio"
+
+This is due to LIBAD9361_GIT_REPO variable being empty. In order to handle
+empty variables in CMake in a string comparison they need to be
+encapsulated in quotes.
+
+Signed-off-by: Lars-Peter Clausen
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7af5444..8d04ba0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,7 +32,7 @@ if (GIT_FOUND)
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+
+-if (${LIBAD9361_GIT_REPO} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
++if ("${LIBAD9361_GIT_REPO}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
+ execute_process(
+ COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild b/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild
new file mode 100644
index 000000000000..429ddc4b83f0
--- /dev/null
+++ b/net-libs/libad9361-iio/libad9361-iio-0.1-r2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc."
+HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+RDEPEND="net-libs/libiio:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch"
+ cmake-utils_src_prepare
+ eapply_user
+}
diff --git a/net-libs/libad9361-iio/libad9361-iio-9999.ebuild b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
new file mode 100644
index 000000000000..429ddc4b83f0
--- /dev/null
+++ b/net-libs/libad9361-iio/libad9361-iio-9999.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="IIO AD9361 library for filter design and handling, multi-chip sync, etc."
+HOMEPAGE="https://github.com/analogdevicesinc/libad9361-iio"
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="https://github.com/analogdevicesinc/libad9361-iio"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+
+RDEPEND="net-libs/libiio:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/7206bb2a9b655be3bdb66c6cf03aa504817ed240.patch"
+ cmake-utils_src_prepare
+ eapply_user
+}
diff --git a/net-libs/libad9361-iio/metadata.xml b/net-libs/libad9361-iio/metadata.xml
new file mode 100644
index 000000000000..36c978cfbdb6
--- /dev/null
+++ b/net-libs/libad9361-iio/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ zerochaos@gentoo.org
+ Rick Farina
+
+
+ radio@gentoo.org
+ Radio
+
+
+ analogdevicesinc/libad9361-iio
+
+
diff --git a/net-libs/libiio/Manifest b/net-libs/libiio/Manifest
new file mode 100644
index 000000000000..e9bb388854d0
--- /dev/null
+++ b/net-libs/libiio/Manifest
@@ -0,0 +1 @@
+DIST libiio-0.15.tar.gz 192704 BLAKE2B 7eeaad1535f69ca11fe3f716ac70a161f98d24513fe910cb34ca11a0b63c07f5b5321447c96c247cc9a76ed838d806fa9f160e87fd10f1aeac5025edfa16b8f6 SHA512 7e3ca1a8b97486f20baf38afecfd26c626bed1fef535d88020d11eb4e49fc1226390c6383799222f6811c13b8b7e5cc77fb899c776c150a9d1c2024bf8ab338b
diff --git a/net-libs/libiio/libiio-0.15-r1.ebuild b/net-libs/libiio/libiio-0.15-r1.ebuild
new file mode 100644
index 000000000000..64bf1679f217
--- /dev/null
+++ b/net-libs/libiio/libiio-0.15-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Library for interfacing with IIO devices"
+HOMEPAGE="https://github.com/analogdevicesinc/libiio"
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="https://github.com/analogdevicesinc/libiio"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="+aio +avahi"
+
+RDEPEND="dev-libs/libxml2:=
+ virtual/libusb:1=
+ aio? ( dev-libs/libaio )
+ avahi? ( net-dns/avahi )"
+DEPEND="${RDEPEND}"
diff --git a/net-libs/libiio/libiio-9999.ebuild b/net-libs/libiio/libiio-9999.ebuild
new file mode 100644
index 000000000000..64bf1679f217
--- /dev/null
+++ b/net-libs/libiio/libiio-9999.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Library for interfacing with IIO devices"
+HOMEPAGE="https://github.com/analogdevicesinc/libiio"
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="https://github.com/analogdevicesinc/libiio"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+IUSE="+aio +avahi"
+
+RDEPEND="dev-libs/libxml2:=
+ virtual/libusb:1=
+ aio? ( dev-libs/libaio )
+ avahi? ( net-dns/avahi )"
+DEPEND="${RDEPEND}"
diff --git a/net-libs/libiio/metadata.xml b/net-libs/libiio/metadata.xml
new file mode 100644
index 000000000000..01dc3884d2c9
--- /dev/null
+++ b/net-libs/libiio/metadata.xml
@@ -0,0 +1,18 @@
+
+
+
+
+ zerochaos@gentoo.org
+ Rick Farina
+
+
+ radio@gentoo.org
+ Radio
+
+
+
+ analogdevicesinc/libiio
+
+
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index dbbf852c2782..ac53341e4884 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -1,3 +1,4 @@
DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f8311c30364bbf06d4f01121a58f5b560e0a1d9071655ce9b310fa3f3f801e11e880ca3eacde66efa0f49dc51b2b SHA512 94b8183e5c83e339303c1a160c92ccff6159471ac7d189ab66cf6d606d2e803fd616519f079aef1577c947d3a14e315332b05ea08e44d0ab550edbcb768dbea7
DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775
DIST libssh-0.8.1.tar.xz 409572 BLAKE2B 65bf38c5bba803a588ff4a1cc5f774cacc43c500bf0aaa77674f9120eccda26027e446aeb9e61a2418eb81077fdb0aa55d8e014f6d466877a9cd96b665c5e7ce SHA512 6630d0b101dc109116ba7a6cffb00db1bc9b5bc6004c843c5361d3d97c6cf4c323129ebf3bbf25ab2fc1961b74520490d7a16999504849c07b26a25679724b93
+DIST libssh-0.8.2.tar.xz 408412 BLAKE2B bbd531ed511baa84d40c2e156cc63fca09345196e24e485930d8f42fed451529ea6ec2ce6f50276dfa56d5523062bbc45774891ad47ce7c748e8b95bc28b9f8c SHA512 ef9877d2a35f1871139c12452c917a3888172ea29f71d880e824de182695e5a8786bb39ca2f4874a160e156648d52065a8b2e7c040220badf65eee35dcfddeb9
diff --git a/net-libs/libssh/libssh-0.8.2.ebuild b/net-libs/libssh/libssh-0.8.2.ebuild
new file mode 100644
index 000000000000..641c1853e986
--- /dev/null
+++ b/net-libs/libssh/libssh-0.8.2.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-${PV/_rc/rc}"
+inherit cmake-multilib
+
+DESCRIPTION="Access a working SSH implementation by means of a library"
+HOMEPAGE="https://www.libssh.org/"
+
+if [[ "${PV}" == *9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.libssh.org/projects/libssh.git"
+else
+ inherit eapi7-ver
+ SRC_URI="https://www.libssh.org/files/$(ver_cut 1-2)/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/4" # subslot = soname major version
+IUSE="debug doc examples gcrypt gssapi libressl mbedtls pcap server +sftp static-libs test zlib"
+# Maintainer: check IUSE-defaults at DefineOptions.cmake
+
+RDEPEND="
+ !gcrypt? (
+ !mbedtls? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+ )
+ )
+ gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
+ gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+ mbedtls? ( net-libs/mbedtls[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
+"
+
+REQUIRED_USE="?? ( gcrypt mbedtls )"
+
+DOCS=( AUTHORS README ChangeLog )
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.8.0-tests.patch"
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # just install the examples do not compile them
+ sed -i \
+ -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
+ CMakeLists.txt || die
+
+ # keyfile torture test is currently broken
+ sed -i \
+ -e '/torture_keyfiles/d' \
+ tests/unittests/CMakeLists.txt || die
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DUNIT_TESTING="$(usex test)"
+ -DWITH_DEBUG_CALLTRACE="$(usex debug)"
+ -DWITH_DEBUG_CRYPTO="$(usex debug)"
+ -DWITH_GCRYPT="$(usex gcrypt)"
+ -DWITH_GSSAPI="$(usex gssapi)"
+ -DWITH_MBEDTLS="$(usex mbedtls)"
+ -DWITH_NACL=no
+ -DWITH_PCAP="$(usex pcap)"
+ -DWITH_SERVER="$(usex server)"
+ -DWITH_SFTP="$(usex sftp)"
+ -DWITH_STACK_PROTECTOR=OFF
+ -DWITH_STATIC_LIB="$(usex static-libs)"
+ -DWITH_STATIC_LIB="$(usex test)"
+ -DWITH_ZLIB="$(usex zlib)"
+ )
+
+ cmake-utils_src_configure
+}
+
+multilib_src_compile() {
+ cmake-utils_src_compile
+ multilib_is_native_abi && use doc && cmake-utils_src_compile doc
+}
+
+multilib_src_install() {
+ cmake-utils_src_install
+
+ if multilib_is_native_abi && use doc ; then
+ docinto html
+ dodoc -r doc/html/.
+ fi
+
+ use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh.a
+
+ # compatibility symlink until all consumers have been updated
+ # to no longer use libssh_threads.so
+ dosym libssh.so /usr/$(get_libdir)/libssh_threads.so
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use examples; then
+ docinto examples
+ dodoc examples/*.{c,h,cpp}
+ fi
+}
diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest
index 95af0c27cb39..96612140117d 100644
--- a/net-libs/libtirpc/Manifest
+++ b/net-libs/libtirpc/Manifest
@@ -1,3 +1,4 @@
DIST libtirpc-1.0.2.tar.bz2 509601 BLAKE2B 7ccf23ca200e2027a66a3105d9b3d0612ac66a08498931f66526a291be6ddef8e7df533af4d44a0e4a1178edd6d51ae39ca50c2536b9b1be7179e7f17cfd165e SHA512 6c819019a8e81d8263d3c509b2eee59ba1ef092222c5a0a8d28f004c711afa252097eca7e6b0b919b2d780883dfd9ee7a363df4cee7fd2c9159a065257637cec
DIST libtirpc-1.0.3.tar.bz2 509831 BLAKE2B 3f908471b3e10f88329793db2c832754b9bb838d115235d7c25256da883960de8d8c94a6941fc9c2a3cc4dca9a77c32b5cb85bb347cc182e5a6255636b79b06e SHA512 1f1cf7dd6f30ddddc919e4caf6db926f1d532f78d5a93e8aaa2acde6b046be0650c4c46549da0ffd5fa7fb9e550af1a871ed6e02ededf504c6667d2e82eba2cc
+DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B 1780f9bb0543583c01b60bda681add0ec2f8718eda4ce4653883c772466178e37d0a3fb47004109f81de470129458561fac4f109f45154c64b6fb729f0212c90 SHA512 392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23
DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba
diff --git a/net-libs/libtirpc/libtirpc-1.0.3.ebuild b/net-libs/libtirpc/libtirpc-1.0.3.ebuild
index e31c61c152ba..edd425c4147f 100644
--- a/net-libs/libtirpc/libtirpc-1.0.3.ebuild
+++ b/net-libs/libtirpc/libtirpc-1.0.3.ebuild
@@ -27,7 +27,6 @@ PATCHES=(
src_prepare() {
cp -r "${WORKDIR}"/tirpc "${S}"/ || die
default
- eapply_user
eautoreconf
}
diff --git a/net-libs/libtirpc/libtirpc-1.1.4.ebuild b/net-libs/libtirpc/libtirpc-1.1.4.ebuild
new file mode 100644
index 000000000000..edd425c4147f
--- /dev/null
+++ b/net-libs/libtirpc/libtirpc-1.1.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal toolchain-funcs
+
+DESCRIPTION="Transport Independent RPC library (SunRPC replacement)"
+HOMEPAGE="http://libtirpc.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+ mirror://gentoo/${PN}-glibc-nfs.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0/3" # subslot matches SONAME major
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 kerberos static-libs"
+
+RDEPEND="kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.2-bcopy-to-memmove.patch"
+)
+
+src_prepare() {
+ cp -r "${WORKDIR}"/tirpc "${S}"/ || die
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable ipv6)
+ $(use_enable kerberos gssapi)
+ $(use_enable static-libs static)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+ default
+
+ # libtirpc replaces rpc support in glibc, so we need it in /
+ gen_usr_ldscript -a tirpc
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ insinto /etc
+ doins doc/netconfig
+
+ insinto /usr/include/tirpc
+ doins -r "${WORKDIR}"/tirpc/*
+
+ # makes sure that the linking order for nfs-utils is proper, as
+ # libtool would inject a libgssglue dependency in the list.
+ if ! use static-libs ; then
+ find "${ED}" -name "*.la" -delete || die
+ fi
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 0130cf36b604..5b2af1357ce1 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,3 +1,3 @@
DIST nghttp2-1.31.1.tar.xz 1545400 BLAKE2B 1d1a0982dc36928fe031c26d7adeca3364e0efbef43a7a2e01701614e128c3ab307321fc3e3166f09e71f002bd14d1ad5caaf3242502cbe4e71285591d8f2977 SHA512 e0f5b345b6d794b21fa04bc0c7125f24a877074538ad746451d4a293eb22f1afb9e0e619c69b84f0fc2142a925044a19976af4cffb8426358e95e7d9715d5a4f
-DIST nghttp2-1.32.0.tar.xz 1548528 BLAKE2B 1a1d031fc23ac14236c58a84aa94ee255646d36c9c631000b5d48e39c9fbc16e1b28d82e40bfc96d0fb9e2aa6982ed6bff77bcecdacf220ba8dea0b86d92bcab SHA512 ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e
DIST nghttp2-1.32.1.tar.xz 1548812 BLAKE2B a4c1f4f8d5070d1ddc5a5680d9fda28ad0b3ee6b1241b58b2be2b63026af249a1bcaf62c158c084061802ce93934dc5648e20c54887df330e07407d5879d1412 SHA512 477e6f4ccdba5c86436d554be819fd10a715896173029aa72f9c90c2ee64dbe20e2ff4cde614be3a7683dec9e0feaa21d124493ed5fc12ad4c63a37a83bad57c
+DIST nghttp2-1.33.0.tar.xz 1554776 BLAKE2B 1b995d6385188423acbcd7c8b3a626a622270bc3079972885a1f707a9cc4ebb053f7347930ce217d2cf4277eab0a3309accb8f9ff18bd8ccc55c86aefa6246c3 SHA512 eeb0bf64fea115444c685c8a01c1017ce96be18adf88ffcdecad067de7012ca61c6b2b6a627b18e2572bba7bd77ec56a3ca4b1109f7a4b21220e8e28687b5b74
diff --git a/net-libs/nghttp2/nghttp2-1.32.0.ebuild b/net-libs/nghttp2/nghttp2-1.33.0.ebuild
similarity index 99%
rename from net-libs/nghttp2/nghttp2-1.32.0.ebuild
rename to net-libs/nghttp2/nghttp2-1.33.0.ebuild
index f472f1d77c9e..b8cb21f53b53 100644
--- a/net-libs/nghttp2/nghttp2-1.32.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.33.0.ebuild
@@ -3,7 +3,7 @@
# TODO: Add python support.
-EAPI=6
+EAPI=7
inherit multilib-minimal
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 31d1de9f15bf..e5d039fc7180 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -3,7 +3,7 @@
# TODO: Add python support.
-EAPI=6
+EAPI=7
inherit multilib-minimal
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]] ; then
inherit autotools git-r3
else
SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
fi
DESCRIPTION="HTTP/2 C Library"
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index a2f08aa35afc..9c28520f9a2e 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/chrony/chrony-3.4_pre1.ebuild b/net-misc/chrony/chrony-3.4_pre1-r1.ebuild
similarity index 93%
rename from net-misc/chrony/chrony-3.4_pre1.ebuild
rename to net-misc/chrony/chrony-3.4_pre1-r1.ebuild
index c3aed38aa99e..a39dc7b24dce 100644
--- a/net-misc/chrony/chrony-3.4_pre1.ebuild
+++ b/net-misc/chrony/chrony-3.4_pre1-r1.ebuild
@@ -38,9 +38,8 @@ S="${WORKDIR}/${P/_/-}"
src_prepare() {
sed -i \
- -e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
- -e 's:/var/run:/run:g' \
- conf.c doc/*.man.in examples/* || die
+ -e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
+ doc/* examples/* || die
default
}
@@ -75,12 +74,13 @@ src_configure() {
$(usex rtc '' --disable-rtc) \
${CHRONY_EDITLINE} \
${EXTRA_ECONF} \
- --docdir=/usr/share/doc/${PF} \
--chronysockdir=/run/chrony \
+ --disable-sechash \
+ --docdir=/usr/share/doc/${PF} \
--mandir=/usr/share/man \
--prefix=/usr \
--sysconfdir=/etc/chrony \
- --disable-sechash \
+ --with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
--without-nss \
--without-tomcrypt
"
@@ -97,7 +97,7 @@ src_compile() {
src_install() {
default
- newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
+ newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
newconfd "${FILESDIR}"/chronyd.conf chronyd
insinto /etc/${PN}
diff --git a/net-misc/chrony/files/chronyd.init-r2 b/net-misc/chrony/files/chronyd.init-r2
new file mode 100644
index 000000000000..4892a57b1636
--- /dev/null
+++ b/net-misc/chrony/files/chronyd.init-r2
@@ -0,0 +1,70 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ use dns
+}
+
+checkconfig() {
+ # Note that /etc/chrony/chrony.keys is *NOT* checked. This
+ # is because the user may have specified another key
+ # file, and we don't want to force the user to use that
+ # exact name for the key file.
+ if [ ! -f "${CFGFILE}" ] ; then
+ eerror "Please create ${CFGFILE} and the"
+ eerror "chrony key file (usually /etc/chrony/chrony.keys)"
+ eerror "by using the"
+ eerror ""
+ eerror " chrony.conf.example"
+ eerror " chrony.keys.example"
+ eerror ""
+ eerror "files (from the documentation directory)"
+ eerror "as templates."
+ return 1
+ else
+ # Actually, I tried it, and chrony seems to ignore the pidfile
+ # option. I'm going to leave it here anyway, since you never
+ # know if it might be handy
+ PIDFILE=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"`
+ [ -z "${PIDFILE}" ] && PIDFILE=/run/chrony/chronyd.pid
+ fi
+ return 0
+}
+
+setxtrarg() {
+ if [ -c /dev/rtc ]; then
+ grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"
+ fi
+ grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r"
+ return 0
+}
+
+start() {
+ checkconfig || return $?
+ setxtrarg
+
+ [ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
+
+ ebegin "Starting chronyd"
+ start-stop-daemon \
+ --start \
+ --quiet \
+ --exec /usr/sbin/chronyd \
+ --pidfile "${PIDFILE}" \
+ -- -f "${CFGFILE}" ${ARGS}
+ eend $? "Failed to start chronyd"
+}
+
+stop() {
+ checkconfig || return $?
+
+ [ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
+
+ ebegin "Stopping chronyd"
+ start-stop-daemon \
+ --stop \
+ --quiet \
+ --pidfile "${PIDFILE}"
+ eend $? "Failed to stop chronyd"
+}
diff --git a/net-misc/ntpsec/Manifest b/net-misc/ntpsec/Manifest
index c6ff344b44b5..b5913390c2d5 100644
--- a/net-misc/ntpsec/Manifest
+++ b/net-misc/ntpsec/Manifest
@@ -1,2 +1,3 @@
DIST ntpsec-1.0.0.tar.gz 2405862 BLAKE2B b1631491500cafa5d41761fe6cb2db523450ed7801d06678048d6b8878d93dbd1e9d7cb2081a8400421213cf78a6724220236149a7f719896d1e8e48f5337d85 SHA512 9fb06310508b30d2ae2d66212d7d87b00e8eea294cebc27eb70435d764bd639fcec234b66e78deafb700476c88e47afe2d1b463563008c32efbb0644dd611f43
DIST ntpsec-1.1.1.tar.gz 2451415 BLAKE2B 516c87f0710ecacfde27f801a5fc4a492e7871eb35cc3afb8a107e0c381cd9787a4af2d0b01e2cf5d4f43043afe042321e5bbd2299578723e870b2fa502646d2 SHA512 838ed81c94e14a3d8588670ce63a1c4f6216d2f79be5149ad6a845cec00bdf6d7fe77310ce9c33c4675d3db54e59c3d9d02ae4351913ffbd9a3883716c443f83
+DIST ntpsec-1.1.2.tar.gz 2458805 BLAKE2B e9ab493f60179ce94a5995287423c3a0038298b622b0dcffd5a299261a7b42fc8d0d04256726e049c625c0789882f601615eaa7169047e984a274f62e0cf40d2 SHA512 83d2d3bc59202f1e5f3e76eeb6810e575e24c6f392f20c25732a6881a0a0a9f72453b76b294399351ec4baf88bc64da089dc1340aee38576021659f81bcd0e19
diff --git a/net-misc/ntpsec/ntpsec-1.1.2.ebuild b/net-misc/ntpsec/ntpsec-1.1.2.ebuild
new file mode 100644
index 000000000000..680e3dcba1d5
--- /dev/null
+++ b/net-misc/ntpsec/ntpsec-1.1.2.ebuild
@@ -0,0 +1,154 @@
+# 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} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic python-r1 waf-utils systemd user
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git"
+ BDEPEND=""
+ KEYWORDS=""
+else
+ SRC_URI="ftp://ftp.ntpsec.org/pub/releases/${PN}-${PV}.tar.gz"
+ RESTRICT="mirror"
+ BDEPEND=""
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="The NTP reference implementation, refactored"
+HOMEPAGE="https://www.ntpsec.org/"
+
+NTPSEC_REFCLOCK=(
+ oncore trimble truetime gpsd jjy generic spectracom
+ shm pps hpgps zyfer arbiter nmea neoclock modem
+ local)
+
+IUSE_NTPSEC_REFCLOCK=${NTPSEC_REFCLOCK[@]/#/rclock_}
+
+LICENSE="HPND MIT BSD-2 BSD CC-BY-SA-4.0"
+SLOT="0"
+IUSE="${IUSE_NTPSEC_REFCLOCK} debug doc early gdb heat libressl nist ntpviz samba seccomp smear tests" #ionice
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# net-misc/pps-tools oncore,pps
+CDEPEND="${PYTHON_DEPS}
+ ${BDEPEND}
+ sys-libs/libcap
+ dev-python/psutil[${PYTHON_USEDEP}]
+ libressl? ( dev-libs/libressl:0= )
+ !libressl? ( dev-libs/openssl:0= )
+ seccomp? ( sys-libs/libseccomp )
+"
+RDEPEND="${CDEPEND}
+ ntpviz? ( sci-visualization/gnuplot media-fonts/liberation-fonts )
+ !net-misc/ntp
+ !net-misc/openntpd
+"
+DEPEND="${CDEPEND}
+ app-text/asciidoc
+ app-text/docbook-xsl-stylesheets
+ sys-devel/bison
+ rclock_oncore? ( net-misc/pps-tools )
+ rclock_pps? ( net-misc/pps-tools )
+"
+
+WAF_BINARY="${S}/waf"
+
+pkg_setup() {
+ enewgroup ntp 123
+ enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+ default
+ # Remove autostripping of binaries
+ sed -i -e '/Strip binaries/d' wscript
+ python_copy_sources
+}
+
+src_configure() {
+ is-flagq -flto* && filter-flags -flto* -fuse-linker-plugin
+
+ local string_127=""
+ local rclocks="";
+ local CLOCKSTRING=""
+
+ for refclock in ${NTPSEC_REFCLOCK[@]} ; do
+ if use rclock_${refclock} ; then
+ string_127+="$refclock,"
+ fi
+ done
+ CLOCKSTRING="`echo ${string_127}|sed 's|,$||'`"
+
+ local myconf=(
+ --nopyc
+ --nopyo
+ --refclock="${CLOCKSTRING}"
+ $(use doc && echo "--enable-doc")
+ $(use early && echo "--enable-early-droproot")
+ $(use gdb && echo "--enable-debug-gdb")
+ $(use nist && echo "--enable-lockclock")
+ $(use samba && echo "--enable-mssntp")
+ $(use seccomp && echo "--enable-seccomp")
+ $(use smear && echo "--enable-leap-smear")
+ $(use tests && echo "--alltests")
+ $(use debug && echo "--enable-debug")
+ )
+
+ python_configure() {
+ waf-utils_src_configure "${myconf[@]}"
+ }
+ python_foreach_impl run_in_build_dir python_configure
+}
+
+src_compile() {
+ unset MAKEOPTS
+ python_compile() {
+ waf-utils_src_compile
+ }
+ python_foreach_impl run_in_build_dir python_compile
+}
+
+src_install() {
+ python_install() {
+ waf-utils_src_install
+ }
+ python_foreach_impl run_in_build_dir python_install
+
+ # Install heat generating scripts
+ use heat && dosbin "${S}"/contrib/ntpheat{,usb}
+
+ # Install the openrc files
+ newinitd "${FILESDIR}"/ntpd.rc-r2 ntp
+ newconfd "${FILESDIR}"/ntpd.confd ntp
+
+ # Install the systemd unit file
+ systemd_newunit "${FILESDIR}"/ntpd.service ntpd.service
+
+ # Prepare a directory for the ntp.drift file
+ mkdir -pv "${ED}"/var/lib/ntp
+ chown ntp:ntp "${ED}"/var/lib/ntp
+ chmod 770 "${ED}"/var/lib/ntp
+ keepdir /var/lib/ntp
+
+ # Install a log rotate script
+ mkdir -pv "${ED}"/etc/logrotate.d
+ cp -v "${S}"/etc/logrotate-config.ntpd "${ED}"/etc/logrotate.d/ntpd
+
+ # Install the configuration file and sample configuration
+ cp -v "${FILESDIR}"/ntp.conf "${ED}"/etc/ntp.conf
+ cp -Rv "${S}"/etc/ntp.d/ "${ED}"/etc/
+}
+
+pkg_postinst() {
+ einfo "If you want to serve time on your local network, then"
+ einfo "you should disable all the ref_clocks unless you have"
+ einfo "one and can get stable time from it. Feel free to try"
+ einfo "it but PPS probably won't work unless you have a UART"
+ einfo "GPS that actually provides PPS messages."
+}
diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index b828cbc1ced3..c5b9992753e8 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1 +1,2 @@
DIST smb4k-2.1.0.tar.xz 3714936 BLAKE2B c105909034acbdb3c8593bb06d787a6602290dadc87982ff45703e574bf978ea8a93d88cd91d062a87683559cda020d4971a7784687a74901e97c0c4a6d66d90 SHA512 632d916d6a9cf08c883d4a17747cf036d8d6e285ee149c487cc305d036977e86a7ef4d3ba4630b3b8f29ca9123d894418348e687b0c009653297d77059fb535c
+DIST smb4k-2.1.1.tar.xz 3718220 BLAKE2B 99258ac57d3b8ff2861b8635b6a0799a347f3934c8d070d41c09f49b69caa7b59f502db9041d1bc4f875ae15544254faaafaae6429200ddf5526a06812983e1f SHA512 d69cb9f4c22e2afdd111e73c3d99d6868f959aa5476ffe10620862d3659b5a4f3b814856b17a9dced7bf6dde524f5bcf224e62d413d2aa92b0bcc2272ddf22b7
diff --git a/net-misc/smb4k/metadata.xml b/net-misc/smb4k/metadata.xml
index fbe6764bb1df..95bfeb8f1e1b 100644
--- a/net-misc/smb4k/metadata.xml
+++ b/net-misc/smb4k/metadata.xml
@@ -7,6 +7,5 @@
smb4k
- https://sourceforge.net/p/smb4k/tickets/
diff --git a/net-misc/smb4k/smb4k-2.1.1.ebuild b/net-misc/smb4k/smb4k-2.1.1.ebuild
new file mode 100644
index 000000000000..74eb7914f02f
--- /dev/null
+++ b/net-misc/smb4k/smb4k-2.1.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Advanced network neighborhood browser"
+HOMEPAGE="https://sourceforge.net/p/smb4k/home/Home/"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+IUSE="plasma"
+
+DEPEND="
+ $(add_frameworks_dep kauth)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kcrash)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kwallet)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep solid)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtnetwork)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qttest)
+ $(add_qt_dep qtwidgets)
+"
+RDEPEND="${DEPEND}
+ net-fs/samba[cups]
+ plasma? ( $(add_frameworks_dep plasma) )
+"
+
+src_configure(){
+ local mycmakeargs=(
+ -DINSTALL_PLASMOID=$(usex plasma)
+ )
+ kde5_src_configure
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 10aa5faa92d2..b4b8946d7db2 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,3 +1,4 @@
DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
DIST youtube-dl-2018.08.22.tar.gz 3025389 BLAKE2B e8d2d8bccab8c169d08de35544e5efb05c65799c26894807e075edfe090d36de30fea787f54d59e4fc8b671356ce2e1d9002627948fb05becc9d2e3bc634164c SHA512 ef17c744ac27b3bf547124f18a155908a66ee75f3f6fb5d7dd8a1d8da61a5a598bbade6cf0362e8c93c337dcf47750db5f56357919226430f02d0b764011ffb5
DIST youtube-dl-2018.08.28.tar.gz 3027906 BLAKE2B dde156395f40aa91247341ab46e909536b3a4f53acea071b543ab8a548608655f2072280c9d927e7845ef79e4b0d7a0c150bafa477fb46df9ff11979cf344c5e SHA512 311abf4410a4e59df9b6941ee7cf03afda1c2e959eac8c1be182a31854d2f4dac9cd016a5103828d4860dce3db0671a8937c296eac2f24364acc67271f8ffd14
+DIST youtube-dl-2018.09.01.tar.gz 3032563 BLAKE2B c1535f1311b03ea5f3b20aba3a14487515427aad7d16e52ddca9d974050fe955405ba05fbac5c91e6e3ac830176b537d44d039a1d1e13fedc32a665610cc2af7 SHA512 172f65f48e81f335e959c119ca13f40f32cca7fc57c123d17e7be836aef2fa072cc20a1255bb5d9584c8cd1d8f8fa4c88d3f2ed5b3fa94075d3f97e7285f30af
diff --git a/net-misc/youtube-dl/youtube-dl-2018.09.01.ebuild b/net-misc/youtube-dl/youtube-dl-2018.09.01.ebuild
new file mode 100644
index 000000000000..1c433fb38eca
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2018.09.01.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=(python{2_7,3_4,3_5,3_6})
+inherit bash-completion-r1 distutils-r1 readme.gentoo-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="https://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="+offensive test"
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+python_prepare_all() {
+ if ! use offensive; then
+ sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
+ youtube_dl/version.py || die
+ # these have single line import statements
+ local xxx=(
+ alphaporno anysex behindkink camwithher chaturbate eporner
+ eroprofile extremetube foxgay goshgay hellporno hentaistigma
+ hornbunny keezmovies lovehomeporn mofosex myvidster porn91 porncom
+ pornflip pornhd pornotube pornovoisines pornoxo ruleporn sexu
+ slutload spankbang spankwire sunporno thisav vporn watchindianporn
+ xbef xnxx xtube xvideos xxxymovies youjizz youporn
+ )
+ # these have multi-line import statements
+ local mxxx=(
+ drtuber fourtube motherless pornhub redtube tnaflix tube8 xhamster
+ )
+ # do single line imports
+ sed -i \
+ -e $( printf '/%s/d;' ${xxx[@]} ) \
+ youtube_dl/extractor/extractors.py \
+ || die
+
+ # do multiple line imports
+ sed -i \
+ -e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+ youtube_dl/extractor/extractors.py \
+ || die
+
+ sed -i \
+ -e $( printf '/%s/d;' ${mxxx[@]} ) \
+ youtube_dl/extractor/generic.py \
+ || die
+
+ rm \
+ $( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+ $( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+ test/test_age_restriction.py \
+ || die
+ fi
+
+ eapply_user
+
+ distutils-r1_python_prepare_all
+}
+
+src_compile() {
+ distutils-r1_src_compile
+}
+
+python_test() {
+ emake test
+}
+
+python_install_all() {
+ dodoc README.txt
+ doman ${PN}.1
+
+ newbashcomp ${PN}.bash-completion ${PN}
+
+ insinto /usr/share/zsh/site-functions
+ newins youtube-dl.zsh _youtube-dl
+
+ insinto /usr/share/fish/vendor_completions.d
+ doins youtube-dl.fish
+
+ distutils-r1_python_install_all
+
+ rm -r "${ED}"/usr/etc || die
+ rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+ elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
+ elog "https://github.com/rg3/youtube-dl/blob/master/README.md#faq :"
+ elog
+ elog "${PN} works fine on its own on most sites. However, if you want"
+ elog "to convert video/audio, you'll need avconf (media-video/libav) or"
+ elog "ffmpeg (media-video/ffmpeg). On some sites - most notably YouTube -"
+ elog "videos can be retrieved in a higher quality format without sound."
+ elog "${PN} will detect whether avconv/ffmpeg is present and"
+ elog "automatically pick the best option."
+
+ elog
+ elog "Videos or video formats streamed via RTMP protocol can only be"
+ elog "downloaded when rtmpdump (media-video/rtmpdump) is installed."
+ elog "Downloading MMS and RTSP videos requires either mplayer"
+ elog "(media-video/mplayer) or mpv (media-video/mpv) to be installed."
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index ba681c3ef200..29c35daebbc8 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 32039569ac1c..ae271899e224 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -1,3 +1,3 @@
DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e3088874e55fd98264018f033f0948449b70623adc2c6e136a7441cf4cbef4470811694379bc798aeff81fe3ed80e66ca SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4
-DIST cups-filters-1.19.0.tar.xz 1465524 BLAKE2B 044ab5906f73a9405de55df953c76f7efd09ac4f7800df538c8c3cfd1651de6ed4ea6e3de9378221fef69d983f070b6dcab68dfd2b822fe59aa7f804a8c27907 SHA512 4b580734f7bac78c9d48aad7d8bb9e47227134e594fba76b1c82632fd8dd3e885f3897f7efd1a4b56647b74741f452f4e36d0157591c7fd5d626001028903d30
DIST cups-filters-1.20.4.tar.xz 1474700 BLAKE2B 70948565e4a2b35d0c3bc510e7c03d77ac1ed47ab16a22bc9f60a7293fe5b5b08fdb1e95dd7a32f4c99a18676e50c48a515a954d437283ce7011ab616804e235 SHA512 4001cefbee945c326e3c597869763286e8665dee098b9aff76340dd249ef3e615f2a8df5c8e802e388b91dfd06ba9e8313b27908ca89ca120f899060785a6f07
+DIST cups-filters-1.21.2.tar.xz 1473008 BLAKE2B fea7f0f92464f5e95f57f71b6f6bb5acc9cd6ccb8c97a6a54a40be4f462b76603879f85c9ae0a0c5f47d113e6de9642ee9707d7af1b5cf93f3c47a619db2be55 SHA512 07672737108e1593374fa95582e2c8ad7a3fec6202846ba85224c1c89f65b7b89de96ebf67841ec5d948fe556dddd06ae6a58ad6c5c0a25a82ce643c9384aaf0
diff --git a/net-print/cups-filters/cups-filters-1.19.0.ebuild b/net-print/cups-filters/cups-filters-1.21.2.ebuild
similarity index 98%
rename from net-print/cups-filters/cups-filters-1.19.0.ebuild
rename to net-print/cups-filters/cups-filters-1.21.2.ebuild
index be4ec7dfe0fa..79068417916a 100644
--- a/net-print/cups-filters/cups-filters-1.19.0.ebuild
+++ b/net-print/cups-filters/cups-filters-1.21.2.ebuild
@@ -23,7 +23,7 @@ IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript stati
RDEPEND="
>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
- >=app-text/qpdf-3.0.2:=
+ >=app-text/qpdf-8.1.0:=
dev-libs/glib:2
media-libs/fontconfig
media-libs/freetype:2
@@ -36,7 +36,7 @@ RDEPEND="
foomatic? ( !net-print/foomatic-filters )
jpeg? ( virtual/jpeg:0 )
ldap? ( net-nds/openldap )
- pclm? ( >=app-text/qpdf-7.0_beta1 )
+ pclm? ( >=app-text/qpdf-8.1.0:= )
pdf? ( app-text/mupdf )
perl? ( dev-lang/perl:= )
png? ( media-libs/libpng:0= )
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index be4ec7dfe0fa..79068417916a 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -23,7 +23,7 @@ IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript stati
RDEPEND="
>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
- >=app-text/qpdf-3.0.2:=
+ >=app-text/qpdf-8.1.0:=
dev-libs/glib:2
media-libs/fontconfig
media-libs/freetype:2
@@ -36,7 +36,7 @@ RDEPEND="
foomatic? ( !net-print/foomatic-filters )
jpeg? ( virtual/jpeg:0 )
ldap? ( net-nds/openldap )
- pclm? ( >=app-text/qpdf-7.0_beta1 )
+ pclm? ( >=app-text/qpdf-8.1.0:= )
pdf? ( app-text/mupdf )
perl? ( dev-lang/perl:= )
png? ( media-libs/libpng:0= )
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index eb90ece689cd..95189e6bb90c 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 959505f8846c..a6f95f0a4014 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,4 +1,3 @@
DIST tinc-1.0.33.tar.gz 486374 BLAKE2B 542e9c95aa3dea941315c5a3293c06137be7131bbb4a3ba5d788e7c250327d0b01530db5b3371aee85b1e85a104b9997e9f09a6b33051090da087595e1bcb9da SHA512 f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804
DIST tinc-1.0.34.tar.gz 484174 BLAKE2B 8ba80983cb1293b03b814f305bd733a2208562b8450a539c0f80c25596c0e05fb7ebc8edf8e6617b9e18d8b96bb49a82098f902e692ce4b85c7c47b1072be2dd SHA512 b711a2c532f8efc94c77e9bbe5213ae284d2a3cb598d2760df700448e495a02ac56baa0393bbc6fbc735bf97a26ca5a79133c92952d98a9086a9ffd273eef725
-DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B e97f044066a3c399b4089ed73e77a78904837031cbf04445390a3132a5cd8cf3e9390c1908b1804364616d16fffdedbae6b88f8a42da7471a42e4c8eea614d0e SHA512 29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17
DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b SHA512 b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43
diff --git a/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch b/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch
deleted file mode 100644
index 519677dd5034..000000000000
--- a/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur tinc-1.1pre14.orig/src/names.c tinc-1.1pre14/src/names.c
---- tinc-1.1pre14.orig/src/names.c 2016-04-17 12:08:41.000000000 -0400
-+++ tinc-1.1pre14/src/names.c 2016-10-15 07:37:51.147064396 -0400
-@@ -86,36 +86,11 @@
- if(!pidfilename)
- xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
- #else
-- bool fallback = false;
-- if(daemon) {
-- if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK))
-- fallback = true;
-- } else {
-- char fname[PATH_MAX];
-- snprintf(fname, sizeof fname, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
-- if(access(fname, R_OK)) {
-- snprintf(fname, sizeof fname, "%s" SLASH "pid", confbase);
-- if(!access(fname, R_OK))
-- fallback = true;
-- }
-- }
-+ if(!logfilename)
-+ xasprintf(&logfilename, "/var/log" SLASH "%s.log", identname);
-
-- if(!fallback) {
-- if(!logfilename)
-- xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
--
-- if(!pidfilename)
-- xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
-- } else {
-- if(!logfilename)
-- xasprintf(&logfilename, "%s" SLASH "log", confbase);
--
-- if(!pidfilename) {
-- if(daemon)
-- logger(DEBUG_ALWAYS, LOG_WARNING, "Could not access " LOCALSTATEDIR SLASH " (%s), storing pid and socket files in %s" SLASH, strerror(errno), confbase);
-- xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
-- }
-- }
-+ if(!pidfilename)
-+ xasprintf(&pidfilename, "/run" SLASH "%s.pid", identname);
- #endif
-
- if(!unixsocketname) {
diff --git a/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch b/net-vpn/tinc/files/tinc-1.1_pre16-r1-fix-paths.patch
similarity index 100%
rename from net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
rename to net-vpn/tinc/files/tinc-1.1_pre16-r1-fix-paths.patch
diff --git a/net-vpn/tinc/metadata.xml b/net-vpn/tinc/metadata.xml
index 02dd537c6e68..f6ec81bf4f88 100644
--- a/net-vpn/tinc/metadata.xml
+++ b/net-vpn/tinc/metadata.xml
@@ -14,7 +14,6 @@
- Add GUI support, using dev-python/wxpython
Enable support for User Mode Linux Sockets
Enable Virtual Distributed Ethernet (VDE) based networking
diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild b/net-vpn/tinc/tinc-1.1_pre15.ebuild
deleted file mode 100644
index 359469d9dc7a..000000000000
--- a/net-vpn/tinc/tinc-1.1_pre15.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1 systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
-
-# UPSTREAM_VER=1
-
-[[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
- ${UPSTREAM_PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- ${PYTHON_DEPS}
- gui? ( dev-python/wxpython:3.0[${PYTHON_USEDEP}] )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- lzo? ( dev-libs/lzo:2 )
- ncurses? ( sys-libs/ncurses:= )
- readline? ( sys-libs/readline:= )
- upnp? ( net-libs/miniupnpc )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
- vde? ( net-misc/vde )"
-S="${WORKDIR}/${MY_P}"
-
-# Upstream's patchset
-if [[ -n ${UPSTREAM_VER} ]]; then
- PATCHES=( "${WORKDIR}"/patches-upstream )
-fi
-
-PATCHES+=(
- "${FILESDIR}"/${PF}-fix-paths.patch #560528
- "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868
-)
-
-src_prepare() {
- default
- eautoreconf
-
- # Fix the static (failing UNKNOWN) version in the autoconf
- # NOTE: When updating the ebuild, make sure to check that this
- # line number hasn't changed in the upstream sources.
- sed -i "4d" configure.ac
- sed -i "4iAC_INIT([tinc], ${PVR})" configure.ac
-}
-
-src_configure() {
- econf \
- --enable-jumbograms \
- --disable-silent-rules \
- --enable-legacy-protocol \
- --disable-tunemu \
- --with-systemd="$(systemd_get_systemunitdir)" \
- $(use_enable lzo) \
- $(use_enable ncurses curses) \
- $(use_enable readline) \
- $(use_enable uml) \
- $(use_enable vde) \
- $(use_enable zlib) \
- $(use_enable upnp miniupnpc) \
- $(use_with ssl openssl)
- #--without-libgcrypt \
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodir /etc/tinc
- dodoc AUTHORS NEWS README THANKS
- doconfd "${FILESDIR}"/tinc.networks
- newconfd "${FILESDIR}"/tincd.conf tincd
- newinitd "${FILESDIR}"/tincd-r2 tincd
-
- if use gui; then
- python_fix_shebang "${ED}"/usr/bin/tinc-gui
- else
- rm -f "${ED}"/usr/bin/tinc-gui || die
- fi
-}
-
-pkg_postinst() {
- elog "This package requires the tun/tap kernel device."
- elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
-}
diff --git a/net-vpn/tinc/tinc-1.1_pre16.ebuild b/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
similarity index 90%
rename from net-vpn/tinc/tinc-1.1_pre16.ebuild
rename to net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
index 919232287018..f252a1217c30 100644
--- a/net-vpn/tinc/tinc-1.1_pre16.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
@@ -24,12 +24,11 @@ SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib"
+IUSE="+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="
${PYTHON_DEPS}
- gui? ( dev-python/wxpython:3.0[${PYTHON_USEDEP}] )
ssl? (
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
@@ -89,12 +88,6 @@ src_install() {
doconfd "${FILESDIR}"/tinc.networks
newconfd "${FILESDIR}"/tincd.conf tincd
newinitd "${FILESDIR}"/tincd-r2 tincd
-
- if use gui; then
- python_fix_shebang "${ED}"/usr/bin/tinc-gui
- else
- rm -f "${ED}"/usr/bin/tinc-gui || die
- fi
}
pkg_postinst() {
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 5fe18f78cf5b..cb21c2b47ccb 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1 +1 @@
-DIST WireGuard-0.0.20180809.tar.xz 272348 BLAKE2B 20e78896b685f7ce9bee9b9863d5261b44947049b14a42f6ef75c2bfac1b04e53814faa3f3ddc47d1f8af877c97625dc0e160d3b4955b75422ec218bfb5e23af SHA512 2278cae078cf3ff9e0c43979ff559820d9d99b64c1ccdbc8a7fea3fc1a5fa0818d782a8962aefc07678599cc15f5a4237fd5dd7ffad108d639c39930979e3cc5
+DIST WireGuard-0.0.20180904.tar.xz 272012 BLAKE2B e279f85374f880d69e4a4dc5b8442520abe4e3141a69133ea012e1c613dd1b9cb6f7b31d38ffd3f5e1f453dcad8cec847df2fd6bf1e46e66dc42f94da3516cb6 SHA512 5eba275fd7bc96a81d7c07f92920bf4e562910756bb7980d1381b204efda184ee93fa710f2ccb0c14667c8647c2fac1cc51fa95be3a51ac25a0567c6204c9018
diff --git a/net-vpn/wireguard/wireguard-0.0.20180809.ebuild b/net-vpn/wireguard/wireguard-0.0.20180904.ebuild
similarity index 100%
rename from net-vpn/wireguard/wireguard-0.0.20180809.ebuild
rename to net-vpn/wireguard/wireguard-0.0.20180904.ebuild
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 3bfb1b53a592..a94ba0c48772 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/gr-iio/Manifest b/net-wireless/gr-iio/Manifest
new file mode 100644
index 000000000000..df074d7140ac
--- /dev/null
+++ b/net-wireless/gr-iio/Manifest
@@ -0,0 +1 @@
+DIST gr-iio-0.3.tar.gz 55090 BLAKE2B 3c89567a921e79261434eefb0706a53e10553aaecd4b6f913e3cadd8714b1d5a089b0ff0d66e9815825d57e21050a4a726a3d095eacda634f8434ab6e4726224 SHA512 2618790f5e1a56af2bcb045871f27d8d5ef37c8708e84dd413ce8e5094bb72d59f7b37798ab0c3ab0bc56d70baeb77bae26f5e1125e1a2d251396e84ea6cde02
diff --git a/net-wireless/gr-iio/gr-iio-0.3-r2.ebuild b/net-wireless/gr-iio/gr-iio-0.3-r2.ebuild
new file mode 100644
index 000000000000..243224b3adce
--- /dev/null
+++ b/net-wireless/gr-iio/gr-iio-0.3-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="GNU Radio IIO Blocks"
+HOMEPAGE="https://github.com/analogdevicesinc/gr-iio"
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-iio"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="${PYTHON_DEPS}
+ >=net-wireless/gnuradio-3.7.0:=
+ dev-libs/boost:=
+ net-libs/libiio:=
+ net-libs/libad9361-iio:="
+
+DEPEND="${RDEPEND}
+ sys-devel/flex:=
+ sys-devel/bison:=
+ dev-util/cppunit:=
+ dev-lang/swig:0"
diff --git a/net-wireless/gr-iio/gr-iio-9999.ebuild b/net-wireless/gr-iio/gr-iio-9999.ebuild
new file mode 100644
index 000000000000..243224b3adce
--- /dev/null
+++ b/net-wireless/gr-iio/gr-iio-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="GNU Radio IIO Blocks"
+HOMEPAGE="https://github.com/analogdevicesinc/gr-iio"
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="https://github.com/analogdevicesinc/gr-iio"
+ inherit git-r3
+ KEYWORDS=""
+else
+ SRC_URI="https://github.com/analogdevicesinc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-3+"
+SLOT="0"
+
+RDEPEND="${PYTHON_DEPS}
+ >=net-wireless/gnuradio-3.7.0:=
+ dev-libs/boost:=
+ net-libs/libiio:=
+ net-libs/libad9361-iio:="
+
+DEPEND="${RDEPEND}
+ sys-devel/flex:=
+ sys-devel/bison:=
+ dev-util/cppunit:=
+ dev-lang/swig:0"
diff --git a/net-wireless/gr-iio/metadata.xml b/net-wireless/gr-iio/metadata.xml
new file mode 100644
index 000000000000..890c956dc139
--- /dev/null
+++ b/net-wireless/gr-iio/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ zerochaos@gentoo.org
+ Rick Farina
+
+
+ radio@gentoo.org
+ Radio
+
+
+ analogdevicesinc/gr-iio
+
+
diff --git a/net-wireless/gr-osmosdr/files/csete-iio.patch b/net-wireless/gr-osmosdr/files/csete-iio.patch
new file mode 100644
index 000000000000..678a8599d058
--- /dev/null
+++ b/net-wireless/gr-osmosdr/files/csete-iio.patch
@@ -0,0 +1,640 @@
+From 0eaf819be8a40896dfc3d810685a609a867a42e9 Mon Sep 17 00:00:00 2001
+From: Alexandru Csete
+Date: Mon, 13 Feb 2017 01:05:50 +0100
+Subject: [PATCH] Add PlutoSDR source through gr-iio
+
+---
+ CMakeLists.txt | 1 +
+ cmake/Modules/FindGnuradioIIO.cmake | 34 ++++
+ cmake/Modules/FindIIO.cmake | 28 +++
+ lib/CMakeLists.txt | 8 +
+ lib/config.h.in | 1 +
+ lib/device.cc | 8 +
+ lib/plutosdr/CMakeLists.txt | 39 +++++
+ lib/plutosdr/plutosdr_source_c.cc | 262 ++++++++++++++++++++++++++++
+ lib/plutosdr/plutosdr_source_c.h | 105 +++++++++++
+ lib/source_impl.cc | 18 ++
+ 10 files changed, 504 insertions(+)
+ create mode 100644 cmake/Modules/FindGnuradioIIO.cmake
+ create mode 100644 cmake/Modules/FindIIO.cmake
+ create mode 100644 lib/plutosdr/CMakeLists.txt
+ create mode 100644 lib/plutosdr/plutosdr_source_c.cc
+ create mode 100644 lib/plutosdr/plutosdr_source_c.h
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 296456d..7871f39 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -159,6 +159,7 @@ endif()
+ find_package(GnuradioIQBalance)
+ find_package(UHD)
+ find_package(GnuradioUHD)
++find_package(GnuradioIIO)
+ find_package(GnuradioFCD)
+ find_package(GnuradioFCDPP)
+ find_package(LibOsmoSDR)
+diff --git a/cmake/Modules/FindGnuradioIIO.cmake b/cmake/Modules/FindGnuradioIIO.cmake
+new file mode 100644
+index 0000000..d3c011a
+--- /dev/null
++++ b/cmake/Modules/FindGnuradioIIO.cmake
+@@ -0,0 +1,34 @@
++INCLUDE(FindPkgConfig)
++PKG_CHECK_MODULES(PC_GNURADIO_IIO gnuradio-iio)
++
++FIND_PATH(
++ GNURADIO_IIO_INCLUDE_DIRS
++ NAMES gnuradio/iio/api.h
++ HINTS $ENV{GNURADIO_IIO_DIR}/include
++ ${PC_GNURADIO_IIO_INCLUDEDIR}
++ PATHS /usr/local/include
++ /usr/include
++)
++
++FIND_LIBRARY(
++ GNURADIO_IIO_LIBRARIES
++ NAMES gnuradio-iio
++ HINTS $ENV{GNURADIO_IIO_DIR}/lib
++ ${PC_GNURADIO_IIO_LIBDIR}
++ PATHS /usr/local/lib
++ /usr/local/lib64
++ /usr/lib
++ /usr/lib64
++)
++
++if(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
++ set(GNURADIO_IIO_FOUND TRUE CACHE INTERNAL "gnuradio-iio found")
++ message(STATUS "Found gnuradio-iio: ${GNURADIO_IIO_INCLUDE_DIRS}, ${GNURADIO_IIO_LIBRARIES}")
++else(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
++ set(GNURADIO_IIO_FOUND FALSE CACHE INTERNAL "gnuradio-iio found")
++ message(STATUS "gnuradio-iio not found.")
++endif(GNURADIO_IIO_INCLUDE_DIRS AND GNURADIO_IIO_LIBRARIES)
++
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNURADIO_IIO DEFAULT_MSG GNURADIO_IIO_LIBRARIES GNURADIO_IIO_INCLUDE_DIRS)
++MARK_AS_ADVANCED(GNURADIO_IIO_LIBRARIES GNURADIO_IIO_INCLUDE_DIRS)
+diff --git a/cmake/Modules/FindIIO.cmake b/cmake/Modules/FindIIO.cmake
+new file mode 100644
+index 0000000..bb87a4b
+--- /dev/null
++++ b/cmake/Modules/FindIIO.cmake
+@@ -0,0 +1,28 @@
++########################################################################
++# Find the IIO userspace library
++########################################################################
++
++INCLUDE(FindPkgConfig)
++PKG_CHECK_MODULES(PC_IIO iio)
++
++FIND_PATH(
++ IIO_INCLUDE_DIRS
++ NAMES iio.h
++ HINTS $ENV{IIO_DIR}/include
++ ${PC_IIO_INCLUDEDIR}
++ PATHS /usr/local/include
++ /usr/include
++)
++
++FIND_LIBRARY(
++ IIO_LIBRARIES
++ NAMES iio
++ HINTS $ENV{IIO_DIR}/lib
++ ${PC_IIO_LIBDIR}
++ PATHS /usr/local/lib
++ /usr/lib
++)
++
++INCLUDE(FindPackageHandleStandardArgs)
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(IIO DEFAULT_MSG IIO_LIBRARIES IIO_INCLUDE_DIRS)
++MARK_AS_ADVANCED(IIO_LIBRARIES IIO_INCLUDE_DIRS)
+diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
+index c05b8d9..936d84b 100644
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -174,6 +174,14 @@ if(ENABLE_UHD)
+ GR_INCLUDE_SUBDIRECTORY(uhd)
+ endif(ENABLE_UHD)
+
++########################################################################
++# Setup IIO component
++########################################################################
++GR_REGISTER_COMPONENT("IIO Devices" ENABLE_IIO GNURADIO_IIO_FOUND)
++if(ENABLE_IIO)
++GR_INCLUDE_SUBDIRECTORY(plutosdr)
++endif(ENABLE_IIO)
++
+ ########################################################################
+ # Setup MiriSDR component
+ ########################################################################
+diff --git a/lib/config.h.in b/lib/config.h.in
+index 42e72f1..0fe2731 100644
+--- a/lib/config.h.in
++++ b/lib/config.h.in
+@@ -10,6 +10,7 @@
+ #cmakedefine ENABLE_RTL
+ #cmakedefine ENABLE_RTL_TCP
+ #cmakedefine ENABLE_UHD
++#cmakedefine ENABLE_IIO
+ #cmakedefine ENABLE_MIRI
+ #cmakedefine ENABLE_SDRPLAY
+ #cmakedefine ENABLE_HACKRF
+diff --git a/lib/device.cc b/lib/device.cc
+index 025a22b..77b271f 100644
+--- a/lib/device.cc
++++ b/lib/device.cc
+@@ -54,6 +54,10 @@
+ #include
+ #endif
+
++#ifdef ENABLE_IIO
++#include
++#endif
++
+ #ifdef ENABLE_MIRI
+ #include
+ #endif
+@@ -162,6 +166,10 @@ devices_t device::find(const device_t &hint)
+ BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() )
+ devices.push_back( device_t(dev) );
+ #endif
++#ifdef ENABLE_IIO
++ BOOST_FOREACH( std::string dev, plutosdr_source_c::get_devices() )
++ devices.push_back( device_t(dev) );
++#endif
+ #ifdef ENABLE_MIRI
+ BOOST_FOREACH( std::string dev, miri_source_c::get_devices() )
+ devices.push_back( device_t(dev) );
+diff --git a/lib/plutosdr/CMakeLists.txt b/lib/plutosdr/CMakeLists.txt
+new file mode 100644
+index 0000000..b335885
+--- /dev/null
++++ b/lib/plutosdr/CMakeLists.txt
+@@ -0,0 +1,39 @@
++# Copyright 2012 Free Software Foundation, Inc.
++#
++# This file is part of GNU Radio
++#
++# GNU Radio is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 3, or (at your option)
++# any later version.
++#
++# GNU Radio is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with GNU Radio; see the file COPYING. If not, write to
++# the Free Software Foundation, Inc., 51 Franklin Street,
++# Boston, MA 02110-1301, USA.
++
++########################################################################
++# This file included, use CMake directory variables
++########################################################################
++
++include_directories(
++ ${CMAKE_CURRENT_SOURCE_DIR}
++ ${GNURADIO_IIO_INCLUDE_DIRS}
++ ${IIO_INCLUDE_DIRS}
++)
++
++set(iio_srcs
++# ${CMAKE_CURRENT_SOURCE_DIR}/iio_sink_c.cc
++ ${CMAKE_CURRENT_SOURCE_DIR}/plutosdr_source_c.cc
++)
++
++########################################################################
++# Append gnuradio-osmosdr library sources
++########################################################################
++list(APPEND gr_osmosdr_srcs ${iio_srcs})
++list(APPEND gr_osmosdr_libs ${GNURADIO_IIO_LIBRARIES} ${IIO_LIBRARIES})
+diff --git a/lib/plutosdr/plutosdr_source_c.cc b/lib/plutosdr/plutosdr_source_c.cc
+new file mode 100644
+index 0000000..009d4b2
+--- /dev/null
++++ b/lib/plutosdr/plutosdr_source_c.cc
+@@ -0,0 +1,262 @@
++/* -*- c++ -*- */
++/*
++ * Copyright 2017 Dimitri Stolnikov
++ *
++ * GNU Radio is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 3, or (at your option)
++ * any later version.
++ *
++ * GNU Radio is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with GNU Radio; see the file COPYING. If not, write to
++ * the Free Software Foundation, Inc., 51 Franklin Street,
++ * Boston, MA 02110-1301, USA.
++ */
++#include
++#include
++
++#include "arg_helpers.h"
++#include "osmosdr/source.h"
++#include "plutosdr_source_c.h"
++
++using namespace boost::assign;
++
++plutosdr_source_c_sptr make_plutosdr_source_c(const std::string &args)
++{
++ return gnuradio::get_initial_sptr(new plutosdr_source_c(args));
++}
++
++plutosdr_source_c::plutosdr_source_c(const std::string &args) :
++ gr::hier_block2("plutosdr_source_c",
++ gr::io_signature::make(0, 0, 0),
++ gr::io_signature::make(1, 1, sizeof(gr_complex)))
++{
++ uri = "ip:pluto.local";
++ frequency = 434000000;
++ samplerate = 2500000;
++ decimation = 0;
++ bandwidth = 2000000;
++ buffer_size = 0x4000;
++ quadrature = true;
++ rfdc = true;
++ bbdc = true;
++ gain_auto = false;
++ gain_value = 50;
++ filter = "";
++ filter_auto = true;
++ _freq_corr = 0.0;
++
++ dict_t dict = params_to_dict(args);
++ if (dict.count("uri"))
++ uri = boost::lexical_cast< std::string >( dict["uri"] );
++
++ std::cerr << "Using PlutoSDR URI = " << uri << std::endl;
++
++ _src = gr::iio::pluto_source::make(uri, frequency, samplerate,
++ bandwidth, buffer_size,
++ quadrature, rfdc, bbdc,
++ "manual", gain_value,
++ filter.c_str(), filter_auto);
++
++ connect( _src, 0, self(), 0 );
++}
++
++plutosdr_source_c::~plutosdr_source_c()
++{
++}
++
++std::vector< std::string > plutosdr_source_c::get_devices()
++{
++ std::vector< std::string > devices;
++
++ std::string args = "plutosdr,label='PlutoSDR'";
++
++ devices.push_back( args );
++
++ return devices;
++}
++
++std::string plutosdr_source_c::name()
++{
++ return "PlutoSDR";
++}
++
++size_t plutosdr_source_c::get_num_channels()
++{
++ return output_signature()->max_streams();
++}
++
++osmosdr::meta_range_t plutosdr_source_c::get_sample_rates( void )
++{
++ osmosdr::meta_range_t rates;
++
++ rates += osmosdr::range_t( 2500000 );
++ rates += osmosdr::range_t( 5000000 );
++ rates += osmosdr::range_t( 10000000 );
++ rates += osmosdr::range_t( 20000000 );
++
++ return rates;
++}
++
++double plutosdr_source_c::set_sample_rate( double rate )
++{
++ samplerate = (unsigned long) rate;
++ set_params();
++
++ return samplerate;
++}
++
++double plutosdr_source_c::get_sample_rate( void )
++{
++ return samplerate;
++}
++
++osmosdr::freq_range_t plutosdr_source_c::get_freq_range( size_t chan )
++{
++ osmosdr::freq_range_t range;
++
++ range += osmosdr::range_t( 70.0e6, 6000.0e6, 1.0 );
++
++ return range;
++}
++
++double plutosdr_source_c::set_center_freq( double freq, size_t chan )
++{
++ frequency = (unsigned long long) freq;
++ set_params();
++
++ return freq;
++}
++
++double plutosdr_source_c::get_center_freq( size_t chan )
++{
++ return frequency;
++}
++
++double plutosdr_source_c::set_freq_corr( double ppm, size_t chan)
++{
++ _freq_corr = ppm;
++ set_params();
++
++ return ppm;
++}
++
++double plutosdr_source_c::get_freq_corr( size_t chan)
++{
++ return _freq_corr;
++}
++
++std::vector plutosdr_source_c::get_gain_names( size_t chan )
++{
++ std::vector< std::string > gains;
++
++ gains.push_back( "RF" );
++
++ return gains;
++}
++
++osmosdr::gain_range_t plutosdr_source_c::get_gain_range( size_t chan)
++{
++ osmosdr::gain_range_t range;
++ range += osmosdr::range_t( -10, 77, 1 ); // https://wiki.analog.com/resources/tools-software/linux-drivers/iio-transceiver/ad9361#rx_gain_control
++
++ return range;
++}
++
++osmosdr::gain_range_t plutosdr_source_c::get_gain_range( const std::string & name,
++ size_t chan)
++{
++ osmosdr::gain_range_t range;
++
++ range += osmosdr::range_t( -10, 77, 1 );
++
++ return range;
++}
++
++bool plutosdr_source_c::set_gain_mode( bool automatic, size_t chan )
++{
++ gain_auto = automatic;
++ set_params();
++
++ return automatic;
++}
++
++bool plutosdr_source_c::get_gain_mode( size_t chan )
++{
++ return gain_auto;
++}
++
++double plutosdr_source_c::set_gain( double gain, size_t chan )
++{
++ gain_value = gain;
++ set_params();
++
++ return gain;
++}
++
++double plutosdr_source_c::set_gain( double gain, const std::string & name, size_t chan )
++{
++ gain_value = gain;
++ set_params();
++
++ return gain;
++}
++
++double plutosdr_source_c::get_gain( size_t chan )
++{
++ return gain_value;
++}
++
++double plutosdr_source_c::get_gain( const std::string & name, size_t chan )
++{
++ return gain_value;
++}
++
++std::vector< std::string > plutosdr_source_c::get_antennas( size_t chan )
++{
++ std::vector< std::string > antennas;
++
++ antennas += get_antenna( chan );
++
++ return antennas;
++}
++
++std::string plutosdr_source_c::set_antenna( const std::string & antenna, size_t chan )
++{
++ return get_antenna( chan );
++}
++
++std::string plutosdr_source_c::get_antenna( size_t chan )
++{
++ return "A_BALANCED";
++}
++
++double plutosdr_source_c::set_bandwidth( double bw, size_t chan )
++{
++ if (bw == 0.0)
++ bw = 0.8 * samplerate; // auto bandwidth
++
++ bandwidth = (unsigned long)bw;
++ set_params();
++ return bandwidth;
++}
++
++double plutosdr_source_c::get_bandwidth( size_t chan )
++{
++ return bandwidth;
++}
++
++void plutosdr_source_c::set_params( void )
++{
++ unsigned long long freq = ((double)frequency * (1.0 + _freq_corr * 0.000001));
++
++ // FIXME: gain_mode string can be manual / slow_attack / fast_attack / hybrid
++ _src->set_params( freq, samplerate, bandwidth, quadrature, rfdc, bbdc,
++ gain_auto ? "fast_attack" : "manual", gain_value,
++ filter.c_str(), filter_auto );
++}
+diff --git a/lib/plutosdr/plutosdr_source_c.h b/lib/plutosdr/plutosdr_source_c.h
+new file mode 100644
+index 0000000..efac91f
+--- /dev/null
++++ b/lib/plutosdr/plutosdr_source_c.h
+@@ -0,0 +1,105 @@
++/* -*- c++ -*- */
++/*
++ * Copyright 2017 Dimitri Stolnikov
++ *
++ * GNU Radio is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 3, or (at your option)
++ * any later version.
++ *
++ * GNU Radio is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with GNU Radio; see the file COPYING. If not, write to
++ * the Free Software Foundation, Inc., 51 Franklin Street,
++ * Boston, MA 02110-1301, USA.
++ */
++#ifndef PLUTOSDR_SOURCE_C_H
++#define PLUTOSDR_SOURCE_C_H
++
++#include
++#include
++#include
++#include
++
++#include "source_iface.h"
++
++class plutosdr_source_c;
++
++typedef boost::shared_ptr< plutosdr_source_c > plutosdr_source_c_sptr;
++
++plutosdr_source_c_sptr make_plutosdr_source_c(const std::string &args = "");
++
++class plutosdr_source_c :
++ public gr::hier_block2,
++ public source_iface
++{
++private:
++ friend plutosdr_source_c_sptr make_plutosdr_source_c(const std::string &args);
++
++ plutosdr_source_c(const std::string &args);
++
++public:
++ ~plutosdr_source_c();
++
++ static std::vector< std::string > get_devices();
++
++ std::string name();
++
++ size_t get_num_channels( void );
++
++ osmosdr::meta_range_t get_sample_rates( void );
++ double set_sample_rate( double rate );
++ double get_sample_rate( void );
++
++ osmosdr::freq_range_t get_freq_range( size_t chan = 0 );
++ double set_center_freq( double freq, size_t chan = 0 );
++ double get_center_freq( size_t chan = 0 );
++
++ double set_freq_corr( double ppm, size_t chan = 0 );
++ double get_freq_corr( size_t chan = 0 );
++
++ std::vector get_gain_names( size_t chan = 0 );
++ osmosdr::gain_range_t get_gain_range( size_t chan = 0 );
++ osmosdr::gain_range_t get_gain_range( const std::string & name, size_t chan = 0 );
++ bool set_gain_mode( bool automatic, size_t chan = 0 );
++ bool get_gain_mode( size_t chan = 0 );
++ double set_gain( double gain, size_t chan = 0 );
++ double set_gain( double gain, const std::string & name, size_t chan = 0 );
++ double get_gain( size_t chan = 0 );
++ double get_gain( const std::string & name, size_t chan = 0 );
++
++ std::vector< std::string > get_antennas( size_t chan = 0 );
++ std::string set_antenna( const std::string & antenna, size_t chan = 0 );
++ std::string get_antenna( size_t chan = 0 );
++
++ double set_bandwidth( double bw, size_t chan = 0 );
++ double get_bandwidth( size_t chan = 0 );
++
++private:
++
++ void set_params(void);
++
++ gr::iio::pluto_source::sptr _src;
++
++ std::string uri;
++ unsigned long long frequency;
++ unsigned long samplerate;
++ unsigned long decimation;
++ unsigned long bandwidth;
++ unsigned long buffer_size;
++ bool quadrature;
++ bool rfdc;
++ bool bbdc;
++ bool gain_auto;
++ double gain_value;
++ std::string filter;
++ bool filter_auto;
++
++ double _freq_corr;
++};
++
++#endif // PLUTOSDR_SOURCE_C_H
+diff --git a/lib/source_impl.cc b/lib/source_impl.cc
+index a28f314..2a153bc 100644
+--- a/lib/source_impl.cc
++++ b/lib/source_impl.cc
+@@ -56,6 +56,10 @@
+ #include
+ #endif
+
++#ifdef ENABLE_IIO
++#include
++#endif
++
+ #ifdef ENABLE_MIRI
+ #include
+ #endif
+@@ -144,6 +148,9 @@ source_impl::source_impl( const std::string &args )
+ #ifdef ENABLE_UHD
+ dev_types.push_back("uhd");
+ #endif
++#ifdef ENABLE_IIO
++ dev_types.push_back("plutosdr");
++#endif
+ #ifdef ENABLE_MIRI
+ dev_types.push_back("miri");
+ #endif
+@@ -216,6 +223,10 @@ source_impl::source_impl( const std::string &args )
+ BOOST_FOREACH( std::string dev, uhd_source_c::get_devices() )
+ dev_list.push_back( dev );
+ #endif
++#ifdef ENABLE_IIO
++ BOOST_FOREACH( std::string dev, plutosdr_source_c::get_devices() )
++ dev_list.push_back( dev );
++#endif
+ #ifdef ENABLE_MIRI
+ BOOST_FOREACH( std::string dev, miri_source_c::get_devices() )
+ dev_list.push_back( dev );
+@@ -316,6 +327,13 @@ source_impl::source_impl( const std::string &args )
+ }
+ #endif
+
++#ifdef ENABLE_IIO
++ if ( dict.count("plutosdr") ) {
++ plutosdr_source_c_sptr src = make_plutosdr_source_c( arg );
++ block = src; iface = src.get();
++ }
++#endif
++
+ #ifdef ENABLE_MIRI
+ if ( dict.count("miri") ) {
+ miri_source_c_sptr src = make_miri_source_c( arg );
diff --git a/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r1.ebuild b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r1.ebuild
new file mode 100644
index 000000000000..3c468c6f97e3
--- /dev/null
+++ b/net-wireless/gr-osmosdr/gr-osmosdr-0.1.4_p20180626-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils python-single-r1
+
+DESCRIPTION="GNU Radio source block for OsmoSDR and rtlsdr and hackrf"
+HOMEPAGE="http://sdr.osmocom.org/trac/wiki/GrOsmoSDR"
+
+if [[ ${PV} == 9999* ]]; then
+ inherit git-r3
+ SRC_URI=""
+ EGIT_REPO_URI="git://git.osmocom.org/${PN}.git"
+ KEYWORDS=""
+else
+ #SRC_URI="http://cgit.osmocom.org/gr-osmosdr/snapshot/gr-osmosdr-${PV}.tar.xz"
+ #git clone git://git.osmocom.org/gr-osmosdr.git
+ #cd gr-osmosdr
+ #git archive --format=tar --prefix=gr-osmosdr-${PV}/ v${PV} | xz > ../gr-osmosdr-${PV}.tar.xz
+ SRC_URI="https://dev.gentoo.org/~zerochaos/distfiles/gr-osmosdr-${PV}.tar.xz"
+ KEYWORDS=""
+fi
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+IUSE="bladerf fcd hackrf iio iqbalance mirisdr python rtlsdr sdrplay soapy uhd"
+
+RDEPEND="${PYTHON_DEPS}
+ dev-libs/boost:=
+ >=net-wireless/gnuradio-3.7_rc:0=[fcd?,${PYTHON_USEDEP}]
+ bladerf? ( >=net-wireless/bladerf-2018.08_rc1:= )
+ hackrf? ( net-libs/libhackrf:= )
+ iio? ( net-wireless/gr-iio )
+ iqbalance? ( net-wireless/gr-iqbal:=[${PYTHON_USEDEP}] )
+ mirisdr? ( net-libs/libmirisdr:= )
+ rtlsdr? ( >=net-wireless/rtl-sdr-0.5.3:= )
+ sdrplay? ( net-wireless/sdrplay )
+ soapy? ( net-wireless/soapysdr )
+ uhd? ( net-wireless/uhd:=[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+ dev-python/cheetah"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+ eapply "${FILESDIR}/csete-iio.patch"
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_DEFAULT=OFF
+ -DPYTHON_EXECUTABLE="${PYTHON}"
+ -DENABLE_FILE=ON
+ -DENABLE_BLADERF="$(usex bladerf)"
+ -DENABLE_FCD="$(usex fcd)"
+ -DENABLE_HACKRF="$(usex hackrf)"
+ -DENABLE_IIO="$(usex iio)"
+ -DENABLE_IQBALANCE="$(usex iqbalance)"
+ -DENABLE_MIRI="$(usex mirisdr)"
+ -DENABLE_PYTHON="$(usex python)"
+ -DENABLE_RTL="$(usex rtlsdr)"
+ -DENABLE_RTL_TCP="$(usex rtlsdr)"
+ -DENABLE_SOAPY="$(usex soapy)"
+ -DENABLE_UHD="$(usex uhd)"
+ -DENABLE_SDRPLAY="$(usex sdrplay)"
+ -DENABLE_NONFREE="$(usex sdrplay)"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ if use python; then
+ python_fix_shebang "${ED}"/usr/bin
+ fi
+}
diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index 2ffcfa21c90d..b55e17a06367 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -9,6 +9,7 @@
Build with Nuand BladeRF support
Build with Funcube Dongle support
Build with Great Scott Gadgets HackRF support
+ Build with Industrial IO support for devices such as Analog Devices Pluto
Enable support for I/Q balancing using gr-iqbal
Build with Mirics MSi2500 + MSi001 SDR support
Build with Realtek RTL2832U (rtlsdr) support
diff --git a/net-wireless/soapyplutosdr/Manifest b/net-wireless/soapyplutosdr/Manifest
new file mode 100644
index 000000000000..cae9271d95de
--- /dev/null
+++ b/net-wireless/soapyplutosdr/Manifest
@@ -0,0 +1 @@
+DIST soapyplutosdr-0.0_p20180825.tar.gz 17597 BLAKE2B d5b6205da7aa64406ccf84d198088094c10397ca874925926dfe2ee3134e045c3ab80b68db06ee84448ae8966e2d8edecb2517ef70b10bbddd9681fcbf09385a SHA512 40cc7c83c13f1d81212c5b0b6028d49de6c9e0b4df9e479c5cb577f60a92b415f76e159d45ecf19aad2deac507f7bd779b7cce1f7bc5e6fd2ea9a3f24399dfe7
diff --git a/net-wireless/soapyplutosdr/metadata.xml b/net-wireless/soapyplutosdr/metadata.xml
new file mode 100644
index 000000000000..04bd48d30e55
--- /dev/null
+++ b/net-wireless/soapyplutosdr/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+
+ zerochaos@gentoo.org
+ Rick Farina
+
+
+ radio@gentoo.org
+ Radio
+
+
+ pothosware/SoapyPlutoSDR
+
+
diff --git a/net-wireless/soapyplutosdr/soapyplutosdr-0.0_p20180825.ebuild b/net-wireless/soapyplutosdr/soapyplutosdr-0.0_p20180825.ebuild
new file mode 100644
index 000000000000..a5f9a164f11d
--- /dev/null
+++ b/net-wireless/soapyplutosdr/soapyplutosdr-0.0_p20180825.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Soapy SDR plugin for the Pluto SDR"
+HOMEPAGE="https://github.com/pothosware/SoapyPlutoSDR"
+
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="https://github.com/pothosware/SoapyPlutoSDR.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~x86"
+ COMMIT="782650597b18f311cc97fbb7c6813539e6adef16"
+ SRC_URI="https://github.com/pothosware/SoapyPlutoSDR/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}"/SoapyPlutoSDR-${COMMIT}
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr
+ net-libs/libiio:=
+ net-libs/libad9361-iio:="
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild b/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild
new file mode 100644
index 000000000000..a5f9a164f11d
--- /dev/null
+++ b/net-wireless/soapyplutosdr/soapyplutosdr-9999.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Soapy SDR plugin for the Pluto SDR"
+HOMEPAGE="https://github.com/pothosware/SoapyPlutoSDR"
+
+if [ "${PV}" = "9999" ]; then
+ EGIT_REPO_URI="https://github.com/pothosware/SoapyPlutoSDR.git"
+ inherit git-r3
+ KEYWORDS=""
+else
+ KEYWORDS="~amd64 ~x86"
+ COMMIT="782650597b18f311cc97fbb7c6813539e6adef16"
+ SRC_URI="https://github.com/pothosware/SoapyPlutoSDR/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}"/SoapyPlutoSDR-${COMMIT}
+fi
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+
+RDEPEND="net-wireless/soapysdr
+ net-libs/libiio:=
+ net-libs/libad9361-iio:="
+DEPEND="${RDEPEND}"
diff --git a/net-wireless/soapysdr/metadata.xml b/net-wireless/soapysdr/metadata.xml
index 2d7ac62a7dfb..8b0393c48e0a 100644
--- a/net-wireless/soapysdr/metadata.xml
+++ b/net-wireless/soapysdr/metadata.xml
@@ -13,6 +13,7 @@
Add support for bladerf hardware
Add support for hackrf hardware
Add support for rtlsdr hardware
+ Add support for Analog Devices ADALM-PLUTO hardware
Add support for Ettus USRP hardware
diff --git a/net-wireless/soapysdr/soapysdr-0.6.1.ebuild b/net-wireless/soapysdr/soapysdr-0.6.1-r1.ebuild
similarity index 92%
rename from net-wireless/soapysdr/soapysdr-0.6.1.ebuild
rename to net-wireless/soapysdr/soapysdr-0.6.1-r1.ebuild
index 0669ed4ac687..699b01529e76 100644
--- a/net-wireless/soapysdr/soapysdr-0.6.1.ebuild
+++ b/net-wireless/soapysdr/soapysdr-0.6.1-r1.ebuild
@@ -24,7 +24,7 @@ fi
LICENSE="Boost-1.0"
SLOT="0"
-IUSE="bladerf hackrf python rtlsdr uhd"
+IUSE="bladerf hackrf python rtlsdr plutosdr uhd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="python? ( ${PYTHON_DEPS} )"
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
PDEPEND="bladerf? ( net-wireless/soapybladerf )
hackrf? ( net-wireless/soapyhackrf )
rtlsdr? ( net-wireless/soapyrtlsdr )
+ plutosdr? ( net-wireless/soapyplutosdr )
uhd? ( net-wireless/soapyuhd )"
src_configure() {
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 433fff93338f..041b723299c0 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/package.mask b/profiles/package.mask
index 744d313f266c..355c89d52f2b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -78,8 +78,9 @@ media-plugins/vdr-xvdr
media-plugins/vdr-autosort
# Matthias Maier (1 Sep 2018)
-# Mask 1.0.0 for the time being until a compatible LLVM version made it
-# into the tree.
+# Mask 0.7.0 and 1.0.0 for the time being until a compatible LLVM version
+# made it into the tree, bug #665192
+~dev-lang/julia-0.7.0
~dev-lang/julia-1.0.0
# Michał Górny (31 Aug 2018)
@@ -205,17 +206,6 @@ sys-apps/microcode-ctl
# experimental features and accept a more unstable release.
>=www-client/chromium-70
-# Virgil Dupras (02 Aug 2018)
-# Django 1.8 is unsupported and insecure. These packages haven't been updated
-# to work with up-to-date django. Removal in 30 days. Bug #662632
- (01 Aug 2018)
# Multiprocessing versions of gemato. They are known to hang on some
# users, so let's keep them masked until somebody figures out what's
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f449b75ac5a4..9cda79caf1a5 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2732,7 +2732,6 @@ dev-python/django-cms:picture - Install djangocms picture plugin
dev-python/django-cms:snippet - Install djangocms snippet plugin
dev-python/django-cms:teaser - Install djangocms teaser plugin
dev-python/django-cms:video - Install djangocms video plugin
-dev-python/django-tastypie:bip - An optional serialiser dev-python/biplist
dev-python/editorconfig-core-py:cli - Install command line interface as well as python library
dev-python/fabric:fab2 - Install as "fab2", allowing side-by-side install with fabric 1.x
dev-python/falcon:cython - Build cython-based python modules
@@ -5279,17 +5278,26 @@ media-video/transcode:pic - disable optimized assembly code that is not PIC frie
media-video/transcode:postproc - Build with ffmpeg libpostproc support
media-video/vdr:alternatechannel - Use alternate channel on record
media-video/vdr:bidi - fribidi support, for languages, written from right to left
+media-video/vdr:ddepgentry - remove duplicate EPG entries
+media-video/vdr:dvlvidprefer - controls video-dir choice on recording
media-video/vdr:graphtft - support for vdr-graphtft plugin up from version 0.1.7
media-video/vdr:html - Install HTML documentation
+media-video/vdr:jumpingseconds - skip seconds in played records
+media-video/vdr:jumpplay - Enables automatic jumping over cut marks while watching a recording
media-video/vdr:kbd - enable keyboard support as remote device
media-video/vdr:mainmenuhooks - Allows to replace main menu entries by some special plugins (like epgsearch, extrecmenu, ...)
media-video/vdr:menuorg - Enables support for the media-plugins/vdr-menuorg
media-video/vdr:menuselection - adds support for menu hotkeys of double digits
media-video/vdr:naludump - Removes NALU fill data from h.264-Streams of TS files
+media-video/vdr:permashift - permanent timeshift by recording live TV on hard disk, need plugin media-plugins/vdr-permashift
media-video/vdr:permashift_v1 - permanent timeshift by recording live TV on RAM, need plugin >=mediaplugins/vdr-permashift-1
media-video/vdr:pinplugin - Support for media-plugins/vdr-pin
media-video/vdr:resumereset - rreset resume of EOF
+media-video/vdr:rotor - Enable support for plugin media-plugins/vdr-rotor for dish-positioner.
media-video/vdr:ttxtsubs - support for media-plugins/vdr-ttxtsubs
+media-video/vdr:vasarajanauloja - replacement for the liemikuutio patch, adds some nice must haves features
+media-video/vdr:wareagleicon - Replace original icon set in menu
+media-video/vdr:yaepg - Enables support for the vdr-yaepg plugin
media-video/vlc:X - Enable support for e.g. fullscreen mode via X and the X C-language binding. It does not build a graphical interface
media-video/vlc:aom - Enable experimental support for AV1 codec
media-video/vlc:archive - Enable support for libarchive stream extractor
@@ -6166,6 +6174,7 @@ net-libs/libesmtp:ntlm - Enable support for NTLM authentication
net-libs/libetpan:liblockfile - Enable support for liblockfile library
net-libs/libgsasl:gcrypt - Use dev-libs/libgcrypt for low-level crypto
net-libs/libgsasl:ntlm - Add support for Microsoft's NTLM mechanism using net-libs/libntlm
+net-libs/libiio:aio - Enable asynchronous IO support
net-libs/libinfinity:server - Build and install the server binary including init.d/conf.d-scripts. Needed if you want to host an infinote server for gobby.
net-libs/libisds:openssl - Use dev-libs/openssl as crypto backend instead of app-crypt/gpgme and dev-libs/libgcrypt
net-libs/libmicrohttpd:epoll - use epoll() system call
@@ -7089,7 +7098,6 @@ net-vpn/strongswan:strongswan_plugins_unbound - Enable support for the unbound p
net-vpn/strongswan:strongswan_plugins_unity - Enable support for the unity plugin
net-vpn/strongswan:strongswan_plugins_vici - Enable support for the vici plugin
net-vpn/strongswan:strongswan_plugins_whitelist - Enable support for the whitelist plugin
-net-vpn/tinc:gui - Add GUI support, using dev-python/wxpython
net-vpn/tinc:uml - Enable support for User Mode Linux Sockets
net-vpn/tinc:vde - Enable Virtual Distributed Ethernet (VDE) based networking
net-vpn/tor:scrypt - Use app-crypt/libscrypt for the scrypt algorithm
@@ -7153,6 +7161,7 @@ net-wireless/gr-baz:uhd - install UHD aware blocks
net-wireless/gr-osmosdr:bladerf - Build with Nuand BladeRF support
net-wireless/gr-osmosdr:fcd - Build with Funcube Dongle support
net-wireless/gr-osmosdr:hackrf - Build with Great Scott Gadgets HackRF support
+net-wireless/gr-osmosdr:iio - Build with Industrial IO support for devices such as Analog Devices Pluto
net-wireless/gr-osmosdr:iqbalance - Enable support for I/Q balancing using gr-iqbal
net-wireless/gr-osmosdr:mirisdr - Build with Mirics MSi2500 + MSi001 SDR support
net-wireless/gr-osmosdr:rtlsdr - Build with Realtek RTL2832U (rtlsdr) support
@@ -7188,6 +7197,7 @@ net-wireless/soapy_power:faster - Use sci-libs/scipy to speed up drawing
net-wireless/soapy_power:fastest - Use dev-python/pyFFTW to speed up drawing to the max
net-wireless/soapysdr:bladerf - Add support for bladerf hardware
net-wireless/soapysdr:hackrf - Add support for hackrf hardware
+net-wireless/soapysdr:plutosdr - Add support for Analog Devices ADALM-PLUTO hardware
net-wireless/soapysdr:rtlsdr - Add support for rtlsdr hardware
net-wireless/soapysdr:uhd - Add support for Ettus USRP hardware
net-wireless/spectools:debug - Build the raw output client for spectools. (for developers)
@@ -7710,6 +7720,8 @@ sci-visualization/gwyddion:fits - Enable FITS image import via sci-libs/cfitsio
sci-visualization/gwyddion:sourceview - Enable support for x11-libs/gtksourceview
sci-visualization/labplot:cantor - Enable support for different open-source computer algebra systems via kde-apps/cantor
sci-visualization/labplot:fits - Enable support for NASA's sci-libs/cfitsio library
+sci-visualization/labplot:libcerf - Enable special functions from sci-libs/libcerf
+sci-visualization/labplot:root - Enable support for CERN's ROOT file type
sci-visualization/opendx:cdf - Add support for sci-libs/cdf data exchange format
sci-visualization/opendx:hdf - Add support for the Hierarchical Data Format (sci-libs/hdf)
sci-visualization/paraview:boost - Enable the usage of dev-libs/boost
@@ -8163,8 +8175,14 @@ sys-cluster/pmix:pmi - Build PMI1 and PMI2 interface
sys-cluster/resource-agents:libnet - Force use of net-libs/libnet
sys-cluster/resource-agents:rgmanager - Install resources for sys-cluster/rgmanager
sys-cluster/singularity:slurm - Compile spank plugin for sys-cluster/slurm
+sys-cluster/slurm:html - Build html documentation
+sys-cluster/slurm:ipmi - Build support for collecting some ipmi stats
+sys-cluster/slurm:json - Add support for json-persing via json-c
sys-cluster/slurm:multiple-slurmd - Allow multiple slurmd to run
sys-cluster/slurm:munge - Enable authentication via munge
+sys-cluster/slurm:netloc - Add support for netloc (amd64 only)
+sys-cluster/slurm:numa - Add NUMA awareness
+sys-cluster/slurm:ofed - Add Infiniband support via ofed
sys-cluster/slurm:torque - Enable perl scripts that emulates pbs (qstat, qsub etc.)
sys-cluster/swift:account - adds swift account support
sys-cluster/swift:container - adds swift container support
diff --git a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.3.1.ebuild b/sci-chemistry/GromacsWrapper/GromacsWrapper-0.3.1.ebuild
deleted file mode 100644
index 4c953dd73e3c..000000000000
--- a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.3.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-if [[ $PV = *9999* ]]; then
- scm_eclass=git-2
- EGIT_REPO_URI="https://github.com/orbeckst/${PN}.git"
- EGIT_BRANCH="develop"
- SRC_URI=""
- KEYWORDS=""
-else
- scm_eclass=vcs-snapshot
- SRC_URI="https://github.com/orbeckst/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-inherit eutils distutils-r1 ${scm_eclass}
-
-DESCRIPTION="Python framework for Gromacs"
-HOMEPAGE="https://orbeckst.github.com/GromacsWrapper/"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- >=dev-python/matplotlib-0.91.3[${PYTHON_USEDEP}]
- >=dev-python/RecSQL-0.3[${PYTHON_USEDEP}]
- >=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
- "
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/0001-Drop-chmod-hack.patch"
-)
diff --git a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.3.2.ebuild b/sci-chemistry/GromacsWrapper/GromacsWrapper-0.3.2.ebuild
deleted file mode 100644
index dc2488dd3b95..000000000000
--- a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.3.2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-if [[ $PV = *9999* ]]; then
- scm_eclass=git-2
- EGIT_REPO_URI="https://github.com/orbeckst/${PN}.git"
- EGIT_BRANCH="develop"
- SRC_URI=""
- KEYWORDS=""
-else
- scm_eclass=vcs-snapshot
- SRC_URI="https://github.com/orbeckst/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-inherit eutils distutils-r1 ${scm_eclass}
-
-DESCRIPTION="Python framework for Gromacs"
-HOMEPAGE="https://orbeckst.github.com/GromacsWrapper/"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- >=dev-python/matplotlib-0.91.3[${PYTHON_USEDEP}]
- >=dev-python/RecSQL-0.3[${PYTHON_USEDEP}]
- >=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
- "
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/0001-Drop-chmod-hack.patch"
-)
diff --git a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.5.1.ebuild b/sci-chemistry/GromacsWrapper/GromacsWrapper-0.7.0.ebuild
similarity index 57%
rename from sci-chemistry/GromacsWrapper/GromacsWrapper-0.5.1.ebuild
rename to sci-chemistry/GromacsWrapper/GromacsWrapper-0.7.0.ebuild
index 3e946ea31dd4..55ff025bcf66 100644
--- a/sci-chemistry/GromacsWrapper/GromacsWrapper-0.5.1.ebuild
+++ b/sci-chemistry/GromacsWrapper/GromacsWrapper-0.7.0.ebuild
@@ -1,26 +1,26 @@
-# 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 )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
if [[ $PV = *9999* ]]; then
- scm_eclass=git-2
- EGIT_REPO_URI="https://github.com/orbeckst/${PN}.git"
+ scm_eclass=git-r3
+ EGIT_REPO_URI="https://github.com/Becksteinlab/${PN}.git"
EGIT_BRANCH="develop"
SRC_URI=""
KEYWORDS=""
else
scm_eclass=vcs-snapshot
- SRC_URI="https://github.com/orbeckst/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/Becksteinlab/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
inherit eutils distutils-r1 ${scm_eclass}
DESCRIPTION="Python framework for Gromacs"
-HOMEPAGE="https://orbeckst.github.com/GromacsWrapper/"
+HOMEPAGE="https://gromacswrapper.readthedocs.io"
LICENSE="GPL-3 LGPL-3"
SLOT="0"
@@ -28,7 +28,6 @@ IUSE=""
DEPEND="
>=dev-python/matplotlib-0.91.3[${PYTHON_USEDEP}]
- >=dev-python/RecSQL-0.3[${PYTHON_USEDEP}]
>=sci-libs/scipy-0.9[${PYTHON_USEDEP}]
- "
+ dev-python/six[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}"
diff --git a/sci-chemistry/GromacsWrapper/Manifest b/sci-chemistry/GromacsWrapper/Manifest
index 6b8bc8231762..54c404a4d0ed 100644
--- a/sci-chemistry/GromacsWrapper/Manifest
+++ b/sci-chemistry/GromacsWrapper/Manifest
@@ -1,3 +1 @@
-DIST GromacsWrapper-0.3.1.tar.gz 1575486 BLAKE2B 3ffb89f1e2facc281c58b48e1acf50fe14d2f0e095ac59a1fc9a571118926fa3d054bfc3ee1debdc46f7ec09fcd60944de460933048d6cc9f10d0411bc246c1a SHA512 655dae431bf575963af58a5f75abe6703fe1ecdddba5839b671d9237ddee0e33ab19b528e89bcba4db9063fe30622d44e8f47c7b6452b4d1eed8c7400873a012
-DIST GromacsWrapper-0.3.2.tar.gz 1592147 BLAKE2B 5b04deab9ab8f19f4fee9c7f0d1a614e64996635a5c8923e2271f26dc3ff7a03886a0306199e894b48267adc8dfc2dd853aeb37860007b27edd2d0c2424a7b35 SHA512 a9e0abb5e7ad0c6831e23b6a8c09c6e4cc74b33d66cd17df8e00b876dc275dda11c3d3723565d8d58c45bdf6b2b00323bf85e24e2d5324a8d8b597cc3e5d78a4
-DIST GromacsWrapper-0.5.1.tar.gz 1247839 BLAKE2B acab6411167c68fe8e1761418ab6f96918fa0eda91a2de15ccebacaf47e7352455576b2666982c25f5a6af4f10a443b4f20a6887998b68f12b13e1cfb4b8e838 SHA512 43b6b47e24cbb118492495370b165eb4b0e7672ba4e1c868d3039a0ad0b9828058f30ab7344118c7b0e7dd166ac325ea2b3483bd28b8f65dd972a101a5b9facd
+DIST GromacsWrapper-0.7.0.tar.gz 1177718 BLAKE2B 88515b14ce85ecdf0323c3e4a68ac702cfc14569508be015fafc8192174af792507f6d10935aed2f969417ad34d5a1216688e9dce2f6dc6fc47529b87572d229 SHA512 74f6c5b84556b79ced128e48bf111cc40306b8854c8fcf53cab8f2fcf2dce56367e075c116f50aa1aa0947c83af0641bc78045e7d5035f2a8813f9709edce097
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 3ae4d9f58c39..64f12e2e4707 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/ParmEd/Manifest b/sci-chemistry/ParmEd/Manifest
index aae813414d81..54276dd03b05 100644
--- a/sci-chemistry/ParmEd/Manifest
+++ b/sci-chemistry/ParmEd/Manifest
@@ -1 +1,2 @@
DIST ParmEd-2.7.3.tar.gz 34494858 BLAKE2B 8e3ac8776f30ac73b06fd2241e5d73ba54517805ffcef7cb2f71281248df4f8afdaa05c2186ff50ba0df45df313ebdecd69a4482c8339d41baf804c37069affe SHA512 a3444f915e188bcc924f28b6b4235246e2c063ae98881c48f6e13ebc685d085d6a1bcb61b29509a343cbe58369bc6233acc20ee620c6f1d42da2033772a12e07
+DIST ParmEd-3.0.3.tar.gz 35159355 BLAKE2B 76b4655905276fe498f38c6a3bd483e89e95d3a339fbcd9ceb90d16f68d417b62e0aacaf18143d0b57167ee7acdc726c44324c844462af4d2385872210daef2a SHA512 60b8ee100a301fbddec8323a3dba550c96ffa09624f41e457d4b3941a4e4a15e903c3da6de24a5183731406f19f9e6436a2111d654bc902c0f06ac8b643acf09
diff --git a/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild b/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild
new file mode 100644
index 000000000000..6ea7bdee606e
--- /dev/null
+++ b/sci-chemistry/ParmEd/ParmEd-3.0.3.ebuild
@@ -0,0 +1,41 @@
+# 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} )
+
+if [[ $PV = *9999* ]]; then
+ scm_eclass=git-r3
+ EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+ SRC_URI=""
+ KEYWORDS=""
+else
+ scm_eclass=vcs-snapshot
+ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+inherit eutils distutils-r1 ${scm_eclass}
+
+DESCRIPTION="Parameter/topology editor and molecular simulator"
+HOMEPAGE="https://parmed.github.io/ParmEd/html/index.html"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+ dev-python/numpy[${PYTHON_USEDEP}]
+ sci-libs/scipy[${PYTHON_USEDEP}]
+"
+
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed \
+ -e "/delfile/d" \
+ -e "/deldir/d" \
+ -i setup.py || die
+ distutils-r1_src_prepare
+}
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 4719e61010b2..34e82823df34 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
new file mode 100644
index 000000000000..4a84dbffcc3a
--- /dev/null
+++ b/sci-geosciences/gpsd/gpsd-3.17-r3.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python2_7 )
+SCONS_MIN_VERSION="1.2.1"
+
+inherit eutils udev user multilib distutils-r1 scons-utils toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://git.savannah.nongnu.org/gpsd.git"
+ inherit git-2
+else
+ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
+ KEYWORDS="amd64 arm ~ppc ~ppc64 x86"
+fi
+
+DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
+HOMEPAGE="http://catb.org/gpsd/"
+
+LICENSE="BSD"
+SLOT="0/23"
+
+GPSD_PROTOCOLS=(
+ aivdm ashtech earthmate evermore fury fv18 garmin garmintxt geostar
+ gpsclock isync itrax mtk3301 navcom nmea0183 nmea2000 ntrip oceanserver
+ oncore passthrough rtcm104v2 rtcm104v3 sirf skytraq superstar2 tnt
+ tripmate tsip ublox
+)
+IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
+REQUIRED_USE="X? ( python )
+ gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ qt5? ( cxx )"
+
+RDEPEND="
+ bluetooth? ( net-wireless/bluez )
+ dbus? (
+ sys-apps/dbus
+ dev-libs/dbus-glib
+ )
+ ncurses? ( sys-libs/ncurses:= )
+ ntp? ( || (
+ net-misc/ntp
+ net-misc/chrony
+ ) )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtnetwork:5
+ )
+ python? ( ${PYTHON_DEPS} )
+ usb? ( virtual/libusb:1 )
+ X? ( dev-python/pygobject:3[cairo,${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( sys-devel/bc )"
+
+# xml packages are for man page generation
+if [[ ${PV} == *9999* ]] ; then
+ DEPEND+="
+ app-text/xmlto
+ =app-text/docbook-xml-dtd-4.1*"
+fi
+
+src_prepare() {
+ # Make sure our list matches the source.
+ local src_protocols=$(echo $(
+ sed -n '/# GPS protocols/,/# Time service/{s:#.*::;s:[(",]::g;p}' "${S}"/SConstruct | awk '{print $1}' | LC_ALL=C sort
+ ) )
+ if [[ ${src_protocols} != ${GPSD_PROTOCOLS[*]} ]] ; then
+ eerror "Detected protocols: ${src_protocols}"
+ eerror "Ebuild protocols: ${GPSD_PROTOCOLS[*]}"
+ die "please sync ebuild & source"
+ fi
+
+ epatch "${FILESDIR}"/${P}-do_not_rm_library.patch
+
+ # Avoid useless -L paths to the install dir
+ sed -i \
+ -e 's:\:SYSROOT:g' \
+ SConstruct || die
+
+ use python && distutils-r1_src_prepare
+}
+
+python_prepare_all() {
+ python_export_best
+ # Extract python info out of SConstruct so we can use saner distribute
+ pyvar() { sed -n "/^ *$1 *=/s:.*= *::p" SConstruct ; }
+ local pybins=$(pyvar python_progs | tail -1)
+ local pysrcs=$(sed -n '/^ *python_extensions = {/,/}/{s:^ *::;s:os[.]sep:"/":g;p}' SConstruct)
+ local packet=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/packet'])")
+ local client=$("${PYTHON}" -c "${pysrcs}; print(python_extensions['gps/clienthelpers'])")
+ sed \
+ -e "s|@VERSION@|$(pyvar gpsd_version)|" \
+ -e "s|@URL@|$(pyvar website)|" \
+ -e "s|@EMAIL@|$(pyvar devmail)|" \
+ -e "s|@SCRIPTS@|${pybins}|" \
+ -e "s|@GPS_PACKET_SOURCES@|${packet}|" \
+ -e "s|@GPS_CLIENT_SOURCES@|${client}|" \
+ -e "s|@SCRIPTS@|${pybins}|" \
+ "${FILESDIR}"/${PN}-3.3-setup.py > setup.py || die
+ distutils-r1_python_prepare_all
+}
+
+src_configure() {
+ myesconsargs=(
+ prefix="${EPREFIX}/usr"
+ libdir="\$prefix/$(get_libdir)"
+ udevdir="$(get_udevdir)"
+ chrpath=False
+ gpsd_user=gpsd
+ gpsd_group=uucp
+ nostrip=True
+ manbuild=False
+ shared=$(usex !static True False)
+ $(use_scons bluetooth bluez)
+ $(use_scons cxx libgpsmm)
+ $(use_scons debug clientdebug)
+ $(use_scons dbus dbus_export)
+ $(use_scons ipv6)
+ $(use_scons latency_timing timing)
+ $(use_scons ncurses)
+ $(use_scons ntp ntpshm)
+ $(use_scons ntp pps)
+ $(use_scons X python)
+ $(use_scons qt5 qt)
+ $(use_scons shm shm_export)
+ $(use_scons sockets socket_export)
+ $(use_scons usb)
+ )
+
+ use X && myesconsargs+=( xgps=1 )
+ use qt5 && myesconsargs+=( qt_versioned=5 )
+
+ # enable specified protocols
+ local protocol
+ for protocol in ${GPSD_PROTOCOLS[@]} ; do
+ myesconsargs+=( $(use_scons gpsd_protocols_${protocol} ${protocol}) )
+ done
+}
+
+src_compile() {
+ export CHRPATH=
+ tc-export CC CXX PKG_CONFIG
+ export SHLINKFLAGS=${LDFLAGS} LINKFLAGS=${LDFLAGS}
+ escons
+
+ use python && distutils-r1_src_compile
+}
+
+src_install() {
+ DESTDIR="${D}" escons install $(usex udev udev-install "")
+
+ newconfd "${FILESDIR}"/gpsd.conf-2 gpsd
+ newinitd "${FILESDIR}"/gpsd.init-2 gpsd
+
+ use python && distutils-r1_src_install
+}
+
+pkg_preinst() {
+ # Run the gpsd daemon as gpsd and group uucp; create it here
+ # as it doesn't seem to be needed during compile/install ...
+ enewuser gpsd -1 -1 -1 "uucp"
+}
diff --git a/sci-geosciences/gpsd/gpsd-9999.ebuild b/sci-geosciences/gpsd/gpsd-9999.ebuild
index 98fba863a5a6..e3db55c44b07 100644
--- a/sci-geosciences/gpsd/gpsd-9999.ebuild
+++ b/sci-geosciences/gpsd/gpsd-9999.ebuild
@@ -30,10 +30,11 @@ GPSD_PROTOCOLS=(
tripmate tsip ublox
)
IUSE_GPSD_PROTOCOLS=${GPSD_PROTOCOLS[@]/#/gpsd_protocols_}
-IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
+IUSE="${IUSE_GPSD_PROTOCOLS} bluetooth +cxx dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X"
REQUIRED_USE="X? ( python )
gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm )
- python? ( ${PYTHON_REQUIRED_USE} )"
+ python? ( ${PYTHON_REQUIRED_USE} )
+ qt5? ( cxx )"
RDEPEND="
bluetooth? ( net-wireless/bluez )
@@ -115,10 +116,10 @@ src_configure() {
gpsd_group=uucp
nostrip=True
python=False
- libgpsmm=True
manbuild=False
shared=$(usex !static True False)
$(use_scons bluetooth bluez)
+ $(use_scons cxx libgpsmm)
$(use_scons debug clientdebug)
$(use_scons dbus dbus_export)
$(use_scons ipv6)
@@ -126,7 +127,7 @@ src_configure() {
$(use_scons ncurses)
$(use_scons ntp ntpshm)
$(use_scons ntp pps)
- $(use_scons qt5 libQgpsmm)
+ $(use_scons qt5 qt)
$(use_scons shm shm_export)
$(use_scons sockets socket_export)
$(use_scons usb)
diff --git a/sci-geosciences/gpxsee/Manifest b/sci-geosciences/gpxsee/Manifest
index 8bbaaf25beee..1b22752082d1 100644
--- a/sci-geosciences/gpxsee/Manifest
+++ b/sci-geosciences/gpxsee/Manifest
@@ -1,2 +1,2 @@
-DIST GPXSee-5.13.tar.gz 3058493 BLAKE2B 3c262d1e78380f8cc0a4a989dd721cfb6eef72f2285f9f5d88f8d521c6d0b24b3c5e8a3b3b7a3a87b7a0e11ca350540a78d826e62afe3c82ad614899c5663f79 SHA512 7cffbf5d3e928cfc14074c62c046be9b2e7546c1cc59716c52c5f43b8a1ffabe04585cff5b4eccbfd6a756c6d635443af610bb3e8c82834f21bb768a93f7bbb6
DIST gpxsee-5.14.tar.gz 3155455 BLAKE2B 6180efa345532c99a655b80b6052e6646d4b8bcf5b7feda1eec6f0c73ca63a21cf6ab7efd29e297d35e2cd5ab8cd73204864f1db0e9417107b59bc29f8982d3e SHA512 0fa666b999bb6990a3e78087053f9647c023a21b2bbec870fffc4fe1df3982e06beb294231340c4a0a006d06a1c136f94a09724ffa76758c1246d79f3077b075
+DIST gpxsee-5.17.tar.gz 3831253 BLAKE2B 297dc940a373a302e93b647b386813d1d0d96ac3d01937f84d8bb79239be492b358351b498743981c046a86349b5036d4448288e7cb113eae42383b1f3ed64ed SHA512 260af8d80df5d4239a4ad6c32154871f663c167f6dc697a4cbc7127d29e8752c401720697ba463647852d4179cd484e871645385baad277f3512e74159a2016e
diff --git a/sci-geosciences/gpxsee/gpxsee-5.13.ebuild b/sci-geosciences/gpxsee/gpxsee-5.17.ebuild
similarity index 89%
rename from sci-geosciences/gpxsee/gpxsee-5.13.ebuild
rename to sci-geosciences/gpxsee/gpxsee-5.17.ebuild
index eac7527636d7..50bccd2c2d46 100644
--- a/sci-geosciences/gpxsee/gpxsee-5.13.ebuild
+++ b/sci-geosciences/gpxsee/gpxsee-5.17.ebuild
@@ -11,7 +11,7 @@ MY_P="${MY_PN}-${PV}"
DESCRIPTION="A viewer and analyzer that supports gpx, tcx, kml, fit, igc and nmea files"
HOMEPAGE="http://www.gpxsee.org/"
-SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.gz"
+SRC_URI="https://github.com/tumic0/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
@@ -45,12 +45,17 @@ src_compile() {
}
src_install() {
+ local lang
newbin ${MY_PN} ${PN}
dodoc README.md
insinto /usr/share/${PN}
doins -r pkg/maps pkg/csv
+
insinto /usr/share/${PN}/translations
- doins lang/*.qm
+ for lang in lang/*.qm; do
+ [ -f "${lang}" ] && doins "${lang}"
+ done
+
insinto /usr/share/applications
doins pkg/${PN}.desktop
insinto /usr/share/mime/packages
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 0844f8a81b8a..da40e79263f7 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/xdrfile/Manifest b/sci-libs/xdrfile/Manifest
index 58e3704b6817..e271caaafe47 100644
--- a/sci-libs/xdrfile/Manifest
+++ b/sci-libs/xdrfile/Manifest
@@ -1 +1,2 @@
DIST xdrfile-1.1.1.tar.gz 378942 BLAKE2B 21b1524a7c31e957b28b93dab4b83b88c183528e534864b06ff76e3f31422129c22ac4bc24a054749dd1b5b80d93a82d873cae82571f0b89c16d55ef0de267c7 SHA512 bff06b08e547b956825f9b16a55fe93d07ff0c529426b892fd4b39be538774aa06facffc68994215e22e36edfa5642674653022da0762ca7cd1b7bc654112868
+DIST xdrfile-1.1.4.tar.gz 815342 BLAKE2B 9f2703cdd67dd6cb3156ab96e496dd4fa37d3a60d660da0a6129562ed295bb52ed5d5acb54aab1bd8b682e31f6155e96541dd47fee7226ae058d62f6efe3937a SHA512 70352efcce989172893e34855edd17990c80f3b5f956b2d8b03a5e75593280e981a56b00616adb950a7da5713729029aecb5dd2cd4c52a658a77eca43aa290df
diff --git a/sci-libs/xdrfile/xdrfile-1.1.4.ebuild b/sci-libs/xdrfile/xdrfile-1.1.4.ebuild
new file mode 100644
index 000000000000..9789dad9d61d
--- /dev/null
+++ b/sci-libs/xdrfile/xdrfile-1.1.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+FORTRAN_NEEDED="fortran"
+
+inherit fortran-2 multilib
+
+DESCRIPTION="Library to read gromacs trajectory and topology files"
+HOMEPAGE="http://www.gromacs.org/Developer_Zone/Programming_Guide/XTC_Library"
+SRC_URI="ftp://ftp.gromacs.org/pub/contrib/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="fortran static-libs"
+
+src_configure() {
+ local myeconfargs=( $(use_enable fortran) )
+
+ default
+}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 9b151a1542c6..93e1a822081e 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/labplot/Manifest b/sci-visualization/labplot/Manifest
index eb9705e4b003..146e34d4dfa8 100644
--- a/sci-visualization/labplot/Manifest
+++ b/sci-visualization/labplot/Manifest
@@ -1 +1,2 @@
DIST labplot-2.4.0-kf5.tar.xz 6038072 BLAKE2B b1116a516f3d94d331584f22aefe4e9e54c0c96e98c08a90929bea1aaf379f04437d39a8644afc7cc7feda3f43881ba552d310ca263ae3fc6db24dbc8fb57777 SHA512 5d29dd7d63d484359e73c8d82d8dbc25a069e1f33829cf75c2a2009ebae2027353ecf578b51806b5f35ae17ec472f5cbfdb4caed2637dc1ecc9229d33033d21b
+DIST labplot-2.5.0.tar.xz 11831656 BLAKE2B b6c122509874f1f7a554814b7ac9889b416d36f750ff831773aed313f9eff23abc0809f40f6f591051b287bd1a875af455f5d500ce54130c4d8ddfe5fcfa0870 SHA512 a4b285917e30b0ac00cb8c8ad6827ba3884d95fccc0511a0a317bb2d637e48e6579929c45cfb8bba737bb5a01472a2baa9d812a688730ac4fa40b23cc6625eba
diff --git a/sci-visualization/labplot/labplot-2.5.0.ebuild b/sci-visualization/labplot/labplot-2.5.0.ebuild
new file mode 100644
index 000000000000..40f32162ebc7
--- /dev/null
+++ b/sci-visualization/labplot/labplot-2.5.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
+HOMEPAGE="https://www.kde.org/applications/education/labplot/"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS=""
+IUSE="cantor fftw fits hdf5 libcerf netcdf"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdelibs4support)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep knewstuff)
+ $(add_frameworks_dep ktextwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep syntax-highlighting)
+ $(add_qt_dep qtconcurrent)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtprintsupport)
+ $(add_qt_dep qtserialport)
+ $(add_qt_dep qtsvg)
+ $(add_qt_dep qtwidgets)
+ >=sci-libs/gsl-1.15:=
+ cantor? ( $(add_kdeapps_dep cantor) )
+ fftw? ( sci-libs/fftw:3.0= )
+ fits? ( sci-libs/cfitsio:= )
+ hdf5? ( sci-libs/hdf5:= )
+ libcerf? ( sci-libs/libcerf )
+ netcdf? ( sci-libs/netcdf:= )
+"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/bison
+ sys-devel/gettext
+ x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+ !sci-visualization/labplot:4
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_CANTOR=$(usex cantor)
+ -DENABLE_FFTW=$(usex fftw)
+ -DENABLE_FITS=$(usex fits)
+ -DENABLE_HDF5=$(usex hdf5)
+ -DENABLE_LIBCERF=$(usex libcerf)
+ -DENABLE_NETCDF=$(usex netcdf)
+ -DENABLE_TESTS=$(usex test)
+ )
+
+ kde5_src_configure
+}
diff --git a/sci-visualization/labplot/labplot-9999.ebuild b/sci-visualization/labplot/labplot-9999.ebuild
index 0fa0b2d7ce08..b6d50918c311 100644
--- a/sci-visualization/labplot/labplot-9999.ebuild
+++ b/sci-visualization/labplot/labplot-9999.ebuild
@@ -4,17 +4,16 @@
EAPI=6
KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
inherit kde5
DESCRIPTION="Scientific data analysis and visualisation based on KDE Frameworks"
HOMEPAGE="https://www.kde.org/applications/education/labplot/"
-[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}-kf5.tar.xz"
+[[ ${KDE_BUILD_TYPE} != live ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
KEYWORDS=""
-IUSE="cantor fftw fits hdf5 netcdf"
-
-[[ ${KDE_BUILD_TYPE} != live ]] && S="${WORKDIR}/${P}-kf5"
+IUSE="cantor fftw fits hdf5 libcerf netcdf root"
COMMON_DEPEND="
$(add_frameworks_dep karchive)
@@ -22,14 +21,13 @@ COMMON_DEPEND="
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kconfigwidgets)
$(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdelibs4support)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
$(add_frameworks_dep knewstuff)
$(add_frameworks_dep ktextwidgets)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep syntax-highlighting)
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtgui)
$(add_qt_dep qtprintsupport)
@@ -37,13 +35,23 @@ COMMON_DEPEND="
$(add_qt_dep qtsvg)
$(add_qt_dep qtwidgets)
>=sci-libs/gsl-1.15:=
- cantor? ( $(add_kdeapps_dep cantor) )
+ cantor? (
+ $(add_frameworks_dep kparts)
+ $(add_frameworks_dep kservice)
+ $(add_kdeapps_dep cantor)
+ )
fftw? ( sci-libs/fftw:3.0= )
fits? ( sci-libs/cfitsio:= )
hdf5? ( sci-libs/hdf5:= )
+ libcerf? ( sci-libs/libcerf )
netcdf? ( sci-libs/netcdf:= )
+ root? (
+ app-arch/lz4
+ sys-libs/zlib
+ )
"
DEPEND="${COMMON_DEPEND}
+ sys-devel/bison
sys-devel/gettext
x11-misc/shared-mime-info
"
@@ -51,21 +59,16 @@ RDEPEND="${COMMON_DEPEND}
!sci-visualization/labplot:4
"
-src_prepare() {
- kde5_src_prepare
-
- if ! use handbook && [[ ${KDE_BUILD_TYPE} != live ]]; then
- cmake_comment_add_subdirectory doc-translations
- fi
-}
-
src_configure() {
local mycmakeargs=(
-DENABLE_CANTOR=$(usex cantor)
-DENABLE_FFTW=$(usex fftw)
-DENABLE_FITS=$(usex fits)
-DENABLE_HDF5=$(usex hdf5)
+ -DENABLE_LIBCERF=$(usex libcerf)
-DENABLE_NETCDF=$(usex netcdf)
+ -DENABLE_ROOT=$(usex root)
+ -DENABLE_TEST=$(usex test)
)
kde5_src_configure
diff --git a/sci-visualization/labplot/metadata.xml b/sci-visualization/labplot/metadata.xml
index 9e450bf9332f..150390b19845 100644
--- a/sci-visualization/labplot/metadata.xml
+++ b/sci-visualization/labplot/metadata.xml
@@ -16,5 +16,7 @@
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 7a8c25655b23..f8dddff16f44 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 7e9079eb0deb..6fca0718871a 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,4 +1,3 @@
-DIST busybox-1.28.0.tar.bz2 2261831 BLAKE2B 9cbb133d59711dde90ef5b20bfd4b892e34565103eaa64b2000b042bd2b9b234df14b5e8b74f7cf8f9071b907e1b9eff556e852bb921088d81548473430d3acf SHA512 346a71d44e6c4e1889ac12ae52320cb0c3d0c45c2b4b49fc4e3c0bb25f427707d8075150d545906f414b9f4e5b6d8f1a3afe8cdc31f6a64e06c62b400d7d129b
DIST busybox-1.29.0.tar.bz2 2303680 BLAKE2B 2b3082952a3dc17c4a65ee6de24276d0c9dca9082bc75df23e67855d9667508ba146ff2210f6c548628341fae7bbd1ff16f4ef445b4297cd2a1a05be2b4fb591 SHA512 49afcb0bfcea881b37cb740cd17b144cb46596d456e72702884a835eee5e4b0b681c3a21ee7095a927a2fe4cd2bb691890aa8f3f32dbd98c4da20c2fa4e7edf9
DIST busybox-1.29.1.tar.bz2 2304866 BLAKE2B b8fb576507b952c241f733b76980a246fc0fad0bb5c97fe39a63d7e780e9934fae325d27e997641250248d1c7dc9f480ed42a09fdfc9b0bedc9eb909137c6ca9 SHA512 4506c149abb9ce0d98c75ee1f73d2915b124b8d1975cd9d20b9cd894b47226ea492c4fa802b28cfaae3082991fb7ab127f2376713401545ce4aea8810c36da76
DIST busybox-1.29.2.tar.bz2 2305093 BLAKE2B 04344bab3dbce6ff01746ce60c7966a883af42987cbc3ef43c9a4c831872aaf5c2727e3ed89e2c8f71f547a7f2cb87b31a302367546cb5149c6f65cd9023a663 SHA512 16191a0773f51fb53ba54765813754982621e0ab391a1d07f66a3fb52d28c567ebff019e39f151cdf29f3c878d691f0fb7cdb4cb67e29b732d45224953c5d70f
diff --git a/sys-apps/busybox/busybox-1.28.0.ebuild b/sys-apps/busybox/busybox-1.28.0.ebuild
deleted file mode 100644
index d4f066a7e3d1..000000000000
--- a/sys-apps/busybox/busybox-1.28.0.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI="5"
-inherit eutils flag-o-matic savedconfig toolchain-funcs multilib
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="https://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
- MY_P=${P}
- EGIT_REPO_URI="https://git.busybox.net/busybox"
- inherit git-r3
-else
- MY_P=${PN}-${PV/_/-}
- SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2" # GPL-2 only
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
-REQUIRED_USE="pam? ( !static )"
-RESTRICT="test"
-
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
- pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}
- static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
- >=sys-kernel/linux-headers-2.6.39"
-RDEPEND="${COMMON_DEPEND}
- mdev? ( !::g' \
- Makefile.flags || die
- #sed -i '/bbsh/s:^//::' include/applets.h
- sed -i '/^#error Aborting compilation./d' applets/applets.c || die
- use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
- sed -i \
- -e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
- -e "/^AR\>/s:=.*:= $(tc-getAR):" \
- -e "/^CC\>/s:=.*:= $(tc-getCC):" \
- -e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
- -e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
- Makefile || die
- sed -i \
- -e 's:-static-libgcc::' \
- Makefile.flags || die
-}
-
-src_configure() {
- # check for a busybox config before making one of our own.
- # if one exist lets return and use it.
-
- restore_config .config
- if [ -f .config ]; then
- yes "" | emake -j1 -s oldconfig >/dev/null
- return 0
- else
- ewarn "Could not locate user configfile, so we will save a default one"
- fi
-
- # setup the config file
- emake -j1 -s allyesconfig >/dev/null
- # nommu forces a bunch of things off which we want on #387555
- busybox_config_option n NOMMU
- sed -i '/^#/d' .config
- yes "" | emake -j1 -s oldconfig >/dev/null
-
- # now turn off stuff we really don't want
- busybox_config_option n DMALLOC
- busybox_config_option n FEATURE_2_4_MODULES #607548
- busybox_config_option n FEATURE_SUID_CONFIG
- busybox_config_option n BUILD_AT_ONCE
- busybox_config_option n BUILD_LIBBUSYBOX
- busybox_config_option n FEATURE_CLEAN_UP
- busybox_config_option n MONOTONIC_SYSCALL
- busybox_config_option n USE_PORTABLE_CODE
- busybox_config_option n WERROR
- # triming the BSS size may be dangerous
- busybox_config_option n FEATURE_USE_BSS_TAIL
-
- # These cause trouble with musl.
- if use elibc_musl; then
- busybox_config_option n FEATURE_UTMP
- busybox_config_option n EXTRA_COMPAT
- busybox_config_option n FEATURE_VI_REGEX_SEARCH
- fi
-
- # If these are not set and we are using a uclibc/busybox setup
- # all calls to system() will fail.
- busybox_config_option y ASH
- busybox_config_option y SH_IS_ASH
- busybox_config_option n HUSH
- busybox_config_option n SH_IS_HUSH
-
- busybox_config_option '"/run"' PID_FILE_PATH
- busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
-
- # disable ipv6 applets
- if ! use ipv6; then
- busybox_config_option n FEATURE_IPV6
- busybox_config_option n TRACEROUTE6
- busybox_config_option n PING6
- busybox_config_option n UDHCPC6
- fi
-
- busybox_config_option pam PAM
- busybox_config_option static STATIC
- busybox_config_option syslog {K,SYS}LOGD LOGGER
- busybox_config_option systemd FEATURE_SYSTEMD
- busybox_config_option math FEATURE_AWK_LIBM
-
- # disable features that uClibc doesn't (yet?) provide.
- if use elibc_uclibc; then
- busybox_config_option n FEATURE_SYNC_FANCY #567598
- busybox_config_option n NSENTER
- fi
-
- # all the debug options are compiler related, so punt them
- busybox_config_option n DEBUG_SANITIZE
- busybox_config_option n DEBUG
- busybox_config_option y NO_DEBUG_LIB
- busybox_config_option n DMALLOC
- busybox_config_option n EFENCE
- busybox_config_option $(usex debug y n) TFTP_DEBUG
-
- busybox_config_option selinux SELINUX
-
- # this opt only controls mounting with /dev/null
-}
-
-src_compile() {
- unset KBUILD_OUTPUT #88088
- export SKIP_STRIP=y
-
- emake V=1 busybox
-}
-
-src_install() {
- unset KBUILD_OUTPUT #88088
- save_config .config
-
- into /
- dodir /bin
- if use sep-usr ; then
- # install /ginit to take care of mounting stuff
- exeinto /
- newexe busybox_unstripped ginit
- dosym /ginit /bin/bb
- dosym bb /bin/busybox
- else
- newbin busybox_unstripped busybox
- dosym busybox /bin/bb
- fi
- if use mdev ; then
- dodir /$(get_libdir)/mdev/
- use make-symlinks || dosym /bin/bb /sbin/mdev
- cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
- exeinto /$(get_libdir)/mdev/
- doexe "${FILESDIR}"/mdev/*
-
- newinitd "${FILESDIR}"/mdev.initd mdev
- fi
- if use livecd ; then
- dosym busybox /bin/vi
- fi
-
- # add busybox daemon's, bug #444718
- if busybox_config_enabled FEATURE_NTPD_SERVER; then
- newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
- newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
- fi
- if busybox_config_enabled SYSLOGD; then
- newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
- newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
- fi
- if busybox_config_enabled KLOGD; then
- newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
- newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
- fi
- if busybox_config_enabled WATCHDOG; then
- newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
- newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
- fi
- if busybox_config_enabled UDHCPC; then
- local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
- exeinto "${path%/*}"
- newexe examples/udhcp/simple.script "${path##*/}"
- fi
- if busybox_config_enabled UDHCPD; then
- insinto /etc
- doins examples/udhcp/udhcpd.conf
- fi
-
- # bundle up the symlink files for use later
- emake DESTDIR="${ED}" install
- rm _install/bin/busybox
- # for compatibility, provide /usr/bin/env
- mkdir -p _install/usr/bin
- ln -s /bin/env _install/usr/bin/env
- tar cf busybox-links.tar -C _install . || : #;die
- insinto /usr/share/${PN}
- use make-symlinks && doins busybox-links.tar
-
- dodoc AUTHORS README TODO
-
- cd docs
- docinto txt
- dodoc *.txt
- docinto pod
- dodoc *.pod
- dohtml *.html
-
- cd ../examples
- docinto examples
- dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
- if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
- ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
- ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
- ewarn "If you are creating a binary only and not merging this is probably ok."
- ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
- die "silly options will destroy your system"
- fi
-
- if use make-symlinks ; then
- mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
- fi
-}
-
-pkg_postinst() {
- savedconfig_pkg_postinst
-
- if use make-symlinks ; then
- cd "${T}" || die
- mkdir _install
- tar xf busybox-links.tar -C _install || die
- cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
- fi
-
- if use sep-usr ; then
- elog "In order to use the sep-usr support, you have to update your"
- elog "kernel command line. Add the option:"
- elog " init=/ginit"
- elog "To launch a different init than /sbin/init, use:"
- elog " init=/ginit /sbin/yourinit"
- elog "To get a rescue shell, you may boot with:"
- elog " init=/ginit bb"
- fi
-}
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 7f106765c115..d01b98168434 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -2,3 +2,4 @@ DIST less-529.tar.gz 339651 BLAKE2B 745146fd584c6144b4052d18bae07a2b4c7a719d36c5
DIST less-530.tar.gz 339723 BLAKE2B 9321548b06330c0b1b5b5a36147f5b9348619ff15d907808744b89581edeb4d8c2118ba455d024a23850902cac4d2c34d1e7b9897e02769584315c0e67ef667e SHA512 8d83a18b5648c4fe85921a563aa2c40bcf495aeb611098c83cd167b1e2f706649846cdf457c8506ae2683ab362ad970a0b261747349673020894bccdb9acbc10
DIST less-531.tar.gz 340466 BLAKE2B 6ac75b623fce478114d18cff429659499fedf4ef1a7bb067465ace91c28a7968efb224a4994a1e376a8cf40b110492f10ecda634628029107b38187044a0cd1e SHA512 180b665f194d7cc40d4bbb37bd64b10be463c0705e81795bef84b20dbba1c61825bb3e3da8bcd79f9176bb3af7b1f4e4c3dfe0829a5a2195a11f5b42294daca1
DIST less-533.tar.gz 341035 BLAKE2B 19e6250ef79d1356b296dd23f2aba45ddddedc1a4c365154d18cd7fa7b79d7ed8c60d8a56646523b8e713d6eede065f3e5fb33527d97053adb2b38fe1f93325c SHA512 a2fa8286f185de866d7c74d9468d201905dcd1b95dfc37013bff3a98a7c8229d76f31584c2db5fe980999cef3445b7db63d5c244078ae0459830fcee609a8e39
+DIST less-534.tar.gz 341351 BLAKE2B f309e486c80eb7573ebffa6cd0d43205bb517a0e1f56116ddca739fb5a94cb010157d7f64507a4e32401e28f499d25b9f1c33d160416cef8f7fba01c62cd218e SHA512 b6896061616b30ccdf4e4f03d95ed5372e912dd42832903015bb7ca1fc5596813b86581f02c6a34f6d6cc0e56f58ff62c8a7e1488a7014bd23acaca9236493fe
diff --git a/sys-apps/less/less-531.ebuild b/sys-apps/less/less-531.ebuild
index c4d58efa2269..eb3d1ccf1afe 100644
--- a/sys-apps/less/less-531.ebuild
+++ b/sys-apps/less/less-531.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
LICENSE="|| ( GPL-3 BSD-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="pcre unicode"
DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-534.ebuild b/sys-apps/less/less-534.ebuild
new file mode 100644
index 000000000000..c4d58efa2269
--- /dev/null
+++ b/sys-apps/less/less-534.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Excellent text file viewer"
+HOMEPAGE="http://www.greenwoodsoftware.com/less/"
+SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
+
+LICENSE="|| ( GPL-3 BSD-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="pcre unicode"
+
+DEPEND=">=app-misc/editor-wrapper-3
+ >=sys-libs/ncurses-5.2:0=
+ pcre? ( dev-libs/libpcre )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ export ac_cv_lib_ncursesw_initscr=$(usex unicode)
+ export ac_cv_lib_ncurses_initscr=$(usex !unicode)
+ local myeconfargs=(
+ --with-regex=$(usex pcre pcre posix)
+ --with-editor="${EPREFIX}"/usr/libexec/editor
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ newbin "${FILESDIR}"/lesspipe.sh lesspipe
+ newenvd "${FILESDIR}"/less.envd 70less
+}
+
+pkg_preinst() {
+ if has_version "<${CATEGORY}/${PN}-483-r1" ; then
+ elog "The lesspipe.sh symlink has been dropped. If you are still setting"
+ elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
+ elog "Colorization support has been dropped. If you want that, check out"
+ elog "the new app-text/lesspipe package."
+ fi
+}
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 336623a0ee94..feacc5293288 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,2 +1,3 @@
DIST nix-2.0.2.tar.xz 796404 BLAKE2B 0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990 SHA512 605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
DIST nix-2.0.4.tar.xz 798352 BLAKE2B 0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77 SHA512 bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0cffff617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
+DIST nix-2.1.tar.xz 814936 BLAKE2B 36cb7cecadb353aa920c873b24ea9b7c6c70b0048ddd664e89e2b3c1736b0fe8057dab02cbb9dfe5b500eea27f6da0dd00532e301e8f190dd3f4bd3ef02911be SHA512 1eddf73680ff59277cddc4c891f026295274ea9bd68b795cb5d1cf9ff993638b066417923c4a0ca8248da982498dca05abe811477eac31dee77bd2dad860e43c
diff --git a/sys-apps/nix/nix-2.1.ebuild b/sys-apps/nix/nix-2.1.ebuild
new file mode 100644
index 000000000000..66d217abf098
--- /dev/null
+++ b/sys-apps/nix/nix-2.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix"
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+#keywords are blocked by boost-1.66
+#KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+ app-arch/brotli
+ app-arch/bzip2
+ app-arch/xz-utils
+ dev-db/sqlite
+ dev-libs/openssl:0=
+ >=dev-libs/boost-1.66:0=[context]
+ net-misc/curl
+ sys-libs/libseccomp
+ sys-libs/zlib
+ gc? ( dev-libs/boehm-gc[cxx] )
+ doc? ( dev-libs/libxml2
+ dev-libs/libxslt
+ app-text/docbook-xsl-stylesheets
+ )
+ sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+ >=sys-devel/bison-2.6
+ >=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+ "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+ "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+ "${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+ [systemd] # systemctl enable nix-daemon
+ [openrc] # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+ \$ nix-channel --update
+[as a user] install nix packages:
+ \$ nix-env -i mc
+[as a user] configure environment:
+ Somewhere in .bash_profile you might want to set
+ LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+ but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+ nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+ enewgroup nixbld
+ for i in {1..10}; do
+ # we list 'nixbld' twice to
+ # both assign a primary group for user
+ # and add a user to /etc/group
+ enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+ done
+}
+
+src_prepare() {
+ default
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --localstatedir="${EPREFIX}"/nix/var \
+ $(use_enable gc)
+}
+
+src_compile() {
+ local make_vars=(
+ OPTIMIZE=0 # disable hardcoded -O3
+ V=1 # verbose build
+ )
+ emake "${make_vars[@]}"
+}
+
+src_install() {
+ # TODO: emacs highlighter
+ default
+
+ readme.gentoo_create_doc
+
+ # here we use an eager variant of something that
+ # is lazily done by nix-daemon and root nix-env
+
+ # TODO: will need a tweak for prefix
+ keepdir /nix/store
+ fowners root:nixbld /nix/store
+ fperms 1775 /nix/store
+
+ keepdir /nix/var/nix/channel-cache
+ fperms 0777 /nix/var/nix/channel-cache
+
+ keepdir /nix/var/nix/profiles/per-user
+ fperms 1777 /nix/var/nix/profiles/per-user
+
+ # setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
+ keepdir /nix/var/nix/gcroots/per-user
+ fperms 1777 /nix/var/nix/gcroots/per-user
+
+ newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
+
+ if ! use etc_profile; then
+ rm "${ED}"/etc/profile.d/nix.sh || die
+ rm "${ED}"/etc/profile.d/nix-daemon.sh || die
+ fi
+}
+
+pkg_postinst() {
+ if ! use etc_profile; then
+ ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to USE=-etc_profile)."
+ fi
+
+ readme.gentoo_print_elog
+}
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index fbed82c3ed39..1194244e3fd5 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -1,4 +1,3 @@
-DIST pciutils-3.4.1.tar.gz 404166 BLAKE2B 75c50e7b4469fe4fc3719ee3b58f94be98f113ce4cb36be3d3fb8e57aaefef039866d31a6acc90e6136b21883239c1c7db2b497776e0db8ce05f19c6336b55e1 SHA512 1394647d5e9d324d68bd8bdf4709a438ae06e6a83ded40b9e0026968c032f214073bc764fbf59e15da90b2e424d90dc430db5810d7ff5fbeab0f3e5c6250ee49
DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41ddd165268011012e55a33ea401e3b78ddffecc6f0ec36efb24b6d9338a691167ac094d0d26f855e42cd055701bb SHA512 dcdca7e0bce69d1bee1fa5ea480a9f38534d66da576fdc710aefd8eeb0c18bf6ec5b39e63019d29d6bae0ec2d3881f5d07a4a105ca04c320d84c17821f7297e4
DIST pciutils-3.6.1.tar.gz 455061 BLAKE2B a9dcce9a79aa66101a77d9299aa7c4f2ae3ab9d7ec597790de7396d65e9c700e4e866b5702412972abbf9ffc2996ebad52782a26d9206cc8d33d96566072fb90 SHA512 2a9c86d826932ac6242677bdd0c5288c264b964aa14314aa7eda5379e687822656081883a2a1c5f846037db9bdba616381f84104d0b3b62cd34acf653faf3990
DIST pciutils-3.6.2.tar.gz 473699 BLAKE2B ae7563f2d17334f54e6b055d135138e21d105fa5f5b71061a6de638ecf26c35d9de79cb67a691f936f42fcedb9a1f300e046dd892429195a9f54f9536e313110 SHA512 ab2bab26dd11f941286593135b751b811fa6199d4b5fb8a18e74f72709ea598ab0c0efa31ad6ca70949966dcf80cdfb16d53e5d339b773c69e0a12f132bb8577
diff --git a/sys-apps/pciutils/pciutils-3.4.1.ebuild b/sys-apps/pciutils/pciutils-3.4.1.ebuild
deleted file mode 100644
index 5856f602feb0..000000000000
--- a/sys-apps/pciutils/pciutils-3.4.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-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"
-IUSE="dns +kmod static-libs +udev zlib"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libssl.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
-DEPEND="kmod? ( sys-apps/kmod )
- static-libs? ( ${LIB_DEPEND} )
- !static-libs? ( ${LIB_DEPEND//static-libs(+),} )
- udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
- sys-apps/hwids"
-DEPEND="${DEPEND}
- kmod? ( virtual/pkgconfig )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
-
-switch_config() {
- [[ $# -ne 2 ]] && return 1
- local opt=$1 val=$2
-
- sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
- return 0
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.1.9-static-pc.patch
-
- if use static-libs ; then
- cp -pPR "${S}" "${S}.static" || die
- mv "${S}.static" "${S}/static" || die
- fi
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- append-lfs-flags #471102
-}
-
-pemake() {
- emake \
- HOST="${CHOST}" \
- CROSS_COMPILE="${CHOST}-" \
- CC="$(tc-getCC)" \
- AR="$(tc-getAR)" \
- PKG_CONFIG="$(tc-getPKG_CONFIG)" \
- RANLIB="$(tc-getRANLIB)" \
- DNS=$(usex dns) \
- IDSDIR='$(SHAREDIR)/misc' \
- MANDIR='$(SHAREDIR)/man' \
- PREFIX="${EPREFIX}/usr" \
- SHARED="yes" \
- STRIP="" \
- ZLIB=$(usex zlib) \
- PCI_COMPRESSED_IDS=0 \
- PCI_IDS=pci.ids \
- LIBDIR="\${PREFIX}/$(get_libdir)" \
- LIBKMOD=$(multilib_native_usex kmod) \
- HWDB=$(usex udev) \
- "$@"
-}
-
-multilib_src_compile() {
- pemake OPT="${CFLAGS}" all
- if use static-libs ; then
- pemake \
- -C "${BUILD_DIR}/static" \
- OPT="${CFLAGS}" \
- SHARED="no" \
- lib/libpci.a
- fi
-}
-
-multilib_src_install() {
- pemake DESTDIR="${D}" install install-lib
- use static-libs && dolib.a "${BUILD_DIR}/static/lib/libpci.a"
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README TODO
-
- rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/misc/pci.ids \
- "${ED}"/usr/share/man/man8/update-pciids.8*
-
- newinitd "${FILESDIR}"/init.d-pciparm pciparm
- newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
-
-pkg_postinst() {
- if [[ ${REPLACING_VERSIONS} ]] && [[ ${REPLACING_VERSIONS} < 3.2.0 ]]; then
- elog "The 'network-cron' USE flag is gone; if you want a more up-to-date"
- elog "pci.ids file, you should use sys-apps/hwids-99999999 (live ebuild)."
- fi
-}
diff --git a/sys-apps/pciutils/pciutils-3.5.6.ebuild b/sys-apps/pciutils/pciutils-3.5.6.ebuild
index f12172aef949..e9b3c34b4292 100644
--- a/sys-apps/pciutils/pciutils-3.5.6.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
LICENSE="GPL-2"
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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="dns +kmod static-libs +udev zlib"
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 92793a2079a6..d584ea36e1b0 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,4 +3,5 @@ DIST portage-2.3.40-bug-656942-bug-657436-937d0156aa06.patch 15214 BLAKE2B 0351f
DIST portage-2.3.40-bug-657436-937d0156aa06-1fc628eead43.patch 4131 BLAKE2B 1b051097ef4fb073d22b9ef3472077b4845190ec3839886f462cacbee0996dc4c036549c4beab09025e1bb42f421e5032144e90197e3aa5de08dd7d8d1c50fbb SHA512 5910469816b69afb7a0078dd3b35a5304e2c806ac03ff3949603cf4162900fd9dd1df15661b91a2181528e8406679e525308822a0f6ddf4799c79fa9652c27a9
DIST portage-2.3.40.tar.bz2 995122 BLAKE2B 3bfadee6cf57dace32bb4a365850650e13664202f3b16bf75821ff6226e85da823785ac87875fa82bd5cf1b953d638773819495f73f471c06ffd6926518df1ac SHA512 ded128c1941664fab6bc95f05115ec08900fddaedd1b6f12afa48da024531ee8939134d49759e09995c76a95e41beafdbf5528a5b62d3bf21c826ab1ac0cd1c5
DIST portage-2.3.48.tar.bz2 1010013 BLAKE2B caa314508dc54255e4829b31cd9b943f901458a9521a1270cfd559f624f39b16e7e8dd9ca8e8c0d8ff387c1322cdf896df0f69f55f693fdbfd3817ed3bea9835 SHA512 255132364daafd47462efa5fea2fa5cb87df3458f2e5da025e5fee35531d78b9581bc9daaa9e78e01730f271e7e8844405a963bbaf739a532699d68760184498
+DIST portage-2.3.49.tar.bz2 1010414 BLAKE2B be8e0194855eda8e8a617ee4415d702199e10772bab9539ff27cb165b6749090be887b6f48d449f4e7650e618d43be1b0d26ba59597996a9d3d3ecd0caea166a SHA512 d3daee0075eee61c354ad1d4865b1cf433d9afe5ed56101758219694325c7c5ad62a0d9ce41bf2205934b6e073d0eba3ef3f7c8b6633b5a3448e469783c5329a
DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
diff --git a/sys-apps/portage/portage-2.3.49.ebuild b/sys-apps/portage/portage-2.3.49.ebuild
new file mode 100644
index 000000000000..9963e46ec945
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.49.ebuild
@@ -0,0 +1,264 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+ pypy
+ python3_4 python3_5 python3_6 python3_7
+ python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 systemd
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd"
+SLOT="0"
+IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ >=sys-apps/sed-4.0.5 sys-devel/patch
+ doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+ epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+ >=app-arch/tar-1.27
+ dev-lang/python-exec:2
+ !build? (
+ >=sys-apps/sed-4.0.5
+ app-shells/bash:0[readline]
+ >=app-admin/eselect-1.2
+ $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+ python{2_7,3_4,3_5} pypy)
+ rsync-verify? (
+ >=app-portage/gemato-14[${PYTHON_USEDEP}]
+ >=app-crypt/openpgp-keys-gentoo-release-20180706
+ >=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+ )
+ )
+ elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+ elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+ elibc_musl? ( >=sys-apps/sandbox-2.2 )
+ elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+ >=app-misc/pax-utils-0.1.17
+ selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+ xattr? ( kernel_linux? (
+ >=sys-apps/install-xattr-0.3
+ $(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+ python2_7 pypy)
+ ) )
+ !=net-misc/rsync-2.6.4
+ userland_GNU? ( >=sys-apps/coreutils-6.4 )
+ )"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+ local x y
+ for x in ${@}; do
+ for y in ${SRC_ARCHIVES}; do
+ echo ${y}/${x}
+ done
+ done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+ $(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_setup() {
+ use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+
+ if use gentoo-dev; then
+ einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+ sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+ -i lib/_emerge/create_depgraph_params.py || \
+ die "failed to patch create_depgraph_params.py"
+
+ einfo "Enabling additional FEATURES for gentoo-dev..."
+ echo 'FEATURES="${FEATURES} ipc-sandbox network-sandbox strict-keepdir"' \
+ >> cnf/make.globals || die
+ fi
+
+ if use native-extensions; then
+ printf "[build_ext]\nportage-ext-modules=true\n" >> \
+ setup.cfg || die
+ fi
+
+ if ! use ipc ; then
+ einfo "Disabling ipc..."
+ sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+ -i lib/_emerge/AbstractEbuildProcess.py || \
+ die "failed to patch AbstractEbuildProcess.py"
+ fi
+
+ if use xattr && use kernel_linux ; then
+ einfo "Adding FEATURES=xattr to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ if use build || ! use rsync-verify; then
+ sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+ -i cnf/repos.conf || die "sed failed"
+ fi
+
+ if [[ -n ${EPREFIX} ]] ; then
+ einfo "Setting portage.const.EPREFIX ..."
+ sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+ -i lib/portage/const.py || \
+ die "Failed to patch portage.const.EPREFIX"
+
+ einfo "Prefixing shebangs ..."
+ while read -r -d $'\0' ; do
+ local shebang=$(head -n1 "$REPLY")
+ if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+ sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+ die "sed failed"
+ fi
+ done < <(find . -type f -print0)
+
+ einfo "Adjusting make.globals ..."
+ sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+ -e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+ -i cnf/make.globals || die "sed failed"
+
+ einfo "Adjusting repos.conf ..."
+ sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+ -e "s|^\(sync-openpgp-key-path = \)\(.*\)|\\1${EPREFIX}\\2|" \
+ -i cnf/repos.conf || die "sed failed"
+ if use prefix-guest ; then
+ sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+ -e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+ -e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+ -i cnf/repos.conf || die "sed failed"
+ fi
+
+ einfo "Adding FEATURES=force-prefix to make.globals ..."
+ echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+ || die "failed to append to make.globals"
+ fi
+
+ cd "${S}/cnf" || die
+ if [ -f "make.conf.example.${ARCH}".diff ]; then
+ patch make.conf.example "make.conf.example.${ARCH}".diff || \
+ die "Failed to patch make.conf.example"
+ else
+ eerror ""
+ eerror "Portage does not have an arch-specific configuration for this arch."
+ eerror "Please notify the arch maintainer about this issue. Using generic."
+ eerror ""
+ fi
+}
+
+python_compile_all() {
+ local targets=()
+ use doc && targets+=( docbook )
+ use epydoc && targets+=( epydoc )
+
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install() {
+ # Install sbin scripts to bindir for python-exec linking
+ # they will be relocated in pkg_preinst()
+ distutils-r1_python_install \
+ --system-prefix="${EPREFIX}/usr" \
+ --bindir="$(python_get_scriptdir)" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+ --sbindir="$(python_get_scriptdir)" \
+ --sysconfdir="${EPREFIX}/etc" \
+ "${@}"
+}
+
+python_install_all() {
+ distutils-r1_python_install_all
+
+ local targets=()
+ use doc && targets+=(
+ install_docbook
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ )
+ use epydoc && targets+=(
+ install_epydoc
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+ )
+
+ # install docs
+ if [[ ${targets[@]} ]]; then
+ esetup.py "${targets[@]}"
+ fi
+
+ systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+ # Due to distutils/python-exec limitations
+ # these must be installed to /usr/bin.
+ local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+ einfo "Moving admin scripts to the correct directory"
+ dodir /usr/sbin
+ for target in ${sbin_relocations}; do
+ einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+ mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+ done
+}
+
+pkg_preinst() {
+ # comment out sanity test until it is fixed to work
+ # with the new PORTAGE_PYM_PATH
+ #if [[ $ROOT == / ]] ; then
+ ## Run some minimal tests as a sanity check.
+ #local test_runner=$(find "${ED}" -name runTests)
+ #if [[ -n $test_runner && -x $test_runner ]] ; then
+ #einfo "Running preinst sanity tests..."
+ #"$test_runner" || die "preinst sanity tests failed"
+ #fi
+ #fi
+
+ # elog dir must exist to avoid logrotate error for bug #415911.
+ # This code runs in preinst in order to bypass the mapping of
+ # portage:portage to root:root which happens after src_install.
+ keepdir /var/log/portage/elog
+ # This is allowed to fail if the user/group are invalid for prefix users.
+ if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+ chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+ fi
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 2c5e9bc45954..72d0cbce4d7a 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/knem/Manifest b/sys-cluster/knem/Manifest
index a4736fb6353b..b258d70ac673 100644
--- a/sys-cluster/knem/Manifest
+++ b/sys-cluster/knem/Manifest
@@ -1 +1 @@
-DIST knem-1.1.1.tar.gz 321401 BLAKE2B bb3f2bd553aa1aad5b7ede61723aaea625b811564f43efaf395425449e2b61631432ab3f9ceed2f3f104f638a93705919e595436fdbe8e64b4782ce1c98629fc SHA512 6b53748df8ffcfa400870657d5c121f51e132d2b724bca832b00d7c16c546299d1dd29739fe1d4b00cc33010558ae584e7c0078de2c56d8ea92ce7880b4bfedc
+DIST knem-1.1.3.tar.gz 330109 BLAKE2B 0aa5a2b5cd329e7183800b8b4e6b76297c85325cef218dc0ae27293ffb3aaf8a6896bc237ca745bb8df97a446c2ecc5542b96fc9eb4bbead6a1c9b894dd38f51 SHA512 ab72b3a803898c8de1bb775857da346e16ade285cdf17b9339eef3dc939c5d50ef5b3442e96418e414d64cd3e1e1a922b5e8c74462c5d6866b842ee9749db3eb
diff --git a/sys-cluster/knem/files/knem-1.1.3-setup_timer.patch b/sys-cluster/knem/files/knem-1.1.3-setup_timer.patch
new file mode 100644
index 000000000000..eb418ccc957a
--- /dev/null
+++ b/sys-cluster/knem/files/knem-1.1.3-setup_timer.patch
@@ -0,0 +1,58 @@
+diff --git a/driver/linux/check_kernel_headers.sh b/driver/linux/check_kernel_headers.sh
+index b0b9b851c0a1..7afec9fae138 100755
+--- a/driver/linux/check_kernel_headers.sh
++++ b/driver/linux/check_kernel_headers.sh
+@@ -330,6 +330,19 @@ else
+ echo no
+ fi
+
++# timer_setup() added in v4.14-rc3
++echo -n " checking (in kernel headers) timer_setup() availability ... "
++if test -e ${LINUX_HDR}/include/linux/timer.h > /dev/null ; then
++ if grep timer_setup ${LINUX_HDR}/include/linux/timer.h > /dev/null ; then
++ echo "#define HAVE_TIMER_SETUP 1" >> ${TMP_CHECKS_NAME}
++ echo yes
++ else
++ echo no
++ fi
++else
++ echo no
++fi
++
+ # add the footer
+ echo "" >> ${TMP_CHECKS_NAME}
+ echo "#endif /* __knem_checks_h__ */" >> ${TMP_CHECKS_NAME}
+diff --git a/driver/linux/knem_main.c b/driver/linux/knem_main.c
+index e12aad3c0ea5..ddae2af14449 100644
+--- a/driver/linux/knem_main.c
++++ b/driver/linux/knem_main.c
+@@ -2610,9 +2610,17 @@ knem_kthread_func(void *data)
+
+ #ifdef KNEM_HAVE_DMA_ENGINE
+ static void
++#ifdef HAVE_TIMER_SETUP
++knem_dmacpy_cleanup_timer_handler(struct timer_list *t)
++#else
+ knem_dmacpy_cleanup_timer_handler(unsigned long data)
++#endif
+ {
++#ifdef HAVE_TIMER_SETUP
++ struct knem_context * ctx = from_timer(ctx, t, dmacpy_cleanup_timer);
++#else
+ struct knem_context * ctx = (void *) data;
++#endif
+
+ wake_up(&ctx->kthread_work_wq);
+ knem_counter_inc(DMACPY_CLEANUP_TIMEOUT);
+@@ -2665,7 +2673,11 @@ knem_miscdev_open(struct inode * inode, struct file * file)
+ if (ctx->dmacpy_chan) {
+ INIT_LIST_HEAD(&ctx->dmacpy_cleanup_work_list);
+ spin_lock_init(&ctx->dmacpy_cleanup_work_lock);
++#ifdef HAVE_TIMER_SETUP
++ timer_setup(&ctx->dmacpy_cleanup_timer, knem_dmacpy_cleanup_timer_handler, 0);
++#else
+ setup_timer(&ctx->dmacpy_cleanup_timer, knem_dmacpy_cleanup_timer_handler, (unsigned long) ctx);
++#endif
+ #if (defined CONFIG_NUMA) && (defined KNEM_HAVE_CPUMASK_OF_NODE)
+ {
+ int node = dev_to_node(ctx->dmacpy_chan->device->dev);
diff --git a/sys-cluster/knem/knem-1.1.1.ebuild b/sys-cluster/knem/knem-1.1.3.ebuild
similarity index 86%
rename from sys-cluster/knem/knem-1.1.1.ebuild
rename to sys-cluster/knem/knem-1.1.3.ebuild
index 5de621a022fb..ed55d7b088e1 100644
--- a/sys-cluster/knem/knem-1.1.1.ebuild
+++ b/sys-cluster/knem/knem-1.1.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit autotools linux-mod linux-info toolchain-funcs udev multilib
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-2
KEYWORDS=""
else
- SRC_URI="http://runtime.bordeaux.inria.fr/knem/download/${P}.tar.gz"
+ SRC_URI="http://gforge.inria.fr/frs/download.php/37186/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -31,8 +31,12 @@ MODULE_NAMES="knem(misc:${S}/driver/linux)"
BUILD_TARGETS="all"
BUILD_PARAMS="KDIR=${KERNEL_DIR}"
+PATCHES=( "${FILESDIR}/${P}-setup_timer.patch" )
+
pkg_setup() {
linux-info_pkg_setup
+ CONFIG_CHECK="DMA_ENGINE"
+ check_extra_config
linux-mod_pkg_setup
ARCH="$(tc-arch-kernel)"
ABI="${KERNEL_ABI}"
@@ -41,6 +45,7 @@ pkg_setup() {
src_prepare() {
sed 's:driver/linux::g' -i Makefile.am
eautoreconf
+ default
}
src_configure() {
diff --git a/sys-cluster/knem/knem-9999.ebuild b/sys-cluster/knem/knem-9999.ebuild
index 5de621a022fb..135aad0a586b 100644
--- a/sys-cluster/knem/knem-9999.ebuild
+++ b/sys-cluster/knem/knem-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
inherit autotools linux-mod linux-info toolchain-funcs udev multilib
@@ -9,7 +9,7 @@ DESCRIPTION="High-Performance Intra-Node MPI Communication"
HOMEPAGE="http://runtime.bordeaux.inria.fr/knem/"
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://gforge.inria.fr/git/knem/knem.git"
- inherit git-2
+ inherit git-r3
KEYWORDS=""
else
SRC_URI="http://runtime.bordeaux.inria.fr/knem/download/${P}.tar.gz"
@@ -41,6 +41,7 @@ pkg_setup() {
src_prepare() {
sed 's:driver/linux::g' -i Makefile.am
eautoreconf
+ default
}
src_configure() {
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index ec10fe92e5a8..0800d99dd771 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,2 +1,2 @@
-DIST slurm-17.02.11.tar.bz2 6056931 BLAKE2B bce33aab9705dd95b60c42aba032d3f63b69c450e6093f10ac2cfab2b6028451f5659d6263aa2cafe76eb5f91b484e95d3dea388f32fd7472b0edd5ff33f4afe SHA512 f93f6afc0f6f37ba518644c52ff318ff9f3624a8326e795957f986c11ec72f1ee0dead1c7d49a1fb67df11a2f792c4ecc4f647bd3f824c8bfee1e2de0261f64c
-DIST slurm-17.11.7.tar.bz2 6249399 BLAKE2B 1a57996440611e1976ac382c1be845649baf930913ad52c8afeecc32e1037115d9477acc4a9ab936c09b60c50d72e3f0398ea3c4ee9490d5057f98ce5990d52e SHA512 1761bad0b355f7d76021f9c1023cff4c315ec727fab8045f6aca4d096cdba3ec44a52942e007877d40c396d791537eb7e61a8c2f2538bdcb3854e40cee9e73ea
+DIST slurm-17.11.9.tar.bz2 6258698 BLAKE2B 53f724dfdcaec4117eedcb187b0bfced41471fff667ea3f3452b35d80ed039c14c31a75672c304816af538861fccd0dcf37c0decd32521299db2162a30b8bba0 SHA512 281bda70695011bbc30f56738049b2b11866d6c266c6aa5590ffcbaaa748a02fc76cd2d03834cd90f0e1f4160ee0fb3c35a7c2e53819f5e21445748d4d437e6b
+DIST slurm-18.08.0.tar.bz2 6100548 BLAKE2B 108a64c05cf704288b2ed3627b92edb6402c41aec9866b06d7fdf18b9e0e5f5e815a7e7ded5f8d5c4ab7e9ad46368b5bc54ac52902413fc8a9395c665f11e2ed SHA512 e0da38e2b8b96433c244bcad41e7dd0da56e9bf3de8a64eafd5a8d89ffb8400a3aebb2a54ec28f6c2e9804d40945bb8b53b2a9e3ac688a1d8a2a81ee71b4b11d
diff --git a/sys-cluster/slurm/files/slurm-17.02.11-disable-sview.patch b/sys-cluster/slurm/files/slurm-18.08.0-disable-sview.patch
similarity index 100%
rename from sys-cluster/slurm/files/slurm-17.02.11-disable-sview.patch
rename to sys-cluster/slurm/files/slurm-18.08.0-disable-sview.patch
diff --git a/sys-cluster/slurm/files/slurm.tmpfiles b/sys-cluster/slurm/files/slurm.tmpfiles
new file mode 100644
index 000000000000..c77457db5576
--- /dev/null
+++ b/sys-cluster/slurm/files/slurm.tmpfiles
@@ -0,0 +1 @@
+d /run/slurm 755 slurm slurm -
diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml
index 3ea81217548b..433eeb9e04cc 100644
--- a/sys-cluster/slurm/metadata.xml
+++ b/sys-cluster/slurm/metadata.xml
@@ -9,8 +9,14 @@
Gentoo Cluster Project
diff --git a/sys-cluster/slurm/slurm-17.11.7.ebuild b/sys-cluster/slurm/slurm-17.11.9.ebuild
similarity index 68%
rename from sys-cluster/slurm/slurm-17.11.7.ebuild
rename to sys-cluster/slurm/slurm-17.11.9.ebuild
index c0310a53cc36..837a4d32c760 100644
--- a/sys-cluster/slurm/slurm-17.11.7.ebuild
+++ b/sys-cluster/slurm/slurm-17.11.9.ebuild
@@ -8,12 +8,13 @@ if [[ ${PV} == *9999* ]]; then
INHERIT_GIT="git-r3"
SRC_URI=""
KEYWORDS=""
+ MY_P="${P}"
else
- inherit versionator
+ inherit eapi7-ver
if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
- MY_PV=$(replace_version_separator 3 '-0.') # pre-releases or release-candidate
+ MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
else
- MY_PV=$(replace_version_separator 3 '-') # stable releases
+ MY_PV=$(ver_rs 3 '-') # stable releases
fi
MY_P="${PN}-${MY_PV}"
INHERIT_GIT=""
@@ -22,35 +23,46 @@ else
S="${WORKDIR}/${MY_P}"
fi
-inherit autotools bash-completion-r1 eutils pam perl-module prefix toolchain-funcs user ${INHERIT_GIT}
+inherit autotools bash-completion-r1 eutils pam perl-module prefix toolchain-funcs user systemd ${INHERIT_GIT}
DESCRIPTION="A Highly Scalable Resource Manager"
HOMEPAGE="https://www.schedmd.com"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque X"
+IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl ssl static-libs torque X"
-DEPEND="
+CDEPEND="
!sys-cluster/torque
!net-analyzer/slurm
!net-analyzer/sinfo
- sys-cluster/pmix[-pmi]
+ || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
mysql? ( virtual/mysql )
munge? ( sys-auth/munge )
pam? ( virtual/pam )
ssl? ( dev-libs/openssl:0= )
lua? ( dev-lang/lua:0= )
!lua? ( !dev-lang/lua )
+ ipmi? ( sys-libs/freeipmi )
+ json? ( dev-libs/json-c:= )
+ amd64? ( netloc? ( sys-apps/netloc ) )
+ hdf5? ( sci-libs/hdf5:= )
+ numa? ( sys-process/numactl )
+ ofed? ( sys-fabric/ofed )
X? ( net-libs/libssh2 )
- >=sys-apps/hwloc-1.1.1-r1"
-RDEPEND="${DEPEND}
+ >=sys-apps/hwloc-1.1.1-r1
+ sys-libs/ncurses:0=
+ app-arch/lz4:0=
+ sys-libs/readline:0="
+DEPEND="${CDEPEND}
+ html? ( sys-apps/man2html )"
+RDEPEND="${CDEPEND}
dev-libs/libcgroup"
REQUIRED_USE="torque? ( perl )"
-LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
+LIBSLURM_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurm/perl"
+LIBSLURMDB_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurmdb/perl"
RESTRICT="primaryuri test"
@@ -60,7 +72,7 @@ PATCHES=(
src_unpack() {
if [[ ${PV} == *9999* ]]; then
- git-2_src_unpack
+ git-r3_src_unpack
else
default
fi
@@ -76,10 +88,13 @@ src_prepare() {
default
# pids should go to /var/run/slurm
- sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/var/run/slurm/slurmctld.pid:g" \
- -e "s:/var/run/slurmd.pid:${EPREFIX}/var/run/slurm/slurmd.pid:g" \
+ sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
+ -e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
-i "${S}/etc/slurm.conf.example" \
|| die "Can't sed for /var/run/slurmctld.pid"
+ sed -i "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
+ -i "${S}/etc/slurmdbd.conf.example" \
+ || die "Can't sed for /var/run/slurmdbd.pid"
# also state dirs are in /var/spool/slurm
sed -e "s:StateSaveLocation=*.:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
-e "s:SlurmdSpoolDir=*.:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
@@ -89,26 +104,35 @@ src_prepare() {
sed -e 's:/tmp:/var/tmp:g' \
-i "${S}/etc/slurm.conf.example" \
|| die "Can't sed for StateSaveLocation=*./tmp"
+ # gentooify systemd services
+ sed -e 's:sysconfig/.*:conf.d/slurm:g' \
+ -e 's:var/run/:run/slurm/:g' \
+ -i "${S}/etc"/*.service.in \
+ || die "Can't sed systemd services for sysconfig or var/run/"
hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
eautoreconf
}
src_configure() {
- local myconf=(
- --sysconfdir="${EPREFIX}/etc/${PN}"
- --with-hwloc="${EPREFIX}/usr"
- --docdir="${EPREFIX}/usr/share/doc/${P}"
- --htmldir="${EPREFIX}/usr/share/doc/${P}"
- )
use debug || myconf+=( --disable-debug )
+ local myconf=(
+ --sysconfdir="${EPREFIX}/etc/${PN}"
+ --with-hwloc="${EPREFIX}/usr"
+ --docdir="${EPREFIX}/usr/share/doc/${P}"
+ --htmldir="${EPREFIX}/usr/share/doc/${P}"
+ )
use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
use mysql || myconf+=( --without-mysql_config )
+ use amd64 && myconf+=( $(use_with netloc) )
econf "${myconf[@]}" \
$(use_enable pam) \
$(use_enable X x11) \
$(use_with ssl) \
$(use_with munge) \
+ $(use_with json) \
+ $(use_with hdf5) \
+ $(use_with ofed) \
$(use_enable static-libs static) \
$(use_enable multiple-slurmd)
@@ -173,20 +197,28 @@ src_install() {
exeinto /etc/slurm
doexe \
etc/slurm.epilog.clean
+ keepdir /etc/slurm/layouts.d
+ insinto /etc/slurm/layouts.d
+ newins etc/layouts.d.power.conf.example power.conf.example
+ newins etc/layouts.d.power_cpufreq.conf.example power_cpufreq.conf.example
+ newins etc/layouts.d.unit.conf.example unit.conf.example
# install init.d files
- newinitd "$(prefixify_ro ${FILESDIR}/slurmd.initd)" slurmd
- newinitd "$(prefixify_ro ${FILESDIR}/slurmctld.initd)" slurmctld
- newinitd "$(prefixify_ro ${FILESDIR}/slurmdbd.initd)" slurmdbd
+ newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
+ newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
+ newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
# install conf.d files
newconfd "${FILESDIR}/slurm.confd" slurm
- # Install logrotate file
+ # install logrotate file
insinto /etc/logrotate.d
newins "${FILESDIR}/logrotate" slurm
-
+ # install bashcomp
newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
bashcomp_alias scontrol \
sreport sacctmgr squeue scancel sshare sbcast sinfo \
sprio sacct salloc sbatch srun sattach sdiag sstat
+ # install systemd files
+ systemd_newtmpfilesd "${FILESDIR}/slurm.tmpfiles" slurm.conf
+ systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
}
pkg_preinst() {
@@ -197,8 +229,8 @@ pkg_preinst() {
create_folders_and_fix_permissions() {
einfo "Fixing permissions in ${@}"
- mkdir -p ${@}
- chown -R ${PN}:${PN} ${@}
+ mkdir -p ${@} || die
+ chown -R ${PN}:${PN} ${@} || die
}
pkg_postinst() {
@@ -207,11 +239,12 @@ pkg_postinst() {
"${EROOT}"var/${PN}
"${EROOT}"var/spool/${PN}/slurmd
"${EROOT}"var/spool/${PN}
- "${EROOT}"var/run/${PN}
"${EROOT}"var/log/${PN}
/var/tmp/${PN}/${PN}d
/var/tmp/${PN}
- )
+ /run/${PN}
+ )
+ local folder_path
for folder_path in ${paths[@]}; do
create_folders_and_fix_permissions $folder_path
done
@@ -223,16 +256,12 @@ pkg_postinst() {
echo
elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
elog "Your kernel must be compiled with the wanted cgroup feature:"
- elog " General setup --->"
- elog " [*] Control Group support --->"
- elog " [*] Freezer cgroup subsystem"
- elog " [*] Device controller for cgroups"
- elog " [*] Cpuset support"
- elog " [*] Simple CPU accounting cgroup subsystem"
- elog " [*] Resource counters"
- elog " [*] Memory Resource Controller for Control Groups"
- elog " [*] Group CPU scheduler --->"
- elog " [*] Group scheduling for SCHED_OTHER"
+ elog " For the proctrack plugin:"
+ elog " freezer"
+ elog " For the task plugin:"
+ elog " cpuset, memory, devices"
+ elog " For the accounting plugin:"
+ elog " cpuacct, memory, blkio"
elog "Then, set these options in /etc/slurm/slurm.conf:"
elog " ProctrackType=proctrack/cgroup"
elog " TaskPlugin=task/cgroup"
diff --git a/sys-cluster/slurm/slurm-17.02.11.ebuild b/sys-cluster/slurm/slurm-18.08.0.ebuild
similarity index 64%
rename from sys-cluster/slurm/slurm-17.02.11.ebuild
rename to sys-cluster/slurm/slurm-18.08.0.ebuild
index b52290725ed8..837a4d32c760 100644
--- a/sys-cluster/slurm/slurm-17.02.11.ebuild
+++ b/sys-cluster/slurm/slurm-18.08.0.ebuild
@@ -8,48 +8,61 @@ if [[ ${PV} == *9999* ]]; then
INHERIT_GIT="git-r3"
SRC_URI=""
KEYWORDS=""
+ MY_P="${P}"
else
- inherit versionator
+ inherit eapi7-ver
if [[ ${PV} == *pre* || ${PV} == *rc* ]]; then
- MY_PV=$(replace_version_separator 3 '-0.') # pre-releases or release-candidate
+ MY_PV=$(ver_rs '-0.') # pre-releases or release-candidate
else
- MY_PV=$(replace_version_separator 3 '-') # stable releases
+ MY_PV=$(ver_rs 3 '-') # stable releases
fi
MY_P="${PN}-${MY_PV}"
INHERIT_GIT=""
- SRC_URI="https://www.schedmd.com/download/latest/${MY_P}.tar.bz2"
+ SRC_URI="https://download.schedmd.com/slurm/${MY_P}.tar.bz2"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_P}"
fi
-inherit autotools eutils pam perl-module prefix toolchain-funcs user ${INHERIT_GIT}
+inherit autotools bash-completion-r1 eutils pam perl-module prefix toolchain-funcs user systemd ${INHERIT_GIT}
DESCRIPTION="A Highly Scalable Resource Manager"
HOMEPAGE="https://www.schedmd.com"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug lua multiple-slurmd +munge mysql pam perl ssl static-libs torque"
+IUSE="debug hdf5 html ipmi json lua multiple-slurmd +munge mysql netloc numa ofed pam perl ssl static-libs torque X"
-DEPEND="
+CDEPEND="
!sys-cluster/torque
!net-analyzer/slurm
!net-analyzer/sinfo
- !sys-cluster/pmix[pmi]
+ || ( sys-cluster/pmix[-pmi] >=sys-cluster/openmpi-2.0.0 )
mysql? ( virtual/mysql )
munge? ( sys-auth/munge )
pam? ( virtual/pam )
ssl? ( dev-libs/openssl:0= )
lua? ( dev-lang/lua:0= )
!lua? ( !dev-lang/lua )
- >=sys-apps/hwloc-1.1.1-r1"
-RDEPEND="${DEPEND}
+ ipmi? ( sys-libs/freeipmi )
+ json? ( dev-libs/json-c:= )
+ amd64? ( netloc? ( sys-apps/netloc ) )
+ hdf5? ( sci-libs/hdf5:= )
+ numa? ( sys-process/numactl )
+ ofed? ( sys-fabric/ofed )
+ X? ( net-libs/libssh2 )
+ >=sys-apps/hwloc-1.1.1-r1
+ sys-libs/ncurses:0=
+ app-arch/lz4:0=
+ sys-libs/readline:0="
+DEPEND="${CDEPEND}
+ html? ( sys-apps/man2html )"
+RDEPEND="${CDEPEND}
dev-libs/libcgroup"
REQUIRED_USE="torque? ( perl )"
-LIBSLURM_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurm/perl"
-LIBSLURMDB_PERL_S="${WORKDIR}/${P}/contribs/perlapi/libslurmdb/perl"
+LIBSLURM_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurm/perl"
+LIBSLURMDB_PERL_S="${WORKDIR}/${MY_P}/contribs/perlapi/libslurmdb/perl"
RESTRICT="primaryuri test"
@@ -59,7 +72,7 @@ PATCHES=(
src_unpack() {
if [[ ${PV} == *9999* ]]; then
- git-2_src_unpack
+ git-r3_src_unpack
else
default
fi
@@ -75,10 +88,13 @@ src_prepare() {
default
# pids should go to /var/run/slurm
- sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/var/run/slurm/slurmctld.pid:g" \
- -e "s:/var/run/slurmd.pid:${EPREFIX}/var/run/slurm/slurmd.pid:g" \
+ sed -e "s:/var/run/slurmctld.pid:${EPREFIX}/run/slurm/slurmctld.pid:g" \
+ -e "s:/var/run/slurmd.pid:${EPREFIX}/run/slurm/slurmd.pid:g" \
-i "${S}/etc/slurm.conf.example" \
|| die "Can't sed for /var/run/slurmctld.pid"
+ sed -i "s:/var/run/slurmdbd.pid:${EPREFIX}/run/slurm/slurmdbd.pid:g" \
+ -i "${S}/etc/slurmdbd.conf.example" \
+ || die "Can't sed for /var/run/slurmdbd.pid"
# also state dirs are in /var/spool/slurm
sed -e "s:StateSaveLocation=*.:StateSaveLocation=${EPREFIX}/var/spool/slurm:g" \
-e "s:SlurmdSpoolDir=*.:SlurmdSpoolDir=${EPREFIX}/var/spool/slurm/slurmd:g" \
@@ -88,25 +104,35 @@ src_prepare() {
sed -e 's:/tmp:/var/tmp:g' \
-i "${S}/etc/slurm.conf.example" \
|| die "Can't sed for StateSaveLocation=*./tmp"
+ # gentooify systemd services
+ sed -e 's:sysconfig/.*:conf.d/slurm:g' \
+ -e 's:var/run/:run/slurm/:g' \
+ -i "${S}/etc"/*.service.in \
+ || die "Can't sed systemd services for sysconfig or var/run/"
hprefixify auxdir/{ax_check_zlib,x_ac_{lz4,ofed,munge}}.m4
eautoreconf
}
src_configure() {
- local myconf=(
- --sysconfdir="${EPREFIX}/etc/${PN}"
- --with-hwloc="${EPREFIX}/usr"
- --docdir="${EPREFIX}/usr/share/doc/${P}"
- --htmldir="${EPREFIX}/usr/share/doc/${P}"
- )
use debug || myconf+=( --disable-debug )
+ local myconf=(
+ --sysconfdir="${EPREFIX}/etc/${PN}"
+ --with-hwloc="${EPREFIX}/usr"
+ --docdir="${EPREFIX}/usr/share/doc/${P}"
+ --htmldir="${EPREFIX}/usr/share/doc/${P}"
+ )
use pam && myconf+=( --with-pam_dir=$(getpam_mod_dir) )
use mysql || myconf+=( --without-mysql_config )
+ use amd64 && myconf+=( $(use_with netloc) )
econf "${myconf[@]}" \
$(use_enable pam) \
+ $(use_enable X x11) \
$(use_with ssl) \
$(use_with munge) \
+ $(use_with json) \
+ $(use_with hdf5) \
+ $(use_with ofed) \
$(use_enable static-libs static) \
$(use_enable multiple-slurmd)
@@ -171,15 +197,28 @@ src_install() {
exeinto /etc/slurm
doexe \
etc/slurm.epilog.clean
+ keepdir /etc/slurm/layouts.d
+ insinto /etc/slurm/layouts.d
+ newins etc/layouts.d.power.conf.example power.conf.example
+ newins etc/layouts.d.power_cpufreq.conf.example power_cpufreq.conf.example
+ newins etc/layouts.d.unit.conf.example unit.conf.example
# install init.d files
- newinitd "$(prefixify_ro ${FILESDIR}/slurmd.initd)" slurmd
- newinitd "$(prefixify_ro ${FILESDIR}/slurmctld.initd)" slurmctld
- newinitd "$(prefixify_ro ${FILESDIR}/slurmdbd.initd)" slurmdbd
+ newinitd "$(prefixify_ro "${FILESDIR}/slurmd.initd")" slurmd
+ newinitd "$(prefixify_ro "${FILESDIR}/slurmctld.initd")" slurmctld
+ newinitd "$(prefixify_ro "${FILESDIR}/slurmdbd.initd")" slurmdbd
# install conf.d files
newconfd "${FILESDIR}/slurm.confd" slurm
- # Install logrotate file
+ # install logrotate file
insinto /etc/logrotate.d
newins "${FILESDIR}/logrotate" slurm
+ # install bashcomp
+ newbashcomp contribs/slurm_completion_help/slurm_completion.sh scontrol
+ bashcomp_alias scontrol \
+ sreport sacctmgr squeue scancel sshare sbcast sinfo \
+ sprio sacct salloc sbatch srun sattach sdiag sstat
+ # install systemd files
+ systemd_newtmpfilesd "${FILESDIR}/slurm.tmpfiles" slurm.conf
+ systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
}
pkg_preinst() {
@@ -190,8 +229,8 @@ pkg_preinst() {
create_folders_and_fix_permissions() {
einfo "Fixing permissions in ${@}"
- mkdir -p ${@}
- chown -R ${PN}:${PN} ${@}
+ mkdir -p ${@} || die
+ chown -R ${PN}:${PN} ${@} || die
}
pkg_postinst() {
@@ -200,11 +239,12 @@ pkg_postinst() {
"${EROOT}"var/${PN}
"${EROOT}"var/spool/${PN}/slurmd
"${EROOT}"var/spool/${PN}
- "${EROOT}"var/run/${PN}
"${EROOT}"var/log/${PN}
/var/tmp/${PN}/${PN}d
/var/tmp/${PN}
- )
+ /run/${PN}
+ )
+ local folder_path
for folder_path in ${paths[@]}; do
create_folders_and_fix_permissions $folder_path
done
@@ -216,16 +256,12 @@ pkg_postinst() {
echo
elog "For cgroup support, please see https://www.schedmd.com/slurmdocs/cgroup.conf.html"
elog "Your kernel must be compiled with the wanted cgroup feature:"
- elog " General setup --->"
- elog " [*] Control Group support --->"
- elog " [*] Freezer cgroup subsystem"
- elog " [*] Device controller for cgroups"
- elog " [*] Cpuset support"
- elog " [*] Simple CPU accounting cgroup subsystem"
- elog " [*] Resource counters"
- elog " [*] Memory Resource Controller for Control Groups"
- elog " [*] Group CPU scheduler --->"
- elog " [*] Group scheduling for SCHED_OTHER"
+ elog " For the proctrack plugin:"
+ elog " freezer"
+ elog " For the task plugin:"
+ elog " cpuset, memory, devices"
+ elog " For the accounting plugin:"
+ elog " cpuacct, memory, blkio"
elog "Then, set these options in /etc/slurm/slurm.conf:"
elog " ProctrackType=proctrack/cgroup"
elog " TaskPlugin=task/cgroup"
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index d12767081f09..b8168da9d4ff 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/bison/bison-3.0.5-r1.ebuild b/sys-devel/bison/bison-3.0.5-r1.ebuild
index 4a6ffce406c2..e60826d10599 100644
--- a/sys-devel/bison/bison-3.0.5-r1.ebuild
+++ b/sys-devel/bison/bison-3.0.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples nls static test"
RDEPEND=">=sys-devel/m4-1.4.16"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 0815f61cdd34..bac34aa478ee 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/encfs/encfs-1.9.2.ebuild b/sys-fs/encfs/encfs-1.9.2.ebuild
index f51c6b663be6..3fd739dd5bd8 100644
--- a/sys-fs/encfs/encfs-1.9.2.ebuild
+++ b/sys-fs/encfs/encfs-1.9.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3 LGPL-3"
SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc ~x86"
+KEYWORDS="amd64 ~arm sparc ~x86"
IUSE="libressl nls"
RDEPEND="
diff --git a/sys-fs/zfs-kmod/metadata.xml b/sys-fs/zfs-kmod/metadata.xml
index bbbcb3977c70..f47155ec64df 100644
--- a/sys-fs/zfs-kmod/metadata.xml
+++ b/sys-fs/zfs-kmod/metadata.xml
@@ -5,10 +5,6 @@
ryao@gentoo.org
Richard Yao
-
- fearedbliss@gentoo.org
- Jonathan Vasquez
-
gyakovlev@gentoo.org
Georgy Yakovlev
diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml
index d3167065338f..0b1da3a015bf 100644
--- a/sys-fs/zfs/metadata.xml
+++ b/sys-fs/zfs/metadata.xml
@@ -5,10 +5,6 @@
ryao@gentoo.org
Richard Yao
-
- fearedbliss@gentoo.org
- Jonathan Vasquez
-
gyakovlev@gentoo.org
Georgy Yakovlev
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 1f6f4834fcc9..31e2d348550d 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/bliss-initramfs/metadata.xml b/sys-kernel/bliss-initramfs/metadata.xml
index b09c5a9a69bf..b328d87537ef 100644
--- a/sys-kernel/bliss-initramfs/metadata.xml
+++ b/sys-kernel/bliss-initramfs/metadata.xml
@@ -1,10 +1,7 @@
-
- fearedbliss@gentoo.org
- Jonathan Vasquez
-
+
fearedbliss/bliss-initramfs
diff --git a/sys-kernel/spl/metadata.xml b/sys-kernel/spl/metadata.xml
index 74c883804eba..b51664dca13c 100644
--- a/sys-kernel/spl/metadata.xml
+++ b/sys-kernel/spl/metadata.xml
@@ -5,10 +5,6 @@
ryao@gentoo.org
Richard Yao
-
- fearedbliss@gentoo.org
- Jonathan Vasquez
-
gyakovlev@gentoo.org
Georgy Yakovlev
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index e90a441b3224..0bb06da12142 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/at/Manifest b/sys-process/at/Manifest
index 1ffc8d52d87f..2fa904fc7b1b 100644
--- a/sys-process/at/Manifest
+++ b/sys-process/at/Manifest
@@ -1,2 +1,3 @@
DIST at_3.1.18.orig.tar.gz 124499 BLAKE2B b7c65d33fea3d3345ec7d1eb82652c787cfa86520bdd8ac0329baad5cd19cf85ffefe695e86480d38833abe131da8e9c2ea8685699bcfe8baafb3e2cfa57502e SHA512 5ec7512663461ffa1922cef0d99c3cc4882defbea7b1ab855b05bb83e9d3817535db73db74413bcc8af005c956032ec3dc7c83ac16fde96bb315094dae654042
DIST at_3.1.20.orig.tar.gz 127666 BLAKE2B 8fd0350859e59e61c72f6c67c174ce05bb9c6cffa77792ded11be43eb24d6d1cf2f9f32719657b937e5a11ba8eabefa0e94d5254f05ab79a3daa40c30af97bd8 SHA512 20a13512a86f988728f590712f5bf8a23f4dc44f4b42521a4dd4783dc1ba7ac2016ee87b4c2c14f2346a5839168a983d99c3195e947014aea3096a3db16d176f
+DIST at_3.1.23.orig.tar.gz 126284 BLAKE2B b2af9dfa4ed87ee93489b98acae6b7eb005d6db7e2401ec7d4d21353af636b232d57e92e4cd6e81f52115aa9d29fadf440809a9d77cb1eb5d40d42ec7fe640b0 SHA512 ee5cf5abf32cf1e89746e427d1cc20005ef49fad47db55512c90042a77e86b2c15f5de029c79573bc86ce4aead6ed2d561b89812510aadbc5763f9288b467cfd
diff --git a/sys-process/at/at-3.1.23.ebuild b/sys-process/at/at-3.1.23.ebuild
new file mode 100644
index 000000000000..66481a8ffd51
--- /dev/null
+++ b/sys-process/at/at-3.1.23.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools eutils flag-o-matic pam user systemd
+
+DESCRIPTION="Queues jobs for later execution"
+HOMEPAGE="https://packages.qa.debian.org/a/at.html"
+SRC_URI="mirror://debian/pool/main/a/at/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pam selinux"
+
+DEPEND="virtual/mta
+ >=sys-devel/autoconf-2.64
+ sys-devel/bison
+ >=sys-devel/flex-2.5.4a
+ pam? ( virtual/pam )"
+RDEPEND="virtual/mta
+ virtual/logger
+ selinux? ( sec-policy/selinux-at )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.8-more-deny.patch
+ "${FILESDIR}"/${PN}-3.1.14-Makefile.patch
+ # fix parallel make issues, bug #244884
+ "${FILESDIR}"/${PN}-3.1.10.2-Makefile.in-parallel-make-fix.patch
+ "${FILESDIR}"/${PN}-3.1.13-configure.in-fix-PAM-automagick-dep.patch
+ # Fix parallel make issue (bug #408375)
+ "${FILESDIR}"/${PN}-3.1.13-parallel-make-fix.patch
+ "${FILESDIR}"/${PN}-3.1.13-getloadavg.patch
+)
+
+pkg_setup() {
+ # Cannot be moved into pkg_preinst!
+ enewgroup at 25
+ enewuser at 25 -1 /var/spool/at/atjobs at
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local my_conf=(
+ --sysconfdir=/etc/at
+ --with-jobdir=/var/spool/at/atjobs
+ --with-atspool=/var/spool/at/atspool
+ --with-etcdir=/etc/at
+ --with-daemon_username=at
+ --with-daemon_groupname=at
+ $(usex pam '' --without-pam)
+ $(use_with selinux)
+ )
+ econf ${my_conf[@]}
+}
+
+src_install() {
+ emake install IROOT="${D}"
+
+ newinitd "${FILESDIR}"/atd.rc8 atd
+ newconfd "${FILESDIR}"/atd.confd atd
+ newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd
+
+ # Preserve existing .SEQ files (bug #386625)
+ local seq_file="${EROOT}/var/spool/at/atjobs/.SEQ"
+ if [ -f "${seq_file}" ] ; then
+ einfo "Preserving existing .SEQ file (bug #386625)."
+ cp -p "${seq_file}" "${ED}"/var/spool/at/atjobs/ || die
+ fi
+
+ systemd_dounit "${FILESDIR}/atd.service"
+ keepdir /var/spool/at/atspool
+}
+
+pkg_postinst() {
+ einfo "Forcing correct permissions on /var/spool/at"
+ local atspooldir="${EROOT}/var/spool/at"
+ chown at:at "${atspooldir}/atjobs"
+ chmod 1770 "${atspooldir}/atjobs"
+ chown at:at "${atspooldir}/atjobs/.SEQ"
+ chmod 0600 "${atspooldir}/atjobs/.SEQ"
+ chown at:at "${atspooldir}/atspool"
+ chmod 1770 "${atspooldir}/atspool"
+}
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index 6a6608bae6ff..06bd290d7327 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1 +1,2 @@
DIST Glances-2.11.1.tar.gz 5665685 BLAKE2B 5de75e7770cc01a0ddd6fcb0583e5d23c02e5188c7d6cbd55d2999be9321a1affda351094b8614d206e640e5a1338266b5c77629ec53bb280b9166f7b6a996e2 SHA512 99adccff7d1531760834b76f9a9525df0bf9a8f6f57dbd1f7c3c0515ba3b5c94f26172e19bbc7c93cecbe4bdebcca87ab3a11dd592259509eff85346780ef43a
+DIST Glances-3.0.tar.gz 6247724 BLAKE2B 0481782c7ad69459ae7a3b2d01f08c1ef45715c8a272ad78283c49c13bd9d7465f1a0ee96284b539b132f9cbc01e8432cf49239f0737da1858895f83b0b47cfe SHA512 8d77d429b553fcb603c627f0fd0a8998791d5bf86be3d89cd35b37e46e1b0546787607ba4f92d5a4981565db54a8b55d314cd3b9e7824a353324cd9d404f3c0b
diff --git a/sys-process/glances/glances-3.0.ebuild b/sys-process/glances/glances-3.0.ebuild
new file mode 100644
index 000000000000..8f7a7c3865df
--- /dev/null
+++ b/sys-process/glances/glances-3.0.ebuild
@@ -0,0 +1,82 @@
+# 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,5,6}} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1 eutils linux-info
+
+DESCRIPTION="CLI curses based monitoring tool"
+HOMEPAGE="https://github.com/nicolargo/glances"
+SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+DEPEND="
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND="${DEPEND}
+ >=dev-python/psutil-2.0.0[${PYTHON_USEDEP}]"
+
+CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
+
+S="${WORKDIR}/${P^}"
+
+pkg_setup() {
+ linux-info_pkg_setup
+}
+
+python_prepare_all() {
+ # Remove duplicate entries of a prebuilt doc build and
+ # ensure install of the file glances.conf in /etc/${PN}
+ sed \
+ -e '/share\/doc\/glances/d' \
+ -e "s/'CONTRIBUTING.md',//" \
+ -e "s:'conf/glances.conf':('${EPREFIX}/etc/glances', ['conf/glances.conf':g" \
+ -i setup.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+ # add an intended file from original data set from setup.py to DOCS
+ local DOCS=( README.rst CONTRIBUTING.md conf/glances.conf )
+ # build docs
+ if use doc; then
+ pushd docs
+ make html
+ popd
+ local HTML_DOCS=( docs/_build/html/. )
+ fi
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature "Action script feature" dev-python/pystache
+ optfeature "Autodiscover mode" dev-python/zeroconf
+ optfeature "Battery monitoring support" dev-python/batinfo
+ optfeature "Docker monitoring support" dev-python/docker-py
+ optfeature "Graphical/chart support" dev-python/matplotlib
+ # https://bitbucket.org/gleb_zhulik/py3sensors
+ # optfeature "Hardware monitoring support" dev-python/py3sensors
+ optfeature "IP plugin" dev-python/netifaces
+ optfeature "InfluxDB export module" dev-python/influxdb
+ optfeature "Hard drive temperature monitoring" app-admin/hddtemp
+ optfeature "Quicklook CPU info" dev-python/py-cpuinfo
+ optfeature "RAID support" dev-python/pymdstat
+ optfeature "RabbitMQ/ActiveMQ export module" dev-python/pika
+ # https://github.com/banjiewen/bernhard
+ # optfeature "Riemann export" dev-python/bernhard
+ optfeature "SNMP support" dev-python/pysnmp
+ optfeature "StatsD export module" dev-python/statsd
+ optfeature "Web server mode" dev-python/bottle
+}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index f0c10c41f6e9..87008d24c413 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index fe6cd0f047ec..9547afc69906 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,2 +1,4 @@
DIST nextcloud-12.0.10.tar.bz2 45114548 BLAKE2B e993c617d27fea12ba95e4fa365c02ae6a6930ef944fcd1604862d4aca331291d1e738a846316f89947f466095b300fa53f652e1ac501440fe88512f8bf0b096 SHA512 10ec239f55e88f247bb52816c8c959b9e504c5a0ae428d0ff372866f72d900e6e9cf8dee43f24f906bebf2db4b4a9d2d8386447b838d834b24da404ee1e5849a
+DIST nextcloud-12.0.11.tar.bz2 45123785 BLAKE2B 3d1f9131ff89d348dd18c0f7de284b13563177b388729e6049909fa1be3ae3ccdd03a85094869a872e4eb18e210a7ef406b0813e2ec5a1804aaecd9df4cf770d SHA512 885daa98ce602c6b59adaf66eb2e10ac6f5c5b2a607b5ebb80b82ee08256fd77d12aa1dee4db463d42abdd169e4acad14ee793cdfbcfa5b466f25ca3fb6ffa79
DIST nextcloud-13.0.5.tar.bz2 44792418 BLAKE2B 0582b36a078ccea7a2b482e8be213f0102fff2d60f0b92736d7c488498cf8ae4b75ea6a9e5c14cd0d71f2b3ad9d0ff9b6a2fba7b809bcc89e2287c7801e26a49 SHA512 5456f95d3835e0c9fcf015453e1f6e75ba6f5c0266d8951596fad7d3bf06230199a22e5869bc616581410db0ed831a5cdec123a9d2955898a837614a2bfff32c
+DIST nextcloud-13.0.6.tar.bz2 44769940 BLAKE2B e9c227d64a23dbd677326f528cc268842403c6d51514e8b0d5d446ca5e91fd49910777b6cc7d7bbf0e7f6e1c422fed390cd38506edde019dc5a1955d94757102 SHA512 cbecd5dc98c96f28cbefe6b25e51f4be4583004841eb38d32a3261ed01f906590e16053dd7d8e31589a2288eafd368a47e280d511ee8c994886b4ea892f535ff
diff --git a/www-apps/nextcloud/nextcloud-12.0.11.ebuild b/www-apps/nextcloud/nextcloud-12.0.11.ebuild
new file mode 100644
index 000000000000..b5b260e20578
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-12.0.11.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND=" /dev/null || die
+ chromium_remove_language_paks
+ popd > /dev/null || die
+
+ sed -i \
+ -e 's|^TargetEnvironment|X-&|g' \
+ usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+ mv * "${D}" || die
+ dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+ fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 6108e1d5e170..5900585215d3 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/passff/Manifest b/www-plugins/passff/Manifest
index 020445e5515c..3aeb03fe3463 100644
--- a/www-plugins/passff/Manifest
+++ b/www-plugins/passff/Manifest
@@ -1 +1 @@
-DIST passff-1.3-an+fx-linux.xpi 59512 BLAKE2B 48eb41e8be2e090aa32137fe93eb6cb7a22218f865f1ade4e6f4516ea3fedc34333f43438fd7c96817ec695ca1d0ced9cff0dd53157e06442e000c12a4bff33c SHA512 d5e5c29fda852c08908ce27e55bb2cd3daaacedf4f1375eb626cf4228d9b8c5113d2210578d80420c1df3846cbb948c184702274ece851c9e8279000e38989a6
+DIST passff-1.5.1-an+fx-linux.xpi 64094 BLAKE2B ebe19e26db05ca38f7ede9a01c1abaec786c197c6a25f0f144be903a93b85723bd143ad1805090fcfe81e83289a156f818d7b7b2a5462f151eb0ac12d1e82b0e SHA512 23dc3833c2d83181c21955169e5f65df88a4a26ab018a852d1181b84fd338a40f46b8ed5828f0e1fccca72f610facac68ceb766a3a7b454962228c36bde233f7
diff --git a/www-plugins/passff/passff-1.3.ebuild b/www-plugins/passff/passff-1.5.1.ebuild
similarity index 73%
rename from www-plugins/passff/passff-1.3.ebuild
rename to www-plugins/passff/passff-1.5.1.ebuild
index 2cc136021db6..8e1bdf3fe70f 100644
--- a/www-plugins/passff/passff-1.3.ebuild
+++ b/www-plugins/passff/passff-1.5.1.ebuild
@@ -7,7 +7,7 @@ inherit mozextension
DESCRIPTION="zx2c4 pass manager extension for Firefox"
HOMEPAGE="https://github.com/passff/passff"
-SRC_URI="https://addons.mozilla.org/firefox/downloads/file/914592/passff-1.3-an+fx-linux.xpi"
+SRC_URI="https://addons.mozilla.org/firefox/downloads/file/1056515/passff-1.5.1-an+fx-linux.xpi"
LICENSE="GPL-2"
SLOT="0"
@@ -19,19 +19,21 @@ REQUIRED_USE="|| ( firefox firefox-bin )"
S="${WORKDIR}"
+MY_XPINAME="passff-1.5.1-an+fx-linux"
+
src_unpack() {
- xpi_unpack "passff-1.3-an+fx-linux.xpi"
+ xpi_unpack "${MY_XPINAME}.xpi"
}
src_install() {
local MOZILLA_FIVE_HOME
if use firefox; then
MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox"
- xpi_install "passff-1.3-an+fx-linux"
+ xpi_install "${MY_XPINAME}"
fi
if use firefox-bin; then
MOZILLA_FIVE_HOME="/opt/firefox"
- xpi_install "passff-1.3-an+fx-linux"
+ xpi_install "${MY_XPINAME}"
fi
}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 5515974e3afb..109bfa020e58 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/lightdm/Manifest b/x11-misc/lightdm/Manifest
index a1f23fa0d0be..25267789efa4 100644
--- a/x11-misc/lightdm/Manifest
+++ b/x11-misc/lightdm/Manifest
@@ -2,3 +2,4 @@ DIST introspection-20110205.m4.tar.bz2 1220 BLAKE2B 01483c1a7b73568e01cc4d84b43c
DIST lightdm-1.18.3.tar.xz 503968 BLAKE2B ec1fa0a62880708d223da972b3d9c2f2961e3e8f8baf6da9012de98818b27e0bc0e37cb6f460a25821779d83e9da1cd632484ad75ba95cb26cb9d23254600024 SHA512 dde34e4969d2f04e6729eb1b30d38bac9a89ff42c46f8a21e94b76beadbde450ffaa377201bd3a56e0d8d95d0640eb312ed11ecf94efb9a5a66777b944d4f234
DIST lightdm-1.24.0.tar.xz 517552 BLAKE2B b4ab92b313bbb3a7bcc48a1d02b7bfb978bbc5041dbb81ceaa59c4296b2e4b069f90d9f09a4289376cb34e11331c39740f4e5370273d1315c75a9a35bd01cbb0 SHA512 30bad8887928f22bf2cc7ce8d7a323637dec669d47d69fb326cfcf1bb5ee9e52c1232cf680af94a25cf90a9de13d9b5ff73307c1dc8829422600d350401555b8
DIST lightdm-1.26.0.tar.xz 516092 BLAKE2B 0bbbe11959a2ea0c21e723d10e8831fc0d9e15475a415869634cfb41c6d576b77fd87720be33dae8456063947dd1b551e88c263ed76ef9b120c43df8c42513f3 SHA512 67c0671753587493ed064b66f94be58853028287c914d1101e66499bebf1408e14d33245887ce89d1c4931960225ea3984e5e625b22dc4e3020be34a3087d8e7
+DIST lightdm-1.28.0.tar.xz 517460 BLAKE2B 98a0b60623dcac07bbb6bff95fa20da9425b714fe5da0d7d86c788362e40604bea2b46675c57e70c70356f71a542adbd6431723e40b815db8565d67ddecc20a1 SHA512 e1e8a952e723bbcc106043d33a64278b228a5a47a7e54235375817b08483594cc5e46ec52f5cbb9d258266e44b045785bca1d4c62daf83071c0f668b3c480071
diff --git a/x11-misc/lightdm/lightdm-1.28.0.ebuild b/x11-misc/lightdm/lightdm-1.28.0.ebuild
new file mode 100644
index 000000000000..772bf25fca77
--- /dev/null
+++ b/x11-misc/lightdm/lightdm-1.28.0.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic pam qmake-utils readme.gentoo-r1 systemd vala xdg-utils
+
+DESCRIPTION="A lightweight display manager"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/LightDM"
+SRC_URI="https://github.com/CanonicalLtd/lightdm/releases/download/${PV}/${P}.tar.xz
+ mirror://gentoo/introspection-20110205.m4.tar.bz2"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="audit +gnome +gtk +introspection qt5 vala"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.44.0:2
+ dev-libs/libxml2
+ virtual/pam
+ x11-libs/libX11
+ >=x11-libs/libxklavier-5
+ audit? ( sys-process/audit )
+ gnome? ( sys-apps/accountsservice )
+ introspection? ( >=dev-libs/gobject-introspection-1 )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ >=sys-auth/pambase-20101024-r2"
+DEPEND="${COMMON_DEPEND}
+ dev-util/gtk-doc-am
+ dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ gnome? ( gnome-base/gnome-common )
+ vala? ( $(vala_depend) )
+"
+PDEPEND="gtk? ( x11-misc/lightdm-gtk-greeter )"
+
+DOCS=( NEWS )
+RESTRICT="test"
+
+src_prepare() {
+ xdg_environment_reset
+
+ sed -i -e 's:getgroups:lightdm_&:' tests/src/libsystem.c || die #412369
+ sed -i -e '/minimum-uid/s:500:1000:' data/users.conf || die
+
+ einfo "Fixing the session-wrapper variable in lightdm.conf"
+ sed -i -e \
+ "/^#session-wrapper/s@^.*@session-wrapper=/etc/${PN}/Xsession@" \
+ data/lightdm.conf || die "Failed to fix lightdm.conf"
+
+ # use correct version of qmake. bug #566950
+ sed \
+ -e "/AC_CHECK_TOOLS(MOC5/a AC_SUBST(MOC5,$(qt5_get_bindir)/moc)" \
+ -i configure.ac || die
+
+ default
+
+ # Remove bogus Makefile statement. This needs to go upstream
+ sed -i /"@YELP_HELP_RULES@"/d help/Makefile.am || die
+ if has_version dev-libs/gobject-introspection; then
+ eautoreconf
+ else
+ AT_M4DIR=${WORKDIR} eautoreconf
+ fi
+
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ # Set default values if global vars unset
+ local _greeter _session _user
+ _greeter=${LIGHTDM_GREETER:=lightdm-gtk-greeter}
+ _session=${LIGHTDM_SESSION:=gnome}
+ _user=${LIGHTDM_USER:=root}
+ # Let user know how lightdm is configured
+ einfo "Gentoo configuration"
+ einfo "Default greeter: ${_greeter}"
+ einfo "Default session: ${_session}"
+ einfo "Greeter user: ${_user}"
+
+ use qt5 && append-cxxflags -std=c++11
+
+ # also disable tests because libsystem.c does not build. Tests are
+ # restricted so it does not matter anyway.
+ local myeconfargs=(
+ --localstatedir=/var
+ --disable-static
+ --disable-tests
+ $(use_enable audit libaudit)
+ $(use_enable introspection)
+ --disable-liblightdm-qt
+ $(use_enable qt5 liblightdm-qt5)
+ $(use_enable vala)
+ --with-user-session=${_session}
+ --with-greeter-session=${_greeter}
+ --with-greeter-user=${_user}
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ # Delete apparmor profiles because they only work with Ubuntu's
+ # apparmor package. Bug #494426
+ if [[ -d ${ED%/}/etc/apparmor.d ]]; then
+ rm -r "${ED%/}/etc/apparmor.d" || die \
+ "Failed to remove apparmor profiles"
+ fi
+
+ insinto /etc/${PN}
+ doins data/{${PN},keys}.conf
+ doins "${FILESDIR}"/Xsession
+ fperms +x /etc/${PN}/Xsession
+ # /var/lib/lightdm-data could be useful. Bug #522228
+ dodir /var/lib/lightdm-data
+
+ find "${ED}" \( -name '*.a' -o -name "*.la" \) -delete || die
+ rm -rf "${ED%/}"/etc/init
+
+ # Remove existing pam file. We will build a new one. Bug #524792
+ rm -rf "${ED%/}"/etc/pam.d/${PN}{,-greeter}
+ pamd_mimic system-local-login ${PN} auth account password session #372229
+ pamd_mimic system-local-login ${PN}-greeter auth account password session #372229
+ dopamd "${FILESDIR}"/${PN}-autologin #390863, #423163
+
+ readme.gentoo_create_doc
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+ keepdir /var/lib/${PN}-data
+}
+
+pkg_postinst() {
+ systemd_reenable "${PN}.service"
+}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 25469e6d6b0a..4d0bd947b3aa 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/xfwm4/xfwm4-4.13.1-r1.ebuild b/xfce-base/xfwm4/xfwm4-4.13.1-r1.ebuild
index c44da6e62c03..45a8b26c1892 100644
--- a/xfce-base/xfwm4/xfwm4-4.13.1-r1.ebuild
+++ b/xfce-base/xfwm4/xfwm4-4.13.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="opengl startup-notification +xcomposite xpresent"
+IUSE="opengl startup-notification +xcomposite +xpresent"
RDEPEND="dev-libs/dbus-glib:=
>=dev-libs/glib-2.20:=