Sync with portage [Sun May 19 23:31:19 MSK 2019].

5 years ago · f5e68b7e16
parent bfa052264b
commit f5e68b7e16
7859 changed files with 16326 additions and 34434 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/brltty/brltty-5.2-r1.ebuild
+++ b/app-accessibility/brltty/brltty-5.2-r1.ebuild
@ -10,8 +10,8 @@ inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
 	autotools udev systemd python-r1
 DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
-HOMEPAGE="http://brltty.com/"
+HOMEPAGE="https://brltty.app/"
-SRC_URI="http://brltty.com/archive/${P}.tar.xz"
+SRC_URI="https://brltty.app/archive/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
--- a/app-accessibility/brltty/brltty-6.0-r1.ebuild
+++ b/app-accessibility/brltty/brltty-6.0-r1.ebuild
@ -12,8 +12,8 @@ inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
 	autotools udev systemd python-r1
 DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
-HOMEPAGE="http://brltty.com/"
+HOMEPAGE="https://brltty.app/"
-SRC_URI="http://brltty.com/archive/${P}.tar.xz"
+SRC_URI="https://brltty.app/archive/${P}.tar.xz"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@ -1,2 +1 @@
 DIST orca-3.24.0.tar.xz 2391740 BLAKE2B 1f294bc8e1c593690c511f0d7d660230c420b33de59c8b1e78ee8d7b16f973b9fff9ce4d656de7202ffd5789ae3604d030c442e8c35eecfd5c5dca058031e996 SHA512 9aa65b534f69bb4a1b800e715776416843ac3756ec1267feca3c66476e34e54f6744f70c0f8ac8868a009d38b6cc165267268491a9ad29ebbd3601dba09d424c
 DIST orca-3.30.2.tar.xz 2493112 BLAKE2B 06ac902f67c66d5098be1829aa7cb7a160663a3a713d407a5245a95215c309f3b374937e4b70acbf9750f6e0e270ed8ab5516ca3cb6b0a19f347ee72a01a325b SHA512 146a132ce06f7f36d6d9397c507ea767be5df6c47a5c7485c35c325868ebc0b3ff7b3653572be82f6d5ed937033cd6d68a08700056a63e5691aed4c9171b3485
--- a/app-accessibility/orca/orca-3.24.0.ebuild
+++ b/app-accessibility/orca/orca-3.24.0.ebuild
@ -1,72 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 GNOME2_LA_PUNT="yes"
 PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="threads"
 inherit gnome2 python-r1
 DESCRIPTION="Extensible screen reader that provides access to the desktop"
 HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="+braille"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-accessibility/at-spi2-atk-2.12:2
 	>=app-accessibility/at-spi2-core-2.12:2[introspection]
 	>=dev-libs/atk-2.10
 	>=dev-libs/glib-2.28:2
 	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
 	>=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
 	media-libs/gstreamer:1.0[introspection]
 	>=x11-libs/gtk+-3.6.2:3[introspection]
 	braille? (
 		>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
 		dev-libs/liblouis[python,${PYTHON_USEDEP}] )
 "
 RDEPEND="${COMMON_DEPEND}
 	>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
 	dev-libs/atk[introspection]
 	dev-python/pyatspi[${PYTHON_USEDEP}]
 	dev-python/setproctitle[${PYTHON_USEDEP}]
 	x11-libs/libwnck:3[introspection]
 	x11-libs/pango[introspection]
 "
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.50
 	dev-util/itstool
 	virtual/pkgconfig
 "
 #	app-text/yelp-tools
 src_prepare() {
 	gnome2_src_prepare
 	python_copy_sources
 }
 src_configure() {
 	python_foreach_impl run_in_build_dir gnome2_src_configure \
 		$(use_with braille liblouis)
 }
 src_compile() {
 	python_foreach_impl run_in_build_dir gnome2_src_compile
 }
 src_install() {
 	installing() {
 		gnome2_src_install
 		# Massage shebang to make python_doscript happy
 		sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
 			-i src/orca/orca || die
 		python_doscript src/orca/orca
 	}
 	python_foreach_impl run_in_build_dir installing
 }
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.3.1-r1.ebuild
@ -27,10 +27,7 @@ IUSE=""
 RDEPEND="
 	$(: --format support)
 	>=app-portage/portage-utils-0.60
-	|| (
+	sys-apps/portage
 		sys-apps/portage
 		sys-apps/portage-mgorny
 	)
 "
 DEPEND=""
--- a/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.12-r1.ebuild
@ -19,7 +19,6 @@ DEPEND=">=dev-lang/ghc-6.12.1"
 # Need a lower version for portage to get --keep-going
 RDEPEND="|| ( >=sys-apps/portage-2.1.6
 		sys-apps/portage-mgorny
 		sys-apps/pkgcore )"
 src_prepare() {
--- a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
@ -1,49 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
 DESCRIPTION="System settings D-Bus service for OpenRC"
 HOMEPAGE="https://gnome.gentoo.org/openrc-settingsd.xml"
 SRC_URI="https://dev.gentoo.org/~tetromino/distfiles/${PN}/${P}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="systemd"
 COMMON_DEPEND=">=dev-libs/glib-2.30:2
 	dev-libs/libdaemon
 	sys-apps/dbus
 	sys-apps/openrc:=
 	sys-auth/polkit"
 RDEPEND="${COMMON_DEPEND}
 	systemd? ( >=sys-apps/systemd-197 )
 	!systemd? ( sys-auth/nss-myhostname !sys-apps/systemd )"
 DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils
 	dev-util/gdbus-codegen
 	virtual/pkgconfig"
 src_configure() {
 	econf \
 		--with-pidfile="${EPREFIX}"/var/run/openrc-settingsd.pid
 }
 src_install() {
 	default
 	if use systemd; then
 		# Avoid file collision with systemd
 		rm -vr "${ED}"usr/share/{dbus-1,polkit-1} "${ED}"etc/dbus-1 || die "rm failed"
 	fi
 }
 pkg_postinst() {
 	if use systemd; then
 		elog "You installed ${PN} with USE=systemd. In this mode,"
 		elog "${PN} will not start via simple dbus activation, so you"
 		elog "will have to manually enable it as an rc service:"
 		elog " # /etc/init.d/openrc-settingsd start"
 		elog " # rc-update add openrc-settingsd default"
 	fi
 }
--- a/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.12.ebuild
@ -58,10 +58,7 @@ DEPEND="${COMMON_DEPEND}
 "
 RDEPEND="${COMMON_DEPEND}
 	>=app-portage/layman-2[${PYTHON_USEDEP}]
-	|| (
+	>=sys-apps/portage-2.2[${PYTHON_USEDEP}]
 		>=sys-apps/portage-2.2[${PYTHON_USEDEP}]
 		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 	)
 	consolekit? ( sys-auth/consolekit )
 	entropy? ( >=sys-apps/entropy-234[${PYTHON_USEDEP}] )
 "
--- a/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.27.ebuild
@ -26,7 +26,6 @@ RDEPEND="app-shells/bash
 	dev-lang/perl
 	|| (
 		( sys-apps/portage app-portage/portage-utils )
 		( sys-apps/portage-mgorny app-portage/portage-utils )
 		sys-apps/pkgcore
 	)
 "
--- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
@ -26,7 +26,6 @@ RDEPEND="app-shells/bash
 	dev-lang/perl
 	|| (
 		( sys-apps/portage app-portage/portage-utils )
 		( sys-apps/portage-mgorny app-portage/portage-utils )
 		sys-apps/pkgcore
 	)
 "
--- a/app-admin/radmind/radmind-1.15.1.ebuild
+++ b/app-admin/radmind/radmind-1.15.1.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://github.com/voretaq7/radmind/releases/download/${P}/${P}.tar.gz"
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="libressl"
 DEPEND="
--- a/app-admin/salt/salt-2017.7.8.ebuild
+++ b/app-admin/salt/salt-2017.7.8.ebuild
@ -55,12 +55,7 @@ RDEPEND="sys-apps/pciutils
 	)
 	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? (
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 		|| (
 			sys-apps/portage[${PYTHON_USEDEP}]
 			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 		)
 	)
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
 	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
 	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
--- a/app-admin/salt/salt-2018.3.4.ebuild
+++ b/app-admin/salt/salt-2018.3.4.ebuild
@ -56,12 +56,7 @@ RDEPEND="sys-apps/pciutils
 	)
 	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? (
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 		|| (
 			sys-apps/portage[${PYTHON_USEDEP}]
 			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 		)
 	)
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
 	mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
 	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
--- a/app-admin/salt/salt-2019.2.0.ebuild
+++ b/app-admin/salt/salt-2019.2.0.ebuild
@ -56,12 +56,7 @@ RDEPEND="sys-apps/pciutils
 	)
 	cherrypy? ( >=dev-python/cherrypy-3.2.2[${PYTHON_USEDEP}] )
 	mongodb? ( dev-python/pymongo[${PYTHON_USEDEP}] )
-	portage? (
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
 		|| (
 			sys-apps/portage[${PYTHON_USEDEP}]
 			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 		)
 	)
 	keyring? ( dev-python/keyring[${PYTHON_USEDEP}] )
 	mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
 	redis? ( dev-python/redis-py[${PYTHON_USEDEP}] )
--- a/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.55-r1.ebuild
@ -20,12 +20,7 @@ IUSE="+portage"
 DEPEND="app-text/xmlto
 	sys-apps/gentoo-functions"
 RDEPEND="
