diff --git a/Manifest.files.gz b/Manifest.files.gz
index f12ae13f6a56..70f1973bccdd 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 7718e9073feb..bc6533537f55 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 104a52f59a54..669847cd2a72 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1 +1,2 @@
DIST r10k-1.5.1.gem 164864 BLAKE2B 398f656913b9c0b3835d782dec3aa0d7a475dc49ac6fba7734239a795e209048969c1e66575029eae5ac19513ac57e24adbfc839c9f5c0537c82fe0fe65def30 SHA512 4440a893aaa6ec0337f9347b620f92afd93099465c148bfe90cd44c2c6fe29cc8411b8c225044a9547d24a8857b580dcf2ea190bf64fe9ba180d1c5c3832d1dd
+DIST r10k-3.1.0.gem 202240 BLAKE2B 46b7b03d7d57aa856f31ee1a8fe804b1e5ed2272f2543955c46fd194a956c4074fab7a0ca59ce828e1d0841cd7beabdcaa7a167329a8ac707e96be9e71f2cd2f SHA512 7ec80be0e09d0693f33eaca4420a47a6fa7c2216ab8a06a45611b7150f97be00eaca7dd674962f14b169f9b0b315c3b47c76612baee0724c7d928541e535a960
diff --git a/app-admin/r10k/r10k-3.1.0.ebuild b/app-admin/r10k/r10k-3.1.0.ebuild
new file mode 100644
index 000000000000..c03f18e4e6a9
--- /dev/null
+++ b/app-admin/r10k/r10k-3.1.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Puppet environment and module deployment"
+HOMEPAGE="https://github.com/puppetlabs/r10k"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+git"
+
+ruby_add_rdepend "
+ ~dev-ruby/colored-1.2
+ =dev-ruby/cri-2.15*
+ >=dev-ruby/gettext-setup-0.24:0
+ ~dev-ruby/log4r-1.1.10
+ >=dev-ruby/multi_json-1.10:0
+ >=dev-ruby/puppet_forge-2.2.8
+ =dev-ruby/puppet_forge-2.2*
+"
+
+ruby_add_bdepend "test? (
+ dev-ruby/archive-tar-minitar
+)"
+
+RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
+
+all_ruby_prepare() {
+ sed -i -e 's/json_pure/json/' \
+ -e '/cri/ s/2\.6\../2.7/' \
+ -e '/systemu/ s/2.5.2/2.5/' \
+ -e '/faraday/ s/0.9.0/0.9/' \
+ -e '/semantic_puppet/ s/~>/>/' \
+ -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+ # Avoid specs for unpackaged rugget git provider
+ rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index ee62fbaf8caf..470474c9ed27 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/lbzip2/lbzip2-2.5-r1.ebuild b/app-arch/lbzip2/lbzip2-2.5-r1.ebuild
index aae9eb87bd90..78726f555327 100644
--- a/app-arch/lbzip2/lbzip2-2.5-r1.ebuild
+++ b/app-arch/lbzip2/lbzip2-2.5-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://archive.lbzip2.org/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="debug symlink"
RDEPEND="symlink? ( !app-arch/pbzip2[symlink] )"
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 8e7d03fd55c9..d1d974cd0c9c 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/pgpdump/pgpdump-0.33.ebuild b/app-crypt/pgpdump/pgpdump-0.33.ebuild
index 83c1e6b2eef1..6a23e5364f66 100644
--- a/app-crypt/pgpdump/pgpdump-0.33.ebuild
+++ b/app-crypt/pgpdump/pgpdump-0.33.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
IUSE=""
DEPEND="sys-libs/zlib
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 52e17a2b48a8..cfe3eb530373 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/xmltoman/xmltoman-0.4-r1.ebuild b/app-doc/xmltoman/xmltoman-0.4-r1.ebuild
index 8ca3ac703350..46cda7db5778 100644
--- a/app-doc/xmltoman/xmltoman-0.4-r1.ebuild
+++ b/app-doc/xmltoman/xmltoman-0.4-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
IUSE=""
RDEPEND="dev-lang/perl
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 823bcd16069b..2f22bc705615 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild b/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild
deleted file mode 100644
index eb138ec6f5bb..000000000000
--- a/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-MACROS_PV="20091017"
-
-DESCRIPTION="Jasspa Microemacs"
-HOMEPAGE="http://www.jasspa.com/"
-SRC_URI="http://www.jasspa.com/release_20090909/jasspa-mesrc-${PV}.tar.gz
- !nanoemacs? (
- http://www.jasspa.com/release_20090909/jasspa-memacros-${MACROS_PV}.tar.gz
- http://www.jasspa.com/release_20090909/jasspa-mehtml-${PV}.tar.gz
- http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="nanoemacs X xpm"
-
-RDEPEND="sys-libs/ncurses
- X? ( x11-libs/libX11
- xpm? ( x11-libs/libXpm ) )
- nanoemacs? ( !app-editors/ne )"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- X? ( x11-libs/libXt
- x11-base/xorg-proto )"
-
-S="${WORKDIR}/me${PV:2}/src"
-
-src_unpack() {
- unpack jasspa-mesrc-${PV}.tar.gz
- if ! use nanoemacs; then
- mkdir "${WORKDIR}/jasspa"
- cd "${WORKDIR}/jasspa"
- # everything except jasspa-mesrc
- unpack ${A/jasspa-mesrc-${PV}.tar.gz/}
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PV}-ncurses.patch"
- epatch "${FILESDIR}/${PV}-linux3.patch"
-
- # allow for some variables to be passed to make
- sed -i -e \
- '/make/s/\$OPTIONS/& CC="$CC" COPTIMISE="$CFLAGS" LDFLAGS="$LDFLAGS" CONSOLE_LIBS="$CONSOLE_LIBS" STRIP=true/' \
- build || die "sed failed"
-}
-
-src_compile() {
- local pkgdatadir="${EPREFIX}/usr/share/jasspa"
- local me="" type=c
- use nanoemacs && me="-ne"
- use X && type=cw
- use xpm || export XPM_INCLUDE=. # prevent Xpm autodetection
-
- CC="$(tc-getCC)" \
- CONSOLE_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)" \
- ./build ${me} \
- -t ${type} \
- -p "~/.jasspa:${pkgdatadir}/site:${pkgdatadir}" \
- || die "build failed"
-}
-
-src_install() {
- local me=me type=c
- use nanoemacs && me=ne
- use X && type=cw
- newbin ${me}${type} ${me}
-
- if ! use nanoemacs; then
- keepdir /usr/share/jasspa/site
- insinto /usr/share
- doins -r "${WORKDIR}/jasspa"
- use X && domenu "${FILESDIR}/${PN}.desktop"
- fi
-
- dodoc ../faq.txt ../readme.txt ../change.log
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 9938653c0717..1da234c8d923 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/dash/dash-2.14.1.ebuild b/app-emacs/dash/dash-2.14.1.ebuild
index 48793266b0f1..f8d73cdff535 100644
--- a/app-emacs/dash/dash-2.14.1.ebuild
+++ b/app-emacs/dash/dash-2.14.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/magnars/dash.el/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
DEPEND="sys-apps/texinfo"
diff --git a/app-emacs/ghub/ghub-2.0.1.ebuild b/app-emacs/ghub/ghub-2.0.1.ebuild
index edadc9267cd5..86391bcb3a88 100644
--- a/app-emacs/ghub/ghub-2.0.1.ebuild
+++ b/app-emacs/ghub/ghub-2.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/ghub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
SITEFILE="50${PN}-gentoo.el"
ELISP_TEXINFO="*.texi"
diff --git a/app-emacs/magit/magit-2.13.1.ebuild b/app-emacs/magit/magit-2.13.1.ebuild
index 1d02dcdfec8f..e01da9137a1e 100644
--- a/app-emacs/magit/magit-2.13.1.ebuild
+++ b/app-emacs/magit/magit-2.13.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/magit/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
S="${WORKDIR}/${P}/lisp"
SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/with-editor/with-editor-2.7.4.ebuild b/app-emacs/with-editor/with-editor-2.7.4.ebuild
index 9067e0fa22d7..b5eb32a5c285 100644
--- a/app-emacs/with-editor/with-editor-2.7.4.ebuild
+++ b/app-emacs/with-editor/with-editor-2.7.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux"
SITEFILE="50${PN}-gentoo.el"
ELISP_TEXINFO="*.texi"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 4b312bac63d5..17177d6b6ff5 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/mc/mc-4.8.22.ebuild b/app-misc/mc/mc-4.8.22.ebuild
index c5ac07970f88..b64ac7df89dd 100644
--- a/app-misc/mc/mc-4.8.22.ebuild
+++ b/app-misc/mc/mc-4.8.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/worker/worker-3.8.3.ebuild b/app-misc/worker/worker-3.8.3.ebuild
index f44b85652878..b4c4e60edc8e 100644
--- a/app-misc/worker/worker-3.8.3.ebuild
+++ b/app-misc/worker/worker-3.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.boomerangsworld.de/cms/worker/downloads/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ppc ~ppc64 x86"
IUSE="avfs debug dbus examples libnotify lua +magic xinerama xft"
RDEPEND="x11-libs/libX11
diff --git a/app-mobilephone/Manifest.gz b/app-mobilephone/Manifest.gz
index 3992d7bbc1b7..a980ec894e8e 100644
Binary files a/app-mobilephone/Manifest.gz and b/app-mobilephone/Manifest.gz differ
diff --git a/app-mobilephone/kannel/files/kannel-1.4.3-custom-wap-ports.patch b/app-mobilephone/kannel/files/kannel-1.4.3-custom-wap-ports.patch
deleted file mode 100644
index e1992b08319a..000000000000
--- a/app-mobilephone/kannel/files/kannel-1.4.3-custom-wap-ports.patch
+++ /dev/null
@@ -1,346 +0,0 @@
-diff -Nru gateway-1.4.3.orig/gw/bb_udp.c gateway-1.4.3/gw/bb_udp.c
---- gateway-1.4.3.orig/gw/bb_udp.c 2009-01-12 16:46:56.000000000 +0000
-+++ gateway-1.4.3/gw/bb_udp.c 2009-03-01 14:20:38.000000000 +0000
-@@ -78,7 +78,7 @@
- #include "gwlib/gwlib.h"
- #include "msg.h"
- #include "bearerbox.h"
--
-+#include "custports.h"
- /* passed from bearerbox core */
-
- extern volatile sig_atomic_t bb_status;
-@@ -352,13 +352,13 @@
- while (gwlist_len(ifs) > 0) {
- iface = gwlist_extract_first(ifs);
- info(0, "Adding interface %s", octstr_get_cstr(iface));
-- add_service(9200, octstr_get_cstr(iface)); /* wsp */
-- add_service(9201, octstr_get_cstr(iface)); /* wsp/wtp */
-+ add_service(port_wsp, octstr_get_cstr(iface)); /* wsp */
-+ add_service(port_wtp, octstr_get_cstr(iface)); /* wsp/wtp */
-
- #ifdef HAVE_WTLS_OPENSSL
- if (allow_wtls) {
-- add_service(9202, octstr_get_cstr(iface)); /* wsp/wtls */
-- add_service(9203, octstr_get_cstr(iface)); /* wsp/wtp/wtls */
-+ add_service(port_wsps, octstr_get_cstr(iface)); /* wsp/wtls */
-+ add_service(port_wtps, octstr_get_cstr(iface)); /* wsp/wtp/wtls */
- }
- #else
- if (allow_wtls)
-diff -Nru gateway-1.4.3.orig/gw/bearerbox.c gateway-1.4.3/gw/bearerbox.c
---- gateway-1.4.3.orig/gw/bearerbox.c 2009-01-12 16:46:56.000000000 +0000
-+++ gateway-1.4.3/gw/bearerbox.c 2009-03-01 14:23:05.000000000 +0000
-@@ -78,6 +78,7 @@
- #include "shared.h"
- #include "dlr.h"
- #include "load.h"
-+#include "custports.h"
-
- /* global variables; included to other modules as needed */
-
-@@ -365,6 +366,7 @@
- int ssl_enabled = 0;
- #endif /* HAVE_LIBSSL */
-
-+ ReadCustomPorts(cfg);
- /* defaults: use localtime and markers for access-log */
- lf = m = 1;
-
-diff -Nru gateway-1.4.3.orig/gw/custports.c gateway-1.4.3/gw/custports.c
---- gateway-1.4.3.orig/gw/custports.c 1970-01-01 00:00:00.000000000 +0000
-+++ gateway-1.4.3/gw/custports.c 2009-03-01 14:20:38.000000000 +0000
-@@ -0,0 +1,88 @@
-+/* ====================================================================
-+ * The Kannel Software License, Version 1.0
-+ *
-+ * Copyright (c) 2001-2004 Kannel Group
-+ * Copyright (c) 1998-2001 WapIT Ltd.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in
-+ * the documentation and/or other materials provided with the
-+ * distribution.
-+ *
-+ * 3. The end-user documentation included with the redistribution,
-+ * if any, must include the following acknowledgment:
-+ * "This product includes software developed by the
-+ * Kannel Group (http://www.kannel.org/)."
-+ * Alternately, this acknowledgment may appear in the software itself,
-+ * if and wherever such third-party acknowledgments normally appear.
-+ *
-+ * 4. The names "Kannel" and "Kannel Group" must not be used to
-+ * endorse or promote products derived from this software without
-+ * prior written permission. For written permission, please
-+ * contact org@kannel.org.
-+ *
-+ * 5. Products derived from this software may not be called "Kannel",
-+ * nor may "Kannel" appear in their name, without prior written
-+ * permission of the Kannel Group.
-+ *
-+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ * DISCLAIMED. IN NO EVENT SHALL THE KANNEL GROUP OR ITS CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ * ====================================================================
-+ *
-+ * This software consists of voluntary contributions made by many
-+ * individuals on behalf of the Kannel Group. For more information on
-+ * the Kannel Group, please see .
-+ *
-+ * Portions of this software are based upon software originally written at
-+ * WapIT Ltd., Helsinki, Finland for the Kannel project.
-+ */
-+
-+/*
-+ * gw/custports.c
-+ *
-+ * Implementation of reading custom UDP ports used by wapbox
-+ *
-+ * Lubor Kolar , 14.03.2006
-+ */
-+
-+#include
-+
-+long port_wsp = 9200; // connectionless default
-+long port_wtp = 9201; // connection-oriented default
-+long port_wsps = 9202; // connectionless secure default
-+long port_wtps = 9203; // connection-oriented secure
-+
-+
-+void ReadCustomPorts(Cfg *config)
-+{
-+ CfgGroup *grp;
-+ grp = cfg_get_single_group(config, octstr_imm("wapbox"));
-+ if(grp == NULL)
-+ return;
-+
-+ if(cfg_get_integer(&port_wsp, grp, octstr_imm("wsp-port")) != -1)
-+ info(0, "Using custom WSP port %ld", port_wsp);
-+ if(cfg_get_integer(&port_wtp, grp, octstr_imm("wtp-port")) != -1)
-+ info(0, "Using custom WSP/WTP port %ld", port_wtp);
-+ if(cfg_get_integer(&port_wsps, grp, octstr_imm("wsps-port")) != -1)
-+ info(0, "Using custom WSP/WTLS port %ld", port_wsps);
-+ if(cfg_get_integer(&port_wtps, grp, octstr_imm("wtps-port")) != -1)
-+ info(0, "Using custom WSP/WTP/WTLS port %ld", port_wtps);
-+}
-diff -Nru gateway-1.4.3.orig/gw/custports.h gateway-1.4.3/gw/custports.h
---- gateway-1.4.3.orig/gw/custports.h 1970-01-01 00:00:00.000000000 +0000
-+++ gateway-1.4.3/gw/custports.h 2009-03-01 14:20:38.000000000 +0000
-@@ -0,0 +1,77 @@
-+/* ====================================================================
-+ * The Kannel Software License, Version 1.0
-+ *
-+ * Copyright (c) 2001-2004 Kannel Group
-+ * Copyright (c) 1998-2001 WapIT Ltd.
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions
-+ * are met:
-+ *
-+ * 1. Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ *
-+ * 2. Redistributions in binary form must reproduce the above copyright
-+ * notice, this list of conditions and the following disclaimer in
-+ * the documentation and/or other materials provided with the
-+ * distribution.
-+ *
-+ * 3. The end-user documentation included with the redistribution,
-+ * if any, must include the following acknowledgment:
-+ * "This product includes software developed by the
-+ * Kannel Group (http://www.kannel.org/)."
-+ * Alternately, this acknowledgment may appear in the software itself,
-+ * if and wherever such third-party acknowledgments normally appear.
-+ *
-+ * 4. The names "Kannel" and "Kannel Group" must not be used to
-+ * endorse or promote products derived from this software without
-+ * prior written permission. For written permission, please
-+ * contact org@kannel.org.
-+ *
-+ * 5. Products derived from this software may not be called "Kannel",
-+ * nor may "Kannel" appear in their name, without prior written
-+ * permission of the Kannel Group.
-+ *
-+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
-+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-+ * DISCLAIMED. IN NO EVENT SHALL THE KANNEL GROUP OR ITS CONTRIBUTORS
-+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-+ * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-+ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ * ====================================================================
-+ *
-+ * This software consists of voluntary contributions made by many
-+ * individuals on behalf of the Kannel Group. For more information on
-+ * the Kannel Group, please see .
-+ *
-+ * Portions of this software are based upon software originally written at
-+ * WapIT Ltd., Helsinki, Finland for the Kannel project.
-+ */
-+
-+/*
-+ * gw/custports.h
-+ *
-+ * Implementation of wapbox custom UDP ports)
-+ *
-+ * Lubor Kolar , 14.03.2006
-+ */
-+
-+#ifndef CUSTPORTS_H
-+#define CUSTPORTS_H
-+
-+#include "gwlib/gwlib.h"
-+
-+extern long port_wsp; // connectionless
-+extern long port_wtp; // connection-oriented
-+extern long port_wsps; // connectionless secure
-+extern long port_wtps; // connection-oriented secure
-+
-+void ReadCustomPorts(Cfg *config);
-+#endif /* CUSTPORTS_H */
-+
-diff -Nru gateway-1.4.3.orig/gw/wapbox.c gateway-1.4.3/gw/wapbox.c
---- gateway-1.4.3.orig/gw/wapbox.c 2009-01-12 16:46:57.000000000 +0000
-+++ gateway-1.4.3/gw/wapbox.c 2009-03-01 14:20:38.000000000 +0000
-@@ -84,17 +84,11 @@
- #include "gwlib/pki.h"
- #endif
- #include "radius/radius_acct.h"
-+#include "custports.h"
-
- static void config_reload(int reload);
- static long logfilelevel=-1;
-
--enum {
-- CONNECTIONLESS_PORT = 9200,
-- CONNECTION_ORIENTED_PORT = 9201,
-- WTLS_CONNECTIONLESS_PORT = 9202,
-- WTLS_CONNECTION_ORIENTED_PORT = 9203
--};
--
- enum { DEFAULT_TIMER_FREQ = 1};
-
- static Octstr *bearerbox_host;
-@@ -131,6 +125,8 @@
-
- cfg_dump(cfg);
-
-+ ReadCustomPorts(cfg);
-+
- /*
- * Extract info from the core group.
- */
-@@ -776,9 +772,9 @@
- * XXXX here should be suspend/resume, add RSN
- */
- } else if (msg_type(msg) == wdp_datagram) {
-- switch (msg->wdp_datagram.destination_port) {
-- case CONNECTIONLESS_PORT:
-- case CONNECTION_ORIENTED_PORT:
-+ if(msg->wdp_datagram.destination_port == port_wsp
-+ || msg->wdp_datagram.destination_port == port_wtp)
-+ {
- dgram = wap_event_create(T_DUnitdata_Ind);
- dgram->u.T_DUnitdata_Ind.addr_tuple = wap_addr_tuple_create(
- msg->wdp_datagram.source_address,
-@@ -789,19 +785,22 @@
- msg->wdp_datagram.user_data = NULL;
-
- wap_dispatch_datagram(dgram);
-- break;
-- case WTLS_CONNECTIONLESS_PORT:
-- case WTLS_CONNECTION_ORIENTED_PORT:
-+ }
-+ else
-+ if(msg->wdp_datagram.destination_port == port_wsps
-+ || msg->wdp_datagram.destination_port == port_wtps)
-+ {
- #if (HAVE_WTLS_OPENSSL)
- dgram = wtls_unpack_wdp_datagram(msg);
- if (dgram != NULL)
- wtls_dispatch_event(dgram);
- #endif
-- break;
-- default:
-+ }
-+ else
-+ {
- panic(0,"Bad packet received! This shouldn't happen!");
- break;
-- }
-+ }
- } else {
- warning(0, "Received other message than wdp/admin, ignoring!");
- }
-diff -Nru gateway-1.4.3.orig/gw/wap_push_ppg.c gateway-1.4.3/gw/wap_push_ppg.c
---- gateway-1.4.3.orig/gw/wap_push_ppg.c 2009-01-12 16:46:56.000000000 +0000
-+++ gateway-1.4.3/gw/wap_push_ppg.c 2009-03-01 14:20:38.000000000 +0000
-@@ -88,6 +88,7 @@
- #include "wap_push_pap_compiler.h"
- #include "wap_push_pap_mime.h"
- #include "wap_push_ppg_pushuser.h"
-+#include "custports.h"
-
- enum {
- TIME_EXPIRED = 0,
-@@ -1779,10 +1780,10 @@
-
- if (!cless_accepted) {
- cliport = CONNECTED_CLIPORT;
-- servport = CONNECTED_SERVPORT;
-+ servport = port_wtp;
- } else {
- cliport = CONNECTIONLESS_PUSH_CLIPORT;
-- servport = CONNECTIONLESS_SERVPORT;
-+ servport = port_wsp;
- }
-
- address_type = (**e).u.Push_Message.address_type;
-diff -Nru gateway-1.4.3.orig/gw/wap_push_ppg.h gateway-1.4.3/gw/wap_push_ppg.h
---- gateway-1.4.3.orig/gw/wap_push_ppg.h 2009-01-12 16:46:57.000000000 +0000
-+++ gateway-1.4.3/gw/wap_push_ppg.h 2009-03-01 14:20:38.000000000 +0000
-@@ -167,9 +167,7 @@
- */
- enum {
- CONNECTIONLESS_PUSH_CLIPORT = 2948,
-- CONNECTIONLESS_SERVPORT = 9200,
- CONNECTED_CLIPORT = 9209,
-- CONNECTED_SERVPORT = 9201
- };
-
- struct PPGSessionMachine {
-diff -Nru gateway-1.4.3.orig/gwlib/cfg.def gateway-1.4.3/gwlib/cfg.def
---- gateway-1.4.3.orig/gwlib/cfg.def 2009-01-12 16:46:55.000000000 +0000
-+++ gateway-1.4.3/gwlib/cfg.def 2009-03-01 14:20:38.000000000 +0000
-@@ -159,6 +159,10 @@
- OCTSTR(concatenation)
- OCTSTR(max-messages)
- OCTSTR(wml-strict)
-+ OCTSTR(wsp-port)
-+ OCTSTR(wtp-port)
-+ OCTSTR(wsps-port)
-+ OCTSTR(wtps-port)
- )
-
-
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 7d12af04e791..a3fa6c53c21b 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/libreoffice-bin-debug/Manifest b/app-office/libreoffice-bin-debug/Manifest
index fcbecfe51cc7..ada045750470 100644
--- a/app-office/libreoffice-bin-debug/Manifest
+++ b/app-office/libreoffice-bin-debug/Manifest
@@ -1,12 +1,24 @@
DIST amd64-debug-libreoffice-6.1.4.2.tar.xz 1271418908 BLAKE2B 6a79d3459d8ff10a63e0b163fabc3b6432b27381bd9653bacfa6c21f05fbd006bfa40cbfa1e2e8263996112e2443f78da989ebc4964283eb5a830c94364b9eb4 SHA512 9d40e356925bbaa252110d1216fdd0cd3367070793c0c546d4a541740e72f65b1de42d740fd6676cf903c9f3feda734ee014290d7c721de59acadc33b4ac04be
+DIST amd64-debug-libreoffice-6.1.5.2.tar.xz 1429362788 BLAKE2B 2973a7a336865fe26f7af3af930cb32be6df02bf80a8940e3bd40226b0341a2993d09e3d48bf3dfc9c5c1b679d194c143a1f298980c73349a93bd5515dfe7326 SHA512 b5ab3bd1bea5510a36ef630f11a0e6eebb923efa240394c24755e7f53abe939ddbdd0ff6beb635c94e48813e4cf70758e53fc1999250d0eb102063bed8ae4902
DIST amd64-debug-libreoffice-gnome-6.1.4.2.xd3 347802853 BLAKE2B 3282b5744c32502555520d21408b31fd7df05042a6560c30573ea4f266ad311fceeff3bfc82d1eab365a14244289a07d58b8aed4f74529ed6112306568b94e3c SHA512 cd32875e42925f1e0f4c80cc36b80a1dfafabe8a5858d4de10e054411f278617dcfe0ba3392ab30df4e40530c5783bfeec94fc9ed11867c6da342183534cb684
+DIST amd64-debug-libreoffice-gnome-6.1.5.2.xd3 401159605 BLAKE2B 854a6d37cef9ce3464d1186cb45d0c608e080fbc0ff2ae63aba3503c0909d9ffff593e3633c00c95386ef2f15a8e17b6df6bfd271c021f13c7a184b1bc3a8893 SHA512 e3733c1e6ad127a3722fede1f36a28ce0ec12978a0bb8d49137d1f48da8462f18d5e1dd74998536efa548de28f7ffd57db8d6e47d965385c402aa82ec66810aa
DIST amd64-debug-libreoffice-gnome-java-6.1.4.2.xd3 655016716 BLAKE2B b711aed5d834297eef110609a508a7ff7268a3db6024032cb16ae7ecd15a289d7211d4922da701226008a508b86e38ca125c8ab86feaa36e9b826dd4fa2f2d69 SHA512 cfb4cba08c497806416a74e53e2d22fefb316253b09529efd4c5a1cdb5788f3b1db6d07ae8fb921111e2a533b3e944fcd72ae576c880929104fb8c5abb13741f
+DIST amd64-debug-libreoffice-gnome-java-6.1.5.2.xd3 745666046 BLAKE2B 8cfa97632b1f2266208ed0980d88e0aed482f27d3000e7e6d3a7db67796a33caa7bbc604a2fbefb5433104bc1b72098e147d4d7982f8659f8356931b999fa47e SHA512 aa2b59209d272dba368cc931bebba0958071c829e6c53251b985b5f1d354dfd64c50d462d39de912c9f3378260a323d6a80c68674f12bfda24f13f39c6323250
DIST amd64-debug-libreoffice-java-6.1.4.2.xd3 645937560 BLAKE2B 77ebb6d10ee3a15933d73ef746ebcde3898fd266e1331a10d32519cb0ec9771741583e4d7b75350e29623368ac85433fc39c7b513dd128c2ec31af621fe46b68 SHA512 03494c9a2827502cca4315696da47470eb42299b8472aa128c1083697c816307d286eb9e1a76205d7b5a293312d97dc5da1d2715eb174c907ce943875f27e2d4
+DIST amd64-debug-libreoffice-java-6.1.5.2.xd3 734888893 BLAKE2B 1b8987c966139aca44ee9242022c717ce6618357567358cf8b2fdc6b8525afbd91b5a0dd9a0358f739f515e097b1e4160ac3dda5811c4e82fbd7868073d6f28f SHA512 a6cb9507d02cf212a0a30e2d8ea4d9650fdab7448480a4ac2c92369a144861fc2b47754c172663be2321257b81c2a9b41fa2373b9fc69f432893e02303eb3c55
DIST amd64-debug-libreoffice-kde-6.1.4.2.xd3 351403453 BLAKE2B b9541d40e054614db12e78dd11b3d481f84a82265c4a9a723bc3c26efad3ef234ee5030eafe950c1f983bfe0f303c23263ed48cc33d3f951e87f6b5790bdb54b SHA512 dd369201fb6b34283852d35cf119e2979eb2c7691a767448008051513dd28cdf400a5680a6833f5ba8d1b18106fadacf0a50721bc46f96a709c33fc83b80cc85
+DIST amd64-debug-libreoffice-kde-6.1.5.2.xd3 405230948 BLAKE2B f3dc189ad696ce47ba8681b1c3928c1dfebd70f59d3d4a845e69ab9d1427af3adb13a016648bcb15e7167d3ee4af3b74e0339592712573a53527790786d1d9cf SHA512 2505aea781253457c46a6b2fec4b999a35dc68ebfa5e25d930375b25287de040566ec12e2d199f0976d8da6a4f1aeff6d249f9af99e4ce4f80ee87885dd8ab96
DIST amd64-debug-libreoffice-kde-java-6.1.4.2.xd3 658586451 BLAKE2B ad06ec566c299e0b752419cd4f681100a9aef644b3a13512026ee6b5f00eba219f03462a791eff8c12b9d0ec448f6d3f775d56732e16f0f86be396c36d84b461 SHA512 48665da7d924ebd937eb141bfe15d13468704f2f4bf9ef8b5ad6e04399f3427ec5a74653371cf9e62601026518f3a978e402ea898ab1b01da2dfb0bd18a3831f
+DIST amd64-debug-libreoffice-kde-java-6.1.5.2.xd3 749683586 BLAKE2B 43f6489ffe3446aeef20e9668fc4bee36003c8eca90d4b138983e05dc07333a4748d9d6d559f036b0c8de0a3ab184f3f02201a5e3442e1f5b93d40d39f437847 SHA512 4b32adaad6efd831aaf5887702d03f9b6baa851b1b98858c94e302b2133bd45bde4a382418b9ae05be0ac5bad827673dc46c381481550071848746e6d1eea59e
DIST x86-debug-libreoffice-6.1.4.2.tar.xz 1241667832 BLAKE2B 53b4e14859c7a68f3e959e1c85108e6c4e44d30b874c938fae04e10b2a24d41c7902fdd726492008dd142f74e898d71fafee2bc58e6ae0a631f1ffe09ec300ed SHA512 2e909898a54d4b0e1a993f818074a5efd30e08d6be5507894c5d0cd7a9fcc5600b7ecc2a14784b4f6d65747e6a98ce28735392df1e2dca6d1c80e9130a03257e
+DIST x86-debug-libreoffice-6.1.5.2.tar.xz 1395697556 BLAKE2B 337d2343a22f11f3f9993a5f50a9c5c202aeb830cce53114c3646e1e289549c7494d7de963bcb6851da130ef331f67fbf42657eaceb7e70e9f71fef273fba424 SHA512 9ee08d9df487c1f76bfdf2f51e465151c88039f18873ad2b8a7db3b8aafc6d370d61b3453843e0c30686e1c477e68f80c6050a61a6451b6b1327589c3f7fe156
DIST x86-debug-libreoffice-gnome-6.1.4.2.xd3 337409896 BLAKE2B f24ecf7a3f5eb605dd41bbca5bf23c889fc94cb426a6fbb0d9776404c66730f9b2a1fb6f5e6c65fe9f6781c1871ea6f15edfad511c8189b4f928a8292161cf45 SHA512 db67d19dbfb89dfc0b8cadc43435e6db85e3bc77252c9c329dd7ec24467e3ab572e400876ec10630bb5822b8c033e7b017296758695893ea6f71eb4564e0e526
+DIST x86-debug-libreoffice-gnome-6.1.5.2.xd3 389161539 BLAKE2B bf0b6352f6a4db9b24e176de87bfca548a2a3862111984da8fbd59b403fe6bfb63377e5b2be84f59a647bd2281a4ccb4db05f002dbb498c7743e6a1d6629dcbc SHA512 4332147743f5dbf246bc190fcd4a0be64064fc3e8755573b74af0cdbdc4147d82f23e1d2b1aabbc4fb23d80570a0ce492c7e7a5c2a53ae3d17229930cc9013ab
DIST x86-debug-libreoffice-gnome-java-6.1.4.2.xd3 591535581 BLAKE2B f27a2d2d5642d0333ad8dbd143fcc2de7b87cc0b8fb9c0ae5ed6037a9d838d0fbc2572b60043aa64e97d67841fb5c9998d5f1d6820120019cffa09a1ef38da5f SHA512 7a8f3fd0d7c79a5f313c71e3c198e12d55c685ecb5a1cc292dd48485abc19ee457723801aace3d6d754008edafc5174924ae7868b4699d2ace146f265e452e96
+DIST x86-debug-libreoffice-gnome-java-6.1.5.2.xd3 664204848 BLAKE2B 2ede572af0b5ae3143c7afed202112a1bfa608706171c45f3aabbe577c33352e6fd0a094756e60f04ad2f29520fafef64acd712052656b18d28bd40a05e7dac8 SHA512 9e8faf7735c550359e922899aa238bbb2d278edbe399e29491349be752c30bd358c198b7f3357b2eda97cc93b317e7c4ee4f9ae971d61ca8158d1d45cc36a2e4
DIST x86-debug-libreoffice-java-6.1.4.2.xd3 582462747 BLAKE2B bde422971efbf2e5d9002dd94921acd152c0f1a867f911b6d5bc7a69ba78d4c8d00cc1b39c7ed3a4df0dece40437356ee2930745366c366d19ee3378caaa30ac SHA512 dfda55b4437d01bde30d15b0bbda141e0c880843877dbf8057bffda31d1a010f99da71869f296669e687650da250e8f6164948958f55cbb4a997182bde59c159
+DIST x86-debug-libreoffice-java-6.1.5.2.xd3 653898049 BLAKE2B 44e8bb0f5221af7ac8099833042f1bb8714882335658a6c0006253f591052e4324aa7a3070bd0933d6af94ffd6e4737f6822b3962ce6b44e638ebb13bc1eeefd SHA512 26c041c551068c197dc1500853874a1c086e0e585058acb5c15936d7dd6cf0dbfac6f5b3bf67b03b84c395797308a4ea6767b80baf70d216ad253a182aa1790f
DIST x86-debug-libreoffice-kde-6.1.4.2.xd3 336243150 BLAKE2B 91f903eb7ea3b72b2a1d3afeeaa51e743c890c0ec48b6332db48fcbe330e73a76dfa72f3271da27c04563e7807f50d89e67c6c2ebaa1611ea492240c3783c34d SHA512 999576a1ad32774bc330a9588c8b742016d8c1474780fdedcde6e20449987cc79660294dfc4e257d1911515bd3d5484204092b4344bfd22d2ecf2ee636a115af
+DIST x86-debug-libreoffice-kde-6.1.5.2.xd3 387793154 BLAKE2B a6b780aadac5d57ac1a13cf64ee8a17f80b0a5e9d82d971a9e0f0a7099123e35b51fddd21973f23c5230e5401f29287e9e02db02c48ca20cc36779740ce6e108 SHA512 46944afb6e92c785804764dcfc3c17ac72bf03b88045fef85c967a9cbbaf36972843070ab6e581a9bbf276521de75d6fe2f0bd405ce7d83e199a941f6085d6b3
DIST x86-debug-libreoffice-kde-java-6.1.4.2.xd3 590359965 BLAKE2B bc169ef7144612def9255191fbd7d2765b42ed8e7f1a1450b4253c6bad1b582481c544c237c26d4bc41f724c4c114b8c55ec05989f337de59cd1285c29428d94 SHA512 31bf9f75e1722ea8dd17ef86d7819fcb0f40369ea7d7399fc88b4e715800bf9419cc4d4bd476dbe5840f8d7e9e9c9fe78289caf4938290224f58d5c5ab68e2af
+DIST x86-debug-libreoffice-kde-java-6.1.5.2.xd3 662820972 BLAKE2B a8757a1835b407647946b1be97db197e056fbbbcb32c7f3aeb935aa7721d347dfa82ff5ec80e56d5a917308627946d44b6e42aa16c0430238b9c9def2ab0395e SHA512 f9b9bb9fc24e978a61f3ba04e4b1362364fdccb59eb60274e5adcc5e4d70b694f6d866f4e6879ac7486ddc4152be55200e9995642c7add6c00341be58d1e92a0
diff --git a/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.1.5.2.ebuild b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.1.5.2.ebuild
new file mode 100644
index 000000000000..435287d3932b
--- /dev/null
+++ b/app-office/libreoffice-bin-debug/libreoffice-bin-debug-6.1.5.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASE_PACKAGENAME="debug"
+BASE_AMD64_URI="https://tamiko.kyomu.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.kyomu.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+ ${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+ kde? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+ ) )
+"
+SRC_URI_X86="
+ ${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+ kde? (
+ !java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+ ) )
+"
+
+SRC_URI="
+ amd64? ( ${SRC_URI_AMD64} )
+ x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
+
+DEPEND="dev-util/xdelta:3"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/*"
+
+src_unpack() {
+ einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+ xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+ local patchname
+ use kde && patchname="-kde"
+ use gnome && patchname="-gnome"
+ use java && patchname="${patchname}-java"
+
+ if [ -n "${patchname}" ]; then
+ einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+ xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+ mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+ fi
+
+ einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+ unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ dodir /usr
+ cp -aR "${S}"/usr/* "${ED}"/usr/ || die
+}
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 7215ff95b047..422e4b39a64c 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,12 +1,24 @@
DIST amd64-bin-libreoffice-6.1.4.2.tar.xz 81346704 BLAKE2B 5c8a46e58ca3318acde5b7d431d6e2adf69873dcef9552ab0d7c28c2936cda4b58ec38085fff727b57970ae5e5d574de474c91e9ab925f5720d8eb093f97092a SHA512 1e16e0c407b60fe80c2338502c359572b0d2e1946528250e636ea9e3a211685174863071905eac97525a7cd3183ead11187cab8ec2f57fdf71b8f82a6c40e227
+DIST amd64-bin-libreoffice-6.1.5.2.tar.xz 81458964 BLAKE2B 0205fa319cc248062327489aaf565bf8d4fb24bd66b4b5af3f9dd4ce6bff34a9cde5258c5a81990f72a4fc0ed503749120db5021d50ef62a0ae69fca6e6eded7 SHA512 4f67e8a17b837ea716f95898334ff7c1de53504e79cb5b51d202724798518c4cda536548cd284ee394d7c34c8727b1c43d30004933a8113f84af4188486fb2f6
DIST amd64-bin-libreoffice-gnome-6.1.4.2.xd3 17021650 BLAKE2B efcd8118167474d8cc3c134e4d292d7c3db040282e943f90818d9266f987ca96f725d6ce6675cb7228e21b5053d71fe103f4e896db87c176647830404ab7b83f SHA512 803d34cc1bf3555e972150b0eed4f9769e826c336a0ca751960c887d5d7a77ec060d5ba8c7db57636399b97101c9dca12843eac8b6c686774e2c232eaea7d1e9
+DIST amd64-bin-libreoffice-gnome-6.1.5.2.xd3 16971562 BLAKE2B 39c13efdb87f9d7db5fb22f4a16b95db03909046f385660edad19c0dca53501faedf8121d85f0459459b5aeffa4acaf029abd63bc8bff91068328fa62d2ff7fb SHA512 646d851389cacecafbb5c1fb7c628218795b2e6e735cc0279f8f87fb6b52e076ad200cbc6d2e7601dbbddd197d42c759bc46f2727fc12fcb851261ac48e10114
DIST amd64-bin-libreoffice-gnome-java-6.1.4.2.xd3 27390110 BLAKE2B 7eb0f8ae4b59926473ddb3d0d3e89ff5350cb10242c93fac696545322ea3f6df1562d8ff4dbf2d65ffbceee8ca8914f3f86b20c28246eb091f3352d551790e9f SHA512 f1e0ed6829f2d8d50fa2a290ba2effbe2c75d0cacdb1315345963abe914e6a0dc7c971a35b1f7a6a80a69f7ba63c08c950b69d1b2243f2a27aef49cc762b7c35
+DIST amd64-bin-libreoffice-gnome-java-6.1.5.2.xd3 27382980 BLAKE2B cda280a0f7fc4b7b33ade0bb81ba0d8bb11cc39397afecc591acce9222c67e659ca98e5605a48675080d410db9c6f54abb5a6abe4e3d391f3053012321268e26 SHA512 13b88b198c3a78aebc19de85a93dc8413e67a1ab54baeee78ab25e0035199fde311f0f974b1d4dd07a6993377ac983b638bd0de56239609bd938ba306adc9420
DIST amd64-bin-libreoffice-java-6.1.4.2.xd3 26132001 BLAKE2B 6b531b30bbea9cf00e684f3bce96f1aa76989375e688212d88084dec4fed52e8542fe952df909179fa8795e0b9ae3b450bc09a18594da67dffc74a3c2b4d1f4e SHA512 5583f4babf60709ec35c23e7ff72cf5c1048b850ec8674f51c45ac5379444696b1f5797b1697d7b61c059782f019ad1bd6a65bdd384cc7d3f1d9c6eec60e4a9c
+DIST amd64-bin-libreoffice-java-6.1.5.2.xd3 26020195 BLAKE2B 7a28ef04f187544b7452174ab183291f0ab6a082b2ba477d75caf4b08b89e59bc2f51183076a864e3c8844d98875c9b627a00f93413a92d50eee0ecf17ad03a9 SHA512 7a9ae33dbb06d05360d5209494e8fcb5a104900770f332171f561201806e049c0f4b7fbf468bb0d4c5ec460747751eb76da2c190881de2fff2ce84fdec761def
DIST amd64-bin-libreoffice-kde-6.1.4.2.xd3 17226538 BLAKE2B 3d55535c01e4300be3288cb6202b0855c71bd1f73a180626b2c7adfe0808523a6c24f0dd7579469a57a54fdc829ccd4f3902bcbcd1a887dbed4d94474e270f17 SHA512 4c2fd1d3adb3e6eb8cdd8aa9298dea8bedf6869115c539e295c325ebe5be343a2391ab669141651fea641a088b77e3dfed84d551645e19afca6bc899c69d6101
+DIST amd64-bin-libreoffice-kde-6.1.5.2.xd3 17204328 BLAKE2B e390a5e1fe64e1be86a2a7a01a695ba4069c916bcc3f181d73c5abc68c131c28dc06049f45065a1a51420c816a1dfc11d3aec4869ece93048988fda4681d3c93 SHA512 67b7c336739e2bc72800de61ecc408d35c9e27abd6a18e2f5d259fe5cd601986fc93935990e980837481c741a5d752b2fb80deefae8f04378dfcb5e2a61edf67
DIST amd64-bin-libreoffice-kde-java-6.1.4.2.xd3 27627892 BLAKE2B a9e843edd462d903c6ba2843e6c0c0b16da2691328b9100813529b0fbf28fc1f0caabe2c3aef6a89423ea86d1ef7ea168ba67d73b62a12c6be7ff841daf93304 SHA512 7c69cf17e49fd31eca1132d0def6796cc0d3eebc32d3dcf7e171e1553cb0d1424822545b407a6dc4d0ef30fe67d7044cbf84664ede6bd3cb0c6a4e853c03aec5
+DIST amd64-bin-libreoffice-kde-java-6.1.5.2.xd3 27569581 BLAKE2B 7a28bac9fbf648df15c8182440585c9c44a6c8487729b492a09b16edf122ce715b18d521dbd98bdf444c429f2c7766d13f40366fbb0ae37834df6369288bdb02 SHA512 d112d1986d69828e597984138345227221ec1b792629fc2d882c6195b0d9c4d33a25c170b8edc4e796b134ec9b3171f659da5e2c022c021c462b3c7e4d33e708
DIST x86-bin-libreoffice-6.1.4.2.tar.xz 83674656 BLAKE2B 89329aad9f8f4d38ec5bc41372307802454cca5e96f984bd9706a53619027ac87b99897de078b3d56e6fb731a6f60165c7b99360205f2a3d01bcdd73d2e7af7d SHA512 38f173b64a57bd4f57761b070a8c7a55404d30177c024037b63b806fa7620c04bf058644b24d8a711b651d11a97955c6771cb78cdf796950fb03c1bae9fd8ed7
+DIST x86-bin-libreoffice-6.1.5.2.tar.xz 83728896 BLAKE2B 4b94d9090b59cde87aa779c566a41d77a90579f177d656689804168a818e516dc19eab0719ff0cf291d408b157782eaf42b0d697677ca3037fd25d08e115d849 SHA512 63356809b2534ba170243a8f517f62a0b1474f52330a772e7b66014841ce3ac8f635196f78933da5544323873cd40bd939b59e1fc2a8638f014f2a5279b5ce0b
DIST x86-bin-libreoffice-gnome-6.1.4.2.xd3 15972006 BLAKE2B d1cf1cecf33aa3158ffccdf727fc454f25f70d31cf69cb2ce41867d15bf0386bb9e9eeb382207dda692b6506ae382f29638dd6bf0b9106701e49db42d0f1a27d SHA512 90272f6579dc8e84f43e1332f75ae7380889b8f09c8b1318799d84ee17f45107acc69c059d611ad7c363fb3d191368b1727f07f19aeb9128c61a1e7209fe107b
+DIST x86-bin-libreoffice-gnome-6.1.5.2.xd3 15117228 BLAKE2B d628407c11c967c3eaa3a67d21a5638bcf64a9db6fcd6494c8622a906af26ca7d16d98635012d52c7c690f812a27dea1496d194e12de44eb96ce0424299a4b14 SHA512 af49354ecda7cdf90268308d6b6dfff08c80397d8e8006d952d759dfa36f9d4228acee0719fd4148a936480f4901bebfc28e68d6e2e04017e3803fef8cde9203
DIST x86-bin-libreoffice-gnome-java-6.1.4.2.xd3 25781254 BLAKE2B 83295b779bccb4e3cecae21272639e14dc84cd8095aafb19adbe15867c03b8e701bbc67bbaa817205e1d8aec687e0d2d265d5d3dc459db600c4eb8f0fa2106db SHA512 19e1123d8f14ca3352c3a997d33a71ef892611b6590b58e3fa9c921dd264a5fba39619402fcd3db335929ddadc02364497cf43473d1783d24c3a71908923839a
+DIST x86-bin-libreoffice-gnome-java-6.1.5.2.xd3 25335202 BLAKE2B 9b98001c51861ebd59d6420c54459a3e2e29d400bd3640adc3b4895e480caae218b8d58d707cf05294d460f584927f7e43de9b34be70def40d567d4280b5d73c SHA512 ad74e386cc718697db24f7a90c328c66413cf046d6d0f0573b46ed6168bd4ceed2956f7f880f548cb84a0a418ab27681040753cafaf81e19b8454a89a459ca82
DIST x86-bin-libreoffice-java-6.1.4.2.xd3 25437540 BLAKE2B 81b009745af9e9fe0dbbc73347faf62b5b53c1bb34209f46b93b7901be30971b777ea2ed27d891f21f3f866b749006e4dc96611fb0d6acfb893ebd5ecbdc50cd SHA512 04bc232a391c3a20be59b3349830825bf7e19f10c2b70a1417a3d32ee784ad999b7fad15b2189a95e9530fb57d8c580e2efbecb71a5e822b816bab1a290158e5
+DIST x86-bin-libreoffice-java-6.1.5.2.xd3 24864117 BLAKE2B a990edae78593ff6d97d51d24b6b17e7f5ca9fa65dfc37a60909f21ce7d73ef598b7958eb7d35ac61f9c635e319ee703aa599cd66fd553cb6447d5e2860c30f9 SHA512 7e2e227365502d1037679041e861f2a547bb33dd818e91c754f1356bde69234cfd419119aca861ec95a2e2eeaf62b62210bc63379c676451d77d6a2196d35946
DIST x86-bin-libreoffice-kde-6.1.4.2.xd3 15913661 BLAKE2B ebeea8f8efa2608ad23c0cddd7f77f908f2fd99cf877934470b4917c0f125ebae7431166d006d02c02980d5b0e7308bb0ce36329dfefb26733f5f70dea389319 SHA512 079d1c2b76776626f9e6f1c9e25590eb7be8b24e5fe8f40abb78bda4b24b1fda1b3077974387d7d04f41105b0f464af1018fd4cb7b4e0d35465d564a94bbd981
+DIST x86-bin-libreoffice-kde-6.1.5.2.xd3 14984951 BLAKE2B 2fa3af871e90833ba492d35443937fb572fd4cc48cfcbd210b542b6963a93c007d29d007a51e54a73cef8cbbde4a9866229013920f5ac981e15d6c632cc9fde5 SHA512 7f8ceb5c4235b1e3892e5c8ea708f54e66c40535653ba4703a45a111c20339355eb90e382b8aea4336956261a2da46c1369f658a47fd0ad0646ed742e8490687
DIST x86-bin-libreoffice-kde-java-6.1.4.2.xd3 25702585 BLAKE2B a66567473b111de9a8303f5fd861f5abb62de40be477f33f20755aa2e04896816ff04ce9bc6adcab841adb333a5edd8ae7f50c201d837166e81f38ccef49b8aa SHA512 f5c689cc8682652d2c9b7c3a5e7a7831295b55f241d63aa9e0f470ee772d8a7be4c72244e4e2d76fbc82cb075b0fcfcf293ddf27bf6aed83c73abc57f491fe33
+DIST x86-bin-libreoffice-kde-java-6.1.5.2.xd3 25252595 BLAKE2B 207ae00d0b210bd869d3d19d7348ee0380153c7d108ddb03d5bdac92718b78106fac321c2df00dc2cc71cfdf791b309a591b530c936ee1673314d55e30d46e9c SHA512 70edcebceee32c82c78ba704cb292cad8e59f31d8d58f72c525cd32723726b251221370c6d2dfe4a54d3f0615f0859792160f1c66b20d8f7b77030f54c084073
diff --git a/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild b/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild
new file mode 100644
index 000000000000..740ef5028227
--- /dev/null
+++ b/app-office/libreoffice-bin/libreoffice-bin-6.1.5.2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+BASE_PACKAGENAME="bin"
+BASE_AMD64_URI="https://tamiko.kyomu.43-1.org/distfiles/amd64-${BASE_PACKAGENAME}-"
+BASE_X86_URI="https://tamiko.kyomu.43-1.org/distfiles/x86-${BASE_PACKAGENAME}-"
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="threads,xml"
+
+inherit gnome2-utils java-pkg-opt-2 python-single-r1 pax-utils prefix versionator xdg-utils
+
+DESCRIPTION="A full office productivity suite. Binary package"
+HOMEPAGE="https://www.libreoffice.org"
+SRC_URI_AMD64="
+ ${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
+ kde? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
+ java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
+ ) )
+"
+SRC_URI_X86="
+ ${BASE_X86_URI}libreoffice-${PVR}.tar.xz
+ kde? (
+ !java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
+ )
+ gnome? (
+ !java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
+ java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
+ )
+ !kde? ( !gnome? (
+ java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
+ ) )
+"
+
+SRC_URI="
+ amd64? ( ${SRC_URI_AMD64} )
+ x86? ( ${SRC_URI_X86} )
+"
+
+IUSE="gnome java kde"
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BIN_COMMON_DEPEND="
+ app-text/hunspell:0/1.6
+ =app-text/libexttextcat-3.4*
+ =app-text/libmwaw-0.3*
+ dev-libs/boost:0/1.65.0
+ dev-libs/icu:0/63.1
+ >=media-gfx/graphite2-1.3.10
+ media-libs/harfbuzz:0/0.9.18[icu]
+ media-libs/libpng:0/16
+ >=sys-devel/gcc-7.3.0
+ >=sys-libs/glibc-2.27
+ virtual/jpeg:62
+"
+
+# PLEASE place any restrictions that are specific to the binary builds
+# into the BIN_COMMON_DEPEND block above.
+# All dependencies below this point should remain identical to those in
+# the source ebuilds.
+
+COMMON_DEPEND="
+ ${BIN_COMMON_DEPEND}
+ ${PYTHON_DEPS}
+ app-arch/unzip
+ app-arch/zip
+ app-crypt/gpgme[cxx]
+ app-text/hunspell:=
+ >=app-text/libabw-0.1.0
+ >=app-text/libebook-0.1
+ app-text/libepubgen
+ >=app-text/libetonyek-0.1
+ app-text/libexttextcat
+ app-text/liblangtag
+ >=app-text/libmspub-0.1.0
+ >=app-text/libmwaw-0.3.1
+ app-text/libnumbertext
+ >=app-text/libodfgen-0.1.0
+ app-text/libqxp
+ app-text/libstaroffice
+ app-text/libwpd:0.10[tools]
+ app-text/libwpg:0.3
+ >=app-text/libwps-0.4
+ app-text/mythes
+ >=dev-cpp/clucene-2.3.3.4-r2
+ =dev-cpp/libcmis-0.5*
+ dev-db/unixODBC
+ dev-lang/perl
+ dev-libs/boost:=[nls]
+ dev-libs/expat
+ dev-libs/hyphen
+ dev-libs/icu:=
+ dev-libs/libassuan
+ dev-libs/libgpg-error
+ =dev-libs/liborcus-0.13*
+ dev-libs/librevenge
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ >=dev-libs/redland-1.0.16
+ >=dev-libs/xmlsec-1.2.24[nss]
+ media-gfx/graphite2
+ media-libs/fontconfig
+ media-libs/freetype:2
+ >=media-libs/harfbuzz-0.9.42:=[graphite,icu]
+ media-libs/lcms:2
+ >=media-libs/libcdr-0.1.0
+ >=media-libs/libepoxy-1.3.1[X]
+ >=media-libs/libfreehand-0.1.0
+ media-libs/libpagemaker
+ >=media-libs/libpng-1.4:0=
+ >=media-libs/libvisio-0.1.0
+ media-libs/libzmf
+ net-libs/neon
+ net-misc/curl
+ net-nds/openldap
+ sci-mathematics/lpsolve
+ sys-libs/zlib
+ virtual/glu
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ net-print/cups
+ dev-libs/dbus-glib
+ gnome? (
+ dev-libs/glib:2
+ gnome-base/dconf
+ gnome-extra/evolution-data-server
+ )
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ gnome? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ kde? (
+ dev-libs/glib:2
+ dev-libs/gobject-introspection
+ gnome-base/dconf
+ media-libs/mesa[egl]
+ x11-libs/gtk+:3
+ x11-libs/pango
+ )
+ x11-libs/gdk-pixbuf
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/pango
+ kde? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtwidgets:5
+ kde-frameworks/kconfig:5
+ kde-frameworks/kcoreaddons:5
+ kde-frameworks/ki18n:5
+ kde-frameworks/kio:5
+ kde-frameworks/kwindowsystem:5
+ )
+"
+
+RDEPEND="${COMMON_DEPEND}
+ !app-office/libreoffice
+ !app-office/openoffice
+ media-fonts/liberation-fonts
+ || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
+ java? ( >=virtual/jre-1.6 )
+ kde? ( kde-frameworks/breeze-icons:* )
+"
+
+PDEPEND="
+ =app-office/libreoffice-l10n-${PV}*
+"
+
+DEPEND="dev-util/xdelta:3"
+
+# only one flavor at a time
+REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde ) ${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test strip"
+
+S="${WORKDIR}"
+
+PYTHON_UPDATER_IGNORE="1"
+
+QA_PREBUILT="/usr/*"
+
+pkg_pretend() {
+ [[ $(gcc-major-version) -lt 4 ]] || \
+ ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
+ && die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
+}
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ einfo "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
+ xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+
+ local patchname
+ use kde && patchname="-kde"
+ use gnome && patchname="-gnome"
+ use java && patchname="${patchname}-java"
+
+ if [ -n "${patchname}" ]; then
+ einfo "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
+ xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
+ mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
+ fi
+
+ einfo "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+ unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
+}
+
+src_prepare() {
+ cp "${FILESDIR}"/50-${PN} "${T}"
+ eprefixify "${T}"/50-${PN}
+ default
+}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+ dodir /usr
+ cp -aR "${S}"/usr/* "${ED}"/usr/
+
+ # prevent revdep-rebuild from attempting to rebuild all the time
+ insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+
+ pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
+
+ use java || \
+ ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 7db906c4b5d6..0c30e3a5b061 100644
Binary files a/app-pda/Manifest.gz and b/app-pda/Manifest.gz differ
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
index 57bdec489ff1..585d9c0ce87c 100644
--- a/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
LICENSE="|| ( GPL-2 LGPL-2 )"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="bluetooth debug java perl png python static-libs threads usb"
COMMON_DEPEND="
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index dd5894282ef7..54ceefdec301 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/g-sorcery/g-sorcery-9999.ebuild b/app-portage/g-sorcery/g-sorcery-9999.ebuild
index 8425f5282fcc..bb8f8a3556e9 100644
--- a/app-portage/g-sorcery/g-sorcery-9999.ebuild
+++ b/app-portage/g-sorcery/g-sorcery-9999.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
PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
@@ -27,14 +27,16 @@ RDEPEND="${DEPEND}"
PDEPEND=">=app-portage/layman-2.2.0[g-sorcery(-),${PYTHON_USEDEP}]"
python_test() {
- PYTHONPATH="." "${PYTHON}" scripts/run_tests.py
+ PYTHONPATH="." "${PYTHON}" scripts/run_tests.py || die
}
python_install_all() {
distutils-r1_python_install_all
doman docs/*.8
- dohtml docs/developer_instructions.html
+ docinto html
+ dodoc docs/developer_instructions.html
diropts -m0777
- dodir /var/lib/g-sorcery
+ dodir /var/lib/${PN}
+ keepdir /var/lib/${PN}
}
diff --git a/app-portage/porticron/porticron-0.7.1.ebuild b/app-portage/porticron/porticron-0.7.1.ebuild
index b899fd1c75b0..e38402ddf84c 100644
--- a/app-portage/porticron/porticron-0.7.1.ebuild
+++ b/app-portage/porticron/porticron-0.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gentoo/porticron/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm hppa ppc ~ppc64 x86"
IUSE=""
RDEPEND="
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index fcf54845cb7e..a91c89744603 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
index 932319468e37..c1c1ed6e8efa 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
LICENSE="docbook"
SLOT="1.0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+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"
IUSE=""
RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
index 449245d970d1..6e3ee2c426a6 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
LICENSE="docbook"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE=""
RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/openjade/openjade-1.3.2-r8.ebuild b/app-text/openjade/openjade-1.3.2-r8.ebuild
index eb9424c299e1..338f5e1e57f6 100644
--- a/app-text/openjade/openjade-1.3.2-r8.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RDEPEND="
diff --git a/app-text/qpdf/qpdf-8.2.1.ebuild b/app-text/qpdf/qpdf-8.2.1.ebuild
index 6f510b86b951..62ad605d8798 100644
--- a/app-text/qpdf/qpdf-8.2.1.ebuild
+++ b/app-text/qpdf/qpdf-8.2.1.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
# subslot = libqpdf soname version
SLOT="0/21"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
IUSE="doc examples perl static-libs test"
CDEPEND="
diff --git a/app-text/robodoc/Manifest b/app-text/robodoc/Manifest
index 0f6f642f0c34..5f8e2acb640a 100644
--- a/app-text/robodoc/Manifest
+++ b/app-text/robodoc/Manifest
@@ -1 +1 @@
-DIST robodoc-4.99.36.tar.gz 280680 BLAKE2B 94662733945f6bbed5a5b6207423c175b1ce0c700f3488cc55bbd79d864c0ee10d49ac27ab8869c09a06708d31e6d1f9e7600bb0fdd7e0477559e19b21ec0a30 SHA512 6643cb1419c58195f26899e629a4a7470014b425e05b7615e523f972b67eb0e39421c373b8c80b53a4dd0d121d61481a7a0e66f7fca7fe82422d56b8ff048b9b
+DIST robodoc-4.99.43.tar.gz 310182 BLAKE2B f8f83c50f51e1f690068b881b51a91369bba3c6b1a9be534fd50887abbf6f06cd90706039865bd0ffdd454b4776ab6e5a1d62dbaf12f459bf1eca0e5872f7e29 SHA512 b9d8758512f6921ca773574ed57763b6eaa203134f13839b8b6f89072bb9a5c0b061bcde816ca8cc64ec72aab7566465ffb0ff2f6a0ead66b50058cb5974fff6
diff --git a/app-text/robodoc/metadata.xml b/app-text/robodoc/metadata.xml
index 6f49eba8f496..a746d82a0260 100644
--- a/app-text/robodoc/metadata.xml
+++ b/app-text/robodoc/metadata.xml
@@ -1,5 +1,15 @@
-
+
+ 4z0r@ovidiu.at
+ Ovidiu - Dan Bogat
+
+
+ proxy-maint@gentoo.org
+ Proxy Maintainers
+
+
diff --git a/app-text/robodoc/robodoc-4.99.36.ebuild b/app-text/robodoc/robodoc-4.99.43.ebuild
similarity index 52%
rename from app-text/robodoc/robodoc-4.99.36.ebuild
rename to app-text/robodoc/robodoc-4.99.43.ebuild
index bc373d944a6e..e539d2a3d151 100644
--- a/app-text/robodoc/robodoc-4.99.36.ebuild
+++ b/app-text/robodoc/robodoc-4.99.43.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
DESCRIPTION="Automating Software Documentation"
-HOMEPAGE="http://www.xs4all.nl/~rfsber/Robo/robodoc.html"
-SRC_URI="http://www.xs4all.nl/~rfsber/Robo/DistSource/${P}.tar.gz"
+HOMEPAGE="https://www.xs4all.nl/~rfsber/Robo/robodoc.html"
+SRC_URI="https://rfsber.home.xs4all.nl/Robo/archives/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
@@ -22,15 +22,13 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ default
insinto /usr/share/${PN}
- doins Contributions/* || die "doins failed"
-
- rm -f "${D}"/usr/share/doc/${PF}/{COPYING,INSTALL}
+ doins Contributions/*
if use examples; then
insinto /usr/share/${PN}
- doins -r Examples/PerlExample || die "doins failed"
+ doins -r Examples/PerlExample
fi
}
diff --git a/app-text/zathura/zathura-0.4.1-r2.ebuild b/app-text/zathura/zathura-0.4.1-r2.ebuild
index 834f69ea245a..f6972544584a 100644
--- a/app-text/zathura/zathura-0.4.1-r2.ebuild
+++ b/app-text/zathura/zathura-0.4.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -41,7 +41,6 @@ BDEPEND="virtual/pkgconfig"
src_configure() {
local emesonargs=(
- --libdir=/usr/$(get_libdir)
-Denable-magic=$(usex magic true false)
-Denable-seccomp=$(usex seccomp true false)
-Denable-sqlite=$(usex sqlite true false)
diff --git a/app-text/zathura/zathura-0.4.3.ebuild b/app-text/zathura/zathura-0.4.3.ebuild
index 498fcc32ef94..19b0aaae81e4 100644
--- a/app-text/zathura/zathura-0.4.3.ebuild
+++ b/app-text/zathura/zathura-0.4.3.ebuild
@@ -42,7 +42,6 @@ BDEPEND="doc? ( dev-python/sphinx )
src_configure() {
local emesonargs=(
- --libdir=/usr/$(get_libdir)
-Dconvert-icon=disabled
-Dmagic=$(usex magic enabled disabled)
-Dmanpages=$(usex doc enabled disabled)
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
index fced4c2aa2b9..fcb0645c0898 100644
--- a/app-text/zathura/zathura-9999.ebuild
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -39,7 +39,6 @@ BDEPEND="virtual/pkgconfig"
src_configure() {
local emesonargs=(
- --libdir=/usr/$(get_libdir)
-Denable-magic=$(usex magic true false)
-Denable-seccomp=$(usex seccomp true false)
-Denable-sqlite=$(usex sqlite true false)
diff --git a/dev-cpp/ETL/ETL-0.04.15-r1.ebuild b/dev-cpp/ETL/ETL-0.04.15-r1.ebuild
new file mode 100644
index 000000000000..98488ac2a7b2
--- /dev/null
+++ b/dev-cpp/ETL/ETL-0.04.15-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Multi-platform class and template library"
+HOMEPAGE="https://www.synfig.org"
+SRC_URI="mirror://sourceforge/synfig/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+ default
+ sed -i -e 's/CXXFLAGS="`echo $CXXFLAGS | sed s:-g::` $debug_flags"//' \
+ -e 's/CFLAGS="`echo $CFLAGS | sed s:-g::` $debug_flags"//' \
+ m4/subs.m4 || die
+
+ eautoreconf
+}
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 9743d7feea7d..9d1a67e4a07d 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/glibmm/glibmm-2.56.1.ebuild b/dev-cpp/glibmm/glibmm-2.56.1.ebuild
index a54c63d94f85..09daa5e21a77 100644
--- a/dev-cpp/glibmm/glibmm-2.56.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.56.1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
SLOT="2"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="doc debug test"
RDEPEND="
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 46315fc6403e..f12bf987acae 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/libiodbc/libiodbc-3.52.12.ebuild b/dev-db/libiodbc/libiodbc-3.52.12.ebuild
index 4572382e090e..e7fc9a2c6ecd 100644
--- a/dev-db/libiodbc/libiodbc-3.52.12.ebuild
+++ b/dev-db/libiodbc/libiodbc-3.52.12.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="ODBC Interface for Linux"
HOMEPAGE="http://www.iodbc.org/"
SRC_URI="https://github.com/openlink/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
-KEYWORDS="alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
LICENSE="|| ( LGPL-2 BSD )"
SLOT="0"
IUSE="gtk"
diff --git a/dev-db/postgresql/postgresql-11.1.ebuild b/dev-db/postgresql/postgresql-11.1.ebuild
index e0eba37b4309..09481404e409 100644
--- a/dev-db/postgresql/postgresql-11.1.ebuild
+++ b/dev-db/postgresql/postgresql-11.1.ebuild
@@ -11,7 +11,7 @@ PLOCALES="af cs de en es fa fr hr hu it ko nb pl pt_BR ro ru sk sl sv tr zh_CN
inherit flag-o-matic l10n linux-info multilib pam prefix python-single-r1 \
systemd user versionator
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SLOT=$(get_major_version)
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 62ec0ac178ce..b35554932ee7 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r13.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r13.ebuild
new file mode 100644
index 000000000000..fd823635a6a8
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r13.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd
+
+SASLAUTHD_CONF_VER="2.1.26"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
+HOMEPAGE="https://www.cyrusimap.org/sasl/"
+SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite
+srp ssl static-libs urandom"
+
+DEPEND="
+ net-mail/mailbase
+ authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
+ berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
+ gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
+ kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+ openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+ mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
+ pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
+ postgres? ( dev-db/postgresql:* )
+ sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+ )
+ java? ( >=virtual/jdk-1.6:= )"
+
+RDEPEND="
+ ${DEPEND}
+ selinux? ( sec-policy/selinux-sasl )"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/sasl/md5global.h
+)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.1.25-sasldb_al.patch"
+ "${FILESDIR}/${PN}-2.1.25-saslauthd_libtool.patch"
+ "${FILESDIR}/${PN}-2.1.25-avoid_pic_overwrite.patch"
+ "${FILESDIR}/${PN}-2.1.25-autotools_fixes.patch"
+ "${FILESDIR}/${PN}-2.1.25-as_needed.patch"
+ "${FILESDIR}/${PN}-2.1.25-missing_header.patch"
+ "${FILESDIR}/${PN}-2.1.25-fix_heimdal.patch"
+ "${FILESDIR}/${PN}-2.1.25-auxprop.patch"
+ "${FILESDIR}/${PN}-2.1.23-gss_c_nt_hostbased_service.patch"
+ "${FILESDIR}/${PN}-2.1.25-service_keytabs.patch"
+ "${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
+ "${FILESDIR}/${PN}-2.1.26-CVE-2013-4122.patch"
+ "${FILESDIR}/${PN}-2.1.26-send-imap-logout.patch"
+ "${FILESDIR}/${PN}-2.1.26-canonuser-ldapdb-garbage-in-out-buffer.patch"
+ "${FILESDIR}/${PN}-2.1.26-fix_dovecot_authentication.patch"
+ "${FILESDIR}/${PN}-2.1.26-openssl-1.1.patch" #592528
+)
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # Get rid of the -R switch (runpath_switch for Sun)
+ # >=gcc-4.6 errors out with unknown option
+ sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
+ configure.in || die
+
+ # Use plugindir for sasldir
+ sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+ "${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+ # #486740 #468556
+ sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
+ -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
+ configure.in || die
+ sed -i -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
+ saslauthd/configure.in || die
+
+ eautoreconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # getpassphrase is defined in /usr/include/stdlib.h
+ append-cppflags -DHAVE_GETPASSPHRASE
+ else
+ # this horrendously breaks things on Solaris
+ append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ # Java support.
+ multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+ local myeconfargs=(
+ --enable-login
+ --enable-ntlm
+ --enable-auth-sasldb
+ --disable-cmulocal
+ --disable-krb4
+ --disable-macos-framework
+ --enable-otp
+ --without-sqlite
+ --with-saslauthd="${EPREFIX}"/run/saslauthd
+ --with-pwcheck="${EPREFIX}"/run/saslauthd
+ --with-configdir="${EPREFIX}"/etc/sasl2
+ --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
+ --with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
+ $(use_with ssl openssl)
+ $(use_with pam)
+ $(use_with openldap ldap)
+ $(use_enable ldapdb)
+ $(multilib_native_use_enable sample)
+ $(use_enable kerberos gssapi)
+ $(multilib_native_use_enable java)
+ $(multilib_native_use_with java javahome ${JAVA_HOME})
+ $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
+ $(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
+ $(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
+ $(use_enable srp)
+ $(use_enable static-libs static)
+
+ # Add authdaemond support (bug #56523).
+ $(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
+
+ # Fix for bug #59634.
+ $(usex ssl '' --without-des)
+
+ # Use /dev/urandom instead of /dev/random (bug #46038).
+ $(usex urandom --with-devrandom=/dev/urandom '')
+ )
+
+ if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
+ myeconfargs+=( --enable-sql )
+ else
+ myeconfargs+=( --disable-sql )
+ fi
+
+ # Default to GDBM if both 'gdbm' and 'berkdb' are present.
+ if use gdbm ; then
+ einfo "Building with GNU DB as database backend for your SASLdb"
+ myeconfargs+=( --with-dblib=gdbm )
+ elif use berkdb ; then
+ einfo "Building with BerkeleyDB as database backend for your SASLdb"
+ myeconfargs+=(
+ --with-dblib=berkeley
+ --with-bdb-incdir="$(db_includedir)"
+ )
+ else
+ einfo "Building without SASLdb support"
+ myeconfargs+=( --with-dblib=none )
+ fi
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ emake
+
+ # Default location for java classes breaks OpenOffice (bug #60769).
+ # Thanks to axxo@gentoo.org for the solution.
+ if multilib_is_native_abi && use java ; then
+ jar -cvf ${PN}.jar -C java $(find java -name "*.class")
+ fi
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi; then
+ if use sample ; then
+ docinto sample
+ dodoc "${S}"/sample/*.c
+ exeinto /usr/share/doc/${P}/sample
+ doexe sample/client sample/server
+ fi
+
+ # Default location for java classes breaks OpenOffice (bug #60769).
+ if use java; then
+ java-pkg_dojar ${PN}.jar
+ java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
+ # hackish, don't wanna dig through makefile
+ rm -rf "${ED}/usr/$(get_libdir)/java" || die
+ docinto "java"
+ dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
+ dodir "/usr/share/doc/${PF}/java/Test"
+ insinto "/usr/share/doc/${PF}/java/Test"
+ doins "${S}"/java/Test/*.java
+ fi
+
+ dosbin saslauthd/testsaslauthd
+ fi
+}
+
+multilib_src_install_all() {
+ keepdir /etc/sasl2
+
+ dodoc AUTHORS ChangeLog NEWS README doc/TODO doc/*.txt
+ newdoc pwcheck/README README.pwcheck
+
+ docinto html
+ dodoc doc/*.html
+
+ docinto "saslauthd"
+ dodoc saslauthd/{AUTHORS,ChangeLog,LDAP_SASLAUTHD,NEWS,README}
+
+ newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+
+ newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
+ systemd_dounit "${FILESDIR}/pwcheck.service"
+
+ newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
+ newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
+ systemd_dounit "${FILESDIR}/saslauthd.service"
+ systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+ # The get_modname bit is important: do not remove the .la files on
+ # platforms where the lib isn't called .so for cyrus searches the .la to
+ # figure out what the name is supposed to be instead
+ if ! use static-libs && [[ $(get_modname) == .so ]] ; then
+ find "${ED}" -name "*.la" -delete || die
+ fi
+}
+
+pkg_postinst () {
+ # Generate an empty sasldb2 with correct permissions.
+ if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
+ einfo "Generating an empty sasldb2 with correct permissions ..."
+ echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
+ || die "Failed to generate sasldb2"
+ "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
+ || die "Failed to delete temp user"
+ chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
+ || die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
+ chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
+ || die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
+ fi
+
+ if use authdaemond ; then
+ elog "You need to add a user running a service using Courier's"
+ elog "authdaemon to the 'mail' group. For example, do:"
+ elog " gpasswd -a postfix mail"
+ elog "to add the 'postfix' user to the 'mail' group."
+ fi
+
+ elog "pwcheck and saslauthd home directories have moved to:"
+ elog " /run/saslauthd, using tmpfiles.d"
+}
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
new file mode 100644
index 000000000000..b31b213093bc
--- /dev/null
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic multilib multilib-minimal autotools pam java-pkg-opt-2 db-use systemd eapi7-ver
+
+SASLAUTHD_CONF_VER="2.1.26"
+
+DESCRIPTION="The Cyrus SASL (Simple Authentication and Security Layer)"
+HOMEPAGE="https://www.cyrusimap.org/sasl/"
+#SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
+SRC_URI="https://github.com/cyrusimap/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD-with-attribution"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom"
+
+CDEPEND="
+ net-mail/mailbase
+ authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) )
+ berkdb? ( >=sys-libs/db-4.8.30-r1:=[${MULTILIB_USEDEP}] )
+ gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
+ kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+ openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
+ mysql? ( dev-db/mysql-connector-c:0=[${MULTILIB_USEDEP}] )
+ pam? ( >=virtual/pam-0-r1[${MULTILIB_USEDEP}] )
+ postgres? ( dev-db/postgresql:* )
+ sqlite? ( >=dev-db/sqlite-3.8.2:3[${MULTILIB_USEDEP}] )
+ ssl? (
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+ )
+ java? ( >=virtual/jdk-1.6:= )"
+
+RDEPEND="
+ ${CDEPEND}
+ selinux? ( sec-policy/selinux-sasl )"
+
+DEPEND="${CDEPEND}"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/sasl/md5global.h
+)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.1.27-avoid_pic_overwrite.patch"
+ "${FILESDIR}/${PN}-2.1.27-autotools_fixes.patch"
+ "${FILESDIR}/${PN}-2.1.27-as_needed.patch"
+ "${FILESDIR}/${PN}-2.1.25-auxprop.patch"
+ "${FILESDIR}/${PN}-2.1.27-gss_c_nt_hostbased_service.patch"
+ "${FILESDIR}/${PN}-2.1.26-missing-size_t.patch"
+ "${FILESDIR}/${PN}-2.1.27-doc_build_fix.patch"
+ "${FILESDIR}/${PN}-2.1.27-memmem.patch"
+)
+
+pkg_setup() {
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # Get rid of the -R switch (runpath_switch for Sun)
+ # >=gcc-4.6 errors out with unknown option
+ sed -i -e '/LIB_SQLITE.*-R/s/ -R[^"]*//' \
+ configure.ac || die
+
+ # Use plugindir for sasldir
+ sed -i '/^sasldir =/s:=.*:= $(plugindir):' \
+ "${S}"/plugins/Makefile.{am,in} || die "sed failed"
+
+ # #486740 #468556
+ sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
+ -e 's:AC_CONFIG_MACRO_DIR:AC_CONFIG_MACRO_DIRS:g' \
+ configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # getpassphrase is defined in /usr/include/stdlib.h
+ append-cppflags -DHAVE_GETPASSPHRASE
+ else
+ # this horrendously breaks things on Solaris
+ append-cppflags -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE -DLDAP_DEPRECATED
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ # Java support.
+ multilib_is_native_abi && use java && export JAVAC="${JAVAC} ${JAVACFLAGS}"
+
+ local myeconfargs=(
+ --enable-login
+ --enable-ntlm
+ --enable-auth-sasldb
+ --disable-cmulocal
+ --disable-krb4
+ --disable-macos-framework
+ --enable-otp
+ --without-sqlite
+ --with-saslauthd="${EPREFIX}"/run/saslauthd
+ --with-pwcheck="${EPREFIX}"/run/saslauthd
+ --with-configdir="${EPREFIX}"/etc/sasl2
+ --with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sasl2
+ --with-dbpath="${EPREFIX}"/etc/sasl2/sasldb2
+ --with-sphinx-build=no
+ $(use_with ssl openssl)
+ $(use_with pam)
+ $(use_with openldap ldap)
+ $(use_enable ldapdb)
+ $(multilib_native_use_enable sample)
+ $(use_enable kerberos gssapi)
+ $(multilib_native_use_enable java)
+ $(multilib_native_use_with mysql mysql "${EPREFIX}"/usr)
+ $(multilib_native_use_with postgres pgsql "${EPREFIX}"/usr/$(get_libdir)/postgresql)
+ $(use_with sqlite sqlite3 "${EPREFIX}"/usr/$(get_libdir))
+ $(use_enable srp)
+ $(use_enable static-libs static)
+
+ # Add authdaemond support (bug #56523).
+ $(usex authdaemond --with-authdaemond="${EPREFIX}"/var/lib/courier/authdaemon/socket '')
+
+ # Fix for bug #59634.
+ $(usex ssl '' --without-des)
+
+ # Use /dev/urandom instead of /dev/random (bug #46038).
+ $(usex urandom --with-devrandom=/dev/urandom '')
+ )
+
+ if use sqlite || { multilib_is_native_abi && { use mysql || use postgres; }; } ; then
+ myeconfargs+=( --enable-sql )
+ else
+ myeconfargs+=( --disable-sql )
+ fi
+
+ # Default to GDBM if both 'gdbm' and 'berkdb' are present.
+ if use gdbm ; then
+ einfo "Building with GNU DB as database backend for your SASLdb"
+ myeconfargs+=( --with-dblib=gdbm )
+ elif use berkdb ; then
+ einfo "Building with BerkeleyDB as database backend for your SASLdb"
+ myeconfargs+=(
+ --with-dblib=berkeley
+ --with-bdb-incdir="$(db_includedir)"
+ )
+ else
+ einfo "Building without SASLdb support"
+ myeconfargs+=( --with-dblib=none )
+ fi
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ emake
+
+ # Default location for java classes breaks OpenOffice (bug #60769).
+ # Thanks to axxo@gentoo.org for the solution.
+ if multilib_is_native_abi && use java ; then
+ jar -cvf ${PN}.jar -C java $(find java -name "*.class")
+ fi
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi; then
+ if use sample ; then
+ docinto sample
+ dodoc "${S}"/sample/*.c
+ exeinto /usr/share/doc/${P}/sample
+ doexe sample/client sample/server
+ fi
+
+ # Default location for java classes breaks OpenOffice (bug #60769).
+ if use java; then
+ java-pkg_dojar ${PN}.jar
+ java-pkg_regso "${ED}/usr/$(get_libdir)/libjavasasl$(get_libname)"
+ # hackish, don't wanna dig through makefile
+ rm -rf "${ED}/usr/$(get_libdir)/java" || die
+ docinto "java"
+ dodoc "${S}/java/README" "${FILESDIR}/java.README.gentoo" "${S}"/java/doc/*
+ dodir "/usr/share/doc/${PF}/java/Test"
+ insinto "/usr/share/doc/${PF}/java/Test"
+ doins "${S}"/java/Test/*.java
+ fi
+
+ dosbin saslauthd/testsaslauthd
+ fi
+}
+
+multilib_src_install_all() {
+ doman man/*
+
+ keepdir /etc/sasl2
+
+ # Reset docinto to default value (#674296)
+ docinto
+ dodoc AUTHORS ChangeLog doc/legacy/TODO
+ newdoc pwcheck/README README.pwcheck
+
+ newdoc docsrc/sasl/release-notes/$(ver_cut 1-2)/index.rst release-notes
+ edos2unix ${ED%/}/usr/share/doc/${PF}/release-notes
+
+ docinto html
+ dodoc doc/html/*.html
+
+ newpamd "${FILESDIR}/saslauthd.pam-include" saslauthd
+
+ newinitd "${FILESDIR}/pwcheck.rc6" pwcheck
+ systemd_dounit "${FILESDIR}/pwcheck.service"
+
+ newinitd "${FILESDIR}/saslauthd2.rc7" saslauthd
+ newconfd "${FILESDIR}/saslauthd-${SASLAUTHD_CONF_VER}.conf" saslauthd
+ systemd_dounit "${FILESDIR}/saslauthd.service"
+ systemd_dotmpfilesd "${FILESDIR}/${PN}.conf"
+
+ # The get_modname bit is important: do not remove the .la files on
+ # platforms where the lib isn't called .so for cyrus searches the .la to
+ # figure out what the name is supposed to be instead
+ if ! use static-libs && [[ $(get_modname) == .so ]] ; then
+ find "${ED}" -name "*.la" -delete || die
+ fi
+}
+
+pkg_postinst () {
+ # Generate an empty sasldb2 with correct permissions.
+ if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
+ einfo "Generating an empty sasldb2 with correct permissions ..."
+ echo "p" | "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -p login \
+ || die "Failed to generate sasldb2"
+ "${EROOT}/usr/sbin/saslpasswd2" -f "${EROOT}/etc/sasl2/sasldb2" -d login \
+ || die "Failed to delete temp user"
+ chown root:mail "${EROOT}/etc/sasl2/sasldb2" \
+ || die "Failed to chown ${EROOT}/etc/sasl2/sasldb2"
+ chmod 0640 "${EROOT}/etc/sasl2/sasldb2" \
+ || die "Failed to chmod ${EROOT}/etc/sasl2/sasldb2"
+ fi
+
+ if use authdaemond ; then
+ elog "You need to add a user running a service using Courier's"
+ elog "authdaemon to the 'mail' group. For example, do:"
+ elog " gpasswd -a postfix mail"
+ elog "to add the 'postfix' user to the 'mail' group."
+ fi
+
+ elog "pwcheck and saslauthd home directories have moved to:"
+ elog " /run/saslauthd, using tmpfiles.d"
+}
diff --git a/dev-libs/faxpp/faxpp-0.4-r1.ebuild b/dev-libs/faxpp/faxpp-0.4-r1.ebuild
new file mode 100644
index 000000000000..70d50bbaeaaf
--- /dev/null
+++ b/dev-libs/faxpp/faxpp-0.4-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Small, fast and conformant XML pull parser written in C"
+HOMEPAGE="http://faxpp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+src_install() {
+ default
+
+ if use doc; then
+ docinto html
+ dodoc -r docs/api/
+ fi
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/dev-libs/libinput/libinput-1.12.6.ebuild b/dev-libs/libinput/libinput-1.12.6.ebuild
index fe9e7e7cf8c1..fa3fa3045685 100644
--- a/dev-libs/libinput/libinput-1.12.6.ebuild
+++ b/dev-libs/libinput/libinput-1.12.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="MIT"
SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="doc input_devices_wacom"
# Tests require write access to udev rules directory which is a no-no for live system.
# Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/liblzw/liblzw-0.2-r1.ebuild b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
index 7cdc606acac6..56b1cee33eb1 100644
--- a/dev-libs/liblzw/liblzw-0.2-r1.ebuild
+++ b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/freestdf/${P}.tar.lzma"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ia64 ~m68k ~s390 ~sh ~x86"
+KEYWORDS="~amd64 ~arm hppa ia64 ~m68k ~s390 ~sh x86"
src_configure(){
econf --disable-static
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index c0eb5a5ea60d..396290996fdd 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1 +1,2 @@
DIST libzip-1.3.0.tar.xz 955876 BLAKE2B 9bb59cb34ed7e85e3161770f0eef7ed1f59fb2f7f648cd201fa5dc6c62339481ad72a71024df443c04ef0c7efe6f00838a3ac316da2ef06c0045ab69ade8f71b SHA512 8e12a23fe62b993ff4592e1b9da152533a363b0603fc1f65e6cbb6121d4260c45f98171effbccb76dec4030b0fcdcd273919755a2496ab462431646ac83bb900
+DIST libzip-1.5.1.tar.xz 717908 BLAKE2B f2c19d3a8d9d60f3a0a9bc06359104187e75bcb59ab2aa06df611b487f0c91c27cf52f24bcc24e3d4358c5fe11882661b245829e6cdee2b39559f728cd20f899 SHA512 92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d
diff --git a/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch b/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch
new file mode 100644
index 000000000000..9b70eaca8e87
--- /dev/null
+++ b/dev-libs/libzip/files/libzip-1.5.1-bzip2.patch
@@ -0,0 +1,53 @@
+From 028c492c9d45ca29e2fbec79a203ba492016f15e Mon Sep 17 00:00:00 2001
+From: Miklos Vajna
+Date: Fri, 7 Sep 2018 23:12:36 +0200
+Subject: [PATCH] Add an option to disable bzip2 support
+
+The explicit switch is still on by default, but this way it's possible
+to explicitly disable bzip2 support even if bzip2 is available on the
+system.
+
+This is useful if bzip2 is not needed, but would automatically lead to
+an unwanted dependency.
+---
+ CMakeLists.txt | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 73a34855..879e0f21 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,6 +10,7 @@ PROJECT(libzip C)
+ OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON)
+ OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
+ OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON)
++OPTION(ENABLE_BZIP2 "Enable use of BZip2" ON)
+
+ OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON)
+ OPTION(BUILD_REGRESS "Build regression tests" ON)
+@@ -186,15 +187,17 @@ IF(ZLIB_VERSION_STRING VERSION_LESS "1.1.2")
+ MESSAGE(FATAL_ERROR "-- ZLIB version too old, please install at least v1.1.2")
+ ENDIF(ZLIB_VERSION_STRING VERSION_LESS "1.1.2")
+
+-FIND_PACKAGE(BZip2)
+-IF(BZIP2_FOUND)
+- SET (HAVE_LIBBZ2 1)
++IF(ENABLE_BZIP2)
++ FIND_PACKAGE(BZip2)
++ IF(BZIP2_FOUND)
++ SET (HAVE_LIBBZ2 1)
+
+- INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
+- SET (OPTIONAL_LIBRARY ${BZIP2_LIBRARY})
+-ELSE()
+- MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled")
+-ENDIF(BZIP2_FOUND)
++ INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
++ SET (OPTIONAL_LIBRARY ${BZIP2_LIBRARY})
++ ELSE()
++ MESSAGE(WARNING "-- bzip2 library not found; bzip2 support disabled")
++ ENDIF(BZIP2_FOUND)
++ENDIF(ENABLE_BZIP2)
+
+ IF (COMMONCRYPTO_FOUND)
+ SET (HAVE_CRYPTO 1)
diff --git a/dev-libs/libzip/files/libzip-1.5.1-options.patch b/dev-libs/libzip/files/libzip-1.5.1-options.patch
new file mode 100644
index 000000000000..0cca187d90a0
--- /dev/null
+++ b/dev-libs/libzip/files/libzip-1.5.1-options.patch
@@ -0,0 +1,50 @@
+From b6e53cce5370fba88299f9ed2944ab8a7a4cef5c Mon Sep 17 00:00:00 2001
+From: Florian Delizy
+Date: Tue, 7 Aug 2018 22:09:32 +0800
+Subject: [PATCH] adding BUILD_TOOLS BUILD_REGRESS BUILD_EXAMPLES BUILD_DOC
+ options (default ON)
+
+---
+ CMakeLists.txt | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 69e6548e..def25607 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,6 +11,11 @@ OPTION(ENABLE_GNUTLS "Enable use of GnuTLS" ON)
+ OPTION(ENABLE_OPENSSL "Enable use of OpenSSL" ON)
+ OPTION(ENABLE_COMMONCRYPTO "Enable use of CommonCrypto" ON)
+
++OPTION(BUILD_TOOLS "Build tools in the src directory (zipcmp, zipmerge, ziptool)" ON)
++OPTION(BUILD_REGRESS "Build regression tests" ON)
++OPTION(BUILD_EXAMPLES "Build examples" ON)
++OPTION(BUILD_DOC "Build documentation" ON)
++
+ INCLUDE(CheckFunctionExists)
+ INCLUDE(CheckIncludeFiles)
+ INCLUDE(CheckSymbolExists)
+@@ -234,10 +239,23 @@ ENABLE_TESTING()
+
+ # Targets
+ ADD_SUBDIRECTORY(lib)
++
++IF(BUILD_DOC)
+ ADD_SUBDIRECTORY(man)
++ENDIF()
++
++IF(BUILD_TOOLS)
+ ADD_SUBDIRECTORY(src)
++ENDIF()
++
++IF(BUILD_REGRESS)
+ ADD_SUBDIRECTORY(regress)
++ENDIF()
++
++IF(BUILD_EXAMPLES)
+ ADD_SUBDIRECTORY(examples)
++ENDIF()
++
+
+ # pkgconfig file
+ SET(prefix ${CMAKE_INSTALL_PREFIX})
diff --git a/dev-libs/libzip/libzip-1.5.1.ebuild b/dev-libs/libzip/libzip-1.5.1.ebuild
new file mode 100644
index 000000000000..b0125575cca1
--- /dev/null
+++ b/dev-libs/libzip/libzip-1.5.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils multibuild
+
+DESCRIPTION="Library for manipulating zip archives"
+HOMEPAGE="https://nih.at/libzip/"
+SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="bzip2 doc gnutls libressl ssl static-libs test"
+
+DEPEND="
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ ssl? (
+ gnutls? ( net-libs/gnutls )
+ !gnutls? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( dev-libs/libressl:0= )
+ )
+ )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-options.patch"
+ "${FILESDIR}/${P}-bzip2.patch"
+)
+
+pkg_setup() {
+ # Upstream doesn't support building dynamic & static
+ # simultaneously: https://github.com/nih-at/libzip/issues/76
+ MULTIBUILD_VARIANTS=( shared $(usev static-libs) )
+}
+
+src_configure() {
+ myconfigure() {
+ local mycmakeargs=(
+ -DBUILD_EXAMPLES=OFF # nothing is installed
+ -DENABLE_COMMONCRYPTO=OFF # not in tree
+ -DENABLE_BZIP2=$(usex bzip2)
+ )
+ if [[ ${MULTIBUILD_VARIANT} = static-libs ]]; then
+ mycmakeargs+=(
+ -DBUILD_DOC=OFF
+ -DBUILD_EXAMPLES=OFF
+ -DBUILD_SHARED_LIBS=OFF
+ -DBUILD_TOOLS=OFF
+ )
+ else
+ mycmakeargs+=(
+ -DBUILD_DOC=$(usex doc)
+ -DBUILD_REGRESS=$(usex test)
+ )
+ fi
+
+ if use ssl; then
+ mycmakeargs+=(
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_OPENSSL=$(usex !gnutls)
+ )
+ else
+ mycmakeargs+=(
+ -DENABLE_GNUTLS=OFF
+ -DENABLE_OPENSSL=OFF
+ )
+ fi
+ cmake-utils_src_configure
+ }
+
+ multibuild_foreach_variant myconfigure
+}
+
+src_compile() {
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+src_test() {
+ [[ ${MULTIBUILD_VARIANT} = shared ]] && cmake-utils_src_test
+}
+
+src_install() {
+ multibuild_foreach_variant cmake-utils_src_install
+}
diff --git a/dev-libs/ltxml/ltxml-1.2.9.ebuild b/dev-libs/ltxml/ltxml-1.2.9.ebuild
index 21ec814668bc..8c6dd381f0cc 100644
--- a/dev-libs/ltxml/ltxml-1.2.9.ebuild
+++ b/dev-libs/ltxml/ltxml-1.2.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI=ftp://ftp.cogsci.ed.ac.uk/pub/LTXML/${P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ia64 ppc ~x86"
+KEYWORDS="~amd64 ia64 ppc x86"
IUSE=""
DEPEND="dev-lang/perl"
diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml
index a2b0f1f2ac3f..f7a05b32b68d 100644
--- a/dev-libs/poco/metadata.xml
+++ b/dev-libs/poco/metadata.xml
@@ -33,6 +33,7 @@ done quickly and working on the features that make their application unique.
Database abstraction layer to easily send/retrieve data to/from various databases
Utility to convert ordinary files to Page Compiler source files
Add JSON support
+ Prefer dev-db/mariadb-connector-c over dev-db/mysql-connector-c
Add dev-db/mongodb support
Classes to write network clients & servers
Simple compiler translating HTML pages containing embedded C++ code into HTTPRequestHandler classes
diff --git a/dev-libs/poco/poco-1.7.6-r1.ebuild b/dev-libs/poco/poco-1.7.6-r1.ebuild
new file mode 100644
index 000000000000..0f6dc7386860
--- /dev/null
+++ b/dev-libs/poco/poco-1.7.6-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="C++ libraries for building network-based applications"
+HOMEPAGE="https://pocoproject.org/"
+SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz"
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="7z apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
+REQUIRED_USE="7z? ( xml )
+ apache? ( net util )
+ file2pagecompiler? ( pagecompiler )
+ iodbc? ( odbc )
+ mongodb? ( data )
+ mysql? ( data )
+ odbc? ( data )
+ pagecompiler? ( json net util xml )
+ pocodoc? ( cppparser util xml )
+ sqlite? ( data )
+ test? ( data? ( sqlite ) json util xml )"
+
+RDEPEND=">=dev-libs/libpcre-8.13
+ xml? ( dev-libs/expat )
+ apache? ( dev-libs/apr
+ dev-libs/apr-util
+ www-servers/apache )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ odbc? ( iodbc? ( dev-db/libiodbc )
+ !iodbc? ( dev-db/unixODBC ) )
+ ssl? (
+ !libressl? ( ${P}.tar.gz"
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="7z apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl mariadb +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
+REQUIRED_USE="7z? ( xml )
+ apache? ( net util )
+ file2pagecompiler? ( pagecompiler )
+ iodbc? ( odbc )
+ mongodb? ( data )
+ mysql? ( data )
+ odbc? ( data )
+ pagecompiler? ( json net util xml )
+ pocodoc? ( cppparser util xml )
+ sqlite? ( data )
+ test? ( data? ( sqlite ) json util xml )"
+
+RDEPEND=">=dev-libs/libpcre-8.13
+ xml? ( dev-libs/expat )
+ apache? ( dev-libs/apr
+ dev-libs/apr-util
+ www-servers/apache )
+ mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= )
+ mariadb? ( dev-db/mariadb-connector-c:0= ) )
+ odbc? ( iodbc? ( dev-db/libiodbc )
+ !iodbc? ( dev-db/unixODBC ) )
+ ssl? (
+ !libressl? ( =dev-libs/libxml2-2.9.5
+ >=dev-libs/libxslt-1.1.28"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
+ $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]' python2_7 'python3*')
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
+ "
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.5.0-cross-compile.patch
+)
+
+python_prepare_all() {
+ # avoid replacing PYTHONPATH in tests.
+ sed -i -e '/sys\.path/d' test.py || die
+
+ # apparently logs have changed with libxslt upgrade
+ # https://bugs.launchpad.net/lxml/+bug/1782078
+ sed -i -e '/assertEqual(4, len(log)/d' src/lxml/tests/test_threading.py || die
+
+ # don't use some random SDK on Darwin
+ sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
+ setupinfo.py || die
+
+ distutils-r1_python_prepare_all
+}
+
+python_compile() {
+ if ! python_is_python3; then
+ local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+ fi
+ tc-export PKG_CONFIG
+ distutils-r1_python_compile
+}
+
+python_test() {
+ cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
+ cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
+ ln -s "${S}"/doc "${BUILD_DIR}"/ || die
+
+ "${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
+}
+
+python_install_all() {
+ if use doc; then
+ local DOCS=( README.rst *.txt doc/*.txt )
+ local HTML_DOCS=( doc/html/. )
+ fi
+ if use examples; then
+ dodoc -r samples
+ fi
+
+ distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+ optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
+ optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
+}
diff --git a/dev-python/pylint/pylint-2.2.2.ebuild b/dev-python/pylint/pylint-2.2.2.ebuild
index 96d3ac690fab..27e44b3c1c75 100644
--- a/dev-python/pylint/pylint-2.2.2.ebuild
+++ b/dev-python/pylint/pylint-2.2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
IUSE="doc examples test"
RDEPEND="
diff --git a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
index 34e5ee21b129..789e0ec4f088 100644
--- a/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.5.0_pre20181012.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${EGIT_COMMIT}.tar.gz -> $
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/dev-python/setuptools/setuptools-40.6.3.ebuild b/dev-python/setuptools/setuptools-40.6.3.ebuild
index 9221a75a1d6c..e34277df295d 100644
--- a/dev-python/setuptools/setuptools-40.6.3.ebuild
+++ b/dev-python/setuptools/setuptools-40.6.3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
inherit git-r3
else
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
- KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Collection of extensions to Distutils"
diff --git a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
index 9eeeca3b4a5c..a56c81e8e5ce 100644
--- a/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
+++ b/dev-python/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/typed-ast/typed-ast-1.2.0.ebuild b/dev-python/typed-ast/typed-ast-1.2.0.ebuild
index 7a9e93cf23e1..b04a42088a3e 100644
--- a/dev-python/typed-ast/typed-ast-1.2.0.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 409bb26b4d97..c201389e04b8 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/minitar/Manifest b/dev-ruby/minitar/Manifest
new file mode 100644
index 000000000000..4ad862807393
--- /dev/null
+++ b/dev-ruby/minitar/Manifest
@@ -0,0 +1 @@
+DIST minitar-0.8.tar.gz 33632 BLAKE2B b576c74cfd59893d4c0c935703453551f9a0ca6258bc6a2b1ecb3151a44ff166607931e554c811fffb489b6398123cd9e8e58372a94b303df45d88ef903868ad SHA512 cab4798b98d91a17dd5ce4aed3f6fd166dab61e8c9e3bef3df218944fe1657a9ec9d40a52ab2773430070e50410c401da799469b096dcc2b22d6466da1e50b8d
diff --git a/dev-ruby/minitar/metadata.xml b/dev-ruby/minitar/metadata.xml
new file mode 100644
index 000000000000..6b698bf6db4e
--- /dev/null
+++ b/dev-ruby/minitar/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ ruby@gentoo.org
+ Gentoo Ruby Project
+
+
+ halostatue/minitar
+
+
diff --git a/dev-ruby/minitar/minitar-0.8.ebuild b/dev-ruby/minitar/minitar-0.8.ebuild
new file mode 100644
index 000000000000..346189f49ddc
--- /dev/null
+++ b/dev-ruby/minitar/minitar-0.8.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_TEST=""
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Provides POSIX tarchive management from Ruby programs"
+HOMEPAGE="https://github.com/halostatue/minitar"
+SRC_URI="https://github.com/halostatue/minitar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="minitar-${PV}"
+
+LICENSE="|| ( BSD-2 Ruby )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
+
+each_ruby_test() {
+ ${RUBY} -Ilib:test:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/puppet_forge/puppet_forge-2.2.9.ebuild b/dev-ruby/puppet_forge/puppet_forge-2.2.9-r1.ebuild
similarity index 75%
rename from dev-ruby/puppet_forge/puppet_forge-2.2.9.ebuild
rename to dev-ruby/puppet_forge/puppet_forge-2.2.9-r1.ebuild
index 7223fbcbc0f0..39d04f7b32e0 100644
--- a/dev-ruby/puppet_forge/puppet_forge-2.2.9.ebuild
+++ b/dev-ruby/puppet_forge/puppet_forge-2.2.9-r1.ebuild
@@ -9,6 +9,10 @@ RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+RUBY_FAKEGEM_EXTRAINSTALL=locales
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
inherit ruby-fakegem
DESCRIPTION="Tools to access Forge API information on Modules, Users, and Releases"
@@ -23,11 +27,17 @@ ruby_add_rdepend "
>=dev-ruby/faraday-0.9.0:0
>=dev-ruby/faraday_middleware-0.9.0:0
>=dev-ruby/gettext-setup-0.11:0
- dev-ruby/archive-tar-minitar
+ dev-ruby/minitar
=dev-ruby/semantic_puppet-1*
"
all_ruby_prepare() {
# Avoid integration and user specs since they all require network access
rm -rf spec/integration spec/unit/forge/v3/user_spec.rb || die
+
+ # Fix overly restrictive dependencies
+ sed -i \
+ -e '/faraday/ s/0.14.0/0.99.0/' \
+ -e '/faraday_middleware/ s/0.13.0/0.99.0/' \
+ ${RUBY_FAKEGEM_GEMSPEC} || die
}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 544b1e22e385..bc8d5ff804ec 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/cmocka/cmocka-1.1.3.ebuild b/dev-util/cmocka/cmocka-1.1.3.ebuild
index 8533c2da00a4..690b8ead007b 100644
--- a/dev-util/cmocka/cmocka-1.1.3.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="doc examples static-libs test"
BDEPEND="
diff --git a/dev-util/cunit/cunit-2.1_p3.ebuild b/dev-util/cunit/cunit-2.1_p3.ebuild
index 9d7de1896ba5..3113817028be 100644
--- a/dev-util/cunit/cunit-2.1_p3.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://cunit.sourceforge.net"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="ncurses static-libs"
RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-util/pkgconf/pkgconf-1.5.4.ebuild b/dev-util/pkgconf/pkgconf-1.5.4.ebuild
index 8ca94819dca7..bdfa51ea1542 100644
--- a/dev-util/pkgconf/pkgconf-1.5.4.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.5.4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit autotools git-r3
else
SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
- KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
+ KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
fi
inherit multilib-minimal
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index 2382a291ca19..b931b9892040 100644
Binary files a/games-roguelike/Manifest.gz and b/games-roguelike/Manifest.gz differ
diff --git a/games-roguelike/stone-soup/Manifest b/games-roguelike/stone-soup/Manifest
index 86ea079c4169..ce8d9856e027 100644
--- a/games-roguelike/stone-soup/Manifest
+++ b/games-roguelike/stone-soup/Manifest
@@ -1,5 +1,4 @@
DIST stone-soup.png 1351 BLAKE2B cc31abd59701aa6f0fb0bdcd90630ceebf7b3cb8b60f0e2817f8800c5bc4b3a5b9fef63c90a97b6248f306e7e3da0df3863a2195b8771863344d2443e7956d59 SHA512 4695204c8b936f7aac1ba15b02a6115a955fb2c56aa9a0b968ff007bc9a1a59b608110d60cce5625a9b92cd2c869bbea7e15433a53c1a338622809477a5846bc
DIST stone-soup.svg 68546 BLAKE2B 7c66286c9e8a3516e8483b3edb628a59fce29d8d248c3fd5b06e308782bbc651814f21ec958b30c36074a2576ced4bb10f291b5236da6f6e865ce1d7cefdf96d SHA512 dca555271faf704eb8ecdf5ee8a763df42cdeba94e9c163608c438cfc73c6fbf53416547050cad57f477ade191842e701785b65b7a9f18e27ceab05df8f2f75f
-DIST stone_soup-0.20.1.tar.xz 28372712 BLAKE2B c12a76afcaf1691a74f23bc2b2927ac2573cb83c602a50aab1567b9e2077c6f12f0847c8c27f17c45941660ab0fac1c28b2531c176c1fc0d4e946b84456d4e75 SHA512 420ccc3c66977da8ae15f9c0465b01a6260ad5db450efced3041455674922e714d9aaed226e1bc32fa3c22bca1ec06bd91979a9378c6ab08fbe1d2bfc3f0da4a
-DIST stone_soup-0.21.1.tar.xz 29091300 BLAKE2B 0ce29554483eb244eb74ef08c3e2a7d253037cec141e90fba0bf5f59eebb30dad0668c997eba0d6ea12a354d515fe770cc7fcf6a2afb8c968a09cb9a337bcde4 SHA512 1fa50e5b434391b6f3abad62931318f28dd2af3d3148a72c1f2ff80142f3ce9128b8fe6e5b8fbcc502a3d7e79b777bd9f345f8cca06d7e3dbe7575a42f8bd9e7
DIST stone_soup-0.22.0.tar.xz 29263688 BLAKE2B e0a4d6953677583fafe1fce037d4d484c821b4d8782c63fa90b6b4f5db3df7b8fd4c5e843740517a7c2321f864df2a346fcd9bc69a1446c74685afc239d1fc55 SHA512 e8daa0f66a5212b116ce997b30b8f0f9ef01cef7e1213a1b6fe17c800d44fa7e318624902ce638dee79027ffaa3a4af8a10f6552de756a2045b5919d817498bd
+DIST stone_soup-0.23.0.tar.xz 29899848 BLAKE2B 138f3c9fe1ad395d05d0654ea42788c6312e92839c6b92edfa538123b8b566f62d263862b05c6da64d589938c820b876e12475b0eeb16af7dd2e3f62c441eecb SHA512 6b53b5d670130aac451d09fe842e7654f61c131d126b34ed729d4542e9d2cbe2beaa6cd5f0b2bb78744ae6c643040996e39db8b0b3840c8946e442aaff54ff58
diff --git a/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch b/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch
deleted file mode 100644
index 010c729b92eb..000000000000
--- a/games-roguelike/stone-soup/files/stone-soup-0.20.1-rltiles-ldflags-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/rltiles/Makefile
-+++ b/rltiles/Makefile
-@@ -1,7 +1,7 @@
- uname_S := $(shell uname -s)
-
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lmingw32
-+LIBS += -lmingw32
- endif
-
- # Note: since generation of tiles is done on the host, we don't care about
-@@ -29,7 +29,7 @@
- endif
-
- CFLAGS += $(PNG_INCLUDE)
-- LDFLAGS += $(PNG_LIB)
-+ LIBS += $(PNG_LIB)
-
- CFLAGS += -DUSE_TILE
- endif
-@@ -39,13 +39,13 @@
- endif
-
- ifneq (,$(findstring MINGW,$(uname_S)))
--LDFLAGS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
-+LIBS += -lgdi32 -lwinmm -lole32 -loleaut32 -limm32 -lshell32 -lversion -luuid
- endif
- ifeq ($(uname_S),Darwin)
--LDFLAGS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
-+LIBS += -framework AppKit -framework AudioUnit -framework CoreAudio -framework ForceFeedback -framework Carbon -framework IOKit -framework OpenGL
- endif
- ifeq ($(uname_S),Linux)
--LDFLAGS += -ldl -lpthread
-+LIBS += -ldl -lpthread
- endif
-
- # Attempt to use a full compiler name, to make
-@@ -134,6 +134,6 @@
- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@
-
- $(TILEGEN): $(OBJECTS)
-- $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS)
-+ $(QUIET_HOSTLINK)$(HOSTCXX) $(CFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS)
-
- .PHONY: all clean distclean
diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index 68e84b34cc48..ec38a399560c 100644
--- a/games-roguelike/stone-soup/metadata.xml
+++ b/games-roguelike/stone-soup/metadata.xml
@@ -1,6 +1,10 @@
+
+ stasibear@gentoo.org
+ Erik Mackdanz
+
games@gentoo.org
Gentoo Games Project
diff --git a/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild
deleted file mode 100644
index 3b31a1d1f7c0..000000000000
--- a/games-roguelike/stone-soup/stone-soup-0.20.1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-## TODO
-# add sound support (no sound files)
-
-EAPI=6
-VIRTUALX_REQUIRED="manual"
-inherit eutils gnome2-utils toolchain-funcs versionator
-
-MY_P="stone_soup-${PV}"
-DESCRIPTION="Role-playing roguelike game of exploration and treasure-hunting in dungeons"
-HOMEPAGE="http://crawl.develz.org/wordpress/"
-SRC_URI="
- https://crawl.develz.org/release/$(get_version_component_range 1-2)/${PN/-/_}-${PV}.tar.xz
- https://dev.gentoo.org/~hasufell/distfiles/${PN}.png
- https://dev.gentoo.org/~hasufell/distfiles/${PN}.svg
-"
-
-# 3-clause BSD: mt19937ar.cc, MSVC/stdint.h
-# 2-clause BSD: all contributions by Steve Noonan and Jesse Luehrs
-# Public Domain|CC0: most of tiles
-# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
-LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug luajit ncurses test +tiles"
-# test is broken
-# see https://crawl.develz.org/mantis/view.php?id=6121
-RESTRICT="test"
-
-RDEPEND="
- dev-db/sqlite:3
- luajit? ( >=dev-lang/luajit-2.0.0 )
- sys-libs/zlib
- !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) )
- ncurses? ( sys-libs/ncurses:0 )
- tiles? (
- media-fonts/dejavu
- media-libs/freetype:2
- media-libs/libpng:0
- media-libs/libsdl2[X,opengl,video]
- media-libs/sdl2-image[png]
- virtual/glu
- virtual/opengl
- )"
-DEPEND="${RDEPEND}
- dev-lang/perl
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc
- tiles? (
- sys-libs/ncurses:0
- )"
-
-S=${WORKDIR}/${MY_P}/source
-S_TEST=${WORKDIR}/${MY_P}_test/source
-PATCHES=(
- "${FILESDIR}"/${PN}-0.20.1-rltiles-ldflags-libs.patch
-)
-
-pkg_setup() {
- if use !ncurses && use !tiles ; then
- ewarn "Neither ncurses nor tiles frontend"
- ewarn "selected, choosing ncurses only."
- ewarn "Note that you can also enable both."
- fi
-}
-
-src_prepare() {
- default
-
- rm -r contrib/{fonts,freetype,libpng,pcre,sdl2,sdl2-image,sdl2-mixer,sqlite,zlib} || die
-}
-
-src_compile() {
- export HOSTCXX=$(tc-getBUILD_CXX)
-
- # leave DATADIR at the top
- myemakeargs=(
- $(usex debug "FULLDEBUG=y DEBUG=y" "")
- $(usex luajit "" "BUILD_LUA=yes") # luajit is not bundled
- AR="$(tc-getAR)"
- CFOPTIMIZE=''
- CFOTHERS="${CXXFLAGS}"
- DATADIR="/usr/share/${PN}"
- GCC="$(tc-getCC)"
- GXX="$(tc-getCXX)"
- LDFLAGS="${LDFLAGS}"
- MAKEOPTS="${MAKEOPTS}"
- PKGCONFIG="$(tc-getPKG_CONFIG)"
- RANLIB="$(tc-getRANLIB)"
- SAVEDIR="~/.crawl"
- STRIP=touch
- USE_LUAJIT=$(usex luajit "yes" "")
- V=1
- prefix="/usr"
- )
-
- if use ncurses || (use !ncurses && use !tiles) ; then
- emake "${myemakeargs[@]}"
- # move it in case we build both variants
- use tiles && { mv crawl "${WORKDIR}"/crawl-ncurses || die ;}
- fi
-
- if use tiles ; then
- emake clean
- emake "${myemakeargs[@]}" "TILES=y"
- fi
-}
-
-src_install() {
- emake "${myemakeargs[@]}" $(usex tiles "TILES=y" "") DESTDIR="${D}" prefix_fp="" bin_prefix="${D}/usr/bin" install
- [[ -e "${WORKDIR}"/crawl-ncurses ]] && dobin "${WORKDIR}"/crawl-ncurses
-
- # don't relocate docs, needed at runtime
- rm -rf "${D}/usr/share/${PN}"/docs/license
-
- # icons and menu for graphical build
- if use tiles ; then
- doicon -s 48 "${DISTDIR}"/${PN}.png
- doicon -s scalable "${DISTDIR}"/${PN}.svg
- make_desktop_entry crawl
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-
- if use tiles && use ncurses ; then
- elog "Since you have enabled both tiles and ncurses frontends"
- elog "the ncurses binary is called 'crawl-ncurses' and the"
- elog "tiles binary is called 'crawl'."
- fi
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild b/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
index 14ea7d7dbe86..742c2c56bd9e 100644
--- a/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
## TODO
@@ -23,7 +23,7 @@ SRC_URI="
# MIT: json.cc/json.h, some .js files in webserver/static/scripts/contrib/
LICENSE="GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="debug luajit ncurses test +tiles"
# test is broken
# see https://crawl.develz.org/mantis/view.php?id=6121
diff --git a/games-roguelike/stone-soup/stone-soup-0.21.1.ebuild b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
similarity index 98%
rename from games-roguelike/stone-soup/stone-soup-0.21.1.ebuild
rename to games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
index 14ea7d7dbe86..876c7001d735 100644
--- a/games-roguelike/stone-soup/stone-soup-0.21.1.ebuild
+++ b/games-roguelike/stone-soup/stone-soup-0.23.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
## TODO
diff --git a/games-roguelike/tomenet/Manifest b/games-roguelike/tomenet/Manifest
index e83e3a90b422..cb2a3a967138 100644
--- a/games-roguelike/tomenet/Manifest
+++ b/games-roguelike/tomenet/Manifest
@@ -1 +1,2 @@
DIST tomenet-4.6.1a.tar.bz2 2990275 BLAKE2B 40d855e4f9e908a8802bba8fd95fcb8c69df026bdc9b891e14a79691e80f7caab48e7826066a761101d932116542d42240457d85998278f8a928dd64ed1ac522 SHA512 eb89cd2276a18947d55efcc745e0b0abc0d9ae8a8d922a4726632657f32657e762bd0530d721afcf9d4ab3eeed2da6e43a3822d1d8c2c3b630fdb4cde924ac9f
+DIST tomenet-4.7.2.tar.bz2 3253873 BLAKE2B 4cba4827a64588c850691ae3b5c7ad0097a322ab1baca42492cbe42bc1e76615fb0084b7b8608e20adf303bded42a9cb80c4d09d0a29f1f68699ffa8e04240bb SHA512 284aa71374b726fd86bfa6b0d820301ec7e5004ddb140a1567c54c883c138cabd2ac55085c222aa057b234dc822f717489128b857ed527fff7d702092bdb51d5
diff --git a/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch b/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch
new file mode 100644
index 000000000000..1b89c2bc987d
--- /dev/null
+++ b/games-roguelike/tomenet/files/tomenet-4.7.2-makefile.patch
@@ -0,0 +1,65 @@
+diff --git a/makefile b/makefile
+index ee56a33..7f3c81f 100644
+--- a/makefile
++++ b/makefile
+@@ -203,7 +203,7 @@ CLI_LUAOBJS = \
+ #
+ # This is my compiler of choice, it seems to work most everywhere
+ #
+-CC = gcc
++CC ?= gcc
+
+ # For allowing #if..#else..#endif constructs in LUA files - C. Blue
+ # Note: The flags must contain
+@@ -215,16 +215,26 @@ CC = gcc
+ # need to use the gcc invocation below instead.
+ #
+ # cpp variant:
+-CPP = cpp
+-CPPFLAGS = -C -P
++#CPP = cpp
++#CPPFLAGS = -C -P
+ # gcc variant:
+-#CPP = gcc
+-#CPPFLAGS = -x c -E -Wp,-C,-P
++CPP ?= gcc
++CPPFLAGS = -x c -E -Wp,-C,-P
+
+
+ # For variations with X11
+ X11BASE = /usr/X11R6
+
++# defines
++ifdef USE_SDL
++CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags)
++SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
++endif
++
++ifdef USE_X
++CFLAGS += -I${X11BASE}/include -DUSE_X11
++LIBS += -L${X11BASE}/lib -lX11
++endif
+
+ ##
+ ## Standard version -- supports X11 (main-x11.c)
+@@ -236,6 +246,11 @@ X11BASE = /usr/X11R6
+ ## With SDL
+ #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags`
+ #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm `sdl-config --libs` -lSDL_mixer
++
++CFLAGS += -Wall
++CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
++LIBS += -L/usr/pkg/lib $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS}
++
+ ##
+ ## Without SDL
+ #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
+@@ -259,7 +274,7 @@ X11BASE = /usr/X11R6
+ #CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 -fPIC
+ CFLAGS = -O2 -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32 -fPIC -Wno-format-truncation
+ #LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
+-LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
++LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm $(shell sdl-config --libs) -lSDL_mixer
+ ACCEDIT_LIBS = -lcurses -lcrypt
+ ##
+ ## Without SDL
diff --git a/games-roguelike/tomenet/files/tomenet-wrapper b/games-roguelike/tomenet/files/tomenet-wrapper
index 2ca29b862176..71abcb79cf25 100644
--- a/games-roguelike/tomenet/files/tomenet-wrapper
+++ b/games-roguelike/tomenet/files/tomenet-wrapper
@@ -1,11 +1,11 @@
#!/bin/sh
-if [ ! -e ~/.tomenet/.gentoo ]; then
+if [ ! -e ~/.tomenet/.gentoo ] || [ ! -e ~/.tomenet/game ] || [ ! -e ~/.tomenet/text ] ; then
LIBDIR="@LIBDIR@"
[ -e ~/.tomenet ] || mkdir ~/.tomenet
- ln -s "${LIBDIR}"/game ~/.tomenet/game
- ln -s "${LIBDIR}"/text ~/.tomenet/text
+ [ -e ~/.tomenet/game ] || ln -sf "${LIBDIR}"/game ~/.tomenet/game
+ [ -e ~/.tomenet/text ] || ln -sf "${LIBDIR}"/text ~/.tomenet/text
cp -R "${LIBDIR}"/user "${LIBDIR}"/scpt "${LIBDIR}"/xtra ~/.tomenet/
[ -e ~/.tomenetrc ] || cp "${LIBDIR}"/.tomenetrc ~/.tomenetrc
diff --git a/games-roguelike/tomenet/tomenet-4.7.2.ebuild b/games-roguelike/tomenet/tomenet-4.7.2.ebuild
new file mode 100644
index 000000000000..5da772d9c22c
--- /dev/null
+++ b/games-roguelike/tomenet/tomenet-4.7.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils gnome2-utils toolchain-funcs
+
+DESCRIPTION="A MMORPG based on the works of J.R.R. Tolkien"
+HOMEPAGE="https://www.tomenet.eu"
+SRC_URI="https://www.tomenet.eu/downloads/${P}.tar.bz2"
+
+LICENSE="Moria"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dedicated server +sound X"
+
+RDEPEND="sys-libs/ncurses:0
+ !dedicated? (
+ X? (
+ x11-libs/libX11
+ )
+ sound? (
+ media-libs/libsdl[sound]
+ media-libs/sdl-mixer[vorbis,smpeg,mp3]
+ )
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ !dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) )"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=(
+ "${FILESDIR}"/${P}-makefile.patch
+)
+
+src_prepare() {
+ default
+ use server || use dedicated || { rm -r ../lib/{config,data,save} || die ;}
+
+ sed \
+ -e "s#@LIBDIR@#/usr/share/${PN}#" \
+ "${FILESDIR}"/${PN}-wrapper > "${T}"/${PN} || die
+
+ if use server || use dedicated ; then
+ sed \
+ -e "s#@LIBDIR@#/usr/share/${PN}#" \
+ "${FILESDIR}"/${PN}-server-wrapper > "${T}"/${PN}.server || die
+ fi
+
+ tc-export PKG_CONFIG
+}
+
+src_compile() {
+ local mytargets="$(usex dedicated "accedit tomenet.server" "$(usex server "all" "tomenet")")"
+ emake \
+ $(usex dedicated "" "$(usex X "USE_X=1" "")") \
+ $(usex dedicated "" "$(usex sound "USE_SDL=1" "")") \
+ -f makefile \
+ ${mytargets[@]}
+}
+
+src_install() {
+ dodoc ../TomeNET-Guide.txt
+
+ if ! use dedicated ; then
+ newbin ${PN} ${PN}.bin
+ dobin "${T}"/${PN}
+
+ doicon -s 48 client/tomenet4.png
+ make_desktop_entry ${PN} ${PN} ${PN}4
+ fi
+
+ if use server || use dedicated ; then
+ newbin tomenet.server tomenet.server.bin
+ dobin "${T}"/${PN}.server accedit
+ fi
+
+ insinto "/usr/share/${PN}"
+ doins -r ../lib/*
+ doins ../.tomenetrc
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+
+ if use sound; then
+ elog "You can get soundpacks from here:"
+ elog ' https://tomenet.net/downloads.php'
+ elog "They must be placed inside ~/.tomenet directory."
+ fi
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 59520b086824..9cbdb6324e8a 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/cjs/cjs-4.0.0-r1.ebuild b/gnome-extra/cjs/cjs-4.0.0-r1.ebuild
new file mode 100644
index 000000000000..a570b3b3d468
--- /dev/null
+++ b/gnome-extra/cjs/cjs-4.0.0-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools gnome2 pax-utils virtualx
+
+DESCRIPTION="Linux Mint's fork of gjs for Cinnamon"
+HOMEPAGE="http://cinnamon.linuxmint.com/"
+SRC_URI="https://github.com/linuxmint/cjs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )"
+SLOT="0"
+IUSE="+cairo examples gtk test"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ dev-lang/spidermonkey:52
+ >=dev-libs/glib-2.37.3:2
+ >=dev-libs/gobject-introspection-1.38:=
+ sys-libs/readline:0=
+ virtual/libffi
+ cairo? ( x11-libs/cairo[X,glib] )
+ gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="${RDEPEND}
+ gnome-base/gnome-common
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? ( sys-apps/dbus )
+ sys-devel/autoconf-archive
+"
+# Cinnamon 2.2 does not work with this release.
+RDEPEND="${RDEPEND}
+ !=net-misc/curl-7.9.7
- )
- bogofilter? ( mail-filter/bogofilter )
- calendar? (
- >=dev-libs/libical-2.0.0:=
- >=net-misc/curl-7.9.7
- )
- dbus? ( >=dev-libs/dbus-glib-0.60 )
- gdata? ( >=dev-libs/libgdata-0.17.2 )
- gnutls? ( >=net-libs/gnutls-3.0 )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( >=x11-libs/gtk+-2.20:2 )
- imap? ( >=net-libs/libetpan-0.57 )
- ldap? ( >=net-nds/openldap-2.0.7 )
- nls? ( >=sys-devel/gettext-0.18 )
- nntp? ( >=net-libs/libetpan-0.57 )
- notification? (
- dev-libs/glib:2
- libcanberra? ( media-libs/libcanberra[gtk] )
- libindicate? ( dev-libs/libindicate:3[gtk] )
- libnotify? ( x11-libs/libnotify )
- )
- pda? ( >=app-pda/jpilot-0.99 )
- pdf? ( app-text/poppler[cairo] )
- pgp? ( >=app-crypt/gpgme-1.0.0 )
- session? (
- x11-libs/libICE
- x11-libs/libSM
- )
- smime? ( >=app-crypt/gpgme-1.0.0 )
- spam-report? ( >=net-misc/curl-7.9.7 )
- spell? ( >=app-text/enchant-1.0.0 )
- startup-notification? ( x11-libs/startup-notification )
- svg? ( >=gnome-base/librsvg-2.40.5 )
- valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${COMMONDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig
- xface? ( >=media-libs/compface-1.4 )"
-
-RDEPEND="${COMMONDEPEND}
- app-misc/mime-types
- x11-misc/shared-mime-info
- clamav? ( app-antivirus/clamav )
- networkmanager? ( net-misc/networkmanager )
- pdf? ( app-text/ghostscript-gpl )
- perl? ( dev-lang/perl:= )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygtk-2.10.3
- )
- rss? (
- dev-libs/libxml2
- net-misc/curl
- )"
-
-PATCHES=(
- "${FILESDIR}/${P}-old_profile_segfault.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # Don't use libsoup-gnome (bug #565924)
- export HAVE_LIBSOUP_GNOME=no
-
- local myeconfargs=(
- --disable-bsfilter-plugin
- --disable-fancy-plugin
- --disable-generic-umpc
- --enable-acpi_notifier-plugin
- --enable-address_keeper-plugin
- --enable-alternate-addressbook
- --enable-att_remover-plugin
- --enable-attachwarner-plugin
- --enable-fetchinfo-plugin
- --enable-mailmbox-plugin
- --enable-newmail-plugin
- --enable-tnef_parse-plugin
- --with-password-encryption=$(usex gnutls gnutls old)
- $(use_enable archive archive-plugin)
- $(use_enable bogofilter bogofilter-plugin)
- $(use_enable calendar vcalendar-plugin)
- $(use_enable clamav clamd-plugin)
- $(use_enable dbus)
- $(use_enable debug crash-dialog)
- $(use_enable doc manual)
- $(use_enable gdata gdata-plugin)
- $(use_enable gnutls)
- $(use_enable gtk3)
- $(use_enable ipv6)
- $(use_enable ldap)
- $(use_enable networkmanager)
- $(use_enable nls)
- $(use_enable notification notification-plugin)
- $(use_enable pda jpilot)
- $(use_enable pdf pdf_viewer-plugin)
- $(use_enable perl perl-plugin)
- $(use_enable pgp pgpcore-plugin)
- $(use_enable pgp pgpinline-plugin)
- $(use_enable pgp pgpmime-plugin)
- $(use_enable python python-plugin)
- $(use_enable rss rssyl-plugin)
- $(use_enable session libsm)
- $(use_enable sieve managesieve-plugin)
- $(use_enable smime smime-plugin)
- $(use_enable spam-report spam_report-plugin)
- $(use_enable spamassassin spamassassin-plugin)
- $(use_enable spell enchant)
- $(use_enable startup-notification)
- $(use_enable svg)
- $(use_enable valgrind valgrind)
- $(use_enable xface compface)
- )
-
- # libetpan is needed if user wants nntp or imap functionality
- if use imap || use nntp ; then
- myeconfargs+=( --enable-libetpan )
- else
- myeconfargs+=( --disable-libetpan )
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
- default
-
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
- # => also install it in /usr/share/pixmaps for other desktop envs
- # => also install higher resolution icons in /usr/share/icons/hicolor/...
- insinto /usr/share/pixmaps
- doins ${PN}.png
- local size
- for size in 64 128 ; do
- newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
- done
-
- docinto tools
- dodoc tools/README*
-
- domenu ${PN}.desktop
-
- einfo "Installing extra tools"
- cd "${S}"/tools
- exeinto /usr/$(get_libdir)/${PN}/tools
- doexe *.pl *.py *.conf *.sh
- doexe tb2claws-mail update-po uudec uuooffice
-
- # kill useless files
- rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
- ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
- ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
- ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/mail-client/claws-mail/claws-mail-3.15.1.ebuild b/mail-client/claws-mail/claws-mail-3.15.1.ebuild
deleted file mode 100644
index 2392454c221e..000000000000
--- a/mail-client/claws-mail/claws-mail-3.15.1.ebuild
+++ /dev/null
@@ -1,205 +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 autotools gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/"
-
-SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
-REQUIRED_USE="libcanberra? ( notification )
- libindicate? ( notification )
- libnotify? ( notification )
- networkmanager? ( dbus )
- python? ( ${PYTHON_REQUIRED_USE} )
- smime? ( pgp )"
-
-COMMONDEPEND="
- net-mail/ytnef
- archive? (
- app-arch/libarchive
- >=net-misc/curl-7.9.7
- )
- bogofilter? ( mail-filter/bogofilter )
- calendar? (
- >=dev-libs/libical-2.0.0:=
- >=net-misc/curl-7.9.7
- )
- dbus? ( >=dev-libs/dbus-glib-0.60 )
- gdata? ( >=dev-libs/libgdata-0.17.2 )
- gnutls? ( >=net-libs/gnutls-3.0 )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( >=x11-libs/gtk+-2.20:2 )
- imap? ( >=net-libs/libetpan-0.57 )
- ldap? ( >=net-nds/openldap-2.0.7 )
- nls? ( >=sys-devel/gettext-0.18 )
- nntp? ( >=net-libs/libetpan-0.57 )
- notification? (
- dev-libs/glib:2
- libcanberra? ( media-libs/libcanberra[gtk] )
- libindicate? ( dev-libs/libindicate:3[gtk] )
- libnotify? ( x11-libs/libnotify )
- )
- pda? ( >=app-pda/jpilot-0.99 )
- pdf? ( app-text/poppler[cairo] )
- pgp? ( >=app-crypt/gpgme-1.0.0 )
- session? (
- x11-libs/libICE
- x11-libs/libSM
- )
- smime? ( >=app-crypt/gpgme-1.0.0 )
- spam-report? ( >=net-misc/curl-7.9.7 )
- spell? ( >=app-text/enchant-1.0.0 )
- startup-notification? ( x11-libs/startup-notification )
- svg? ( >=gnome-base/librsvg-2.40.5 )
- valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${COMMONDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig
- xface? ( >=media-libs/compface-1.4 )"
-
-RDEPEND="${COMMONDEPEND}
- app-misc/mime-types
- x11-misc/shared-mime-info
- clamav? ( app-antivirus/clamav )
- networkmanager? ( net-misc/networkmanager )
- pdf? ( app-text/ghostscript-gpl )
- perl? ( dev-lang/perl:= )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygtk-2.10.3
- )
- rss? (
- dev-libs/libxml2
- net-misc/curl
- )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # Don't use libsoup-gnome (bug #565924)
- export HAVE_LIBSOUP_GNOME=no
-
- local myeconfargs=(
- --disable-bsfilter-plugin
- --disable-fancy-plugin
- --disable-generic-umpc
- --enable-acpi_notifier-plugin
- --enable-address_keeper-plugin
- --enable-alternate-addressbook
- --enable-att_remover-plugin
- --enable-attachwarner-plugin
- --enable-fetchinfo-plugin
- --enable-mailmbox-plugin
- --enable-newmail-plugin
- --enable-tnef_parse-plugin
- --with-password-encryption=$(usex gnutls gnutls old)
- $(use_enable archive archive-plugin)
- $(use_enable bogofilter bogofilter-plugin)
- $(use_enable calendar vcalendar-plugin)
- $(use_enable clamav clamd-plugin)
- $(use_enable dbus)
- $(use_enable debug crash-dialog)
- $(use_enable doc manual)
- $(use_enable gdata gdata-plugin)
- $(use_enable gnutls)
- $(use_enable gtk3)
- $(use_enable ipv6)
- $(use_enable ldap)
- $(use_enable networkmanager)
- $(use_enable nls)
- $(use_enable notification notification-plugin)
- $(use_enable pda jpilot)
- $(use_enable pdf pdf_viewer-plugin)
- $(use_enable perl perl-plugin)
- $(use_enable pgp pgpcore-plugin)
- $(use_enable pgp pgpinline-plugin)
- $(use_enable pgp pgpmime-plugin)
- $(use_enable python python-plugin)
- $(use_enable rss rssyl-plugin)
- $(use_enable session libsm)
- $(use_enable sieve managesieve-plugin)
- $(use_enable smime smime-plugin)
- $(use_enable spam-report spam_report-plugin)
- $(use_enable spamassassin spamassassin-plugin)
- $(use_enable spell enchant)
- $(use_enable startup-notification)
- $(use_enable svg)
- $(use_enable valgrind valgrind)
- $(use_enable xface compface)
- )
-
- # libetpan is needed if user wants nntp or imap functionality
- if use imap || use nntp ; then
- myeconfargs+=( --enable-libetpan )
- else
- myeconfargs+=( --disable-libetpan )
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
- default
-
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
- # => also install it in /usr/share/pixmaps for other desktop envs
- # => also install higher resolution icons in /usr/share/icons/hicolor/...
- insinto /usr/share/pixmaps
- doins ${PN}.png
- local size
- for size in 64 128 ; do
- newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
- done
-
- docinto tools
- dodoc tools/README*
-
- domenu ${PN}.desktop
-
- einfo "Installing extra tools"
- cd "${S}"/tools
- exeinto /usr/$(get_libdir)/${PN}/tools
- doexe *.pl *.py *.conf *.sh
- doexe tb2claws-mail update-po uudec uuooffice
-
- # kill useless files
- rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
- ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
- ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
- ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/mail-client/claws-mail/claws-mail-3.16.0.ebuild b/mail-client/claws-mail/claws-mail-3.16.0.ebuild
deleted file mode 100644
index cc00879ebd7a..000000000000
--- a/mail-client/claws-mail/claws-mail-3.16.0.ebuild
+++ /dev/null
@@ -1,205 +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 autotools gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/"
-
-SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
-REQUIRED_USE="libcanberra? ( notification )
- libindicate? ( notification )
- libnotify? ( notification )
- networkmanager? ( dbus )
- python? ( ${PYTHON_REQUIRED_USE} )
- smime? ( pgp )"
-
-COMMONDEPEND="
- net-mail/ytnef
- archive? (
- app-arch/libarchive
- >=net-misc/curl-7.9.7
- )
- bogofilter? ( mail-filter/bogofilter )
- calendar? (
- >=dev-libs/libical-2.0.0:=
- >=net-misc/curl-7.9.7
- )
- dbus? ( >=dev-libs/dbus-glib-0.60 )
- gdata? ( >=dev-libs/libgdata-0.17.2 )
- gnutls? ( >=net-libs/gnutls-3.0 )
- gtk3? ( x11-libs/gtk+:3 )
- !gtk3? ( >=x11-libs/gtk+-2.20:2 )
- imap? ( >=net-libs/libetpan-0.57 )
- ldap? ( >=net-nds/openldap-2.0.7 )
- nls? ( >=sys-devel/gettext-0.18 )
- nntp? ( >=net-libs/libetpan-0.57 )
- notification? (
- dev-libs/glib:2
- libcanberra? ( media-libs/libcanberra[gtk] )
- libindicate? ( dev-libs/libindicate:3[gtk] )
- libnotify? ( x11-libs/libnotify )
- )
- pda? ( >=app-pda/jpilot-0.99 )
- pdf? ( app-text/poppler[cairo] )
- pgp? ( >=app-crypt/gpgme-1.0.0 )
- session? (
- x11-libs/libICE
- x11-libs/libSM
- )
- smime? ( >=app-crypt/gpgme-1.0.0 )
- spam-report? ( >=net-misc/curl-7.9.7 )
- spell? ( >=app-text/enchant-1.0.0 )
- startup-notification? ( x11-libs/startup-notification )
- svg? ( >=gnome-base/librsvg-2.40.5 )
- valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${COMMONDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig
- xface? ( >=media-libs/compface-1.4 )"
-
-RDEPEND="${COMMONDEPEND}
- app-misc/mime-types
- x11-misc/shared-mime-info
- clamav? ( app-antivirus/clamav )
- networkmanager? ( net-misc/networkmanager )
- pdf? ( app-text/ghostscript-gpl )
- perl? ( dev-lang/perl:= )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygtk-2.10.3
- )
- rss? (
- dev-libs/libxml2
- net-misc/curl
- )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # Don't use libsoup-gnome (bug #565924)
- export HAVE_LIBSOUP_GNOME=no
-
- local myeconfargs=(
- --disable-bsfilter-plugin
- --disable-fancy-plugin
- --disable-generic-umpc
- --enable-acpi_notifier-plugin
- --enable-address_keeper-plugin
- --enable-alternate-addressbook
- --enable-att_remover-plugin
- --enable-attachwarner-plugin
- --enable-fetchinfo-plugin
- --enable-mailmbox-plugin
- --enable-newmail-plugin
- --enable-tnef_parse-plugin
- --with-password-encryption=$(usex gnutls gnutls old)
- $(use_enable archive archive-plugin)
- $(use_enable bogofilter bogofilter-plugin)
- $(use_enable calendar vcalendar-plugin)
- $(use_enable clamav clamd-plugin)
- $(use_enable dbus)
- $(use_enable debug crash-dialog)
- $(use_enable doc manual)
- $(use_enable gdata gdata-plugin)
- $(use_enable gnutls)
- $(use_enable gtk3)
- $(use_enable ipv6)
- $(use_enable ldap)
- $(use_enable networkmanager)
- $(use_enable nls)
- $(use_enable notification notification-plugin)
- $(use_enable pda jpilot)
- $(use_enable pdf pdf_viewer-plugin)
- $(use_enable perl perl-plugin)
- $(use_enable pgp pgpcore-plugin)
- $(use_enable pgp pgpinline-plugin)
- $(use_enable pgp pgpmime-plugin)
- $(use_enable python python-plugin)
- $(use_enable rss rssyl-plugin)
- $(use_enable session libsm)
- $(use_enable sieve managesieve-plugin)
- $(use_enable smime smime-plugin)
- $(use_enable spam-report spam_report-plugin)
- $(use_enable spamassassin spamassassin-plugin)
- $(use_enable spell enchant)
- $(use_enable startup-notification)
- $(use_enable svg)
- $(use_enable valgrind valgrind)
- $(use_enable xface compface)
- )
-
- # libetpan is needed if user wants nntp or imap functionality
- if use imap || use nntp ; then
- myeconfargs+=( --enable-libetpan )
- else
- myeconfargs+=( --disable-libetpan )
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
- default
-
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
- # => also install it in /usr/share/pixmaps for other desktop envs
- # => also install higher resolution icons in /usr/share/icons/hicolor/...
- insinto /usr/share/pixmaps
- doins ${PN}.png
- local size
- for size in 64 128 ; do
- newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
- done
-
- docinto tools
- dodoc tools/README*
-
- domenu ${PN}.desktop
-
- einfo "Installing extra tools"
- cd "${S}"/tools
- exeinto /usr/$(get_libdir)/${PN}/tools
- doexe *.pl *.py *.conf *.sh
- doexe tb2claws-mail update-po uudec uuooffice
-
- # kill useless files
- rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
- ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
- ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
- ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely"
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/mail-client/claws-mail/claws-mail-3.17.2.ebuild b/mail-client/claws-mail/claws-mail-3.17.2.ebuild
deleted file mode 100644
index ba540a3ae23f..000000000000
--- a/mail-client/claws-mail/claws-mail-3.17.2.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit autotools gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="An email client (and news reader) based on GTK+"
-HOMEPAGE="https://www.claws-mail.org/"
-
-if [[ "${PV}" == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
-else
- SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-SLOT="0"
-LICENSE="GPL-3"
-
-IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
-REQUIRED_USE="libcanberra? ( notification )
- libindicate? ( notification )
- libnotify? ( notification )
- networkmanager? ( dbus )
- python? ( ${PYTHON_REQUIRED_USE} )
- smime? ( pgp )"
-
-COMMONDEPEND="
- dev-libs/nettle
- net-mail/ytnef
- >=x11-libs/gtk+-2.24:2
- archive? (
- app-arch/libarchive
- >=net-misc/curl-7.9.7
- )
- bogofilter? ( mail-filter/bogofilter )
- calendar? (
- >=dev-libs/libical-2.0.0:=
- >=net-misc/curl-7.9.7
- )
- dbus? ( >=dev-libs/dbus-glib-0.60 )
- gdata? ( >=dev-libs/libgdata-0.17.2 )
- dillo? ( www-client/dillo )
- gnutls? ( >=net-libs/gnutls-3.0 )
- imap? ( >=net-libs/libetpan-0.57 )
- ldap? ( >=net-nds/openldap-2.0.7 )
- nls? ( >=sys-devel/gettext-0.18 )
- nntp? ( >=net-libs/libetpan-0.57 )
- notification? (
- dev-libs/glib:2
- libcanberra? ( media-libs/libcanberra[gtk] )
- libindicate? ( dev-libs/libindicate:3[gtk] )
- libnotify? ( x11-libs/libnotify )
- )
- pda? ( >=app-pda/jpilot-0.99 )
- pdf? ( app-text/poppler[cairo] )
- pgp? ( >=app-crypt/gpgme-1.0.0 )
- session? (
- x11-libs/libICE
- x11-libs/libSM
- )
- smime? ( >=app-crypt/gpgme-1.0.0 )
- spam-report? ( >=net-misc/curl-7.9.7 )
- spell? ( >=app-text/enchant-1.0.0 )
- startup-notification? ( x11-libs/startup-notification )
- svg? ( >=gnome-base/librsvg-2.40.5 )
- valgrind? ( dev-util/valgrind )
-"
-
-DEPEND="${COMMONDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig
- xface? ( >=media-libs/compface-1.4 )"
-
-RDEPEND="${COMMONDEPEND}
- app-misc/mime-types
- x11-misc/shared-mime-info
- clamav? ( app-antivirus/clamav )
- networkmanager? ( net-misc/networkmanager )
- pdf? ( app-text/ghostscript-gpl )
- perl? ( dev-lang/perl:= )
- python? (
- ${PYTHON_DEPS}
- >=dev-python/pygtk-2.10.3
- )
- rss? (
- dev-libs/libxml2
- net-misc/curl
- )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # Don't use libsoup-gnome (bug #565924)
- export HAVE_LIBSOUP_GNOME=no
-
- local myeconfargs=(
- --disable-bsfilter-plugin
- --disable-fancy-plugin
- --disable-generic-umpc
- --enable-acpi_notifier-plugin
- --enable-address_keeper-plugin
- --enable-alternate-addressbook
- --enable-att_remover-plugin
- --enable-attachwarner-plugin
- --enable-fetchinfo-plugin
- --enable-mailmbox-plugin
- --enable-newmail-plugin
- --enable-tnef_parse-plugin
- --with-password-encryption=$(usex gnutls gnutls old)
- $(use_enable archive archive-plugin)
- $(use_enable bogofilter bogofilter-plugin)
- $(use_enable calendar vcalendar-plugin)
- $(use_enable clamav clamd-plugin)
- $(use_enable dbus)
- $(use_enable debug crash-dialog)
- $(use_enable dillo dillo-plugin)
- $(use_enable doc manual)
- $(use_enable gdata gdata-plugin)
- $(use_enable gnutls)
- $(use_enable ipv6)
- $(use_enable ldap)
- $(use_enable networkmanager)
- $(use_enable nls)
- $(use_enable notification notification-plugin)
- $(use_enable pda jpilot)
- $(use_enable pdf pdf_viewer-plugin)
- $(use_enable perl perl-plugin)
- $(use_enable pgp pgpcore-plugin)
- $(use_enable pgp pgpinline-plugin)
- $(use_enable pgp pgpmime-plugin)
- $(use_enable python python-plugin)
- $(use_enable rss rssyl-plugin)
- $(use_enable session libsm)
- $(use_enable sieve managesieve-plugin)
- $(use_enable smime smime-plugin)
- $(use_enable spam-report spam_report-plugin)
- $(use_enable spamassassin spamassassin-plugin)
- $(use_enable spell enchant)
- $(use_enable startup-notification)
- $(use_enable svg)
- $(use_enable valgrind valgrind)
- $(use_enable xface compface)
- )
-
- # libetpan is needed if user wants nntp or imap functionality
- if use imap || use nntp ; then
- myeconfargs+=( --enable-libetpan )
- else
- myeconfargs+=( --disable-libetpan )
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_install() {
- local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
- default
-
- # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
- # => also install it in /usr/share/pixmaps for other desktop envs
- # => also install higher resolution icons in /usr/share/icons/hicolor/...
- insinto /usr/share/pixmaps
- doins ${PN}.png
- local size
- for size in 64 128 ; do
- newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
- done
-
- docinto tools
- dodoc tools/README*
-
- domenu ${PN}.desktop
-
- einfo "Installing extra tools"
- cd "${S}"/tools || die
- exeinto /usr/$(get_libdir)/${PN}/tools
- doexe *.pl *.py *.conf *.sh
- doexe tb2claws-mail update-po uudec uuooffice
-
- # kill useless files
- rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la}
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
- ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
- ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
- ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely"
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
diff --git a/mail-client/claws-mail/claws-mail-3.17.3.ebuild b/mail-client/claws-mail/claws-mail-3.17.3.ebuild
index 0c05462d0814..fcf7a62de7dd 100644
--- a/mail-client/claws-mail/claws-mail-3.17.3.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.3.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
else
SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
- KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
fi
SLOT="0"
diff --git a/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch b/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch
deleted file mode 100644
index b19bf8f39d67..000000000000
--- a/mail-client/claws-mail/files/claws-mail-3.15.0-old_profile_segfault.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Ricardo Mones
-Date: Wed, 9 Aug 2017 14:48:38 +0000 (+0200)
-Subject: Fix bug #3855: segfault at startup with old profile and IMAP account
-X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=667c9d3eaf0487193cc7873e6d3a63959a03d7f9;hp=63677adb68c57479f6bc7534cfbf2f234b1f4fb1
-
-Fix bug #3855: segfault at startup with old profile and IMAP account
-
-Revert "Remove duplicated code and include".
-
-This reverts commit 300f811f3bbf10455ca55d9b01da6705dd1e07bb.
----
-
-diff --git a/src/imap.c b/src/imap.c
-index 0e1e777..25bb283 100644
---- a/src/imap.c
-+++ b/src/imap.c
-@@ -77,6 +77,8 @@ typedef struct _IMAPSession IMAPSession;
- typedef struct _IMAPNameSpace IMAPNameSpace;
- typedef struct _IMAPFolderItem IMAPFolderItem;
-
-+#include "prefs_account.h"
-+
- #define IMAP_FOLDER(obj) ((IMAPFolder *)obj)
- #define IMAP_FOLDER_ITEM(obj) ((IMAPFolderItem *)obj)
- #define IMAP_SESSION(obj) ((IMAPSession *)obj)
-@@ -425,6 +427,7 @@ static gint imap_get_flags (Folder *folder,
- FolderItem *item,
- MsgInfoList *msglist,
- GHashTable *msgflags);
-+static gchar *imap_folder_get_path (Folder *folder);
- static gchar *imap_item_get_path (Folder *folder,
- FolderItem *item);
- static MsgInfo *imap_parse_msg(const gchar *file, FolderItem *item);
-@@ -3042,6 +3045,35 @@ static FolderItem *imap_create_special_folder(Folder *folder,
- return new_item;
- }
-
-+static gchar *imap_folder_get_path(Folder *folder)
-+{
-+ gchar *folder_path;
-+
-+ g_return_val_if_fail(folder != NULL, NULL);
-+ g_return_val_if_fail(folder->account != NULL, NULL);
-+
-+#ifdef G_OS_WIN32
-+ gchar *sanitized_dirname = g_strdup(folder->account->recv_server);
-+ g_strdelimit(sanitized_dirname, ":", ',');
-+#endif
-+
-+ folder_path = g_strconcat(get_imap_cache_dir(),
-+ G_DIR_SEPARATOR_S,
-+#ifdef G_OS_WIN32
-+ sanitized_dirname,
-+#else
-+ folder->account->recv_server,
-+#endif
-+ G_DIR_SEPARATOR_S,
-+ folder->account->userid,
-+ NULL);
-+
-+#ifdef G_OS_WIN32
-+ g_free(sanitized_dirname);
-+#endif
-+ return folder_path;
-+}
-+
- #ifdef G_OS_WIN32
- static gchar *imap_encode_unsafe_chars(const gchar *str)
- {
-@@ -3078,9 +3110,8 @@ static gchar *imap_item_get_path(Folder *folder, FolderItem *item)
- gchar *item_path = NULL;
-
- g_return_val_if_fail(folder != NULL, NULL);
-- g_return_val_if_fail(folder->account != NULL, NULL);
- g_return_val_if_fail(item != NULL, NULL);
-- folder_path = prefs_account_cache_dir(folder->account, FALSE);
-+ folder_path = imap_folder_get_path(folder);
-
- g_return_val_if_fail(folder_path != NULL, NULL);
-
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 1fc13553c429..3f6eb5186feb 100644
Binary files a/mail-filter/Manifest.gz and b/mail-filter/Manifest.gz differ
diff --git a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
index 7d73c8a4fa91..82b6f097433a 100644
--- a/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
+++ b/mail-filter/amavisd-new/amavisd-new-2.11.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/-/archive/${P}/amavis-${P}.tar.gz"
LICENSE="GPL-2 BSD-2"
SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 sparc x86"
IUSE="clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq"
DEPEND=">=sys-apps/sed-4
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 2734ee332ed5..548bf9cb46d2 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest
index 6b5fce29bccb..7a1c803da895 100644
--- a/media-gfx/sxiv/Manifest
+++ b/media-gfx/sxiv/Manifest
@@ -1 +1,2 @@
DIST sxiv-24.tar.gz 47148 BLAKE2B 69d70d64ea6cf6ae7a044d06df78a2e1e53941ef281d6445f54a28c4368112674461bc4e71a0226946588e604de33dd0972960cb072a00efd64512e5273cef09 SHA512 e4c9d4e18b4f1999b6441256b4c0d4683a105f1f64d4f754d6f9bc4f467ee1ccc6b6996cec8a210276c5fbec59417627fb838cb4f7be37cce32fa2c5d45d347b
+DIST sxiv-25.tar.gz 48814 BLAKE2B 17ef2ff0e75acd6acce068dfc17dfbce78bb1a38b652e948b5f88902adcbae504e9322c92d125b71c511a95c7e8e47b58060ff58e2c804a7296b5a801d3fc0e8 SHA512 ca0d834c9982c5e98c0bae51d21b7d08692af2d692eeb2ac55e19c4da7d09b16bbaa8022af0a0d00c52def4120058d895f37a2f8b14f453a0ceb65eebe564814
diff --git a/media-gfx/sxiv/sxiv-25.ebuild b/media-gfx/sxiv/sxiv-25.ebuild
new file mode 100644
index 000000000000..3b3917053a8f
--- /dev/null
+++ b/media-gfx/sxiv/sxiv-25.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop xdg-utils gnome2-utils savedconfig toolchain-funcs
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
+ inherit git-r3
+else
+ SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Simple (or small or suckless) X Image Viewer"
+HOMEPAGE="https://github.com/muennich/sxiv/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="exif gif +jpeg +png"
+
+RDEPEND="
+ exif? ( media-libs/libexif )
+ gif? ( media-libs/giflib:0= )
+ media-libs/imlib2[X,gif?,jpeg?,png?]
+ x11-libs/libX11
+ x11-libs/libXft
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ restore_config config.h
+ default
+}
+
+src_compile() {
+ emake V=1 CC="$(tc-getCC)" HAVE_LIBEXIF=$(usex exif 1 0) HAVE_GIFLIB=$(usex gif 1 0)
+}
+
+src_install() {
+ emake DESTDIR="${ED}" PREFIX=/usr install
+ emake -C icon DESTDIR="${ED}" PREFIX=/usr install
+ dodoc README.md
+ domenu sxiv.desktop
+
+ save_config config.h
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ gnome2_icon_cache_update
+}
diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index 778e21dde204..3b3917053a8f 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit eutils xdg-utils gnome2-utils savedconfig toolchain-funcs
+inherit desktop xdg-utils gnome2-utils savedconfig toolchain-funcs
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/muennich/sxiv.git"
@@ -18,12 +18,12 @@ HOMEPAGE="https://github.com/muennich/sxiv/"
LICENSE="GPL-2"
SLOT="0"
-IUSE="exif gif"
+IUSE="exif gif +jpeg +png"
RDEPEND="
exif? ( media-libs/libexif )
gif? ( media-libs/giflib:0= )
- media-libs/imlib2[X,gif?]
+ media-libs/imlib2[X,gif?,jpeg?,png?]
x11-libs/libX11
x11-libs/libXft
"
diff --git a/media-gfx/xv/xv-3.10a-r19.ebuild b/media-gfx/xv/xv-3.10a-r19.ebuild
index 37d1f5a73e74..1b06f5a96590 100644
--- a/media-gfx/xv/xv-3.10a-r19.ebuild
+++ b/media-gfx/xv/xv-3.10a-r19.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
LICENSE="xv"
SLOT="0"
-KEYWORDS="alpha ~amd64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="jpeg tiff png"
DEPEND="x11-libs/libXt
diff --git a/media-gfx/zbar/files/zbar-0.10-python-crash.patch b/media-gfx/zbar/files/zbar-0.10-python-crash.patch
deleted file mode 100644
index a6f7a96e34db..000000000000
--- a/media-gfx/zbar/files/zbar-0.10-python-crash.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://sourceforge.net/p/zbar/patches/37/
-
-fix from Debian for crashes when importing the python module.
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=702499
-
-this doesn't happen on some arches as the data naturally ends up with zero
-data after the structure, but on some (like arm), it isn't so we crash when
-python walks the list.
-
---- a/python/imagescanner.c
-+++ b/python/imagescanner.c
-@@ -68,6 +68,7 @@ imagescanner_get_results (zbarImageScanner *self,
-
- static PyGetSetDef imagescanner_getset[] = {
- { "results", (getter)imagescanner_get_results, },
-+ { NULL },
- };
-
- static PyObject*
diff --git a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch b/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
deleted file mode 100644
index 4fde95e2b563..000000000000
--- a/media-gfx/zbar/files/zbar-0.10-v4l2-uvcvideo.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- zbar-0.10/zbar/video/v4l2.c 2009-10-23 18:16:44.000000000 +0000
-+++ zbar-0.10/zbar/video/v4l2.c 2015-03-07 05:46:36.000000000 +0000
-@@ -241,6 +241,21 @@
- return(0);
- }
-
-+static int v4l2_request_buffers (zbar_video_t *vdo)
-+{
-+ struct v4l2_requestbuffers rb;
-+ memset(&rb, 0, sizeof(rb));
-+ rb.count = vdo->num_images;
-+ rb.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-+ rb.memory = V4L2_MEMORY_USERPTR;
-+ if(ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
-+ return(err_capture(vdo, SEV_ERROR, ZBAR_ERR_SYSTEM, __func__,
-+ "requesting video frame buffers (VIDIOC_REQBUFS)"));
-+ if(rb.count)
-+ vdo->num_images = rb.count;
-+ return(0);
-+}
-+
- static int v4l2_set_format (zbar_video_t *vdo,
- uint32_t fmt)
- {
-@@ -308,6 +323,8 @@
- return(-1);
- if(vdo->iomode == VIDEO_MMAP)
- return(v4l2_mmap_buffers(vdo));
-+ if(vdo->iomode == VIDEO_USERPTR)
-+ return(v4l2_request_buffers(vdo));
- return(0);
- }
-
-@@ -337,8 +354,13 @@
- else {
- if(!vdo->iomode)
- vdo->iomode = VIDEO_USERPTR;
-- if(rb.count)
-- vdo->num_images = rb.count;
-+ /* releasing buffers
-+ * lest the driver may later refuse to change format
-+ */
-+ rb.count = 0;
-+ if (ioctl(vdo->fd, VIDIOC_REQBUFS, &rb) < 0)
-+ zprintf(0, "WARNING: releasing video buffers failed: error %d\n",
-+ errno);
- }
- return(0);
- }
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 10a758ed5f5c..7b6c6d91cc8d 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
index f6b720c417a4..9105b1a7b0d5 100644
--- a/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
else
SRC_URI="mirror://gnome/sources/${PN}/$(ver_cut 1-2)/${P}.tar.xz"
- 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"
fi
LICENSE="LGPL-2.1"
diff --git a/media-libs/glew/glew-2.1.0-r1.ebuild b/media-libs/glew/glew-2.1.0-r1.ebuild
index cddeb537619a..bf24a6714bca 100644
--- a/media-libs/glew/glew-2.1.0-r1.ebuild
+++ b/media-libs/glew/glew-2.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
LICENSE="BSD MIT"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc static-libs"
DEPEND="
diff --git a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
index 366c468a90f4..9229b8209dca 100644
--- a/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
+++ b/media-libs/libart_lgpl/libart_lgpl-2.3.21-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,14 +8,12 @@ GNOME2_LA_PUNT="yes"
inherit autotools gnome2 multilib-minimal
DESCRIPTION="A LGPL version of libart"
-HOMEPAGE="http://www.levien.com/libart"
+HOMEPAGE="https://www.levien.com/libart"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-RDEPEND=""
DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
# The provided tests are interactive only
@@ -29,7 +27,7 @@ src_prepare() {
gnome2_src_prepare
# Fix crosscompiling, bug #185684
- rm "${S}"/art_config.h
+ rm "${S}"/art_config.h || die
eapply "${FILESDIR}"/${PN}-2.3.21-crosscompile.patch
# Do not build tests if not required
diff --git a/media-libs/libsfml/libsfml-2.5.1.ebuild b/media-libs/libsfml/libsfml-2.5.1.ebuild
index d7b28cb87d90..22aac292e478 100644
--- a/media-libs/libsfml/libsfml-2.5.1.ebuild
+++ b/media-libs/libsfml/libsfml-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/SFML/SFML/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="debug doc examples"
RDEPEND="
diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-gcc6.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc6.patch
new file mode 100644
index 000000000000..7cfac32b2295
--- /dev/null
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc6.patch
@@ -0,0 +1,22 @@
+Description: explicit cast to int8_t
+ Fix FTBFS with GCC 6 due to narrowing conversions from 'char' to 'int8_t'.
+Author: Laszlo Boszormenyi (GCS)
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/837378
+Last-Update: 2016-09-19
+
+---
+
+--- sidplay-libs-2.1.1.orig/libsidplay/src/xsid/xsid.cpp
++++ sidplay-libs-2.1.1/libsidplay/src/xsid/xsid.cpp
+@@ -96,8 +96,8 @@ const int8_t XSID::sampleConvertTable[16
+ */
+ const int8_t XSID::sampleConvertTable[16] =
+ {
+- '\x80', '\x94', '\xa9', '\xbc', '\xce', '\xe1', '\xf2', '\x03',
+- '\x1b', '\x2a', '\x3b', '\x49', '\x58', '\x66', '\x73', '\x7f'
++ (int8_t)'\x80', (int8_t)'\x94', (int8_t)'\xa9', (int8_t)'\xbc', (int8_t)'\xce', (int8_t)'\xe1', (int8_t)'\xf2', (int8_t)'\x03',
++ (int8_t)'\x1b', (int8_t)'\x2a', (int8_t)'\x3b', (int8_t)'\x49', (int8_t)'\x58', (int8_t)'\x66', (int8_t)'\x73', (int8_t)'\x7f'
+ };
+
+ const char *XSID::credit =
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
new file mode 100644
index 000000000000..cb385dd5622a
--- /dev/null
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool multilib-minimal
+
+MY_P=sidplay-libs-${PV}
+
+DESCRIPTION="C64 SID player library"
+HOMEPAGE="http://sidplay2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sidplay2/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="static-libs"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/sidplay/sidconfig.h
+)
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc41.patch
+ "${FILESDIR}"/${P}-fbsd.patch
+ "${FILESDIR}"/${P}-gcc43.patch
+ "${FILESDIR}"/${P}-no_libtool_reference.patch
+ "${FILESDIR}"/${P}-gcc6.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ elibtoolize
+ multilib_copy_sources
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --enable-shared
+ --with-pic
+ $(use_enable static-libs static)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ docinto libsidplay
+ dodoc libsidplay/{AUTHORS,ChangeLog,README,TODO}
+
+ docinto libsidutils
+ dodoc libsidutils/{AUTHORS,ChangeLog,README,TODO}
+
+ docinto resid
+ dodoc resid/{AUTHORS,ChangeLog,NEWS,README,THANKS,TODO}
+
+ doenvd "${FILESDIR}"/65resid
+
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libsidplayfp/Manifest b/media-libs/libsidplayfp/Manifest
index f462c0473b1b..58f626d5bbbd 100644
--- a/media-libs/libsidplayfp/Manifest
+++ b/media-libs/libsidplayfp/Manifest
@@ -1,4 +1,3 @@
-DIST libsidplayfp-0.3.8.tar.gz 682303 BLAKE2B 28bc2f611979f9b9dbbab1764fda99e9f17bf868f20e4513322f4b9852bef102b9a4654167a8251f2e5d1b48fe8ebc562bb35dacc8bbb8f6e54f7b05a1210ef4 SHA512 5a4cae8e7ca6c9ae514b7018b27c125e17dc6773db036dca7140e51d3021a4274348b791d72e6e277ac0d1fa3b20ba2b3a04bbccf574db178b1b28428f2099cc
DIST libsidplayfp-1.1.0.tar.gz 620228 BLAKE2B 4e51092d84817c6c90ebb0327ba1816c6dae42868f6296f269cdeee1cdf8c226e71e799ab5d7a8609546cb07669dd80f5bd1fb70e14ef594ac128c43a5c7bf51 SHA512 fb0ce00d220772aaf97fc88b7ba3e764f1c94439c9d35713743726872cf6bc6524893489c5909be538f0630896bd328560c6b189d6d2d09932457671080ed76f
-DIST libsidplayfp-1.8.0.tar.gz 669469 BLAKE2B 9a5b2da9a696d7b18aacf7dcf9693290d73f22582a5ed3db728f326d1e1ef1b6d0c4258253db51aa6739c471ccbe33b8abeec5c327c131d48453d0fd5ba84b44 SHA512 37af2e0f2a4b635797ce289cba33e0bbe9dea0ec2378da8b4e886f94a34fe09d2941c9deda9568e5325f7da6423f4a9820c814ec8d2970987f3cd03965147c52
DIST libsidplayfp-1.8.1.tar.gz 669478 BLAKE2B af6657ba2eceb40585f9900a72605455b50dc3afb36f091e05b8d9b557ae7dca13c2feb36ecf4a9dbab63e82d3d986a21008034b30189b5e9618518b68385284 SHA512 54731b33071a6bb7300b50c4d899706b71779977d8999302f7aae17d6a9406c9ec407baf87788cae073b04ce6b3f516d90af365b5d95d9dc5525c00cacf79ffd
+DIST libsidplayfp-1.8.8.tar.gz 673522 BLAKE2B 2d31955e08b0b2b9558e033eff5d959acda08cdc5a3c2bb8c0aacb07c4b8c105812b4faa0af07dbc51255c72cfdf4893ce0da4d642dfc0f89ebc6ec96c51db51 SHA512 84fb24dcf6680dd0e2ec9cc39ddaf30707e4beb5136b7b496b1b85bf11580b1080fbb59b6ec3c1dc7b829fa0cd933db89ee3968518f23ef1a35d9253707d6392
diff --git a/media-libs/libsidplayfp/libsidplayfp-0.3.8.ebuild b/media-libs/libsidplayfp/libsidplayfp-0.3.8.ebuild
deleted file mode 100644
index dd7b626bcebd..000000000000
--- a/media-libs/libsidplayfp/libsidplayfp-0.3.8.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="A library for the sidplay2 fork with resid-fp"
-HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-DOCS=( AUTHORS NEWS README TODO )
-
-src_prepare() {
- # fix automagic. warning: modifying .ac triggers maintainer mode.
- sed -i -e 's:doxygen:dIsAbLe&:' configure || die
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/media-libs/libsidplayfp/libsidplayfp-1.8.0.ebuild b/media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild
similarity index 58%
rename from media-libs/libsidplayfp/libsidplayfp-1.8.0.ebuild
rename to media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild
index 8d0ef050961a..bf0faa527c68 100644
--- a/media-libs/libsidplayfp/libsidplayfp-1.8.0.ebuild
+++ b/media-libs/libsidplayfp/libsidplayfp-1.8.8.ebuild
@@ -1,26 +1,30 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils versionator
+EAPI=7
-DESCRIPTION="A library for the sidplay2 fork with resid-fp"
+inherit flag-o-matic
+
+DESCRIPTION="Library for the sidplay2 fork with resid-fp"
HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(get_version_component_range 1-2)/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~x86"
IUSE="cpu_flags_x86_mmx static-libs"
-DOCS=( AUTHORS NEWS README TODO )
-
src_prepare() {
+ default
# fix automagic. warning: modifying .ac triggers maintainer mode.
sed -i -e 's:doxygen:dIsAbLe&:' configure || die
}
src_configure() {
+ # relies on undocumented "uint" type in libstdc++
+ # bug 649832
+ append-cxxflags -std=c++14
+
econf \
$(use_enable static-libs static) \
$(use_enable cpu_flags_x86_mmx mmx)
@@ -28,5 +32,5 @@ src_configure() {
src_install() {
default
- prune_libtool_files
+ find "${D}" -name '*.la' -delete || die
}
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 0cf9742727b4..f391ad1d7265 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -2,7 +2,9 @@ DIST libvpx-1.5.0.tar.bz2 1906571 BLAKE2B 1e4e2d7ac6ae046d733361d644a9c36b84f033
DIST libvpx-1.6.0.tar.bz2 1943026 BLAKE2B 1fbea27d73b2120ed807108b8ba09c4118e2d8381fdcbbf8661c5fd664e6272d6c14b73c7b8317b97fa51b212d3ea2429819e0e17adf6afcb8d0f5fb6dd9a68a SHA512 dd753372a156bbf7ceb4090276e5fb32b4c8581c93925dded93efee74153b5eb24ee8c3d8ee6339a6878482f0ecf178a2befeeb36e17eada6c440b48c60e9162
DIST libvpx-1.6.1.tar.bz2 1959534 BLAKE2B 67f73ffd2569bde46db98e7fcb36f7b37d33927fad8c3916ebe1810e63e7aae963bd39ba1f399be079ea4c9f52736f98a603c810f9412643a91166dfb09ed895 SHA512 1a4b009fe1737715c6563a79848126a5859394a5074b1e9cca9bc2e213df90890c15e708040d5f2c96c7c21e268f51e1352ac6911514bf891a4bf3eea154159d
DIST libvpx-1.7.0.tar.gz 2679797 BLAKE2B de7992adb517e375c5be2a9facf2b4a73174adcaef11185ed6d3102c2f6b73f378b0d415c5e3a4d915b3a6889bd8b31ba3e8c007a87a433a345ef7696a1dd899 SHA512 8b3b766b550f8d86907628d7ed88035f9a2612aac21542e0fd5ad35b905eb82cbe1be02a1a24afce7a3bcc4766f62611971f72724761996b392136c40a1e7ff0
+DIST libvpx-1.8.0.tar.gz 2879302 BLAKE2B a6113115b4d3668951b084250ca3e9bafeb1a4c54cb0c5516d6d24a88105f13b5b458dd0b57088eddb64deb0096a2023968588cc7dc69aa0cd0799caa71f9fc0 SHA512 77477ec7059de1d90f048c10783b4adce463a84c9c828f125686e533f5bc8c9eeab8a1747df5c928e0869ccf855a9af5608199c8c376a75d35659f719ee870ef
DIST libvpx-testdata-1.5.0.tar.bz2 117022525 BLAKE2B d0b5e96694d84d825b874df208dc3b3156ab0d5e9d567e1e05cdc7b88f47126917b84178748f0971ce14d58ee031906b72070bec622983ec56244159b8b759ee SHA512 58abcea159d1f709c2b9b52e8ae381481ed0ee1f43972f5e52d628754844ed23f5f77180a9c3f950a19fd8e2eaec406288d9ec65a42c9d6d080a6948827698bb
DIST libvpx-testdata-1.6.0.tar.bz2 121020858 BLAKE2B 93bbaa4514e46b762fbf86d66394b228d62c19906dc79c5c661feedf088d09d4b6c2ac908dc8b1ac4236a801047d5d608b17a8bc0fa5bd5ca0c992cd0729fc7a SHA512 639e229bd97e7a92a29e636f548234a87dbe63673d968cdfbec1faf9ccb0ee2087ad00b0a5bfb1581bea6b17e70bb449e9a046da4d9891f59ec79773ece4294e
DIST libvpx-testdata-1.6.1.tar.bz2 158774682 BLAKE2B 0ba1897e015c69cbf98b645cc634f98fdaf58aa814ad2cf93ee1812a38d279a570b856017822db0b21215c0e6d2d069c3f40692317c885ffbc3b59c236a754ba SHA512 9038774a6955cb6664ea664b4d8e08b0e7a2acba85429da9fd84f522bc7a03d57f6d9f1302481136a718507113babbe4786ff7a648130298ad2c0b3cbe8e82ab
DIST libvpx-testdata-1.7.0.tar.xz 238790100 BLAKE2B 1d14e794341d35402eaf54d398ebed56b0983908e397ae677737e0f313ea0bfc9c4a39be91765b02a07a8eb9b55529d5f998efcc87b1b493b0e326e02193d982 SHA512 1556345e41674f0846a7419828972ec27c3c37fe270fa1deb45e03665f60ec088d79134aee0d2e27003b130636eeed4a15ea3f701c9d7014f3ca2785467767a8
+DIST libvpx-testdata-1.8.0.tar.xz 418337232 BLAKE2B 1336e522f18a8f7812b4e7e4de7b27d32778c38fe902c62a4415a17e857868bfcdcbdcab528617db89e9f57449a486333feccffc4a250bfe79fc460c790071ed SHA512 991066467121614106455522b3651f194b45a37125c1b4e6bade59044756f26d914c95388e3c0bd3dc22159525aa6478df36801767bb7506fa7e77b93c6c2ede
diff --git a/media-libs/libvpx/libvpx-1.8.0-r1.ebuild b/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
new file mode 100644
index 000000000000..b75c00c5ca4f
--- /dev/null
+++ b/media-libs/libvpx/libvpx-1.8.0-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit toolchain-funcs multilib-minimal
+
+# To create a new testdata tarball:
+# 1. Unpack source tarbll or checkout git tag
+# 2. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
+# 3. configure --enable-unit-tests --enable-vp9-highbitdepth
+# 4. make testdata
+# 5. tar -cjf libvpx-testdata-${MY_PV}.tar.xz libvpx-testdata
+
+LIBVPX_TESTDATA_VER=1.8.0
+
+DESCRIPTION="WebM VP8 and VP9 Codec SDK"
+HOMEPAGE="https://www.webmproject.org"
+SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc +highbitdepth postproc static-libs svc test +threads"
+
+REQUIRED_USE="test? ( threads )"
+
+# Disable test phase when USE="-test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="abi_x86_32? ( dev-lang/yasm )
+ abi_x86_64? ( dev-lang/yasm )
+ abi_x86_x32? ( dev-lang/yasm )
+ x86-fbsd? ( dev-lang/yasm )
+ amd64-fbsd? ( dev-lang/yasm )
+ doc? (
+ app-doc/doxygen
+ dev-lang/php
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
+)
+
+src_configure() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=384585
+ # https://bugs.gentoo.org/show_bug.cgi?id=465988
+ # copied from php-pear-r1.eclass
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/
+ addpredict /var/lib/net-snmp/mib_indexes
+ addpredict /session_mm_cli0.sem
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ unset CODECS #357487
+
+ # #498364: sse doesn't work without sse2 enabled,
+ local myconfargs=(
+ --prefix="${EPREFIX}"/usr
+ --libdir="${EPREFIX}"/usr/$(get_libdir)
+ --enable-pic
+ --enable-vp8
+ --enable-vp9
+ --enable-shared
+ --extra-cflags="${CFLAGS}"
+ $(use_enable postproc)
+ $(use_enable svc experimental)
+ $(use_enable static-libs static)
+ $(use_enable test unit-tests)
+ $(use_enable threads multithread)
+ $(use_enable highbitdepth vp9-highbitdepth)
+ )
+
+ # let the build system decide which AS to use (it honours $AS but
+ # then feeds it with yasm flags without checking...) #345161
+ tc-export AS
+ case "${CHOST}" in
+ i?86*) export AS=yasm;;
+ x86_64*) export AS=yasm;;
+ esac
+
+ # Build with correct toolchain.
+ tc-export CC CXX AR NM
+ # Link with gcc by default, the build system should override this if needed.
+ export LD="${CC}"
+
+ if multilib_is_native_abi; then
+ myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
+ else
+ # not needed for multilib and will be overwritten anyway.
+ myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
+ fi
+
+ echo "${S}"/configure "${myconfargs[@]}" >&2
+ "${S}"/configure "${myconfargs[@]}"
+}
+
+multilib_src_compile() {
+ # build verbose by default and do not build examples that will not be installed
+ emake verbose=yes GEN_EXAMPLES=
+}
+
+multilib_src_test() {
+ local -x LD_LIBRARY_PATH="${BUILD_DIR}"
+ local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
+ emake verbose=yes GEN_EXAMPLES= test
+}
+
+multilib_src_install() {
+ emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
+ multilib_is_native_abi && use doc && dodoc -r docs/html
+}
diff --git a/media-libs/libvpx/libvpx-1.8.0.ebuild b/media-libs/libvpx/libvpx-1.8.0.ebuild
new file mode 100644
index 000000000000..73214ce5133d
--- /dev/null
+++ b/media-libs/libvpx/libvpx-1.8.0.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+inherit toolchain-funcs multilib-minimal
+
+# To create a new testdata tarball:
+# 1. Unpack source tarbll or checkout git tag
+# 2. export LIBVPX_TEST_DATA_PATH=libvpx-testdata
+# 3. configure --enable-unit-tests --enable-vp9-highbitdepth
+# 4. make testdata
+# 5. tar -cjf libvpx-testdata-${MY_PV}.tar.xz libvpx-testdata
+
+LIBVPX_TESTDATA_VER=1.8.0
+
+DESCRIPTION="WebM VP8 and VP9 Codec SDK"
+HOMEPAGE="https://www.webmproject.org"
+SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? ( mirror://gentoo/${PN}-testdata-${LIBVPX_TESTDATA_VER}.tar.xz )"
+
+LICENSE="BSD"
+SLOT="0/6"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
+
+REQUIRED_USE="
+ cpu_flags_x86_sse2? ( cpu_flags_x86_mmx )
+ cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
+ test? ( threads )
+"
+
+# Disable test phase when USE="-test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="abi_x86_32? ( dev-lang/yasm )
+ abi_x86_64? ( dev-lang/yasm )
+ abi_x86_x32? ( dev-lang/yasm )
+ x86-fbsd? ( dev-lang/yasm )
+ amd64-fbsd? ( dev-lang/yasm )
+ doc? (
+ app-doc/doxygen
+ dev-lang/php
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/libvpx-1.3.0-sparc-configure.patch" # 501010
+)
+
+src_configure() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=384585
+ # https://bugs.gentoo.org/show_bug.cgi?id=465988
+ # copied from php-pear-r1.eclass
+ addpredict /usr/share/snmp/mibs/.index
+ addpredict /var/lib/net-snmp/
+ addpredict /var/lib/net-snmp/mib_indexes
+ addpredict /session_mm_cli0.sem
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ unset CODECS #357487
+
+ # #498364: sse doesn't work without sse2 enabled,
+ local myconfargs=(
+ --prefix="${EPREFIX}"/usr
+ --libdir="${EPREFIX}"/usr/$(get_libdir)
+ --enable-pic
+ --enable-vp8
+ --enable-vp9
+ --enable-shared
+ --extra-cflags="${CFLAGS}"
+ $(use_enable cpu_flags_x86_avx avx)
+ $(use_enable cpu_flags_x86_avx2 avx2)
+ $(use_enable cpu_flags_x86_mmx mmx)
+ $(use_enable postproc)
+ $(use cpu_flags_x86_sse2 && use_enable cpu_flags_x86_sse sse || echo --disable-sse)
+ $(use_enable cpu_flags_x86_sse2 sse2)
+ $(use_enable cpu_flags_x86_sse3 sse3)
+ $(use_enable cpu_flags_x86_sse4_1 sse4_1)
+ $(use_enable cpu_flags_x86_ssse3 ssse3)
+ $(use_enable svc experimental)
+ $(use_enable static-libs static)
+ $(use_enable test unit-tests)
+ $(use_enable threads multithread)
+ $(use_enable highbitdepth vp9-highbitdepth)
+ )
+
+ # let the build system decide which AS to use (it honours $AS but
+ # then feeds it with yasm flags without checking...) #345161
+ tc-export AS
+ case "${CHOST}" in
+ i?86*) export AS=yasm;;
+ x86_64*) export AS=yasm;;
+ esac
+
+ # Build with correct toolchain.
+ tc-export CC CXX AR NM
+ # Link with gcc by default, the build system should override this if needed.
+ export LD="${CC}"
+
+ if multilib_is_native_abi; then
+ myconfargs+=( $(use_enable doc install-docs) $(use_enable doc docs) )
+ else
+ # not needed for multilib and will be overwritten anyway.
+ myconfargs+=( --disable-examples --disable-install-docs --disable-docs )
+ fi
+
+ "${S}"/configure "${myconfargs[@]}"
+}
+
+multilib_src_compile() {
+ # build verbose by default and do not build examples that will not be installed
+ emake verbose=yes GEN_EXAMPLES=
+}
+
+multilib_src_test() {
+ local -x LD_LIBRARY_PATH="${BUILD_DIR}"
+ local -x LIBVPX_TEST_DATA_PATH="${WORKDIR}/${PN}-testdata"
+ emake verbose=yes GEN_EXAMPLES= test
+}
+
+multilib_src_install() {
+ emake verbose=yes GEN_EXAMPLES= DESTDIR="${D}" install
+ multilib_is_native_abi && use doc && dodoc -r docs/html
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index b7e1a4957572..6cdf1be2f38b 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
index e80f66f40cc1..6e7d542ac49e 100644
--- a/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
+++ b/media-sound/clementine/clementine-1.3.1_p20190127.ebuild
@@ -81,6 +81,7 @@ DEPEND="${COMMON_DEPEND}
>=dev-cpp/gtest-1.8.0
dev-libs/boost
dev-qt/linguist-tools:5
+ dev-qt/qtopengl:5
dev-qt/qtx11extras:5
dev-qt/qtxml:5
sys-devel/gettext
@@ -88,7 +89,6 @@ DEPEND="${COMMON_DEPEND}
box? ( dev-cpp/sparsehash )
dropbox? ( dev-cpp/sparsehash )
googledrive? ( dev-cpp/sparsehash )
- projectm? ( dev-qt/qtopengl:5 )
pulseaudio? ( media-sound/pulseaudio )
seafile? ( dev-cpp/sparsehash )
skydrive? ( dev-cpp/sparsehash )
diff --git a/media-sound/mpc/files/mpc-0.31-nodoc.patch b/media-sound/mpc/files/mpc-0.31-nodoc.patch
new file mode 100644
index 000000000000..55afa828ffc3
--- /dev/null
+++ b/media-sound/mpc/files/mpc-0.31-nodoc.patch
@@ -0,0 +1,12 @@
+--- a/meson.build 2018-10-24 10:31:33.000000000 +0200
++++ b/meson.build 2019-02-09 22:49:02.890387140 +0100
+@@ -109,9 +109,6 @@
+ install: true
+ )
+
+-install_data('AUTHORS', 'COPYING', 'NEWS', 'README.rst',
+- install_dir : join_paths(get_option('datadir'), 'doc', meson.project_name()))
+-
+ install_data(
+ 'contrib/mpd-m3u-handler.sh', 'contrib/mpd-pls-handler.sh',
+ 'contrib/mpc-completion.bash',
diff --git a/media-sound/mpc/mpc-0.31-r1.ebuild b/media-sound/mpc/mpc-0.31-r1.ebuild
new file mode 100644
index 000000000000..63e630daea44
--- /dev/null
+++ b/media-sound/mpc/mpc-0.31-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 meson
+
+DESCRIPTION="Commandline client for Music Player Daemon (media-sound/mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc iconv test"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( dev-python/sphinx )
+ iconv? ( virtual/libiconv )
+ test? ( dev-libs/check )
+"
+DEPEND="media-libs/libmpdclient"
+RDEPEND="${DEPEND}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=( "${FILESDIR}/${P}-nodoc.patch" )
+
+src_prepare() {
+ default
+
+ # use correct docdir
+ sed -e "/install_dir:.*contrib/s/meson.project_name()/'${PF}'/" \
+ -i meson.build || die
+
+ # use correct (html) docdir
+ sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
+ -i doc/meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ -Ddocumentation=$(usex doc enabled disabled)
+ -Diconv=$(usex iconv enabled disabled)
+ -Dtest=$(usex test true false)
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+ newbashcomp contrib/mpc-completion.bash mpc
+}
diff --git a/media-sound/mpc/mpc-0.31.ebuild b/media-sound/mpc/mpc-0.31.ebuild
deleted file mode 100644
index 2429ef0a37b6..000000000000
--- a/media-sound/mpc/mpc-0.31.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 meson
-
-DESCRIPTION="A commandline client for Music Player Daemon (media-sound/mpd)"
-HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="iconv test"
-
-RDEPEND="media-libs/libmpdclient"
-
-DEPEND="${RDEPEND}
- dev-python/sphinx
- iconv? ( virtual/libiconv )
- test? ( dev-libs/check )"
-
-BDEPEND="virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-src_configure() {
- local emesonargs=(
- -Dtest=$(usex test true false)
- -Diconv=$(usex iconv enabled disabled)
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
- newbashcomp contrib/mpc-completion.bash mpc
-}
diff --git a/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch b/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch
new file mode 100644
index 000000000000..0bc3798bc5e7
--- /dev/null
+++ b/media-sound/ncmpc/files/ncmpc-0.33-mandir.patch
@@ -0,0 +1,25 @@
+From 821acdad907d1558c570bca6e2ac63d55905f363 Mon Sep 17 00:00:00 2001
+From: kaliko
+Date: Mon, 10 Dec 2018 13:46:42 +0100
+Subject: [PATCH] Fixed manual install dir
+
+---
+ doc/meson.build | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/meson.build b/doc/meson.build
+index aadea58..f4b491d 100644
+--- a/doc/meson.build
++++ b/doc/meson.build
+@@ -30,9 +30,9 @@ endif
+ if get_option('manual')
+ custom_target(
+ 'Manpage documentation',
+- output: 'man',
++ output: 'man1',
+ input: ['index.rst', 'conf.py'],
+- command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
++ command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/man_doctrees', meson.current_source_dir(), '@OUTPUT@'],
+ build_by_default: true,
+ install: true,
+ install_dir: get_option('mandir'),
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index 240ddfa18ac8..f4eb96c015fc 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/metadata.xml
@@ -11,6 +11,7 @@
Enable the chat screen
Enable the help screen
Enable key editor screen
+ Enable library screen
Enable lyrics screen
Enable curses getmouse support
Enable the outputs screen
diff --git a/media-sound/ncmpc/ncmpc-0.33.ebuild b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
similarity index 72%
rename from media-sound/ncmpc/ncmpc-0.33.ebuild
rename to media-sound/ncmpc/ncmpc-0.33-r1.ebuild
index 5aa8337eea5c..745b2f2cc692 100644
--- a/media-sound/ncmpc/ncmpc-0.33.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.33-r1.ebuild
@@ -5,37 +5,42 @@ EAPI=7
inherit meson
-DESCRIPTION="A ncurses client for the Music Player Daemon (MPD)"
+DESCRIPTION="Ncurses client for the Music Player Daemon (MPD)"
HOMEPAGE="https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc"
-SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="+artist-screen async-connect chat-screen doc +help-screen key-screen lirc lyrics-screen outputs-screen search-screen +song-screen +mouse nls pcre"
+IUSE="async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( dev-python/sphinx )
+"
RDEPEND="
>=media-libs/libmpdclient-2.9
sys-libs/ncurses:0=[unicode]
lirc? ( app-misc/lirc )
pcre? ( dev-libs/libpcre )
"
-
DEPEND="${RDEPEND}
- >=dev-util/meson-0.47
>=dev-libs/boost-1.62
- virtual/pkgconfig
- doc? ( dev-python/sphinx )
"
+PATCHES=( "${FILESDIR}/${P}-mandir.patch" )
+
src_prepare() {
default
# use correct docdir and don't install license file
- sed \
- -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
+ sed -e "/^docdir =/s/meson.project_name()/'${PF}'/" \
-e "s/'COPYING', //" \
-i meson.build || die
+
+ # use correct (html) docdir
+ sed -e "/install_dir:.*doc/s/meson.project_name()/'${PF}'/" \
+ -i doc/meson.build || die
}
src_configure() {
@@ -44,22 +49,22 @@ src_configure() {
-Dcolors=true
-Dmini=false
-Dlyrics_plugin_dir="${EPREFIX}/usr/$(get_libdir)/ncmpc/lyrics"
- -Dartist_screen=$(usex artist-screen true false)
-Dasync_connect=$(usex async-connect true false)
-Dchat_screen=$(usex chat-screen true false)
-Ddocumentation=$(usex doc enabled disabled)
-Dhelp_screen=$(usex help-screen true false)
-Dkey_screen=$(usex key-screen true false)
- -Dlyrics_screen=$(usex lyrics-screen true false)
- -Doutputs_screen=$(usex outputs-screen true false)
- -Dsearch_screen=$(usex search-screen true false)
- -Dsong_screen=$(usex song-screen true false)
+ -Dlibrary_screen=$(usex library-screen true false)
+ -Dlirc=$(usex lirc enabled disabled)
-Dlocale=$(usex nls enabled disabled)
+ -Dlyrics_screen=$(usex lyrics-screen true false)
+ -Dmouse=$(usex mouse enabled disabled)
-Dmultibyte=$(usex nls true false)
-Dnls=$(usex nls enabled disabled)
- -Dlirc=$(usex lirc enabled disabled)
- -Dmouse=$(usex mouse enabled disabled)
+ -Doutputs_screen=$(usex outputs-screen true false)
-Dregex=$(usex pcre enabled disabled)
+ -Dsearch_screen=$(usex search-screen true false)
+ -Dsong_screen=$(usex song-screen true false)
)
meson_src_configure
diff --git a/media-sound/pianobar/Manifest b/media-sound/pianobar/Manifest
index 0f13136b90b1..849c81d89010 100644
--- a/media-sound/pianobar/Manifest
+++ b/media-sound/pianobar/Manifest
@@ -1,3 +1,2 @@
-DIST pianobar-2016.06.02.tar.bz2 46262 BLAKE2B 1e466dc438630c090e78cec5a54488ae6c0595695a6e97c164ecd3a0bb630d73663c4955bb795a0c9c89b79aa9c384d228c0ac28200d1f8ab9edcbe02b43ae85 SHA512 943e4b7bdfa5690f73378c6454666ec972f4d33faa0549ec087fb0ffeb5584e7ec26cef39dfd0134eefe2723638cc41f29c76eecb306c295c067996443958027
-DIST pianobar-2017.08.30.tar.bz2 46664 BLAKE2B 2ab90efab273e2af707924072252b1de77f41629407b0cb65850fad2ff32fd2a56480f4074d30aa68bb2add3fa9350d9d3e2fd1c3e19db420d1caf4a07291090 SHA512 35019bd387a323c85928e8979c075c7b2a8d88115066a55068dd62279760200fcadf022f7000a40e198bebc3cfc5507913da7c9c06ae220cba6fe3910a6bca54
DIST pianobar-2018.06.22.tar.bz2 47455 BLAKE2B f1d61709f7c95438352f29a075120c4794c666d9406fb9e6dea47930f2715a0538588d29510097487c5bc06d77ccc44f393fff1561545e21bb71f739151a712a SHA512 0fc2d90324da576266f063573549399e4354b8e83678632fadb80864e82c432a1a90a3092085f0155fc136b726ba59eabb26586a1ba11c5ce668c3a89a218133
+DIST pianobar-2019.01.25.tar.bz2 48340 BLAKE2B 09078b0fdf43baab99c343a86d5f1c1e0ee7ab39e2af20e7cdde6c21320a74d82ed9bc02e821b02ab045329944aa7d273d637c80bcb0ce96692281dc2e1a0568 SHA512 bfcec235ff01e40a2f650166a29020276b43b241008fd5eb8b84944744b1ce6262cf3be140354404c9410b88d6910e4bcf77b4de787742a7898bbc8511fef0f6
diff --git a/media-sound/pianobar/pianobar-2016.06.02.ebuild b/media-sound/pianobar/pianobar-2016.06.02.ebuild
deleted file mode 100644
index 0e3bb2a1d58e..000000000000
--- a/media-sound/pianobar/pianobar-2016.06.02.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/PromyLOPh/${PN}.git"
-else
- SRC_URI="https://6xq.net/${PN}/${P}.tar.bz2"
- KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="A console-based replacement for Pandora's flash player"
-HOMEPAGE="https://6xq.net/pianobar/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND="media-libs/libao
- net-misc/curl
- dev-libs/libgcrypt:0=
- dev-libs/json-c:=
- >=virtual/ffmpeg-9"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_compile() {
- append-cflags -std=c99
- tc-export CC
- emake V=1 DYNLINK=1
-}
-
-src_install() {
- emake DESTDIR="${D}" PREFIX=/usr LIBDIR=/usr/$(get_libdir) DYNLINK=1 install
- dodoc ChangeLog README.md
-
- use static-libs || { rm "${D}"/usr/lib*/*.a || die; }
-
- docinto contrib
- dodoc -r contrib/{config-example,*.sh,eventcmd-examples}
- docompress -x /usr/share/doc/${PF}/contrib
-}
diff --git a/media-sound/pianobar/pianobar-2017.08.30.ebuild b/media-sound/pianobar/pianobar-2019.01.25.ebuild
similarity index 95%
rename from media-sound/pianobar/pianobar-2017.08.30.ebuild
rename to media-sound/pianobar/pianobar-2019.01.25.ebuild
index 9d1f513a05ea..dff31a20e216 100644
--- a/media-sound/pianobar/pianobar-2017.08.30.ebuild
+++ b/media-sound/pianobar/pianobar-2019.01.25.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit toolchain-funcs flag-o-matic
if [[ ${PV} == 9999 ]]; then
diff --git a/media-sound/pianobar/pianobar-9999.ebuild b/media-sound/pianobar/pianobar-9999.ebuild
index 9d1f513a05ea..dff31a20e216 100644
--- a/media-sound/pianobar/pianobar-9999.ebuild
+++ b/media-sound/pianobar/pianobar-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit toolchain-funcs flag-o-matic
if [[ ${PV} == 9999 ]]; then
diff --git a/media-sound/sidplay/sidplay-2.0.9-r1.ebuild b/media-sound/sidplay/sidplay-2.0.9-r1.ebuild
new file mode 100644
index 000000000000..b10d636702c8
--- /dev/null
+++ b/media-sound/sidplay/sidplay-2.0.9-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C64 SID player"
+HOMEPAGE="http://sidplay2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sidplay2/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ppc ~sparc x86"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="media-libs/libsidplay:2"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-gcc43.patch"
+ "${FILESDIR}/${P}-gcc44.patch"
+)
diff --git a/media-sound/sidplayfp/Manifest b/media-sound/sidplayfp/Manifest
index 32b6e1f64a7e..9dfb6f45ad11 100644
--- a/media-sound/sidplayfp/Manifest
+++ b/media-sound/sidplayfp/Manifest
@@ -1,3 +1,2 @@
-DIST sidplayfp-0.3.3.tar.gz 454452 BLAKE2B d791698972bc8e4cc31c9c29b42f6af8a7024cb64bb9c3f24389bef01f1bd3d4c194eb84c82ebb85a73fd10e07a0fc2374afa38273aee0642a9ad3daaad59883 SHA512 f979af0c6ead38a9cd3a95cb27ebb26390506bbfbea192345f9873c62e064f18d7dc529ead22c35d46b4ebe8af6808d42f4d015d61ce48d7318daa1a7f613fbf
-DIST sidplayfp-1.1.0.tar.gz 221706 BLAKE2B d6c0b4a70872fab235a46783cf2ec077a5746c175fb6d2fcb5e057cb76f249a3a75c16ff0e3ebb0f2a2546e49ef8310b445c4b86c8ba262b6bef1d86895e6e48 SHA512 2e0986b9bb5b571e1e38c7e92b836a2e39f6dd84fd26161891b3117976c2d98e615e13819f68d0984094b085d50b53205a74a71b371ba005b1ddf3cb00d5274c
DIST sidplayfp-1.4.0.tar.gz 181746 BLAKE2B ec21d900dbfaabe7d8e976acce0c4a53c60b4be8cfb6bc1e53005949f52a0dc28ff90e6087e57e77db571e987cdbc644eacbaaa3a78ef8868c4a48771e2c9603 SHA512 ac91cc26622b211408c50bcef14dcda78b8da81b43a8f334d91a02b89bd6dac0b3e3adaeb84545e6dbcef97354ba6c2dc555e4f0a2ff0298c6710fe1c6cbbd5f
+DIST sidplayfp-1.4.4.tar.gz 183711 BLAKE2B 31ff002d4cd54e827117e2b2f86d253ee1e0bc07fb6ac777653109585c059311205e141e339a8d8cde08209e1c35776d6f0a0ccf0ad754f78eb5e5f4bafd3cfb SHA512 8375a249da80a10d9c0ef55b35c5b047bf0249393026ad8ff25fb8a2660151f1d482fe581a85c6982b3c70ea257807ce17e1c6011874f10c64bec54a1982ec04
diff --git a/media-sound/sidplayfp/sidplayfp-0.3.3.ebuild b/media-sound/sidplayfp/sidplayfp-0.3.3.ebuild
deleted file mode 100644
index 94a9199284b6..000000000000
--- a/media-sound/sidplayfp/sidplayfp-0.3.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A sidplay2 fork with resid-fp"
-HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa oss pulseaudio"
-
-RDEPEND=">=media-libs/libsidplayfp-0.3.8
- alsa? ( media-libs/alsa-lib )
- pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- oss? ( virtual/os-headers )"
-
-DOCS=( AUTHORS ChangeLog README TODO )
-
-src_configure() {
- local output=wav
- use oss && output=oss
- use alsa && output=alsa
- use pulseaudio && output=pulse
-
- econf --enable-driver=${output}
-}
diff --git a/media-sound/sidplayfp/sidplayfp-1.1.0.ebuild b/media-sound/sidplayfp/sidplayfp-1.4.4.ebuild
similarity index 51%
rename from media-sound/sidplayfp/sidplayfp-1.1.0.ebuild
rename to media-sound/sidplayfp/sidplayfp-1.4.4.ebuild
index eefcd503753a..40dc1277bbd0 100644
--- a/media-sound/sidplayfp/sidplayfp-1.1.0.ebuild
+++ b/media-sound/sidplayfp/sidplayfp-1.4.4.ebuild
@@ -1,30 +1,35 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils
+EAPI=7
-DESCRIPTION="A sidplay2 fork with resid-fp"
+DESCRIPTION="Sidplay2 fork with resid-fp"
HOMEPAGE="https://sourceforge.net/projects/sidplay-residfp/"
-SRC_URI="mirror://sourceforge/sidplay-residfp/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/sidplay-residfp/${PN}/$(ver_cut 1-2)/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+alsa oss pulseaudio"
-RDEPEND=">=media-libs/libsidplayfp-1.1.0
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+ >=media-libs/libsidplayfp-1.8.0
alsa? ( media-libs/alsa-lib )
pulseaudio? ( media-sound/pulseaudio )"
DEPEND="${RDEPEND}
- virtual/pkgconfig
oss? ( virtual/os-headers )"
DOCS=( AUTHORS README TODO )
src_prepare() {
- use alsa || { sed -i -e 's:alsa >= 1.0:dIsAbLe&:' configure || die; }
- use pulseaudio || { sed -i -e 's:libpulse-simple >= 1.0:dIsAbLe&:' configure || die; }
+ default
+ if ! use alsa; then
+ sed -i -e 's:alsa >= 1.0:dIsAbLe&:' configure || die
+ fi
+ if ! use pulseaudio; then
+ sed -i -e 's:libpulse-simple >= 1.0:dIsAbLe&:' configure || die
+ fi
}
src_configure() {
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
index b094986ea86a..2a35e0544c8a 100644
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
+++ b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.3-docs.patch
@@ -1,7 +1,5 @@
-Index: zynaddsubfx-2.5.2/CMakeLists.txt
-===================================================================
---- zynaddsubfx-2.5.2.orig/CMakeLists.txt
-+++ zynaddsubfx-2.5.2/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -28,9 +28,6 @@ include(CTestConfig.cmake)
#Currently the only directory that uses cmake
add_subdirectory(src)
diff --git a/media-sound/zynaddsubfx/metadata.xml b/media-sound/zynaddsubfx/metadata.xml
index bca5422640b4..63c95289a8f5 100644
--- a/media-sound/zynaddsubfx/metadata.xml
+++ b/media-sound/zynaddsubfx/metadata.xml
@@ -5,6 +5,9 @@
proaudio@gentoo.org
Gentoo ProAudio Project
+
zynaddsubfx
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
new file mode 100644
index 000000000000..42707c6895ba
--- /dev/null
+++ b/media-sound/zynaddsubfx/zynaddsubfx-3.0.3-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
+HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa doc dssi +fltk jack lash portaudio"
+
+REQUIRED_USE="|| ( alsa jack portaudio )"
+
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+"
+DEPEND="
+ >=dev-libs/mxml-2.2.1
+ media-libs/liblo
+ sci-libs/fftw:3.0
+ sys-libs/zlib
+ alsa? ( media-libs/alsa-lib )
+ dssi? ( media-libs/dssi )
+ fltk? (
+ >=x11-libs/fltk-1.3:1
+ x11-libs/libX11
+ x11-libs/libXpm
+ )
+ jack? ( virtual/jack )
+ lash? ( media-sound/lash )
+ portaudio? ( media-libs/portaudio )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-docs.patch )
+
+DOCS=( ChangeLog HISTORY.txt README.adoc )
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ if ! use dssi; then
+ sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+ if ! use jack; then
+ sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
+ fi
+ if ! use lash; then
+ sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+ if ! use portaudio; then
+ sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ append-cxxflags -std=c++11
+
+ local mycmakeargs=(
+ -DPluginLibDir=$(get_libdir)
+ $(cmake-utils_use_find_package alsa Alsa)
+ $(cmake-utils_use_find_package doc Doxygen)
+ $(cmake-utils_use_find_package fltk FLTK)
+ )
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+ use doc && cmake-utils_src_compile doc
+}
+
+src_install() {
+ use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+ cmake-utils_src_install
+ insinto /usr/share/${PN}
+ doins -r instruments/*
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index dcb710cbd496..4106b820a3a9 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 8d99ae585c32..777704ad4e96 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Feb 2019 18:08:43 +0000
+Sun, 10 Feb 2019 11:08:42 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8d99ae585c32..777704ad4e96 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Feb 2019 18:08:43 +0000
+Sun, 10 Feb 2019 11:08:42 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 0004eb467324..a1f79e0640da 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 e1d63284f6a2..39ea0083a62c 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/r10k-3.1.0 b/metadata/md5-cache/app-admin/r10k-3.1.0
new file mode 100644
index 000000000000..ac4e1c5752d0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/r10k-3.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( ~dev-ruby/colored-1.2[ruby_targets_ruby23] =dev-ruby/cri-2.15*[ruby_targets_ruby23] >=dev-ruby/gettext-setup-0.24:0[ruby_targets_ruby23] ~dev-ruby/log4r-1.1.10[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby23] >=dev-ruby/puppet_forge-2.2.8[ruby_targets_ruby23] =dev-ruby/puppet_forge-2.2*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/colored-1.2[ruby_targets_ruby24] =dev-ruby/cri-2.15*[ruby_targets_ruby24] >=dev-ruby/gettext-setup-0.24:0[ruby_targets_ruby24] ~dev-ruby/log4r-1.1.10[ruby_targets_ruby24] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby24] >=dev-ruby/puppet_forge-2.2.8[ruby_targets_ruby24] =dev-ruby/puppet_forge-2.2*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/colored-1.2[ruby_targets_ruby25] =dev-ruby/cri-2.15*[ruby_targets_ruby25] >=dev-ruby/gettext-setup-0.24:0[ruby_targets_ruby25] ~dev-ruby/log4r-1.1.10[ruby_targets_ruby25] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby25] >=dev-ruby/puppet_forge-2.2.8[ruby_targets_ruby25] =dev-ruby/puppet_forge-2.2*[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/archive-tar-minitar[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/archive-tar-minitar[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=Puppet environment and module deployment
+EAPI=5
+HOMEPAGE=https://github.com/puppetlabs/r10k
+IUSE=+git test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby23? ( ~dev-ruby/colored-1.2[ruby_targets_ruby23] =dev-ruby/cri-2.15*[ruby_targets_ruby23] >=dev-ruby/gettext-setup-0.24:0[ruby_targets_ruby23] ~dev-ruby/log4r-1.1.10[ruby_targets_ruby23] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby23] >=dev-ruby/puppet_forge-2.2.8[ruby_targets_ruby23] =dev-ruby/puppet_forge-2.2*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( ~dev-ruby/colored-1.2[ruby_targets_ruby24] =dev-ruby/cri-2.15*[ruby_targets_ruby24] >=dev-ruby/gettext-setup-0.24:0[ruby_targets_ruby24] ~dev-ruby/log4r-1.1.10[ruby_targets_ruby24] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby24] >=dev-ruby/puppet_forge-2.2.8[ruby_targets_ruby24] =dev-ruby/puppet_forge-2.2*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( ~dev-ruby/colored-1.2[ruby_targets_ruby25] =dev-ruby/cri-2.15*[ruby_targets_ruby25] >=dev-ruby/gettext-setup-0.24:0[ruby_targets_ruby25] ~dev-ruby/log4r-1.1.10[ruby_targets_ruby25] >=dev-ruby/multi_json-1.10:0[ruby_targets_ruby25] >=dev-ruby/puppet_forge-2.2.8[ruby_targets_ruby25] =dev-ruby/puppet_forge-2.2*[ruby_targets_ruby25] ) git? ( >=dev-vcs/git-1.6.6 ) 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/r10k-3.1.0.gem
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 99ea75c9f08fd38989951c554dfa56ea ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 4044516b167f460104703fee4a3c7f5f ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils 10cec86289e60f4b0d731b2e4b545e5d toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_md5_=c46aa29fc30404b85c60e7e65cde2c01
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 399df88741ef..71179576a3b0 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/lbzip2-2.5-r1 b/metadata/md5-cache/app-arch/lbzip2-2.5-r1
index e493fc56b904..17c71cf78af1 100644
--- a/metadata/md5-cache/app-arch/lbzip2-2.5-r1
+++ b/metadata/md5-cache/app-arch/lbzip2-2.5-r1
@@ -3,9 +3,9 @@ DESCRIPTION=Parallel bzip2 utility
EAPI=6
HOMEPAGE=https://github.com/kjn/lbzip2/
IUSE=debug symlink
-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-3
RDEPEND=symlink? ( !app-arch/pbzip2[symlink] )
SLOT=0
SRC_URI=http://archive.lbzip2.org/lbzip2-2.5.tar.gz
-_md5_=c369b591ff101e870066e5d36f99cd08
+_md5_=94c086889fdd92a77fe55aef08a12bbf
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 54102ef5a735..daf22656e383 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/pgpdump-0.33 b/metadata/md5-cache/app-crypt/pgpdump-0.33
index d95a071013a2..4ab594bbc574 100644
--- a/metadata/md5-cache/app-crypt/pgpdump-0.33
+++ b/metadata/md5-cache/app-crypt/pgpdump-0.33
@@ -3,9 +3,9 @@ DEPEND=sys-libs/zlib app-arch/bzip2
DESCRIPTION=A PGP packet visualizer
EAPI=6
HOMEPAGE=http://www.mew.org/~kazu/proj/pgpdump/
-KEYWORDS=~amd64 ppc sparc x86
+KEYWORDS=amd64 ppc sparc x86
LICENSE=BSD
RDEPEND=sys-libs/zlib app-arch/bzip2
SLOT=0
SRC_URI=http://www.mew.org/~kazu/proj/pgpdump/pgpdump-0.33.tar.gz
-_md5_=8a9549b131b9c8a2095e114797f4435e
+_md5_=01c6023cbfb70c38c5c3249f0db7e98e
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 9603c4fe2d69..561999d422bc 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/xmltoman-0.4-r1 b/metadata/md5-cache/app-doc/xmltoman-0.4-r1
index 1aa4145a51f4..f1af268d09b0 100644
--- a/metadata/md5-cache/app-doc/xmltoman-0.4-r1
+++ b/metadata/md5-cache/app-doc/xmltoman-0.4-r1
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl dev-perl/XML-Parser
DESCRIPTION=Simple scripts for converting xml to groff or html
EAPI=6
HOMEPAGE=https://sourceforge.net/projects/xmltoman/
-KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
LICENSE=GPL-2
RDEPEND=dev-lang/perl dev-perl/XML-Parser
SLOT=0
SRC_URI=mirror://sourceforge/xmltoman/xmltoman-0.4.tar.gz
-_md5_=8371e15c6c3ede95506b6b4f102209c1
+_md5_=14eb4c222772cf3ece441e690fab327b
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 1475ea8488b4..f9da0c01f0a1 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/jasspa-microemacs-20091011-r2 b/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r2
deleted file mode 100644
index a19859d343d4..000000000000
--- a/metadata/md5-cache/app-editors/jasspa-microemacs-20091011-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DEPEND=sys-libs/ncurses X? ( x11-libs/libX11 xpm? ( x11-libs/libXpm ) ) nanoemacs? ( !app-editors/ne ) virtual/pkgconfig X? ( x11-libs/libXt x11-base/xorg-proto )
-DESCRIPTION=Jasspa Microemacs
-EAPI=4
-HOMEPAGE=http://www.jasspa.com/
-IUSE=nanoemacs X xpm
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=sys-libs/ncurses X? ( x11-libs/libX11 xpm? ( x11-libs/libXpm ) ) nanoemacs? ( !app-editors/ne )
-SLOT=0
-SRC_URI=http://www.jasspa.com/release_20090909/jasspa-mesrc-20091011.tar.gz !nanoemacs? ( http://www.jasspa.com/release_20090909/jasspa-memacros-20091017.tar.gz http://www.jasspa.com/release_20090909/jasspa-mehtml-20091011.tar.gz http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=587797109cb3bbf75c2d257f402a66a0
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 10f22c452f7b..e753e4d9d9cf 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/dash-2.14.1 b/metadata/md5-cache/app-emacs/dash-2.14.1
index 4fd0d080947e..dda60c063a13 100644
--- a/metadata/md5-cache/app-emacs/dash-2.14.1
+++ b/metadata/md5-cache/app-emacs/dash-2.14.1
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo >=virtual/emacs-23
DESCRIPTION=A modern list library for Emacs
EAPI=6
HOMEPAGE=https://github.com/magnars/dash.el
-KEYWORDS=amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3+
RDEPEND=>=virtual/emacs-23
SLOT=0
SRC_URI=https://github.com/magnars/dash.el/archive/2.14.1.tar.gz -> dash-2.14.1.tar.gz
_eclasses_=elisp efe1c459331d853614b12c63ab169a32 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=54deb5c228ea06316822407c86218ea5
+_md5_=cf1e2d45dbd2940a6814bd8f0ef154a4
diff --git a/metadata/md5-cache/app-emacs/ghub-2.0.1 b/metadata/md5-cache/app-emacs/ghub-2.0.1
index a4ec3b79cf13..f6372a321ece 100644
--- a/metadata/md5-cache/app-emacs/ghub-2.0.1
+++ b/metadata/md5-cache/app-emacs/ghub-2.0.1
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo >=virtual/emacs-25
DESCRIPTION=minuscule client library for the Github API
EAPI=6
HOMEPAGE=https://magit.vc/manual/ghub
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3+
RDEPEND=>=virtual/emacs-25
SLOT=0
SRC_URI=https://github.com/magit/ghub/archive/v2.0.1.tar.gz -> ghub-2.0.1.tar.gz
_eclasses_=elisp efe1c459331d853614b12c63ab169a32 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=c5c10766e3534ccad6ec7c37d5c73056
+_md5_=dcf8dbc5739909598d59416156485890
diff --git a/metadata/md5-cache/app-emacs/magit-2.13.1 b/metadata/md5-cache/app-emacs/magit-2.13.1
index b42f2ab94ba9..37b0b65c12eb 100644
--- a/metadata/md5-cache/app-emacs/magit-2.13.1
+++ b/metadata/md5-cache/app-emacs/magit-2.13.1
@@ -3,10 +3,10 @@ DEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/ghub-2.0.1 >=app-emacs/magit-popup-2.
DESCRIPTION=A Git porcelain inside Emacs
EAPI=6
HOMEPAGE=https://magit.vc/
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3+
RDEPEND=>=app-emacs/dash-2.14.1 >=app-emacs/ghub-2.0.1 >=app-emacs/magit-popup-2.12.3 >=app-emacs/with-editor-2.7.3 >=dev-vcs/git-1.9.4 >=virtual/emacs-24
SLOT=0
SRC_URI=https://github.com/magit/magit/archive/2.13.1.tar.gz -> magit-2.13.1.tar.gz
_eclasses_=elisp efe1c459331d853614b12c63ab169a32 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=0ed26c562d775102fc1726dfb08df579
+_md5_=026fb69525df745b6e7c38a104561eae
diff --git a/metadata/md5-cache/app-emacs/with-editor-2.7.4 b/metadata/md5-cache/app-emacs/with-editor-2.7.4
index f4c81f6e77cf..89b0039e8d03 100644
--- a/metadata/md5-cache/app-emacs/with-editor-2.7.4
+++ b/metadata/md5-cache/app-emacs/with-editor-2.7.4
@@ -3,10 +3,10 @@ DEPEND=sys-apps/texinfo >=virtual/emacs-24
DESCRIPTION=Use the Emacsclient as the $EDITOR of child processes
EAPI=6
HOMEPAGE=https://magit.vc/manual/with-editor
-KEYWORDS=amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3+
RDEPEND=!!=virtual/emacs-24
SLOT=0
SRC_URI=https://github.com/magit/with-editor/archive/v2.7.4.tar.gz -> with-editor-2.7.4.tar.gz
_eclasses_=elisp efe1c459331d853614b12c63ab169a32 elisp-common 23f47b2e1de7abf387105eddd1318738
-_md5_=73dceef453cecd01957d008d8ab108cb
+_md5_=1a01dceee6fc91c72d123ed5ee5a60fd
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 505303e2293f..c081bf8a675a 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/mc-4.8.22 b/metadata/md5-cache/app-misc/mc-4.8.22
index f70c447332f8..0cbd0198f602 100644
--- a/metadata/md5-cache/app-misc/mc-4.8.22
+++ b/metadata/md5-cache/app-misc/mc-4.8.22
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Midnight Commander is a text based file manager
EAPI=7
HOMEPAGE=https://www.midnight-commander.org
IUSE=+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
LICENSE=GPL-3
RDEPEND=>=dev-libs/glib-2.26.0:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses:0=[unicode?] ) spell? ( app-text/aspell ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
REQUIRED_USE=spell? ( edit )
SLOT=0
SRC_URI=http://ftp.midnight-commander.org/mc-4.8.22.tar.xz
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=6066c141a955d648009d494cd758df61
+_md5_=ad693de0cd4f16aa407b4c229837bf98
diff --git a/metadata/md5-cache/app-misc/worker-3.8.3 b/metadata/md5-cache/app-misc/worker-3.8.3
index f17bba290f98..b0ef77244366 100644
--- a/metadata/md5-cache/app-misc/worker-3.8.3
+++ b/metadata/md5-cache/app-misc/worker-3.8.3
@@ -4,10 +4,10 @@ DESCRIPTION=Worker Filemanager: Amiga Directory Opus 4 clone
EAPI=6
HOMEPAGE=http://www.boomerangsworld.de/cms/worker/
IUSE=avfs debug dbus examples libnotify lua +magic xinerama xft
-KEYWORDS=~amd64 ~arm ~hppa ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ppc ~ppc64 x86
LICENSE=GPL-2
RDEPEND=x11-libs/libX11 avfs? ( >=sys-fs/avfs-0.9.5 ) dbus? ( dev-libs/dbus-glib ) lua? ( dev-lang/lua:0 ) magic? ( sys-apps/file ) xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXinerama )
SLOT=0
SRC_URI=http://www.boomerangsworld.de/cms/worker/downloads/worker-3.8.3.tar.bz2
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=644c57ca794d8ff2b9d98fd66c257b2a
+_md5_=863607bd947be53f1647bcf40777d901
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index a0e962149983..d01ef11e01d8 100644
Binary files a/metadata/md5-cache/app-office/Manifest.gz and b/metadata/md5-cache/app-office/Manifest.gz differ
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-6.1.5.2 b/metadata/md5-cache/app-office/libreoffice-bin-6.1.5.2
new file mode 100644
index 000000000000..3552b3187061
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-6.1.5.2
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=dev-util/xdelta:3 >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A full office productivity suite. Binary package
+EAPI=6
+HOMEPAGE=https://www.libreoffice.org
+IUSE=gnome java kde elibc_FreeBSD java python_targets_python3_6
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-3
+PDEPEND==app-office/libreoffice-l10n-6.1.5.2*
+RDEPEND=app-text/hunspell:0/1.6 =app-text/libexttextcat-3.4* =app-text/libmwaw-0.3* dev-libs/boost:0/1.65.0 dev-libs/icu:0/63.1 >=media-gfx/graphite2-1.3.10 media-libs/harfbuzz:0/0.9.18[icu] media-libs/libpng:0/16 >=sys-devel/gcc-7.3.0 >=sys-libs/glibc-2.27 virtual/jpeg:62 python_targets_python3_6? ( dev-lang/python:3.6[threads,xml] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_7(-),python_single_target_python3_6(+)] app-arch/unzip app-arch/zip app-crypt/gpgme[cxx] app-text/hunspell:= >=app-text/libabw-0.1.0 >=app-text/libebook-0.1 app-text/libepubgen >=app-text/libetonyek-0.1 app-text/libexttextcat app-text/liblangtag >=app-text/libmspub-0.1.0 >=app-text/libmwaw-0.3.1 app-text/libnumbertext >=app-text/libodfgen-0.1.0 app-text/libqxp app-text/libstaroffice app-text/libwpd:0.10[tools] app-text/libwpg:0.3 >=app-text/libwps-0.4 app-text/mythes >=dev-cpp/clucene-2.3.3.4-r2 =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl dev-libs/boost:=[nls] dev-libs/expat dev-libs/hyphen dev-libs/icu:= dev-libs/libassuan dev-libs/libgpg-error =dev-libs/liborcus-0.13* dev-libs/librevenge dev-libs/libxml2 dev-libs/libxslt dev-libs/nspr dev-libs/nss >=dev-libs/redland-1.0.16 >=dev-libs/xmlsec-1.2.24[nss] media-gfx/graphite2 media-libs/fontconfig media-libs/freetype:2 >=media-libs/harfbuzz-0.9.42:=[graphite,icu] media-libs/lcms:2 >=media-libs/libcdr-0.1.0 >=media-libs/libepoxy-1.3.1[X] >=media-libs/libfreehand-0.1.0 media-libs/libpagemaker >=media-libs/libpng-1.4:0= >=media-libs/libvisio-0.1.0 media-libs/libzmf net-libs/neon net-misc/curl net-nds/openldap sci-mathematics/lpsolve sys-libs/zlib virtual/glu virtual/jpeg:0 virtual/opengl x11-libs/cairo[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender net-print/cups dev-libs/dbus-glib gnome? ( dev-libs/glib:2 gnome-base/dconf gnome-extra/evolution-data-server ) media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 gnome? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) kde? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf media-libs/mesa[egl] x11-libs/gtk+:3 x11-libs/pango ) x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 x11-libs/pango kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kio:5 kde-frameworks/kwindowsystem:5 ) !app-office/libreoffice !app-office/openoffice media-fonts/liberation-fonts || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) java? ( >=virtual/jre-1.6 ) kde? ( kde-frameworks/breeze-icons:* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=kde? ( !gnome ) gnome? ( !kde ) python_targets_python3_6
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-6.1.5.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-kde-6.1.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-kde-java-6.1.5.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-gnome-6.1.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-gnome-java-6.1.5.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-bin-libreoffice-java-6.1.5.2.xd3 ) ) ) ) x86? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-6.1.5.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-kde-6.1.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-kde-java-6.1.5.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-gnome-6.1.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-gnome-java-6.1.5.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-bin-libreoffice-java-6.1.5.2.xd3 ) ) ) )
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 99ea75c9f08fd38989951c554dfa56ea ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 pax-utils e85f015e815dd463b0c206d781ef45a5 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=58204803bb11d1325a669956f9fde975
diff --git a/metadata/md5-cache/app-office/libreoffice-bin-debug-6.1.5.2 b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.1.5.2
new file mode 100644
index 000000000000..03a2da6de2da
--- /dev/null
+++ b/metadata/md5-cache/app-office/libreoffice-bin-debug-6.1.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install unpack
+DEPEND=dev-util/xdelta:3
+DESCRIPTION=LibreOffice, a full office productivity suite. Binary package, debug info
+EAPI=6
+HOMEPAGE=https://www.libreoffice.org
+IUSE=gnome java kde
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=LGPL-3
+RDEPEND==app-office/libreoffice-bin-6.1.5.2[gnome=,java=,kde=]
+RESTRICT=test strip
+SLOT=0
+SRC_URI=amd64? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-6.1.5.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-kde-6.1.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-kde-java-6.1.5.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-gnome-6.1.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-gnome-java-6.1.5.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/amd64-debug-libreoffice-java-6.1.5.2.xd3 ) ) ) ) x86? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-6.1.5.2.tar.xz kde? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-kde-6.1.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-kde-java-6.1.5.2.xd3 ) ) gnome? ( !java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-gnome-6.1.5.2.xd3 ) java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-gnome-java-6.1.5.2.xd3 ) ) !kde? ( !gnome? ( java? ( https://tamiko.kyomu.43-1.org/distfiles/x86-debug-libreoffice-java-6.1.5.2.xd3 ) ) ) )
+_md5_=17879f92eb3aaaa7f786dfe95bcdf1fa
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index 431b9ab4a553..01020ec24211 100644
Binary files a/metadata/md5-cache/app-pda/Manifest.gz and b/metadata/md5-cache/app-pda/Manifest.gz differ
diff --git a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r2 b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r2
index 73cfbcc5f5fa..77814c4928dd 100644
--- a/metadata/md5-cache/app-pda/pilot-link-0.12.5-r2
+++ b/metadata/md5-cache/app-pda/pilot-link-0.12.5-r2
@@ -4,7 +4,7 @@ DESCRIPTION=Suite of tools for moving data between a Palm device and a desktop
EAPI=6
HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
IUSE=bluetooth debug java perl png python static-libs threads usb python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=|| ( GPL-2 LGPL-2 )
RDEPEND=dev-libs/popt >=sys-libs/ncurses-5.7-r7:0= >=sys-libs/readline-6:0= virtual/libiconv bluetooth? ( net-wireless/bluez ) perl? ( >=dev-lang/perl-5.12 ) png? ( media-libs/libpng:0= ) usb? ( virtual/libusb:0 ) java? ( >=virtual/jre-1.4 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/perl:= java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=|| ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://gentoo/pilot-link-0.12.5.tar.bz2 https://dev.gentoo.org/~mgorny/dist/pilot-link-0.12.5-gentoo-patchset.tar.bz2
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 71a5ee567fb298e553ce8d1319279151 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 99ea75c9f08fd38989951c554dfa56ea libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0a9aaabdd7005995aa96e87bc8978491
+_md5_=b36598686ecfaf94bb4da0d1932dfb1e
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 689ad7cd8cb5..93f383c05cb8 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/g-sorcery-9999 b/metadata/md5-cache/app-portage/g-sorcery-9999
index 7541bc907f6c..37b417320d45 100644
--- a/metadata/md5-cache/app-portage/g-sorcery-9999
+++ b/metadata/md5-cache/app-portage/g-sorcery-9999
@@ -1,7 +1,8 @@
+BDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) git? ( dev-vcs/git ) || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) git? ( dev-vcs/git ) || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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=framework for ebuild generators
-EAPI=6
+EAPI=7
HOMEPAGE=https://github.com/jauhien/g-sorcery
IUSE=bson git python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
LICENSE=GPL-2
@@ -9,5 +10,5 @@ PDEPEND=>=app-portage/layman-2.2.0[g-sorcery(-),python_targets_python2_7(-)?,pyt
RDEPEND=bson? ( dev-python/pymongo[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) git? ( dev-vcs/git ) || ( sys-apps/portage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-apps/portage-mgorny[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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
-_eclasses_=distutils-r1 71a5ee567fb298e553ce8d1319279151 git-r3 0d4635eeb5a96cd5315597a47eba25c9 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e2722e93634bc89ee6214cc288a7879c
+_eclasses_=distutils-r1 71a5ee567fb298e553ce8d1319279151 git-r3 0d4635eeb5a96cd5315597a47eba25c9 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861
+_md5_=3914ea0f544473b1394bfb3f922fcae4
diff --git a/metadata/md5-cache/app-portage/porticron-0.7.1 b/metadata/md5-cache/app-portage/porticron-0.7.1
index e2e1add52dc0..0551e71e39f1 100644
--- a/metadata/md5-cache/app-portage/porticron-0.7.1
+++ b/metadata/md5-cache/app-portage/porticron-0.7.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
DESCRIPTION=cron script to sync portage and send update mails to root
EAPI=6
HOMEPAGE=https://github.com/gentoo/porticron
-KEYWORDS=~amd64 ~arm hppa ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm hppa ppc ~ppc64 x86
LICENSE=BSD
RDEPEND=app-portage/gentoolkit net-dns/bind-tools
SLOT=0
SRC_URI=https://github.com/gentoo/porticron/archive/v0.7.1.tar.gz -> porticron-0.7.1.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921
-_md5_=5ce6373879b367ec263ad99a76d20c13
+_md5_=368a53c64e5e73c4d51f670bb1cbace1
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index a86a59968e9f..3fa04e25c80c 100644
Binary files a/metadata/md5-cache/app-text/Manifest.gz and b/metadata/md5-cache/app-text/Manifest.gz differ
diff --git a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r2 b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r2
index 99af7e51d4dc..5e5eb1beb286 100644
--- a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r2
+++ b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-1.0-r2
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
DESCRIPTION=Simplified Docbook DTD for XML
EAPI=0
HOMEPAGE=http://www.oasis-open.org/docbook/
-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
+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
LICENSE=docbook
RDEPEND=>=app-text/build-docbook-catalog-1.6
SLOT=1.0
SRC_URI=http://www.oasis-open.org/docbook/xml/simple/1.0/docbook-simple-1.0.zip
_eclasses_=base 2ec5c64f5de125f0c65a927c4c128fef desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 sgml-catalog a1731744d7cca1d14638e0e054ceea6e toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7dbb15379b91615563e2537f5a1ea00a
+_md5_=eedfa37002cf29bfc5accc360ca3835a
diff --git a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r3 b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r3
index a42ffbf4e7da..e753f9218322 100644
--- a/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r3
+++ b/metadata/md5-cache/app-text/docbook-xml-simple-dtd-4.1.2.4-r3
@@ -3,10 +3,10 @@ DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
DESCRIPTION=Docbook DTD for XML
EAPI=0
HOMEPAGE=http://www.oasis-open.org/docbook/
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
LICENSE=docbook
RDEPEND=>=app-text/build-docbook-catalog-1.6
SLOT=0
SRC_URI=mirror://gentoo/sdb4124.zip
_eclasses_=base 2ec5c64f5de125f0c65a927c4c128fef desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 sgml-catalog a1731744d7cca1d14638e0e054ceea6e toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=44997dbf16e0f91c984f7ab6edee88b5
+_md5_=99fcd7fb59b7c912136f83e850cfd9b8
diff --git a/metadata/md5-cache/app-text/openjade-1.3.2-r8 b/metadata/md5-cache/app-text/openjade-1.3.2-r8
index 3217ffff7cc5..6904a6b88eb5 100644
--- a/metadata/md5-cache/app-text/openjade-1.3.2-r8
+++ b/metadata/md5-cache/app-text/openjade-1.3.2-r8
@@ -5,10 +5,10 @@ DESCRIPTION=Jade is an implementation of DSSSL for formatting SGML and XML docum
EAPI=7
HOMEPAGE=http://openjade.sourceforge.net
IUSE=static-libs
-KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1
SLOT=0
SRC_URI=mirror://sourceforge/openjade/openjade-1.3.2.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 sgml-catalog a1731744d7cca1d14638e0e054ceea6e toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=1237e8b454ea251facdb4699f76a4c19
+_md5_=3325ad960ff9799801dfd5c7b551d8a1
diff --git a/metadata/md5-cache/app-text/qpdf-8.2.1 b/metadata/md5-cache/app-text/qpdf-8.2.1
index d9339f111654..18273d38144e 100644
--- a/metadata/md5-cache/app-text/qpdf-8.2.1
+++ b/metadata/md5-cache/app-text/qpdf-8.2.1
@@ -4,9 +4,9 @@ DESCRIPTION=Command-line tool for structural, content-preserving transformation
EAPI=7
HOMEPAGE=http://qpdf.sourceforge.net/
IUSE=doc examples perl static-libs test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
LICENSE=|| ( Apache-2.0 Artistic-2 )
RDEPEND=sys-libs/zlib virtual/jpeg:0= perl? ( >=dev-lang/perl-5.8 )
SLOT=0/21
SRC_URI=mirror://sourceforge/qpdf/qpdf-8.2.1.tar.gz
-_md5_=0c972d52061cc77706ebf22f25a6ab58
+_md5_=63a413ba10e269cc354c1036f3ed7107
diff --git a/metadata/md5-cache/app-text/robodoc-4.99.36 b/metadata/md5-cache/app-text/robodoc-4.99.43
similarity index 52%
rename from metadata/md5-cache/app-text/robodoc-4.99.36
rename to metadata/md5-cache/app-text/robodoc-4.99.43
index a64bd0469753..1262f822532e 100644
--- a/metadata/md5-cache/app-text/robodoc-4.99.36
+++ b/metadata/md5-cache/app-text/robodoc-4.99.43
@@ -1,12 +1,12 @@
DEFINED_PHASES=configure install
DEPEND=>=dev-util/ctags-5.3.1
DESCRIPTION=Automating Software Documentation
-EAPI=5
-HOMEPAGE=http://www.xs4all.nl/~rfsber/Robo/robodoc.html
+EAPI=7
+HOMEPAGE=https://www.xs4all.nl/~rfsber/Robo/robodoc.html
IUSE=examples
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=>=dev-util/ctags-5.3.1
SLOT=0
-SRC_URI=http://www.xs4all.nl/~rfsber/Robo/DistSource/robodoc-4.99.36.tar.gz
-_md5_=bb699e385c20968c8d7c8b6cb10b1329
+SRC_URI=https://rfsber.home.xs4all.nl/Robo/archives/robodoc-4.99.43.tar.gz
+_md5_=1b30c00e3c9a854506b1ef299ea855a9
diff --git a/metadata/md5-cache/app-text/zathura-0.4.1-r2 b/metadata/md5-cache/app-text/zathura-0.4.1-r2
index 123d36ca784f..d609c76b18ad 100644
--- a/metadata/md5-cache/app-text/zathura-0.4.1-r2
+++ b/metadata/md5-cache/app-text/zathura-0.4.1-r2
@@ -10,4 +10,4 @@ RDEPEND=>=dev-libs/girara-0.3.1 >=dev-libs/glib-2.50:2 dev-python/sphinx >=sys-d
SLOT=0
SRC_URI=https://pwmt.org/projects/zathura/download/zathura-0.4.1.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e meson 3c3f61163f786eebdbd8ad4f1e24ab7c multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=50f3ba4e61dc001b2915d26b988de505
+_md5_=8f0ff3e17c9e5fa4db2aa4dfd1d3dab9
diff --git a/metadata/md5-cache/app-text/zathura-0.4.3 b/metadata/md5-cache/app-text/zathura-0.4.3
index b19630475e0f..0f911dbde3c0 100644
--- a/metadata/md5-cache/app-text/zathura-0.4.3
+++ b/metadata/md5-cache/app-text/zathura-0.4.3
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://pwmt.org/projects/zathura/download/zathura-0.4.3.tar.xz
_eclasses_=meson 3c3f61163f786eebdbd8ad4f1e24ab7c multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 virtualx 401b718cc14d43a5a7fbe062c4851ba5
-_md5_=61d2bb88ff39ea1b10ffe6eb464d121c
+_md5_=f8f7efe561204f4ab3ab0be49ee7dcd5
diff --git a/metadata/md5-cache/app-text/zathura-9999 b/metadata/md5-cache/app-text/zathura-9999
index 2c78dadfbe16..cdede20e07fb 100644
--- a/metadata/md5-cache/app-text/zathura-9999
+++ b/metadata/md5-cache/app-text/zathura-9999
@@ -8,4 +8,4 @@ LICENSE=ZLIB
RDEPEND=>=dev-libs/girara-0.3.1 >=dev-libs/glib-2.50:2 dev-python/sphinx >=sys-devel/gettext-0.19.8 x11-libs/cairo >=x11-libs/gtk+-3.22:3 magic? ( sys-apps/file ) seccomp? ( sys-libs/libseccomp ) sqlite? ( >=dev-db/sqlite-3.5.9:3 ) synctex? ( app-text/texlive-core )
SLOT=0
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 0d4635eeb5a96cd5315597a47eba25c9 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e meson 3c3f61163f786eebdbd8ad4f1e24ab7c multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=77faeeb2bf9eaeb6d1561fe0ef066872
+_md5_=656a70a34b53fc0317e44750307d7c3a
diff --git a/metadata/md5-cache/dev-cpp/ETL-0.04.15-r1 b/metadata/md5-cache/dev-cpp/ETL-0.04.15-r1
new file mode 100644
index 000000000000..2e237096a70b
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/ETL-0.04.15-r1
@@ -0,0 +1,11 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DESCRIPTION=Multi-platform class and template library
+EAPI=7
+HOMEPAGE=https://www.synfig.org
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/synfig/ETL/0.04.15/ETL-0.04.15.tar.gz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861
+_md5_=3f2f65454ab10851324e723812874c66
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 6d58398794e5..3a114d50c302 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/glibmm-2.56.1 b/metadata/md5-cache/dev-cpp/glibmm-2.56.1
index c243d2473e38..210b673c5b1d 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.56.1
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.56.1
@@ -4,10 +4,10 @@ DESCRIPTION=C++ interface for glib2
EAPI=6
HOMEPAGE=https://www.gtkmm.org
IUSE=doc debug 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 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
LICENSE=LGPL-2.1+ GPL-2+
RDEPEND=>=dev-libs/libsigc++-2.9.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/glib-2.55.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=2
SRC_URI=mirror://gnome/sources/glibmm/2.56/glibmm-2.56.1.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 acac536f2c3bbcd312ac3faaa3e55e40 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a8c3df9866e20d80a7280ad96c8a6d4b
+_md5_=eb4e6f530e475b690fc1ea1ca5be00e6
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 7233ac7b5246..eeb1717621df 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/libiodbc-3.52.12 b/metadata/md5-cache/dev-db/libiodbc-3.52.12
index d0c292e0acfd..ddd6e2ad5606 100644
--- a/metadata/md5-cache/dev-db/libiodbc-3.52.12
+++ b/metadata/md5-cache/dev-db/libiodbc-3.52.12
@@ -4,10 +4,10 @@ DESCRIPTION=ODBC Interface for Linux
EAPI=6
HOMEPAGE=http://www.iodbc.org/
IUSE=gtk abi_x86_32 abi_x86_64 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
+KEYWORDS=alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=|| ( LGPL-2 BSD )
RDEPEND=gtk? ( x11-libs/gtk+:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0
SRC_URI=https://github.com/openlink/iODBC/archive/v3.52.12.zip -> libiodbc-3.52.12.zip
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=4dc10bf7b051fe1f57ebdcc7c7f7507b
+_md5_=feb55189a21ed4cdef08ba817be8cf77
diff --git a/metadata/md5-cache/dev-db/postgresql-11.1 b/metadata/md5-cache/dev-db/postgresql-11.1
index 8212941c94d8..51a351e327ed 100644
--- a/metadata/md5-cache/dev-db/postgresql-11.1
+++ b/metadata/md5-cache/dev-db/postgresql-11.1
@@ -4,11 +4,11 @@ DESCRIPTION=PostgreSQL RDBMS
EAPI=6
HOMEPAGE=http://www.postgresql.org/
IUSE=doc kerberos kernel_linux ldap libressl llvm nls pam perl python +readline selinux +server systemd ssl static-libs tcl threads uuid xml zlib elibc_glibc elibc_uclibc elibc_musl elibc_FreeBSD elibc_NetBSD elibc_OpenBSD kernel_linux python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=POSTGRESQL GPL-2
RDEPEND=>=app-eselect/eselect-postgresql-2.0 sys-apps/less virtual/libintl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) llvm? ( sys-devel/llvm:= sys-devel/clang:= ) pam? ( virtual/pam ) perl? ( >=dev-lang/perl-5.8:= ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) server? ( systemd? ( sys-apps/systemd ) ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.6-r1:0= ) libressl? ( dev-libs/libressl:= ) ) tcl? ( >=dev-lang/tcl-8:0= ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) zlib? ( sys-libs/zlib ) uuid? ( elibc_glibc? ( sys-apps/util-linux ) elibc_uclibc? ( sys-apps/util-linux ) elibc_musl? ( sys-apps/util-linux ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( !elibc_FreeBSD? ( !elibc_NetBSD? ( !elibc_OpenBSD? ( dev-libs/ossp-uuid ) ) ) ) ) ) ) !dev-db/postgresql-docs:11 !dev-db/postgresql-base:11 !dev-db/postgresql-server:11 selinux? ( sec-policy/selinux-postgresql )
REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
SLOT=11
SRC_URI=mirror://postgresql/source/v11.1/postgresql-11.1.tar.bz2
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e l10n 97f2753e3f1f3753d53d856c7c0bbb0b linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 pam 3e788d86170dfcd5b06824d898315e18 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=7f37c23adf0ea893e14aedad54c2be0a
+_md5_=b56350cb6b7dc491a6fa93f7a6a676b7
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 86e236fa008d..c271128bf062 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r13 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r13
new file mode 100644
index 000000000000..702ae6e7cdb0
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.26-r13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( dev-db/mysql-connector-c: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(-)?] ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.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(-)?] ) ssl? ( !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(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
+EAPI=6
+HOMEPAGE=https://www.cyrusimap.org/sasl/
+IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-with-attribution
+RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( dev-db/mysql-connector-c: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(-)?] ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.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(-)?] ) ssl? ( !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(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=2
+SRC_URI=ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.26.tar.gz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 99ea75c9f08fd38989951c554dfa56ea libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_md5_=7487b1f484cb6e9fcf8d560f64b100b8
diff --git a/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r2 b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r2
new file mode 100644
index 000000000000..07c011f660be
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/cyrus-sasl-2.1.27-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( dev-db/mysql-connector-c: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(-)?] ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.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(-)?] ) ssl? ( !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(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=The Cyrus SASL (Simple Authentication and Security Layer)
+EAPI=6
+HOMEPAGE=https://www.cyrusimap.org/sasl/
+IUSE=authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite srp ssl static-libs urandom abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 elibc_FreeBSD java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD-with-attribution
+RDEPEND=net-mail/mailbase authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-4.8.30-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(-)?] ) gdbm? ( >=sys-libs/gdbm-1.10-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) openldap? ( >=net-nds/openldap-2.4.38-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(-)?] ) mysql? ( dev-db/mysql-connector-c: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(-)?] ) pam? ( >=virtual/pam-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(-)?] ) postgres? ( dev-db/postgresql:* ) sqlite? ( >=dev-db/sqlite-3.8.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(-)?] ) ssl? ( !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(-)?] ) ) java? ( >=virtual/jdk-1.6:= ) selinux? ( sec-policy/selinux-sasl ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=2
+SRC_URI=https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-2.1.27/cyrus-sasl-2.1.27.tar.gz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 99ea75c9f08fd38989951c554dfa56ea libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 pam 3e788d86170dfcd5b06824d898315e18 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_md5_=4ffff459efe4e72115a6e2e216681c7e
diff --git a/metadata/md5-cache/dev-libs/faxpp-0.4-r1 b/metadata/md5-cache/dev-libs/faxpp-0.4-r1
new file mode 100644
index 000000000000..b3339ff4f651
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/faxpp-0.4-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Small, fast and conformant XML pull parser written in C
+EAPI=7
+HOMEPAGE=http://faxpp.sourceforge.net/
+IUSE=doc examples
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=mirror://sourceforge/faxpp/faxpp-0.4.tar.gz
+_md5_=41d0d0a344257e25cd5333e2c0630f60
diff --git a/metadata/md5-cache/dev-libs/libinput-1.12.6 b/metadata/md5-cache/dev-libs/libinput-1.12.6
index e6c76edea580..9881c4d0fab2 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.12.6
+++ b/metadata/md5-cache/dev-libs/libinput-1.12.6
@@ -5,11 +5,11 @@ DESCRIPTION=Library to handle input devices in Wayland
EAPI=7
HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
IUSE=doc input_devices_wacom
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
LICENSE=MIT
RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev:= virtual/udev
RESTRICT=test
SLOT=0/10
SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.12.6.tar.xz
_eclasses_=meson 3c3f61163f786eebdbd8ad4f1e24ab7c multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac
-_md5_=0a16b349f26c5bd8b273853d76e48644
+_md5_=90c9c8274114ace4968817f8112bfe2e
diff --git a/metadata/md5-cache/dev-libs/liblzw-0.2-r1 b/metadata/md5-cache/dev-libs/liblzw-0.2-r1
index 5cdc6a582fd0..6c4fdfefcbbb 100644
--- a/metadata/md5-cache/dev-libs/liblzw-0.2-r1
+++ b/metadata/md5-cache/dev-libs/liblzw-0.2-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=configure install
DESCRIPTION=small C library for reading LZW compressed files (.Z)
EAPI=7
HOMEPAGE=https://github.com/vapier/liblzw
-KEYWORDS=~amd64 ~arm hppa ia64 ~m68k ~s390 ~sh ~x86
+KEYWORDS=~amd64 ~arm hppa ia64 ~m68k ~s390 ~sh x86
LICENSE=public-domain
SLOT=0
SRC_URI=mirror://sourceforge/freestdf/liblzw-0.2.tar.lzma
-_md5_=2d8661e19ece2589533d156afed5ca9d
+_md5_=1292115e19b3183133f7458fc35fa4a4
diff --git a/metadata/md5-cache/dev-libs/libzip-1.5.1 b/metadata/md5-cache/dev-libs/libzip-1.5.1
new file mode 100644
index 000000000000..94a706b555cc
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libzip-1.5.1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
+DESCRIPTION=Library for manipulating zip archives
+EAPI=7
+HOMEPAGE=https://nih.at/libzip/
+IUSE=bzip2 doc gnutls libressl ssl static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=BSD
+RDEPEND=sys-libs/zlib bzip2? ( app-arch/bzip2 ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) )
+SLOT=0/5
+SRC_URI=https://www.nih.at/libzip/libzip-1.5.1.tar.xz
+_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs f164325a2cdb5b3ea39311d483988861 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=04d5050cde60002652ac1edc2444de16
diff --git a/metadata/md5-cache/dev-libs/ltxml-1.2.9 b/metadata/md5-cache/dev-libs/ltxml-1.2.9
index e31106a21a75..c28e750798ca 100644
--- a/metadata/md5-cache/dev-libs/ltxml-1.2.9
+++ b/metadata/md5-cache/dev-libs/ltxml-1.2.9
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl
DESCRIPTION=Integrated set of XML tools and a developers tool-kit with C API
EAPI=4
HOMEPAGE=http://www.ltg.ed.ac.uk/software/xml/
-KEYWORDS=~amd64 ia64 ppc ~x86
+KEYWORDS=~amd64 ia64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=ftp://ftp.cogsci.ed.ac.uk/pub/LTXML/ltxml-1.2.9.tar.gz
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=7d622ff0d4ed1faf8998f09804d147e6
+_md5_=cda91981dff34e6fd35faa95efc2d996
diff --git a/metadata/md5-cache/dev-libs/poco-1.7.6-r1 b/metadata/md5-cache/dev-libs/poco-1.7.6-r1
new file mode 100644
index 000000000000..54afeaef8023
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/poco-1.7.6-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=C++ libraries for building network-based applications
+EAPI=6
+HOMEPAGE=https://pocoproject.org/
+IUSE=7z apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Boost-1.0
+RDEPEND=>=dev-libs/libpcre-8.13 xml? ( dev-libs/expat ) apache? ( dev-libs/apr dev-libs/apr-util www-servers/apache ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( !libressl? ( poco-1.7.6.tar.gz
+_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=3ac95a6b1526975b5aad4fad1eef5df7
diff --git a/metadata/md5-cache/dev-libs/poco-1.9.0-r1 b/metadata/md5-cache/dev-libs/poco-1.9.0-r1
new file mode 100644
index 000000000000..d9f4eaa61d72
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/poco-1.9.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
+DESCRIPTION=C++ libraries for building network-based applications
+EAPI=6
+HOMEPAGE=https://pocoproject.org/
+IUSE=7z apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl mariadb +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Boost-1.0
+RDEPEND=>=dev-libs/libpcre-8.13 xml? ( dev-libs/expat ) apache? ( dev-libs/apr dev-libs/apr-util www-servers/apache ) mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= ) mariadb? ( dev-db/mariadb-connector-c:0= ) ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( !libressl? ( poco-1.9.0.tar.gz
+_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=f0f376f60a78e247e0f1b0c877162e9b
diff --git a/metadata/md5-cache/dev-libs/protobuf-c-1.3.1 b/metadata/md5-cache/dev-libs/protobuf-c-1.3.1
index 78e38524967d..d0ef00bfac38 100644
--- a/metadata/md5-cache/dev-libs/protobuf-c-1.3.1
+++ b/metadata/md5-cache/dev-libs/protobuf-c-1.3.1
@@ -5,10 +5,10 @@ DESCRIPTION=Protocol Buffers implementation in C
EAPI=7
HOMEPAGE=https://github.com/protobuf-c/protobuf-c
IUSE=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 sparc ~x86
+KEYWORDS=alpha ~amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86
LICENSE=BSD-2
RDEPEND=>=dev-libs/protobuf-2.6.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0/1.0.0
SRC_URI=https://github.com/protobuf-c/protobuf-c/releases/download/v1.3.1/protobuf-c-1.3.1.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=ab2fb2678821d91ff6467ac4a6cc4767
+_md5_=b5635294a94db73781e7bc5323772acd
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.9-r1 b/metadata/md5-cache/dev-libs/pugixml-1.9-r1
index 224e5c9e3cd3..fda6ef2992c9 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.9-r1
+++ b/metadata/md5-cache/dev-libs/pugixml-1.9-r1
@@ -3,9 +3,9 @@ DEFINED_PHASES=compile configure install prepare test
DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
EAPI=7
HOMEPAGE=https://pugixml.org/ https://github.com/zeux/pugixml/
-KEYWORDS=~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=MIT
SLOT=0
SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.9/pugixml-1.9.tar.gz
_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs f164325a2cdb5b3ea39311d483988861 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2c21722a5da575cdbc7acbc92768d1da
+_md5_=c22f46fa5d625fb2950bfe376a218719
diff --git a/metadata/md5-cache/dev-libs/uulib-0.5.20-r1 b/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
index a72193ff8cbb..7379ee9d0b12 100644
--- a/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
+++ b/metadata/md5-cache/dev-libs/uulib-0.5.20-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=prepare
DESCRIPTION=Library that supports Base64 (MIME), uuencode, xxencode and binhex coding
EAPI=5
HOMEPAGE=http://www.fpx.de/fp/Software/UUDeview/
-KEYWORDS=alpha ~amd64 ~arm hppa ia64 ppc ~ppc64 ~sh sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm hppa ia64 ppc ~ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=07c12cbfb5b54458d650acc8a712905d
+_md5_=013530436a44b2bfff569ea6d66507ea
diff --git a/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1 b/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
index c8296c4dca2d..3f996547d475 100644
--- a/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
+++ b/metadata/md5-cache/dev-libs/xerces-c-3.2.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A validating XML parser written in a portable subset of C++
EAPI=6
HOMEPAGE=https://xerces.apache.org/xerces-c/
IUSE=cpu_flags_x86_sse2 curl doc elibc_Darwin elibc_FreeBSD examples iconv icu static-libs test threads
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
LICENSE=Apache-2.0
RDEPEND=icu? ( dev-libs/icu:0= ) curl? ( net-misc/curl ) virtual/libiconv
SLOT=0
SRC_URI=mirror://apache/xerces/c/3/sources/xerces-c-3.2.2.tar.gz
_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=5f8e7a0d5afb261307998ef7fb3f1370
+_md5_=8d95c4343f4fb923d5f59632f4c557d7
diff --git a/metadata/md5-cache/dev-lua/Manifest.gz b/metadata/md5-cache/dev-lua/Manifest.gz
index 4e707af3d035..bb0d3ea39c4d 100644
Binary files a/metadata/md5-cache/dev-lua/Manifest.gz and b/metadata/md5-cache/dev-lua/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r4 b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r4
index 28a91cb0bb22..aa79ede12832 100644
--- a/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r4
+++ b/metadata/md5-cache/dev-lua/luasocket-3.0_rc1-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Networking support library for the Lua language
EAPI=7
HOMEPAGE=http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/
IUSE=debug abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 hppa ~mips ppc ppc64 sparc x86
LICENSE=MIT
RDEPEND=>=dev-lang/lua-5.1.5-r2[deprecated,abi_x86_32(-)?,abi_x86_64(-)?,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://github.com/diegonehab/luasocket/archive/v3.0-rc1.tar.gz -> luasocket-3.0_rc1.tar.gz
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=5811edca76f3e1e0476789521c65c2f7
+_md5_=de58002c1879a3becf44f40866ed73fd
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 9b2310a5966e..8fd69075521a 100644
Binary files a/metadata/md5-cache/dev-ml/Manifest.gz and b/metadata/md5-cache/dev-ml/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ml/ocaml-autoconf-1.1-r1 b/metadata/md5-cache/dev-ml/ocaml-autoconf-1.1-r1
new file mode 100644
index 000000000000..307c43e31027
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-autoconf-1.1-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=autoconf macros to support configuration of OCaml programs and libraries
+EAPI=7
+HOMEPAGE=http://ocaml-autoconf.forge.ocamlcore.org/
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://forge.ocamlcore.org/frs/download.php/282/ocaml-autoconf-1.1.tar.gz
+_md5_=f4428cfc9f453c57b9e47670620923d4
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 786c0c12f740..bbaaff4a3c39 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/astroid-2.1.0 b/metadata/md5-cache/dev-python/astroid-2.1.0
index ea1e3d97ba74..d6766169458b 100644
--- a/metadata/md5-cache/dev-python/astroid-2.1.0
+++ b/metadata/md5-cache/dev-python/astroid-2.1.0
@@ -5,11 +5,11 @@ DESCRIPTION=Abstract Syntax Tree for logilab packages
EAPI=7
HOMEPAGE=https://github.com/PyCQA/astroid https://pypi.org/project/astroid/
IUSE=test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc64 ~sparc ~x86
LICENSE=LGPL-2.1
RDEPEND=dev-python/lazy-object-proxy[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/six[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/wrapt[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-python/typed-ast-1.2.0[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( <=dev-python/typed-ast-1.2.0[python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/a/astroid/astroid-2.1.0.tar.gz
_eclasses_=distutils-r1 71a5ee567fb298e553ce8d1319279151 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=faa1dc195520ee21bcb4f817f0885a14
+_md5_=687c5ab46b35ecb42e7bb7f691fd734e
diff --git a/metadata/md5-cache/dev-python/commonmark-0.8.1 b/metadata/md5-cache/dev-python/commonmark-0.8.1
index be237252a2ed..e02bc03f598b 100644
--- a/metadata/md5-cache/dev-python/commonmark-0.8.1
+++ b/metadata/md5-cache/dev-python/commonmark-0.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python parser for the CommonMark Markdown spec
EAPI=6
HOMEPAGE=https://github.com/rtfd/CommonMark-py
IUSE=test 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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=|| ( 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://pypi/c/commonmark/commonmark-0.8.1.tar.gz
_eclasses_=distutils-r1 71a5ee567fb298e553ce8d1319279151 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7c1274efc10fe0ff31a3076151d90687
+_md5_=d926a10485533386afa7b66dbc26b2d9
diff --git a/metadata/md5-cache/dev-python/ipython-5.8.0-r1 b/metadata/md5-cache/dev-python/ipython-5.8.0-r1
index 6b0fcb89b0bb..06d986e5092d 100644
--- a/metadata/md5-cache/dev-python/ipython-5.8.0-r1
+++ b/metadata/md5-cache/dev-python/ipython-5.8.0-r1
@@ -1,16 +1,16 @@
DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.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/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/python-typing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sphinxcontrib-websupport[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] >=dev-python/jedi-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] =dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] python_targets_python2_7? ( dev-python/backports-shutil_get_terminal_size[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/python-typing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] test? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] dev-python/nbformat[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] dev-python/testpath[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] ) doc? ( dev-python/ipykernel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] dev-python/sphinxcontrib-websupport[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Advanced interactive shell for Python
EAPI=6
HOMEPAGE=http://ipython.org/
-IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+IUSE=doc examples matplotlib notebook nbconvert qt5 +smp test wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 test
KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
-PDEPEND=notebook? ( dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/ipywidgets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt5? ( dev-python/qtconsole[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) smp? ( dev-python/ipyparallel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jedi-0.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/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] =dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] nbconvert? ( dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+PDEPEND=notebook? ( dev-python/notebook[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] dev-python/ipywidgets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] ) qt5? ( dev-python/qtconsole[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] ) smp? ( dev-python/ipyparallel[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] )
+RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] >=dev-python/jedi-0.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] dev-python/pexpect[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] dev-python/pickleshare[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] >=dev-python/prompt_toolkit-1.0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] =dev-python/traitlets-4.2.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] matplotlib? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] ) wxwidgets? ( python_targets_python2_7? ( dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) virtual/python-pathlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] nbconvert? ( dev-python/nbconvert[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[readline,sqlite,threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[readline,sqlite,threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[readline,sqlite,threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[readline,sqlite,threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[readline,sqlite,threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
RESTRICT=!test? ( test )
SLOT=0
SRC_URI=mirror://pypi/i/ipython/ipython-5.8.0.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 71a5ee567fb298e553ce8d1319279151 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=15df220fe92fd01390bac082e6251b31
+_md5_=1d5eaea37f90898282854fe9313db909
diff --git a/metadata/md5-cache/dev-python/lxml-4.3.1 b/metadata/md5-cache/dev-python/lxml-4.3.1
new file mode 100644
index 000000000000..9ce5e9e9c8dc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lxml-4.3.1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig python_targets_python2_7? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_4? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_5? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/setuptools[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(-)] test? ( dev-python/cssselect[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(-)] ) 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libxml2-2.9.5 >=dev-libs/libxslt-1.1.28
+DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
+EAPI=7
+HOMEPAGE=https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml
+IUSE=doc examples +threads test 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 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD ElementTree GPL-2 PSF-2
+RDEPEND=>=dev-libs/libxml2-2.9.5 >=dev-libs/libxslt-1.1.28 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=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=|| ( 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://pypi/l/lxml/lxml-4.3.1.tar.gz
+_eclasses_=distutils-r1 71a5ee567fb298e553ce8d1319279151 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861
+_md5_=68701286f89a2c65a8d4d895825725b7
diff --git a/metadata/md5-cache/dev-python/pylint-2.2.2 b/metadata/md5-cache/dev-python/pylint-2.2.2
index f74a8b7090a4..1a8308cecbc0 100644
--- a/metadata/md5-cache/dev-python/pylint-2.2.2
+++ b/metadata/md5-cache/dev-python/pylint-2.2.2
@@ -5,11 +5,11 @@ DESCRIPTION=Python code static checker
EAPI=7
HOMEPAGE=https://www.logilab.org/project/pylint https://pypi.org/project/pylint/ https://github.com/pycqa/pylint
IUSE=doc examples test python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=>=dev-python/astroid-2.0.0[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/isort-4.2.5[python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/mccabe[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(-)] virtual/python-singledispatch[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[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[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=mirror://pypi/p/pylint/pylint-2.2.2.tar.gz
_eclasses_=distutils-r1 71a5ee567fb298e553ce8d1319279151 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=48501c8a586cc4a96d1c418306903555
+_md5_=7587cb091e96c119d6f572f3ac9ad72f
diff --git a/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012 b/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012
index a66bfd9114ed..0f09bf9d0cfa 100644
--- a/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012
+++ b/metadata/md5-cache/dev-python/recommonmark-0.5.0_pre20181012
@@ -4,7 +4,7 @@ DESCRIPTION=Python docutils-compatibility bridge to CommonMark
EAPI=6
HOMEPAGE=https://recommonmark.readthedocs.io/
IUSE=test 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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=>=dev-python/commonmark-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] >=dev-python/sphinx-1.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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(-)] 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 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-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=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://github.com/rtfd/recommonmark/archive/fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz -> recommonmark-fdeeda5f6fe3ed8905deb7a067cc5951a477d091.tar.gz
_eclasses_=distutils-r1 71a5ee567fb298e553ce8d1319279151 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=166052ba8069302ddc87c0bf4e63fdac
+_md5_=8eb8c39f258ec820a2ae46e7353daa74
diff --git a/metadata/md5-cache/dev-python/setuptools-40.6.3 b/metadata/md5-cache/dev-python/setuptools-40.6.3
index e7dff634b453..a2a8427e7ec6 100644
--- a/metadata/md5-cache/dev-python/setuptools-40.6.3
+++ b/metadata/md5-cache/dev-python/setuptools-40.6.3
@@ -4,7 +4,7 @@ DESCRIPTION=Collection of extensions to Distutils
EAPI=6
HOMEPAGE=https://github.com/pypa/setuptools https://pypi.org/project/setuptools/
IUSE=test python_targets_pypy python_targets_pypy3 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 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
PDEPEND=>=dev-python/certifi-2016.9.26[python_targets_pypy(-)?,python_targets_pypy3(-)?,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_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(-)]
RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0=[xml(+)] ) python_targets_pypy3? ( >=virtual/pypy3-5:0=[xml(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python
SLOT=0
SRC_URI=mirror://pypi/s/setuptools/setuptools-40.6.3.zip
_eclasses_=distutils-r1 71a5ee567fb298e553ce8d1319279151 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0ee8826a1b525b01192b6de4b15c2be7
+_md5_=904c53b9d9724949cbdac8e982c5c0d0
diff --git a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4 b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4
index fe09202d9d66..8d97bf89d4fc 100644
--- a/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4
+++ b/metadata/md5-cache/dev-python/sphinx_rtd_theme-0.2.4
@@ -4,11 +4,11 @@ DESCRIPTION=ReadTheDocs.org theme for Sphinx
EAPI=6
HOMEPAGE=https://github.com/snide/sphinx_rtd_theme/
IUSE=python_targets_pypy python_targets_pypy3 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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~amd64-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-solaris
LICENSE=MIT
RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/s/sphinx_rtd_theme/sphinx_rtd_theme-0.2.4.tar.gz
_eclasses_=distutils-r1 71a5ee567fb298e553ce8d1319279151 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=272418c3ad20d9a4ee46ca75a04c2d6a
+_md5_=f83855bdf1f55ad4d057f944ef21650c
diff --git a/metadata/md5-cache/dev-python/typed-ast-1.2.0 b/metadata/md5-cache/dev-python/typed-ast-1.2.0
index 69cc15babc32..d7a3a9a33679 100644
--- a/metadata/md5-cache/dev-python/typed-ast-1.2.0
+++ b/metadata/md5-cache/dev-python/typed-ast-1.2.0
@@ -5,11 +5,11 @@ DESCRIPTION=Python typed-ast backported
EAPI=7
HOMEPAGE=https://pypi.org/project/typed-ast/
IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~ia64 ~ppc64 ~sparc ~x86
LICENSE=Apache-2.0 MIT
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 ) python_targets_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_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
SRC_URI=mirror://pypi/t/typed-ast/typed-ast-1.2.0.tar.gz
_eclasses_=distutils-r1 71a5ee567fb298e553ce8d1319279151 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=b97fb0de27c8a3fec8cb4de860a72711
+_md5_=70f9e5da80c2719abee69ae7cd836712
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index e889a3fde511..8b5e396ed0d7 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/minitar-0.8 b/metadata/md5-cache/dev-ruby/minitar-0.8
new file mode 100644
index 000000000000..d422ae44a9ff
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/minitar-0.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby23? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby25] ) ) ruby_targets_ruby26? ( test? ( >=dev-ruby/minitest-5.3:5[ruby_targets_ruby26] ) ) 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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) 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] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] ) )
+DESCRIPTION=Provides POSIX tarchive management from Ruby programs
+EAPI=6
+HOMEPAGE=https://github.com/halostatue/minitar
+IUSE=elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 test
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( BSD-2 Ruby )
+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_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26] )
+REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
+SLOT=0
+SRC_URI=https://github.com/halostatue/minitar/archive/v0.8.tar.gz -> minitar-0.8.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 99ea75c9f08fd38989951c554dfa56ea ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 4044516b167f460104703fee4a3c7f5f ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils 10cec86289e60f4b0d731b2e4b545e5d toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_md5_=ffa3005ab0520bce38a4705a57794cda
diff --git a/metadata/md5-cache/dev-ruby/puppet_forge-2.2.9 b/metadata/md5-cache/dev-ruby/puppet_forge-2.2.9
deleted file mode 100644
index 25fe4fb5d5c6..000000000000
--- a/metadata/md5-cache/dev-ruby/puppet_forge-2.2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby23] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby23] dev-ruby/archive-tar-minitar[ruby_targets_ruby23] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby24] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby24] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby24] dev-ruby/archive-tar-minitar[ruby_targets_ruby24] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby25] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby25] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby25] dev-ruby/archive-tar-minitar[ruby_targets_ruby25] =dev-ruby/semantic_puppet-1*[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=Tools to access Forge API information on Modules, Users, and Releases
-EAPI=6
-HOMEPAGE=https://github.com/puppetlabs/forge-ruby
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby23] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby23] dev-ruby/archive-tar-minitar[ruby_targets_ruby23] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby24] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby24] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby24] dev-ruby/archive-tar-minitar[ruby_targets_ruby24] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby25] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby25] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby25] dev-ruby/archive-tar-minitar[ruby_targets_ruby25] =dev-ruby/semantic_puppet-1*[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=2
-SRC_URI=mirror://rubygems/puppet_forge-2.2.9.gem
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 99ea75c9f08fd38989951c554dfa56ea ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 4044516b167f460104703fee4a3c7f5f ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils 10cec86289e60f4b0d731b2e4b545e5d toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=351893fcf9477ab589303f27896b0c06
diff --git a/metadata/md5-cache/dev-ruby/puppet_forge-2.2.9-r1 b/metadata/md5-cache/dev-ruby/puppet_forge-2.2.9-r1
new file mode 100644
index 000000000000..38bdbfbf7a53
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/puppet_forge-2.2.9-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby23] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby23] dev-ruby/minitar[ruby_targets_ruby23] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby24] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby24] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby24] dev-ruby/minitar[ruby_targets_ruby24] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby25] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby25] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby25] dev-ruby/minitar[ruby_targets_ruby25] =dev-ruby/semantic_puppet-1*[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=Tools to access Forge API information on Modules, Users, and Releases
+EAPI=6
+HOMEPAGE=https://github.com/puppetlabs/forge-ruby
+IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby23] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby23] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby23] dev-ruby/minitar[ruby_targets_ruby23] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby24] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby24] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby24] dev-ruby/minitar[ruby_targets_ruby24] =dev-ruby/semantic_puppet-1*[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9.0:0[ruby_targets_ruby25] >=dev-ruby/faraday_middleware-0.9.0:0[ruby_targets_ruby25] >=dev-ruby/gettext-setup-0.11:0[ruby_targets_ruby25] dev-ruby/minitar[ruby_targets_ruby25] =dev-ruby/semantic_puppet-1*[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=2
+SRC_URI=mirror://rubygems/puppet_forge-2.2.9.gem
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 99ea75c9f08fd38989951c554dfa56ea ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 4044516b167f460104703fee4a3c7f5f ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils 10cec86289e60f4b0d731b2e4b545e5d toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_md5_=b946ebf33eb054074b06cf7880ec7009
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 969577cb408e..511f6cbd0d5c 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/cmocka-1.1.3 b/metadata/md5-cache/dev-util/cmocka-1.1.3
index 5cf5b8a53a6c..79a853b41e13 100644
--- a/metadata/md5-cache/dev-util/cmocka-1.1.3
+++ b/metadata/md5-cache/dev-util/cmocka-1.1.3
@@ -4,9 +4,9 @@ DESCRIPTION=Unit testing framework for C
EAPI=7
HOMEPAGE=https://cmocka.org/
IUSE=doc examples 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 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=Apache-2.0
SLOT=0
SRC_URI=https://cmocka.org/files/1.1/cmocka-1.1.3.tar.xz
_eclasses_=cmake-multilib 9400794da450ca9e38faef6eefbb3957 cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs f164325a2cdb5b3ea39311d483988861 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=dca41de10465bc68dd7256e3f6df8d21
+_md5_=dd34bbb46efc3f78f8236509fd604b7f
diff --git a/metadata/md5-cache/dev-util/cunit-2.1_p3 b/metadata/md5-cache/dev-util/cunit-2.1_p3
index 8b934ad1e9c6..e6290e1cc36e 100644
--- a/metadata/md5-cache/dev-util/cunit-2.1_p3
+++ b/metadata/md5-cache/dev-util/cunit-2.1_p3
@@ -4,10 +4,10 @@ DESCRIPTION=C Unit Test Framework
EAPI=6
HOMEPAGE=http://cunit.sourceforge.net
IUSE=ncurses static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=LGPL-2
RDEPEND=ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0
SRC_URI=mirror://sourceforge/cunit/CUnit-2.1-3.tar.bz2
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=73e3930a97d0e3d7a1dde2d99a47db35
+_md5_=2e90d365fab6d5d1f5b1aee687385fca
diff --git a/metadata/md5-cache/dev-util/pkgconf-1.5.4 b/metadata/md5-cache/dev-util/pkgconf-1.5.4
index 7c3e3330d335..c3283a0741e5 100644
--- a/metadata/md5-cache/dev-util/pkgconf-1.5.4
+++ b/metadata/md5-cache/dev-util/pkgconf-1.5.4
@@ -4,11 +4,11 @@ DESCRIPTION=pkg-config compatible replacement with no dependencies other than AN
EAPI=6
HOMEPAGE=https://github.com/pkgconf/pkgconf
IUSE=+pkg-config 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 sparc ~x86
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86
LICENSE=ISC
RDEPEND=pkg-config? ( !dev-util/pkgconfig !dev-util/pkg-config-lite !dev-util/pkgconfig-openbsd[pkg-config] )
RESTRICT=!test? ( test )
SLOT=0/3
SRC_URI=http://distfiles.dereferenced.org/pkgconf/pkgconf-1.5.4.tar.xz
_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=87ba602dcaa1d00f729674df10d5e8e2
+_md5_=55253f976e784a17928c2aabd64ccbba
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index 12bad012c36c..8b49e3415469 100644
Binary files a/metadata/md5-cache/games-roguelike/Manifest.gz and b/metadata/md5-cache/games-roguelike/Manifest.gz differ
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.20.1 b/metadata/md5-cache/games-roguelike/stone-soup-0.20.1
deleted file mode 100644
index 3c9e9e521d93..000000000000
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.20.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl ) dev-lang/perl sys-devel/flex virtual/pkgconfig virtual/yacc tiles? ( sys-libs/ncurses:0 ) >=sys-apps/sed-4
-DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in dungeons
-EAPI=6
-HOMEPAGE=http://crawl.develz.org/wordpress/
-IUSE=debug luajit ncurses test +tiles
-KEYWORDS=amd64 x86
-LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
-RDEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://crawl.develz.org/release/0.20/stone_soup-0.20.1.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1abf47f103e71ac35b9286f1476cc5f7
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.22.0 b/metadata/md5-cache/games-roguelike/stone-soup-0.22.0
index fa3881efbc7f..3fc1cac44cb1 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.22.0
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.22.0
@@ -4,11 +4,11 @@ DESCRIPTION=Role-playing roguelike game of exploration and treasure-hunting in d
EAPI=6
HOMEPAGE=http://crawl.develz.org/wordpress/
IUSE=debug luajit ncurses test +tiles
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
RDEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl )
RESTRICT=test
SLOT=0
SRC_URI=https://crawl.develz.org/release/0.22/stone_soup-0.22.0.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2606a4742a72b766c60dea0d50474c2f
+_md5_=732c1c246462379a4988461cc5932453
diff --git a/metadata/md5-cache/games-roguelike/stone-soup-0.21.1 b/metadata/md5-cache/games-roguelike/stone-soup-0.23.0
similarity index 94%
rename from metadata/md5-cache/games-roguelike/stone-soup-0.21.1
rename to metadata/md5-cache/games-roguelike/stone-soup-0.23.0
index dd6ab2177beb..32a11dbe2d85 100644
--- a/metadata/md5-cache/games-roguelike/stone-soup-0.21.1
+++ b/metadata/md5-cache/games-roguelike/stone-soup-0.23.0
@@ -9,6 +9,6 @@ LICENSE=GPL-2 BSD BSD-2 public-domain CC0-1.0 MIT
RDEPEND=dev-db/sqlite:3 luajit? ( >=dev-lang/luajit-2.0.0 ) sys-libs/zlib !ncurses? ( !tiles? ( sys-libs/ncurses:0 ) ) ncurses? ( sys-libs/ncurses:0 ) tiles? ( media-fonts/dejavu media-libs/freetype:2 media-libs/libpng:0 media-libs/libsdl2[X,opengl,video] media-libs/sdl2-image[png] virtual/glu virtual/opengl )
RESTRICT=test
SLOT=0
-SRC_URI=https://crawl.develz.org/release/0.21/stone_soup-0.21.1.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
+SRC_URI=https://crawl.develz.org/release/0.23/stone_soup-0.23.0.tar.xz https://dev.gentoo.org/~hasufell/distfiles/stone-soup.png https://dev.gentoo.org/~hasufell/distfiles/stone-soup.svg
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=2606a4742a72b766c60dea0d50474c2f
+_md5_=100f9c436226a6dd091e7c8c3ac499fd
diff --git a/metadata/md5-cache/games-roguelike/tomenet-4.7.2 b/metadata/md5-cache/games-roguelike/tomenet-4.7.2
new file mode 100644
index 000000000000..5771f557dcce
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/tomenet-4.7.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=sys-libs/ncurses:0 !dedicated? ( X? ( x11-libs/libX11 ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis,smpeg,mp3] ) ) virtual/pkgconfig !dedicated? ( sound? ( app-arch/p7zip[wxwidgets] ) ) >=sys-apps/sed-4
+DESCRIPTION=A MMORPG based on the works of J.R.R. Tolkien
+EAPI=6
+HOMEPAGE=https://www.tomenet.eu
+IUSE=dedicated server +sound X
+KEYWORDS=~amd64 ~x86
+LICENSE=Moria
+RDEPEND=sys-libs/ncurses:0 !dedicated? ( X? ( x11-libs/libX11 ) sound? ( media-libs/libsdl[sound] media-libs/sdl-mixer[vorbis,smpeg,mp3] ) )
+SLOT=0
+SRC_URI=https://www.tomenet.eu/downloads/tomenet-4.7.2.tar.bz2
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=96efd6e03006e9e6c2659ce7a4b31627
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 20c4e956ab20..b9a21411453f 100644
Binary files a/metadata/md5-cache/gnome-extra/Manifest.gz and b/metadata/md5-cache/gnome-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-extra/cjs-4.0.0-r1 b/metadata/md5-cache/gnome-extra/cjs-4.0.0-r1
new file mode 100644
index 000000000000..fe454fc3d2d4
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/cjs-4.0.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-lang/spidermonkey:52 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-introspection-1.38:= sys-libs/readline:0= virtual/libffi cairo? ( x11-libs/cairo[X,glib] ) gtk? ( x11-libs/gtk+:3 ) gnome-base/gnome-common sys-devel/gettext virtual/pkgconfig test? ( sys-apps/dbus ) sys-devel/autoconf-archive >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Linux Mint's fork of gjs for Cinnamon
+EAPI=6
+HOMEPAGE=http://cinnamon.linuxmint.com/
+IUSE=+cairo examples gtk test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT || ( MPL-1.1 LGPL-2+ GPL-2+ )
+RDEPEND=dev-lang/spidermonkey:52 >=dev-libs/glib-2.37.3:2 >=dev-libs/gobject-introspection-1.38:= sys-libs/readline:0= virtual/libffi cairo? ( x11-libs/cairo[X,glib] ) gtk? ( x11-libs/gtk+:3 ) ! cjs-4.0.0.tar.gz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 acac536f2c3bbcd312ac3faaa3e55e40 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 pax-utils e85f015e815dd463b0c206d781ef45a5 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=10aa156c487b737d5bb28f33195c471a
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index bef3df8b21b2..565f341b1bc3 100644
Binary files a/metadata/md5-cache/kde-misc/Manifest.gz and b/metadata/md5-cache/kde-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/kde-misc/krename-5.0.0-r1 b/metadata/md5-cache/kde-misc/krename-5.0.0-r1
index 0cc5e4e2a751..0f2ac8311516 100644
--- a/metadata/md5-cache/kde-misc/krename-5.0.0-r1
+++ b/metadata/md5-cache/kde-misc/krename-5.0.0-r1
@@ -5,10 +5,10 @@ DESCRIPTION=Powerful batch file renamer
EAPI=7
HOMEPAGE=http://www.krename.net/
IUSE=exif pdf taglib truetype debug test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=GPL-2
RDEPEND=>=kde-frameworks/kcompletion-5.54.0:5 >=kde-frameworks/kconfig-5.54.0:5 >=kde-frameworks/kcoreaddons-5.54.0:5 >=kde-frameworks/kcrash-5.54.0:5 >=kde-frameworks/ki18n-5.54.0:5 >=kde-frameworks/kiconthemes-5.54.0:5 >=kde-frameworks/kio-5.54.0:5 >=kde-frameworks/kitemviews-5.54.0:5 >=kde-frameworks/kjobwidgets-5.54.0:5 >=kde-frameworks/kjs-5.54.0:5 >=kde-frameworks/kservice-5.54.0:5 >=kde-frameworks/kwidgetsaddons-5.54.0:5 >=kde-frameworks/kxmlgui-5.54.0:5 >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtwidgets-5.11.1:5 >=dev-qt/qtxml-5.11.1:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo:= ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) !kde-misc/krename:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
SLOT=5
SRC_URI=mirror://kde/stable/krename/5.0.0/src/krename-5.0.0.tar.xz
_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e kde5 1349a105b08a8bb265c1d22984d0dad2 kde5-functions 1236edc19d52100e99be7dc2fc91db0a multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs f164325a2cdb5b3ea39311d483988861 virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=0859ead6ae22edf937fa53053cdb8b9c
+_md5_=430b1a9cf8391a48c3f777bc441f71e3
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index 81745f89db1d..1de8af01d40e 100644
Binary files a/metadata/md5-cache/mail-client/Manifest.gz and b/metadata/md5-cache/mail-client/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.15.0-r2 b/metadata/md5-cache/mail-client/claws-mail-3.15.0-r2
deleted file mode 100644
index 7188e656aaa5..000000000000
--- a/metadata/md5-cache/mail-client/claws-mail-3.15.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=net-mail/ytnef archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) gdata? ( >=dev-libs/libgdata-0.17.2 ) gnutls? ( >=net-libs/gnutls-3.0 ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.20:2 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-1.0.0 ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-arch/xz-utils virtual/pkgconfig xface? ( >=media-libs/compface-1.4 ) >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=An email client (and news reader) based on GTK+
-EAPI=6
-HOMEPAGE=https://www.claws-mail.org/
-IUSE=archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface python_targets_python2_7
-KEYWORDS=alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86
-LICENSE=GPL-3
-RDEPEND=net-mail/ytnef archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) gdata? ( >=dev-libs/libgdata-0.17.2 ) gnutls? ( >=net-libs/gnutls-3.0 ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.20:2 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-1.0.0 ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) 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(+)] >=dev-python/pygtk-2.10.3 ) rss? ( dev-libs/libxml2 net-misc/curl )
-REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( python_targets_python2_7 ) smime? ( pgp )
-SLOT=0
-SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.15.0.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=9b52c9dcd2d4b3b46bd5c2932ebe20ff
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.15.1 b/metadata/md5-cache/mail-client/claws-mail-3.15.1
deleted file mode 100644
index dd13c70b340b..000000000000
--- a/metadata/md5-cache/mail-client/claws-mail-3.15.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=net-mail/ytnef archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) gdata? ( >=dev-libs/libgdata-0.17.2 ) gnutls? ( >=net-libs/gnutls-3.0 ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.20:2 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-1.0.0 ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-arch/xz-utils virtual/pkgconfig xface? ( >=media-libs/compface-1.4 ) >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=An email client (and news reader) based on GTK+
-EAPI=6
-HOMEPAGE=https://www.claws-mail.org/
-IUSE=archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=net-mail/ytnef archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) gdata? ( >=dev-libs/libgdata-0.17.2 ) gnutls? ( >=net-libs/gnutls-3.0 ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.20:2 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-1.0.0 ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) 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(+)] >=dev-python/pygtk-2.10.3 ) rss? ( dev-libs/libxml2 net-misc/curl )
-REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( python_targets_python2_7 ) smime? ( pgp )
-SLOT=0
-SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.15.1.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=abdbfb2a57b00b692dcdcb5c1e1b2479
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.16.0 b/metadata/md5-cache/mail-client/claws-mail-3.16.0
deleted file mode 100644
index 13ccbad82f25..000000000000
--- a/metadata/md5-cache/mail-client/claws-mail-3.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=net-mail/ytnef archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) gdata? ( >=dev-libs/libgdata-0.17.2 ) gnutls? ( >=net-libs/gnutls-3.0 ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.20:2 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-1.0.0 ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-arch/xz-utils virtual/pkgconfig xface? ( >=media-libs/compface-1.4 ) >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=An email client (and news reader) based on GTK+
-EAPI=6
-HOMEPAGE=https://www.claws-mail.org/
-IUSE=archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=net-mail/ytnef archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) gdata? ( >=dev-libs/libgdata-0.17.2 ) gnutls? ( >=net-libs/gnutls-3.0 ) gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( >=x11-libs/gtk+-2.20:2 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-1.0.0 ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) 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(+)] >=dev-python/pygtk-2.10.3 ) rss? ( dev-libs/libxml2 net-misc/curl )
-REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( python_targets_python2_7 ) smime? ( pgp )
-SLOT=0
-SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.16.0.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=d636afa8d7e2e12f833a2b0c7f4fb309
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.17.2 b/metadata/md5-cache/mail-client/claws-mail-3.17.2
deleted file mode 100644
index 99659b719e42..000000000000
--- a/metadata/md5-cache/mail-client/claws-mail-3.17.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/nettle net-mail/ytnef >=x11-libs/gtk+-2.24:2 archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-1.0.0 ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-arch/xz-utils virtual/pkgconfig xface? ( >=media-libs/compface-1.4 ) >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
-DESCRIPTION=An email client (and news reader) based on GTK+
-EAPI=6
-HOMEPAGE=https://www.claws-mail.org/
-IUSE=archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/nettle net-mail/ytnef >=x11-libs/gtk+-2.24:2 archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-1.0.0 ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) 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(+)] >=dev-python/pygtk-2.10.3 ) rss? ( dev-libs/libxml2 net-misc/curl )
-REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( python_targets_python2_7 ) smime? ( pgp )
-SLOT=0
-SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.17.2.tar.xz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=8c9de34bbdd7d08e665180c7f3f52c5e
diff --git a/metadata/md5-cache/mail-client/claws-mail-3.17.3 b/metadata/md5-cache/mail-client/claws-mail-3.17.3
index 0ea41c75dbee..79637af81dd1 100644
--- a/metadata/md5-cache/mail-client/claws-mail-3.17.3
+++ b/metadata/md5-cache/mail-client/claws-mail-3.17.3
@@ -4,11 +4,11 @@ DESCRIPTION=An email client (and news reader) based on GTK+
EAPI=6
HOMEPAGE=https://www.claws-mail.org/
IUSE=archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface python_targets_python2_7
-KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86
LICENSE=GPL-3
RDEPEND=dev-libs/nettle net-mail/ytnef >=x11-libs/gtk+-2.24:2 archive? ( app-arch/libarchive >=net-misc/curl-7.9.7 ) bogofilter? ( mail-filter/bogofilter ) calendar? ( >=dev-libs/libical-2.0.0:= >=net-misc/curl-7.9.7 ) dbus? ( >=dev-libs/dbus-glib-0.60 ) gdata? ( >=dev-libs/libgdata-0.17.2 ) dillo? ( www-client/dillo ) gnutls? ( >=net-libs/gnutls-3.0 ) imap? ( >=net-libs/libetpan-0.57 ) ldap? ( >=net-nds/openldap-2.0.7 ) nls? ( >=sys-devel/gettext-0.18 ) nntp? ( >=net-libs/libetpan-0.57 ) notification? ( dev-libs/glib:2 libcanberra? ( media-libs/libcanberra[gtk] ) libindicate? ( dev-libs/libindicate:3[gtk] ) libnotify? ( x11-libs/libnotify ) ) pda? ( >=app-pda/jpilot-0.99 ) pdf? ( app-text/poppler[cairo] ) pgp? ( >=app-crypt/gpgme-1.0.0 ) session? ( x11-libs/libICE x11-libs/libSM ) smime? ( >=app-crypt/gpgme-1.0.0 ) spam-report? ( >=net-misc/curl-7.9.7 ) spell? ( >=app-text/enchant-1.0.0 ) startup-notification? ( x11-libs/startup-notification ) svg? ( >=gnome-base/librsvg-2.40.5 ) valgrind? ( dev-util/valgrind ) app-misc/mime-types x11-misc/shared-mime-info clamav? ( app-antivirus/clamav ) networkmanager? ( net-misc/networkmanager ) pdf? ( app-text/ghostscript-gpl ) 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(+)] >=dev-python/pygtk-2.10.3 ) rss? ( dev-libs/libxml2 net-misc/curl )
REQUIRED_USE=libcanberra? ( notification ) libindicate? ( notification ) libnotify? ( notification ) networkmanager? ( dbus ) python? ( python_targets_python2_7 ) smime? ( pgp )
SLOT=0
SRC_URI=https://www.claws-mail.org/download.php?file=releases/claws-mail-3.17.3.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=13135cb0cd9292285e3e5303dc96ba51
+_md5_=f86b5179e44e3e15cba5a7b4d315f16f
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index e354cac8424c..288a7f1915ed 100644
Binary files a/metadata/md5-cache/mail-filter/Manifest.gz and b/metadata/md5-cache/mail-filter/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3 b/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3
index b92aa6820b0a..17e5361c0415 100644
--- a/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3
+++ b/metadata/md5-cache/mail-filter/amavisd-new-2.11.1-r3
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance interface between the MTA and content checkers
EAPI=6
HOMEPAGE=https://gitlab.com/amavis/amavis
IUSE=clamav courier dkim ldap mysql postgres qmail razor snmp spamassassin zmq
-KEYWORDS=amd64 ~hppa ~ppc ~ppc64 sparc x86
+KEYWORDS=amd64 hppa ~ppc ~ppc64 sparc x86
LICENSE=GPL-2 BSD-2
RDEPEND=>=sys-apps/sed-4 >=dev-lang/perl-5.10.0 >=sys-apps/coreutils-5.0-r3 app-arch/cpio app-arch/gzip app-arch/bzip2 app-arch/arc app-arch/cabextract app-arch/lha app-arch/lrzip app-arch/lzop app-arch/ncompress app-arch/p7zip app-arch/pax app-arch/unarj app-arch/unrar app-arch/xz-utils app-arch/zoo net-mail/ripole >=dev-perl/Archive-Zip-1.14 >=virtual/perl-IO-Compress-1.35 >=virtual/perl-Compress-Raw-Zlib-2.017 net-mail/tnef virtual/perl-MIME-Base64 >=dev-perl/MIME-tools-5.415 >=dev-perl/MailTools-1.58 >=dev-perl/Net-Server-0.91 virtual/perl-Digest-MD5 dev-perl/IO-stringy virtual/perl-IO-Socket-IP >=virtual/perl-Time-HiRes-1.49 dev-perl/Unix-Syslog dev-perl/Net-LibIDN dev-perl/File-LibMagic >=sys-libs/db-4.4.20 dev-perl/BerkeleyDB dev-perl/Convert-BinHex >=dev-perl/Mail-DKIM-0.31 virtual/perl-File-Temp dev-perl/Net-SSLeay dev-perl/IO-Socket-SSL virtual/mta clamav? ( app-antivirus/clamav ) ldap? ( >=dev-perl/perl-ldap-0.33 ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) razor? ( mail-filter/razor ) snmp? ( net-analyzer/net-snmp[perl] ) spamassassin? ( mail-filter/spamassassin dev-perl/Image-Info ) zmq? ( dev-perl/ZMQ-LibZMQ3 )
SLOT=0
SRC_URI=https://gitlab.com/amavis/amavis/-/archive/amavisd-new-2.11.1/amavis-amavisd-new-2.11.1.tar.gz
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=fcec1ab7a01209c59ab432a1760afcf6
+_md5_=cf49b892f6a3415a02afb3b2f2d4f5f2
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 9d9de605c414..173c6022a1a0 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/sxiv-25 b/metadata/md5-cache/media-gfx/sxiv-25
new file mode 100644
index 000000000000..4db06d4f128c
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/sxiv-25
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?,jpeg?,png?] x11-libs/libX11 x11-libs/libXft >=sys-apps/sed-4
+DESCRIPTION=Simple (or small or suckless) X Image Viewer
+EAPI=6
+HOMEPAGE=https://github.com/muennich/sxiv/
+IUSE=exif gif +jpeg +png savedconfig
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?,jpeg?,png?] x11-libs/libX11 x11-libs/libXft
+SLOT=0
+SRC_URI=https://github.com/muennich/sxiv/archive/v25.tar.gz -> sxiv-25.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=39496ff445e9ab9a9acc5a8980575246
diff --git a/metadata/md5-cache/media-gfx/sxiv-9999 b/metadata/md5-cache/media-gfx/sxiv-9999
index 21ac03b6c8dc..feb22f56cb36 100644
--- a/metadata/md5-cache/media-gfx/sxiv-9999
+++ b/metadata/md5-cache/media-gfx/sxiv-9999
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile install postinst postrm preinst prepare unpack
-DEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?] x11-libs/libX11 x11-libs/libXft >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?,jpeg?,png?] x11-libs/libX11 x11-libs/libXft >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
DESCRIPTION=Simple (or small or suckless) X Image Viewer
EAPI=6
HOMEPAGE=https://github.com/muennich/sxiv/
-IUSE=exif gif savedconfig
+IUSE=exif gif +jpeg +png savedconfig
LICENSE=GPL-2
-RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?] x11-libs/libX11 x11-libs/libXft
+RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?,jpeg?,png?] x11-libs/libX11 x11-libs/libXft
SLOT=0
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-r3 0d4635eeb5a96cd5315597a47eba25c9 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 portability 2b88d3ecc35035a3b8ab628b49cafb0e preserve-libs ef207dc62baddfddfd39a164d9797648 savedconfig e6948c872ff47e15a10e5ad1be15c18e toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a8bec5c1bb444a128042228fbc6c6f9c
+_md5_=39496ff445e9ab9a9acc5a8980575246
diff --git a/metadata/md5-cache/media-gfx/xv-3.10a-r19 b/metadata/md5-cache/media-gfx/xv-3.10a-r19
index b6d248c63ba9..91cc3afb3acf 100644
--- a/metadata/md5-cache/media-gfx/xv-3.10a-r19
+++ b/metadata/md5-cache/media-gfx/xv-3.10a-r19
@@ -4,10 +4,10 @@ DESCRIPTION=Interactive image manipulation program supporting a wide variety of
EAPI=6
HOMEPAGE=http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html
IUSE=jpeg tiff png
-KEYWORDS=alpha ~amd64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=alpha ~amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
LICENSE=xv
RDEPEND=x11-libs/libXt jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0= sys-libs/zlib )
SLOT=0
SRC_URI=mirror://sourceforge/png-mng/xv-3.10a-jumbo-patches-20070520.tar.gz ftp://ftp.cis.upenn.edu/pub/xv/xv-3.10a.tar.gz mirror://gentoo/xv-3.10a.png.bz2
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f380f6d1c290c7e32529cb0543dcdd50
+_md5_=0266f498d6a9cc876c561f09a5025a5a
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index fedfff3523c2..d498e5ed00be 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/gexiv2-0.10.10-r1 b/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
index 8dcc309c799b..a3c5a4bdd1e7 100644
--- a/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
+++ b/metadata/md5-cache/media-libs/gexiv2-0.10.10-r1
@@ -5,11 +5,11 @@ DESCRIPTION=GObject-based wrapper around the Exiv2 library
EAPI=7
HOMEPAGE=https://wiki.gnome.org/Projects/gexiv2
IUSE=gtk-doc +introspection python static-libs test vala python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-fbsd
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-fbsd
LICENSE=LGPL-2.1
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/glib-2.38.0:2 >=media-gfx/exiv2-0.21:= introspection? ( >=dev-libs/gobject-introspection-1.54:= )
REQUIRED_USE=python? ( introspection || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) test? ( python introspection ) vala? ( introspection )
SLOT=0
SRC_URI=mirror://gnome/sources/gexiv2/0.10/gexiv2-0.10.10.tar.xz
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 meson 3c3f61163f786eebdbd8ad4f1e24ab7c multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vala 2f3804278870542119da624a5eded505 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=e6072bbf0462445e1fbc619901a1a55d
+_md5_=be705c3840b5607b6811b50bf7c821f8
diff --git a/metadata/md5-cache/media-libs/glew-2.1.0-r1 b/metadata/md5-cache/media-libs/glew-2.1.0-r1
index 8047917a721b..6252e8d50420 100644
--- a/metadata/md5-cache/media-libs/glew-2.1.0-r1
+++ b/metadata/md5-cache/media-libs/glew-2.1.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=The OpenGL Extension Wrangler Library
EAPI=7
HOMEPAGE=http://glew.sourceforge.net/
IUSE=doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=BSD MIT
RDEPEND=>=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
SLOT=0/2.1
SRC_URI=mirror://sourceforge/glew/glew-2.1.0.tgz
_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=c286fa15708bcdac8c8c44600ba67c56
+_md5_=b31e9ab9569e4ad8345c896e46147343
diff --git a/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r3 b/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r3
index 0833d1a7f2f8..61d9808f7828 100644
--- a/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r3
+++ b/metadata/md5-cache/media-libs/libart_lgpl-2.3.21-r3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
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(-)?] >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=A LGPL version of libart
EAPI=6
-HOMEPAGE=http://www.levien.com/libart
+HOMEPAGE=https://www.levien.com/libart
IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
LICENSE=LGPL-2.1
@@ -10,4 +10,4 @@ RESTRICT=test
SLOT=0
SRC_URI=mirror://gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.tar.bz2
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 acac536f2c3bbcd312ac3faaa3e55e40 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=a4bf30494b5c27bd388972fab85d73a2
+_md5_=3952d38b41c412bb7a5d68fef265420d
diff --git a/metadata/md5-cache/media-libs/libsfml-2.5.1 b/metadata/md5-cache/media-libs/libsfml-2.5.1
index 0f2c6f7f3e7a..13efffc74be8 100644
--- a/metadata/md5-cache/media-libs/libsfml-2.5.1
+++ b/metadata/md5-cache/media-libs/libsfml-2.5.1
@@ -4,10 +4,10 @@ DESCRIPTION=Simple and Fast Multimedia Library (SFML)
EAPI=6
HOMEPAGE=http://www.sfml-dev.org/ https://github.com/SFML/SFML
IUSE=debug doc examples
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=ZLIB
RDEPEND=media-libs/flac media-libs/freetype:2 media-libs/libpng:0= media-libs/libogg media-libs/libvorbis media-libs/openal sys-libs/zlib virtual/jpeg:0 kernel_linux? ( virtual/libudev:0 ) virtual/opengl !kernel_Winnt? ( x11-libs/libX11 x11-libs/libXrandr x11-libs/libxcb x11-libs/xcb-util-image )
SLOT=0/2.5
SRC_URI=https://github.com/SFML/SFML/archive/2.5.1.tar.gz -> libsfml-2.5.1.tar.gz
_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=717c05d2a9b2c114f5db49e6c5361eff
+_md5_=f812df1d0e3be793d8ceae2c872ad041
diff --git a/metadata/md5-cache/media-libs/libsidplay-2.1.1-r5 b/metadata/md5-cache/media-libs/libsidplay-2.1.1-r5
new file mode 100644
index 000000000000..0bdcecd934d4
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsidplay-2.1.1-r5
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=C64 SID player library
+EAPI=7
+HOMEPAGE=http://sidplay2.sourceforge.net/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+SLOT=2
+SRC_URI=mirror://sourceforge/sidplay2/sidplay-libs-2.1.1.tar.gz
+_eclasses_=libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs f164325a2cdb5b3ea39311d483988861
+_md5_=93fe6e80baef531d3e78f215f6e88551
diff --git a/metadata/md5-cache/media-libs/libsidplayfp-0.3.8 b/metadata/md5-cache/media-libs/libsidplayfp-0.3.8
deleted file mode 100644
index 69d24dc72604..000000000000
--- a/metadata/md5-cache/media-libs/libsidplayfp-0.3.8
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=A library for the sidplay2 fork with resid-fp
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/sidplay-residfp/
-IUSE=static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/sidplay-residfp/libsidplayfp-0.3.8.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d519faab0cd022ef9e6001aee22e125d
diff --git a/metadata/md5-cache/media-libs/libsidplayfp-1.8.0 b/metadata/md5-cache/media-libs/libsidplayfp-1.8.0
deleted file mode 100644
index 6d28f4c0050c..000000000000
--- a/metadata/md5-cache/media-libs/libsidplayfp-1.8.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=A library for the sidplay2 fork with resid-fp
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/sidplay-residfp/
-IUSE=cpu_flags_x86_mmx static-libs
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/sidplay-residfp/libsidplayfp/1.8/libsidplayfp-1.8.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=1b3ab1865edbcb4a8e782570469f7673
diff --git a/metadata/md5-cache/media-libs/libsidplayfp-1.8.8 b/metadata/md5-cache/media-libs/libsidplayfp-1.8.8
new file mode 100644
index 000000000000..30764326ccee
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsidplayfp-1.8.8
@@ -0,0 +1,11 @@
+DEFINED_PHASES=configure install prepare
+DESCRIPTION=Library for the sidplay2 fork with resid-fp
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/sidplay-residfp/
+IUSE=cpu_flags_x86_mmx static-libs
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/sidplay-residfp/libsidplayfp/1.8/libsidplayfp-1.8.8.tar.gz
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861
+_md5_=6f51edefe0caf6d5787c6454a50dd19e
diff --git a/metadata/md5-cache/media-libs/libvpx-1.8.0 b/metadata/md5-cache/media-libs/libvpx-1.8.0
new file mode 100644
index 000000000000..597d1c7e5424
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libvpx-1.8.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=abi_x86_32? ( dev-lang/yasm ) abi_x86_64? ( dev-lang/yasm ) abi_x86_x32? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) amd64-fbsd? ( dev-lang/yasm ) doc? ( app-doc/doxygen dev-lang/php )
+DESCRIPTION=WebM VP8 and VP9 Codec SDK
+EAPI=7
+HOMEPAGE=https://www.webmproject.org
+IUSE=cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads abi_x86_32 abi_x86_64 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 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 ) test? ( threads )
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=https://github.com/webmproject/libvpx/archive/v1.8.0.tar.gz -> libvpx-1.8.0.tar.gz test? ( mirror://gentoo/libvpx-testdata-1.8.0.tar.xz )
+_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs f164325a2cdb5b3ea39311d483988861
+_md5_=5cd98e87892a13e323621ff2402be495
diff --git a/metadata/md5-cache/media-libs/libvpx-1.8.0-r1 b/metadata/md5-cache/media-libs/libvpx-1.8.0-r1
new file mode 100644
index 000000000000..a96f13eb6c65
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libvpx-1.8.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=abi_x86_32? ( dev-lang/yasm ) abi_x86_64? ( dev-lang/yasm ) abi_x86_x32? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) amd64-fbsd? ( dev-lang/yasm ) doc? ( app-doc/doxygen dev-lang/php )
+DESCRIPTION=WebM VP8 and VP9 Codec SDK
+EAPI=7
+HOMEPAGE=https://www.webmproject.org
+IUSE=doc +highbitdepth postproc static-libs svc test +threads abi_x86_32 abi_x86_64 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 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD
+REQUIRED_USE=test? ( threads )
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=https://github.com/webmproject/libvpx/archive/v1.8.0.tar.gz -> libvpx-1.8.0.tar.gz test? ( mirror://gentoo/libvpx-testdata-1.8.0.tar.xz )
+_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs f164325a2cdb5b3ea39311d483988861
+_md5_=006b17d4930acb8d97ae4e0899d57f8a
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 71ba53cf0648..0dbe870dff49 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/clementine-1.3.1_p20190127 b/metadata/md5-cache/media-sound/clementine-1.3.1_p20190127
index a8d5e3c767a1..1fc1fb0b37b5 100644
--- a/metadata/md5-cache/media-sound/clementine-1.3.1_p20190127
+++ b/metadata/md5-cache/media-sound/clementine-1.3.1_p20190127
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++[asm] dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 virtual/opengl ) >=dev-cpp/gtest-1.8.0 dev-libs/boost dev-qt/linguist-tools:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) projectm? ( dev-qt/qtopengl:5 ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=app-crypt/qca:2[qt5(+)] dev-db/sqlite:= dev-libs/crypto++[asm] dev-libs/glib:2 dev-libs/libxml2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=media-libs/libmygpo-qt-1.0.9[qt5(+)] >=media-libs/taglib-1.11.1_p20181028 sys-libs/zlib virtual/glu x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( media-libs/glew:= >=media-libs/libprojectm-1.2.0 virtual/opengl ) >=dev-cpp/gtest-1.8.0 dev-libs/boost dev-qt/linguist-tools:5 dev-qt/qtopengl:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) dropbox? ( dev-cpp/sparsehash ) googledrive? ( dev-cpp/sparsehash ) pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) test? ( dev-qt/qttest:5 gnome-base/gsettings-desktop-schemas ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
DESCRIPTION=Modern music player and library organizer based on Amarok 1.4 and Qt
EAPI=6
HOMEPAGE=https://www.clementine-player.org https://github.com/clementine-player/Clementine
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://github.com/clementine-player/Clementine/archive/610566d25271c67d1625fd62041f6a27435b0a9d.tar.gz -> clementine-1.3.1_p20190127.tar.gz
_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 l10n 97f2753e3f1f3753d53d856c7c0bbb0b ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=32e62d25de984a7109893ad6a264ba19
+_md5_=a27b78b1b1bd73318b05a0ecbf31bba9
diff --git a/metadata/md5-cache/media-sound/mpc-0.31 b/metadata/md5-cache/media-sound/mpc-0.31-r1
similarity index 61%
rename from metadata/md5-cache/media-sound/mpc-0.31
rename to metadata/md5-cache/media-sound/mpc-0.31-r1
index dc227de8e8e9..59522c79b2d0 100644
--- a/metadata/md5-cache/media-sound/mpc-0.31
+++ b/metadata/md5-cache/media-sound/mpc-0.31-r1
@@ -1,10 +1,10 @@
-BDEPEND=virtual/pkgconfig >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DEFINED_PHASES=compile configure install test
-DEPEND=media-libs/libmpdclient dev-python/sphinx iconv? ( virtual/libiconv ) test? ( dev-libs/check )
-DESCRIPTION=A commandline client for Music Player Daemon (media-sound/mpd)
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) iconv? ( virtual/libiconv ) test? ( dev-libs/check ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/libmpdclient
+DESCRIPTION=Commandline client for Music Player Daemon (media-sound/mpd)
EAPI=7
HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/mpc
-IUSE=iconv test
+IUSE=doc iconv test
KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2
RDEPEND=media-libs/libmpdclient
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
SLOT=0
SRC_URI=https://www.musicpd.org/download/mpc/0/mpc-0.31.tar.xz
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb meson 3c3f61163f786eebdbd8ad4f1e24ab7c multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=b17674ec79582c85ea21f75bb3ae4f0e
+_md5_=8bf97543f803f69721c73070ecca1481
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.33 b/metadata/md5-cache/media-sound/ncmpc-0.33-r1
similarity index 57%
rename from metadata/md5-cache/media-sound/ncmpc-0.33
rename to metadata/md5-cache/media-sound/ncmpc-0.33-r1
index 92f3d450f346..791d8ad34ca0 100644
--- a/metadata/md5-cache/media-sound/ncmpc-0.33
+++ b/metadata/md5-cache/media-sound/ncmpc-0.33-r1
@@ -1,14 +1,14 @@
-BDEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+BDEPEND=virtual/pkgconfig doc? ( dev-python/sphinx ) >=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:0=[unicode] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre ) >=dev-util/meson-0.47 >=dev-libs/boost-1.62 virtual/pkgconfig doc? ( dev-python/sphinx )
-DESCRIPTION=A ncurses client for the Music Player Daemon (MPD)
+DEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:0=[unicode] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre ) >=dev-libs/boost-1.62
+DESCRIPTION=Ncurses client for the Music Player Daemon (MPD)
EAPI=7
HOMEPAGE=https://www.musicpd.org/clients/ncmpc/ https://github.com/MusicPlayerDaemon/ncmpc
-IUSE=+artist-screen async-connect chat-screen doc +help-screen key-screen lirc lyrics-screen outputs-screen search-screen +song-screen +mouse nls pcre
+IUSE=async-connect chat-screen doc +help-screen key-screen +library-screen lirc lyrics-screen +mouse nls outputs-screen pcre search-screen +song-screen
KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
LICENSE=GPL-2+
RDEPEND=>=media-libs/libmpdclient-2.9 sys-libs/ncurses:0=[unicode] lirc? ( app-misc/lirc ) pcre? ( dev-libs/libpcre )
SLOT=0
-SRC_URI=http://www.musicpd.org/download/ncmpc/0/ncmpc-0.33.tar.xz
+SRC_URI=https://www.musicpd.org/download/ncmpc/0/ncmpc-0.33.tar.xz
_eclasses_=meson 3c3f61163f786eebdbd8ad4f1e24ab7c multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=1aefb09af20ad93f1b64a742ad6fd54a
+_md5_=13df30488a49dfa08b2991116d707f33
diff --git a/metadata/md5-cache/media-sound/pianobar-2016.06.02 b/metadata/md5-cache/media-sound/pianobar-2016.06.02
deleted file mode 100644
index 99c3ca3e3aa9..000000000000
--- a/metadata/md5-cache/media-sound/pianobar-2016.06.02
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=media-libs/libao net-misc/curl dev-libs/libgcrypt:0= dev-libs/json-c:= >=virtual/ffmpeg-9 virtual/pkgconfig
-DESCRIPTION=A console-based replacement for Pandora's flash player
-EAPI=6
-HOMEPAGE=https://6xq.net/pianobar/
-IUSE=static-libs
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=media-libs/libao net-misc/curl dev-libs/libgcrypt:0= dev-libs/json-c:= >=virtual/ffmpeg-9
-SLOT=0
-SRC_URI=https://6xq.net/pianobar/pianobar-2016.06.02.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=98ed5b0c4359a1ea23646e484f18b169
diff --git a/metadata/md5-cache/media-sound/pianobar-2017.08.30 b/metadata/md5-cache/media-sound/pianobar-2017.08.30
deleted file mode 100644
index cea6f857830a..000000000000
--- a/metadata/md5-cache/media-sound/pianobar-2017.08.30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=media-libs/libao net-misc/curl dev-libs/libgcrypt:0= dev-libs/json-c:= libav? ( >=media-video/libav-12:0= ) !libav? ( >=media-video/ffmpeg-3.1:0= ) virtual/pkgconfig
-DESCRIPTION=A console-based replacement for Pandora's flash player
-EAPI=6
-HOMEPAGE=https://6xq.net/pianobar/
-IUSE=libav static-libs
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=media-libs/libao net-misc/curl dev-libs/libgcrypt:0= dev-libs/json-c:= libav? ( >=media-video/libav-12:0= ) !libav? ( >=media-video/ffmpeg-3.1:0= )
-SLOT=0
-SRC_URI=https://6xq.net/pianobar/pianobar-2017.08.30.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=36decf97a5fb84e751e325d9005bd6d0
diff --git a/metadata/md5-cache/media-sound/pianobar-2019.01.25 b/metadata/md5-cache/media-sound/pianobar-2019.01.25
new file mode 100644
index 000000000000..99a17c9ca6e3
--- /dev/null
+++ b/metadata/md5-cache/media-sound/pianobar-2019.01.25
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=media-libs/libao net-misc/curl dev-libs/libgcrypt:0= dev-libs/json-c:= libav? ( >=media-video/libav-12:0= ) !libav? ( >=media-video/ffmpeg-3.1:0= ) virtual/pkgconfig
+DESCRIPTION=A console-based replacement for Pandora's flash player
+EAPI=7
+HOMEPAGE=https://6xq.net/pianobar/
+IUSE=libav static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=media-libs/libao net-misc/curl dev-libs/libgcrypt:0= dev-libs/json-c:= libav? ( >=media-video/libav-12:0= ) !libav? ( >=media-video/ffmpeg-3.1:0= )
+SLOT=0
+SRC_URI=https://6xq.net/pianobar/pianobar-2019.01.25.tar.bz2
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861
+_md5_=410abf35e89071143108a1ff66797169
diff --git a/metadata/md5-cache/media-sound/pianobar-9999 b/metadata/md5-cache/media-sound/pianobar-9999
index d607a1eaaffa..d0a29d582338 100644
--- a/metadata/md5-cache/media-sound/pianobar-9999
+++ b/metadata/md5-cache/media-sound/pianobar-9999
@@ -1,11 +1,12 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile install unpack
-DEPEND=media-libs/libao net-misc/curl dev-libs/libgcrypt:0= dev-libs/json-c:= libav? ( >=media-video/libav-12:0= ) !libav? ( >=media-video/ffmpeg-3.1:0= ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=media-libs/libao net-misc/curl dev-libs/libgcrypt:0= dev-libs/json-c:= libav? ( >=media-video/libav-12:0= ) !libav? ( >=media-video/ffmpeg-3.1:0= ) virtual/pkgconfig
DESCRIPTION=A console-based replacement for Pandora's flash player
-EAPI=6
+EAPI=7
HOMEPAGE=https://6xq.net/pianobar/
IUSE=libav static-libs
LICENSE=MIT
RDEPEND=media-libs/libao net-misc/curl dev-libs/libgcrypt:0= dev-libs/json-c:= libav? ( >=media-video/libav-12:0= ) !libav? ( >=media-video/ffmpeg-3.1:0= )
SLOT=0
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=36decf97a5fb84e751e325d9005bd6d0
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e git-r3 0d4635eeb5a96cd5315597a47eba25c9 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861
+_md5_=410abf35e89071143108a1ff66797169
diff --git a/metadata/md5-cache/media-sound/sidplay-2.0.9-r1 b/metadata/md5-cache/media-sound/sidplay-2.0.9-r1
new file mode 100644
index 000000000000..63c02b2514f1
--- /dev/null
+++ b/metadata/md5-cache/media-sound/sidplay-2.0.9-r1
@@ -0,0 +1,12 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=-
+DEPEND=media-libs/libsidplay:2
+DESCRIPTION=C64 SID player
+EAPI=7
+HOMEPAGE=http://sidplay2.sourceforge.net/
+KEYWORDS=alpha amd64 ~hppa ppc ~sparc x86
+LICENSE=GPL-2
+RDEPEND=media-libs/libsidplay:2
+SLOT=0
+SRC_URI=mirror://sourceforge/sidplay2/sidplay-2.0.9.tar.gz
+_md5_=efa075dea368d624ba3b648a9a0947bf
diff --git a/metadata/md5-cache/media-sound/sidplayfp-0.3.3 b/metadata/md5-cache/media-sound/sidplayfp-0.3.3
deleted file mode 100644
index dfb7b6d52d5e..000000000000
--- a/metadata/md5-cache/media-sound/sidplayfp-0.3.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=media-libs/libsidplayfp-0.3.8 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig oss? ( virtual/os-headers )
-DESCRIPTION=A sidplay2 fork with resid-fp
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/sidplay-residfp/
-IUSE=+alsa oss pulseaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsidplayfp-0.3.8 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
-SLOT=0
-SRC_URI=mirror://sourceforge/sidplay-residfp/sidplayfp-0.3.3.tar.gz
-_md5_=f4bc4b5fd47df163e369a456e7c2ef28
diff --git a/metadata/md5-cache/media-sound/sidplayfp-1.1.0 b/metadata/md5-cache/media-sound/sidplayfp-1.1.0
deleted file mode 100644
index f00daf29c2cf..000000000000
--- a/metadata/md5-cache/media-sound/sidplayfp-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=media-libs/libsidplayfp-1.1.0 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) virtual/pkgconfig oss? ( virtual/os-headers )
-DESCRIPTION=A sidplay2 fork with resid-fp
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/sidplay-residfp/
-IUSE=+alsa oss pulseaudio
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libsidplayfp-1.1.0 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
-SLOT=0
-SRC_URI=mirror://sourceforge/sidplay-residfp/sidplayfp-1.1.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d5a3814ef227d89f96e53f8598189696
diff --git a/metadata/md5-cache/media-sound/sidplayfp-1.4.4 b/metadata/md5-cache/media-sound/sidplayfp-1.4.4
new file mode 100644
index 000000000000..c26207665002
--- /dev/null
+++ b/metadata/md5-cache/media-sound/sidplayfp-1.4.4
@@ -0,0 +1,13 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure prepare
+DEPEND=>=media-libs/libsidplayfp-1.8.0 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) oss? ( virtual/os-headers )
+DESCRIPTION=Sidplay2 fork with resid-fp
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/sidplay-residfp/
+IUSE=+alsa oss pulseaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libsidplayfp-1.8.0 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
+SLOT=0
+SRC_URI=mirror://sourceforge/sidplay-residfp/sidplayfp/1.4/sidplayfp-1.4.4.tar.gz
+_md5_=376732f1d4486d60aca4d20de579a4a2
diff --git a/metadata/md5-cache/media-sound/zynaddsubfx-3.0.3-r1 b/metadata/md5-cache/media-sound/zynaddsubfx-3.0.3-r1
new file mode 100644
index 000000000000..38c6fa03acbc
--- /dev/null
+++ b/metadata/md5-cache/media-sound/zynaddsubfx-3.0.3-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) dev-util/ninja >=dev-util/cmake-3.9.6
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/mxml-2.2.1 media-libs/liblo sci-libs/fftw:3.0 sys-libs/zlib alsa? ( media-libs/alsa-lib ) dssi? ( media-libs/dssi ) fltk? ( >=x11-libs/fltk-1.3:1 x11-libs/libX11 x11-libs/libXpm ) jack? ( virtual/jack ) lash? ( media-sound/lash ) portaudio? ( media-libs/portaudio )
+DESCRIPTION=Software synthesizer capable of making a countless number of instruments
+EAPI=7
+HOMEPAGE=http://zynaddsubfx.sourceforge.net/
+IUSE=alsa doc dssi +fltk jack lash portaudio
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/mxml-2.2.1 media-libs/liblo sci-libs/fftw:3.0 sys-libs/zlib alsa? ( media-libs/alsa-lib ) dssi? ( media-libs/dssi ) fltk? ( >=x11-libs/fltk-1.3:1 x11-libs/libX11 x11-libs/libXpm ) jack? ( virtual/jack ) lash? ( media-sound/lash ) portaudio? ( media-libs/portaudio )
+REQUIRED_USE=|| ( alsa jack portaudio )
+SLOT=0
+SRC_URI=mirror://sourceforge/zynaddsubfx/zynaddsubfx-3.0.3.tar.bz2
+_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f toolchain-funcs f164325a2cdb5b3ea39311d483988861 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
+_md5_=e9784a3418e2a69bf6685b679241e78b
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 2358c47bca67..6edeb8096905 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/barnyard-0.2.0-r5 b/metadata/md5-cache/net-analyzer/barnyard-0.2.0-r5
new file mode 100644
index 000000000000..bb3e60dd57bd
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/barnyard-0.2.0-r5
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=net-libs/libpcap mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:*[server] ) sguil? ( dev-lang/tcl:0 )
+DESCRIPTION=Fast output system for Snort
+EAPI=7
+HOMEPAGE=https://sourceforge.net/projects/barnyard
+IUSE=mysql postgres sguil
+KEYWORDS=~amd64 -sparc ~x86
+LICENSE=QPL GPL-2
+RDEPEND=net-libs/libpcap mysql? ( dev-db/mysql-connector-c:0= ) postgres? ( dev-db/postgresql:*[server] ) sguil? ( dev-lang/tcl:0 ) net-analyzer/snort
+SLOT=0
+SRC_URI=mirror://sourceforge/barnyard/barnyard-0.2.0.tar.gz mirror://gentoo/barnyard-0.2.0-patches.tar.bz2
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861
+_md5_=594c296ab46cd308a48fe3cb0e015784
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 0b4e4717139a..59081878dab9 100644
Binary files a/metadata/md5-cache/net-dialup/Manifest.gz and b/metadata/md5-cache/net-dialup/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dialup/mgetty-1.2.1 b/metadata/md5-cache/net-dialup/mgetty-1.2.1
index 41da289eee8e..57d35b445325 100644
--- a/metadata/md5-cache/net-dialup/mgetty-1.2.1
+++ b/metadata/md5-cache/net-dialup/mgetty-1.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=fax and voice modem programs
EAPI=6
HOMEPAGE=http://mgetty.greenie.net/
IUSE=+fax fidonet
-KEYWORDS=alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86
+KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 sparc x86
LICENSE=GPL-2
RDEPEND=>=sys-apps/sed-4 sys-apps/groff dev-lang/perl sys-apps/texinfo virtual/awk fax? ( !net-misc/efax !net-misc/hylafax ) fax? ( media-libs/netpbm app-text/ghostscript-gpl )
SLOT=0
SRC_URI=ftp://mgetty.greenie.net/pub/mgetty/source/1.2/mgetty-1.2.1.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=19eaca9d8c917e8c08993f604def9578
+_md5_=1657f854ce3b975975330347c15ae3f0
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index fedd573c0c4e..a3a67300064c 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/dnrd-2.20.3-r1 b/metadata/md5-cache/net-dns/dnrd-2.20.3-r1
deleted file mode 100644
index e9a52e912b21..000000000000
--- a/metadata/md5-cache/net-dns/dnrd-2.20.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1 >=sys-devel/automake-1.15.1 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A caching DNS proxy server
-EAPI=0
-HOMEPAGE=http://dnrd.sourceforge.net/
-IUSE=debug
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/dnrd/dnrd-2.20.3.tar.gz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 user 8bc2845510e2109af75e3eeac607ec81 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5191ab3c838a1cef5dc8313dec9c960e
diff --git a/metadata/md5-cache/net-dns/unbound-1.9.0 b/metadata/md5-cache/net-dns/unbound-1.9.0
index 4392edeede02..c6a2eb24725f 100644
--- a/metadata/md5-cache/net-dns/unbound-1.9.0
+++ b/metadata/md5-cache/net-dns/unbound-1.9.0
@@ -5,11 +5,11 @@ DESCRIPTION=A validating, recursive and caching DNS resolver
EAPI=7
HOMEPAGE=https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/
IUSE=debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 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
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86
LICENSE=BSD GPL-2
RDEPEND=>=dev-libs/expat-2.1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libevent-2.0.21: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-2.2.4:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !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(-)?] ) dnscrypt? ( dev-libs/libsodium[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dnstap? ( dev-libs/fstrm[abi_x86_32(-)?,abi_x86_64(-)?,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/protobuf-c-1.0.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ecdsa? ( !libressl? ( dev-libs/openssl:0[-bindist] ) ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) python_single_target_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,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(+)?] ) redis? ( dev-libs/hiredis:= ) net-dns/dnssec-root selinux? ( sec-policy/selinux-bind ) net-dns/dnssec-root
REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 python_single_target_python3_7 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) python_single_target_python3_7? ( python_targets_python3_7 ) )
SLOT=0/8
SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.9.0.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=0cda3e3c5b1f2efe2e3ca4e73f2a3191
+_md5_=32680f4a3cf9fdae5b55367d48c2afe3
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 758047ee2178..fcf847b1ec3c 100644
Binary files a/metadata/md5-cache/net-im/Manifest.gz and b/metadata/md5-cache/net-im/Manifest.gz differ
diff --git a/metadata/md5-cache/net-im/bitlbee-3.6 b/metadata/md5-cache/net-im/bitlbee-3.6
new file mode 100644
index 000000000000..d02bf83f4ad8
--- /dev/null
+++ b/metadata/md5-cache/net-im/bitlbee-3.6
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) ) virtual/pkgconfig selinux? ( sec-policy/selinux-bitlbee ) test? ( dev-libs/check )
+DESCRIPTION=irc to IM gateway that support multiple IM protocols
+EAPI=7
+HOMEPAGE=https://www.bitlbee.org/
+IUSE=debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd msn oscar purple twitter +xmpp
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) ) xinetd? ( sys-apps/xinetd )
+REQUIRED_USE=|| ( purple xmpp msn oscar ) xmpp? ( !nss ) test? ( plugins )
+SLOT=0
+SRC_URI=https://get.bitlbee.org/src/bitlbee-3.6.tar.gz
+_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 user 8bc2845510e2109af75e3eeac607ec81
+_md5_=982158e310d4c9082585f1e8ce4a31f6
diff --git a/metadata/md5-cache/net-im/bitlbee-9999 b/metadata/md5-cache/net-im/bitlbee-9999
index 7c8a4e4128d3..1d45f6dfc38f 100644
--- a/metadata/md5-cache/net-im/bitlbee-9999
+++ b/metadata/md5-cache/net-im/bitlbee-9999
@@ -1,12 +1,13 @@
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
DEFINED_PHASES=compile configure install postinst prepare setup unpack
-DEPEND=>=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) ) virtual/pkgconfig selinux? ( sec-policy/selinux-bitlbee ) test? ( dev-libs/check ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEPEND=>=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) ) virtual/pkgconfig selinux? ( sec-policy/selinux-bitlbee ) test? ( dev-libs/check )
DESCRIPTION=irc to IM gateway that support multiple IM protocols
-EAPI=6
+EAPI=7
HOMEPAGE=https://www.bitlbee.org/
IUSE=debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd msn oscar purple twitter +xmpp
LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) ) virtual/logger xinetd? ( sys-apps/xinetd )
+RDEPEND=>=dev-libs/glib-2.16 purple? ( net-im/pidgin ) libevent? ( dev-libs/libevent:= ) otr? ( >=net-libs/libotr-4 ) gnutls? ( net-libs/gnutls:= ) !gnutls? ( nss? ( dev-libs/nss ) !nss? ( libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) ) ) xinetd? ( sys-apps/xinetd )
REQUIRED_USE=|| ( purple xmpp msn oscar ) xmpp? ( !nss ) test? ( plugins )
SLOT=0
_eclasses_=git-r3 0d4635eeb5a96cd5315597a47eba25c9 multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 user 8bc2845510e2109af75e3eeac607ec81
-_md5_=14265b1718e161cf30a2f7b3bb9f679b
+_md5_=982158e310d4c9082585f1e8ce4a31f6
diff --git a/metadata/md5-cache/net-im/pidgin-2.13.0 b/metadata/md5-cache/net-im/pidgin-2.13.0
index bcf10b8d9a20..14a9b3e0719f 100644
--- a/metadata/md5-cache/net-im/pidgin-2.13.0
+++ b/metadata/md5-cache/net-im/pidgin-2.13.0
@@ -4,11 +4,11 @@ DESCRIPTION=GTK Instant Messenger client
EAPI=6
HOMEPAGE=http://pidgin.im/
IUSE=dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile pie networkmanager nls perl silc tcl tk spell sasl ncurses groupwise prediction python +xscreensaver zephyr zeroconf aqua python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.16 >=dev-libs/libxml2-2.6.18 ncurses? ( sys-libs/ncurses:0=[unicode] dbus? ( 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(+)] ) 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(+)] ) ) gtk? ( >=x11-libs/gtk+-2.10:2[aqua=] x11-libs/libSM >=x11-libs/pango-1.4.0 xscreensaver? ( x11-libs/libXScrnSaver ) spell? ( >=app-text/gtkspell-2.0.2:2 ) eds? ( >=gnome-extra/evolution-data-server-3.6:= ) prediction? ( >=dev-db/sqlite-3.3:3 ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 >=net-libs/farstream-0.2.7:0.2 ) zeroconf? ( net-dns/avahi[dbus] ) dbus? ( >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-0.90 dev-python/dbus-python ) perl? ( >=dev-lang/perl-5.16:= ) gadu? ( || ( >=net-libs/libgadu-1.11.0[ssl,gnutls] >=net-libs/libgadu-1.11.0[-ssl] ) ) gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/nspr dev-libs/nss ) meanwhile? ( net-libs/meanwhile ) silc? ( >=net-im/silc-toolkit-1.0.1 ) tcl? ( dev-lang/tcl:0= ) tk? ( dev-lang/tk:0= ) sasl? ( dev-libs/cyrus-sasl:2 ) networkmanager? ( net-misc/networkmanager ) idn? ( net-dns/libidn:= ) ! pidgin-2.10.9-irc_join_sleep.patch
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome.org 5e4cc5af3f1b17bdee155bf02e8c2df4 gnome2 acac536f2c3bbcd312ac3faaa3e55e40 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=3ad69ef4b8e91a16826613e2287d34dd
+_md5_=a8cc38b12d2d71fc0bca51d89b707bcc
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index c96e77ba8f11..dc163004bfbc 100644
Binary files a/metadata/md5-cache/net-mail/Manifest.gz and b/metadata/md5-cache/net-mail/Manifest.gz differ
diff --git a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r1 b/metadata/md5-cache/net-mail/metamail-2.7.53.3-r1
deleted file mode 100644
index c3b325c9c641..000000000000
--- a/metadata/md5-cache/net-mail/metamail-2.7.53.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-libs/ncurses app-arch/sharutils net-mail/mailbase >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Metamail (with Debian patches) - Generic MIME package
-EAPI=4
-HOMEPAGE=http://ftp.funet.fi/pub/unix/mail/metamail/
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=app-misc/mime-types sys-apps/debianutils !app-misc/run-mailcap
-SLOT=0
-SRC_URI=http://ftp.funet.fi/pub/unix/mail/metamail/mm2.7.tar.Z mirror://debian/pool/main/m/metamail/metamail_2.7-53.diff.gz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
-_md5_=67b5ba1a32ccecb6d7209df24ae9432d
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 150cf1d93a57..875929707185 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/autossh-1.4g b/metadata/md5-cache/net-misc/autossh-1.4g
new file mode 100644
index 000000000000..47ddeea6b145
--- /dev/null
+++ b/metadata/md5-cache/net-misc/autossh-1.4g
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Automatically restart SSH sessions and tunnels
+EAPI=7
+HOMEPAGE=http://www.harding.motd.ca/autossh/
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=net-misc/openssh
+SLOT=0
+SRC_URI=http://www.harding.motd.ca/autossh/autossh-1.4g.tgz
+_md5_=84e176df69ba7952f5cc68a975b0b5fc
diff --git a/metadata/md5-cache/net-misc/curl-7.64.0 b/metadata/md5-cache/net-misc/curl-7.64.0
index a0ad5c2e2035..b0863bd35eb7 100644
--- a/metadata/md5-cache/net-misc/curl-7.64.0
+++ b/metadata/md5-cache/net-misc/curl-7.64.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Client that groks URLs
EAPI=6
HOMEPAGE=https://curl.haxx.se/
IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=MIT
RDEPEND=ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[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(-)?] dev-libs/nettle: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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[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(-)?] ) curl_ssl_nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[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(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=https://curl.haxx.se/download/curl-7.64.0.tar.bz2
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 prefix e51c7882b7b721e54e684f7eb143cbfe preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c73fc6d87e3a5be13c1eef6366381ce
+_md5_=bce74ae5b01438ea3d919a386b3c6aeb
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index abb5271b2167..c04f239748c2 100644
Binary files a/metadata/md5-cache/net-nds/Manifest.gz and b/metadata/md5-cache/net-nds/Manifest.gz differ
diff --git a/metadata/md5-cache/net-nds/yp-tools-4.2.3 b/metadata/md5-cache/net-nds/yp-tools-4.2.3
index 5c1c04d949d9..6370d113ac98 100644
--- a/metadata/md5-cache/net-nds/yp-tools-4.2.3
+++ b/metadata/md5-cache/net-nds/yp-tools-4.2.3
@@ -5,10 +5,10 @@ DESCRIPTION=Network Information Service tools
EAPI=7
HOMEPAGE=https://www.thkukuk.de/nis/
IUSE=nls
-KEYWORDS=alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sparc x86
LICENSE=GPL-2
RDEPEND=net-libs/libtirpc:= >=net-libs/libnsl-1.2.0:0=
SLOT=0
SRC_URI=https://github.com/thkukuk/yp-tools/archive/v4.2.3.tar.gz -> yp-tools-4.2.3.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=0fb578a9186a0e20bd5342d3cd6e077f
+_md5_=8f570ed662e189fb3f68a95bd0a75261
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 3b586ec8ee71..ad19fb8a6ee3 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.21.6 b/metadata/md5-cache/net-print/cups-filters-1.21.6
index 61392093e170..5411ee586ed0 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.21.6
+++ b/metadata/md5-cache/net-print/cups-filters-1.21.6
@@ -4,10 +4,10 @@ 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
+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-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.21.6.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=45b34140eff0a38abcccf6178b495e7b
+_md5_=1f90f733608863a9e0fc55c5d670555c
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index fc920092a629..e41b75bcc4c7 100644
Binary files a/metadata/md5-cache/sci-astronomy/Manifest.gz and b/metadata/md5-cache/sci-astronomy/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.18.2 b/metadata/md5-cache/sci-astronomy/stellarium-0.18.2
index 705b59d708eb..91f2e4a3ee41 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-0.18.2
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.18.2
@@ -4,10 +4,10 @@ DESCRIPTION=3D photo-realistic skies in real time
EAPI=6
HOMEPAGE=https://www.stellarium.org/
IUSE=debug gps media nls stars test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2+
RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] )
SLOT=0
SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v0.18.2/stellarium-0.18.2.tar.gz stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=adc28f838cb0762ecaef9bd9363decc6
+_md5_=0281b5605c1398024d1e6bc7357a8078
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 583356004f9f..7fdc2a711a50 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/lm_sensors-3.5.0 b/metadata/md5-cache/sys-apps/lm_sensors-3.5.0
index f64741591bef..61168a56cba8 100644
--- a/metadata/md5-cache/sys-apps/lm_sensors-3.5.0
+++ b/metadata/md5-cache/sys-apps/lm_sensors-3.5.0
@@ -4,10 +4,10 @@ DESCRIPTION=Hardware Monitoring user-space utilities
EAPI=6
HOMEPAGE=https://hwmon.wiki.kernel.org/ https://github.com/lm-sensors/lm-sensors
IUSE=contrib sensord static-libs kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2+ LGPL-2.1
RDEPEND=sensord? ( net-analyzer/rrdtool virtual/logger ) dev-lang/perl ! lm_sensors-3.5.0.tar.gz
_eclasses_=eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=fa374bda48c2f701cc708ec5810f59ef
+_md5_=19764caf1833b9067618b9a95d897904
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.24 b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.24
index 7bf38a04a70d..5cad193c8323 100644
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.8.24
+++ b/metadata/md5-cache/sys-apps/pcsc-lite-1.8.24
@@ -5,11 +5,11 @@ DESCRIPTION=PC/SC Architecture smartcard middleware library
EAPI=7
HOMEPAGE=https://pcsclite.apdu.fr/
IUSE=python libusb policykit selinux systemd +udev python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=BSD ISC MIT GPL-3+ GPL-2
RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/udev ) policykit? ( >=sys-auth/polkit-0.111 ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) !=dev-libs/glib-2.26.0 gnutls? ( >=net-libs/gnutls-2.12.0 ) netlink? ( >=dev-libs/libnl-3.1 ) zlib? ( sys-libs/zlib )
SLOT=0
SRC_URI=mirror://sourceforge/nbd/nbd-3.18.tar.xz
-_md5_=cbc32f2990fd8285a982f607ea714ef5
+_md5_=6a7649d0fcc2ce06b5f1f799e3244c54
diff --git a/metadata/md5-cache/sys-firmware/Manifest.gz b/metadata/md5-cache/sys-firmware/Manifest.gz
index 7f4bf2ec139f..3b887a622757 100644
Binary files a/metadata/md5-cache/sys-firmware/Manifest.gz and b/metadata/md5-cache/sys-firmware/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8 b/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8
deleted file mode 100644
index 367ca7cc3647..000000000000
--- a/metadata/md5-cache/sys-firmware/sgabios-0.1_pre8
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=serial graphics adapter bios option rom for x86
-EAPI=4
-HOMEPAGE=https://code.google.com/p/sgabios/
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=mirror://gentoo/sgabios-0.1_pre8.tar.xz https://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8.tar.xz https://dev.gentoo.org/~cardoe/distfiles/sgabios-0.1_pre8-bins.tar.xz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f8d5709e25d849f153232c73b3837daa
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index eae1596e6131..b5c1205dedff 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/udisks-2.8.1 b/metadata/md5-cache/sys-fs/udisks-2.8.1
index f62f6d518070..5658c51bbd53 100644
--- a/metadata/md5-cache/sys-fs/udisks-2.8.1
+++ b/metadata/md5-cache/sys-fs/udisks-2.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=Daemon providing interfaces to work with storage devices
EAPI=6
HOMEPAGE=https://www.freedesktop.org/wiki/Software/udisks
IUSE=acl debug elogind +introspection lvm nls selinux systemd vdo kernel_linux
-KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 sparc ~x86
+KEYWORDS=alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86
LICENSE=GPL-2
RDEPEND=>=dev-libs/glib-2.50:2 >=dev-libs/libatasmart-0.19 >=sys-auth/polkit-0.110 >=sys-libs/libblockdev-2.19[cryptsetup,lvm?,vdo?] >=virtual/libgudev-165:= virtual/udev acl? ( virtual/acl ) elogind? ( >=sys-auth/elogind-219 ) introspection? ( >=dev-libs/gobject-introspection-1.30:= ) lvm? ( sys-fs/lvm2 ) systemd? ( >=sys-apps/systemd-209 ) >=sys-apps/util-linux-2.30 >=sys-block/parted-3 virtual/eject selinux? ( sec-policy/selinux-devicekit )
REQUIRED_USE=?? ( elogind systemd )
SLOT=2
SRC_URI=https://github.com/storaged-project/udisks/releases/download/udisks-2.8.1/udisks-2.8.1.tar.bz2
_eclasses_=bash-completion-r1 47a7402d95930413ce25ba8d857339bb eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 linux-info 953c3b1c472dcadbf62098a9301327f2 multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs f164325a2cdb5b3ea39311d483988861 udev 7752f306eec7b286d00bdb47b763e7ac xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=7db5c5ead4c3a33c1ba43f028645a861
+_md5_=3aef1ce5c96a2e5858e8629bf90f51b2
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 4da13e762997..585ce1226e88 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/wait_on_pid-0.0.2 b/metadata/md5-cache/sys-process/wait_on_pid-0.0.2
deleted file mode 100644
index 65c368bea067..000000000000
--- a/metadata/md5-cache/sys-process/wait_on_pid-0.0.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=small utility to wait for an arbitrary process to exit
-EAPI=5
-HOMEPAGE=https://dev.gentoo.org/~zzam/wait_on_pid/
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/wait_on_pid-0.0.2.tar.bz2 https://dev.gentoo.org/~zzam/wait_on_pid/wait_on_pid-0.0.2.tar.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=146d25c82fc29e40b8318f1edb30e04f
diff --git a/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1 b/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
index 0c3621c9b0ad..e0d0ba821d91 100644
--- a/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
+++ b/metadata/md5-cache/sys-process/wait_on_pid-0.0.2-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
DESCRIPTION=small utility to wait for an arbitrary process to exit
EAPI=6
HOMEPAGE=https://dev.gentoo.org/~zzam/wait_on_pid/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux
LICENSE=GPL-2
SLOT=0
SRC_URI=mirror://gentoo/wait_on_pid-0.0.2.tar.bz2 https://dev.gentoo.org/~zzam/wait_on_pid/wait_on_pid-0.0.2.tar.bz2
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=521d672e06fdfa4f26c7fe97e42cbb8a
+_md5_=aea07d377cde46e91784806c3a20bb39
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 19551f8f8825..f962e8e41944 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/pkgconfig-1 b/metadata/md5-cache/virtual/pkgconfig-1
index f559c02c7b92..f1c44ea6c2f3 100644
--- a/metadata/md5-cache/virtual/pkgconfig-1
+++ b/metadata/md5-cache/virtual/pkgconfig-1
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
DESCRIPTION=Virtual for the pkg-config implementation
EAPI=7
IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha ~amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~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
RDEPEND=|| ( >=dev-util/pkgconf-1.3.7[pkg-config,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/pkgconfig-0.29.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/pkgconfig-openbsd-20130507-r2[pkg-config,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
SLOT=0
_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=0601acdbcc9231a57a704b574f74ed7a
+_md5_=78766d27f5ab5e1aea0f6284d470ff3f
diff --git a/metadata/md5-cache/virtual/python-futures-1 b/metadata/md5-cache/virtual/python-futures-1
index 0b452e719bc1..69ad9a22d396 100644
--- a/metadata/md5-cache/virtual/python-futures-1
+++ b/metadata/md5-cache/virtual/python-futures-1
@@ -2,9 +2,9 @@ DEFINED_PHASES=-
DESCRIPTION=A virtual for the Python concurrent.futures module
EAPI=7
IUSE=python_targets_pypy python_targets_pypy3 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 ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux
RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_pypy? ( dev-python/futures[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/futures[python_targets_pypy(-)?,-python_single_target_pypy(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 )
SLOT=0
_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 12114a2a9aab35b93efc037a196b3234 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=8e297af5135899e656ea303725706c8a
+_md5_=b00573ad83ce7067eda4fba853e78b49
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 641fcb5c94c1..d883def5401f 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-71.0.3578.98 b/metadata/md5-cache/www-client/chromium-71.0.3578.98
deleted file mode 100644
index 9be1b96ea921..000000000000
--- a/metadata/md5-cache/www-client/chromium-71.0.3578.98
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.0.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=http://chromium.org/
-IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.0.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl dev-util/gn >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-7.6.0[inspector] sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.0.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 )
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=7
-HOMEPAGE=http://chromium.org/
-IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine kernel_linux custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.0.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=app-accessibility/at-spi2-atk-2.26:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) >=dev-libs/atk-2.26 dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.11.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-2.0.0:0=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.54.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= x11-libs/xcb-util ) >=dev-qt/linguist-tools-5.9.2:5 >=dev-qt/qtconcurrent-5.9.2:5 gnome-keyring? ( virtual/pkgconfig ) >=kde-frameworks/ki18n-5.54.0 sys-devel/make >=dev-util/cmake-3.9.6 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.9.2:5 ) >=kde-frameworks/extra-cmake-modules-5.54.0:5 >=dev-qt/qtcore-5.9.2:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Cross-platform web browser using QtWebEngine
-EAPI=6
-HOMEPAGE=https://www.falkon.org/
-IUSE=dbus gnome-keyring kwallet libressl +X test debug test
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-qt/qtdeclarative-5.9.2:5[widgets] >=dev-qt/qtgui-5.9.2:5 >=dev-qt/qtnetwork-5.9.2:5[ssl] >=dev-qt/qtprintsupport-5.9.2:5 >=dev-qt/qtsql-5.9.2:5[sqlite] >=dev-qt/qtwebchannel-5.9.2:5 >=dev-qt/qtwebengine-5.9.2:5[widgets] >=dev-qt/qtwidgets-5.9.2:5 dbus? ( >=dev-qt/qtdbus-5.9.2:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.54.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.9.2:5 x11-libs/libxcb:= x11-libs/xcb-util ) !www-client/qupzilla >=dev-qt/qtsvg-5.9.2:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.2:5
-SLOT=0
-SRC_URI=mirror://kde/stable/falkon/3.0.1/falkon-3.0.1.tar.xz
-_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 1349a105b08a8bb265c1d22984d0dad2 kde5-functions 1236edc19d52100e99be7dc2fc91db0a ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=1c331b0be4ca319ce8dd3ee910d91d0d
diff --git a/metadata/md5-cache/www-client/falkon-3.0.1-r1 b/metadata/md5-cache/www-client/falkon-3.0.1-r1
index 5826295a5856..7dd599a4bc59 100644
--- a/metadata/md5-cache/www-client/falkon-3.0.1-r1
+++ b/metadata/md5-cache/www-client/falkon-3.0.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Cross-platform web browser using QtWebEngine
EAPI=6
HOMEPAGE=https://www.falkon.org/
IUSE=dbus gnome-keyring kwallet libressl +X test debug test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-3
RDEPEND=>=dev-qt/qtdeclarative-5.11.1:5[widgets] >=dev-qt/qtgui-5.11.1:5 >=dev-qt/qtnetwork-5.11.1:5[ssl] >=dev-qt/qtprintsupport-5.11.1:5 >=dev-qt/qtsql-5.11.1:5[sqlite] >=dev-qt/qtwebchannel-5.11.1:5 >=dev-qt/qtwebengine-5.11.1:5[widgets] >=dev-qt/qtwidgets-5.11.1:5 dbus? ( >=dev-qt/qtdbus-5.11.1:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kwallet? ( >=kde-frameworks/kwallet-5.54.0 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0= ) X? ( >=dev-qt/qtx11extras-5.11.1:5 x11-libs/libxcb:= x11-libs/xcb-util ) !www-client/qupzilla >=dev-qt/qtsvg-5.11.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.54.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.11.1:5
RESTRICT=test
SLOT=0
SRC_URI=mirror://kde/stable/falkon/3.0.1/falkon-3.0.1.tar.xz
_eclasses_=cmake-utils ab10bd85e5d38e2a32077bcd91faa1b6 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e gnome2-utils c6060f4ab634aca444c4b2176b0f3877 kde5 1349a105b08a8bb265c1d22984d0dad2 kde5-functions 1236edc19d52100e99be7dc2fc91db0a ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 ninja-utils 132cbb376048d079b5a012f5467c4e7f preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg 4939e61ae72d18779a8bdac386a7a07e xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=11f9cdb6e7845e397ff181531b09308b
+_md5_=64d61046781b6988033cb3f27bef37ca
diff --git a/metadata/md5-cache/www-client/google-chrome-71.0.3578.98 b/metadata/md5-cache/www-client/google-chrome-72.0.3626.96
similarity index 95%
rename from metadata/md5-cache/www-client/google-chrome-71.0.3578.98
rename to metadata/md5-cache/www-client/google-chrome-72.0.3626.96
index 04b36af93333..19799d1e605b 100644
--- a/metadata/md5-cache/www-client/google-chrome-71.0.3578.98
+++ b/metadata/md5-cache/www-client/google-chrome-72.0.3626.96
@@ -9,6 +9,6 @@ LICENSE=google-chrome
RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
RESTRICT=bindist mirror strip
SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_71.0.3578.98-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_72.0.3626.96-1_amd64.deb
_eclasses_=chromium-2 92ff174aa2b13d6ea0c4539533f0b2de desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 pax-utils e85f015e815dd463b0c206d781ef45a5 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
-_md5_=6104cc386ab4b1682bb66c5962f8dd94
+_md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.71 b/metadata/md5-cache/www-client/google-chrome-beta-73.0.3683.27
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.71
rename to metadata/md5-cache/www-client/google-chrome-beta-73.0.3683.27
index c7435d64ffa2..e67ed4f01d99 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-72.0.3626.71
+++ b/metadata/md5-cache/www-client/google-chrome-beta-73.0.3683.27
@@ -9,6 +9,6 @@ LICENSE=google-chrome
RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
RESTRICT=bindist mirror strip
SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_72.0.3626.71-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_73.0.3683.27-1_amd64.deb
_eclasses_=chromium-2 92ff174aa2b13d6ea0c4539533f0b2de desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 pax-utils e85f015e815dd463b0c206d781ef45a5 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
_md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3679.0 b/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3683.20
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-unstable-73.0.3679.0
rename to metadata/md5-cache/www-client/google-chrome-unstable-73.0.3683.20
index 10b6998e0936..a89de517b886 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3679.0
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-73.0.3683.20
@@ -9,6 +9,6 @@ LICENSE=google-chrome
RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
RESTRICT=bindist mirror strip
SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_73.0.3679.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_73.0.3683.20-1_amd64.deb
_eclasses_=chromium-2 92ff174aa2b13d6ea0c4539533f0b2de desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome2-utils c6060f4ab634aca444c4b2176b0f3877 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 pax-utils e85f015e815dd463b0c206d781ef45a5 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 unpacker 3cd8bad0d31e525cd26be1bfa4e61631 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 93b2dfbb00a09161e1e7f6360c0f7f6b
_md5_=3343caa50371c896ad0091dd00d8ec72
diff --git a/metadata/md5-cache/www-misc/Manifest.gz b/metadata/md5-cache/www-misc/Manifest.gz
index 374d8c8a9aeb..236f83c57edd 100644
Binary files a/metadata/md5-cache/www-misc/Manifest.gz and b/metadata/md5-cache/www-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/www-misc/visitors-0.7-r2 b/metadata/md5-cache/www-misc/visitors-0.7-r2
index 1b2b66839656..a40a32b082d2 100644
--- a/metadata/md5-cache/www-misc/visitors-0.7-r2
+++ b/metadata/md5-cache/www-misc/visitors-0.7-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
DESCRIPTION=Fast web log analyzer
EAPI=7
HOMEPAGE=http://www.hping.org/visitors/
-KEYWORDS=amd64 ppc ~x86
+KEYWORDS=amd64 ppc x86
LICENSE=GPL-2
SLOT=0
SRC_URI=http://www.hping.org/visitors/visitors-0.7.tar.gz
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs f164325a2cdb5b3ea39311d483988861
-_md5_=c7e9ebf6227d70445aee5f4d18deacec
+_md5_=6285e7b2b8c64bfdf76a07bc33809324
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 3a8cf7b40dce..25e6c59de518 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3578.98 b/metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.96
similarity index 87%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3578.98
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.96
index c2234196eac9..d86b4cc49f92 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-71.0.3578.98
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-72.0.3626.96
@@ -8,6 +8,6 @@ LICENSE=google-chrome
RDEPEND=widevine? ( dev-libs/glib:2 dev-libs/nspr dev-libs/nss !=dev-libs/libinput-1.5.0:0= x11-base/xorg-server:= x11-base/xorg-server[xorg]
SLOT=0
SRC_URI=https://www.x.org/releases/individual/driver/xf86-input-libinput-0.28.2.tar.bz2
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 autotools-utils 696393cddf6200db17a31641f597b403 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 55aaa148741116aa54ad0d80e361818e libtool f143db5a74ccd9ca28c1234deffede96 linux-info 953c3b1c472dcadbf62098a9301327f2 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xorg-2 3177e7a1a6d7ed77cd228f01de48336b
-_md5_=53d9ffa4ef3c9e5a65d38bf6a050cc78
+_md5_=913e3ed6b4b836fec06464c12632f1ae
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index 5d2d20499f29..2113ccb3f320 100644
Binary files a/metadata/md5-cache/x11-wm/Manifest.gz and b/metadata/md5-cache/x11-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-wm/cwm-5.6 b/metadata/md5-cache/x11-wm/cwm-5.6
index d8f8149fc632..96d86743dd02 100644
--- a/metadata/md5-cache/x11-wm/cwm-5.6
+++ b/metadata/md5-cache/x11-wm/cwm-5.6
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile install unpack
DEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr virtual/pkgconfig sys-devel/bison
DESCRIPTION=OpenBSD fork of calmwm, a clean and lightweight window manager
EAPI=5
-HOMEPAGE=http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/ https://github.com/chneukirchen/cwm
+HOMEPAGE=https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/ https://github.com/chneukirchen/cwm
IUSE=vanilla
KEYWORDS=amd64 arm x86
LICENSE=ISC
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
SLOT=0
SRC_URI=vanilla? ( http://chneukirchen.org/releases/cwm-5.6.tar.gz -> cwm-5.6-chneukirchen.tar.gz ) !vanilla? ( https://github.com/xmw/cwm/tarball/ea9a436 -> cwm-5.6-xmw.tar.gz )
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d49a0f12ffdfa2da0b108e4103d5aced
+_md5_=5a25fcf38e71a59de073d021fe268dff
diff --git a/metadata/md5-cache/x11-wm/cwm-9999 b/metadata/md5-cache/x11-wm/cwm-9999
index 92a03b56a3ea..df2a4a5753a1 100644
--- a/metadata/md5-cache/x11-wm/cwm-9999
+++ b/metadata/md5-cache/x11-wm/cwm-9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install setup unpack
DEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr virtual/pkgconfig sys-devel/bison dev-vcs/git
DESCRIPTION=OpenBSD fork of calmwm, a clean and lightweight window manager
EAPI=5
-HOMEPAGE=http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/ https://github.com/chneukirchen/cwm
+HOMEPAGE=https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/ https://github.com/chneukirchen/cwm
IUSE=vanilla
LICENSE=ISC
RDEPEND=x11-libs/libXft x11-libs/libXinerama x11-libs/libXrandr
SLOT=0
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 git-2 249c1a0962573f4ce2c28f0d5b6b35d4 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a6092878d7cc75929d0164bbd5190cd
+_md5_=ad57d904fa056118412265455e2820ee
diff --git a/metadata/md5-cache/x11-wm/echinus-0.4.9 b/metadata/md5-cache/x11-wm/echinus-0.4.9
index 1fb64414de36..650dcd547696 100644
--- a/metadata/md5-cache/x11-wm/echinus-0.4.9
+++ b/metadata/md5-cache/x11-wm/echinus-0.4.9
@@ -2,12 +2,12 @@ DEFINED_PHASES=install postinst prepare setup
DEPEND=x11-libs/libX11 x11-libs/libXft xrandr? ( x11-libs/libXrandr ) virtual/pkgconfig
DESCRIPTION=A window manager for X in the spirit of dwm
EAPI=4
-HOMEPAGE=http://plhk.ru/echinus
+HOMEPAGE=https://plhk.ru/
IUSE=xrandr
KEYWORDS=~amd64 ~x86
LICENSE=MIT
RDEPEND=x11-libs/libX11 x11-libs/libXft xrandr? ( x11-libs/libXrandr )
SLOT=0
-SRC_URI=http://plhk.ru/static/echinus/echinus-0.4.9.tar.gz
+SRC_URI=https://plhk.ru/static/echinus/echinus-0.4.9.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=71a941829e0fde0033e1f9f08930c490
+_md5_=d975795eda6c8db0a91d5e99a60f67e1
diff --git a/metadata/md5-cache/x11-wm/sawfish-1.12.0 b/metadata/md5-cache/x11-wm/sawfish-1.12.0
index f82d24eef656..6e5c5f1b07d4 100644
--- a/metadata/md5-cache/x11-wm/sawfish-1.12.0
+++ b/metadata/md5-cache/x11-wm/sawfish-1.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=Extensible window manager using a Lisp-based scripting language
EAPI=6
HOMEPAGE=http://sawfish.wikia.com/
IUSE=emacs kde nls xinerama
-KEYWORDS=alpha amd64 ~ia64 ppc ~ppc64 ~sh sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ~ppc64 ~sh sparc x86 ~x86-fbsd
LICENSE=GPL-2 Artistic-2
RDEPEND=emacs? ( virtual/emacs !app-emacs/sawfish ) >=dev-libs/librep-0.92.1 >=x11-libs/rep-gtk-0.90.7 x11-libs/pangox-compat x11-libs/gdk-pixbuf:2[X] >=x11-libs/gtk+-2.24.0:2 x11-libs/libXtst kde? ( kde-frameworks/kdelibs4support ) nls? ( sys-devel/gettext ) xinerama? ( x11-libs/libXinerama )
SLOT=0
SRC_URI=http://download.tuxfamily.org/sawfish/sawfish_1.12.0.tar.xz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c1c1c0105604ae2d4c13be7e412ca0db
+_md5_=5c9ecf7ed691dc7a62f45e9a758ab67c
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8d99ae585c32..777704ad4e96 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Feb 2019 18:08:43 +0000
+Sun, 10 Feb 2019 11:08:42 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 67f6eb99d428..a7dced7ba541 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Feb 9 18:08:43 UTC 2019
+Sun Feb 10 11:08:42 UTC 2019
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6a4c857e95ab..b838071e97c9 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Feb 2019 18:30:01 +0000
+Sun, 10 Feb 2019 11:30:02 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 37627e561803..4a022c22a2e6 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-aa890cb7ecfb8129e93ae06dbcf5fea9cfbcfcfc 1549731231 2019-02-09T16:53:51+00:00
+79061429fbfea5e6769fa6fc7b88e55be61cd9dc 1549791546 2019-02-10T09:39:06+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f8096b575544..565bde3eb450 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1549735502 Sat 09 Feb 2019 06:05:02 PM UTC
+1549796701 Sun 10 Feb 2019 11:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8d99ae585c32..777704ad4e96 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 09 Feb 2019 18:08:43 +0000
+Sun, 10 Feb 2019 11:08:42 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 68f9e682e3da..d64761085b89 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild
new file mode 100644
index 000000000000..5d369ae6705d
--- /dev/null
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Fast output system for Snort"
+HOMEPAGE="https://sourceforge.net/projects/barnyard"
+SRC_URI="
+ mirror://sourceforge/barnyard/barnyard-${PV/_/-}.tar.gz
+ mirror://gentoo/${P}-patches.tar.bz2"
+
+SLOT="0"
+LICENSE="QPL GPL-2"
+KEYWORDS="~amd64 -sparc ~x86"
+IUSE="mysql postgres sguil"
+
+DEPEND="
+ net-libs/libpcap
+ mysql? ( dev-db/mysql-connector-c:0= )
+ postgres? ( dev-db/postgresql:*[server] )
+ sguil? ( dev-lang/tcl:0 )"
+RDEPEND="${DEPEND}
+ net-analyzer/snort"
+
+S="${WORKDIR}/${P/_/-}"
+
+DOCS="AUTHORS README docs/*"
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}/barnyard.64bit.diff"
+ if use sguil ; then
+ eapply "${WORKDIR}/${PV}-sguil_files.patch"
+ eapply "${WORKDIR}/${PV}-configure-in.patch"
+ cd "${S}/src/output-plugins" || die
+ eapply "${WORKDIR}/${PV}-op_plugbase.c.patch"
+ cd "${S}" || die
+ fi
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+ if use sguil ; then
+ myconf="--enable-tcl"
+ fi
+
+ econf \
+ ${myconf} \
+ --sysconfdir=/etc/snort \
+ $(use_enable postgres) \
+ $(use_enable mysql)
+}
+
+src_install () {
+ default
+
+ keepdir /var/log/snort
+ keepdir /var/log/snort/archive
+
+ insinto /etc/snort
+ newins etc/barnyard.conf barnyard.conf
+ newconfd "${FILESDIR}"/barnyard.confd barnyard
+ newinitd "${FILESDIR}"/barnyard.rc6 barnyard
+
+ if use sguil ; then
+ sed -i -e "/config hostname:/s%snorthost%$(hostname)%" \
+ -e "/config interface/s:fxp0:eth0:" \
+ -e "s:output alert_fast:#output alert_fast:" \
+ -e "s:output log_dump:#output log_dump:" \
+ "${D}/etc/snort/barnyard.conf" || die "sed failed"
+
+ sed -i -e s:/var/log/snort:/var/lib/sguil/$(hostname): \
+ -e s:/var/run/barnyard.pid:/var/run/sguil/barnyard.pid: \
+ "${D}/etc/conf.d/barnyard" || die "sed failed"
+
+ sed -i -e "/start-stop-daemon --start/s:--exec:-c sguil --exec:" \
+ "${D}/etc/init.d/barnyard" || die "sed failed"
+ fi
+}
+
+pkg_postinst() {
+ if use sguil ; then
+ elog
+ elog "Make sure to edit /etc/snort/barnyard.conf and uncomment the"
+ elog "sguil section along with supplying the appropriate database"
+ elog "information."
+ elog
+ fi
+}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 214cb5596c99..af6ea5a8254e 100644
Binary files a/net-dialup/Manifest.gz and b/net-dialup/Manifest.gz differ
diff --git a/net-dialup/mgetty/mgetty-1.2.1.ebuild b/net-dialup/mgetty/mgetty-1.2.1.ebuild
index b26d15b6a07a..09f902f7cffa 100644
--- a/net-dialup/mgetty/mgetty-1.2.1.ebuild
+++ b/net-dialup/mgetty/mgetty-1.2.1.ebuild
@@ -25,7 +25,7 @@ RDEPEND="${DEPEND}
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
IUSE="+fax fidonet"
pkg_setup() {
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index b5a32538927c..8a864db82769 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/dnrd/dnrd-2.20.3-r1.ebuild b/net-dns/dnrd/dnrd-2.20.3-r1.ebuild
deleted file mode 100644
index fae872bc300d..000000000000
--- a/net-dns/dnrd/dnrd-2.20.3-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit autotools eutils user
-
-DESCRIPTION="A caching DNS proxy server"
-HOMEPAGE="http://dnrd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/dnrd/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug"
-DEPEND=""
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-docdir.patch
- eautoreconf
-}
-
-src_compile() {
- econf \
- $(use_enable debug) \
- --disable-dependency-tracking \
- --docdir=/usr/share/doc/${PF} \
- || die
-
- emake || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
-
- keepdir /etc/dnrd
- doinitd ${FILESDIR}/dnrd
- newconfd ${FILESDIR}/dnrd.conf dnrd
-}
-
-pkg_postinst() {
- enewgroup dnrd
- enewuser dnrd -1 -1 /dev/null dnrd
-}
diff --git a/net-dns/unbound/unbound-1.9.0.ebuild b/net-dns/unbound/unbound-1.9.0.ebuild
index c51b28fbac6b..16a0168dc2ea 100644
--- a/net-dns/unbound/unbound-1.9.0.ebuild
+++ b/net-dns/unbound/unbound-1.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz"
LICENSE="BSD GPL-2"
SLOT="0/8" # ABI version of libunbound.so
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 x86"
IUSE="debug dnscrypt dnstap +ecdsa ecs gost libressl python redis selinux static-libs systemd test threads"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 5f39a1c702c9..fac6907bb1ab 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 3176cc89495e..89d1716f8e66 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1 +1,2 @@
DIST bitlbee-3.5.1.tar.gz 680351 BLAKE2B 952a12975d4f95020a5b577603aea791fca754006dc96af3c500d3885b6f2c50cabe51ab698625acb717524a729ef03d18a29aa25bd4815bae2f18fa6298aeea SHA512 4eb3b0d3a92910c8dd789cd23338cc6296bf40212c5244fcb27a88ede10e86424ea59c78e719841863701a7fdd8c61819f2775f7b58833e287d9110e49d036f3
+DIST bitlbee-3.6.tar.gz 534961 BLAKE2B 007681a384fcb2c0736b901dfdc213ba0829ca006ad3204aca1bc4520a3874760867df6165a9218a9deeabb13bc06f118c9e2f804a97e671a348734f6cb7e963 SHA512 ccbf0f23e228de2de147241f36f59744b2256cba958e2fabfba0cfa60935e55bbb7d7e20fffa54da9a345e55ffa9ca82cb62e9b99dc738ba35c6e268c6561a8d
diff --git a/net-im/bitlbee/bitlbee-3.6.ebuild b/net-im/bitlbee/bitlbee-3.6.ebuild
new file mode 100644
index 000000000000..703647ae05d3
--- /dev/null
+++ b/net-im/bitlbee/bitlbee-3.6.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd toolchain-funcs
+
+if [[ ${PV} == "9999" ]]; then
+ EGIT_REPO_URI="https://github.com/bitlbee/bitlbee.git"
+ inherit git-r3
+else
+ SRC_URI="https://get.bitlbee.org/src/${P}.tar.gz"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+
+DESCRIPTION="irc to IM gateway that support multiple IM protocols"
+HOMEPAGE="https://www.bitlbee.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE_PROTOCOLS="msn oscar purple twitter +xmpp"
+IUSE="debug +gnutls ipv6 libevent libressl nss otr +plugins selinux test xinetd
+ ${IUSE_PROTOCOLS}"
+
+REQUIRED_USE="
+ || ( purple xmpp msn oscar )
+ xmpp? ( !nss )
+ test? ( plugins )
+"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.16
+ purple? ( net-im/pidgin )
+ libevent? ( dev-libs/libevent:= )
+ otr? ( >=net-libs/libotr-4 )
+ gnutls? ( net-libs/gnutls:= )
+ !gnutls? (
+ nss? ( dev-libs/nss )
+ !nss? (
+ libressl? ( dev-libs/libressl:= )
+ !libressl? ( dev-libs/openssl:0= )
+ )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ selinux? ( sec-policy/selinux-bitlbee )
+ test? ( dev-libs/check )"
+
+RDEPEND="${COMMON_DEPEND}
+ xinetd? ( sys-apps/xinetd )"
+
+pkg_setup() {
+ enewgroup bitlbee
+ enewuser bitlbee -1 -1 /var/lib/bitlbee bitlbee
+}
+
+src_prepare() {
+ [[ ${PV} != "9999" ]] && eapply "${FILESDIR}"/${PN}-3.5-systemd-user.patch
+ eapply_user
+}
+
+src_configure() {
+ local myconf
+
+ # setup plugins, protocol, ipv6 and debug
+ myconf+=( --jabber=$(usex xmpp 1 0) )
+ for flag in debug ipv6 plugins ${IUSE_PROTOCOLS/+xmpp/} ; do
+ myconf+=( --${flag}=$(usex ${flag} 1 0) )
+ done
+
+ # set otr
+ if use otr && use plugins ; then
+ myconf+=( --otr=plugin )
+ else
+ if use otr ; then
+ ewarn "OTR support has been disabled automatically because it"
+ ewarn "requires the plugins USE flag."
+ fi
+ myconf+=( --otr=0 )
+ fi
+
+ # setup ssl use flags
+ if use gnutls ; then
+ myconf+=( --ssl=gnutls )
+ einfo "Using gnutls for SSL support"
+ else
+ ewarn "Only gnutls is officially supported by upstream."
+ if use nss ; then
+ myconf+=( --ssl=nss )
+ einfo "Using nss for SSL support"
+ else
+ myconf+=( --ssl=openssl )
+ einfo "Using openssl for SSL support"
+ fi
+ fi
+
+ # set event handler
+ if use libevent ; then
+ myconf+=( --events=libevent )
+ else
+ myconf+=( --events=glib )
+ fi
+
+ # not autotools-based
+ ./configure \
+ --prefix=/usr \
+ --datadir=/usr/share/bitlbee \
+ --etcdir=/etc/bitlbee \
+ --plugindir=/usr/$(get_libdir)/bitlbee \
+ --systemdsystemunitdir=$(systemd_get_systemunitdir) \
+ --doc=1 \
+ --strip=0 \
+ --verbose=1 \
+ "${myconf[@]}" || die
+
+ sed -i \
+ -e "/^EFLAGS/s:=:&${LDFLAGS} :" \
+ Makefile.settings || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" LD="$(tc-getLD)"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install install-etc install-doc install-dev install-systemd
+
+ keepdir /var/lib/bitlbee
+ fperms 700 /var/lib/bitlbee
+ fowners bitlbee:bitlbee /var/lib/bitlbee
+
+ dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README}
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins doc/bitlbee.xinetd bitlbee
+ fi
+
+ newinitd "${FILESDIR}"/bitlbee.initd-r2 bitlbee
+ newconfd "${FILESDIR}"/bitlbee.confd-r2 bitlbee
+
+ exeinto /usr/share/bitlbee
+ doexe utils/{convert_purple.py,bitlbee-ctl.pl}
+}
+
+pkg_postinst() {
+ chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
+}
diff --git a/net-im/bitlbee/bitlbee-9999.ebuild b/net-im/bitlbee/bitlbee-9999.ebuild
index ba55773394df..703647ae05d3 100644
--- a/net-im/bitlbee/bitlbee-9999.ebuild
+++ b/net-im/bitlbee/bitlbee-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit user systemd toolchain-funcs
@@ -48,7 +48,6 @@ DEPEND="${COMMON_DEPEND}
test? ( dev-libs/check )"
RDEPEND="${COMMON_DEPEND}
- virtual/logger
xinetd? ( sys-apps/xinetd )"
pkg_setup() {
@@ -57,12 +56,7 @@ pkg_setup() {
}
src_prepare() {
- if [[ ${PV} != "9999" ]]; then
- eapply \
- "${FILESDIR}"/${P}-systemd-user.patch \
- "${FILESDIR}"/${P}-verbose-build.patch
- fi
-
+ [[ ${PV} != "9999" ]] && eapply "${FILESDIR}"/${PN}-3.5-systemd-user.patch
eapply_user
}
@@ -143,8 +137,8 @@ src_install() {
newins doc/bitlbee.xinetd bitlbee
fi
- newinitd "${FILESDIR}"/bitlbee.initd-r1 bitlbee
- newconfd "${FILESDIR}"/bitlbee.confd-r1 bitlbee
+ newinitd "${FILESDIR}"/bitlbee.initd-r2 bitlbee
+ newconfd "${FILESDIR}"/bitlbee.confd-r2 bitlbee
exeinto /usr/share/bitlbee
doexe utils/{convert_purple.py,bitlbee-ctl.pl}
@@ -152,17 +146,4 @@ src_install() {
pkg_postinst() {
chown -R bitlbee:bitlbee "${ROOT}"/var/lib/bitlbee
- [[ -d "${ROOT}"/var/run/bitlbee ]] &&
- chown -R bitlbee:bitlbee "${ROOT}"/var/run/bitlbee
-
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- einfo
- elog "The bitlbee init script will now attempt to stop all processes owned by the"
- elog "bitlbee user, including per-client forks."
- elog
- elog "Tell the init script not to touch anything besides the main bitlbee process"
- elog "by changing the BITLBEE_STOP_ALL variable in"
- elog " /etc/conf.d/bitlbee"
- einfo
- fi
}
diff --git a/net-im/bitlbee/files/bitlbee.confd-r2 b/net-im/bitlbee/files/bitlbee.confd-r2
new file mode 100644
index 000000000000..afd24f857f2d
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee.confd-r2
@@ -0,0 +1,7 @@
+# Bitlbee options (see /usr/sbin/bitlbee -h)
+BITLBEE_OPTS=""
+
+# Specify the network services that correspond to "DaemonInterface" and
+# "ClientInterface" settings in bitlbee.conf. For example, if bound to 0.0.0.0,
+# this should be set to "net.lo" which provides the loopback interface.
+rc_need="net.lo"
diff --git a/net-im/bitlbee/files/bitlbee.initd-r2 b/net-im/bitlbee/files/bitlbee.initd-r2
new file mode 100644
index 000000000000..0b3b1a4911bc
--- /dev/null
+++ b/net-im/bitlbee/files/bitlbee.initd-r2
@@ -0,0 +1,7 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/sbin/bitlbee"
+pidfile="/run/${RC_SVCNAME}.pid"
+command_args="-D -P ${pidfile} -u bitlbee ${BITLBEE_OPTS}"
diff --git a/net-im/pidgin/pidgin-2.13.0.ebuild b/net-im/pidgin/pidgin-2.13.0.ebuild
index 68fc76b0cb0e..0927ed54a444 100644
--- a/net-im/pidgin/pidgin-2.13.0.ebuild
+++ b/net-im/pidgin/pidgin-2.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="0/2" # libpurple version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="dbus debug doc eds gadu gnutls +gstreamer +gtk idn meanwhile pie"
IUSE+=" networkmanager nls perl silc tcl tk spell sasl ncurses"
IUSE+=" groupwise prediction python +xscreensaver zephyr zeroconf" # mono"
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 3a14d40646b6..468254f46564 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/metamail/metamail-2.7.53.3-r1.ebuild b/net-mail/metamail/metamail-2.7.53.3-r1.ebuild
deleted file mode 100644
index 0fc5a95cabe2..000000000000
--- a/net-mail/metamail/metamail-2.7.53.3-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils toolchain-funcs versionator
-
-MY_PV=$(get_version_component_range 1-2)
-DEB_PV=${MY_PV}-$(get_version_component_range 3)
-
-DESCRIPTION="Metamail (with Debian patches) - Generic MIME package"
-HOMEPAGE="http://ftp.funet.fi/pub/unix/mail/metamail/"
-SRC_URI="http://ftp.funet.fi/pub/unix/mail/metamail/mm${MY_PV}.tar.Z
- mirror://debian/pool/main/m/metamail/metamail_${DEB_PV}.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="static-libs"
-
-DEPEND="sys-libs/ncurses
- app-arch/sharutils
- net-mail/mailbase"
-RDEPEND="app-misc/mime-types
- sys-apps/debianutils
- !app-misc/run-mailcap"
-
-S=${WORKDIR}/mm${MY_PV}/src
-
-src_prepare() {
- epatch "${WORKDIR}"/metamail_${DEB_PV}.diff
- epatch "${FILESDIR}"/${PN}-2.7.45.3-CVE-2006-0709.patch
- epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-
- # respect CFLAGS
- sed -i -e 's/CFLAGS/LIBS/' \
- "${S}"/src/{metamail,richmail}/Makefile.am || die
-
- # add missing include - QA
- sed -i -e '/config.h/a #include ' \
- "${S}"/src/metamail/shared.c || die
-
- # Fix building with ncurses[tinfo]
- sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" \
- src/richmail/Makefile.am \
- src/metamail/Makefile.am || die
- eautoreconf
- chmod +x "${S}"/configure
-}
-
-src_configure() {
- econf $(use_enable static-libs static)
-}
-
-src_compile() {
- emake CC=$(tc-getCC) CFLAGS="${CFLAGS}"
-}
-
-src_install () {
- emake DESTDIR="${D}" install
- dodoc CREDITS README
- rm man/mmencode.1
- doman man/* debian/mimencode.1 debian/mimeit.1
-
- use static-libs || find "${D}"/usr/lib* -name '*.la' -delete
-}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 3c98f093ae3b..b1263cba95f6 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/autossh/Manifest b/net-misc/autossh/Manifest
index a864eea78c26..e35aa69e9d59 100644
--- a/net-misc/autossh/Manifest
+++ b/net-misc/autossh/Manifest
@@ -1,2 +1,3 @@
DIST autossh-1.4e.tgz 65852 BLAKE2B e654f7bb3efb48ab33fe7fb52b812d5b3de9bcbf4ecd79fe67372f0c832bedf4f8fb30ff5ec116418c9a6317e60d4ea4f3d3b2be4d6a8bafa431a9b289954c9f SHA512 2f71403ee005103c6a3e2e669f6b26153161c95c8dacd3e73d61673461b3512348636877760d911341771e744c0a682b107df4ac48621661ff36a9fc0191f2fb
DIST autossh-1.4f.tgz 67128 BLAKE2B 197c964272c47bce1a137eb45560a9f70c64686915d12e1f9827eaffb66151e124a4ad7e3b5980d539d75feb0180760d6df382da77f9195ad3f703c85b02759b SHA512 a66912a04d1b659802913ec63d7b951fa6265dedf4480f0ad2dfdfb852e1e3029355b9a132bf3fa5b4b67e5ac8dace83b96e837182d8b3f0c2c72ad9188b7b8f
+DIST autossh-1.4g.tgz 67599 BLAKE2B 179af97ee6f3b9c1c4fcbad1593118aa5d69dbd2b6215efd4a16ab7641f6f0194faaca3c3101b3a918d652988a06b5fa8ce6e52f85f81edd95b3d71d49aad076 SHA512 499b560d978736f4e764d5d828282fdaba1cbf94811ae6be0be5434d9c1cdc6ca5513d728b6372aa243843cb1b91e61cfc5fdeb77ddb0b6a7ce027218ba67466
diff --git a/net-misc/autossh/autossh-1.4g.ebuild b/net-misc/autossh/autossh-1.4g.ebuild
new file mode 100644
index 000000000000..14991df99f5a
--- /dev/null
+++ b/net-misc/autossh/autossh-1.4g.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Automatically restart SSH sessions and tunnels"
+HOMEPAGE="http://www.harding.motd.ca/autossh/"
+SRC_URI="http://www.harding.motd.ca/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="net-misc/openssh"
+
+src_install() {
+ dobin autossh
+ dodoc CHANGES README autossh.host rscreen
+ doman autossh.1
+}
diff --git a/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch b/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch
deleted file mode 100644
index 5404414fc0ea..000000000000
--- a/net-misc/connman/files/connman-1.16-execinfo-assumptions.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff -uNr a/config.h.in b/config.h.in
---- a/config.h.in 2013-07-02 17:41:03.715261748 +0000
-+++ b/config.h.in 2013-07-02 17:41:21.707260667 +0000
-@@ -3,6 +3,9 @@
- /* Define to 1 if you have the header file. */
- #undef HAVE_DLFCN_H
-
-+/* Define to 1 if you have the header file. */
-+#undef HAVE_EXECINFO_H
-+
- /* Define to 1 if you have the header file. */
- #undef HAVE_INTTYPES_H
-
-diff -uNr a/configure.ac b/configure.ac
---- a/configure.ac 2013-07-02 17:41:03.715261748 +0000
-+++ b/configure.ac 2013-07-02 17:41:21.719260666 +0000
-@@ -181,6 +181,8 @@
- AC_CHECK_FUNC(signalfd, dummy=yes,
- AC_MSG_ERROR(signalfd support is required))
-
-+AC_CHECK_HEADERS([execinfo.h], [], [])
-+
- AC_CHECK_LIB(dl, dlopen, dummy=yes,
- AC_MSG_ERROR(dynamic linking loader is required))
-
-diff -uNr a/src/log.c b/src/log.c
---- a/src/log.c 2013-07-02 17:41:03.727261747 +0000
-+++ b/src/log.c 2013-07-02 17:42:12.717257603 +0000
-@@ -30,7 +30,9 @@
- #include
- #include
- #include
-+#ifdef HAVE_EXECINFO_H
- #include
-+#endif
- #include
-
- #include "connman.h"
-@@ -112,6 +114,7 @@
-
- static void print_backtrace(unsigned int offset)
- {
-+#ifdef HAVE_EXECINFO_H
- void *frames[99];
- size_t n_ptrs;
- unsigned int i;
-@@ -210,6 +213,7 @@
-
- close(outfd[1]);
- close(infd[0]);
-+#endif
- }
-
- static void signal_handler(int signo)
diff --git a/net-misc/connman/files/connman-1.31-xtables.patch b/net-misc/connman/files/connman-1.31-xtables.patch
deleted file mode 100644
index 84f4445e8da1..000000000000
--- a/net-misc/connman/files/connman-1.31-xtables.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- connman-1.31/src/iptables.c.old 2016-03-22 20:12:47.829460752 -0700
-+++ connman-1.31/src/iptables.c 2016-03-22 21:33:36.835384724 -0700
-@@ -28,11 +28,11 @@
- #include
- #include
- #include
- #include
- #include
--#include
-+#include "connman_xtables.h"
- #include
-
- #include
-
- #include "connman.h"
---- connman-1.31/src/firewall.c.old 2016-03-22 21:29:01.959472262 -0700
-+++ connman-1.31/src/firewall.c 2016-03-22 21:33:53.048144181 -0700
-@@ -23,11 +23,11 @@
- #include
- #endif
-
- #include
-
--#include
-+#include "connman_xtables.h"
- #include
-
- #include "connman.h"
-
- #define CHAIN_PREFIX "connman-"
---- /dev/null 2016-03-18 06:21:16.372989086 -0700
-+++ connman-1.31/include/connman_xtables.h 2016-03-22 21:32:21.349504786 -0700
-@@ -0,0 +1,21 @@
-+#ifndef CONNMAN_XTABLES_H
-+#define CONNMAN_XTABLES_H
-+
-+#include
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) || \
-+ LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)
-+#include
-+#else
-+#ifdef __USE_MISC
-+#define GENTOO_USE_MISC __USE_MISC
-+#undef __USE_MISC
-+#endif
-+
-+#include
-+
-+#ifdef GENTOO_USE_MISC
-+#define __USE_MISC GENTOO_USE_MISC
-+#undef GENTOO_USE_MISC
-+#endif
-+#endif
-+#endif
diff --git a/net-misc/connman/files/connman.service b/net-misc/connman/files/connman.service
deleted file mode 100644
index ece38a716e96..000000000000
--- a/net-misc/connman/files/connman.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Network Connection Manager Daemon
-
-[Service]
-Type=dbus
-BusName=net.connman
-ExecStart=/usr/sbin/connmand --nodaemon
-
-[Install]
-WantedBy=multi-user.target
-Alias=net.connman.service
diff --git a/net-misc/curl/curl-7.64.0.ebuild b/net-misc/curl/curl-7.64.0.ebuild
index 26b4dd60cdc0..e50554e31902 100644
--- a/net-misc/curl/curl-7.64.0.ebuild
+++ b/net-misc/curl/curl-7.64.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://curl.haxx.se/download/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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="adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads"
IUSE+=" curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl"
IUSE+=" elibc_Winnt"
diff --git a/net-misc/electrum/files/2.8.0-no-user-root.patch b/net-misc/electrum/files/2.8.0-no-user-root.patch
deleted file mode 100644
index 2ca5363effe7..000000000000
--- a/net-misc/electrum/files/2.8.0-no-user-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./setup.py.orig 2017-01-06 19:17:44.294137848 +0000
-+++ ./setup.py 2017-01-06 19:17:50.093161327 +0000
-@@ -21,12 +21,6 @@
- parser.add_argument('--root=', dest='root_path', metavar='dir', default='/')
- opts, _ = parser.parse_known_args(sys.argv[1:])
- usr_share = os.path.join(sys.prefix, "share")
-- if not os.access(opts.root_path + usr_share, os.W_OK) and \
-- not os.access(opts.root_path, os.W_OK):
-- if 'XDG_DATA_HOME' in os.environ.keys():
-- usr_share = os.environ['XDG_DATA_HOME']
-- else:
-- usr_share = os.path.expanduser('~/.local/share')
- data_files += [
- (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
- ]
diff --git a/net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch b/net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch
deleted file mode 100644
index d8d8a1355f25..000000000000
--- a/net-misc/electrum/files/3.1.1-pip-optional-pkgs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Electrum-3.1.1.orig/setup.py Electrum-3.1.1/setup.py
---- Electrum-3.1.1.orig/setup.py 2018-03-12 13:25:11.000000000 -0400
-+++ Electrum-3.1.1/setup.py 2018-03-17 17:49:54.481961514 -0400
-@@ -86,8 +86,3 @@
- url="https://electrum.org",
- long_description="""Lightweight Bitcoin Wallet"""
- )
--
--# Optional modules (not required to run Electrum)
--import pip
--opt_modules = requirements_hw + ['pycryptodomex']
--[ pip.main(['install', m]) for m in opt_modules ]
diff --git a/net-misc/electrum/files/3.1.2-desktop.patch b/net-misc/electrum/files/3.1.2-desktop.patch
deleted file mode 100644
index 2c271dd60d88..000000000000
--- a/net-misc/electrum/files/3.1.2-desktop.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur Electrum-3.1.2.orig/electrum.desktop Electrum-3.1.2/electrum.desktop
---- Electrum-3.1.2.orig/electrum.desktop 2018-03-24 06:42:16.000000000 -0400
-+++ Electrum-3.1.2/electrum.desktop 2018-04-01 08:37:43.362027638 -0400
-@@ -3,7 +3,7 @@
-
- [Desktop Entry]
- Comment=Lightweight Bitcoin Client
--Exec=sh -c 'PATH="$HOME/.local/bin:$PATH" electrum %u'
-+Exec=electrum %u
- GenericName[en_US]=Bitcoin Wallet
- GenericName=Bitcoin Wallet
- Icon=electrum
-@@ -14,8 +14,4 @@
- Terminal=false
- Type=Application
- MimeType=x-scheme-handler/bitcoin;
--Actions=Testnet;
-
--[Desktop Action Testnet]
--Exec=sh -c 'PATH="$HOME/.local/bin:$PATH" electrum --testnet %u'
--Name=Testnet mode
diff --git a/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch b/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch
deleted file mode 100644
index 0f54f477adc6..000000000000
--- a/net-misc/electrum/files/3.2.2-pip-optional-pkgs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Naur Electrum-3.2.2.orig/setup.py Electrum-3.2.2/setup.py
---- Electrum-3.2.2.orig/setup.py 2018-07-01 08:00:11.000000000 -0400
-+++ Electrum-3.2.2/setup.py 2018-07-16 14:09:10.790238994 -0400
-@@ -40,19 +40,10 @@
- (os.path.join(usr_share, icons_dirname), ['icons/electrum.png'])
- ]
-
--extras_require = {
-- 'hardware': requirements_hw,
-- 'fast': ['pycryptodomex'],
-- ':python_version < "3.5"': ['typing>=3.0.0'],
--}
--extras_require['full'] = extras_require['hardware'] + extras_require['fast']
--
--
- setup(
- name="Electrum",
- version=version.ELECTRUM_VERSION,
- install_requires=requirements,
-- extras_require=extras_require,
- packages=[
- 'electrum',
- 'electrum_gui',
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 679c76c74500..e35dbc48731a 100644
Binary files a/net-nds/Manifest.gz and b/net-nds/Manifest.gz differ
diff --git a/net-nds/yp-tools/yp-tools-4.2.3.ebuild b/net-nds/yp-tools/yp-tools-4.2.3.ebuild
index ba91972ac78d..e44183604d89 100644
--- a/net-nds/yp-tools/yp-tools-4.2.3.ebuild
+++ b/net-nds/yp-tools/yp-tools-4.2.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/thkukuk/yp-tools/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sparc x86"
IUSE="nls"
DEPEND="
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index a4a176e35a1e..57896abc3b7b 100644
Binary files a/net-news/Manifest.gz and b/net-news/Manifest.gz differ
diff --git a/net-news/rssguard/files/rssguard-3.3.5-deps.patch b/net-news/rssguard/files/rssguard-3.3.5-deps.patch
deleted file mode 100644
index 86733e362afe..000000000000
--- a/net-news/rssguard/files/rssguard-3.3.5-deps.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Remove these dependencies that are not used.
-
---- a/rssguard.pro
-+++ b/rssguard.pro
-@@ -164,7 +164,7 @@ message(rssguard: Prefix directory: \"$$PREFIX\".)
- message(rssguard: Build revision: \"$$APP_REVISION\".)
- message(rssguard: lrelease executable name: \"$$LRELEASE_EXECUTABLE\".)
-
--QT += core gui widgets sql network xml printsupport
-+QT += core gui widgets sql network xml
-
- CONFIG *= c++11 debug_and_release warn_on
- DEFINES *= QT_USE_QSTRINGBUILDER QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS UNICODE _UNICODE
-diff --git a/src/miscellaneous/systemfactory.cpp b/src/miscellaneous/systemfactory.cpp
-index da35aba..1d6b2cd 100755
---- a/src/miscellaneous/systemfactory.cpp
-+++ b/src/miscellaneous/systemfactory.cpp
-@@ -35,7 +35,6 @@
- #include
- #include
- #include
--#include
- #include
-
-
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 32a1226fbab3..9d545548be3f 100644
Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ
diff --git a/net-p2p/bitcoind/files/bitcoind.service-r1 b/net-p2p/bitcoind/files/bitcoind.service-r1
deleted file mode 100644
index ee113d7615c2..000000000000
--- a/net-p2p/bitcoind/files/bitcoind.service-r1
+++ /dev/null
@@ -1,25 +0,0 @@
-# It is not recommended to modify this file in-place, because it will
-# be overwritten during package upgrades. If you want to add further
-# options or overwrite existing ones then use
-# $ systemctl edit bitcoind.service
-# See "man systemd.service" for details.
-
-# Note that almost all daemon options could be specified in
-# /etc/bitcoin/bitcoin.conf
-
-[Unit]
-Description=Bitcoin daemon
-After=network.target
-
-[Service]
-ExecStart=/usr/bin/bitcoind -daemon -conf=/etc/bitcoin/bitcoin.conf -pid=/run/bitcoind/bitcoind.pid
-# Creates /run/bitcoind owned by bitcoin
-RuntimeDirectory=bitcoind
-User=bitcoin
-Type=forking
-PIDFile=/run/bitcoind/bitcoind.pid
-Restart=on-failure
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 0a61fb69d038..18704dc2e3ff 100644
Binary files a/net-print/Manifest.gz and b/net-print/Manifest.gz differ
diff --git a/net-print/cups-filters/cups-filters-1.21.6.ebuild b/net-print/cups-filters/cups-filters-1.21.6.ebuild
index 3b9ec070445a..9fdf92bcda50 100644
--- a/net-print/cups-filters/cups-filters-1.21.6.ebuild
+++ b/net-print/cups-filters/cups-filters-1.21.6.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
else
SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
- KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-fbsd ~m68k-mint"
+ KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
fi
DESCRIPTION="Cups filters"
HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 7a5e6b8d7a6b..fbfe047b107e 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.1-ldflags.patch b/net-proxy/tinyproxy/files/tinyproxy-1.8.1-ldflags.patch
deleted file mode 100644
index bd40ec33e31a..000000000000
--- a/net-proxy/tinyproxy/files/tinyproxy-1.8.1-ldflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac 2010-03-09 12:41:45.000000000 +0100
-+++ b/configure.ac 2010-05-17 23:07:39.000000000 +0200
-@@ -222,7 +222,7 @@
- CFLAGS="-DNDEBUG $CFLAGS"
- fi
-
--LDFLAGS="-Wl,-z,defs"
-+LDFLAGS="$LDFLAGS -Wl,-z,defs"
-
- dnl
- dnl Make sure we can actually handle the "--with-*" and "--enable-*" stuff.
diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.1-minimal.patch b/net-proxy/tinyproxy/files/tinyproxy-1.8.1-minimal.patch
deleted file mode 100644
index 82793a8894d0..000000000000
--- a/net-proxy/tinyproxy/files/tinyproxy-1.8.1-minimal.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,7 +2,6 @@
- src \
- data \
- etc \
-- docs \
- m4macros \
- tests
-
diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2-DoS-Prevention.patch b/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2-DoS-Prevention.patch
deleted file mode 100644
index 059f178c1ee2..000000000000
--- a/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2-DoS-Prevention.patch
+++ /dev/null
@@ -1,183 +0,0 @@
-https://banu.com/bugzilla/show_bug.cgi?id=110#c4
-
-From 526215dbb4abb1cff9a170343fa50dbda9492eb1 Mon Sep 17 00:00:00 2001
-From: Michael Adam
-Date: Fri, 15 Mar 2013 12:34:01 +0100
-Subject: [PATCH 1/2] [BB#110] secure the hashmaps by adding a seed
-
-Based on patch provided by gpernot@praksys.org on bugzilla.
-
-Signed-off-by: Michael Adam
----
- configure.ac | 2 ++
- src/child.c | 1 +
- src/hashmap.c | 14 ++++++++------
- 3 files changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ecbcba0..cc40e85 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -205,6 +205,8 @@ AC_CHECK_FUNCS([gethostname inet_ntoa memchr memset select socket strcasecmp \
- AC_CHECK_FUNCS([isascii memcpy setrlimit ftruncate regcomp regexec])
- AC_CHECK_FUNCS([strlcpy strlcat])
-
-+AC_CHECK_FUNCS([time rand srand])
-+
-
- dnl Enable extra warnings
- DESIRED_FLAGS="-fdiagnostics-show-option -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wfloat-equal -Wundef -Wformat=2 -Wlogical-op -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Waggregate-return -Winit-self -Wpacked --std=c89 -ansi -pedantic -Wno-overlength-strings -Wc++-compat -Wno-long-long -Wno-overlength-strings -Wdeclaration-after-statement -Wredundant-decls -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-qual -Wcast-align -Wwrite-strings -Wp,-D_FORTIFY_SOURCE=2 -fno-common"
-diff --git a/src/child.c b/src/child.c
-index 34e20e0..0d778d9 100644
---- a/src/child.c
-+++ b/src/child.c
-@@ -196,6 +196,7 @@ static void child_main (struct child_s *ptr)
- }
-
- ptr->connects = 0;
-+ srand(time(NULL));
-
- while (!config.quit) {
- ptr->status = T_WAITING;
-diff --git a/src/hashmap.c b/src/hashmap.c
-index f46fdcb..8cf7c6b 100644
---- a/src/hashmap.c
-+++ b/src/hashmap.c
-@@ -50,6 +50,7 @@ struct hashbucket_s {
- };
-
- struct hashmap_s {
-+ uint32_t seed;
- unsigned int size;
- hashmap_iter end_iterator;
-
-@@ -65,7 +66,7 @@ struct hashmap_s {
- *
- * If any of the arguments are invalid a negative number is returned.
- */
--static int hashfunc (const char *key, unsigned int size)
-+static int hashfunc (const char *key, unsigned int size, uint32_t seed)
- {
- uint32_t hash;
-
-@@ -74,7 +75,7 @@ static int hashfunc (const char *key, unsigned int size)
- if (size == 0)
- return -ERANGE;
-
-- for (hash = tolower (*key++); *key != '\0'; key++) {
-+ for (hash = seed; *key != '\0'; key++) {
- uint32_t bit = (hash & 1) ? (1 << (sizeof (uint32_t) - 1)) : 0;
-
- hash >>= 1;
-@@ -104,6 +105,7 @@ hashmap_t hashmap_create (unsigned int nbuckets)
- if (!ptr)
- return NULL;
-
-+ ptr->seed = (uint32_t)rand();
- ptr->size = nbuckets;
- ptr->buckets = (struct hashbucket_s *) safecalloc (nbuckets,
- sizeof (struct
-@@ -201,7 +203,7 @@ hashmap_insert (hashmap_t map, const char *key, const void *data, size_t len)
- if (!data || len < 1)
- return -ERANGE;
-
-- hash = hashfunc (key, map->size);
-+ hash = hashfunc (key, map->size, map->seed);
- if (hash < 0)
- return hash;
-
-@@ -382,7 +384,7 @@ ssize_t hashmap_search (hashmap_t map, const char *key)
- if (map == NULL || key == NULL)
- return -EINVAL;
-
-- hash = hashfunc (key, map->size);
-+ hash = hashfunc (key, map->size, map->seed);
- if (hash < 0)
- return hash;
-
-@@ -416,7 +418,7 @@ ssize_t hashmap_entry_by_key (hashmap_t map, const char *key, void **data)
- if (!map || !key || !data)
- return -EINVAL;
-
-- hash = hashfunc (key, map->size);
-+ hash = hashfunc (key, map->size, map->seed);
- if (hash < 0)
- return hash;
-
-@@ -451,7 +453,7 @@ ssize_t hashmap_remove (hashmap_t map, const char *key)
- if (map == NULL || key == NULL)
- return -EINVAL;
-
-- hash = hashfunc (key, map->size);
-+ hash = hashfunc (key, map->size, map->seed);
- if (hash < 0)
- return hash;
-
---
-1.7.9.5
-
-https://banu.com/bugzilla/show_bug.cgi?id=110#c5
-
-From f1189daec6866efeb44f24073cd19d7ece86e537 Mon Sep 17 00:00:00 2001
-From: Michael Adam
-Date: Fri, 15 Mar 2013 13:10:01 +0100
-Subject: [PATCH 2/2] [BB#110] limit the number of headers per request to
- prevent DoS
-
-Based on patch provided by gpernot@praksys.org on bugzilla.
-
-Signed-off-by: Michael Adam
----
- src/reqs.c | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/src/reqs.c b/src/reqs.c
-index 2de43a8..af014ba 100644
---- a/src/reqs.c
-+++ b/src/reqs.c
-@@ -611,12 +611,19 @@ add_header_to_connection (hashmap_t hashofheaders, char *header, size_t len)
- }
-
- /*
-+ * define max number of headers.
-+ * big enough to handle legitimate cases, but limited to avoid DoS
-+ */
-+#define MAX_HEADERS 10000
-+
-+/*
- * Read all the headers from the stream
- */
- static int get_all_headers (int fd, hashmap_t hashofheaders)
- {
- char *line = NULL;
- char *header = NULL;
-+ int count;
- char *tmp;
- ssize_t linelen;
- ssize_t len = 0;
-@@ -625,7 +632,7 @@ static int get_all_headers (int fd, hashmap_t hashofheaders)
- assert (fd >= 0);
- assert (hashofheaders != NULL);
-
-- for (;;) {
-+ for (count = 0; count < MAX_HEADERS; count++) {
- if ((linelen = readline (fd, &line)) <= 0) {
- safefree (header);
- safefree (line);
-@@ -691,6 +698,14 @@ static int get_all_headers (int fd, hashmap_t hashofheaders)
-
- safefree (line);
- }
-+
-+ /*
-+ * if we get there, this is we reached MAX_HEADERS count
-+ * bail out with error
-+ */
-+ safefree (header);
-+ safefree (line);
-+ return -1;
- }
-
- /*
---
-1.7.9.5
diff --git a/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2.initd b/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2.initd
deleted file mode 100644
index 0d6618b69a9a..000000000000
--- a/net-proxy/tinyproxy/files/tinyproxy-1.8.3-r2.initd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-get_config() {
- res=$(awk '$1 == "'$1'" { s=$2 } END { print s }' "$CONFFILE")
-
- if [ "x$res" = "x" ]; then
- echo "$2"
- else
- eval echo "$res"
- fi
-}
-
-: ${CONFFILE:="/etc/${SVCNAME}.conf"}
-
-command=/usr/sbin/tinyproxy
-command_args="-c ${CONFFILE}"
-pidfile=$(get_config PidFile /run/tinyproxy/${SVCNAME}.pid)
-
-depend() {
- config "$CONFFILE"
-
- use dns
-
- [ "$(get_config Syslog Off)" = "On" ] && \
- use logger
-}
-
-start_pre() {
- piddir=$(dirname ${pidfile})
-
- if [ "${piddir}" = "/run" ]; then
- eerror "Please change your PidFile settings to be within the"
- eerror "/run/tinyproxy directory"
- eend 1
- else
- checkpath -d -o $(get_config User tinyproxy):$(get_config Group tinyproxy) ${piddir}
- fi
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 27d572f9e4e2..a0b387236e85 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/updates/1Q-2013 b/profiles/updates/1Q-2013
deleted file mode 100644
index 64008999629a..000000000000
--- a/profiles/updates/1Q-2013
+++ /dev/null
@@ -1,82 +0,0 @@
-move media-gfx/opencolorio media-libs/opencolorio
-move dev-util/nvidia-cuda-npp dev-util/nvidia-cuda-toolkit
-move app-cdr/cdemud app-cdr/cdemu-daemon
-slotmove =dev-python/pmw-1.3.3 0 py2
-slotmove =dev-python/pmw-2.0.0 0 py3
-move media-fonts/freefont-ttf media-fonts/freefont
-move sys-cluster/gsh sys-cluster/polysh
-move media-tv/ivtv-firmware sys-firmware/ivtv-firmware
-move net-wireless/zd1201-firmware sys-firmware/zd1201-firmware
-move net-wireless/zd1211-firmware sys-firmware/zd1211-firmware
-move net-wireless/ipw2100-firmware sys-firmware/ipw2100-firmware
-move net-wireless/ipw2200-firmware sys-firmware/ipw2200-firmware
-move app-vim/threesome app-vim/splice
-move app-vim/bufferexplorer app-vim/bufexplorer
-move net-wireless/bluez-firmware sys-firmware/bluez-firmware
-move net-wireless/atmel-firmware sys-firmware/atmel-firmware
-move net-wireless/b43-firmware sys-firmware/b43-firmware
-move net-wireless/b43legacy-firmware sys-firmware/b43legacy-firmware
-move dev-util/qt-creator dev-qt/qt-creator
-move x11-libs/qt-assistant dev-qt/qthelp
-move x11-libs/qt-core dev-qt/qtcore
-move x11-libs/qt-dbus dev-qt/qtdbus
-move x11-libs/qt-declarative dev-qt/qtdeclarative
-move x11-libs/qt-gui dev-qt/qtgui
-move x11-libs/qt-multimedia dev-qt/qtmultimedia
-move x11-libs/qt-opengl dev-qt/qtopengl
-move x11-libs/qt-script dev-qt/qtscript
-move x11-libs/qt-sql dev-qt/qtsql
-move x11-libs/qt-svg dev-qt/qtsvg
-move x11-libs/qt-test dev-qt/qttest
-move x11-libs/qt-webkit dev-qt/qtwebkit
-move x11-libs/qt-xmlpatterns dev-qt/qtxmlpatterns
-move app-editors/leechcraft-popishu app-leechcraft/lc-popishu
-move app-text/leechcraft-monocle app-leechcraft/lc-monocle
-move media-sound/leechcraft-hotstreams app-leechcraft/lc-hotstreams
-move media-sound/leechcraft-lastfmscrobble app-leechcraft/lc-lastfmscrobble
-move media-sound/leechcraft-lmp app-leechcraft/lc-lmp
-move media-sound/leechcraft-musiczombie app-leechcraft/lc-musiczombie
-move media-sound/leechcraft-touchstreams app-leechcraft/lc-touchstreams
-move net-analyzer/leechcraft-networkmonitor app-leechcraft/lc-networkmonitor
-move net-im/leechcraft-azoth app-leechcraft/lc-azoth
-move net-misc/leechcraft-advancednotifications app-leechcraft/lc-advancednotifications
-move net-misc/leechcraft-anhero app-leechcraft/lc-anhero
-move net-misc/leechcraft-auscrie app-leechcraft/lc-auscrie
-move net-misc/leechcraft-blogique app-leechcraft/lc-blogique
-move net-misc/leechcraft-core app-leechcraft/lc-core
-move net-misc/leechcraft-cstp app-leechcraft/lc-cstp
-move net-misc/leechcraft-dbusmanager app-leechcraft/lc-dbusmanager
-move net-misc/leechcraft-full app-leechcraft/leechcraft-meta
-move net-misc/leechcraft-gacts app-leechcraft/lc-gacts
-move net-misc/leechcraft-glance app-leechcraft/lc-glance
-move net-misc/leechcraft-historyholder app-leechcraft/lc-historyholder
-move net-misc/leechcraft-kinotify app-leechcraft/lc-kinotify
-move net-misc/leechcraft-knowhow app-leechcraft/lc-knowhow
-move net-misc/leechcraft-lackman app-leechcraft/lc-lackman
-move net-misc/leechcraft-launchy app-leechcraft/lc-launchy
-move net-misc/leechcraft-lemon app-leechcraft/lc-lemon
-move net-misc/leechcraft-liznoo app-leechcraft/lc-liznoo
-move net-misc/leechcraft-netstoremanager app-leechcraft/lc-netstoremanager
-move net-misc/leechcraft-newlife app-leechcraft/lc-newlife
-move net-misc/leechcraft-otlozhu app-leechcraft/lc-otlozhu
-move net-misc/leechcraft-pintab app-leechcraft/lc-pintab
-move net-misc/leechcraft-qrosp app-leechcraft/lc-qrosp
-move net-misc/leechcraft-sb2 app-leechcraft/lc-sb2
-move net-misc/leechcraft-secman app-leechcraft/lc-secman
-move net-misc/leechcraft-summary app-leechcraft/lc-summary
-move net-misc/leechcraft-tabsessmanager app-leechcraft/lc-tabsessmanager
-move net-misc/leechcraft-tabslist app-leechcraft/lc-tabslist
-move net-news/leechcraft-aggregator app-leechcraft/lc-aggregator
-move net-p2p/leechcraft-bittorrent app-leechcraft/lc-bittorrent
-move net-proxy/leechcraft-xproxy app-leechcraft/lc-xproxy
-move sys-fs/leechcraft-vrooby app-leechcraft/lc-vrooby
-move www-client/leechcraft-deadlyrics app-leechcraft/lc-deadlyrics
-move www-client/leechcraft-dolozhee app-leechcraft/lc-dolozhee
-move www-client/leechcraft-poshuku app-leechcraft/lc-poshuku
-move www-misc/leechcraft-pogooglue app-leechcraft/lc-pogooglue
-move www-misc/leechcraft-seekthru app-leechcraft/lc-seekthru
-move x11-plugins/leechcraft-lhtr app-leechcraft/lc-lhtr
-move x11-plugins/leechcraft-tpi app-leechcraft/lc-tpi
-move app-leechcraft/leechraft-meta app-leechcraft/leechcraft-meta
-slotmove www-plugins/chrome-binary-plugins 0 unstable
-slotmove
-
+
floppym@gentoo.org
Mike Gilbert
- GRUB2 only - do not assign bugs related to GRUB Legacy (0.97)
-
-
- axs@gentoo.org
- Ian Stakenvicius
- GRUB-Legacy only - do not assign bugs related to GRUB2
base-system@gentoo.org
diff --git a/sys-firmware/Manifest.gz b/sys-firmware/Manifest.gz
index f440dab99091..58fc4044299e 100644
Binary files a/sys-firmware/Manifest.gz and b/sys-firmware/Manifest.gz differ
diff --git a/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild b/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild
deleted file mode 100644
index b062b9588e3c..000000000000
--- a/sys-firmware/sgabios/sgabios-0.1_pre8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="serial graphics adapter bios option rom for x86"
-HOMEPAGE="https://code.google.com/p/sgabios/"
-SRC_URI="mirror://gentoo/${P}.tar.xz
- https://dev.gentoo.org/~cardoe/distfiles/${P}.tar.xz
- https://dev.gentoo.org/~cardoe/distfiles/${P}-bins.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
-IUSE=""
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-makefile.patch
- epatch "${FILESDIR}"/${P}-build-cc.patch #552280
- epatch_user
-}
-
-src_compile() {
- if use amd64 || use x86 ; then
- tc-ld-disable-gold
- tc-export_build_env BUILD_CC
- emake \
- BUILD_CC="${BUILD_CC}" \
- BUILD_CFLAGS="${BUILD_CFLAGS}" \
- BUILD_LDFLAGS="${BUILD_LDFLAGS}" \
- BUILD_CPPFLAGS="${BUILD_CPPFLAGS}" \
- CC="$(tc-getCC)" \
- LD="$(tc-getLD)" \
- AR="$(tc-getAR)" \
- OBJCOPY="$(tc-getOBJCOPY)"
- fi
-}
-
-src_install() {
- insinto /usr/share/sgabios
-
- if use amd64 || use x86 ; then
- doins sgabios.bin
- else
- doins bins/sgabios.bin
- fi
-}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index cf89eebe3976..5a1ad20da16c 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/udisks/udisks-2.8.1.ebuild b/sys-fs/udisks/udisks-2.8.1.ebuild
index e129bdb659a1..5b55c237eb74 100644
--- a/sys-fs/udisks/udisks-2.8.1.ebuild
+++ b/sys-fs/udisks/udisks-2.8.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
IUSE="acl debug elogind +introspection lvm nls selinux systemd vdo"
REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index dc6c68def173..183cf156fd42 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/wait_on_pid/wait_on_pid-0.0.2-r1.ebuild b/sys-process/wait_on_pid/wait_on_pid-0.0.2-r1.ebuild
index 30c39fb67a5b..760d312320b4 100644
--- a/sys-process/wait_on_pid/wait_on_pid-0.0.2-r1.ebuild
+++ b/sys-process/wait_on_pid/wait_on_pid-0.0.2-r1.ebuild
@@ -7,11 +7,11 @@ inherit toolchain-funcs
DESCRIPTION="small utility to wait for an arbitrary process to exit"
HOMEPAGE="https://dev.gentoo.org/~zzam/wait_on_pid/"
-SRC_URI="mirror://gentoo/$P.tar.bz2 https://dev.gentoo.org/~zzam/wait_on_pid/$P.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2 https://dev.gentoo.org/~zzam/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
IUSE=""
DEPEND=""
diff --git a/sys-process/wait_on_pid/wait_on_pid-0.0.2.ebuild b/sys-process/wait_on_pid/wait_on_pid-0.0.2.ebuild
deleted file mode 100644
index ff20a7fa8eed..000000000000
--- a/sys-process/wait_on_pid/wait_on_pid-0.0.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="small utility to wait for an arbitrary process to exit"
-HOMEPAGE="https://dev.gentoo.org/~zzam/wait_on_pid/"
-SRC_URI="mirror://gentoo/$P.tar.bz2 https://dev.gentoo.org/~zzam/wait_on_pid/$P.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_prepare() {
- tc-export CC
-}
-
-src_install() {
- dobin wait_on_pid || die
- dodoc README
-}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 160e56cbe9d3..552b00efc4bf 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/pkgconfig/pkgconfig-1.ebuild b/virtual/pkgconfig/pkgconfig-1.ebuild
index 2476384b1b03..95ee24813766 100644
--- a/virtual/pkgconfig/pkgconfig-1.ebuild
+++ b/virtual/pkgconfig/pkgconfig-1.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
DESCRIPTION="Virtual for the pkg-config implementation"
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"
RDEPEND="
|| (
diff --git a/virtual/python-futures/python-futures-1.ebuild b/virtual/python-futures/python-futures-1.ebuild
index 8b9b48857247..374212fe0289 100644
--- a/virtual/python-futures/python-futures-1.ebuild
+++ b/virtual/python-futures/python-futures-1.ebuild
@@ -9,7 +9,7 @@ inherit python-r1
DESCRIPTION="A virtual for the Python concurrent.futures module"
SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index d4c91e4c5a55..c1791212a371 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/gitea/files/gitea.logrotated b/www-apps/gitea/files/gitea.logrotated
deleted file mode 100644
index ec6ddfe606b9..000000000000
--- a/www-apps/gitea/files/gitea.logrotated
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/gitea/* {
- su git git
- missingok
- size 5M
- rotate 3
- compress
- copytruncate
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 7b4e9233b029..e7d129913090 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 1b44e81cd233..86cd01aa8316 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
DIST chromium-71.0.3578.80.tar.xz 633878288 BLAKE2B be6dcb4c1123830f8f0413e52e46c6e3356356cbfadcaa77c3960f22a6f1f2f5a7a2e7da415b7c19b75d6cd4b881d45a8aeaa7c311547ac58fc34c87fdf23891 SHA512 79b0f5ebe71a34d9f5215df1b4e47071f2337bb480fbec591011653acdfe524419bd10efdeab334ac34c07bc4eb2c485d60a9c3b2f053a721271130ff98af516
-DIST chromium-71.0.3578.98.tar.xz 633860888 BLAKE2B f232fa3ecef45b3e7d0c9876c2d9133ed0a51f2241c3b354592ea62817b7660e7a91869f0d7f1aee60384e9b87644b837af36ff5d802cee986346778946ce0be SHA512 dbeb90e16c6c05422c1f43e8fe747d60dab49c1fffdd0f33824ca24429f3871bda649eb1e6402470d3d9bb701e47d55d2fff4f46530e3f43e72f516d1837aad6
-DIST chromium-72.0.3595.2.tar.xz 658797888 BLAKE2B 7f0274693e8fac283d75c7e7ff6f672a10937454d989e9aa728b4a9646fe92bd8aaa8c154913d71dd86fd7ced595c1b2475248a9fb521984049af04f289f3f43 SHA512 7d5130e45e28ccf7389c64ca24a12ffc84922ca40d2c0e9a2d9caf27eb40a08cfdda8a902c6d747f864071b6eec752287fe2654f62e7e6c5c42c1334c5f35766
DIST chromium-72.0.3626.28.tar.xz 686169316 BLAKE2B 6ee2bfd35e8d48a7122f0a8b85777733bdaf2c6c56b00eb6cf3ee14afede25a45919b6ce6267fb54ae9040d0b676d084d6db5026918b07bc3e26f825d6298c35 SHA512 474452f6d41f900118d88f3aaf435cd332567f7a55c2af449e775668a78ee285ab7c011ca41237fa2b13f4b3076ec0cfb5448cfe9018092614e60c0ad7c12252
+DIST chromium-72.0.3626.96.tar.xz 686361344 BLAKE2B 92a001d99d418b0305235af9109719d9179f8bee53ad79e1ac089a1bc32b493ddcd3e26419e37b68e912f7b09deb51efefd325b82abb1fa281fe207e3a1f9a89 SHA512 949dde41053dba7408ab96d6fc56668efa46248a7a5a4690642f3de696c25fc9d5a746d82b106f4083bf4a1a5676eea06060c616375f74379a051a6bde4faea0
+DIST chromium-webrtc-includes-r1.patch.xz 57820 BLAKE2B 8e113680254b4834abda72c335a8f0af7211c5982c91e52372945f9a57c5558bd6772300ffefb475b450c40ffe66cd627aba34d33af101fe402815c2a16fe6c8 SHA512 cd4562ec32a044925afc65d9cba62310acc515db7cab0ee3aa0f3afe11672b3e7046ca937d8739c4feca436af7d9cf0f7860716a397c8aa5d5ae647b5eaf1ac0
DIST chromium-webrtc-includes.patch.xz 57908 BLAKE2B e977da6fb10bd3fdd12fef75ad669c4e7cb15f8e518a18c52dec7a4e27f0d5444dffc880b4aed30ccef8b620d82946be08c0b5b63ceaec0554e9f80b867b9750 SHA512 440c5ede645d13ec74c08c755a46298f5fcf10c9cbe6d88621ae89a2b27ae41be9954f4e3c1798525cc97aac01e5021b878a06c5625628c4c071cec84f3dfe8a
diff --git a/www-client/chromium/chromium-71.0.3578.98.ebuild b/www-client/chromium/chromium-71.0.3578.98.ebuild
deleted file mode 100644
index 88e3484e883b..000000000000
--- a/www-client/chromium/chromium-71.0.3578.98.ebuild
+++ /dev/null
@@ -1,714 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
- hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
- sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-COMMON_DEPEND="
- >=app-accessibility/at-spi2-atk-2.26:2
- app-arch/bzip2:=
- cups? ( >=net-print/cups-1.3.11:= )
- >=dev-libs/atk-2.26
- dev-libs/expat:=
- dev-libs/glib:2
- system-icu? ( >=dev-libs/icu-59:= )
- >=dev-libs/libxml2-2.9.4-r3:=[icu]
- dev-libs/libxslt:=
- dev-libs/nspr:=
- >=dev-libs/nss-3.26:=
- >=dev-libs/re2-0.2016.11.01:=
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
- >=media-libs/alsa-lib-1.0.19:=
- media-libs/fontconfig:=
- media-libs/freetype:=
- >=media-libs/harfbuzz-2.0.0:0=[icu(-)]
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
- >=media-libs/openh264-1.6.0:=
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? (
- >=media-video/ffmpeg-4:=
- || (
- media-video/ffmpeg[-samba]
- >=net-fs/samba-4.5.10-r1[-debug(-)]
- )
- !=net-fs/samba-4.5.12-r0
- media-libs/opus:=
- )
- sys-apps/dbus:=
- sys-apps/pciutils:=
- virtual/udev
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3[X]
- x11-libs/libX11:=
- x11-libs/libXcomposite:=
- x11-libs/libXcursor:=
- x11-libs/libXdamage:=
- x11-libs/libXext:=
- x11-libs/libXfixes:=
- >=x11-libs/libXi-1.6.0:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/libXScrnSaver:=
- x11-libs/libXtst:=
- x11-libs/pango:=
- app-arch/snappy:=
- media-libs/flac:=
- >=media-libs/libwebp-0.4.0:=
- sys-libs/zlib:=[minizip]
- kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
- !=app-arch/gzip-1.7
- !arm? (
- dev-lang/yasm
- )
- dev-lang/perl
- dev-util/gn
- >=dev-util/gperf-3.0.3
- >=dev-util/ninja-1.7.2
- >=net-libs/nodejs-7.6.0[inspector]
- sys-apps/hwids[usb(+)]
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- virtual/pkgconfig
- dev-vcs/git
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
- BDEPEND+=" >=sys-devel/clang-5"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-"
-
-PATCHES=(
- "${FILESDIR}/chromium-compiler-r6.patch"
- "${FILESDIR}/chromium-widevine-r3.patch"
- "${FILESDIR}/chromium-webrtc-r0.patch"
- "${FILESDIR}/chromium-memcpy-r0.patch"
- "${FILESDIR}/chromium-math.h-r0.patch"
- "${FILESDIR}/chromium-stdint.patch"
- "${FILESDIR}/chromium-harfbuzz-r0.patch"
- "${FILESDIR}/chromium-71-gcc-0.patch"
-)
-
-pre_build_checks() {
- #if [[ ${MERGE_TYPE} != binary ]]; then
- # local -x CPP="$(tc-getCXX) -E"
- # if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
- # # bugs: #601654
- # die "At least clang 3.9.1 is required"
- # fi
- # if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
- # # bugs: #535730, #525374, #518668, #600288, #627356
- # die "At least gcc 5.0 is required"
- # fi
- #fi
-
- # Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="3G"
- CHECKREQS_DISK_BUILD="5G"
- if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
- CHECKREQS_DISK_BUILD="25G"
- if ! use component-build; then
- CHECKREQS_MEMORY="16G"
- fi
- fi
- check-reqs_pkg_setup
-}
-
-pkg_pretend() {
- pre_build_checks
-}
-
-pkg_setup() {
- pre_build_checks
-
- chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- default
-
- mkdir -p third_party/node/linux/node-linux-x64/bin || die
- ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
- local keeplibs=(
- base/third_party/dmg_fp
- base/third_party/dynamic_annotations
- base/third_party/icu
- base/third_party/nspr
- base/third_party/superfasthash
- base/third_party/symbolize
- base/third_party/valgrind
- base/third_party/xdg_mime
- base/third_party/xdg_user_dirs
- buildtools/third_party/libc++
- buildtools/third_party/libc++abi
- chrome/third_party/mozilla_security_manager
- courgette/third_party
- net/third_party/http2
- net/third_party/mozilla_security_manager
- net/third_party/nss
- net/third_party/quic
- net/third_party/spdy
- net/third_party/uri_template
- third_party/WebKit
- third_party/abseil-cpp
- third_party/analytics
- third_party/angle
- third_party/angle/src/common/third_party/base
- third_party/angle/src/common/third_party/smhasher
- third_party/angle/src/third_party/compiler
- third_party/angle/src/third_party/libXNVCtrl
- third_party/angle/src/third_party/trace_event
- third_party/angle/third_party/glslang
- third_party/angle/third_party/spirv-headers
- third_party/angle/third_party/spirv-tools
- third_party/angle/third_party/vulkan-headers
- third_party/angle/third_party/vulkan-loader
- third_party/angle/third_party/vulkan-tools
- third_party/angle/third_party/vulkan-validation-layers
- third_party/apple_apsl
- third_party/blink
- third_party/boringssl
- third_party/boringssl/src/third_party/fiat
- third_party/breakpad
- third_party/breakpad/breakpad/src/third_party/curl
- third_party/brotli
- third_party/cacheinvalidation
- third_party/catapult
- third_party/catapult/common/py_vulcanize/third_party/rcssmin
- third_party/catapult/common/py_vulcanize/third_party/rjsmin
- third_party/catapult/third_party/beautifulsoup4
- third_party/catapult/third_party/html5lib-python
- third_party/catapult/third_party/polymer
- third_party/catapult/third_party/six
- third_party/catapult/tracing/third_party/d3
- third_party/catapult/tracing/third_party/gl-matrix
- third_party/catapult/tracing/third_party/jszip
- third_party/catapult/tracing/third_party/mannwhitneyu
- third_party/catapult/tracing/third_party/oboe
- third_party/catapult/tracing/third_party/pako
- third_party/ced
- third_party/cld_3
- third_party/crashpad
- third_party/crashpad/crashpad/third_party/zlib
- third_party/crc32c
- third_party/cros_system_api
- third_party/devscripts
- third_party/dom_distiller_js
- third_party/fips181
- third_party/flatbuffers
- third_party/flot
- third_party/freetype
- third_party/glslang-angle
- third_party/google_input_tools
- third_party/google_input_tools/third_party/closure_library
- third_party/google_input_tools/third_party/closure_library/third_party/closure
- third_party/googletest
- third_party/hunspell
- third_party/iccjpeg
- third_party/inspector_protocol
- third_party/jinja2
- third_party/jsoncpp
- third_party/jstemplate
- third_party/khronos
- third_party/leveldatabase
- third_party/libXNVCtrl
- third_party/libaddressinput
- third_party/libaom
- third_party/libaom/source/libaom/third_party/vector
- third_party/libaom/source/libaom/third_party/x86inc
- third_party/libjingle
- third_party/libphonenumber
- third_party/libsecret
- third_party/libsrtp
- third_party/libsync
- third_party/libudev
- third_party/libwebm
- third_party/libxml/chromium
- third_party/libyuv
- third_party/llvm
- third_party/lss
- third_party/lzma_sdk
- third_party/markupsafe
- third_party/mesa
- third_party/metrics_proto
- third_party/modp_b64
- third_party/node
- third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
- third_party/openmax_dl
- third_party/ots
- third_party/pdfium
- third_party/pdfium/third_party/agg23
- third_party/pdfium/third_party/base
- third_party/pdfium/third_party/bigint
- third_party/pdfium/third_party/freetype
- third_party/pdfium/third_party/lcms
- third_party/pdfium/third_party/libopenjpeg20
- third_party/pdfium/third_party/libpng16
- third_party/pdfium/third_party/libtiff
- third_party/pdfium/third_party/skia_shared
- third_party/perfetto
- third_party/ply
- third_party/polymer
- third_party/protobuf
- third_party/protobuf/third_party/six
- third_party/pyjson5
- third_party/qcms
- third_party/rnnoise
- third_party/s2cellid
- third_party/sfntly
- third_party/simplejson
- third_party/skia
- third_party/skia/third_party/gif
- third_party/skia/third_party/skcms
- third_party/skia/third_party/vulkan
- third_party/smhasher
- third_party/spirv-headers
- third_party/SPIRV-Tools
- third_party/spirv-tools-angle
- third_party/sqlite
- third_party/swiftshader
- third_party/swiftshader/third_party/llvm-subzero
- third_party/swiftshader/third_party/subzero
- third_party/unrar
- third_party/usrsctp
- third_party/vulkan
- third_party/vulkan-validation-layers
- third_party/web-animations-js
- third_party/webdriver
- third_party/webrtc
- third_party/webrtc/common_audio/third_party/fft4g
- third_party/webrtc/common_audio/third_party/spl_sqrt_floor
- third_party/webrtc/modules/third_party/fft
- third_party/webrtc/modules/third_party/g711
- third_party/webrtc/modules/third_party/g722
- third_party/webrtc/rtc_base/third_party/base64
- third_party/webrtc/rtc_base/third_party/sigslot
- third_party/widevine
- third_party/woff2
- third_party/zlib/google
- url/third_party/mozilla
- v8/src/third_party/valgrind
- v8/src/third_party/utf8-decoder
- v8/third_party/inspector_protocol
- v8/third_party/v8
-
- # gyp -> gn leftovers
- base/third_party/libevent
- third_party/adobe
- third_party/speech-dispatcher
- third_party/usb_ids
- third_party/xdg-utils
- third_party/yasm/run_yasm.py
- )
- if ! use system-ffmpeg; then
- keeplibs+=( third_party/ffmpeg third_party/opus )
- fi
- if ! use system-icu; then
- keeplibs+=( third_party/icu )
- fi
- if ! use system-libvpx; then
- keeplibs+=( third_party/libvpx )
- keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
- fi
- if use tcmalloc; then
- keeplibs+=( third_party/tcmalloc )
- fi
-
- # Remove most bundled libraries. Some are still needed.
- build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-src_configure() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- local myconf_gn=""
-
- # Make sure the build system will use the right tools, bug #340795.
- tc-export AR CC CXX NM
-
- if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
- # Force clang since gcc is pretty broken at the moment.
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- strip-unsupported-flags
- fi
-
- if tc-is-clang; then
- myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
- else
- myconf_gn+=" is_clang=false"
- fi
-
- # Define a custom toolchain for GN
- myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
- if tc-is-cross-compiler; then
- tc-export BUILD_{AR,CC,CXX,NM}
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
- myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
- else
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
- fi
-
- # GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
- myconf_gn+=" is_debug=false"
-
- # Component build isn't generally intended for use by end users. It's mostly useful
- # for development and debugging.
- myconf_gn+=" is_component_build=$(usex component-build true false)"
-
- # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
- myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
-
- myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
- myconf_gn+=" enable_nacl=false"
-
- # Use system-provided libraries.
- # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
- # TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_libsrtp (bug #459932).
- # TODO: use_system_protobuf (bug #525560).
- # TODO: use_system_ssl (http://crbug.com/58087).
- # TODO: use_system_sqlite (http://crbug.com/22208).
-
- # libevent: https://bugs.gentoo.org/593458
- local gn_system_libraries=(
- flac
- fontconfig
- freetype
- # Need harfbuzz_from_pkgconfig target
- #harfbuzz-ng
- libdrm
- libjpeg
- libpng
- libwebp
- libxml
- libxslt
- openh264
- re2
- snappy
- yasm
- zlib
- )
- if use system-ffmpeg; then
- gn_system_libraries+=( ffmpeg opus )
- fi
- if use system-icu; then
- gn_system_libraries+=( icu )
- fi
- if use system-libvpx; then
- gn_system_libraries+=( libvpx )
- fi
- build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
- # See dependency logic in third_party/BUILD.gn
- myconf_gn+=" use_system_harfbuzz=true"
-
- # Optional dependencies.
- myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
- myconf_gn+=" enable_widevine=$(usex widevine true false)"
- myconf_gn+=" use_cups=$(usex cups true false)"
- myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
- myconf_gn+=" use_kerberos=$(usex kerberos true false)"
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
- # TODO: link_pulseaudio=true for GN.
-
- myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- # Do not use bundled clang.
- # Trying to use gold results in linker crash.
- myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
-
- # Disable forced lld, bug 641556
- myconf_gn+=" use_lld=false"
-
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
- myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
- myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
- # Note: these are for Gentoo use ONLY. For your own distribution,
- # please get your own set of keys. Feel free to contact chromium@gentoo.org
- # for more info.
- local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
- myconf_gn+=" google_api_key=\"${google_api_key}\""
- myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
- myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
- local myarch="$(tc-arch)"
-
- # Avoid CFLAGS problems, bug #352457, bug #390147.
- if ! use custom-cflags; then
- replace-flags "-Os" "-O2"
- strip-flags
-
- # Prevent linker from running out of address space, bug #471810 .
- if use x86; then
- filter-flags "-g*"
- fi
-
- # Prevent libvpx build failures. Bug 530248, 544702, 546984.
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
- fi
- fi
-
- if [[ $myarch = amd64 ]] ; then
- myconf_gn+=" target_cpu=\"x64\""
- ffmpeg_target_arch=x64
- elif [[ $myarch = x86 ]] ; then
- myconf_gn+=" target_cpu=\"x86\""
- ffmpeg_target_arch=ia32
-
- # This is normally defined by compiler_cpu_abi in
- # build/config/compiler/BUILD.gn, but we patch that part out.
- append-flags -msse2 -mfpmath=sse -mmmx
- elif [[ $myarch = arm64 ]] ; then
- myconf_gn+=" target_cpu=\"arm64\""
- ffmpeg_target_arch=arm64
- elif [[ $myarch = arm ]] ; then
- myconf_gn+=" target_cpu=\"arm\""
- ffmpeg_target_arch=$(usex neon arm-neon arm)
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf_gn+=" treat_warnings_as_errors=false"
-
- # Disable fatal linker warnings, bug 506268.
- myconf_gn+=" fatal_linker_warnings=false"
-
- # https://bugs.gentoo.org/588596
- #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
- # Bug 491582.
- export TMPDIR="${WORKDIR}/temp"
- mkdir -p -m 755 "${TMPDIR}" || die
-
- # https://bugs.gentoo.org/654216
- addpredict /dev/dri/ #nowarn
-
- #if ! use system-ffmpeg; then
- if false; then
- local build_ffmpeg_args=""
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
- build_ffmpeg_args+=" --disable-asm"
- fi
-
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
- einfo "Configuring bundled ffmpeg..."
- pushd third_party/ffmpeg > /dev/null || die
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
- chromium/scripts/copy_config.sh || die
- chromium/scripts/generate_gn.py || die
- popd > /dev/null || die
- fi
-
- einfo "Configuring Chromium..."
- set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
- echo "$@"
- "$@" || die
-}
-
-src_compile() {
- # Final link uses lots of file descriptors.
- ulimit -n 2048
-
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
- # Work around broken deps
- eninja -C out/Release gen/ui/accessibility/ax_enums.mojom{,-shared}.h
-
- # Build mksnapshot and pax-mark it.
- local x
- for x in mksnapshot v8_context_snapshot_generator; do
- if tc-is-cross-compiler; then
- eninja -C out/Release "host/${x}"
- pax-mark m "out/Release/host/${x}"
- else
- eninja -C out/Release "${x}"
- pax-mark m "out/Release/${x}"
- fi
- done
-
- # Even though ninja autodetects number of CPUs, we respect
- # user's options, for debugging with -j 1 or any other reason.
- eninja -C out/Release chrome chromedriver
- use suid && eninja -C out/Release chrome_sandbox
-
- pax-mark m out/Release/chrome
-}
-
-src_install() {
- local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
- exeinto "${CHROMIUM_HOME}"
- doexe out/Release/chrome
-
- if use suid; then
- newexe out/Release/chrome_sandbox chrome-sandbox
- fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
- fi
-
- doexe out/Release/chromedriver
-
- local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
- doexe chromium-launcher.sh
-
- # It is important that we name the target "chromium-browser",
- # xdg-utils expect it; bug #355517.
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
- # keep the old symlink around for consistency
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
- dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
- # Allow users to override command-line options, bug #357629.
- insinto /etc/chromium
- newins "${FILESDIR}/chromium.default" "default"
-
- pushd out/Release/locales > /dev/null || die
- chromium_remove_language_paks
- popd
-
- insinto "${CHROMIUM_HOME}"
- doins out/Release/*.bin
- doins out/Release/*.pak
- doins out/Release/*.so
-
- if ! use system-icu; then
- doins out/Release/icudtl.dat
- fi
-
- doins -r out/Release/locales
- doins -r out/Release/resources
-
- if [[ -d out/Release/swiftshader ]]; then
- insinto "${CHROMIUM_HOME}/swiftshader"
- doins out/Release/swiftshader/*.so
- fi
-
- # Install icons and desktop entry.
- local branding size
- for size in 16 22 24 32 48 64 128 256 ; do
- case ${size} in
- 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
- *) branding="chrome/app/theme/chromium" ;;
- esac
- newicon -s ${size} "${branding}/product_logo_${size}.png" \
- chromium-browser.png
- done
-
- local mime_types="text/html;text/xml;application/xhtml+xml;"
- mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
- mime_types+="x-scheme-handler/ftp;" # bug #412185
- mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
- make_desktop_entry \
- chromium-browser \
- "Chromium" \
- chromium-browser \
- "Network;WebBrowser" \
- "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
- sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
- # Install GNOME default application entry (bug #303100).
- insinto /usr/share/gnome-control-center/default-apps
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
- readme.gentoo_create_doc
-}
-
-pkg_postrm() {
- if type gtk-update-icon-cache &>/dev/null; then
- ebegin "Updating GTK icon cache"
- gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor"
- eend $?
- fi
- xdg_desktop_database_update
-}
-
-pkg_postinst() {
- if type gtk-update-icon-cache &>/dev/null; then
- ebegin "Updating GTK icon cache"
- gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor"
- eend $?
- fi
- xdg_desktop_database_update
- readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-72.0.3595.2.ebuild b/www-client/chromium/chromium-72.0.3595.2.ebuild
deleted file mode 100644
index 7005f32011cb..000000000000
--- a/www-client/chromium/chromium-72.0.3595.2.ebuild
+++ /dev/null
@@ -1,715 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
- hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
- sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-COMMON_DEPEND="
- >=app-accessibility/at-spi2-atk-2.26:2
- app-arch/bzip2:=
- cups? ( >=net-print/cups-1.3.11:= )
- >=dev-libs/atk-2.26
- dev-libs/expat:=
- dev-libs/glib:2
- system-icu? ( >=dev-libs/icu-59:= )
- >=dev-libs/libxml2-2.9.4-r3:=[icu]
- dev-libs/libxslt:=
- dev-libs/nspr:=
- >=dev-libs/nss-3.26:=
- >=dev-libs/re2-0.2016.11.01:=
- gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
- >=media-libs/alsa-lib-1.0.19:=
- media-libs/fontconfig:=
- media-libs/freetype:=
- >=media-libs/harfbuzz-2.0.0:0=[icu(-)]
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
- >=media-libs/openh264-1.6.0:=
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? (
- >=media-video/ffmpeg-4:=
- || (
- media-video/ffmpeg[-samba]
- >=net-fs/samba-4.5.10-r1[-debug(-)]
- )
- !=net-fs/samba-4.5.12-r0
- media-libs/opus:=
- )
- sys-apps/dbus:=
- sys-apps/pciutils:=
- virtual/udev
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- x11-libs/gtk+:3[X]
- x11-libs/libX11:=
- x11-libs/libXcomposite:=
- x11-libs/libXcursor:=
- x11-libs/libXdamage:=
- x11-libs/libXext:=
- x11-libs/libXfixes:=
- >=x11-libs/libXi-1.6.0:=
- x11-libs/libXrandr:=
- x11-libs/libXrender:=
- x11-libs/libXScrnSaver:=
- x11-libs/libXtst:=
- x11-libs/pango:=
- app-arch/snappy:=
- media-libs/flac:=
- >=media-libs/libwebp-0.4.0:=
- sys-libs/zlib:=[minizip]
- kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
- !=app-arch/gzip-1.7
- !arm? (
- dev-lang/yasm
- )
- dev-lang/perl
- dev-util/gn
- >=dev-util/gperf-3.0.3
- >=dev-util/ninja-1.7.2
- >=net-libs/nodejs-7.6.0[inspector]
- sys-apps/hwids[usb(+)]
- >=sys-devel/bison-2.4.3
- sys-devel/flex
- virtual/pkgconfig
- dev-vcs/git
-"
-
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
- BDEPEND+=" >=sys-devel/clang-5"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
- EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-"
-
-PATCHES=(
- "${FILESDIR}/chromium-compiler-r7.patch"
- "${FILESDIR}/chromium-widevine-r3.patch"
- "${FILESDIR}/chromium-webrtc-r0.patch"
- "${FILESDIR}/chromium-memcpy-r0.patch"
- "${FILESDIR}/chromium-math.h-r0.patch"
- "${FILESDIR}/chromium-stdint.patch"
- "${FILESDIR}/chromium-harfbuzz-r0.patch"
-)
-
-pre_build_checks() {
- #if [[ ${MERGE_TYPE} != binary ]]; then
- # local -x CPP="$(tc-getCXX) -E"
- # if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
- # # bugs: #601654
- # die "At least clang 3.9.1 is required"
- # fi
- # if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
- # # bugs: #535730, #525374, #518668, #600288, #627356
- # die "At least gcc 5.0 is required"
- # fi
- #fi
-
- # Check build requirements, bug #541816 and bug #471810 .
- CHECKREQS_MEMORY="3G"
- CHECKREQS_DISK_BUILD="5G"
- if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then
- CHECKREQS_DISK_BUILD="25G"
- if ! use component-build; then
- CHECKREQS_MEMORY="16G"
- fi
- fi
- check-reqs_pkg_setup
-}
-
-pkg_pretend() {
- pre_build_checks
-}
-
-pkg_setup() {
- pre_build_checks
-
- chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- default
-
- mkdir -p third_party/node/linux/node-linux-x64/bin || die
- ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
- local keeplibs=(
- base/third_party/dmg_fp
- base/third_party/dynamic_annotations
- base/third_party/icu
- base/third_party/nspr
- base/third_party/superfasthash
- base/third_party/symbolize
- base/third_party/valgrind
- base/third_party/xdg_mime
- base/third_party/xdg_user_dirs
- buildtools/third_party/libc++
- buildtools/third_party/libc++abi
- chrome/third_party/mozilla_security_manager
- courgette/third_party
- net/third_party/http2
- net/third_party/mozilla_security_manager
- net/third_party/nss
- net/third_party/quic
- net/third_party/spdy
- net/third_party/uri_template
- third_party/WebKit
- third_party/abseil-cpp
- third_party/analytics
- third_party/angle
- third_party/angle/src/common/third_party/base
- third_party/angle/src/common/third_party/smhasher
- third_party/angle/src/third_party/compiler
- third_party/angle/src/third_party/libXNVCtrl
- third_party/angle/src/third_party/trace_event
- third_party/angle/third_party/glslang
- third_party/angle/third_party/spirv-headers
- third_party/angle/third_party/spirv-tools
- third_party/angle/third_party/vulkan-headers
- third_party/angle/third_party/vulkan-loader
- third_party/angle/third_party/vulkan-tools
- third_party/angle/third_party/vulkan-validation-layers
- third_party/apple_apsl
- third_party/blink
- third_party/boringssl
- third_party/boringssl/src/third_party/fiat
- third_party/breakpad
- third_party/breakpad/breakpad/src/third_party/curl
- third_party/brotli
- third_party/cacheinvalidation
- third_party/catapult
- third_party/catapult/common/py_vulcanize/third_party/rcssmin
- third_party/catapult/common/py_vulcanize/third_party/rjsmin
- third_party/catapult/third_party/beautifulsoup4
- third_party/catapult/third_party/html5lib-python
- third_party/catapult/third_party/polymer
- third_party/catapult/third_party/six
- third_party/catapult/tracing/third_party/d3
- third_party/catapult/tracing/third_party/gl-matrix
- third_party/catapult/tracing/third_party/jszip
- third_party/catapult/tracing/third_party/mannwhitneyu
- third_party/catapult/tracing/third_party/oboe
- third_party/catapult/tracing/third_party/pako
- third_party/ced
- third_party/cld_3
- third_party/closure_compiler
- third_party/crashpad
- third_party/crashpad/crashpad/third_party/zlib
- third_party/crc32c
- third_party/cros_system_api
- third_party/devscripts
- third_party/dom_distiller_js
- third_party/fips181
- third_party/flatbuffers
- third_party/flot
- third_party/freetype
- third_party/glslang-angle
- third_party/google_input_tools
- third_party/google_input_tools/third_party/closure_library
- third_party/google_input_tools/third_party/closure_library/third_party/closure
- third_party/googletest
- third_party/hunspell
- third_party/iccjpeg
- third_party/inspector_protocol
- third_party/jinja2
- third_party/jsoncpp
- third_party/jstemplate
- third_party/khronos
- third_party/leveldatabase
- third_party/libXNVCtrl
- third_party/libaddressinput
- third_party/libaom
- third_party/libaom/source/libaom/third_party/vector
- third_party/libaom/source/libaom/third_party/x86inc
- third_party/libjingle
- third_party/libphonenumber
- third_party/libsecret
- third_party/libsrtp
- third_party/libsync
- third_party/libudev
- third_party/libwebm
- third_party/libxml/chromium
- third_party/libyuv
- third_party/llvm
- third_party/lss
- third_party/lzma_sdk
- third_party/markupsafe
- third_party/mesa
- third_party/metrics_proto
- third_party/modp_b64
- third_party/node
- third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
- third_party/openmax_dl
- third_party/ots
- third_party/pdfium
- third_party/pdfium/third_party/agg23
- third_party/pdfium/third_party/base
- third_party/pdfium/third_party/bigint
- third_party/pdfium/third_party/freetype
- third_party/pdfium/third_party/lcms
- third_party/pdfium/third_party/libopenjpeg20
- third_party/pdfium/third_party/libpng16
- third_party/pdfium/third_party/libtiff
- third_party/pdfium/third_party/skia_shared
- third_party/perfetto
- third_party/ply
- third_party/polymer
- third_party/protobuf
- third_party/protobuf/third_party/six
- third_party/pyjson5
- third_party/qcms
- third_party/rnnoise
- third_party/s2cellid
- third_party/sfntly
- third_party/simplejson
- third_party/skia
- third_party/skia/third_party/gif
- third_party/skia/third_party/skcms
- third_party/skia/third_party/vulkan
- third_party/smhasher
- third_party/spirv-headers
- third_party/SPIRV-Tools
- third_party/spirv-tools-angle
- third_party/sqlite
- third_party/swiftshader
- third_party/swiftshader/third_party/llvm-subzero
- third_party/swiftshader/third_party/subzero
- third_party/unrar
- third_party/usrsctp
- third_party/vulkan
- third_party/vulkan-validation-layers
- third_party/web-animations-js
- third_party/webdriver
- third_party/webrtc
- third_party/webrtc/common_audio/third_party/fft4g
- third_party/webrtc/common_audio/third_party/spl_sqrt_floor
- third_party/webrtc/modules/third_party/fft
- third_party/webrtc/modules/third_party/g711
- third_party/webrtc/modules/third_party/g722
- third_party/webrtc/rtc_base/third_party/base64
- third_party/webrtc/rtc_base/third_party/sigslot
- third_party/widevine
- third_party/woff2
- third_party/zlib/google
- url/third_party/mozilla
- v8/src/third_party/valgrind
- v8/src/third_party/utf8-decoder
- v8/third_party/inspector_protocol
- v8/third_party/v8
-
- # gyp -> gn leftovers
- base/third_party/libevent
- third_party/adobe
- third_party/speech-dispatcher
- third_party/usb_ids
- third_party/xdg-utils
- third_party/yasm/run_yasm.py
- )
- if ! use system-ffmpeg; then
- keeplibs+=( third_party/ffmpeg third_party/opus )
- fi
- if ! use system-icu; then
- keeplibs+=( third_party/icu )
- fi
- if ! use system-libvpx; then
- keeplibs+=( third_party/libvpx )
- keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
- fi
- if use tcmalloc; then
- keeplibs+=( third_party/tcmalloc )
- fi
-
- # Remove most bundled libraries. Some are still needed.
- build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-src_configure() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- local myconf_gn=""
-
- # Make sure the build system will use the right tools, bug #340795.
- tc-export AR CC CXX NM
-
- if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then
- # Force clang since gcc is pretty broken at the moment.
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
- strip-unsupported-flags
- fi
-
- if tc-is-clang; then
- myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
- else
- myconf_gn+=" is_clang=false"
- fi
-
- # Define a custom toolchain for GN
- myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
- if tc-is-cross-compiler; then
- tc-export BUILD_{AR,CC,CXX,NM}
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
- myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
- else
- myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
- fi
-
- # GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
- myconf_gn+=" is_debug=false"
-
- # Component build isn't generally intended for use by end users. It's mostly useful
- # for development and debugging.
- myconf_gn+=" is_component_build=$(usex component-build true false)"
-
- # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
- myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
-
- myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
- # Disable nacl, we can't build without pnacl (http://crbug.com/269560).
- myconf_gn+=" enable_nacl=false"
-
- # Use system-provided libraries.
- # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
- # TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_libsrtp (bug #459932).
- # TODO: use_system_protobuf (bug #525560).
- # TODO: use_system_ssl (http://crbug.com/58087).
- # TODO: use_system_sqlite (http://crbug.com/22208).
-
- # libevent: https://bugs.gentoo.org/593458
- local gn_system_libraries=(
- flac
- fontconfig
- freetype
- # Need harfbuzz_from_pkgconfig target
- #harfbuzz-ng
- libdrm
- libjpeg
- libpng
- libwebp
- libxml
- libxslt
- openh264
- re2
- snappy
- yasm
- zlib
- )
- if use system-ffmpeg; then
- gn_system_libraries+=( ffmpeg opus )
- fi
- if use system-icu; then
- gn_system_libraries+=( icu )
- fi
- if use system-libvpx; then
- gn_system_libraries+=( libvpx )
- fi
- build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
- # See dependency logic in third_party/BUILD.gn
- myconf_gn+=" use_system_harfbuzz=true"
-
- # Optional dependencies.
- myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
- myconf_gn+=" enable_widevine=$(usex widevine true false)"
- myconf_gn+=" use_cups=$(usex cups true false)"
- myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
- myconf_gn+=" use_kerberos=$(usex kerberos true false)"
- myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
- # TODO: link_pulseaudio=true for GN.
-
- myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
- # Never use bundled gold binary. Disable gold linker flags for now.
- # Do not use bundled clang.
- # Trying to use gold results in linker crash.
- myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
-
- # Disable forced lld, bug 641556
- myconf_gn+=" use_lld=false"
-
- ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
- myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
- myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
- # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
- # Note: these are for Gentoo use ONLY. For your own distribution,
- # please get your own set of keys. Feel free to contact chromium@gentoo.org
- # for more info.
- local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
- local google_default_client_id="329227923882.apps.googleusercontent.com"
- local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
- myconf_gn+=" google_api_key=\"${google_api_key}\""
- myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
- myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
- local myarch="$(tc-arch)"
- if [[ $myarch = amd64 ]] ; then
- myconf_gn+=" target_cpu=\"x64\""
- ffmpeg_target_arch=x64
- elif [[ $myarch = x86 ]] ; then
- myconf_gn+=" target_cpu=\"x86\""
- ffmpeg_target_arch=ia32
-
- # This is normally defined by compiler_cpu_abi in
- # build/config/compiler/BUILD.gn, but we patch that part out.
- append-flags -msse2 -mfpmath=sse -mmmx
- elif [[ $myarch = arm64 ]] ; then
- myconf_gn+=" target_cpu=\"arm64\""
- ffmpeg_target_arch=arm64
- elif [[ $myarch = arm ]] ; then
- myconf_gn+=" target_cpu=\"arm\""
- ffmpeg_target_arch=$(usex neon arm-neon arm)
- else
- die "Failed to determine target arch, got '$myarch'."
- fi
-
- # Make sure that -Werror doesn't get added to CFLAGS by the build system.
- # Depending on GCC version the warnings are different and we don't want
- # the build to fail because of that.
- myconf_gn+=" treat_warnings_as_errors=false"
-
- # Disable fatal linker warnings, bug 506268.
- myconf_gn+=" fatal_linker_warnings=false"
-
- # Avoid CFLAGS problems, bug #352457, bug #390147.
- if ! use custom-cflags; then
- replace-flags "-Os" "-O2"
- strip-flags
-
- # Prevent linker from running out of address space, bug #471810 .
- if use x86; then
- filter-flags "-g*"
- fi
-
- # Prevent libvpx build failures. Bug 530248, 544702, 546984.
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
- fi
- fi
-
- # https://bugs.gentoo.org/588596
- #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
- # Bug 491582.
- export TMPDIR="${WORKDIR}/temp"
- mkdir -p -m 755 "${TMPDIR}" || die
-
- # https://bugs.gentoo.org/654216
- addpredict /dev/dri/ #nowarn
-
- #if ! use system-ffmpeg; then
- if false; then
- local build_ffmpeg_args=""
- if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
- build_ffmpeg_args+=" --disable-asm"
- fi
-
- # Re-configure bundled ffmpeg. See bug #491378 for example reasons.
- einfo "Configuring bundled ffmpeg..."
- pushd third_party/ffmpeg > /dev/null || die
- chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
- --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
- chromium/scripts/copy_config.sh || die
- chromium/scripts/generate_gn.py || die
- popd > /dev/null || die
- fi
-
- einfo "Configuring Chromium..."
- set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
- echo "$@"
- "$@" || die
-}
-
-src_compile() {
- # Final link uses lots of file descriptors.
- ulimit -n 2048
-
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
- # Work around broken deps
- eninja -C out/Release gen/ui/accessibility/ax_enums.mojom{,-shared}.h
-
-if false; then
- # Build mksnapshot and pax-mark it.
- local x
- for x in mksnapshot v8_context_snapshot_generator; do
- if tc-is-cross-compiler; then
- eninja -C out/Release "host/${x}"
- pax-mark m "out/Release/host/${x}"
- else
- eninja -C out/Release "${x}"
- pax-mark m "out/Release/${x}"
- fi
- done
-fi
-
- # Even though ninja autodetects number of CPUs, we respect
- # user's options, for debugging with -j 1 or any other reason.
- eninja -C out/Release chrome chromedriver
- use suid && eninja -C out/Release chrome_sandbox
-
- pax-mark m out/Release/chrome
-}
-
-src_install() {
- local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
- exeinto "${CHROMIUM_HOME}"
- doexe out/Release/chrome
-
- if use suid; then
- newexe out/Release/chrome_sandbox chrome-sandbox
- fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
- fi
-
- doexe out/Release/chromedriver
-
- local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
- sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
- doexe chromium-launcher.sh
-
- # It is important that we name the target "chromium-browser",
- # xdg-utils expect it; bug #355517.
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
- # keep the old symlink around for consistency
- dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
- dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
- # Allow users to override command-line options, bug #357629.
- insinto /etc/chromium
- newins "${FILESDIR}/chromium.default" "default"
-
- pushd out/Release/locales > /dev/null || die
- chromium_remove_language_paks
- popd
-
- insinto "${CHROMIUM_HOME}"
- doins out/Release/*.bin
- doins out/Release/*.pak
- doins out/Release/*.so
-
- if ! use system-icu; then
- doins out/Release/icudtl.dat
- fi
-
- doins -r out/Release/locales
- doins -r out/Release/resources
-
- if [[ -d out/Release/swiftshader ]]; then
- insinto "${CHROMIUM_HOME}/swiftshader"
- doins out/Release/swiftshader/*.so
- fi
-
- # Install icons and desktop entry.
- local branding size
- for size in 16 22 24 32 48 64 128 256 ; do
- case ${size} in
- 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
- *) branding="chrome/app/theme/chromium" ;;
- esac
- newicon -s ${size} "${branding}/product_logo_${size}.png" \
- chromium-browser.png
- done
-
- local mime_types="text/html;text/xml;application/xhtml+xml;"
- mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
- mime_types+="x-scheme-handler/ftp;" # bug #412185
- mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
- make_desktop_entry \
- chromium-browser \
- "Chromium" \
- chromium-browser \
- "Network;WebBrowser" \
- "MimeType=${mime_types}\nStartupWMClass=chromium-browser"
- sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
- # Install GNOME default application entry (bug #303100).
- insinto /usr/share/gnome-control-center/default-apps
- newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
- readme.gentoo_create_doc
-}
-
-pkg_postrm() {
- if type gtk-update-icon-cache &>/dev/null; then
- ebegin "Updating GTK icon cache"
- gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor"
- eend $?
- fi
- xdg_desktop_database_update
-}
-
-pkg_postinst() {
- if type gtk-update-icon-cache &>/dev/null; then
- ebegin "Updating GTK icon cache"
- gtk-update-icon-cache "${EROOT}/usr/share/icons/hicolor"
- eend $?
- fi
- xdg_desktop_database_update
- readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-72.0.3626.28.ebuild b/www-client/chromium/chromium-72.0.3626.96.ebuild
similarity index 98%
rename from www-client/chromium/chromium-72.0.3626.28.ebuild
rename to www-client/chromium/chromium-72.0.3626.96.ebuild
index 6943618d3e1c..bf82cadbae56 100644
--- a/www-client/chromium/chromium-72.0.3626.28.ebuild
+++ b/www-client/chromium/chromium-72.0.3626.96.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,11 +13,11 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="http://chromium.org/"
SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
- https://dev.gentoo.org/~floppym/dist/chromium-webrtc-includes.patch.xz"
+ https://dev.gentoo.org/~floppym/dist/chromium-webrtc-includes-r1.patch.xz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
@@ -140,7 +140,7 @@ GTK+ icon theme.
PATCHES=(
"${FILESDIR}/chromium-compiler-r7.patch"
- "${FILESDIR}/chromium-widevine-r3.patch"
+ "${FILESDIR}/chromium-widevine-r4.patch"
"${FILESDIR}/chromium-webrtc-r0.patch"
"${FILESDIR}/chromium-memcpy-r0.patch"
"${FILESDIR}/chromium-math.h-r0.patch"
@@ -189,7 +189,7 @@ src_prepare() {
default
pushd third_party/webrtc >/dev/null || die
- eapply "${WORKDIR}"/chromium-webrtc-includes.patch
+ eapply "${WORKDIR}"/chromium-webrtc-includes-r1.patch
popd >/dev/null || die
mkdir -p third_party/node/linux/node-linux-x64/bin || die
@@ -507,6 +507,23 @@ src_configure() {
myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
local myarch="$(tc-arch)"
+
+ # Avoid CFLAGS problems, bug #352457, bug #390147.
+ if ! use custom-cflags; then
+ replace-flags "-Os" "-O2"
+ strip-flags
+
+ # Prevent linker from running out of address space, bug #471810 .
+ if use x86; then
+ filter-flags "-g*"
+ fi
+
+ # Prevent libvpx build failures. Bug 530248, 544702, 546984.
+ if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+ filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+ fi
+ fi
+
if [[ $myarch = amd64 ]] ; then
myconf_gn+=" target_cpu=\"x64\""
ffmpeg_target_arch=x64
@@ -535,22 +552,6 @@ src_configure() {
# Disable fatal linker warnings, bug 506268.
myconf_gn+=" fatal_linker_warnings=false"
- # Avoid CFLAGS problems, bug #352457, bug #390147.
- if ! use custom-cflags; then
- replace-flags "-Os" "-O2"
- strip-flags
-
- # Prevent linker from running out of address space, bug #471810 .
- if use x86; then
- filter-flags "-g*"
- fi
-
- # Prevent libvpx build failures. Bug 530248, 544702, 546984.
- if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
- filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
- fi
- fi
-
# https://bugs.gentoo.org/588596
#append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
diff --git a/www-client/chromium/files/chromium-70-gcc-0.patch b/www-client/chromium/files/chromium-70-gcc-0.patch
deleted file mode 100644
index 7005d3732545..000000000000
--- a/www-client/chromium/files/chromium-70-gcc-0.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d Mon Sep 17 00:00:00 2001
-From: Maksim Sisov
-Date: Thu, 13 Sep 2018 15:17:29 +0000
-Subject: [PATCH] ScrollPaintPropertyNode: Rename SnapContainerData() to
- GetSnapContainerData()
-
-GCC is stricter than clang when it comes to class members' names and how
-they can change the meaning of a previously existing symbol with the same
-name.
-
-Here is a short error message:
-
-error: changes meaning of 'SnapContainerData' from 'using SnapContainerData =
-class cc::SnapContainerData' [-fpermissive] using SnapContainerData =
-cc::SnapContainerData;
-
-Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel
-Change-Id: I0de5460f17b13484253e1ff0538b111c9a3b0d13
-Reviewed-on: https://chromium-review.googlesource.com/1213180
-Commit-Queue: Maksim Sisov
-Reviewed-by: Philip Rogers
-Cr-Commit-Position: refs/heads/master@{#591015}
----
- .../renderer/core/paint/paint_property_tree_update_tests.cc | 2 +-
- .../platform/graphics/compositing/property_tree_manager.cc | 2 +-
- .../platform/graphics/paint/scroll_paint_property_node.h | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc b/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc
-index 0d999d45076f..1fe1815a5659 100644
---- a/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc
-+++ b/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc
-@@ -1310,7 +1310,7 @@ TEST_P(PaintPropertyTreeUpdateTest, EnsureSnapContainerData) {
- GetDocument().View()->Resize(300, 300);
- GetDocument().View()->UpdateAllLifecyclePhases();
-
-- auto doc_snap_container_data = DocScroll()->SnapContainerData();
-+ auto doc_snap_container_data = DocScroll()->GetSnapContainerData();
- ASSERT_TRUE(doc_snap_container_data);
- EXPECT_EQ(doc_snap_container_data->scroll_snap_type().axis, SnapAxis::kBoth);
- EXPECT_EQ(doc_snap_container_data->scroll_snap_type().strictness,
-diff --git a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc
-index 745b8c8b387e..5f87eeea9435 100644
---- a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc
-+++ b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc
-@@ -333,7 +333,7 @@ void PropertyTreeManager::CreateCompositorScrollNode(
- scroll_node->OverscrollBehaviorX()),
- static_cast(
- scroll_node->OverscrollBehaviorY()));
-- compositor_node.snap_container_data = scroll_node->SnapContainerData();
-+ compositor_node.snap_container_data = scroll_node->GetSnapContainerData();
-
- auto compositor_element_id = scroll_node->GetCompositorElementId();
- if (compositor_element_id) {
-diff --git a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
-index e1479269ccc3..5bd7f65f10ba 100644
---- a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
-+++ b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h
-@@ -99,7 +99,7 @@ class PLATFORM_EXPORT ScrollPaintPropertyNode
- return state_.overscroll_behavior.y;
- }
-
-- base::Optional SnapContainerData() const {
-+ base::Optional GetSnapContainerData() const {
- return state_.snap_container_data;
- }
-
---
-2.19.1
-
diff --git a/www-client/chromium/files/chromium-70-gcc-1.patch b/www-client/chromium/files/chromium-70-gcc-1.patch
deleted file mode 100644
index bca2a1f8e805..000000000000
--- a/www-client/chromium/files/chromium-70-gcc-1.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 87902b3202f81d689dd314c17006ffc907fe12a1 Mon Sep 17 00:00:00 2001
-From: Wang Qing
-Date: Mon, 3 Sep 2018 02:41:08 +0000
-Subject: [PATCH] Fix build error for blink.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This CLs fixed the error of constexpr function call to non-constexpr function.
-
-Bug: 878202
-Change-Id: I6ad217a687e62a9a384980d852743a56479de3a9
-Reviewed-on: https://chromium-review.googlesource.com/1192467
-Commit-Queue: 汪 清
-Reviewed-by: Eric Willigers
-Cr-Commit-Position: refs/heads/master@{#588316}
----
- .../core/animation/animation_time_delta.cc | 22 ++++++++++++++
- .../core/animation/animation_time_delta.h | 30 +++++++------------
- 2 files changed, 32 insertions(+), 20 deletions(-)
-
-diff --git a/third_party/blink/renderer/core/animation/animation_time_delta.cc b/third_party/blink/renderer/core/animation/animation_time_delta.cc
-index 1b25469c7f2f..2e30a18890da 100644
---- a/third_party/blink/renderer/core/animation/animation_time_delta.cc
-+++ b/third_party/blink/renderer/core/animation/animation_time_delta.cc
-@@ -7,6 +7,28 @@
- namespace blink {
-
- #if !defined(BLINK_ANIMATION_USE_TIME_DELTA)
-+// Comparison operators on AnimationTimeDelta.
-+bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs,
-+ const AnimationTimeDelta& rhs) {
-+ return lhs.InSecondsF() == rhs.InSecondsF();
-+}
-+bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs,
-+ const AnimationTimeDelta& rhs) {
-+ return lhs.InSecondsF() != rhs.InSecondsF();
-+}
-+bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs,
-+ const AnimationTimeDelta& rhs) {
-+ return lhs.InSecondsF() > rhs.InSecondsF();
-+}
-+bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs,
-+ const AnimationTimeDelta& rhs) {
-+ return lhs.InSecondsF() >= rhs.InSecondsF();
-+}
-+bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs,
-+ const AnimationTimeDelta& rhs) {
-+ return lhs.InSecondsF() <= rhs.InSecondsF();
-+}
-+
- std::ostream& operator<<(std::ostream& os, AnimationTimeDelta time) {
- return os << time.InSecondsF() << " s";
- }
-diff --git a/third_party/blink/renderer/core/animation/animation_time_delta.h b/third_party/blink/renderer/core/animation/animation_time_delta.h
-index 1903c1150d3e..95d218466d90 100644
---- a/third_party/blink/renderer/core/animation/animation_time_delta.h
-+++ b/third_party/blink/renderer/core/animation/animation_time_delta.h
-@@ -90,26 +90,16 @@ AnimationTimeDelta operator*(T a, AnimationTimeDelta td) {
- }
-
- // Comparison operators on AnimationTimeDelta.
--constexpr bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs,
-- const AnimationTimeDelta& rhs) {
-- return lhs.InSecondsF() == rhs.InSecondsF();
--}
--constexpr bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs,
-- const AnimationTimeDelta& rhs) {
-- return lhs.InSecondsF() != rhs.InSecondsF();
--}
--constexpr bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs,
-- const AnimationTimeDelta& rhs) {
-- return lhs.InSecondsF() > rhs.InSecondsF();
--}
--constexpr bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs,
-- const AnimationTimeDelta& rhs) {
-- return lhs.InSecondsF() >= rhs.InSecondsF();
--}
--constexpr bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs,
-- const AnimationTimeDelta& rhs) {
-- return lhs.InSecondsF() <= rhs.InSecondsF();
--}
-+bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs,
-+ const AnimationTimeDelta& rhs);
-+bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs,
-+ const AnimationTimeDelta& rhs);
-+bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs,
-+ const AnimationTimeDelta& rhs);
-+bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs,
-+ const AnimationTimeDelta& rhs);
-+bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs,
-+ const AnimationTimeDelta& rhs);
-
- // Defined to allow DCHECK_EQ/etc to work with the class.
- CORE_EXPORT std::ostream& operator<<(std::ostream& os, AnimationTimeDelta time);
---
-2.19.1
-
diff --git a/www-client/chromium/files/chromium-70-gcc-2.patch b/www-client/chromium/files/chromium-70-gcc-2.patch
deleted file mode 100644
index 33041454c524..000000000000
--- a/www-client/chromium/files/chromium-70-gcc-2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4 Mon Sep 17 00:00:00 2001
-From: Maksim Sisov
-Date: Fri, 7 Sep 2018 18:57:42 +0000
-Subject: [PATCH] OmniboxTextView: fix gcc error for structure initialization
-
-It looks like there is bug in GCC 6, which cannot go through
-structure initialization normally.
-
-Thus, instead of a default initialization of one of the members,
-explicitly initialize it to a default value.
-
-Change-Id: Ia55cc6658e6b6b2f8a80c2582dd28f001c9e648c
-Reviewed-on: https://chromium-review.googlesource.com/1213181
-Reviewed-by: Scott Violet
-Commit-Queue: Maksim Sisov
-Cr-Commit-Position: refs/heads/master@{#589614}
----
- chrome/browser/ui/views/omnibox/omnibox_text_view.cc | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
-index f0a8083dc930..9021284f166d 100644
---- a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
-+++ b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc
-@@ -175,7 +175,8 @@ void ApplyTextStyleForType(SuggestionAnswer::TextStyle text_style,
- style = {part_color, .baseline = gfx::SUPERIOR};
- break;
- case SuggestionAnswer::TextStyle::BOLD:
-- style = {part_color, .weight = gfx::Font::Weight::BOLD};
-+ style = {part_color, .baseline = gfx::NORMAL_BASELINE,
-+ .weight = gfx::Font::Weight::BOLD};
- break;
- case SuggestionAnswer::TextStyle::NORMAL:
- case SuggestionAnswer::TextStyle::NORMAL_DIM:
---
-2.19.1
-
diff --git a/www-client/chromium/files/chromium-compiler-r4.patch b/www-client/chromium/files/chromium-compiler-r4.patch
deleted file mode 100644
index 3fe73ef7fec2..000000000000
--- a/www-client/chromium/files/chromium-compiler-r4.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From 777d166eec22c1894108dce985498f75ac5931e8 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert
-Date: Wed, 25 Apr 2018 13:22:49 -0400
-Subject: [PATCH] Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 61 ++++++++++------------------------
- 1 file changed, 18 insertions(+), 43 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 6e38ad782d38..87bbd423f67f 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -225,8 +225,6 @@ config("compiler") {
-
- configs += [
- # See the definitions below.
-- ":clang_revision",
-- ":compiler_cpu_abi",
- ":compiler_codegen",
- ]
-
-@@ -488,18 +486,6 @@ config("compiler") {
- }
- }
-
-- if (is_clang && !is_nacl && current_toolchain == host_toolchain &&
-- target_os != "chromeos") {
-- cflags += [
-- # TODO(hans): Remove this once Clang generates better optimized debug info
-- # by default. https://crbug.com/765793
-- "-Xclang",
-- "-mllvm",
-- "-Xclang",
-- "-instcombine-lower-dbg-declare=0",
-- ]
-- }
--
- # Print absolute paths in diagnostics. There is no precedent for doing this
- # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and
- # Windows developers rely on it (crbug.com/636109) so only do this on Windows.
-@@ -1473,10 +1459,6 @@ config("default_warnings") {
- cflags += [
- # TODO(thakis): https://crbug.com/753973
- "-Wno-enum-compare-switch",
--
-- # Ignore warnings about MSVC optimization pragmas.
-- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
-- "-Wno-ignored-pragma-optimize",
- ]
- }
- }
-@@ -1518,22 +1500,6 @@ config("chromium_code") {
- "__STDC_FORMAT_MACROS",
- ]
-
-- if (!is_debug && !using_sanitizer &&
-- (!is_linux || !is_clang || is_official_build) &&
-- current_cpu != "s390x" && current_cpu != "s390" &&
-- current_cpu != "ppc64" && current_cpu != "ppc64" &&
-- current_cpu != "mips" && current_cpu != "mips64") {
-- # _FORTIFY_SOURCE isn't really supported by Clang now, see
-- # http://llvm.org/bugs/show_bug.cgi?id=16821.
-- # It seems to work fine with Ubuntu 12 headers though, so use it in
-- # official builds.
-- #
-- # Non-chromium code is not guaranteed to compile cleanly with
-- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
-- # disabled, so only do that for Release build.
-- defines += [ "_FORTIFY_SOURCE=2" ]
-- }
--
- if (is_mac || is_ios) {
- cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
- cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -1863,7 +1829,8 @@ config("default_stack_frames") {
- }
-
- # Default "optimization on" config.
--config("optimize") {
-+config("optimize") { }
-+config("xoptimize") {
- if (is_win) {
- # TODO(thakis): Remove is_clang here, https://crbug.com/598772
- if (is_official_build && full_wpo_on_official && !is_clang) {
-@@ -1897,7 +1864,8 @@ config("optimize") {
- }
-
- # Same config as 'optimize' but without the WPO flag.
--config("optimize_no_wpo") {
-+config("optimize_no_wpo") { }
-+config("xoptimize_no_wpo") {
- if (is_win) {
- # Favor size over speed, /O1 must be before the common flags. The GYP
- # build also specifies /Os and /GF but these are implied by /O1.
-@@ -1920,7 +1888,8 @@ config("optimize_no_wpo") {
- }
-
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
- if (is_win) {
- cflags = [
- "/Od", # Disable optimization.
-@@ -1944,7 +1913,8 @@ config("no_optimize") {
- # Turns up the optimization level. On Windows, this implies whole program
- # optimization and link-time code generation which is very expensive and should
- # be used sparingly.
--config("optimize_max") {
-+config("optimize_max") { }
-+config("xoptimize_max") {
- if (is_nacl && is_nacl_irt) {
- # The NaCl IRT is a special case and always wants its own config.
- # Various components do:
-@@ -1991,7 +1961,8 @@ config("optimize_max") {
- #
- # TODO(crbug.com/621335) - rework how all of these configs are related
- # so that we don't need this disclaimer.
--config("optimize_speed") {
-+config("optimize_speed") { }
-+config("xoptimize_speed") {
- if (is_nacl && is_nacl_irt) {
- # The NaCl IRT is a special case and always wants its own config.
- # Various components do:
-@@ -2029,7 +2000,8 @@ config("optimize_speed") {
- }
- }
-
--config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
- cflags = [ "-O1" ] + common_optimize_on_cflags
- ldflags = common_optimize_on_ldflags
- visibility = [ ":default_optimization" ]
-@@ -2115,7 +2087,8 @@ config("afdo") {
- # configs += [ "//build/config/compiler:symbols" ]
-
- # Full symbols.
--config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
- if (is_win) {
- if (use_goma || is_clang) {
- # Note that with VC++ this requires is_win_fastlink, enforced elsewhere.
-@@ -2213,7 +2186,8 @@ config("symbols") {
- # Minimal symbols.
- # This config guarantees to hold symbol for stack trace which are shown to user
- # when crash happens in unittests running on buildbot.
--config("minimal_symbols") {
-+config("minimal_symbols") { }
-+config("xminimal_symbols") {
- if (is_win) {
- # Linker symbols for backtraces only.
- cflags = []
-@@ -2244,7 +2218,8 @@ config("minimal_symbols") {
- }
-
- # No symbols.
--config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
- if (!is_win) {
- cflags = [ "-g0" ]
- asmflags = cflags
---
-2.18.0
-
diff --git a/www-client/chromium/files/chromium-pdfium-stdlib-r0.patch b/www-client/chromium/files/chromium-pdfium-stdlib-r0.patch
deleted file mode 100644
index 1cfa4c55c29e..000000000000
--- a/www-client/chromium/files/chromium-pdfium-stdlib-r0.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From e3ad3deb6a6e79284f3748fa7410311d87df91c5 Mon Sep 17 00:00:00 2001
-From: Henrique Nakashima
-Date: Tue, 4 Sep 2018 16:49:51 +0000
-Subject: [PATCH] IWYU: stdint.h in pdfium_mem_buffer_file_write.h for uint8_t
-
-Bug: 879900
-Change-Id: I9c15d1c280a23c53d31f2d72c9d0d1db79eab886
-Reviewed-on: https://chromium-review.googlesource.com/1204410
-Reviewed-by: Lei Zhang
-Commit-Queue: Henrique Nakashima
-Cr-Commit-Position: refs/heads/master@{#588547}
----
- pdf/pdfium/pdfium_mem_buffer_file_write.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pdf/pdfium/pdfium_mem_buffer_file_write.h b/pdf/pdfium/pdfium_mem_buffer_file_write.h
-index 03c54bb63800..82e82d23684d 100644
---- a/pdf/pdfium/pdfium_mem_buffer_file_write.h
-+++ b/pdf/pdfium/pdfium_mem_buffer_file_write.h
-@@ -6,6 +6,7 @@
- #define PDF_PDFIUM_PDFIUM_MEM_BUFFER_FILE_WRITE_H_
-
- #include
-+#include
-
- #include
-
---
-2.19.0
-
diff --git a/www-client/falkon/falkon-3.0.1-r1.ebuild b/www-client/falkon/falkon-3.0.1-r1.ebuild
index 4a7483626802..3c30194cf4e8 100644
--- a/www-client/falkon/falkon-3.0.1-r1.ebuild
+++ b/www-client/falkon/falkon-3.0.1-r1.ebuild
@@ -15,7 +15,7 @@ fi
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="dbus gnome-keyring kwallet libressl +X"
COMMON_DEPEND="
diff --git a/www-client/falkon/falkon-3.0.1.ebuild b/www-client/falkon/falkon-3.0.1.ebuild
deleted file mode 100644
index e9e625d2b3c3..000000000000
--- a/www-client/falkon/falkon-3.0.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-QT_MINIMAL="5.9.2"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Cross-platform web browser using QtWebEngine"
-HOMEPAGE="https://www.falkon.org/"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus gnome-keyring kwallet libressl +X"
-
-COMMON_DEPEND="
- $(add_qt_dep qtdeclarative 'widgets')
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork 'ssl')
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsql 'sqlite')
- $(add_qt_dep qtwebchannel)
- $(add_qt_dep qtwebengine 'widgets')
- $(add_qt_dep qtwidgets)
- dbus? ( $(add_qt_dep qtdbus) )
- gnome-keyring? ( gnome-base/gnome-keyring )
- kwallet? ( $(add_frameworks_dep kwallet) )
- libressl? ( dev-libs/libressl:= )
- !libressl? ( dev-libs/openssl:0= )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libxcb:=
- x11-libs/xcb-util
- )
-"
-DEPEND="${COMMON_DEPEND}
- $(add_qt_dep linguist-tools)
- $(add_qt_dep qtconcurrent)
- gnome-keyring? ( virtual/pkgconfig )
-"
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
- DEPEND+=" $(add_frameworks_dep ki18n)"
-fi
-RDEPEND="${COMMON_DEPEND}
- !www-client/qupzilla
- $(add_qt_dep qtsvg)
-"
-
-src_configure() {
- local mycmakeargs=(
- -DDISABLE_DBUS=$(usex !dbus)
- -DBUILD_KEYRING=$(usex gnome-keyring)
- $(cmake-utils_use_find_package kwallet KF5Wallet)
- -DNO_X11=$(usex !X)
- )
- kde5_src_configure
-}
-
-pkg_postinst() {
- kde5_pkg_postinst
- elog "If you were previously using QupZilla, you can manually migrate your profiles"
- elog "by moving the config directory from ~/.config/qupzilla to ~/.config/falkon"
-}
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 98aad0efdab5..2524ea6e1daa 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_72.0.3626.71-1_amd64.deb 58360214 BLAKE2B 0cef3065af93efc258920d98b145ff14423e5c8a9d3bede7becef3b2058dd5f3d9fc4b273581dd8575d21973de55f6007d8b2b9fd3a93c2ed1f4c76e1bb5a253 SHA512 52ac25b235ff8614ab2672af31ddd94f9b95ad6f1772f86f2e632b72647642abf8ac8d9111de87d6bca7a17418100bdda801cb61c4cfc63b5c531b9018c512e2
+DIST google-chrome-beta_73.0.3683.27-1_amd64.deb 58749710 BLAKE2B 2747ee00aa2a7b795f7a59474d324e5494009836f2bede7208319e442d15b96868df1294ce6a314caf937aa4442481e8cd8194b7c500ebbe46c1f539c412cbea SHA512 06831e1a6a1f6458f50a4e3ebe395c6c4223a69d9d278f8ca9b0bd54421c7bd18dee3a2d0e96af2b98b9c0340173dd5b8b040cc322441bce72de0a0d33eea285
diff --git a/www-client/google-chrome-beta/google-chrome-beta-72.0.3626.71.ebuild b/www-client/google-chrome-beta/google-chrome-beta-73.0.3683.27.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-72.0.3626.71.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-73.0.3683.27.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index f79918160aef..2c6fab3b08c0 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1 +1 @@
-DIST google-chrome-unstable_73.0.3679.0-1_amd64.deb 58489980 BLAKE2B ae86ce9cf87fda474fb024323d84a7a173c0f021bebb5bcb1ce758ed273d0f78646153a7253df1753a9d5f78e229c171a537c650f61ac1c74c34b860dfb05054 SHA512 9fba3e4c2d947d6c34c1b9232724a1696cda3da2efef0b4998c5756cd33c34287689bc7070914f96a251e5af61a3578be96ff056b5f5454aaf0b23fd8ff90088
+DIST google-chrome-unstable_73.0.3683.20-1_amd64.deb 58798594 BLAKE2B 096d84d156773c1a87bbc56a078c3099ae43e46931bbafbcb6d749f333df04dd317e882c3a73121391767de6b10410d7152757608ac59dfadaefa1621d8aa0f0 SHA512 d962b392e5b4466d92aded3a32f4c2c9e6f9ec2fb85591c8421acb1cb3646fb1a3c40565eb2012a3b8cb98300ad6d071b393f162af9594fd3b718529dd062903
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3679.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-73.0.3683.20.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-73.0.3679.0.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-73.0.3683.20.ebuild
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 72b1499841d3..35997d0379a5 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1 +1 @@
-DIST google-chrome-stable_71.0.3578.98-1_amd64.deb 56611204 BLAKE2B 77fc467a3041576d64ddfe5d2c66b33aef8f936a53dd78cc16a38a34f99085e00205061643ba9f70c2fd74c127dcb1f2979361daf1ad43b5b2e0164bbbed1113 SHA512 50518b38b5f7c198014b82243aa19b29e7c29d5a0df6175c72df1e082ffaa40e4b2a2f81047d1d7a069a4f9035fe22b4644946d00807db2fcbae93f189054e7f
+DIST google-chrome-stable_72.0.3626.96-1_amd64.deb 57127360 BLAKE2B 2f21778cf761b298fa854230db19fd3a773715db0f6676b6ee5818278d7420dabc3660582bd1f86c90572fc6c4c099eeb76a000510cce753359224a477f99af8 SHA512 4cfe35edc23261cb6aaea9b199ce71df6073fe85ea7cc3e861e31dbc5569ce3a12c88427a24cf1a7705e86ab0aa6da36e329c5489042f1df7abd04e7ad5f04f0
diff --git a/www-client/google-chrome/google-chrome-71.0.3578.98.ebuild b/www-client/google-chrome/google-chrome-72.0.3626.96.ebuild
similarity index 98%
rename from www-client/google-chrome/google-chrome-71.0.3578.98.ebuild
rename to www-client/google-chrome/google-chrome-72.0.3626.96.ebuild
index fd49af6a6c8b..e75218fcde20 100644
--- a/www-client/google-chrome/google-chrome-71.0.3578.98.ebuild
+++ b/www-client/google-chrome/google-chrome-72.0.3626.96.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2018 Gentoo Authors
+# Copyright 2011-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
diff --git a/www-misc/Manifest.gz b/www-misc/Manifest.gz
index a3301883e36b..a0e867e527ce 100644
Binary files a/www-misc/Manifest.gz and b/www-misc/Manifest.gz differ
diff --git a/www-misc/visitors/visitors-0.7-r2.ebuild b/www-misc/visitors/visitors-0.7-r2.ebuild
index 23cd0fa780db..19963571fecc 100644
--- a/www-misc/visitors/visitors-0.7-r2.ebuild
+++ b/www-misc/visitors/visitors-0.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.hping.org/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
S="${WORKDIR}/${P/-/_}"
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index ca8fe221ed37..08288697d414 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index d1d5d9c94242..3dc40b5dfdd8 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_72.0.3626.71-1_amd64.deb 58360214 BLAKE2B 0cef3065af93efc258920d98b145ff14423e5c8a9d3bede7becef3b2058dd5f3d9fc4b273581dd8575d21973de55f6007d8b2b9fd3a93c2ed1f4c76e1bb5a253 SHA512 52ac25b235ff8614ab2672af31ddd94f9b95ad6f1772f86f2e632b72647642abf8ac8d9111de87d6bca7a17418100bdda801cb61c4cfc63b5c531b9018c512e2
-DIST google-chrome-stable_71.0.3578.98-1_amd64.deb 56611204 BLAKE2B 77fc467a3041576d64ddfe5d2c66b33aef8f936a53dd78cc16a38a34f99085e00205061643ba9f70c2fd74c127dcb1f2979361daf1ad43b5b2e0164bbbed1113 SHA512 50518b38b5f7c198014b82243aa19b29e7c29d5a0df6175c72df1e082ffaa40e4b2a2f81047d1d7a069a4f9035fe22b4644946d00807db2fcbae93f189054e7f
-DIST google-chrome-unstable_73.0.3679.0-1_amd64.deb 58489980 BLAKE2B ae86ce9cf87fda474fb024323d84a7a173c0f021bebb5bcb1ce758ed273d0f78646153a7253df1753a9d5f78e229c171a537c650f61ac1c74c34b860dfb05054 SHA512 9fba3e4c2d947d6c34c1b9232724a1696cda3da2efef0b4998c5756cd33c34287689bc7070914f96a251e5af61a3578be96ff056b5f5454aaf0b23fd8ff90088
+DIST google-chrome-beta_73.0.3683.27-1_amd64.deb 58749710 BLAKE2B 2747ee00aa2a7b795f7a59474d324e5494009836f2bede7208319e442d15b96868df1294ce6a314caf937aa4442481e8cd8194b7c500ebbe46c1f539c412cbea SHA512 06831e1a6a1f6458f50a4e3ebe395c6c4223a69d9d278f8ca9b0bd54421c7bd18dee3a2d0e96af2b98b9c0340173dd5b8b040cc322441bce72de0a0d33eea285
+DIST google-chrome-stable_72.0.3626.96-1_amd64.deb 57127360 BLAKE2B 2f21778cf761b298fa854230db19fd3a773715db0f6676b6ee5818278d7420dabc3660582bd1f86c90572fc6c4c099eeb76a000510cce753359224a477f99af8 SHA512 4cfe35edc23261cb6aaea9b199ce71df6073fe85ea7cc3e861e31dbc5569ce3a12c88427a24cf1a7705e86ab0aa6da36e329c5489042f1df7abd04e7ad5f04f0
+DIST google-chrome-unstable_73.0.3683.20-1_amd64.deb 58798594 BLAKE2B 096d84d156773c1a87bbc56a078c3099ae43e46931bbafbcb6d749f333df04dd317e882c3a73121391767de6b10410d7152757608ac59dfadaefa1621d8aa0f0 SHA512 d962b392e5b4466d92aded3a32f4c2c9e6f9ec2fb85591c8421acb1cb3646fb1a3c40565eb2012a3b8cb98300ad6d071b393f162af9594fd3b718529dd062903
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3578.98.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-72.0.3626.96.ebuild
similarity index 97%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3578.98.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-72.0.3626.96.ebuild
index 208b53cea0fa..c60abbfa5a56 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-71.0.3578.98.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-72.0.3626.96.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2012-2018 Gentoo Authors
+# Copyright 2012-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-72.0.3626.71_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3683.20_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-72.0.3626.71_beta.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3683.20_alpha.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3679.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3683.27_beta.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3679.0_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-73.0.3683.27_beta.ebuild
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 43f078f2a2fa..eede6257e3e7 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.2.ebuild b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.2.ebuild
index d9e07aac053d..3cb078d0836f 100644
--- a/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.2.ebuild
+++ b/x11-drivers/xf86-input-libinput/xf86-input-libinput-0.28.2.ebuild
@@ -7,7 +7,7 @@ inherit linux-info xorg-2
DESCRIPTION="X.org input driver based on libinput"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE=""
RDEPEND=">=dev-libs/libinput-1.5.0:0="
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index bc09c99d6ebd..c0a44023d0e4 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/cwm/cwm-5.6.ebuild b/x11-wm/cwm/cwm-5.6.ebuild
index 8d82e7c8a650..82d341433eaa 100644
--- a/x11-wm/cwm/cwm-5.6.ebuild
+++ b/x11-wm/cwm/cwm-5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils toolchain-funcs
DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
-HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+HOMEPAGE="https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
https://github.com/chneukirchen/cwm"
SRC_URI="vanilla? ( http://chneukirchen.org/releases/${P}.tar.gz -> ${P}-chneukirchen.tar.gz )
!vanilla? ( https://github.com/xmw/cwm/tarball/ea9a436 -> ${P}-xmw.tar.gz )"
diff --git a/x11-wm/cwm/cwm-9999.ebuild b/x11-wm/cwm/cwm-9999.ebuild
index 9362010d5669..573b8cfaaa4e 100644
--- a/x11-wm/cwm/cwm-9999.ebuild
+++ b/x11-wm/cwm/cwm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
inherit eutils toolchain-funcs git-2
DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
-HOMEPAGE="http://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
+HOMEPAGE="https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
https://github.com/chneukirchen/cwm"
EGIT_BRANCH=linux
diff --git a/x11-wm/echinus/echinus-0.4.9.ebuild b/x11-wm/echinus/echinus-0.4.9.ebuild
index 36cbcd703ef5..6ed20ef6b800 100644
--- a/x11-wm/echinus/echinus-0.4.9.ebuild
+++ b/x11-wm/echinus/echinus-0.4.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@@ -6,8 +6,8 @@ EAPI=4
inherit eutils toolchain-funcs multilib
DESCRIPTION="A window manager for X in the spirit of dwm"
-HOMEPAGE="http://plhk.ru/echinus"
-SRC_URI="http://plhk.ru/static/${PN}/${P}.tar.gz"
+HOMEPAGE="https://plhk.ru/"
+SRC_URI="https://plhk.ru/static/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
diff --git a/x11-wm/sawfish/sawfish-1.12.0.ebuild b/x11-wm/sawfish/sawfish-1.12.0.ebuild
index 8cf400901e0a..082e2269503c 100644
--- a/x11-wm/sawfish/sawfish-1.12.0.ebuild
+++ b/x11-wm/sawfish/sawfish-1.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/sawfish/${MY_P}.tar.xz"
LICENSE="GPL-2 Artistic-2"
SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 ~sh sparc x86 ~x86-fbsd"
IUSE="emacs kde nls xinerama"
RDEPEND="