-	portage? (
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 		|| (
 			sys-apps/portage[${PYTHON_USEDEP}]
 			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 		)
 	)"
 python_prepare_all() {
 	distutils-r1_python_prepare_all
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.ebuild
@ -27,12 +27,7 @@ IUSE="+portage"
 DEPEND="app-text/xmlto
 	sys-apps/gentoo-functions"
 RDEPEND="
-	portage? (
+	portage? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 		|| (
 			sys-apps/portage[${PYTHON_USEDEP}]
 			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
 		)
 	)"
 python_prepare_all() {
 	distutils-r1_python_prepare_all
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@ -1,2 +1 @@
 DIST file-roller-3.26.2.tar.xz 1436760 BLAKE2B a563f77dcc8d61e90e4e42fa4f08aded657d677b319b39f4c9fd16670a2309e81f142b7b8528e52db0be3f454efca15ccd7e9e25754a95b45800a9ca02969e12 SHA512 3572446081f931ce7cfd7eccdc9450d798164426a68bc332f9340b7c06b79ce4f1589b817c27322a0c1681d7f2cb8cf93462cde1e3df13ad40789faec1decc9f
 DIST file-roller-3.30.1.tar.xz 1443340 BLAKE2B 352b094b51d342ac71f2174b59dff262ba46b4697c21164ba18bf825d70cb609d59a35ce0efe1013e217e86754822accc11c59eb9bba7185a9f7efe5dded4def SHA512 8f3f55cd7d6769fbf8f72118bb8982775c3f83534266db1f2cc9bbfd9e8dd68545ab49baaa4e468ce22e616346dec9c99c11a0c5b4208dca2e648fac8756cea7
--- a/app-arch/file-roller/file-roller-3.26.2.ebuild
+++ b/app-arch/file-roller/file-roller-3.26.2.ebuild
@ -1,92 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 GNOME2_LA_PUNT="yes"
 inherit gnome2 readme.gentoo-r1
 DESCRIPTION="Archive manager for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus packagekit"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
 # pango used in fr-window
 RDEPEND="
 	>=app-arch/libarchive-3:=
 	>=dev-libs/glib-2.36:2
 	>=dev-libs/json-glib-0.14
 	>=x11-libs/gtk+-3.13.2:3
 	sys-apps/file
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
 	x11-libs/pango
 	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
 	nautilus? ( >=gnome-base/nautilus-2.22.2 )
 	packagekit? ( app-admin/packagekit-base )
 "
 # libxml2 required for glib-compile-resources
 DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	dev-util/glib-utils
 	>=dev-util/intltool-0.50.1
 	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 # eautoreconf needs:
 #	gnome-base/gnome-common
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
 ${PN} is a frontend for several archiving utilities. If you want a
 particular archive format support, see ${HOMEPAGE}
 and install the relevant package. For example:
 7-zip   - app-arch/p7zip
 ace     - app-arch/unace
 arj     - app-arch/arj
 cpio    - app-arch/cpio
 deb     - app-arch/dpkg
 iso     - app-cdr/cdrtools
 jar,zip - app-arch/zip and app-arch/unzip
 lha     - app-arch/lha
 lzop    - app-arch/lzop
 lz4     - app-arch/lz4
 rar     - app-arch/unrar or app-arch/unar
 rpm     - app-arch/rpm
 unstuff - app-arch/stuffit
 zoo     - app-arch/zoo"
 src_prepare() {
 	# File providing Gentoo package names for various archivers
 	cp -v "${FILESDIR}"/3.22-packages.match data/packages.match || die
 	gnome2_src_prepare
 }
 src_configure() {
 	# --disable-debug because enabling it adds -O0 to CFLAGS
 	gnome2_src_configure \
 		--disable-run-in-place \
 		--disable-static \
 		--disable-debug \
 		--enable-magic \
 		--enable-libarchive \
 		$(use_enable libnotify notification) \
 		$(use_enable nautilus nautilus-actions) \
 		$(use_enable packagekit)
 }
 src_install() {
 	gnome2_src_install
 	readme.gentoo_create_doc
 }
 pkg_postinst() {
 	gnome2_pkg_postinst
 	readme.gentoo_print_elog
 }
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@ -1,2 +1 @@
 DIST gnome-autoar-0.2.2.tar.xz 295488 BLAKE2B 33f614846547921b208239f7756cab3561ec417f2030e3196bece43c47af2a6496fef82838d90fa3ddcf8742023b525bc4e8cbdfbf3fc925c92c74a8a6918c3b SHA512 78faf8f82eeab4cb5f1f364d6e9caa4d24f21f9b81a79ebde4404253f3e7ae120f44600f236612859810afc6fc6f1a8c6f2e065db98be79103255642139c10a2
 DIST gnome-autoar-0.2.3.tar.xz 297632 BLAKE2B 37b5861b1e0866200884aa1791fced6168c12aa740413a1330a08629aaf4e18105b02b36828619c20a15874ac41c779836627728c82fa1a79a1bab6dc9224d97 SHA512 f87299817c52e7862a6c1cc950b1c362db8e7465e008d988e70245a203c728a9179400aac8601c399abe361e5a1ac4558b1190641ad3afa7224f883546fae7bc
--- a/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.2.2.ebuild
@ -1,43 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 VALA_USE_DEPEND="vapigen"
 inherit gnome2 vala
 DESCRIPTION="Automatic archives creating and extracting library"
 HOMEPAGE="https://git.gnome.org/browse/gnome-autoar"
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="0"
 IUSE="gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 RDEPEND="
 	>=app-arch/libarchive-3.2.0
 	>=dev-libs/glib-2.35.6:2
 	gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
 	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.14
 	gnome-base/gnome-common
 	virtual/pkgconfig
 	vala? ( $(vala_depend) )
 "
 src_prepare() {
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 }
 src_configure() {
 	gnome2_src_configure \
 		--disable-static \
 		$(use_enable introspection) \
 		$(use_enable vala) \
 		$(use_enable gtk)
 }
--- a/app-arch/xarchiver/Manifest
+++ b/app-arch/xarchiver/Manifest
@ -1,2 +1 @@
 DIST xarchiver-0.5.4.13.tar.gz 1079259 BLAKE2B c824e81182a6105d24fe85d148fb7e71c2ae761948421bacf7af240e4b2a381582ab5db46c29ee3b2daf01f710696ee53a93a0a2923923083c177e9473bee4f1 SHA512 ace6b3bade20f517c63a035022944d092868e4c000976ef388a3ee70ef8a28177ee20cfb089d0984e9274722c4ec13d129fd7a4ef542e7b5cd4423c26ad5b849
 DIST xarchiver-0.5.4.14.tar.gz 1081542 BLAKE2B 591d93dfbaa98164bc169105462155b09ed87dab8ad5adff6653e77673095a29d7f00cdaeed1b928039fe3cc5f668f8da46885905ae73d03f5b4c71dd279a7b4 SHA512 b38881e6cdfb402499efbd18ab25cac3869cd48ef96941a4bb3cb8b6b130a2317abe3b1d11bfc3d60e81eef7cafa34515fefc11e469443d96d139c2f09cf4498
--- a/app-arch/xarchiver/xarchiver-0.5.4.13.ebuild
+++ b/app-arch/xarchiver/xarchiver-0.5.4.13.ebuild
@ -1,62 +0,0 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit autotools gnome2-utils xdg-utils
 DESCRIPTION="A GTK+ archive manager that can be used with Thunar"
 HOMEPAGE="https://github.com/ib/xarchiver"
 SRC_URI="https://github.com/ib/xarchiver/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc"
 # older pigz versions have incompatible command-line processing
 # https://bugs.gentoo.org/661464
 RDEPEND=">=dev-libs/glib-2:=
 	x11-libs/gtk+:3=
 	!!<app-arch/pigz-2.4[symlink]"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	sys-devel/gettext
 	virtual/pkgconfig
 	doc? (
 		app-text/docbook-xml-dtd
 		app-text/docbook-xsl-stylesheets
 		dev-libs/libxml2
 		dev-libs/libxslt
 	)"
 src_prepare() {
 	sed -e '/COPYING/d' -e '/NEWS/d' -i doc/Makefile.am || die
 	default
 	eautoreconf
 }
 src_configure() {
 	local myconf=(
 		$(use_enable doc)
 	)
 	econf "${myconf[@]}"
 }
 pkg_postinst() {
 	xdg_desktop_database_update
 	gnome2_icon_cache_update
 	elog "You need external programs for some formats, including:"
 	elog "7zip - app-arch/p7zip"
 	elog "arj - app-arch/unarj app-arch/arj"
 	elog "lha - app-arch/lha"
 	elog "lzop - app-arch/lzop"
 	elog "rar - app-arch/unrar app-arch/rar"
 	elog "zip - app-arch/unzip app-arch/zip"
 }
 pkg_postrm() {
 	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.97.2.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
 DESCRIPTION="Hard drive bottleneck testing benchmark suite"
-HOMEPAGE="http://www.coker.com.au/bonnie++/"
+HOMEPAGE="https://www.coker.com.au/bonnie++/"
-SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
+SRC_URI="https://www.coker.com.au/${PN}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
--- a/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
+++ b/app-benchmarks/bonnie++/bonnie++-1.97.3.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
 DESCRIPTION="Hard drive bottleneck testing benchmark suite"
-HOMEPAGE="http://www.coker.com.au/bonnie++/"
+HOMEPAGE="https://www.coker.com.au/bonnie++/"
-SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz"
+SRC_URI="https://www.coker.com.au/${PN}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
--- a/app-benchmarks/stress/stress-1.0.4-r2.ebuild
+++ b/app-benchmarks/stress/stress-1.0.4-r2.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://people.seas.harvard.edu/~apw/${PN}/${P}.tar.gz -> ${P}-r1.tar.g
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="amd64 ~arm ~mips ppc ppc64 sparc x86"
 IUSE="static"
 src_configure() {
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
+++ b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
@ -1,5 +1,5 @@
--- configure.in.orig	2014-12-02 18:56:23.000000000 +0300
+--- a/configure.in	2014-12-02 18:56:23.000000000 +0300
-+++ configure.in	2014-12-02 19:09:46.724190436 +0300
+++ b/configure.in	2014-12-02 19:09:46.724190436 +0300
@@ -6,13 +6,13 @@
 dnl Checks for libraries.
--- a/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
+++ b/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
@ -0,0 +1,34 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools flag-o-matic
 DESCRIPTION="Xbox xdvdfs ISO extraction utility"
 HOMEPAGE="https://sourceforge.net/projects/xbiso/"
 SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 src_prepare() {
 	eapply_user
 	sed -i -e 's:C) $(CFLAGS):C) $(LDFLAGS) $(CFLAGS):' Makefile.in || die #337769
 	eapply "${FILESDIR}/${P}-libs.patch"
 	mv configure.in configure.ac || die #426262
 	eautoreconf
 }
 src_configure() {
 	# for this package, interix behaves the same as BSD
 	[[ ${CHOST} == *-interix* ]] && append-flags -D_BSD
 	econf --disable-ftp
 }
 src_install() {
 	dobin xbiso
 	dodoc CHANGELOG README
 }
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/acme-sh/acme-sh-2.7.9.ebuild
+++ b/app-crypt/acme-sh/acme-sh-2.7.9.ebuild
@ -17,7 +17,7 @@ IUSE=""
 RDEPEND="net-misc/curl
 	|| ( dev-libs/libressl dev-libs/openssl:0 )
-	|| ( net-analyzer/netcat6 net-analyzer/openbsd-netcat )
+	net-analyzer/openbsd-netcat
 	|| ( net-misc/socat www-servers/apache:2 www-servers/nginx:0 )
 	virtual/cron"
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd"
 IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp +pkinit selinux ssl static-libs test X"
 CDEPEND="
--- a/app-crypt/libb2/Manifest
+++ b/app-crypt/libb2/Manifest
@ -1 +1,2 @@
 DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b
 DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073
--- a/app-crypt/libb2/libb2-0.98.1.ebuild
+++ b/app-crypt/libb2/libb2-0.98.1.ebuild
@ -0,0 +1,56 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit autotools ltprune toolchain-funcs
 DESCRIPTION="C library providing BLAKE2b, BLAKE2s, BLAKE2bp, BLAKE2sp"
 HOMEPAGE="https://github.com/BLAKE2/libb2"
 GITHASH="73d41c8255a991ed2adea41c108b388d9d14b449"
 SRC_URI="https://github.com/BLAKE2/libb2/archive/${GITHASH}.tar.gz -> ${P}.tar.gz"
 LICENSE="CC0-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="static +native-cflags openmp"
 DEPEND="
 	openmp? (
 		|| ( >=sys-devel/gcc-4.2:*[openmp] sys-devel/clang-runtime:*[openmp] )
 	)
 "
 RDEPEND="${DEPEND}"
 S=${WORKDIR}/${PN}-${GITHASH}
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != "binary" ]] && use openmp && ! tc-has-openmp; then
 		ewarn "You are using a compiler without OpenMP support"
 		die "Need an OpenMP capable compiler"
 	fi
 }
 src_prepare() {
 	default
 	# fix bashism
 	sed -i -e 's/ == / = /' configure.ac || die
 	eautoreconf  # upstream doesn't make releases
 }
 src_configure() {
 	econf \
 		$(use_enable static) \
 		$(use_enable native-cflags native) \
 		$(use_enable openmp)
 }
 src_compile() {
 	# respect our CFLAGS when native-cflags is not in effect
 	emake $(use native-cflags && echo no)CFLAGS="${CFLAGS}"
 }
 src_install() {
 	default
 	prune_libtool_files
 }
--- a/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.23.12.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/p11-glue/${PN}/releases/download/${PV}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv 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="+asn1 debug +libffi +trust"
 REQUIRED_USE="trust? ( asn1 )"
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@ -1,2 +1 @@
 DIST seahorse-3.20.0.tar.xz 1556556 BLAKE2B e0742996045b50acb2d60f548f321e1ff0121c166209e2230d5839cc971f8560f316c91c3a88a30c302c5339ba0251e7faf64ae805c4f80e853cc67a6952d350 SHA512 a02d3da7af95256941ef065ac024bd5bfb53a026767b951fa2e26446fb0eed23707e69f72f6e8ebfa7d538823fa41411709fa2bebad4fbd662af1e81bc15ab82
 DIST seahorse-3.30.1.1.tar.xz 1428904 BLAKE2B 54760362fc452b2ff3f7a0d72b25540568703cb91cd46321fb8cd60c9b51f84c3f48575ae9f6c72080cbe0b29e8a38f5e6afdb6c3120b2783a8a04688bd219c9 SHA512 971b8bea484f456d2942f1d1b407ca5b11c1d431f2ee524e58348a421a235dd9d2fa463e73487c6137bde116b34a5d1c0291b479d8562d4ce03766081e0dc469
--- a/app-crypt/seahorse/seahorse-3.20.0.ebuild
+++ b/app-crypt/seahorse/seahorse-3.20.0.ebuild
@ -1,68 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit gnome2
 DESCRIPTION="A GNOME application for managing encryption keys"
 HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE="debug ldap zeroconf"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 COMMON_DEPEND="
 	>=app-crypt/gcr-3.11.91:=
 	>=dev-libs/glib-2.10:2
 	>=x11-libs/gtk+-3.4:3
 	>=app-crypt/libsecret-0.16
 	>=net-libs/libsoup-2.33.92:2.4
 	x11-misc/shared-mime-info
 	net-misc/openssh
 	>=app-crypt/gpgme-1
 	>=app-crypt/gnupg-2.0.12
 	ldap? ( net-nds/openldap:= )
 	zeroconf? ( >=net-dns/avahi-0.6:= )
 "
 DEPEND="${COMMON_DEPEND}
 	app-text/yelp-tools
 	dev-util/gdbus-codegen
 	>=dev-util/intltool-0.35
 	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 # Need seahorse-plugins git snapshot
 RDEPEND="${COMMON_DEPEND}
 	!<app-crypt/seahorse-plugins-2.91.0_pre20110114
 "
 src_prepare() {
 	# Do not mess with CFLAGS with USE="debug"
 	sed -e '/CFLAGS="$CFLAGS -g/d' \
 		-e '/CFLAGS="$CFLAGS -O0/d' \
 		-i configure.ac configure || die "sed 1 failed"
 	# Accept GnuPG 2.2.0
 	sed -e 's/GNUPG_ACCEPTED="2.0.12 2.1.4"/GNUPG_ACCEPTED="2.0.12 2.1.4 2.2.0"/g' \
 		-i configure.ac configure || die "sed failed"
 	gnome2_src_prepare
 }
 src_configure() {
 	# bindir is needed due to bad macro expansion in desktop file, bug #508610
 	gnome2_src_configure \
 		--bindir=/usr/bin \
 		--enable-pgp \
 		--enable-ssh \
 		--enable-pkcs11 \
 		--enable-hkp \
 		$(use_enable debug) \
 		$(use_enable ldap) \
 		$(use_enable zeroconf sharing) \
 		VALAC=$(type -P true)
 }
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@ -1,2 +1 @@
 DIST gnome-dictionary-3.24.1.tar.xz 880500 BLAKE2B f730276612d2578e7b25121b49be9639cf7a9fc67bda9687285f6d3873d3b825301246447d968b24ed29240a1b0e7fc48d63c8454e704b799eebdf340f5f6da2 SHA512 b3ee838888a97e914add58dd4b61fa096b9488aab360815f2e7b674e7a57b237849a1ccaf107c1e94968e534b24ee24d827c42a3a1b0dfd8c5ef25eeb90456d3
 DIST gnome-dictionary-3.26.1.tar.xz 662048 BLAKE2B 3b77d3632629f8502476f029ab9ba3c66225cd619992e185b1403adfeba718b7e0fa0f32762eb086c1e9ef80a08cf79cd872e2ca3026b8cb3975954077c5f7c1 SHA512 da7169795740295c13f02143f5263603f0f6c621e96cecf88a4ee089114399d59f083987bc4571821467da64dc43f00bebbe4ea66b46a035088f85d35d6aee27
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
@ -1,41 +0,0 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit gnome2
 DESCRIPTION="Dictionary utility for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Dictionary"
 LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1+"
 SLOT="0/10" # subslot = suffix of libgdict-1.0.so
 IUSE="debug +introspection ipv6"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 COMMON_DEPEND="
 	>=dev-libs/glib-2.42:2[dbus]
 	x11-libs/cairo:=
 	>=x11-libs/gtk+-3.21.1:3
 	x11-libs/pango
 	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 "
 RDEPEND="${COMMON_DEPEND}
 	gnome-base/gsettings-desktop-schemas
 	!<gnome-extra/gnome-utils-3.4
 "
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.15
 	dev-util/glib-utils
 	>=dev-util/intltool-0.40
 	dev-util/itstool
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
 src_configure() {
 	gnome2_src_configure \
 		$(usex debug --enable-debug=yes ' ') \
 		$(use_enable introspection) \
 		$(use_enable ipv6)
 }
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
+++ b/app-doc/linkers-and-loaders/linkers-and-loaders-1-r1.ebuild
@ -0,0 +1,25 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DESCRIPTION="The Linkers and Loaders book"
 HOMEPAGE="https://linker.iecc.com/"
 SRC_URI="https://wh0rd.org/books/${P}.tar.lzma"
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc"
 RESTRICT="mirror bindist"
 BDEPEND="app-arch/xz-utils"
 S=${WORKDIR}
 src_install() {
 	use doc && dodoc *.txt *.rtf
 	dodoc *.pdf
 	docinto html
 	dodoc *.html *.jpg
 }
--- a/app-doc/linkers-and-loaders/linkers-and-loaders-1.ebuild
+++ b/app-doc/linkers-and-loaders/linkers-and-loaders-1.ebuild
@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="4"
-DESCRIPTION="the Linkers and Loaders book"
+DESCRIPTION="The Linkers and Loaders book"
-HOMEPAGE="http://linker.iecc.com/"
+HOMEPAGE="https://linker.iecc.com/"
-SRC_URI="http://wh0rd.org/books/${P}.tar.lzma"
+SRC_URI="https://wh0rd.org/books/${P}.tar.lzma"
 LICENSE="all-rights-reserved"
 SLOT="0"
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@ -1,2 +1 @@
 DIST gedit-plugins-3.28.1.tar.xz 1350468 BLAKE2B 4fd50ad7358581f5e27f0c3a7e127d4e2c0e7189c039daee1d8d7ddf7062846e1aebb634b3edd998c9a7c11840c71f56fe4eeca78ea2e91ae18db814e4fd79e5 SHA512 6258c627cd3fa2948375c30e87061375c0d09ce2c70301c2d10a403e6075d1df09e928a2d95b72f6d7950a31a720af645fff2f7f59a281d2999948beb56c1dc9
 DIST gedit-plugins-3.30.1.tar.xz 1354644 BLAKE2B ee42fb2fe47c9219442e0bbdaf21a14a834b8bc38558713ccf0ad384814812fd71f4d318624b4d2c149b26d304203a2b954ef49c3299877f4d067ae181bfe1d5 SHA512 0e777779288b51015d7ab539bf896a00d5226560f2cc2211daf777da87824eed858255318c421524933a540135e4bfdcc294ba7ed89f680a35aa48f7279cbc94
--- a/app-editors/gedit-plugins/gedit-plugins-3.28.1.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.28.1.ebuild
@ -1,94 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
 PYTHON_COMPAT=( python3_{5,6} )
 PYTHON_REQ_USE="xml"
 VALA_MIN_API_VERSION="0.28"
 inherit eutils gnome2 multilib python-single-r1 vala
 DESCRIPTION="Official plugins for gedit"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit/ShippedPlugins"
 LICENSE="GPL-2+"
 KEYWORDS="amd64 x86"
 SLOT="0"
 IUSE_plugins="charmap git terminal vala"
 IUSE="+python ${IUSE_plugins}"
 # python-single-r1 would request disabling PYTHON_TARGETS on libpeas
 REQUIRED_USE="
 	charmap? ( python )
 	git? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	terminal? ( python )
 "
 RDEPEND="
 	>=app-editors/gedit-3.16
 	>=dev-libs/glib-2.32:2
 	>=dev-libs/libpeas-1.7.0[gtk]
 	>=x11-libs/gtk+-3.9:3
 	>=x11-libs/gtksourceview-3.21.3:3.0
 	python? (
 		${PYTHON_DEPS}
 		>=app-editors/gedit-3.16[introspection,python,${PYTHON_USEDEP}]
 		dev-libs/libpeas[python,${PYTHON_USEDEP}]
 		>=dev-python/dbus-python-0.82[${PYTHON_USEDEP}]
 		dev-python/pycairo[${PYTHON_USEDEP}]
 		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
 		>=x11-libs/gtk+-3.9:3[introspection]
 		>=x11-libs/gtksourceview-3.14:3.0[introspection]
 		x11-libs/pango[introspection]
 		x11-libs/gdk-pixbuf:2[introspection]
 	)
 	charmap? ( >=gnome-extra/gucharmap-3:2.90[introspection] )
 	git? ( >=dev-libs/libgit2-glib-0.0.6 )
 	terminal? ( x11-libs/vte:2.91[introspection] )
 	vala? ( $(vala_depend) )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.50.2
 	dev-util/itstool
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig
 "
 pkg_setup() {
 	use python && [[ ${MERGE_TYPE} != binary ]] && python-single-r1_pkg_setup
 }
 src_prepare() {
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 }
 src_configure() {
 	gnome2_src_configure \
 		$(use_enable python) \
 		$(use_enable vala)
 }
 src_install() {
 	gnome2_src_install
 	# FIXME: crazy !!!
 	if use python; then
 		find "${ED}"/usr/share/gedit -name "*.py*" -delete || die
 		find "${ED}"/usr/share/gedit -type d -empty -delete || die
 	fi
 	# FIXME: upstream made this automagic...
 	clean_plugin charmap
 	clean_plugin git
 	clean_plugin terminal
 }
 clean_plugin() {
 	if use !${1} ; then
 		rm -rf "${ED}"/usr/share/gedit/plugins/${1}*
 		rm -rf "${ED}"/usr/$(get_libdir)/gedit/plugins/${1}*
 	fi
 }
--- a/app-editors/gedit/Manifest
+++ b/app-editors/gedit/Manifest
@ -1,3 +1,2 @@
 DIST gedit-3.28.1.tar.xz 3149684 BLAKE2B 6afedcc5de0bd249af3d0fd02339acc2d993aae083dcbfda9212745ab810b81cdb9da655273cb7ccc556644c29d69429d3587fcc9e1faf7aa1c2cee57af09a4b SHA512 f5931ac562cb5005a83eec43048b718ef431e6006b72470fea54ad0e94bd64940ebdec160ee0459ceb5adb235ab111711a2f9fbdc74104d2edd8f287d7474815
 DIST gedit-3.30.2.tar.xz 3155628 BLAKE2B 96736adbce987af89b37a712448f42b2a2eeed72d52aa16377d961c9e929fa4e75205eac5987bfc067cc2fecb35aec720d85483c4e2e824a6e8248cc652d2fbe SHA512 58ae7a4c27aeabad670718e39e1860df112d0be00ea622cc8adc185cb5d0e16ac4af65cb3aa45423c7b1b94c88d04d081fe05f3647b054a3e3291abc73c41f6f
 DIST gedit-3.32.0.tar.xz 14793216 BLAKE2B b1d9af7882063a622fe27f8e5aa322e2a1724410c4419d538712fdda2cab10aa59014a82cc1a41b35966dceb1b75ce2613d9c5c98400743b31df76b0114e84e8 SHA512 f25ed05f5d3b7ab7711be32c6516479c8b515d6d5983e3bc3a00407740fb8ec42b1e9a3005473671fc144f4437b9e98355a3669210eefb5bf8288f171188f387
--- a/app-editors/gedit/gedit-3.28.1.ebuild
+++ b/app-editors/gedit/gedit-3.28.1.ebuild
@ -1,92 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
 GNOME2_LA_PUNT="yes" # plugins are dlopened
 PYTHON_COMPAT=( python3_{5,6} )
 VALA_MIN_API_VERSION="0.26"
 VALA_USE_DEPEND="vapigen"
 inherit eutils gnome2 multilib python-single-r1 vala virtualx
 DESCRIPTION="A text editor for the GNOME desktop"
 HOMEPAGE="https://wiki.gnome.org/Apps/Gedit"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="+introspection +python spell vala"
 REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 # X libs are not needed for OSX (aqua)
 COMMON_DEPEND="
 	>=dev-libs/libxml2-2.5.0:2
 	>=dev-libs/glib-2.44:2[dbus]
 	>=x11-libs/gtk+-3.22.0:3[introspection?]
 	>=x11-libs/gtksourceview-3.22.0:3.0[introspection?]
 	>=dev-libs/libpeas-1.14.1[gtk]
 	gnome-base/gsettings-desktop-schemas
 	gnome-base/gvfs
 	x11-libs/libX11
 	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
 	python? (
 		${PYTHON_DEPS}
 		dev-python/pycairo[${PYTHON_USEDEP}]
 		>=dev-python/pygobject-3:3[cairo,${PYTHON_USEDEP}]
 		dev-libs/libpeas[python,${PYTHON_USEDEP}] )
 	spell? ( >=app-text/gspell-0.2.5:0= )
 "
 RDEPEND="${COMMON_DEPEND}
 	x11-themes/adwaita-icon-theme
 "
 DEPEND="${COMMON_DEPEND}
 	${vala_depend}
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1
 	>=dev-util/intltool-0.50.1
 	dev-util/itstool
 	>=sys-devel/gettext-0.18
 	virtual/pkgconfig
 "
 # yelp-tools, gnome-common needed to eautoreconf
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 src_prepare() {
 	vala_src_prepare
 	gnome2_src_prepare
 }
 src_configure() {
 	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
 	gnome2_src_configure \
 		--disable-deprecations \
 		--disable-updater \
 		--enable-gvfs-metadata \
 		$(use_enable introspection) \
 		$(use_enable spell) \
 		$(use_enable python) \
 		$(use_enable vala)
 }
 src_test() {
 	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
 	GSETTINGS_SCHEMA_DIR="${S}/data" virtx emake check
 }
 src_install() {
 	local args=()
 	# manually set pyoverridesdir due to bug #524018 and AM_PATH_PYTHON limitations
 	use python && args+=( pyoverridesdir="$(python_get_sitedir)/gi/overrides" )
 	gnome2_src_install "${args[@]}"
 }
--- a/app-editors/gnome-latex/Manifest
+++ b/app-editors/gnome-latex/Manifest
@ -1,3 +1 @@
 DIST gnome-latex-3.28.1.tar.xz 1082708 BLAKE2B 3b0a341278838b37fb1a54f4f746af4fc6ccf4dd37f6b919f53523acfdcbeb6a8974217260db4d8186b8acd3ba782cbc1ddf1dce20735d70d01c88ed3c1fb90f SHA512 fe5c2456839757237d422d0f0629f11a43a8ca5b3cd86ce94b37ee26f68165f111940d5c3c47adba7be05532c413a97a867219c498abec3fd064122516e0c470
 DIST latexila-3.22.1.tar.xz 1111820 BLAKE2B 8a3e375ba048112565f6b074ec62a243fb34890f6e903a2ba2d36f7bb5ede6b0fcb8b488a725752c2edd06b0c71916f13915ebdc26fcf8b6a889523b99141b10 SHA512 7c2d3b95b9547e97c79f5e6384b1f33ccb81e70cea1d26fcc07845f3f391ac54b5931ddcec742f3439ba55e8f9f2a2054935795ab16bee584eb05780a72ba3a9
 DIST latexila-3.24.3.tar.xz 1112940 BLAKE2B 2410276574f02735dde9ce77a9bba257e3732784664b302870957fc3f8603bedddaebed4da3f6da1e1f6fc30e3dc233146b65dbf7589a8776c653018a4129355 SHA512 c7c8996704e68ed136d3d2a04c839faf5497a78ad459411daaabfba38ac883f253325f07a8c126cc4b2f1d553fe08b39f1d6a51d1b6944540dc13142173e4361
--- a/app-editors/gnome-latex/gnome-latex-3.22.1.ebuild
+++ b/app-editors/gnome-latex/gnome-latex-3.22.1.ebuild
@ -1,54 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
 VALA_USE_DEPEND="vapigen"
 GNOME_ORG_MODULE="latexila"
 inherit gnome2 vala
 DESCRIPTION="Integrated LaTeX environment for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+introspection +latexmk rubber"
 COMMON_DEPEND="
 	$(vala_depend)
 	app-text/enchant
 	>=app-text/gspell-1.0:0=
 	>=dev-libs/glib-2.40:2[dbus]
 	>=dev-libs/libgee-0.10:0.8=
 	gnome-base/gsettings-desktop-schemas
 	>=x11-libs/gtk+-3.20:3
 	>=x11-libs/gtksourceview-3.18:3.0=
 	x11-libs/gdk-pixbuf:2
 	x11-libs/pango
 	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
 "
 RDEPEND="${COMMON_DEPEND}
 	virtual/latex-base
 	x11-themes/hicolor-icon-theme
 	latexmk? ( dev-tex/latexmk )
 	rubber? ( dev-tex/rubber )
 "
 DEPEND="${COMMON_DEPEND}
 	app-text/yelp-tools
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.50.1
 	virtual/pkgconfig
 "
 src_prepare() {
 	gnome2_src_prepare
 	vala_src_prepare
 }
 src_configure() {
 	gnome2_src_configure \
 		$(use_enable introspection)
 }
--- a/app-editors/gnome-latex/gnome-latex-3.24.3.ebuild
+++ b/app-editors/gnome-latex/gnome-latex-3.24.3.ebuild
@ -1,56 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI="6"
 VALA_MIN_API_VERSION="0.34"
 VALA_USE_DEPEND="vapigen"
 GNOME_ORG_MODULE="latexila"
 inherit gnome2 vala
 DESCRIPTION="Integrated LaTeX environment for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/GNOME-LaTeX"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+introspection +latexmk rubber"
 COMMON_DEPEND="
 	$(vala_depend)
 	app-text/enchant
 	>=app-text/gspell-1.0:0=
 	>=dev-libs/glib-2.50:2[dbus]
 	>=dev-libs/libgee-0.10:0.8=
 	gnome-base/gsettings-desktop-schemas
 	>=x11-libs/gtef-2.0
 	>=x11-libs/gtk+-3.20:3
 	>=x11-libs/gtksourceview-3.24:3.0=
 	x11-libs/gdk-pixbuf:2
 	x11-libs/pango
 	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
 "
 RDEPEND="${COMMON_DEPEND}
 	virtual/latex-base
 	x11-themes/hicolor-icon-theme
 	latexmk? ( dev-tex/latexmk )
 	rubber? ( dev-tex/rubber )
 "
 DEPEND="${COMMON_DEPEND}
 	app-text/yelp-tools
 	dev-util/gdbus-codegen
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
 	>=dev-util/intltool-0.50.1
 	virtual/pkgconfig
 "
 src_prepare() {
 	gnome2_src_prepare
 	vala_src_prepare
 }
 src_configure() {
 	gnome2_src_configure \
 		$(use_enable introspection)
 }
--- a/app-editors/le/le-1.16.5.ebuild
+++ b/app-editors/le/le-1.16.5.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -11,7 +11,7 @@ DOCS="AUTHORS ChangeLog FEATURES HISTORY INSTALL NEWS README THANKS TODO"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 RDEPEND="sys-libs/ncurses:0="
 DEPEND="${RDEPEND}"
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/ess/ess-17.11.ebuild
+++ b/app-emacs/ess/ess-17.11.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${P}.tgz"
 LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 RESTRICT="test"
 DEPEND="app-text/texi2html
--- a/app-emacs/multi-term/Manifest
+++ b/app-emacs/multi-term/Manifest
@ -1,2 +1 @@
 DIST multi-term-1.3.el.xz 7968 BLAKE2B 6cb9a8bec0f2e1ef18229ecbec78a856808f6b3cab3eecc4ba2c78f91adcd687fcca870307c808cc1d0e6c2de71d42effdd0cdf38fc1b97b19511da7aad2be84 SHA512 fcb31da193f84fde653583b999e344fb7ec7404948fbf64b15f9a86eb69e9cc9514ad4380ce5b9c3813a74226d8addf8c87bb539f9ee927d4a0c0a7c2ea7c361
 DIST multi-term-1.4.el.xz 7996 BLAKE2B fd9247d55b272c5238ae2344ecb7f516d0b3877f934ad35410ffaaa85d5d208a906cef2f2843240c672f916ce68dc210aa07c2330e9e485505c89d98c88a7d25 SHA512 113118fd352516cb1abf49536369361790786d570d347aab3faa1c672058d883e9ae8bba00a73f6ffc7487fc4166525e0c4af395888f09181dcc69d8aaba5f03
--- a/app-emacs/multi-term/multi-term-1.3.ebuild
+++ b/app-emacs/multi-term/multi-term-1.3.ebuild
@ -1,17 +0,0 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 inherit elisp
 DESCRIPTION="Manage multiple terminal buffers in Emacs"
 HOMEPAGE="https://www.emacswiki.org/emacs/MultiTerm"
 # Taken from http://www.emacswiki.org/emacs/download/${PN}.el
 SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.el.xz"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 SITEFILE="50${PN}-gentoo.el"
--- a/app-emacs/multi-term/multi-term-1.4.ebuild
+++ b/app-emacs/multi-term/multi-term-1.4.ebuild
@ -12,6 +12,6 @@ SRC_URI="https://dev.gentoo.org/~mjo/distfiles/${P}.el.xz"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 SITEFILE="50${PN}-gentoo.el"
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@ -1,2 +1,3 @@
 DIST diskimage-builder-2.21.0.tar.gz 409367 BLAKE2B 25c8a819be8674eee38a97e822151527dd77d3f5e85016ebc1a7fa5bf907f64bdac47012eb748b69273b519580c6ea4ca845abd7800ddb4e3f60dd81da546a73 SHA512 51a871a772fd4ae35d0a8ea51f7c01502c374805f5de5ab37c2f18ea868a829c7085ecaa6a62690e8d6e85afe225cbab7ed86266eb5fc3e8741a8ff968cb35f9
 DIST diskimage-builder-2.22.0.tar.gz 410939 BLAKE2B ff5b3ce0f128001091e4621170def71cb6ef46cc278aee5a877caba0a3df054ac5e7027640a70ffdd8b8329764774ef801b0c0ad427babaec09a7123552edb50 SHA512 e051b668a86a4b386c2ec079a8f28bb5ab54ee6dbd1f39d7889075efa6abd4dff7063be24b817e05057f85036202f6193438df1a112009a1b954eaa4bb1b6e44
 DIST diskimage-builder-2.23.0.tar.gz 403817 BLAKE2B 14b67dc456bd9dab13a534f0f6df27b8a74514966ad965b401d33274d37ee2f201fa1dcd64b2c04a7503ab1f6a893dc40b5145c9559a7be74a029e2da226758a SHA512 89b2ee7eda56c610b9c343edd51276d54eb129ce319cf7f0fdebbccd1bba52903d16a71f1558bb76d2011d5267ffbc62bde94f5d7fd5aabdab2bc82abf10c685
--- a/app-emulation/diskimage-builder/diskimage-builder-2.23.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-2.23.0.ebuild
@ -0,0 +1,42 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 DESCRIPTION="Golden Disk Image builder."
 HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
 DEPEND="${CDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
 	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
 	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
 	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
 	<dev-python/networkx-2.3[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
 	>=dev-python/flake8-2.5.4[${PYTHON_USEDEP}]
 	<dev-python/flake8-2.6.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
 	app-emulation/qemu
 	sys-block/parted
 	sys-fs/multipath-tools
 	sys-fs/dosfstools
 	sys-apps/gptfdisk
 	!dev-python/dib-utils[${PYTHON_USEDEP}]"
--- a/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
+++ b/app-emulation/playonlinux/playonlinux-4.2.12.ebuild
@ -30,7 +30,7 @@ RDEPEND="${PYTHON_DEPS}
 	x11-apps/mesa-progs
 	x11-terms/xterm
 	media-gfx/icoutils
-	|| ( net-analyzer/netcat net-analyzer/netcat6 )
+	net-analyzer/netcat
 	virtual/imagemagick-tools
 	winbind? ( net-fs/samba[winbind] )
 "
--- a/app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild
+++ b/app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=5
@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	app-emulation/qemu
-	|| ( net-misc/socat net-analyzer/netcat6 )"
+	net-misc/socat"
 S="${PORTAGE_BUILDDIR}/work/${PN}"
--- a/app-emulation/qemu/files/qemu-3.1.0-md-clear-md-no.patch
+++ b/app-emulation/qemu/files/qemu-3.1.0-md-clear-md-no.patch
@ -33,6 +33,29 @@ index d6bb57d2..331a364a 100644
             NULL, NULL, NULL, NULL,
             NULL, NULL, NULL, NULL,
             NULL, NULL, NULL, NULL,
-- 
+diff --git a/target/i386/cpu.h b/target/i386/cpu.h
-2.21.0
+index 83fb5225..d0bab4d7 100644
-
+--- a/target/i386/cpu.h
 +++ b/target/i386/cpu.h
@@ -694,6 +694,7 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS];
 #define CPUID_7_0_EDX_AVX512_4VNNIW (1U << 2) /* AVX512 Neural Network Instructions */
 #define CPUID_7_0_EDX_AVX512_4FMAPS (1U << 3) /* AVX512 Multiply Accumulation Single Precision */
 +#define CPUID_7_0_EDX_MD_CLEAR      (1U << 10) /* Microarchitectural Data Clear */
 #define CPUID_7_0_EDX_SPEC_CTRL     (1U << 26) /* Speculation Control */
 #define CPUID_7_0_EDX_ARCH_CAPABILITIES (1U << 29)  /*Arch Capabilities*/
 #define CPUID_7_0_EDX_SPEC_CTRL_SSBD  (1U << 31) /* Speculative Store Bypass Disable */
 diff --git a/target/i386/hvf/x86_cpuid.c b/target/i386/hvf/x86_cpuid.c
 index 4d957fe8..b453552f 100644
 --- a/target/i386/hvf/x86_cpuid.c
 +++ b/target/i386/hvf/x86_cpuid.c
@@ -90,7 +90,8 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,
             }
             ecx &= CPUID_7_0_ECX_AVX512BMI | CPUID_7_0_ECX_AVX512_VPOPCNTDQ;
 -            edx &= CPUID_7_0_EDX_AVX512_4VNNIW | CPUID_7_0_EDX_AVX512_4FMAPS;
 +            edx &= CPUID_7_0_EDX_AVX512_4VNNIW | CPUID_7_0_EDX_AVX512_4FMAPS | \
 +                   CPUID_7_0_EDX_MD_CLEAR;
         } else {
             ebx = 0;
             ecx = 0;
--- a/app-emulation/qemu/qemu-4.0.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-4.0.0-r2.ebuild
--- a/app-emulation/virtualbox-additions/Manifest
+++ b/app-emulation/virtualbox-additions/Manifest
@ -1,5 +1,5 @@
 DIST VBoxGuestAdditions_5.2.22.iso 58013696 BLAKE2B 196f0048b685200328bcf753f3df23eac6477ce863885e93a54951795368bf62bdaa497589001ec203d75809b1f74ebbaa80419406d26bc7db43a131f5b9d698 SHA512 b320174b2f2ef796ac2c9c920579be38f0cedaa037d21992863ac355ecf6e99ae2aea56c70fb2034e9e03afac2cd7297f7717b447a6981701755593110164d37
 DIST VBoxGuestAdditions_5.2.26.iso 58433536 BLAKE2B 1d7bae647923a57cdcee38a1609a07cd081d593a0852dcf67b549ed178508e93f7ee4d076ac700ab7e7ec828e660eb09cc8a55a0f2400b1ff0912cc2fafdff7f SHA512 fea91c442d3f05a35435155d3a3890e2c29e2523f1106cc8c7fb6513826263ff450e72b393796e0dff99b3bd85d85d8d55309e81f68ddfd39689df8f54bca1fe
 DIST VBoxGuestAdditions_5.2.28.iso 58568704 BLAKE2B cc7f0f0c18823f8c7dcae945d0e73b4b8c7d151a07be23bd8d21c44aa555f7964949857af817a9bc4e04d773a18cdc369dcbd8aadffe846ff7200477118aada8 SHA512 ccfdb2705a6c7daa79108fdb3bc6e6070e8de3f45eea308f821a0194e77c092b029119739239a2ccf9c5cb89045e919ba57950994668bc879443a55b53407c9c
-DIST VBoxGuestAdditions_6.0.4.iso 85917696 BLAKE2B 2fa419ef8524b46afb327bd1f5e53bec6df7fa53d6608bb25e5d986d8be9eaf2e0e7a37523beb56981380e8f4ad41ae48eb5ec23505a382c57fda737ec999caf SHA512 ad9afd9941cac771a156071df3a054225643e39059c84abc0c0c2525d0fa32d5bc5a144b1fef367f92e0216f8f9fc73ef961eeead648421ea30465650516bc88
+DIST VBoxGuestAdditions_5.2.30.iso 58578944 BLAKE2B 6a2565fa8e3b19363da82592ba4d93ddfb6d22e107e28e901aa4c0bce84aaa0bd63d781155e44462b90d9f491e4df589cfd346dd33fe8f016862e85d99c2092c SHA512 568312b26647f7932d94a42279f35b9a827145ef2bd0ea4ef00a865c355b1de55dee66e731a90d644ddd35cb301f61315edf684c9a321681882c1537c8159caa
 DIST VBoxGuestAdditions_6.0.6.iso 86321152 BLAKE2B d186d6c14500376b1721e084d9a4859bcbe3c64bfc22835a8e4b4425eee4a3a21c8dc4d48bfb072a793a8f2fb0d7f6ef83f53b1ebedbfb38c2e3fffbe3611d55 SHA512 ced893f8384b0ad74cce77f6d6f74fd748acf3acd18843a08c1b433b40ee73ce4c10d16ab8893aabba7fb3aac57e6faea599ed5733d4e91895bb78e7cf34c7ac
 DIST VBoxGuestAdditions_6.0.8.iso 86562816 BLAKE2B dddac0dff687982040543bff065719a6b900666886892247d6ca2e6968d601dfd7c01b0b4c79db28ca81f25ed15906ec65c3e77ac4128eeaaf9a8d6d16632336 SHA512 95396a04e436cf2b30f6897f4ee561acaaf3fd3b677bc2f2d58dc92649245f7b105bbf0ec1b8f5612f5465e2c46d8b55786863508192d0a68aa381ddc44a315c
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.2.30.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.2.30.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
@ -14,7 +14,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.iso"
 LICENSE="GPL-2+ LGPL-2.1+ MIT SGI-B-2.0 CDDL"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror"
--- a/app-emulation/virtualbox-additions/virtualbox-additions-6.0.8.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-6.0.8.ebuild
--- a/app-emulation/virtualbox-bin/Manifest
+++ b/app-emulation/virtualbox-bin/Manifest
@ -1,18 +1,18 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.22-126460.tar.gz 19640932 BLAKE2B 162ab40da6b2cd30d00e020666a1f4fb026e29af2ca9d6c36c294e5fa299b61ab8fd147f24d2b500426c768808db2c7693c30e88519e695d7759f8eedf1c52c5 SHA512 85b8552668b6580bea24f051ad861c82b9ba32177fb7fa37fe2980d8bab32a84325d02bfa9c8f55c2021a4000ef2546d8996ca8b99ca7fc19f8281a92108dfb0
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.tar.gz 19684009 BLAKE2B 81787dcf3b70211fa9c84a40c668100eda0dfd2ce3e1d35c226cb6913ef74027f3444be93069a5e881d8e60905477460a180cb98919050286978edf9c1edcdf3 SHA512 deb4c62d58e2071f4413f0ff769e9ecd756362920b29482a6a3d77566c327b075cb5ecafdc65985305b8b798dc56ca2104a0f8244651fca89c4e15ef879c121e
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.28-130011.tar.gz 19719444 BLAKE2B 4b70bb91f4309efbc9a3127e85aaab2175dee1bd3535dce17f3e36747c60ea4b2951958020c3b922b3f832e5cc2a40785ec7fdbe9be6af8a93513ac3d8012d20 SHA512 9da57baaa508cd86663e57b9c545532207fd8460bddb9fd92c3a0058da05cd81e782f99f7c6cc3bbbe1811ebff67e9e7455ccf4a7851d2c3025c4d4d98acf10d
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.4-128413.tar.gz 23290549 BLAKE2B f9ac1a560d5e8b9b73efa21e3623c9f6f0d7769eb4cad7b01d8f68a135a74573659a0a9b092f7ab35beb348ed2722fcf7862aa66e47987b33038f488b88b1129 SHA512 ee54cbdf58de8d37ba84fffd2baec2c9d3915feeab715767515fd6d6ec3032dad2f02509b08cea24754cfce0974a7c1b29c6050bff466af53c1ac6589f4c0215
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.30-130521.tar.gz 26914147 BLAKE2B f595f32a76649a803be490a9a6d46702e82cc835274973f0867f957d944724252b59e9844167b0038b9ba2b91854443f6eeaf084278534f4ab4249444fb8755a SHA512 f08fde658c7c1e916ce2c0ccebe9b05e7963168bbf945156c96f75acbd06ef1dca2088371fc3a6f75c84232bee9ebbed3b6bf92dbd0702cb5ff496cdc11227c5
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.6-130049.tar.gz 23309541 BLAKE2B 550dcee0893c820e3113344f5990528ec2ade766f0a3ff1efc0965c555f820224070bec1f4b4b8b835b2150a7279d1bf9b247433a42658f0e179326c7d78eb0c SHA512 e0b0061137f2e5db1cba0aaf287be2f06cc5379e8f9b562a661beae1f2cc8855f0a78e173473bf44906ca84d6a09c0afa82e0f4026cfb5fb64f9fe6267ab3044
-DIST VirtualBox-5.2.22-126460-Linux_amd64.run 88821201 BLAKE2B 1b0433844247ee9531af915dcbb740183fa29fb296f8c78b4165cc3b48300da71f7d329026983da581ffff0d7b8976a2e5e32d5e948861a557ddfa2437813ea0 SHA512 22b20a68884a114818fcdfe9a459a7c3b1b3598526a74cc66407f5bcdc6eb6bcbe022b820477ccdc081e22349777b73fac9d6126585ee3c8fa0d3d24624006f3
+DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.8-130520.tar.gz 23309069 BLAKE2B bbb060e0e13e336ee445234d7a61ded3896a0948a6a24f3d4b1792da4a9003cfb5717b7f608ffd9c74b4bfe2b24ed918fa2e87cf90ec3aaa3a7b31a7ef33dee5 SHA512 f942c08dd905163cadf79897a0ad8e8a280c96a555bfb9b5d2fc50c25872e8fe69c2f30326bd6a074ed73ea2d6f99b02e143870c05c68c663ed32aee62abba1a
 DIST VirtualBox-5.2.22-126460-Linux_x86.run 87817677 BLAKE2B 5f11e5f92386c9524869082cf1a5af413c69fe5b36b1ace58887076000c7b928267eb7c3be22282885d6871ccdcee981ec79a526c71f281f0e8ada5858194851 SHA512 32d44b6d691e33a1ee1426cb7a3cb3648722709c588d177951b8be802546faadfd612567981bbbfed3d782b18260e6e638e7879813f3b06bb5a8387b052b0227
 DIST VirtualBox-5.2.26-128414-Linux_amd64.run 89220562 BLAKE2B d937e3a8f622ed1afc8ab7d2479401c6b41f6b1404197b2d86933d741a209071b1bc98de14ea4f25b2b0f2a22a328393908f85955f8879dbf8b28e2b981e4d04 SHA512 c8d7741408d234e7c05709dd0ed66d30b427b0f39976f232b1fe8a17160d36c4dda7d3adda46a38cbdd6626d34570805f582ac0aae2a975385a1f1d06e97f354
 DIST VirtualBox-5.2.26-128414-Linux_x86.run 88339918 BLAKE2B 0fe177a8d9ab4c4cb894151a00f9554713dee27af1fe3036591a0e7865c8869eef17368ab42270d5a9081c849e6550ebef809c3f8f09a9238e2f5a5f0c9e76e5 SHA512 6a809cf29a2cd70bddeca0443955ea10044553ef85744949b604f92a8bca96b9deb1c37f723388d1f27f903c9469e7cb853a0bf7d6928bb18ba61cb19b216fba
 DIST VirtualBox-5.2.28-130011-Linux_amd64.run 89445843 BLAKE2B c5a91dad470ec1bf9c9bc6ff2e8197bb05e16098e8e9c8168d41c8657d0acf8556d77446d3ffbdeee054874b70c744644a00b3a6eb0bb0b6fb51bfc6bdeec367 SHA512 0f4f5ab8248ee65894609a63138b5001d04e1475f3ecd5f38a85f33be5b12eebdd2ab8a2bfeae6a99ba30c2c304b51e2466560316e634d82f47fa99e895e8b43
 DIST VirtualBox-5.2.28-130011-Linux_x86.run 88544719 BLAKE2B ed76962b9ddcd27136a4ced260cad88825542e690b633bd54a4aa8e877f47560ca93401ec67bb75224cd2a7247d5a477d7d532f78f11d341e69cab03240cbe9d SHA512 7c8292b898f7f701eeeeb7a27112f1350b7a255aaa095a7fb3a3037205d30948033acc368a28eeac70e9bd841f1032b946f802a7c9ab47b88105bbf343a14bb9
-DIST VirtualBox-6.0.4-128413-Linux_amd64.run 154920406 BLAKE2B 518ef3ee6a5b8d066b9238ea3660cce5898b15471805cdcc508471a8a7b1003d5b4d894a8de5be4e70a67abe77dd05ce7d463603081749836d1e6b58aa43aa04 SHA512 a35cbc5d726acde31939d8729695cb041c8e962af3f4894153e5779af4efa1b260f0f021de9c5a3edc651271e7adfa1818d6b9c1e081155f483cb148555e52b5
+DIST VirtualBox-5.2.30-130521-Linux_amd64.run 89855442 BLAKE2B ef1b8e2c83a8cc6404ccdc8cb446dfbe7ea827f88e857947779c916745f5058db33ef075c531914e4974d8abc00b4099fb531e0965a7116971d9a0560eb17a1f SHA512 36b5ee0e1815bebd5a75947004206c43c5f84341b7a967b33d37cf4b35fb6261594788859b636a918edaece4af9d08b1892db7c17e0a30a83bf9e69cd175b123
 DIST VirtualBox-5.2.30-130521-Linux_x86.run 88923599 BLAKE2B e8e5abf4b839c4edd4833c766824255675554cad2050f007d6459f28edc3f70bfd6346bbc893070630efdaf106a2e236974fe7fe09dc918e69dc1c9858edc369 SHA512 d6cddcab262422ee08ebbb796a4c2615dabad3ffde4fa5774a58a087cb14b2b813736053639dd132129a412fd68200d7666bdc110ce44d3ada864b9e7ebadaf5
 DIST VirtualBox-6.0.6-130049-Linux_amd64.run 132914648 BLAKE2B 720d98a3d271a545e1ff3357731c44d592c2f1e3a5c685f68b1daeecd9880c784f19de905c5ca73fa6a7be77ecc550e97f672b08198f90ead13c059edb4c59d1 SHA512 ee1156e940b1c1c2e4c82d77148f56495845731d73ef68f4a5da9c19f008c978c6ef3e7693b70e7d16ebf44202deeba30928674a26ad3090dad7f5ae2a242a88
-DIST VirtualBoxSDK-5.2.22-126460.zip 10154660 BLAKE2B e0a0106f695ca7198d4b2ac5c62bb435fe7934858115dcb3aed57b40d82655bd54cbbae63b279132c23762a227c53affe68131a0bf9452c69dcaf2162b1e4ebf SHA512 1d34b8f7f32602b5656fdb6184e6c35cc54d6ecb36bc41d7df3e154f18c27ea5938635969feb69defe86a53897eee87792514967f15810224ee89e8e523d2b29
+DIST VirtualBox-6.0.8-130520-Linux_amd64.run 133672408 BLAKE2B 62c8d51502c4b3a15ba2a79356227c9e932c87480b31f3f70a5c89881f757a2725f4c1800ac312866f0e1e2e2970f6288d4970b52428ce94e390dfc68872ea7c SHA512 ea9061f420c2fce424c98903c8f7845cbb60eab83722de2f7ccd5723df81365b8e8b6fe80d183b4b38a30c13432fa4c567ea05e799ee176111130c3060bc25b7
 DIST VirtualBoxSDK-5.2.26-128414.zip 10159276 BLAKE2B 32a9e0a70cc63c8e0daa7080f8e10ac8a514837be98a66b00161cd0c9bf2cc42ef0a11f3a69a742a2f6745b4c8b8fe9e946e18f81cd5ef3ab2f68d5e3c95c568 SHA512 f3d1cc622734ecb0f56fcdf5728fcc747e3b084cb2358d420c55c1acd98d2f24870f0fd18cea430f118f34bca10199526ba195a314d6ce7fb6c4bc8281d89f09
 DIST VirtualBoxSDK-5.2.28-130011.zip 10157910 BLAKE2B 793918a663027a1396706b3aa0573679526b9c02aaaaadfe7cf4448744fc3ee6ea0484cdd01b07cb03169583b91fb1567d9c2f30046fc4bcb113d709aed30242 SHA512 90b25a1dddc50efe29cc1bd70819ca945be5f474c89e9fea90b0aa2f3ace448ec961ee749b6e3f41f763c05edd824d4a5e3c1c227db8e9a59267f91b87c24770
-DIST VirtualBoxSDK-6.0.4-128413.zip 10755635 BLAKE2B 60333b130adbacc85a84c65ee638effcb6d1a226957c48907df342853b0a9ba4d5632d93858e539fafe2ec28befaa7de584538b46ee83a05789b065a05c3107c SHA512 de2c3e979fe35cda8b433c27f4ce52d5c86e7c0bdfb061a758fce642d4aab908c7c6808c3110ec81d4967977768de95ee8be5cd330d634d3dc9711dd77f17867
+DIST VirtualBoxSDK-5.2.30-130521.zip 10153996 BLAKE2B d0c24220f3d9d10528e10dd65a884d7431bb54b3fe186500685f7ee228b74aae2ed81650e695f7a47d7b8769fc94d7c8d8dfda443fe3ee0f11fc4773f1b34a2c SHA512 6305c7884ede60090726d9f9e6628a20030537d121892d2005e13abce5233df85fcfc465faee199fd38901431e1d9f86c9985698ddd6b0594f80842f34b8b8b3
 DIST VirtualBoxSDK-6.0.6-130049.zip 10759233 BLAKE2B f5fbcdeacfa3d4843b62728ecd2406785355eecd396292502ae2ebdadcdb38c24d0565a1304e935a1b3cc390880c443f9e8e490ab18adcc13f4b461c9750441a SHA512 45c5450249ab5ac43eb5dbc4d6e2b61cd4cd5a22005f38fd019d909f9d4b98147b959ff836ea05cceb7d730196a14763472ac6fe4113d1de7c11fad76300ac82
 DIST VirtualBoxSDK-6.0.8-130520.zip 10758177 BLAKE2B 6d4f8fc33cb57ff5055775cc0e9f676eede2cc07d62c73ee66813e9aae71ce6a73c2c81699234d5b5eab8244d9f15374a0485cfed1bedec429088e2d82bfd91a SHA512 2a94359904869b228337eb754bf545d32981bdc16ecc33544f30a6ce67d3ee1cec2d0c5bd02ed510ecfc7779871a53dc391a39a37a29fd725a403fd68789a081
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.2.30.130521.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.2.30.130521.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
@ -34,7 +34,7 @@ SRC_URI="amd64? ( https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}_am
 LICENSE="GPL-2 PUEL"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+additions +chm headless python vboxwebsrv rdesktop-vrdp"
 RESTRICT="mirror"
--- a/app-emulation/virtualbox-bin/virtualbox-bin-6.0.8.130520.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-6.0.8.130520.ebuild
@ -258,9 +258,9 @@ src_install() {
 }
 pkg_postinst() {
 	xdg_icon_cache_update
 	xdg_desktop_database_update
-
+	xdg_mimeinfo_database_update
 	gnome2_icon_cache_update
 	udevadm control --reload-rules && udevadm trigger --subsystem-match=usb
@ -285,5 +285,7 @@ pkg_postinst() {
 }
 pkg_postrm() {
 	xdg_icon_cache_update
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
 }
--- a/app-emulation/virtualbox-extpack-oracle/Manifest
+++ b/app-emulation/virtualbox-extpack-oracle/Manifest
@ -1,5 +1,5 @@
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.22-126460.tar.gz 19640932 BLAKE2B 162ab40da6b2cd30d00e020666a1f4fb026e29af2ca9d6c36c294e5fa299b61ab8fd147f24d2b500426c768808db2c7693c30e88519e695d7759f8eedf1c52c5 SHA512 85b8552668b6580bea24f051ad861c82b9ba32177fb7fa37fe2980d8bab32a84325d02bfa9c8f55c2021a4000ef2546d8996ca8b99ca7fc19f8281a92108dfb0
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.26-128414.tar.gz 19684009 BLAKE2B 81787dcf3b70211fa9c84a40c668100eda0dfd2ce3e1d35c226cb6913ef74027f3444be93069a5e881d8e60905477460a180cb98919050286978edf9c1edcdf3 SHA512 deb4c62d58e2071f4413f0ff769e9ecd756362920b29482a6a3d77566c327b075cb5ecafdc65985305b8b798dc56ca2104a0f8244651fca89c4e15ef879c121e
 DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.28-130011.tar.gz 19719444 BLAKE2B 4b70bb91f4309efbc9a3127e85aaab2175dee1bd3535dce17f3e36747c60ea4b2951958020c3b922b3f832e5cc2a40785ec7fdbe9be6af8a93513ac3d8012d20 SHA512 9da57baaa508cd86663e57b9c545532207fd8460bddb9fd92c3a0058da05cd81e782f99f7c6cc3bbbe1811ebff67e9e7455ccf4a7851d2c3025c4d4d98acf10d
-DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.4-128413.tar.gz 23290549 BLAKE2B f9ac1a560d5e8b9b73efa21e3623c9f6f0d7769eb4cad7b01d8f68a135a74573659a0a9b092f7ab35beb348ed2722fcf7862aa66e47987b33038f488b88b1129 SHA512 ee54cbdf58de8d37ba84fffd2baec2c9d3915feeab715767515fd6d6ec3032dad2f02509b08cea24754cfce0974a7c1b29c6050bff466af53c1ac6589f4c0215
+DIST Oracle_VM_VirtualBox_Extension_Pack-5.2.30-130521.tar.gz 26914147 BLAKE2B f595f32a76649a803be490a9a6d46702e82cc835274973f0867f957d944724252b59e9844167b0038b9ba2b91854443f6eeaf084278534f4ab4249444fb8755a SHA512 f08fde658c7c1e916ce2c0ccebe9b05e7963168bbf945156c96f75acbd06ef1dca2088371fc3a6f75c84232bee9ebbed3b6bf92dbd0702cb5ff496cdc11227c5
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.6-130049.tar.gz 23309541 BLAKE2B 550dcee0893c820e3113344f5990528ec2ade766f0a3ff1efc0965c555f820224070bec1f4b4b8b835b2150a7279d1bf9b247433a42658f0e179326c7d78eb0c SHA512 e0b0061137f2e5db1cba0aaf287be2f06cc5379e8f9b562a661beae1f2cc8855f0a78e173473bf44906ca84d6a09c0afa82e0f4026cfb5fb64f9fe6267ab3044
 DIST Oracle_VM_VirtualBox_Extension_Pack-6.0.8-130520.tar.gz 23309069 BLAKE2B bbb060e0e13e336ee445234d7a61ded3896a0948a6a24f3d4b1792da4a9003cfb5717b7f608ffd9c74b4bfe2b24ed918fa2e87cf90ec3aaa3a7b31a7ef33dee5 SHA512 f942c08dd905163cadf79897a0ad8e8a280c96a555bfb9b5d2fc50c25872e8fe69c2f30326bd6a074ed73ea2d6f99b02e143870c05c68c663ed32aee62abba1a
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.30.130521.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.2.30.130521.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
@ -25,7 +25,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.vbox-extpac
 LICENSE="PUEL"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 RESTRICT="mirror strip"
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.8.130520.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-6.0.8.130520.ebuild
--- a/app-emulation/virtualbox-guest-additions/Manifest
+++ b/app-emulation/virtualbox-guest-additions/Manifest
@ -1,7 +1,7 @@
 DIST VirtualBox-5.2.22.tar.bz2 118757134 BLAKE2B be795cdbfb09d3d443f63e190b63898239622f5a57aefdd90f382d9a849d09cc1abc2624071fbc60b2c04a12f33376184540cc362c19225733f99a3bcc8ff6a3 SHA512 4f6c4611a3114778f45419587dc1519ca07410c1ea6474cdb18ecd3b068639a4fdac3f25146fe9b8e006e30f19eba134ce9f665182008b033f6f78497e1ea722
 DIST VirtualBox-5.2.26.tar.bz2 118371765 BLAKE2B 32413b72e33f2f63835a2eb2d47dc75a7b63121934bdffd51ff58e9d63d68b77b4f8dac4605916ba8bd6896240d00024ccc3d7d002d4f6f92d6d9b1dc35995e3 SHA512 aee334c74bd02772ac5e0528d84d31661f61c775d0993c00febe125810efc78a2f779db41bf66283be51b19a35540fee14445bada59a8d3b7affa6ef6645005f
 DIST VirtualBox-5.2.28.tar.bz2 118655475 BLAKE2B 4e4e75b78de3cb3b6dc2fe2c2f306487cb924bf9ca2d1b0ffc6fc349774d3fa38886d386277a32067daaabfad6e8cd58ea058a78a70d16761d76f6ebed035d16 SHA512 085cfcab82851f98c757ea109ba420335d891a99df52a811e19815b3e55a92894cfb7b6fd4a5aaf15def71811f14e21527625adf885a394144cb5f971eb57782
-DIST VirtualBox-6.0.4.tar.bz2 155233564 BLAKE2B 6bc4d450e275e8aac5dc62ab05d9ba1450e13965f3eba64819315d121bd0e515319be2ad92ab429f2e598e157e89660561de69a2aac87e14792284669bcec7e8 SHA512 c2e5418bafd5d50b46e1bc70280753c2fdfbf7248d782fc398771839950fb575eaea437e9699d56f4d8c92ea4dc9ba8bed74379565dac6114f7e9c45aecc9fdb
+DIST VirtualBox-5.2.30.tar.bz2 118462289 BLAKE2B 87126b5af657815d0fcc8aadf49a23ce613ea0998b70f988f78e9d381138c414c7c73a0bf91955481cf484f5b71081ff1bab8dabe1b41fffde877e1003477625 SHA512 6230846ceda47b8ffe942aa8427f04f193095103371b7210d30e49cd9e384b9828d6917f75ef125e63e2c1810e8aa3b7c17b72f3ede7697c55d6de9da9d3f668
 DIST VirtualBox-6.0.6.tar.bz2 155297550 BLAKE2B a886ed99da3aee7a52d8c0654c33e50ae4155077e3d5061e1888a0cb5760b12dd63fb1205b75ec04419d50261f81e56036bdba79d20b57c836f073af232c913a SHA512 eb71ca94220680ac6cba7af13eb9eef132c21e57b1b27d6bc3c564bba58b000e682d19e36b63660bfa4f4471cd0632d365659ef8c4e3e526931622901a432d1b
 DIST VirtualBox-6.0.8.tar.bz2 155404889 BLAKE2B 3eb6ebf713c32e301db1673b22c367a89ce1ffb25d12baab6c7335389ce17e08efd744139acc4114231c4d4b69c6370b6e5d5b18ce97fe5494ca7a192fa43f7d SHA512 df18d5df2c82761b8a77e509b2873cdeaa46d11bc50ca166af1e6c30d3042b0cf5640957b1d411333f5bd5be3f03f382550f1afaecf0651d847bc88c95863d83
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.30.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.2.30.ebuild
@ -15,7 +15,7 @@ SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="X"
 RDEPEND="
@ -93,6 +93,7 @@ src_prepare() {
 	# Remove pointless GCC version check
 	sed -e '/^check_gcc$/d' -i configure || die
 	rm "${WORKDIR}/patches/008_virtualbox-4.3.14-missing_define.patch" || die
 	eapply "${WORKDIR}/patches"
 	eapply_user
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.8.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-6.0.8.ebuild
@ -48,49 +48,38 @@ BUILD_TARGETS="all"
 BUILD_TARGET_ARCH="${ARCH}"
 S="${WORKDIR}/${MY_P}"
 VBOX_MOD_SRC_DIR="${S}/out/linux.${ARCH}/release/bin/additions/src"
 pkg_setup() {
 	export DISTCC_DISABLE=1 #674256
-	MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest)
+	MODULE_NAMES="vboxguest(misc:${VBOX_MOD_SRC_DIR}/vboxguest:${VBOX_MOD_SRC_DIR}/vboxguest)
-		vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)"
+		vboxsf(misc:${VBOX_MOD_SRC_DIR}/vboxsf:${VBOX_MOD_SRC_DIR}/vboxsf)"
-	use X && MODULE_NAMES+=" vboxvideo(misc:${WORKDIR}/vboxvideo::${WORKDIR}/vboxvideo)"
+	use X && MODULE_NAMES+=" vboxvideo(misc:${VBOX_MOD_SRC_DIR}/vboxvideo::${VBOX_MOD_SRC_DIR}/vboxvideo)"
 	linux-mod_pkg_setup
 	BUILD_PARAMS="KERN_DIR=/lib/modules/${KV_FULL}/build KERNOUT=${KV_OUT_DIR}"
 }
-src_unpack() {
+src_prepare() {
 	unpack ${A}
 	# Create and unpack a tarball with the sources of the Linux guest
 	# kernel modules, to include all the needed files
 	"${S}"/src/VBox/Additions/linux/export_modules.sh "${WORKDIR}/vbox-kmod.tar.gz"
 	unpack ./vbox-kmod.tar.gz
 	# Remove shipped binaries (kBuild,yasm), see bug #232775
-	cd "${S}"
+	rm -r kBuild/bin tools || die
-	rm -rf kBuild/bin tools
+
-}
+	# Provide kernel sources
 	pushd src/VBox/Additions &>/dev/null || die
 	ebegin "Extracting guest kernel module sources"
 	kmk GuestDrivers-src vboxguest-src vboxsf-src vboxvideo-src &>/dev/null || die
 	eend
 	popd &>/dev/null || die
 src_prepare() {
 	# PaX fixes (see bug #298988)
-	pushd "${WORKDIR}" &>/dev/null || die
+	pushd "${VBOX_MOD_SRC_DIR}" &>/dev/null || die
-	eapply "${FILESDIR}"/vboxguest-4.1.0-log-use-c99.patch
+	eapply "${FILESDIR}"/vboxguest-6.0.6-log-use-c99.patch
 	popd &>/dev/null || die
 	# Disable things unused or splitted into separate ebuilds
 	cp "${FILESDIR}/${PN}-5-localconfig" LocalConfig.kmk || die
 	use X || echo "VBOX_WITH_X11_ADDITIONS :=" >> LocalConfig.kmk
 	# stupid new header references...
 	local vboxheader mdir
 	for vboxheader in {product,revision,version}-generated.h ; do
 		for mdir in vbox{guest,sf} ; do
 			ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \
 				"${WORKDIR}/${mdir}/${vboxheader}"
 		done
 	done
 	# Remove pointless GCC version check
 	sed -e '/^check_gcc$/d' -i configure || die
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@ -1,5 +1,5 @@
 DIST vbox-kernel-module-src-5.2.22.tar.xz 638492 BLAKE2B 71aba29b056bb3dfeffbf4632fbf7f15d89b988267ba24c766b78b1d9c50a4d27fb1b8e699108b973af68024f9f77ca0a8ad787355d7342fe1400f14189487ff SHA512 3361bb536af8e8d490377be04d1b1b9af478538e23ec409d3e0205ad930c16e5228c57ae7d92d214ac533ae64298d9eaff3c9284ff9bb308108d1ad7d69fb507
 DIST vbox-kernel-module-src-5.2.26.tar.xz 642096 BLAKE2B fa908b8dda4c49e880005f22d4ec159ba4e84b20d3cf8f514ec5ad0ea556499b0df25fb714bb5f9a3474e6fc1cba67f6d56fddaee748b9561bbe31a003dd0657 SHA512 7f37be1b35772d59cd3df9b61dec436450de3c038faf2cd22fb891fee7270aa7f87f146f72497ffeb63dfe869cccd3f2788562d23fc51afd83ca19159f2a6810
 DIST vbox-kernel-module-src-5.2.28.tar.xz 642000 BLAKE2B 65ffe2345e978e0afba079e9291d55dc0419853718831d4c47e8e3e4f9fa194957342683aec0f362aa3f3924dca90d73ac30d947dec69ff54106d8e229510889 SHA512 bef0601b295d1a5cc0387262a6c75ec33777edaeaa543218bc7ddea5ced3995511978abfb624d2547fc6339c41e638054fb173ee7e0aeb46c7356a24834b3d83
-DIST vbox-kernel-module-src-6.0.4.tar.xz 666200 BLAKE2B b7a6911a8534ae9e7db5a90fecfaf58394bf61ff1ee925302fdea46443e603535d1508b638c7c3f2440c0fe1176ca85d2f063f99632eb1a9093a9367f2e49fdc SHA512 565d635683f8a5f32c18b1bbf41b38bcab549a019cf0977c8dfbb53310494fb261e485ac11eb48e546c3c4b6ed13b3fb1628013dbc101f042ee9a61b8168122a
+DIST vbox-kernel-module-src-5.2.30.tar.xz 642476 BLAKE2B 497a381b10f813ee333f0ac0a0b9f7893b0cc3c842757e85f119bc28dec4ed978bab827df116c8f99bafb412b8bf5a97592a964cf61f7e813284b2e74e7e8a6d SHA512 80511d96c44294a1faae165e874b838f76449a898cdc01411eae0dbdc5f7ee79f75f8c6a52e9e0c9c1ad8bd054c64751f6be6f7790d0053933db8d786dfbc53e
 DIST vbox-kernel-module-src-6.0.6.tar.xz 667936 BLAKE2B 5eca0167ad6c624bb56978c07c0184ef39d789ca5752fee3fcb00a2f5a7af4d20a69dde4288fc5233111ea821eab69d6970a86861459d09d6050d93f09f8f2ef SHA512 aff4b1f200abfdb7e249e6c725ab9c2a4c83010bd0c7b6d2d6595ae7d7bc6b2bd291f77c1597b3fb2c39de61867447c18e06d865a50565ccb07120de2c34d141
 DIST vbox-kernel-module-src-6.0.8.tar.xz 668380 BLAKE2B 06deabe0bae37503ec2b2df3cf1edb820b190c9e453aad8e211278a27c9ffaf229b98c08b2d7510b3721a30ca53833b43184636fde7ce3e5ac0bcbc588330486 SHA512 a4fb626c5a58637cfef7ebc44ccfcf82d6f2a7e91af665a8854d9fafb0c9b042d473c6767dad64497aed5110aefd23299461d39b43f8e57aa0c255cfcc94b448
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.2.30.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.2.30.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
 # XXX: the tarball here is just the kernel modules split out of the binary
@ -15,7 +15,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/virtualbox/${MY_P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="pax_kernel"
 RDEPEND="!=app-emulation/virtualbox-9999"
--- a/app-emulation/virtualbox-modules/virtualbox-modules-6.0.8.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-6.0.8.ebuild
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -1,7 +1,7 @@
 DIST VirtualBox-5.2.22.tar.bz2 118757134 BLAKE2B be795cdbfb09d3d443f63e190b63898239622f5a57aefdd90f382d9a849d09cc1abc2624071fbc60b2c04a12f33376184540cc362c19225733f99a3bcc8ff6a3 SHA512 4f6c4611a3114778f45419587dc1519ca07410c1ea6474cdb18ecd3b068639a4fdac3f25146fe9b8e006e30f19eba134ce9f665182008b033f6f78497e1ea722
 DIST VirtualBox-5.2.26.tar.bz2 118371765 BLAKE2B 32413b72e33f2f63835a2eb2d47dc75a7b63121934bdffd51ff58e9d63d68b77b4f8dac4605916ba8bd6896240d00024ccc3d7d002d4f6f92d6d9b1dc35995e3 SHA512 aee334c74bd02772ac5e0528d84d31661f61c775d0993c00febe125810efc78a2f779db41bf66283be51b19a35540fee14445bada59a8d3b7affa6ef6645005f
 DIST VirtualBox-5.2.28.tar.bz2 118655475 BLAKE2B 4e4e75b78de3cb3b6dc2fe2c2f306487cb924bf9ca2d1b0ffc6fc349774d3fa38886d386277a32067daaabfad6e8cd58ea058a78a70d16761d76f6ebed035d16 SHA512 085cfcab82851f98c757ea109ba420335d891a99df52a811e19815b3e55a92894cfb7b6fd4a5aaf15def71811f14e21527625adf885a394144cb5f971eb57782
-DIST VirtualBox-6.0.4.tar.bz2 155233564 BLAKE2B 6bc4d450e275e8aac5dc62ab05d9ba1450e13965f3eba64819315d121bd0e515319be2ad92ab429f2e598e157e89660561de69a2aac87e14792284669bcec7e8 SHA512 c2e5418bafd5d50b46e1bc70280753c2fdfbf7248d782fc398771839950fb575eaea437e9699d56f4d8c92ea4dc9ba8bed74379565dac6114f7e9c45aecc9fdb
+DIST VirtualBox-5.2.30.tar.bz2 118462289 BLAKE2B 87126b5af657815d0fcc8aadf49a23ce613ea0998b70f988f78e9d381138c414c7c73a0bf91955481cf484f5b71081ff1bab8dabe1b41fffde877e1003477625 SHA512 6230846ceda47b8ffe942aa8427f04f193095103371b7210d30e49cd9e384b9828d6917f75ef125e63e2c1810e8aa3b7c17b72f3ede7697c55d6de9da9d3f668
 DIST VirtualBox-6.0.6.tar.bz2 155297550 BLAKE2B a886ed99da3aee7a52d8c0654c33e50ae4155077e3d5061e1888a0cb5760b12dd63fb1205b75ec04419d50261f81e56036bdba79d20b57c836f073af232c913a SHA512 eb71ca94220680ac6cba7af13eb9eef132c21e57b1b27d6bc3c564bba58b000e682d19e36b63660bfa4f4471cd0632d365659ef8c4e3e526931622901a432d1b
 DIST VirtualBox-6.0.8.tar.bz2 155404889 BLAKE2B 3eb6ebf713c32e301db1673b22c367a89ce1ffb25d12baab6c7335389ce17e08efd744139acc4114231c4d4b69c6370b6e5d5b18ce97fe5494ca7a192fa43f7d SHA512 df18d5df2c82761b8a77e509b2873cdeaa46d11bc50ca166af1e6c30d3042b0cf5640957b1d411333f5bd5be3f03f382550f1afaecf0651d847bc88c95863d83
 DIST virtualbox-5.2.16-patches-02.tar.xz 3152 BLAKE2B c8d8f3872f544a465c7d1aa07291599307120ac9eabfb299ddd788a11f85ca6c2d84b8e7306ee4ad436270dad0dd39f101ee68a549eac15afd1e3cdc03f23c6c SHA512 85ee8c4045de562d71ab2d761695ea48b6726a6f0c4bcaa2562bb0d147542d3f1a1b5b47cf593a7f22dac1b86f87b59a56bef421dce3e1fa8e5260cd41998450
 DIST virtualbox-6.0.0_beta2-patches-01.tar.xz 2732 BLAKE2B a138e715d99f135f16ca21c92781bf6cd8913f7f766bb598eddcd63e98280e568e646f56bbd0a3714f273457ca90db0b77ec7940ba25028506a22891f1af7b2d SHA512 954e4b40d6e272efe756ee0965adb4110d45f764433a89080fda7ebaebbc20031f86a3e0027dfdaa1c6a7d6379a1af557cea71512504e4b57b5f5adbfc86b56e
--- a/app-emulation/virtualbox/virtualbox-5.2.30.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.2.30.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
@ -15,10 +15,10 @@ HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-5.2.16-patches-02.tar.xz"
-LICENSE="GPL-2"
+LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@ -123,7 +123,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 "
-pkg_setup() {
+pkg_pretend() {
 	if ! use headless && ! use qt5 ; then
 		einfo "No USE=\"qt5\" selected, this build will not include any Qt frontend."
 	elif use headless && use qt5 ; then
@ -139,6 +139,9 @@ pkg_setup() {
 		einfo "You have disabled the \"python\" USE flag. This will only"
 		einfo "disable the python bindings being installed."
 	fi
 }
 pkg_setup() {
 	java-pkg-opt-2_pkg_setup
 	python-single-r1_pkg_setup
@ -193,6 +196,7 @@ src_prepare() {
 		eapply "${FILESDIR}"/virtualbox-5.2.8-paxmark-bldprogs.patch
 	fi
 	rm "${WORKDIR}/patches/008_virtualbox-4.3.14-missing_define.patch" || die
 	eapply "${WORKDIR}/patches"
 	eapply_user
@ -420,6 +424,22 @@ src_install() {
 		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
 	fi
 	# Fix version string in extensions or else they don't get accepted
 	# by the virtualbox host process (see bug #438930)
 	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
 		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
 		|| die
 	if use vnc ; then
 		insinto ${vbox_inst_path}/ExtensionPacks
 		doins -r ExtensionPacks/VNC
 	fi
 	if use dtrace ; then
 		insinto ${vbox_inst_path}/ExtensionPacks
 		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
 	fi
 	if use doc ; then
 		dodoc UserManual.pdf
 	fi
--- a/app-emulation/virtualbox/virtualbox-6.0.4-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-6.0.4-r1.ebuild
@ -15,11 +15,11 @@ HOMEPAGE="https://www.virtualbox.org/"
 SRC_URI="https://download.virtualbox.org/virtualbox/${MY_PV}/${MY_P}.tar.bz2
 	https://dev.gentoo.org/~polynomial-c/${PN}/patchsets/${PN}-6.0.0_beta2-patches-01.tar.xz"
-LICENSE="GPL-2"
+LICENSE="GPL-2 dtrace? ( CDDL )"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
+IUSE="alsa debug doc dtrace headless java libressl lvm +opus pam pax_kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc"
 RDEPEND="!app-emulation/virtualbox-bin
 	~app-emulation/virtualbox-modules-${PV}
@ -199,7 +199,6 @@ src_prepare() {
 	rm "${WORKDIR}/patches/010_virtualbox-5.2.12-qt511.patch" || die
 	eapply "${WORKDIR}/patches"
 	eapply "${FILESDIR}"/${PN}-6.0.0-libressl.patch #673800
 	eapply_user
 }
@ -263,9 +262,7 @@ src_compile() {
 }
 src_install() {
-	local binpath="release"
+	cd "${S}"/out/linux.${ARCH}/$(usex debug debug release)/bin || die
 	use debug && binpath="debug"
 	cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
 	local vbox_inst_path="/usr/$(get_libdir)/${PN}" each size ico icofile
@ -428,6 +425,22 @@ src_install() {
 		newconfd "${FILESDIR}"/vboxwebsrv-confd vboxwebsrv
 	fi
 	# Fix version string in extensions or else they don't get accepted
 	# by the virtualbox host process (see bug #438930)
 	find ExtensionPacks -type f -name "ExtPack.xml" -print0 \
 		| xargs --no-run-if-empty --null sed -i '/Version/s@_Gentoo@@' \
 		|| die
 	if use vnc ; then
 		insinto ${vbox_inst_path}/ExtensionPacks
 		doins -r ExtensionPacks/VNC
 	fi
 	if use dtrace ; then
 		insinto ${vbox_inst_path}/ExtensionPacks
 		doins -r ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack
 	fi
 	if use doc ; then
 		dodoc UserManual.pdf
 	fi
@ -474,7 +487,7 @@ pkg_postinst() {
 		elog ""
 		elog "WARNING!"
 		elog "Without USE=udev, USB devices will likely not work in ${PN}."
-	elif [ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ] ; then
+	elif [[ -e "${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules" ]] ; then
 		elog ""
 		elog "Please remove \"${ROOT%/}/etc/udev/rules.d/10-virtualbox.rules\""
 		elog "or else USB in ${PN} won't work."
--- a/app-emulation/winetricks/winetricks-20190310.ebuild
+++ b/app-emulation/winetricks/winetricks-20190310.ebuild
@ -11,7 +11,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/Winetricks/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 fi
 wtg="winetricks-gentoo-2012.11.24"
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@ -6,8 +6,9 @@ DIST seabios-1.12.0.tar.gz 613542 BLAKE2B f145c2db716996bfa9e5c014086ccfaa8ae96e
 DIST seabios-rel-1.11.1.tar.gz 604125 BLAKE2B df2b7322f5169fb74e7f5dd3f680e7d8ad3e6f93e8b1376d15bbda8865458648a0d6086011a8a6549e7ad1794844878736441e70067580c0eb416e20ee038d95 SHA512 69622460475b54ba77a10509dae0ef46d9c733c6c8527ab56a4f2298534dcf1f7722eb501df873ab612222e5867e334c2831cc4c95dd23771aee10740acf0273
 DIST xen-4.10.3-upstream-patches-1.tar.xz 24064 BLAKE2B ec9339d00afd4057738a78165a82dbebbab73eb561984a049daff84dfb115c0550e67796bfa775d5e5a3a4576c4ea7db408d491fe745a68c412f93a04719c58d SHA512 b3761acdb7a581d172e1e2b1e09406c4748eda3e25c81c19bb53b38e005d27e10ac64109870b47ce72372dc7b7c63ec3eca6156389c174f28ab4ad1c2b9e5634
 DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906 SHA512 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412
-DIST xen-4.11.1-upstream-patches-1.tar.xz 60048 BLAKE2B 60d5960183433776c881696e9b50f800c2724c9815b3ebb6eb994d108ab4b3de92cf8d7ec79c86958e8811b19550f802c26326351d49f35391cfeb3e6a1d5e76 SHA512 788245219ed374b80423f01754abae457b36de098a0d568828af02142b55692e2df78eceb8cb2a11fc20e9ee59c2cebfea8ec1de0a9d6dc64f327a88cf6bf918
+DIST xen-4.11.1-upstream-patches-2.tar.xz 78292 BLAKE2B 762c0b33500503854d3195af752a4510090b22a7212abb6bd72a74fd55b64ffc622db5d3b18ff5c2f1b804002537a82bdf5036ec23acf15c8b8e3f0ed8c722fb SHA512 4850ab53de811dc7a5499f603584624c7879f41cbacc223cbfd5fdf0042d39ba0195aa51356215d26136dab536f1b713274d21e3d265b62ca06fdab0aa923a77
 DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
 DIST xen-4.12.0-upstream-patches-0.tar.xz 32864 BLAKE2B 994ca1f9fdd89f25e225348870ec97257795644f0314437f8d2927b77ce5b53de6b9e043636cc2c9e4f8fda4ff7b7c26917f2912f2a287c57bc00606846fb617 SHA512 6f7ab80cac0afd8bcd88109cd052e29f9b028b0c363a4e1f1e845f4fdbb3d7782dffd1f20dd80f2923c507625abe9648d7fbe7d52c6fd565ab550c9c5a416eeb
 DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
 DIST xen-gentoo-patches-16.tar.xz 36980 BLAKE2B a59fcb221a915e39fbbc463fa8b1ca1ef00007654936cc17f64853d91737478a6f78480a3e459b07b8c3ddcc81ab9400beb9ea3906750ba69864d1b97db349d2 SHA512 7727e5c7f4ef997eea830618bc26b26f3a99539a1c702264132401e41a328b384346a06b6721f18e3056fc91a2d2d2bf6320e0ae3c79432c7458a24a0d269c56
 DIST xen-gentoo-patches-17.tar.xz 15688 BLAKE2B d5e3bdb15e182c5f0c21adfa5cb5b88e3453e5035659823e3322074646c3ea89b55bf54d0ec6c54966d9739544d156de365a60acf928b799b68978be3380a002 SHA512 f1000ca36166fa21d4b18fb9ecf36f55b1450c312622fbe38545f78aabc150e2d6cce4bd58472c41bd9be8945940a0bc953ba7e470cd5095cf2e7d8a87769b2b
--- a/app-emulation/xen-tools/xen-tools-4.11.1-r5.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.11.1-r5.ebuild
@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
 	S="${WORKDIR}/${REPO}"
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=1
+	UPSTREAM_VER=2
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
 	GENTOO_VER=17
--- a/app-emulation/xen-tools/xen-tools-4.12.0-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.12.0-r2.ebuild
@ -17,7 +17,7 @@ if [[ $PV == *9999 ]]; then
 	S="${WORKDIR}/${REPO}"
 else
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	UPSTREAM_VER=
+	UPSTREAM_VER=0
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
 	GENTOO_VER=17
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@ -1,5 +1,6 @@
 DIST xen-4.10.3-upstream-patches-1.tar.xz 24064 BLAKE2B ec9339d00afd4057738a78165a82dbebbab73eb561984a049daff84dfb115c0550e67796bfa775d5e5a3a4576c4ea7db408d491fe745a68c412f93a04719c58d SHA512 b3761acdb7a581d172e1e2b1e09406c4748eda3e25c81c19bb53b38e005d27e10ac64109870b47ce72372dc7b7c63ec3eca6156389c174f28ab4ad1c2b9e5634
 DIST xen-4.10.3.tar.gz 24695778 BLAKE2B 50a9e31fb4cf587eeedb357fc710405a1cd4506174a38eb9b032a0cdd9b7f7343d98624ecb07cf605b1403664c7117cdc8f011290309caa18ca9604b4008b906 SHA512 030d23109ce4c0ebf50ade6841d5525a39032bcf8fd0599ccaa9502ff301c1f61f9c5f49233b41a5934a71228958febc1e529a9fc6822ba401a0c18c490ad412
-DIST xen-4.11.1-upstream-patches-1.tar.xz 60048 BLAKE2B 60d5960183433776c881696e9b50f800c2724c9815b3ebb6eb994d108ab4b3de92cf8d7ec79c86958e8811b19550f802c26326351d49f35391cfeb3e6a1d5e76 SHA512 788245219ed374b80423f01754abae457b36de098a0d568828af02142b55692e2df78eceb8cb2a11fc20e9ee59c2cebfea8ec1de0a9d6dc64f327a88cf6bf918
+DIST xen-4.11.1-upstream-patches-2.tar.xz 78292 BLAKE2B 762c0b33500503854d3195af752a4510090b22a7212abb6bd72a74fd55b64ffc622db5d3b18ff5c2f1b804002537a82bdf5036ec23acf15c8b8e3f0ed8c722fb SHA512 4850ab53de811dc7a5499f603584624c7879f41cbacc223cbfd5fdf0042d39ba0195aa51356215d26136dab536f1b713274d21e3d265b62ca06fdab0aa923a77
 DIST xen-4.11.1.tar.gz 25152217 BLAKE2B a8dfbeb3d490787725c589e1ce82dcbbcd0be7fb4743b38daf3a8704dffda34d1faabb07d74e01d2fab1572ce0b730c21192469317545e8b3edb3fae1130ef8c SHA512 c1655c5decdaed95a2b9a99652318cfc72f6cfdae957cfe60d635f7787e8850f33e8fafc4c4b8d61fb579c9b9d93028a6382903e71808a0418b931e76d72a649
 DIST xen-4.12.0-upstream-patches-0.tar.xz 32864 BLAKE2B 994ca1f9fdd89f25e225348870ec97257795644f0314437f8d2927b77ce5b53de6b9e043636cc2c9e4f8fda4ff7b7c26917f2912f2a287c57bc00606846fb617 SHA512 6f7ab80cac0afd8bcd88109cd052e29f9b028b0c363a4e1f1e845f4fdbb3d7782dffd1f20dd80f2923c507625abe9648d7fbe7d52c6fd565ab550c9c5a416eeb
 DIST xen-4.12.0.tar.gz 26949697 BLAKE2B 9175cc9054e4a2b5c34df89a4efd667f86b4861bef9c3310bf431d041f710a7cb265b4d34a76ab18a17a3121392942d2e5d76c5044eb9b957d4255af889fe69a SHA512 0ce366dcac607c9b592c5e9c0f40652eef743913b246bed4b0c380b8d59ac23a6adcd05befec37fc799a61476f47df76d4911cbf1da6ceb51441c546bf2464de
--- a/app-emulation/xen/files/xen.gcc9.fixes.patch
+++ b/app-emulation/xen/files/xen.gcc9.fixes.patch
@ -0,0 +1,34 @@
 --- xen-4.11.1/xen/drivers/passthrough/vtd/vtd.h.orig	2018-11-29 14:04:11.000000000 +0000
 +++ xen-4.11.1/xen/drivers/passthrough/vtd/vtd.h	2019-02-05 21:32:50.056774501 +0000
@@ -28,7 +28,7 @@
 /* Allow for both IOAPIC and IOSAPIC. */
 #define IO_xAPIC_route_entry IO_APIC_route_entry
 -struct IO_APIC_route_remap_entry {
 +struct __packed IO_APIC_route_remap_entry {
     union {
         u64 val;
         struct {
 --- xen-4.11.1/xen/common/trace.c.orig	2018-11-29 14:04:11.000000000 +0000
 +++ xen-4.11.1/xen/common/trace.c	2019-02-06 20:31:27.370256971 +0000
@@ -819,7 +819,7 @@
 void __trace_hypercall(uint32_t event, unsigned long op,
                        const xen_ulong_t *args)
 {
 -    struct __packed {
 +    struct {
         uint32_t op;
         uint32_t args[6];
     } d;
 --- xen-4.11.1/xen/arch/x86/cpu/mtrr/generic.c.orig	2018-11-29 14:04:11.000000000 +0000
 +++ xen-4.11.1/xen/arch/x86/cpu/mtrr/generic.c	2019-02-10 19:24:09.378805103 +0000
@@ -171,6 +171,9 @@
 	printk("%sMTRR variable ranges %sabled:\n", level,
 	       mtrr_state.enabled ? "en" : "dis");
 	width = (paddr_bits - PAGE_SHIFT + 3) / 4;
 +	if (  width > 64 ) {
 +		width=64;
 +	}
 	for (i = 0; i < num_var_ranges; ++i) {
 		if (mtrr_state.var_ranges[i].mask & MTRR_PHYSMASK_VALID)
--- a/app-emulation/xen/xen-4.11.1-r3.ebuild
+++ b/app-emulation/xen/xen-4.11.1-r3.ebuild
@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=1
+	UPSTREAM_VER=2
 	SECURITY_VER=
 	GENTOO_VER=
@ -100,6 +100,9 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
 	# https://src.fedoraproject.org/rpms/xen/blob/master/f/xen.gcc9.fixes.patch
 	eapply "${FILESDIR}"/${PN}.gcc9.fixes.patch
 	# Drop .config
 	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
--- a/app-emulation/xen/xen-4.12.0-r1.ebuild
+++ b/app-emulation/xen/xen-4.12.0-r1.ebuild
@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=
+	UPSTREAM_VER=0
 	SECURITY_VER=
 	GENTOO_VER=
@ -100,6 +100,9 @@ src_prepare() {
 	eapply "${FILESDIR}"/${PN}-4.6-efi.patch
 	# https://src.fedoraproject.org/rpms/xen/blob/master/f/xen.gcc9.fixes.patch
 	eapply "${FILESDIR}"/${PN}.gcc9.fixes.patch
 	# Drop .config
 	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-java/eselect-java-0.4.0.ebuild
+++ b/app-eselect/eselect-java/eselect-java-0.4.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 RDEPEND="
 	!app-eselect/eselect-ecj
--- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.ebuild
+++ b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20180529.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=7
@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 RDEPEND=">=app-admin/eselect-1.4.13"
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
--- a/app-forensics/air/air-2.0.0-r2.ebuild
+++ b/app-forensics/air/air-2.0.0-r2.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
@ -21,11 +21,7 @@ DEPEND="${COMMON_DEPEND}
 "
 # TODO: air can utilize dc3dd, but it is not in portage ATM
 RDEPEND="${COMMON_DEPEND}
-	|| (
+	net-analyzer/netcat
 		net-analyzer/netcat6
 		net-analyzer/netcat
 		net-analyzer/gnu-netcat
 	)
 	app-arch/mt-st
 	crypt? ( net-analyzer/cryptcat )
 "
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/Show More
+++ b/Show More
`@ -1,2 +1 @@`
	`DIST orca-3.24.0.tar.xz 2391740 BLAKE2B 1f294bc8e1c593690c511f0d7d660230c420b33de59c8b1e78ee8d7b16f973b9fff9ce4d656de7202ffd5789ae3604d030c442e8c35eecfd5c5dca058031e996 SHA512 9aa65b534f69bb4a1b800e715776416843ac3756ec1267feca3c66476e34e54f6744f70c0f8ac8868a009d38b6cc165267268491a9ad29ebbd3601dba09d424c`
	`DIST orca-3.30.2.tar.xz 2493112 BLAKE2B 06ac902f67c66d5098be1829aa7cb7a160663a3a713d407a5245a95215c309f3b374937e4b70acbf9750f6e0e270ed8ab5516ca3cb6b0a19f347ee72a01a325b SHA512 146a132ce06f7f36d6d9397c507ea767be5df6c47a5c7485c35c325868ebc0b3ff7b3653572be82f6d5ed937033cd6d68a08700056a63e5691aed4c9171b3485`	`DIST orca-3.30.2.tar.xz 2493112 BLAKE2B 06ac902f67c66d5098be1829aa7cb7a160663a3a713d407a5245a95215c309f3b374937e4b70acbf9750f6e0e270ed8ab5516ca3cb6b0a19f347ee72a01a325b SHA512 146a132ce06f7f36d6d9397c507ea767be5df6c47a5c7485c35c325868ebc0b3ff7b3653572be82f6d5ed937033cd6d68a08700056a63e5691aed4c9171b3485`
`@ -1,2 +1 @@`
	`DIST file-roller-3.26.2.tar.xz 1436760 BLAKE2B a563f77dcc8d61e90e4e42fa4f08aded657d677b319b39f4c9fd16670a2309e81f142b7b8528e52db0be3f454efca15ccd7e9e25754a95b45800a9ca02969e12 SHA512 3572446081f931ce7cfd7eccdc9450d798164426a68bc332f9340b7c06b79ce4f1589b817c27322a0c1681d7f2cb8cf93462cde1e3df13ad40789faec1decc9f`
	`DIST file-roller-3.30.1.tar.xz 1443340 BLAKE2B 352b094b51d342ac71f2174b59dff262ba46b4697c21164ba18bf825d70cb609d59a35ce0efe1013e217e86754822accc11c59eb9bba7185a9f7efe5dded4def SHA512 8f3f55cd7d6769fbf8f72118bb8982775c3f83534266db1f2cc9bbfd9e8dd68545ab49baaa4e468ce22e616346dec9c99c11a0c5b4208dca2e648fac8756cea7`	`DIST file-roller-3.30.1.tar.xz 1443340 BLAKE2B 352b094b51d342ac71f2174b59dff262ba46b4697c21164ba18bf825d70cb609d59a35ce0efe1013e217e86754822accc11c59eb9bba7185a9f7efe5dded4def SHA512 8f3f55cd7d6769fbf8f72118bb8982775c3f83534266db1f2cc9bbfd9e8dd68545ab49baaa4e468ce22e616346dec9c99c11a0c5b4208dca2e648fac8756cea7`
`@ -1,2 +1 @@`
	`DIST gnome-autoar-0.2.2.tar.xz 295488 BLAKE2B 33f614846547921b208239f7756cab3561ec417f2030e3196bece43c47af2a6496fef82838d90fa3ddcf8742023b525bc4e8cbdfbf3fc925c92c74a8a6918c3b SHA512 78faf8f82eeab4cb5f1f364d6e9caa4d24f21f9b81a79ebde4404253f3e7ae120f44600f236612859810afc6fc6f1a8c6f2e065db98be79103255642139c10a2`
	`DIST gnome-autoar-0.2.3.tar.xz 297632 BLAKE2B 37b5861b1e0866200884aa1791fced6168c12aa740413a1330a08629aaf4e18105b02b36828619c20a15874ac41c779836627728c82fa1a79a1bab6dc9224d97 SHA512 f87299817c52e7862a6c1cc950b1c362db8e7465e008d988e70245a203c728a9179400aac8601c399abe361e5a1ac4558b1190641ad3afa7224f883546fae7bc`	`DIST gnome-autoar-0.2.3.tar.xz 297632 BLAKE2B 37b5861b1e0866200884aa1791fced6168c12aa740413a1330a08629aaf4e18105b02b36828619c20a15874ac41c779836627728c82fa1a79a1bab6dc9224d97 SHA512 f87299817c52e7862a6c1cc950b1c362db8e7465e008d988e70245a203c728a9179400aac8601c399abe361e5a1ac4558b1190641ad3afa7224f883546fae7bc`
`@ -1,2 +1 @@`
	`DIST xarchiver-0.5.4.13.tar.gz 1079259 BLAKE2B c824e81182a6105d24fe85d148fb7e71c2ae761948421bacf7af240e4b2a381582ab5db46c29ee3b2daf01f710696ee53a93a0a2923923083c177e9473bee4f1 SHA512 ace6b3bade20f517c63a035022944d092868e4c000976ef388a3ee70ef8a28177ee20cfb089d0984e9274722c4ec13d129fd7a4ef542e7b5cd4423c26ad5b849`
	`DIST xarchiver-0.5.4.14.tar.gz 1081542 BLAKE2B 591d93dfbaa98164bc169105462155b09ed87dab8ad5adff6653e77673095a29d7f00cdaeed1b928039fe3cc5f668f8da46885905ae73d03f5b4c71dd279a7b4 SHA512 b38881e6cdfb402499efbd18ab25cac3869cd48ef96941a4bb3cb8b6b130a2317abe3b1d11bfc3d60e81eef7cafa34515fefc11e469443d96d139c2f09cf4498`	`DIST xarchiver-0.5.4.14.tar.gz 1081542 BLAKE2B 591d93dfbaa98164bc169105462155b09ed87dab8ad5adff6653e77673095a29d7f00cdaeed1b928039fe3cc5f668f8da46885905ae73d03f5b4c71dd279a7b4 SHA512 b38881e6cdfb402499efbd18ab25cac3869cd48ef96941a4bb3cb8b6b130a2317abe3b1d11bfc3d60e81eef7cafa34515fefc11e469443d96d139c2f09cf4498`
`@ -1 +1,2 @@`
		`DIST libb2-0.98.1.tar.gz 280826 BLAKE2B aa8c3dee3032f457410479be12d00c79a6ca6a7c0376a5c70265d30ff25b50663171f7096141834d4faa4dd5027f38b23b774e59be63475a3ecba855337fb1aa SHA512 a666fdbd1efa9cfff3028e953c62f21ba092c6733ccd12d4d04f1f836fc9747fc90053bc9166510d251d332b91e133853d2cc9b61c279517bd65b05e8483250b`
	`DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073`	`DIST libb2-0.98.tar.gz 275076 BLAKE2B 7c0aa473a58a5ceb6e913487cc6f0078e6cab661bd26cb1f5611473b430213521a23adbde227da6d7561b4d581369e268308ae6b2a10da5399c0d2d6ab288b26 SHA512 be400d16ab00b3006ec7412dcbf580427600f4997cee19c0448d849ff8bbbb58bbb7be3d49e4052cb1b6791b6bed9c9cc48b51da3ec77b2fdf3d197ccf0c8073`
`@ -1,2 +1 @@`
	`DIST seahorse-3.20.0.tar.xz 1556556 BLAKE2B e0742996045b50acb2d60f548f321e1ff0121c166209e2230d5839cc971f8560f316c91c3a88a30c302c5339ba0251e7faf64ae805c4f80e853cc67a6952d350 SHA512 a02d3da7af95256941ef065ac024bd5bfb53a026767b951fa2e26446fb0eed23707e69f72f6e8ebfa7d538823fa41411709fa2bebad4fbd662af1e81bc15ab82`
	`DIST seahorse-3.30.1.1.tar.xz 1428904 BLAKE2B 54760362fc452b2ff3f7a0d72b25540568703cb91cd46321fb8cd60c9b51f84c3f48575ae9f6c72080cbe0b29e8a38f5e6afdb6c3120b2783a8a04688bd219c9 SHA512 971b8bea484f456d2942f1d1b407ca5b11c1d431f2ee524e58348a421a235dd9d2fa463e73487c6137bde116b34a5d1c0291b479d8562d4ce03766081e0dc469`	`DIST seahorse-3.30.1.1.tar.xz 1428904 BLAKE2B 54760362fc452b2ff3f7a0d72b25540568703cb91cd46321fb8cd60c9b51f84c3f48575ae9f6c72080cbe0b29e8a38f5e6afdb6c3120b2783a8a04688bd219c9 SHA512 971b8bea484f456d2942f1d1b407ca5b11c1d431f2ee524e58348a421a235dd9d2fa463e73487c6137bde116b34a5d1c0291b479d8562d4ce03766081e0dc469`
`@ -1,2 +1 @@`
	`DIST gnome-dictionary-3.24.1.tar.xz 880500 BLAKE2B f730276612d2578e7b25121b49be9639cf7a9fc67bda9687285f6d3873d3b825301246447d968b24ed29240a1b0e7fc48d63c8454e704b799eebdf340f5f6da2 SHA512 b3ee838888a97e914add58dd4b61fa096b9488aab360815f2e7b674e7a57b237849a1ccaf107c1e94968e534b24ee24d827c42a3a1b0dfd8c5ef25eeb90456d3`
	`DIST gnome-dictionary-3.26.1.tar.xz 662048 BLAKE2B 3b77d3632629f8502476f029ab9ba3c66225cd619992e185b1403adfeba718b7e0fa0f32762eb086c1e9ef80a08cf79cd872e2ca3026b8cb3975954077c5f7c1 SHA512 da7169795740295c13f02143f5263603f0f6c621e96cecf88a4ee089114399d59f083987bc4571821467da64dc43f00bebbe4ea66b46a035088f85d35d6aee27`	`DIST gnome-dictionary-3.26.1.tar.xz 662048 BLAKE2B 3b77d3632629f8502476f029ab9ba3c66225cd619992e185b1403adfeba718b7e0fa0f32762eb086c1e9ef80a08cf79cd872e2ca3026b8cb3975954077c5f7c1 SHA512 da7169795740295c13f02143f5263603f0f6c621e96cecf88a4ee089114399d59f083987bc4571821467da64dc43f00bebbe4ea66b46a035088f85d35d6aee27`
`@ -1,2 +1 @@`
	`DIST gedit-plugins-3.28.1.tar.xz 1350468 BLAKE2B 4fd50ad7358581f5e27f0c3a7e127d4e2c0e7189c039daee1d8d7ddf7062846e1aebb634b3edd998c9a7c11840c71f56fe4eeca78ea2e91ae18db814e4fd79e5 SHA512 6258c627cd3fa2948375c30e87061375c0d09ce2c70301c2d10a403e6075d1df09e928a2d95b72f6d7950a31a720af645fff2f7f59a281d2999948beb56c1dc9`
	`DIST gedit-plugins-3.30.1.tar.xz 1354644 BLAKE2B ee42fb2fe47c9219442e0bbdaf21a14a834b8bc38558713ccf0ad384814812fd71f4d318624b4d2c149b26d304203a2b954ef49c3299877f4d067ae181bfe1d5 SHA512 0e777779288b51015d7ab539bf896a00d5226560f2cc2211daf777da87824eed858255318c421524933a540135e4bfdcc294ba7ed89f680a35aa48f7279cbc94`	`DIST gedit-plugins-3.30.1.tar.xz 1354644 BLAKE2B ee42fb2fe47c9219442e0bbdaf21a14a834b8bc38558713ccf0ad384814812fd71f4d318624b4d2c149b26d304203a2b954ef49c3299877f4d067ae181bfe1d5 SHA512 0e777779288b51015d7ab539bf896a00d5226560f2cc2211daf777da87824eed858255318c421524933a540135e4bfdcc294ba7ed89f680a35aa48f7279cbc94`
`@ -1,2 +1 @@`
	`DIST multi-term-1.3.el.xz 7968 BLAKE2B 6cb9a8bec0f2e1ef18229ecbec78a856808f6b3cab3eecc4ba2c78f91adcd687fcca870307c808cc1d0e6c2de71d42effdd0cdf38fc1b97b19511da7aad2be84 SHA512 fcb31da193f84fde653583b999e344fb7ec7404948fbf64b15f9a86eb69e9cc9514ad4380ce5b9c3813a74226d8addf8c87bb539f9ee927d4a0c0a7c2ea7c361`
	`DIST multi-term-1.4.el.xz 7996 BLAKE2B fd9247d55b272c5238ae2344ecb7f516d0b3877f934ad35410ffaaa85d5d208a906cef2f2843240c672f916ce68dc210aa07c2330e9e485505c89d98c88a7d25 SHA512 113118fd352516cb1abf49536369361790786d570d347aab3faa1c672058d883e9ae8bba00a73f6ffc7487fc4166525e0c4af395888f09181dcc69d8aaba5f03`	`DIST multi-term-1.4.el.xz 7996 BLAKE2B fd9247d55b272c5238ae2344ecb7f516d0b3877f934ad35410ffaaa85d5d208a906cef2f2843240c672f916ce68dc210aa07c2330e9e485505c89d98c88a7d25 SHA512 113118fd352516cb1abf49536369361790786d570d347aab3faa1c672058d883e9ae8bba00a73f6ffc7487fc4166525e0c4af395888f09181dcc69d8aaba5f03`