Sync with portage [Thu Jan 2 12:06:01 MSK 2020].

4 years ago · ffe74f16b5
parent 8549b53bbd
commit ffe74f16b5
2252 changed files with 10910 additions and 28085 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/acct-group/Manifest.gz
+++ b/acct-group/Manifest.gz
--- a/acct-group/fetchmail/Manifest
+++ b/acct-group/fetchmail/Manifest
--- a/acct-group/fetchmail/fetchmail-0.ebuild
+++ b/acct-group/fetchmail/fetchmail-0.ebuild
@ -0,0 +1,9 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for net-mail/fetchmail"
+ACCT_GROUP_ID=124
--- a/acct-group/fetchmail/metadata.xml
+++ b/acct-group/fetchmail/metadata.xml
@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>zlogene@gentoo.org</email>
-	<name>Mikle Kolyada</name>
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
 </maintainer>
 </pkgmetadata>
--- a/acct-group/geneweb/Manifest
+++ b/acct-group/geneweb/Manifest
--- a/acct-group/geneweb/geneweb-0.ebuild
+++ b/acct-group/geneweb/geneweb-0.ebuild
@ -0,0 +1,12 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+DESCRIPTION="Group for geneweb daemon"
+
+KEYWORDS="~amd64 ~x86"
+
+ACCT_GROUP_ID=467
--- a/acct-group/geneweb/metadata.xml
+++ b/acct-group/geneweb/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>php-bugs@gentoo.org</email>
-		<name>PHP</name>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Alfredo Tupone</name>
 	</maintainer>
 </pkgmetadata>
--- a/acct-user/Manifest.gz
+++ b/acct-user/Manifest.gz
--- a/acct-user/fetchmail/Manifest
+++ b/acct-user/fetchmail/Manifest
--- a/acct-user/fetchmail/fetchmail-0.ebuild
+++ b/acct-user/fetchmail/fetchmail-0.ebuild
@ -0,0 +1,14 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="User for net-mail/fetchmail"
+ACCT_USER_ID=124
+ACCT_USER_GROUPS=( fetchmail )
+ACCT_USER_HOME="/var/lib/fetchmail"
+ACCT_USER_HOME_PERMS=0700
+
+acct-user_add_deps
--- a/dev-php/pecl-htscanner/metadata.xml
+++ b/dev-php/pecl-htscanner/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>php-bugs@gentoo.org</email>
-	<name>PHP</name>
+<maintainer type="person">
+	<email>voyageur@gentoo.org</email>
+	<name>Bernard Cafarelli</name>
 </maintainer>
 </pkgmetadata>
--- a/acct-user/geneweb/Manifest
+++ b/acct-user/geneweb/Manifest
--- a/acct-user/geneweb/geneweb-0.ebuild
+++ b/acct-user/geneweb/geneweb-0.ebuild
@ -0,0 +1,16 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user id for geneweb daemon"
+
+KEYWORDS="~amd64 ~x86"
+
+ACCT_USER_ID=467
+ACCT_USER_HOME=/var/lib/geneweb
+ACCT_USER_GROUPS=( geneweb )
+
+acct-user_add_deps
--- a/dev-php/pecl-mysqlnd_ms/metadata.xml
+++ b/dev-php/pecl-mysqlnd_ms/metadata.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-    <email>php-bugs@gentoo.org</email>
-    <name>PHP</name>
+  <maintainer type="person">
+    <email>tupone@gentoo.org</email>
+    <name>Alfredo Tupone</name>
  </maintainer>
 </pkgmetadata>
--- a/acct-user/mpd/mpd-0.ebuild
+++ b/acct-user/mpd/mpd-0.ebuild
@ -1,11 +1,11 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7

 inherit acct-user

-DESCRIPTION="An user for music player daemon (mpd)"
+DESCRIPTION="A user for music player daemon (mpd)"
 ACCT_USER_ID=45
 ACCT_USER_HOME=/var/lib/mpd
 ACCT_USER_GROUPS=( audio )
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@ -1,4 +1,3 @@
 DIST at-spi2-atk-2.26.2.tar.xz 322800 BLAKE2B 108a01fd8c16816d9953ad42721080dd6dcb9f75c95c412387d7f54920998c66eb5855eb859e8e00096a47b387d05779691887a7717d31f4c70681d69a9c8266 SHA512 f938b8e2b999fcdfa13e9433bd13c39430bae2ceae0c664a24caccc6af522947bf73de02de3c359807f5370a85961193df2ba24b193b60b915c61828ea747bb2
-DIST at-spi2-atk-2.30.1.tar.xz 94812 BLAKE2B fe3ef77e749bef2300219fe32586ac0b871d06dce708ce8b7b57356a1fa17041c3f7b788e3e6d6b5f89dc97c3e8d43a9d1eb897ed8fbaac954f042421aef68b6 SHA512 862cccb65d2a8a7df4e899e4f53742535389a0efa0a75c936b52e68690c07e206b19d8308f0910cddb71bda0d803012d613f6959329ae43c411d1314062b7018
 DIST at-spi2-atk-2.32.0.tar.xz 94952 BLAKE2B 972bb32590a51549eb8b0b3c46a068e95cc43783f0f0e31ca3663ff1669196a88def63342c01d056d45d6f4fb4bcc2127b50a49be37fd45d33aa1daeadca5172 SHA512 095ceaa33d5b35f1f4f81a31bea00487c054493cb29d4fdbcf74331ec8d1b9570dc7cb93e1cc06da9ea3f5805e7a3a9e7bf80cfdbce86a1822c2a46327109393
 DIST at-spi2-atk-2.34.0.tar.xz 96116 BLAKE2B 242b29b988d97b06ca85495be77f9c4cf1c621d9ff977cd73ea37f97b42fc636474df34429e7397fb3f91d3d11b14ce1b3de5d68c0b30f85877f444c78389564 SHA512 515ad4d0a000fa47a7848f3ea9f95f8e0c582f9d9876725deb8e521c60e290f73655445456e6c238f382cb8773b56db2795c221029ec931bad68395326b6bb04
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.30.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.30.1.ebuild
@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org meson multilib-minimal virtualx xdg
-
-DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.30.0[${MULTILIB_USEDEP}]
-	>=app-accessibility/at-spi2-core-2.30.0[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( >=dev-libs/libxml2-2.9.1 )
-"
-
-multilib_src_configure() {
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
-
-multilib_src_install() {
-	meson_src_install
-}
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.32.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"

 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"

--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@ -1,4 +1,3 @@
 DIST at-spi2-core-2.26.2.tar.xz 494484 BLAKE2B 0c67cea9c0107fb6503a933de134eb662f192ae2a98734bde1b0629da151476858720d2dcb1791a00a44b61ae2ead945178fba659f88303c552567d7f3f9817b SHA512 6a8e158e30c37ce475467b6634aff046a318875271966d7bfa3e56052d0cd26cd37435d0b9ae14f079542b8b3e76088da5bd50ed39eb39f3f40394c55ed3f255
-DIST at-spi2-core-2.30.1.tar.xz 188056 BLAKE2B 8686a5bd0a359d575d052f5c42cec76bbd88f7d681decbcec92ef163d5f59dac4e642b544b928e141739479b9e349868c0f5ecb7d42a29e9b32615f27a852e52 SHA512 c8b6a2ae5f96ce7d8c1fd32c9fec861148ceff631069b417296425fe6e2ae15198628826e13a72e018871d38e12b1128aa299edcc45eaf3eb7bbff83774361cd
 DIST at-spi2-core-2.32.1.tar.xz 188952 BLAKE2B a12e234b19a38b0fcffbabb8430ef49dc538b38831cc22bbafc7f5d499082007909a82e785184d052f3a62853474cbc4838125540026a6d0e2ac2181e98a6a4c SHA512 cec6ea1426b25d9738c5c401a1038b39e04b1e989b7ef8e02590d117b35cfb253b260cc6e41b09e10e007801fedcb7702c48ba7f3a0c7b6c1f16edd4e8ad0cca
 DIST at-spi2-core-2.34.0.tar.xz 186736 BLAKE2B 6210ef0254760f1ef6e9c9124680f604864e24228650d4be1026dc73ce0ec5d10eec5e9958a98f0970e1292e4fc3935c8379278b10c633c87da5eb3960b94670 SHA512 99f6773e29fb5fcb339cbe5b23133dab78bc52e3c46a1d5bd748788c48345223f1def5078ac48e58756a7692459b177b0e26dc8059898a5ccac56ceb495b7de8
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.30.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.30.1.ebuild
@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org meson multilib-minimal systemd virtualx xdg
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="X gtk-doc +introspection"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-RDEPEND="
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.54.0:= )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	gtk-doc? (
-		>=dev-util/gtk-doc-1.25
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-PATCHES=(
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-)
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Denable_docs=$(multilib_native_usex gtk-doc true false)
-		-Denable-introspection=$(multilib_native_usex introspection)
-		-Denable-x11=$(usex X)
-		-Dsystemd_user_dir="$(systemd_get_userunitdir)"
-	)
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	virtx meson_src_test
-}
-
-multilib_src_install() {
-	meson_src_install
-}
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.32.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="X gtk-doc +introspection"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"

 RDEPEND="
 	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@ -1 +1,2 @@
 DIST calamares-3.2.12.tar.gz 3008153 BLAKE2B 32b8a141346da528c2aef40a8fe480445cc8acbccc1190ca5ad1b5b0d03b59c709abd663e5ed33503955e3c0caa71476e7d737d46422992fc22e3acd96260857 SHA512 00dec40eb9c9e95933d3785a7b2ddc606530d8b94fde233d91071afbe11067d4e5b0a81298e66aaa0c65b55b6a86359466d8789f3ed886e76c2102b850f2bbc0
+DIST calamares-3.2.17.1.tar.gz 3128350 BLAKE2B a6926faaf1d521647cc0037b88686f9ceee1cc8167b888fe3c25228cbca8058572c8786a51f6ce0ccb77b31351d21ac41fa6c86a6577569c118729e1263ccafa SHA512 fa8f1906aa7774b0f6bd65d1dc87ea2e08df92018c162f7e7fe01fe6119e65d6391141bc242623f88040bb18eb8b71003cb7417b27c10b39bc30de0f0bf8deb0
--- a/app-admin/calamares/calamares-3.2.17.1.ebuild
+++ b/app-admin/calamares/calamares-3.2.17.1.ebuild
@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_6 )
+inherit ecm python-r1
+
+DESCRIPTION="Distribution-independent installer framework"
+HOMEPAGE="https://calamares.io"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+KEYWORDS="~amd64"
+SLOT=5
+LICENSE="GPL-3"
+IUSE="+networkmanager pythonqt +upower"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-cpp/yaml-cpp:=
+	>=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
+	dev-libs/libpwquality[${PYTHON_USEDEP}]
+	dev-qt/qtconcurrent:5
+	dev-qt/qtdbus:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebengine:5[widgets]
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	kde-frameworks/kconfig:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kcrash:5
+	kde-frameworks/kpackage:5
+	kde-frameworks/kparts:5
+	kde-frameworks/kservice:5
+	sys-apps/dbus
+	sys-apps/dmidecode
+	sys-auth/polkit-qt
+	>=sys-libs/kpmcore-4.0.0:5=
+	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-qt/qttest:5 )
+"
+RDEPEND="${COMMON_DEPEND}
+	app-admin/sudo
+	dev-libs/libatasmart
+	net-misc/rsync
+	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
+	sys-boot/os-prober
+	sys-fs/squashfs-tools
+	sys-libs/timezone-data
+	virtual/udev
+	networkmanager? ( net-misc/networkmanager )
+	upower? ( sys-power/upower )
+"
+
+src_prepare() {
+	ecm_src_prepare
+	python_setup
+	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
+			PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
+			PYTHON_CFLAGS="$(python_get_CFLAGS)"\
+			PYTHON_LIBS="$(python_get_LIBS)"
+
+	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
+		calamares.desktop || die
+	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
+		calamares.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWEBVIEW_FORCE_WEBKIT=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
+		-DWITH_PYTHONQT=$(usex pythonqt)
+	)
+
+	ecm_src_configure
+}
+
+src_install() {
+	ecm_src_install
+	dobin "${FILESDIR}"/calamares-pkexec
+}
--- a/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
+++ b/app-admin/cygwin-rebase/cygwin-rebase-4.4.4.ebuild
@ -31,7 +31,7 @@ else
 		https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch -> ${P}_merge-files-flag-0.patch
 	"
 	PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" )
-	KEYWORDS="-* ~x64-cygwin"
+	KEYWORDS="-* ~x64-cygwin ~x86-cygwin"
 fi

 DEPEND=""
@ -60,6 +60,10 @@ pkg_preinst() {
 	local rebasedb
 	local baseaddr
 	case ${CHOST} in
+	i686-*-cygwin*)
+		rebasedb=/etc/rebase.db.i386
+		baseaddr=0x70000000
+		;;
 	x86_64-*-cygwin*)
 		rebasedb=/etc/rebase.db.x86_64
 		baseaddr=0x1000000000
--- a/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
+++ b/app-admin/cygwin-rebase/cygwin-rebase-9999.ebuild
@ -31,7 +31,7 @@ else
 		https://github.com/haubi/cygwin-rebase/compare/rebase-${MY_PV}...rebase-${MY_PV}_merge-files-flag-0.patch -> ${P}_merge-files-flag-0.patch
 	"
 	PATCHES=( "${DISTDIR}/${P}_merge-files-flag-0.patch" )
-	KEYWORDS="-* ~x64-cygwin"
+	KEYWORDS="-* ~x64-cygwin ~x86-cygwin"
 fi

 DEPEND=""
@ -60,6 +60,10 @@ pkg_preinst() {
 	local rebasedb
 	local baseaddr
 	case ${CHOST} in
+	i686-*-cygwin*)
+		rebasedb=/etc/rebase.db.i386
+		baseaddr=0x70000000
+		;;
 	x86_64-*-cygwin*)
 		rebasedb=/etc/rebase.db.x86_64
 		baseaddr=0x1000000000
--- a/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-inherit cmake-utils xdg
+inherit cmake xdg

 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@ -66,7 +66,7 @@ src_prepare() {
 	 use test || \
 		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die

-	 cmake-utils_src_prepare
+	 cmake_src_prepare
 }

 src_configure() {
@ -84,7 +84,7 @@ src_configure() {
 	if [[ "${PV}" == *_beta* ]] ; then
 		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }

 pkg_preinst() {
--- a/app-admin/keepassxc/keepassxc-2.5.0.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.5.0.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-inherit cmake-utils xdg
+inherit cmake xdg

 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@ -67,7 +67,7 @@ src_prepare() {
 	 use test || \
 		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die

-	 cmake-utils_src_prepare
+	 cmake_src_prepare
 }

 src_configure() {
@ -86,7 +86,7 @@ src_configure() {
 	if [[ "${PV}" == *_beta* ]] ; then
 		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }

 pkg_preinst() {
--- a/app-admin/keepassxc/keepassxc-2.5.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.5.1.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-inherit cmake-utils xdg
+inherit cmake xdg

 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@ -67,7 +67,7 @@ src_prepare() {
 	 use test || \
 		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die

-	 cmake-utils_src_prepare
+	 cmake_src_prepare
 }

 src_configure() {
@ -86,7 +86,7 @@ src_configure() {
 	if [[ "${PV}" == *_beta* ]] ; then
 		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }

 pkg_preinst() {
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-9999.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-inherit cmake-utils xdg
+inherit cmake xdg

 DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
 HOMEPAGE="https://keepassxc.org"
@ -67,7 +67,7 @@ src_prepare() {
 	 use test || \
 		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die

-	 cmake-utils_src_prepare
+	 cmake_src_prepare
 }

 src_configure() {
@ -86,7 +86,7 @@ src_configure() {
 	if [[ "${PV}" == *_beta* ]] ; then
 		mycmakeargs+=( -DOVERRIDE_VERSION="${PV/_/-}" )
 	fi
-	cmake-utils_src_configure
+	cmake_src_configure
 }

 pkg_preinst() {
--- a/app-admin/linux-bench/Manifest
+++ b/app-admin/linux-bench/Manifest
@ -1,21 +0,0 @@
-DIST github.com-aquasecurity-bench-common-81f08528fa03.tar.gz 18981 BLAKE2B 6579a12622870e537a16f467bcfed71ed1c791641e1948caee10a69f8ff7fc28a3f73e48beb8d3b1d274428e498720f528237d07b28fe1319164ab1339852d0e SHA512 b01f88ddb7c119dc9d7e4f7f3e2d9c80b4046dcd65c6d5f2640d28c235c04fbe03b348032584350485f6323920f692cd96ff73e4140faaeb26d7d5b6eb24671f
-DIST github.com-fatih-color-v1.7.0.tar.gz 816449 BLAKE2B f006f51cbd1a0288380b339d7d2b493e447aa1e6bd783f11de5670d4db6ff8c1463cbe957a04127c1f24186a9362be8c40ecdf4394cbbc0e2c6c2cb598c012ac SHA512 ee5668ce828ad3e5461c54d971aee4b10a578f697717010d60fdda641948430816e74580563dfea6a4c66a9840175ff5b63c2ca9cf1af213cfac5be7b8ddac36
-DIST github.com-fsnotify-fsnotify-v1.4.7.tar.gz 31139 BLAKE2B f2d0aaabfad525fb640beba78991a858ad23203a557a69fc15d2f017b2a693c64c244de435682b1cd9d59e89a97e4ba60c7f95fa99a6145a9dea73b0f334936e SHA512 840943043c49c837641f04b976f2ba610fc03bd31030ca6442744d51fa9241da1905730ea11466e249a5bd37437f1e2a433a012a64ce872a1562c941bd5bfcbf
-DIST github.com-go-yaml-yaml-v2.2.2.tar.gz 70656 BLAKE2B 750d1135eb73dd1eaa08f86294227973fc465ea6212233596253e5385e2081f4576123b7fbd96bfbdcdec4d1171d78c04835d7fbaa4b4e69dabdc3da10bba1de SHA512 210b36f9cc4205f91041e0da08b8eae6afbb9f44fc036bf578223da52a74ee21fa60caa569efbb5b8262e2b885ff13efa68705cbefdf93a1d05b2378d95620e8
-DIST github.com-golang-glog-23def4e6c14b.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
-DIST github.com-golang-sys-a9d3bda3a223.tar.gz 1245170 BLAKE2B 62fd7fea3ab8426f9092e6758573c1fcd8915c776b7f44521d7d82ee42bbe5d4323a8813f1d39c336da6bce3525b4eff1b60e024cbf037738268dc7151024f4d SHA512 79e81f5fc94fe47ce3e794a80e888d09e3d9a192a65fd234a177e1665fde5a9029d1197160edfb5df7e479313665536a1e6445428d41d0c33f5319aa5d79cf51
-DIST github.com-golang-text-v0.3.0.tar.gz 6102619 BLAKE2B c92e68014a8c157d76741c02acd708771d66bd3dda5b19285f5aa3e073e0fe3fccb9054744d35ea62b681ae4421bb7489238d6868f9314fb26f88e002287abe8 SHA512 bd60dfaa7d9dbfca171a3ba40b51f5663c01257cf3b12b618d35689a97ab2212d316d5716ff09681bf40b099f7e20a0e0df8cfc065699cb6a07ad1dc2e2bc189
-DIST github.com-hashicorp-hcl-v1.0.0.tar.gz 70658 BLAKE2B f28dbe8171ce4fa94f57e8bfa8ffe7e16e57147a6a4525a8b5d31d3a47e817e056a85bdb8b91d56be202db27a29f37496f73014d1d97c5d55ce07b89f7ff6848 SHA512 044e3ba2a44a1abd9c851d4ec1f5c541663f8cd7f705c46c6ae2c377fae6df6315a6596c42f391e8239b61f0f0f6caed8d4156f8875cbddfbc7bcb78eaeb466f
-DIST github.com-inconshreveable-mousetrap-v1.0.0.tar.gz 2290 BLAKE2B bd46103e50dd916bad41aafbf8c1945d835222c131a88f4d3fba35feb4b11ae83c900280c9dafc6f0ef92f71b6a3ba02996dcb31d67eb49314b29d23fda2c8b8 SHA512 6f68bd6b7b1c7aa6651fe83b5230b6c8398b85561b01ca6a36ee638e186c325cc70444818de7a569db240159ba5840ed24f212e0defdf9f9890803a7641285d9
-DIST github.com-magiconair-properties-v1.8.0.tar.gz 29504 BLAKE2B 667b8e60ed2ff538a84f199e43c75d37998d6fcb2e9c3cd6b3e069ba9950d45b4cd775797879467ef86b701391078582be2100fe32fbfc4c794f728fb7f38527 SHA512 9790debc8def1a7eae5a1e530ca68e53e562e622b374752f69e40aa508a88b58b95e15a503a8314e7d4f71a42411d1ba462687184c2b251eb41b5ee3f12ce95d
-DIST github.com-mattn-go-colorable-v0.1.2.tar.gz 8518 BLAKE2B 176ecf55b90c106f4801aeee6d03a53eac495d23ccdf70e8276fb9f909ba144e2b59643bf4dd708131abb0ee3d1ca08c334f2accf0c4ad31729d46b8a7509a09 SHA512 fec4d5e9c5d4a259e81fa62d5188bfa6c5309e9113c0d77803f04702c482d4dc4b7ca4ae079a0aa1d8f789b48ad6dd2dc4f86074e8fa51e0fce3214fe88149c8
-DIST github.com-mattn-go-isatty-v0.0.8.tar.gz 3564 BLAKE2B da50a8739bd33249bca2231509948da94d5ac61787e5ac84af17b04a5b76cc751d2d3ab00d1967e1bc71365060835c6d668a8cea607eccd5a4f95bef8cafb240 SHA512 e9dc9181dfa9780bffd5b1aefbee9028d8a38c2c8feef6a0ca28952b57948a41582dc4c372394bdc76f8081490283d055f89cb7a8792418b3ee55a85c32a5b69
-DIST github.com-mitchellh-mapstructure-v1.1.2.tar.gz 20980 BLAKE2B 6792e875503b852773e8f062808f7bfa5a7e77ab4ec9012865750a5e15a13a6338490e7dd865545b8055c043a9f016cdabe6fc71c031a1210eb3a5e0c28a3394 SHA512 86c9fb9494652dd391b67185aae44b9cb14fcf96ba9ff62ed95c8952b01f6485154102e5883d16c6007d18a02bbf34e5937e2842df72c0244d48b22ee6aa9fe3
-DIST github.com-pelletier-go-toml-v1.2.0.tar.gz 57496 BLAKE2B 48ffbd6b1b06df31b89ccda4d5aa7f8b23215a2532aab102612231dcdda3fcad4c277f15a56894e10bb94cb3c891f50e87ef9c0e6c7e1f3f840d14bd85634b25 SHA512 07791bbc0e578ab383776d715942cd4fa723e5fa6f9879676b6820166ca9b776651fd62a0584cbcc52d2ba87cecf18184734ce9b06fb5b490013eb8dff6fbb4d
-DIST github.com-spf13-afero-v1.1.2.tar.gz 45309 BLAKE2B 0de6a204590f40cda8e80495bf57f55827aec4fb0fff58e0ae7d03b25d297edf530af4c8da94f11ad9bd25eb148fb72b083c75d513b8c4802e8d1a557386f101 SHA512 2ea3773346086d7f0e499653649ef9cbe71b5c0ea488b7650630f4262c13fa426522c9f9556ab127c7b8aa2aa97ff0b34cf3a9eba8b7c753ed200292a50a314e
-DIST github.com-spf13-cast-v1.3.0.tar.gz 11085 BLAKE2B f46ad23efac14d599ef7268c033c5f244ea7976982fee02b4d83ae65f91a72150bef359eb24b8c868f8a42ea8a0aeae839dcf82a7646648bf482f2a520704e09 SHA512 4cd15f59860fddbb67055beb15dfb8114ecaad5999a8fb46fbbbdea1cf78eaa094a4893c10b97efc7d2f95509920688659d609623135bf9871e6229043452194
-DIST github.com-spf13-cobra-v0.0.5.tar.gz 111126 BLAKE2B 0f5fe38e3e278603fcc53edfdd72206d7b6850aa3ac4054b4242091949fe327bf80ddc46c20c3df1e644807e5b8882c528ca5d3bc184b9f039038cbe9043835a SHA512 c21a2c935365c74772152e37adea553dc89fd31dae794bd7e8f56d7c9eaafe717e2d0d6f56e1c8d2fe442df445dee9f03bbd30e802e2ac6911babf309b901c04
-DIST github.com-spf13-jwalterweatherman-v1.0.0.tar.gz 6392 BLAKE2B 15ed225aa9eb6afca552a19a7ba22216454a27a29aa9f7ee39758100ff123afe8b10e06fce63bf2f4710fbdcbc5c680d3b4eef1cc3c8d363ce0a9f31ce8a34ca SHA512 13cc90c6f4a9fcdd29610773ada79fa2072223459c824b0f732ed3a6f4c61cb7a65c169f70007d3a08354f0a2e06b67e5257c4b0a0e1989fbc2309e69f7200cf
-DIST github.com-spf13-pflag-v1.0.3.tar.gz 46002 BLAKE2B b7caa90be69c7bb6a36b0da68af309debee6edd6e2596d39e286ebdb10f9f90246736f3af3a35c89ac704e2764d2ac40e76dad09c3147a942200592e3d234916 SHA512 d7121dade4fc06568cfb650a529dda350c60171e97ca405d29b9654a9fd06e453d20f8efc2fd8c51f530cfb0708648b2b2ba06ab40897b262ef2f3baf04d65a7
-DIST github.com-spf13-viper-v1.4.0.tar.gz 44183 BLAKE2B 4294bc3c5076f1305618f4caf5abdfdec200dbd140d48264495319a33c850a99b5bfa406f4987e58ae5b96321044e12235b60ffee018adfc6612daf04870074e SHA512 59d1ac2d84c4e72687df631fcdad723a5ad96e362a851a56fcf2f2dc57b5a9ac03f01f47fd24f5d3b027ffbd011b3981ce3abc21f3b98fcbe04c7f34752d4b01
-DIST linux-bench-0.0.2.tar.gz 73095 BLAKE2B c90b0185886a56a2afe2110c167dd2f7783f2bcdf50670d632ddd4c30f34a8186cb82fc477e6ddd9b9d8fbb22ce19438418dd3db62f8da851a20c04b23f61474 SHA512 acbabcebd5bd79d32863941e501b8e787ff89f92564ce7a0827fe1cde4f6c210bc4a5ff9d9a9e1f5db33b019f215eff3f27869e58ccd23e1eafcb8931dc3f0c9
--- a/app-admin/linux-bench/linux-bench-0.0.2.ebuild
+++ b/app-admin/linux-bench/linux-bench-0.0.2.ebuild
@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/aquasecurity/linux-bench"
-
-EGO_VENDOR=(
-	"github.com/aquasecurity/bench-common 81f08528fa03"
-	"github.com/fatih/color v1.7.0"
-	"github.com/fsnotify/fsnotify v1.4.7"
-	"github.com/golang/glog 23def4e6c14b"
-	"github.com/hashicorp/hcl v1.0.0"
-	"github.com/inconshreveable/mousetrap v1.0.0"
-	"github.com/magiconair/properties v1.8.0"
-	"github.com/mattn/go-colorable v0.1.2"
-	"github.com/mattn/go-isatty v0.0.8"
-	"github.com/mitchellh/mapstructure v1.1.2"
-	"github.com/pelletier/go-toml v1.2.0"
-	"github.com/spf13/afero v1.1.2"
-	"github.com/spf13/cast v1.3.0"
-	"github.com/spf13/cobra v0.0.5"
-	"github.com/spf13/jwalterweatherman v1.0.0"
-	"github.com/spf13/pflag v1.0.3"
-	"github.com/spf13/viper v1.4.0"
-	"golang.org/x/sys a9d3bda3a223 github.com/golang/sys"
-	"golang.org/x/text v0.3.0 github.com/golang/text"
-	"gopkg.in/yaml.v2 v2.2.2 github.com/go-yaml/yaml"
-)
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/aquasecurity/linux-bench/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_VENDOR_URI}"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Bench for Security runs the CIS Distribution-Independent Linux Benchmark"
-HOMEPAGE="https://github.com/aquasecurity/linux-bench"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GO111MODULE=on GOPATH="${S}" go build -mod vendor -v -o ${PN} . || die
-	popd || die
-}
-
-src_install() {
-	dobin src/${EGO_PN}/${PN}
-	insinto /etc/linux-bench
-	doins -r src/${EGO_PN}/cfg
-}
--- a/app-admin/linux-bench/metadata.xml
+++ b/app-admin/linux-bench/metadata.xml
@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">aquasecurity/linux-bench</remote-id>
-	</upstream>
-</pkgmetadata>
--- a/app-admin/setools/files/setools-4.1.1-remove-gui.patch
+++ b/app-admin/setools/files/setools-4.1.1-remove-gui.patch
@ -1,18 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 2ca44c9..0c8a0d9 100644
--- a/setup.py
-+++ b/setup.py
-@@ -180,10 +180,10 @@ setup(name='setools',
-                 'build_lex': LexCommand,
-                 'build_ext': BuildExtCommand,
-                 'build_qhc': QtHelpCommand},
-      packages=['setools', 'setools.diff', 'setools.policyrep', 'setoolsgui', 'setoolsgui.apol'],
-      scripts=['apol', 'sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-+      packages=['setools', 'setools.diff', 'setools.policyrep'],
-+      scripts=['sediff', 'seinfo', 'seinfoflow', 'sesearch', 'sedta'],
-       data_files=[(join(sys.prefix, 'share/man/man1'), glob.glob("man/*.1"))],
-      package_data={'': ['*.ui', '*.qhc', '*.qch'], 'setools': ['perm_map']},
-+      package_data={'setools': ['perm_map']},
-       ext_modules=ext_py_mods,
-       test_suite='tests',
-       license='GPLv2+, LGPLv2.1+',
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@ -1,3 +1,3 @@
 DIST sudo-1.8.28p1.tar.gz 3310254 BLAKE2B a1810af7a42d05cce49bb9d0acf6f3731a5193e9e9c3b458691379131eb86d36995854d11c09525e8d999ed1da7e99cf170634667c5a444aa522b8f23db7d1aa SHA512 bda3de34c15fbb68fc29759542295560ccc1562b419d03709cea51613937e9b92ba689c79c3ef4858aeea90d3d1a4dc0148225b11b22cf82395ae1bad8cb1734
 DIST sudo-1.8.29.tar.gz 3338260 BLAKE2B 7ba29d155bfb1d7ba20e32ade2e8ee3919e70400b6c235e313052b247b48406b9a051e71daa7e47fdb0a9fd0889f4c05b8a1a170c027503b90081e8cec81660e SHA512 ea780922b2afb47df4df4b533fb355fd916cb18a6bfd13c7ca36a25b03ef585d805648c6fa85692bea363b1f83664ac3bc622f99bcd149b3a86f70522eb4d340
-DIST sudo-1.8.30b3.tar.gz 3349576 BLAKE2B e811357aec08612e8d43cc1fc721edbe32f7f44578113a214685709d5851dd9b3b320d09eb0c93a79c97c6706722a18339a931bb8e240d8e39dc94e839420d00 SHA512 c765f69d80207d70d0fd64382b33b08a08c59306e8930cd76eeaf907f22d55f6531e6bdf156514d07692bd700cbda6f1fe670c0dd0fa8b844e094f7561632547
+DIST sudo-1.8.30.tar.gz 3349455 BLAKE2B 5e0aaa41f42c18cd0de473add3665adf797cd37eacfb4abfc9472814ea679c1e88e28e95e13a73eb7d9648174609d80a2d4eccf3bdf87a44186df07aeba60eee SHA512 d44831feabd92d736614239e0e0f086829d84b213c98524fffb4b926a96715b1156538a7ab5e0b6e0db8be67a6e24a1642b3648105b076d23b58c39d0dd947af
--- a/app-admin/sudo/sudo-1.8.30_beta3.ebuild
+++ b/app-admin/sudo/sudo-1.8.30_beta3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
--- a/app-antivirus/clamav/files/clamav-0.100.0_autotools.patch
+++ b/app-antivirus/clamav/files/clamav-0.100.0_autotools.patch
@ -1,10 +0,0 @@
--- clamav-0.100.0/configure.ac_orig	2018-04-12 13:12:58.201729248 +0200
-+++ clamav-0.100.0/configure.ac	2018-04-12 13:23:44.982679360 +0200
-@@ -47,6 +47,7 @@
- LT_CONFIG_LTDL_DIR([libltdl])
- LT_INIT([dlopen disable-static])
- LTDL_INIT([recursive])
-+PKG_PROG_PKG_CONFIG(0.16)
- 
- m4_include([m4/reorganization/build_tools.m4])
- m4_include([m4/reorganization/headers.m4])
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/gcab/Manifest
+++ b/app-arch/gcab/Manifest
@ -1,3 +1,2 @@
 DIST gcab-0.8.tar.xz 337016 BLAKE2B 6f9ccf6d33c4bd32b6cda09083c98ee9b24ffc3b42be9019493a864011a4d3f1e2d1fa766bbdd0a5de29eb04608d91a2ad5c17aa25302e3d94d2ef6ca659d764 SHA512 044b1cbe71b08946031161ca97379df8500be5569d6f4989b8fd8f1d8c48ba0fe757306955de9137958eb870cd4024e4c56f833ce847e5a972339883b39454f2
-DIST gcab-1.2.tar.xz 76088 BLAKE2B 4d8f04ec6211745e841b88e93c5d156843bce9ca8668daf9d39f1197c814d619f7e61b1e20d163c8631da36bf395776c3b20a91a0ec97ff7c609997fa84a538d SHA512 b5cc114f5cea21c21d9ef2009cefce700b5a7f97609e20aa455b84fcefe1693ce2566ddc58dc2b7c97f7db772f8ae3a2f3cc9a0e1d2c23d93d5fbee9101d3f64
 DIST gcab-1.3.tar.xz 77900 BLAKE2B 9ab61c1ab36561cd0bce075c8d491c8e28651c26ff5943a2ddc294a369f7627c300ed698363980dd839b64d512b678d7b3903addeea05657551af308b6e0c5ed SHA512 fd34722bc57a75e9a2aaec354af4629a35936928eb6db5646659c8dd51c8c6fd7fc6786c23f7e91a33a727bf8548327f50725081a8c7b1e0facb877341887b22
--- a/app-arch/gcab/files/1.2-optional-vapi.patch
+++ b/app-arch/gcab/files/1.2-optional-vapi.patch
@ -1,44 +0,0 @@
-From 5ac7272bba9635234fc08ab526b80a9f259d0fc6 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Tue, 12 Feb 2019 11:44:10 +0200
-Subject: [PATCH] build-sys: Support disabling vapi generation independent of
- introspection
-
---
- libgcab/meson.build | 12 +++++++-----
- meson_options.txt   |  1 +
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/libgcab/meson.build b/libgcab/meson.build
-index f939617..3c4ac68 100644
--- a/libgcab/meson.build
-+++ b/libgcab/meson.build
-@@ -93,9 +93,11 @@ if get_option('introspection')
-     ],
-     install : true
-   )
-  gnome.generate_vapi('libgcab-1.0',
-    sources: gir[0],
-    packages : ['gio-2.0'],
-    install : true,
-  )
-+  if get_option('vapi')
-+    gnome.generate_vapi('libgcab-1.0',
-+      sources: gir[0],
-+      packages : ['gio-2.0'],
-+      install : true,
-+    )
-+  endif
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index bbcbbea..b7ade3f 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,3 +1,4 @@
- option('docs', type : 'boolean', value : true, description : 'enable developer documentation')
- option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data')
-+option('vapi', type : 'boolean', value : true, description: 'generate Vala bindings (requires introspection)')
- option('tests', type : 'boolean', value : true, description : 'enable tests')
-- 
-2.17.0
-
--- a/app-arch/gcab/gcab-1.2.ebuild
+++ b/app-arch/gcab/gcab-1.2.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome.org meson vala xdg
-
-DESCRIPTION="Library and tool for working with Microsoft Cabinet (CAB) files"
-HOMEPAGE="https://wiki.gnome.org/msitools"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
-
-IUSE="gtk-doc +introspection test vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.44:2
-	sys-libs/zlib
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-"
-DEPEND="${RDEPEND}
-	dev-util/glib-utils
-	gtk-doc? ( >=dev-util/gtk-doc-1.14
-		app-text/docbook-xml-dtd:4.3 )
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${PV}-optional-vapi.patch ) # https://gitlab.gnome.org/GNOME/gcab/merge_requests/1
-
-src_prepare() {
-	xdg_src_prepare
-	use vala && vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc docs)
-		$(meson_use introspection)
-		$(meson_use vala vapi)
-		$(meson_use test tests)
-	)
-	meson_src_configure
-}
--- a/app-arch/gcab/gcab-1.3.ebuild
+++ b/app-arch/gcab/gcab-1.3.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/msitools"

 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"

 IUSE="gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
--- a/app-arch/zopfli/Manifest
+++ b/app-arch/zopfli/Manifest
@ -1 +1,2 @@
 DIST zopfli-1.0.2.tar.gz 136035 BLAKE2B 23b9af324f50f2fa7276cdb8ac042e251f4e295617638c6e3999b8ecaef5d61d1fe21dd7b8d84e19f7f682f3a592674fcd6c19f359efb86ac4ea57acaac3761e SHA512 290a9506a0c1f3d0510230ca21017e1d2bed830f3f96f9d38c9f27210d89123c3baebd05a1da988eccd5395a7b007f6690f08eb9087550a06eaa69d7531f074e
+DIST zopfli-1.0.3.tar.gz 195227 BLAKE2B fed322e6d0baf8e9008e91fef4c459e8f67f0e7d62942469893d89b8ca39ace6d1ac68cbbc322e938e66a613ea9a36e3ae9f59550b5f4964107bec490a07038a SHA512 362cbeee0b3f04a4c5da512f82671491f874d4ec7b693dca9724ae42123d7ac184cc4d5de1872b4f1fc938c97f79dfdb482f62d1fca4a17cff6d267f6021e8d2
--- a/app-arch/zopfli/zopfli-1.0.3.ebuild
+++ b/app-arch/zopfli/zopfli-1.0.3.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Very good, but slow, deflate or zlib compression"
+HOMEPAGE="https://github.com/google/zopfli/"
+SRC_URI="https://github.com/google/zopfli/archive/${P}.tar.gz"
+
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DOCS=( CONTRIBUTORS README README.zopflipng )
--- a/app-backup/Manifest.gz
+++ b/app-backup/Manifest.gz
--- a/app-backup/amanda/amanda-3.5.1-r1.ebuild
+++ b/app-backup/amanda/amanda-3.5.1-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -145,6 +145,9 @@ src_prepare() {
 	# bug with glibc-2.16.0
 	sed -i -e '/gets is a security/d' "${S}"/gnulib/stdio.in.h || die

+	# https://bugs.gentoo.org/701416 sandbox violation
+	sed -i -e 's/case `"$SAMBA_CLIENT.*/case "Connection to nosuchhost.amanda.org failed" in/' "${S}"/config/amanda/dumpers.m4 || die
+
 	eautoreconf

 	# places for us to work in
--- a/app-backup/backintime/Manifest
+++ b/app-backup/backintime/Manifest
@ -1 +1,2 @@
 DIST backintime-1.2.0_pre20180221.tar.gz 712330 BLAKE2B 9ba40c5f89b9fbdf0b1c381bf2e3edce13553b2c301792627fc037bd2de181804b2dc6cad6e78a02844f8835dcd6415a35590125e832d55187fa2ed1a5fa864b SHA512 ad1bb11ea411904027952809c577de1a5317f40430af9b91b16a2c157d560c72b65c879bb880b557e9b5e333e76a44977a26486f4ed4f45281a5e8b0d4583c2a
+DIST backintime-1.2.1.tar.gz 713853 BLAKE2B 0f05d6cdc04a41ec9737badb8693c1270bb1333b2986fce925625ba2d7be05de0630ff5f59a7b5854a38ba382d6992df1ffc4e1cb584cae0e2618b877db4f06b SHA512 91dbc76a7db81469c5a538be03196c8e307d13307486d8e1c6cad10ce0af399de495f0292fecffc2853ed78804b5899750f06f274b4701efe3af6a708ea1024e
--- a/app-backup/backintime/backintime-1.2.1.ebuild
+++ b/app-backup/backintime/backintime-1.2.1.ebuild
@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit python-single-r1 xdg
+
+DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
+HOMEPAGE="https://backintime.readthedocs.io/en/latest/ https://github.com/bit-team/backintime/"
+SRC_URI="https://github.com/bit-team/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples qt5"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	net-misc/openssh
+	net-misc/rsync[xattr,acl]
+"
+RDEPEND="${DEPEND}
+	qt5? ( dev-python/PyQt5[gui,widgets] )
+"
+
+PATCHES=( "${FILESDIR}/${P}-no-compress-docs-examples.patch" )
+
+src_configure() {
+	pushd common > /dev/null || die
+		./configure --python3 --no-fuse-group || die
+	popd > /dev/null || die
+	if use qt5 ; then
+		pushd qt > /dev/null || die
+			./configure --python3 || die
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	pushd common > /dev/null || die
+		emake
+	popd > /dev/null || die
+	if use qt5 ; then
+		pushd qt > /dev/null || die
+			emake
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	pushd common > /dev/null || die
+		emake DESTDIR="${D}" install
+	popd > /dev/null || die
+	if use qt5 ; then
+		pushd qt > /dev/null || die
+			emake DESTDIR="${D}" install
+		popd > /dev/null || die
+	fi
+
+	einstalldocs
+	if use examples ; then
+		docinto examples
+		dodoc common/{config-example-local,config-example-ssh}
+	fi
+
+	python_optimize "${D}"
+}
--- a/app-backup/backintime/backintime-9999.ebuild
+++ b/app-backup/backintime/backintime-9999.ebuild
@ -1,87 +1,72 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7} )

-inherit python-single-r1 gnome2-utils git-r3
+inherit python-single-r1 git-r3 xdg

 DESCRIPTION="Backup system inspired by TimeVault and FlyBack"
-HOMEPAGE="https://backintime.readthedocs.io/ https://github.com/bit-team/backintime/"
+HOMEPAGE="https://backintime.readthedocs.io/en/latest/ https://github.com/bit-team/backintime/"
 EGIT_REPO_URI="https://github.com/bit-team/backintime/"

 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="qt5"
+IUSE="examples qt5"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"

 DEPEND="${PYTHON_DEPS}
 	dev-python/dbus-python[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
 	net-misc/openssh
-	net-misc/rsync[xattr,acl]"
+	net-misc/rsync[xattr,acl]
+"
 RDEPEND="${DEPEND}
-	qt5? ( dev-python/PyQt5 )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+	qt5? ( dev-python/PyQt5[gui,widgets] )
+"

-src_prepare() {
-	#fix doc install location
-	sed -e "s:/doc/${PN}-common:/doc/${PF}:g" \
-		-i common/configure || die
-	sed -e "s:/doc/${PN}-qt:/doc/${PF}:g" \
-		-i qt/configure || die
-	sed -e "/addInstallFile \"..\/VERSION/d" \
-		-e "/addInstallFile \"..\/LICENSE/d" \
-		-e "/addInstallFile \"..\/debian\/copyright/d" \
-		-i {qt,common}/configure || die
-
-	if [ -n ${LINGUAS+x} ] ; then
-		cd common/po || die
-		for po in *.po ; do
-			if ! has ${po/.po} ${LINGUAS} ; then
-				rm ${po} || die
-			fi
-		done
-	fi
-
-	default
-}
+PATCHES=( "${FILESDIR}/${PN}-1.2.1-no-compress-docs-examples.patch" )

 src_configure() {
-	cd "${S}"/common || die
+	pushd common > /dev/null || die
 		./configure --python3 --no-fuse-group || die
+	popd > /dev/null || die
 	if use qt5 ; then
-		cd "${S}"/qt || die
+		pushd qt > /dev/null || die
 			./configure --python3 || die
+		popd > /dev/null || die
 	fi
 }

 src_compile() {
-	cd "${S}"/common || die
+	pushd common > /dev/null || die
 		emake
+	popd > /dev/null || die
 	if use qt5 ; then
-		cd "${S}"/qt || die
+		pushd qt > /dev/null || die
 			emake
+		popd > /dev/null || die
 	fi
 }

 src_install() {
-	cd "${S}"/common || die
+	pushd common > /dev/null || die
 		emake DESTDIR="${D}" install
+	popd > /dev/null || die
 	if use qt5 ; then
-		cd "${S}"/qt || die
+		pushd qt > /dev/null || die
 			emake DESTDIR="${D}" install
+		popd > /dev/null || die
 	fi

-	python_optimize "${D}"
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
+	einstalldocs
+	if use examples ; then
+		docinto examples
+		dodoc common/{config-example-local,config-example-ssh}
+	fi

-pkg_postrm() {
-	gnome2_icon_cache_update
+	python_optimize "${D}"
 }
--- a/app-backup/backintime/files/backintime-1.2.1-no-compress-docs-examples.patch
+++ b/app-backup/backintime/files/backintime-1.2.1-no-compress-docs-examples.patch
@ -0,0 +1,142 @@
+From 897f81aefa1dfcfb8c645375e0c4baeadd39c9c0 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 31 Dec 2019 22:13:23 +0100
+Subject: [PATCH] No compress, no DOCS install, no examples install, fix
+ docbook path
+
+---
+ common/configure | 36 ++++--------------------------------
+ qt/configure     | 30 ++++++------------------------
+ 2 files changed, 10 insertions(+), 56 deletions(-)
+
+diff --git a/common/configure b/common/configure
+index 87cdc48..c1dd1af 100755
+--- a/common/configure
+++ b/common/configure
+@@ -166,7 +166,7 @@ printf "DEST=\$(DESTDIR)\$(PREFIX)\n\n" >> ${MAKEFILE}
+ 
+ printf "all:\tbuild\n\n" >> ${MAKEFILE}
+ 
+-printf "build:\ttranslate compress\n\n" >> ${MAKEFILE}
+printf "build:\ttranslate\n\n" >> ${MAKEFILE}
+ 
+ printf "clean:\n" >> ${MAKEFILE}
+ printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
+@@ -191,30 +191,11 @@ addInstallFiles "plugins/*.py" "/share/backintime/plugins"
+ addUninstallDir                "/share/backintime"
+ addNewline
+ 
+-addComment "documentation"
+-addInstallDir                        "/share/doc/backintime-common"
+-addInstallFile "../debian/copyright" "/share/doc/backintime-common"
+-addInstallFile "../AUTHORS"          "/share/doc/backintime-common"
+-addInstallFile "../LICENSE"          "/share/doc/backintime-common"
+-addInstallFile "../README.md"        "/share/doc/backintime-common"
+-addInstallFile "../TRANSLATIONS"     "/share/doc/backintime-common"
+-addInstallFile "../VERSION"          "/share/doc/backintime-common"
+-addInstallFile "../CHANGES"          "/share/doc/backintime-common"
+-addNewline
+-
+-addComment "config-examples"
+-addInstallDir                            "/share/doc/backintime-common/examples"
+-addInstallFile "config-example-local.gz" "/share/doc/backintime-common/examples"
+-addInstallFile "config-example-ssh.gz"   "/share/doc/backintime-common/examples"
+-addUninstallDir                          "/share/doc/backintime-common"
+-addUninstallDir                          "/share/doc"
+-addNewline
+-
+ addComment "man"
+ addInstallDir                                  "/share/man/man1"
+-addInstallFile "man/C/backintime.1.gz"         "/share/man/man1"
+-addInstallFile "man/C/backintime-askpass.1.gz" "/share/man/man1"
+-addInstallFile "man/C/backintime-config.1.gz"  "/share/man/man1"
+addInstallFile "man/C/backintime.1"            "/share/man/man1"
+addInstallFile "man/C/backintime-askpass.1"    "/share/man/man1"
+addInstallFile "man/C/backintime-config.1"     "/share/man/man1"
+ addUninstallDir                                "/share/man"
+ addNewline
+ 
+@@ -238,15 +219,6 @@ addSymlink      "backintime"        "/share/bash-completion/completions/backinti
+ addUninstallDir                     "/share/bash-completion"
+ addNewline
+ 
+-#compress
+-printf "compress:\n" >> ${MAKEFILE}
+-printf "\t#man pages\n" >> ${MAKEFILE}
+-printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE}
+-
+-printf "\t#config-examples\n" >> ${MAKEFILE}
+-printf "\tgzip -n --best -c config-example-local > config-example-local.gz\n" >> ${MAKEFILE}
+-printf "\tgzip -n --best -c config-example-ssh > config-example-ssh.gz\n\n" >> ${MAKEFILE}
+-
+ #translate
+ printf "translate:\t$mos\n\n" >> ${MAKEFILE}
+ 
+diff --git a/qt/configure b/qt/configure
+index 4b56b70..8bbdfcb 100755
+--- a/qt/configure
+++ b/qt/configure
+@@ -126,7 +126,7 @@ printf "DEST=\$(DESTDIR)\$(PREFIX)\n\n" >> ${MAKEFILE}
+ 
+ printf "all:\tbuild\n\n" >> ${MAKEFILE}
+ 
+-printf "build:\tcompress\n\n" >> ${MAKEFILE}
+printf "build:\t\n\n" >> ${MAKEFILE}
+ 
+ printf "clean:\n" >> ${MAKEFILE}
+ printf "\trm -f po/*.mo\n" >> ${MAKEFILE}
+@@ -174,34 +174,21 @@ addInstallFiles "net.launchpad.backintime*.policy" "/share/polkit-1/actions"
+ addUninstallDir                                    "/share/polkit-1"
+ addNewline
+ 
+-addComment "documentation"
+-addInstallDir                        "/share/doc/backintime-qt"
+-addInstallFile "../debian/copyright" "/share/doc/backintime-qt"
+-addInstallFile "../AUTHORS"          "/share/doc/backintime-qt"
+-addInstallFile "../LICENSE"          "/share/doc/backintime-qt"
+-addInstallFile "../README.md"        "/share/doc/backintime-qt"
+-addInstallFile "../TRANSLATIONS"     "/share/doc/backintime-qt"
+-addInstallFile "../VERSION"          "/share/doc/backintime-qt"
+-addInstallFile "../CHANGES"          "/share/doc/backintime-qt"
+-addNewline
+-
+ addComment ".desktop"
+ addInstallDir               "/share/applications"
+ addInstallFiles "*.desktop" "/share/applications"
+ addNewline
+ 
+ addComment "docbook"
+-addInstallDir                          "/share/doc/qt/HTML/en/backintime"
+-addInstallFiles "docbook/en/*.docbook" "/share/doc/qt/HTML/en/backintime"
+-addUninstallDir                        "/share/doc/qt/HTML/en"
+-addUninstallDir                        "/share/doc/qt/HTML"
+-addUninstallDir                        "/share/doc/qt"
+-addUninstallDir                        "/share/doc"
+addInstallDir                          "/share/help/en/backintime"
+addInstallFiles "docbook/en/*.docbook" "/share/help/en/backintime"
+addUninstallDir                        "/share/help/en"
+addUninstallDir                        "/share/help"
+ addNewline
+ 
+ addComment "man"
+ addInstallDir    "/share/man/man1"
+-addInstallFile   "man/C/backintime-qt.1.gz" "/share/man/man1"
+addInstallFile   "man/C/backintime-qt.1"    "/share/man/man1"
+ addUninstallDir  "/share/man"
+ addNewline
+ 
+@@ -216,11 +203,6 @@ addUninstallDir                                             "/share/icons"
+ addUninstallDir                                             "/share"
+ addNewline
+ 
+-#compress
+-printf "compress:\n" >> ${MAKEFILE}
+-printf "\t#man pages\n" >> ${MAKEFILE}
+-printf "\tfor i in \$\$(ls -1 man/C/); do case \$\$i in *.gz|*~) continue;; *) gzip -n --best -c man/C/\$\$i > man/C/\$\${i}.gz;; esac; done\n\n" >> ${MAKEFILE}
+-
+ #uninstall
+ printf "uninstall: uninstall_files uninstall_dirs\n\n" >> ${MAKEFILE}
+ printf "uninstall_files:\n" >> ${MAKEFILE}
+-- 
+2.24.1
+
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
--- a/app-cdr/xfburn/xfburn-0.6.1.ebuild
+++ b/app-cdr/xfburn/xfburn-0.6.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 arm ~ppc x86"
 IUSE="gstreamer +udev"

 RDEPEND=">=dev-libs/glib-2.32:=
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@ -1,2 +1 @@
-DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d
 DIST argon2-20190702.tar.gz 1505307 BLAKE2B fa9c3dde7b39c8d797a3d6b52992ebfe35f5eba1c7d7b3aa02c440edc36a3f5186cacee2e39e27ed7c6356dc1970dac0e8198d6f2065eb63ff77f9dfb2937cf8 SHA512 0a4cb89e8e63399f7df069e2862ccd05308b7652bf4ab74372842f66bcc60776399e0eaf979a7b7e31436b5e6913fe5b0a6949549d8c82ebd06e0629b106e85f
--- a/app-crypt/argon2/argon2-20171227-r1.ebuild
+++ b/app-crypt/argon2/argon2-20171227-r1.ebuild
@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
-HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
-SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 CC0-1.0 )"
-SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/phc-winner-${P}"
-
-DOCS=( argon2-specs.pdf CHANGELOG.md README.md )
-
-src_prepare() {
-	default
-	if ! use static-libs; then
-		sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
-	fi
-	sed -i -e 's/-O3 //' -e 's/-g //' -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
-
-	sed -i -e "s/lib\/@HOST_MULTIARCH@/$(get_libdir)/" -e "s/@UPSTREAM_VER@/${PV}/" lib${PN}.pc || die
-
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${ED}" LIBRARY_REL="$(get_libdir)" install
-	einstalldocs
-	doman man/${PN}.1
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins lib${PN}.pc
-}
--- a/app-crypt/argon2/argon2-20190702.ebuild
+++ b/app-crypt/argon2/argon2-20190702.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -11,7 +11,7 @@ SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}

 LICENSE="|| ( Apache-2.0 CC0-1.0 )"
 SLOT="0/1"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs"

 S="${WORKDIR}/phc-winner-${P}"
@ -31,10 +31,15 @@ src_prepare() {

 	tc-export CC

-	if use amd64 || use x86; then
-		OPTTEST=0
-	else
 	OPTTEST=1
+	if use amd64 || use x86; then
+		$(tc-getCPP) ${CFLAGS} ${CPPFLAGS} -P - <<-EOF &>/dev/null && OPTTEST=0
+			#if defined(__SSE2__)
+			true
+			#else
+			#error false
+			#endif
+		EOF
 	fi
 }

--- a/app-crypt/minisign/minisign-0.8.ebuild
+++ b/app-crypt/minisign/minisign-0.8.ebuild
@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
 else
 	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64"
 fi

 LICENSE="ISC"
--- a/app-crypt/minisign/minisign-9999.ebuild
+++ b/app-crypt/minisign/minisign-9999.ebuild
@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/jedisct1/${PN}.git"
 else
 	SRC_URI="https://github.com/jedisct1/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64"
 fi

 LICENSE="ISC"
--- a/app-crypt/pesign/pesign-113.ebuild
+++ b/app-crypt/pesign/pesign-113.ebuild
@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 PATCHES=( "${FILESDIR}"/${PN}-113-nss.patch )

 src_compile() {
-	emake AR="$(tc-is-gcc && echo "$(tc-getCC)-ar" || tc-getAR)" \
+	emake AR="$(tc-getAR)" \
 		ARFLAGS="-cvqs" \
 		AS="$(tc-getAS)" \
 		CC="$(tc-getCC)" \
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
--- a/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild
+++ b/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -30,7 +30,7 @@ SRC_URI="

 LICENSE="BSD-2 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86"

 src_prepare() {
 	default
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
--- a/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
+++ b/app-doc/doxygen/doxygen-1.8.16-r1.ebuild
@ -11,10 +11,10 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/doxygen/doxygen.git"
 	SRC_URI=""
-	KEYWORDS="alpha amd64 arm arm64 ia64 sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
 else
 	SRC_URI="http://doxygen.nl/files/${P}.src.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="Documentation system for most programming languages"
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
+++ b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild
@ -4,7 +4,7 @@
 EAPI=7

 COMMIT=5ba17f90ec173e773470bc80ea26bca9a3f093fd
-inherit cmake-utils xdg
+inherit cmake xdg

 DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting"
 HOMEPAGE="http://juffed.com/en/"
@ -41,7 +41,7 @@ src_prepare() {
 	# Upstream version outdated/dysfunctional and CRLF terminated
 	cp "${FILESDIR}"/FindQtSingleApplication.cmake cmake/ || die

-	cmake-utils_src_prepare
+	cmake_src_prepare

 	sed -i -e '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt || die
 }
@ -54,5 +54,5 @@ src_configure() {
 		-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
 		-DLIB_SUFFIX=${libdir/lib/}
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
--- a/app-editors/nano/nano-4.6.ebuild
+++ b/app-editors/nano/nano-4.6.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-${PV/_}"
 	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi

 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
--- a/app-editors/neovim/neovim-0.3.8.ebuild
+++ b/app-editors/neovim/neovim-0.3.8.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils

 DESCRIPTION="Vim-fork focused on extensibility and agility"
 HOMEPAGE="https://neovim.io"
@ -62,7 +62,7 @@ src_prepare() {
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
 		-i src/nvim/globals.h || die

-	cmake-utils_src_prepare
+	cmake_src_prepare
 }

 src_configure() {
@ -71,11 +71,11 @@ src_configure() {
 		-DENABLE_JEMALLOC=$(usex jemalloc)
 		-DPREFER_LUA=$(usex luajit no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }

 src_install() {
-	cmake-utils_src_install
+	cmake_src_install

 	# install a default configuration file
 	insinto /etc/vim
--- a/app-editors/neovim/neovim-0.4.2.ebuild
+++ b/app-editors/neovim/neovim-0.4.2.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-inherit cmake-utils eutils xdg
+inherit cmake eutils xdg

 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@ -58,7 +58,7 @@ src_prepare() {
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
 		-i src/nvim/globals.h || die

-	cmake-utils_src_prepare
+	cmake_src_prepare
 }

 src_configure() {
@ -66,11 +66,11 @@ src_configure() {
 		-DFEAT_TUI=$(usex tui)
 		-DPREFER_LUA=$(usex luajit no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }

 src_install() {
-	cmake-utils_src_install
+	cmake_src_install

 	# install a default configuration file
 	insinto /etc/vim
--- a/app-editors/neovim/neovim-0.4.3.ebuild
+++ b/app-editors/neovim/neovim-0.4.3.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-inherit cmake-utils eutils xdg
+inherit cmake eutils xdg

 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@ -58,7 +58,7 @@ src_prepare() {
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
 		-i src/nvim/globals.h || die

-	cmake-utils_src_prepare
+	cmake_src_prepare
 }

 src_configure() {
@ -66,11 +66,11 @@ src_configure() {
 		-DFEAT_TUI=$(usex tui)
 		-DPREFER_LUA=$(usex luajit no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }

 src_install() {
-	cmake-utils_src_install
+	cmake_src_install

 	# install a default configuration file
 	insinto /etc/vim
--- a/app-editors/neovim/neovim-9999.ebuild
+++ b/app-editors/neovim/neovim-9999.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-inherit cmake-utils eutils xdg
+inherit cmake eutils xdg

 DESCRIPTION="Vim-fork focused on extensibility and agility."
 HOMEPAGE="https://neovim.io"
@ -59,7 +59,7 @@ src_prepare() {
 	sed -e "/^# define SYS_VIMRC_FILE/s|\$VIM|${EPREFIX}/etc/vim|" \
 		-i src/nvim/globals.h || die

-	cmake-utils_src_prepare
+	cmake_src_prepare
 }

 src_configure() {
@ -67,11 +67,11 @@ src_configure() {
 		-DFEAT_TUI=$(usex tui)
 		-DPREFER_LUA=$(usex luajit no yes)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }

 src_install() {
-	cmake-utils_src_install
+	cmake_src_install

 	# install a default configuration file
 	insinto /etc/vim
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch
+++ b/app-emacs/d-mode/files/d-mode-2.0.6-emacs-24.4.patch
@ -1,13 +0,0 @@
-https://bugs.gentoo.org/536490
-https://bugs.gentoo.org/547026
-
--- Emacs-D-Mode-2.0.6-orig/d-mode.el
-+++ Emacs-D-Mode-2.0.6/d-mode.el
-@@ -66,6 +66,7 @@
- ;; necessary to get them compiled.)
- ;; Coment out 'when-compile part for debugging
- (eval-when-compile
-+  (require 'cl)
-   (require 'cc-langs)
-   (require 'cc-fonts)
- )
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/libvirt-glib/Manifest
+++ b/app-emulation/libvirt-glib/Manifest
@ -1,2 +1,3 @@
 DIST libvirt-glib-1.0.0.tar.gz 860450 BLAKE2B 417a3bd0df41787fbec456f301af744a04649db02192ef9c80bf42214a112a050a9f054c81549a114e7a1236c86e0066e8002f0c7f09317abb672fe5f6a76789 SHA512 72f53a90d3e40aa93d4afe5b29f631afe859532fbdb4e27086da3bd4cdaf0fb25fc808a82a1994b7c2648a1e864876ce95de28acb3b4876dac47b0f4d1c97ba5
 DIST libvirt-glib-2.0.0.tar.gz 868946 BLAKE2B 1ff4695b25766d6caa603826dcc63e64aa3ce022e6623eb31017fb67a490baeb546a9bc67e16fc16c7b86040db971748b1ef4303a21b5dec098cf732f77c92ec SHA512 6ead4c37c314eb5670c5aa282ce039a0182a71a20b349a5d9c78367381eb674fad0f2ca0f2e20e1e89ff7df2ac9f1640f20fdfa63d599d8a2538fb4c0fba4c3f
+DIST libvirt-glib-3.0.0.tar.gz 899180 BLAKE2B ef10b3d9bad48e49dd1898733aacb2f51f1826330eda9c63a7f8df5f11c96812f8cc7fe6a867961efa85a433f45c934d75cf605eb523ec723459da4646335b1a SHA512 b9e7d782c25b5c3a9b2829f1be8162352438ab3505510a1ca7dd64d741eaab158dc9206fdd4b0e3e27b0c049e4bcfc47db0c9a7fa1a84888864e23d3c35c079e
--- a/app-emulation/libvirt-glib/libvirt-glib-3.0.0.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-3.0.0.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 vala
+
+DESCRIPTION="GLib and GObject mappings for libvirt"
+HOMEPAGE="http://libvirt.org/git/?p=libvirt-glib.git"
+SRC_URI="ftp://libvirt.org/libvirt/glib/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="+introspection nls +vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	>=app-emulation/libvirt-1.2.6:=
+	>=dev-libs/glib-2.38.0:2
+	introspection? ( >=dev-libs/gobject-introspection-1.36.0:= )"
+DEPEND="${RDEPEND}
+	dev-util/glib-utils
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
+
+src_prepare() {
+	gnome2_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-test-coverage \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable nls) \
+		$(use_enable vala)
+}
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@ -1,3 +1,4 @@
+DIST libvirt-5.10.0.tar.xz 8732120 BLAKE2B 9b191a624cca2c84d157482c48cd4eec0456382aa861958880bbbdc25785625386f63320a0626e52683776cca25c4af80ee65d19349ed0b2862e76a074e4e419 SHA512 bb518a6aa6731a7de4b24fc7b8ffdcd2cdd84dfe49047374e0f02265c274eb06dbe1732c9cc4954412853d36d9dd5c1124fb8a5e37f4c01654d85013773ffa23
 DIST libvirt-5.2.0.tar.xz 14992888 BLAKE2B d68aedb634a70063a116e112689f252d3fc2fe5369a4cdde8cacd392e806203bf277406bb10c751bae27f34f27a38355fde84573b6221fc4843393f9ae60ae5c SHA512 378dc1552263cce746117487abc0a1f3411e5be149331717158ba23825734ceae7ca474290264d71de798fdd089ad9672026bcb242fa5b3aef87294284d06f04
 DIST libvirt-5.5.0.tar.xz 12930224 BLAKE2B 4add0b727e4754bd1b2b4e9020942b17872533737e496ddf7976bf86a0fd3bcfbebd83387a8f3bab8dcc9afb05755b245e55682ed17d6094085d3dc96d94eefe SHA512 47923aaca605fb43a53238ac535abc1f88f73435336b8f3e88cb01df277ed205d99c586991e523aa32b50c832a0a7c949ab5f84dc78eb8d18a4951cfc791448d
 DIST libvirt-5.6.0.tar.xz 13147976 BLAKE2B dbfc997123f43fcf9d635b59fffa00d96826e673c4037105151bde2c4a0fb3015a0e458e8e67969b5513a4ddbf41d062feb91e6a86054ddcc1d661f0554fd1f7 SHA512 95fe931394fb31288faf73349bb298f08f63cf062f851b9935303145f8166f69128be9360757f0e1845256c14f4d7672843dba0dc6c086b1c3c8bfc035cc8986
--- a/app-emulation/libvirt/libvirt-5.10.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.10.0.ebuild
@ -0,0 +1,379 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
+	SRC_URI=""
+	KEYWORDS=""
+	SLOT="0"
+else
+	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	SLOT="0/${PV}"
+fi
+
+DESCRIPTION="C toolkit to manipulate virtual machines"
+HOMEPAGE="http://www.libvirt.org/"
+LICENSE="LGPL-2.1"
+IUSE="
+	apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
+	iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
+	parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa
+	virtualbox virt-network wireshark-plugins xen zfs
+"
+
+REQUIRED_USE="
+	firewalld? ( virt-network )
+	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
+	lxc? ( caps libvirtd )
+	openvz? ( libvirtd )
+	policykit? ( dbus )
+	qemu? ( libvirtd )
+	vepa? ( macvtap )
+	virt-network? ( libvirtd )
+	virtualbox? ( libvirtd )
+	xen? ( libvirtd )"
+
+# gettext.sh command is used by the libvirt command wrappers, and it's
+# non-optional, so put it into RDEPEND.
+# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
+# package will use 3 by default. Since we don't have slot pinning in an API,
+# we must go with the most recent
+RDEPEND="
+	acct-user/qemu
+	policykit? ( acct-group/libvirt )
+	app-misc/scrub
+	>=dev-libs/glib-2.48.0
+	dev-libs/libgcrypt:0
+	dev-libs/libnl:3
+	>=dev-libs/libxml2-2.7.6
+	>=net-analyzer/openbsd-netcat-1.105-r1
+	>=net-libs/gnutls-1.0.25:0=
+	net-libs/libssh2
+	net-libs/libtirpc
+	net-libs/rpcsvc-proto
+	>=net-misc/curl-7.18.0
+	sys-apps/dmidecode
+	>=sys-apps/util-linux-2.17
+	sys-devel/gettext
+	sys-libs/ncurses:0=
+	sys-libs/readline:=
+	apparmor? ( sys-libs/libapparmor )
+	audit? ( sys-process/audit )
+	caps? ( sys-libs/libcap-ng )
+	dbus? ( sys-apps/dbus )
+	dtrace? ( dev-util/systemtap )
+	firewalld? ( >=net-firewall/firewalld-0.6.3 )
+	fuse? ( >=sys-fs/fuse-2.8.6:= )
+	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
+	iscsi? ( sys-block/open-iscsi )
+	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
+	libssh? ( net-libs/libssh )
+	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
+	lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] )
+	nfs? ( net-fs/nfs-utils )
+	numa? (
+		>sys-process/numactl-2.0.2
+		sys-process/numad
+	)
+	parted? (
+		>=sys-block/parted-1.8[device-mapper]
+		sys-fs/lvm2[-device-mapper-only(-)]
+	)
+	pcap? ( >=net-libs/libpcap-1.0.0 )
+	policykit? ( >=sys-auth/polkit-0.9 )
+	qemu? (
+		>=app-emulation/qemu-1.5.0
+		dev-libs/yajl
+	)
+	rbd? ( sys-cluster/ceph )
+	sasl? ( dev-libs/cyrus-sasl )
+	selinux? ( >=sys-libs/libselinux-2.0.85 )
+	virt-network? (
+		net-dns/dnsmasq[script]
+		net-firewall/ebtables
+		>=net-firewall/iptables-1.4.10[ipv6]
+		net-misc/radvd
+		sys-apps/iproute2[-minimal]
+	)
+	virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
+	wireshark-plugins? ( net-analyzer/wireshark:= )
+	xen? (
+		>=app-emulation/xen-4.6.0
+		app-emulation/xen-tools:=
+	)
+	udev? (
+		virtual/udev
+		>=x11-libs/libpciaccess-0.10.9
+	)
+	zfs? ( sys-fs/zfs )"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/xhtml1
+	dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-XPath
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.7.0-do-not-use-sysconf.patch
+	"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
+	"${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
+)
+
+pkg_setup() {
+	# Check kernel configuration:
+	CONFIG_CHECK=""
+	use fuse && CONFIG_CHECK+="
+		~FUSE_FS"
+
+	use lvm && CONFIG_CHECK+="
+		~BLK_DEV_DM
+		~DM_MULTIPATH
+		~DM_SNAPSHOT"
+
+	use lxc && CONFIG_CHECK+="
+		~BLK_CGROUP
+		~CGROUP_CPUACCT
+		~CGROUP_DEVICE
+		~CGROUP_FREEZER
+		~CGROUP_NET_PRIO
+		~CGROUP_PERF
+		~CGROUPS
+		~CGROUP_SCHED
+		~CPUSETS
+		~IPC_NS
+		~MACVLAN
+		~NAMESPACES
+		~NET_CLS_CGROUP
+		~NET_NS
+		~PID_NS
+		~POSIX_MQUEUE
+		~SECURITYFS
+		~USER_NS
+		~UTS_NS
+		~VETH
+		~!GRKERNSEC_CHROOT_MOUNT
+		~!GRKERNSEC_CHROOT_DOUBLE
+		~!GRKERNSEC_CHROOT_PIVOT
+		~!GRKERNSEC_CHROOT_CHMOD
+		~!GRKERNSEC_CHROOT_CAPS"
+
+	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
+		~DEVPTS_MULTIPLE_INSTANCES"
+
+	use macvtap && CONFIG_CHECK+="
+		~MACVTAP"
+
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_MARK_T
+		~BRIDGE_NF_EBTABLES
+		~NETFILTER_ADVANCED
+		~NETFILTER_XT_CONNMARK
+		~NETFILTER_XT_MARK
+		~NETFILTER_XT_TARGET_CHECKSUM
+		~IP_NF_FILTER
+		~IP_NF_MANGLE
+		~IP_NF_NAT
+		~IP_NF_TARGET_MASQUERADE
+		~IP6_NF_FILTER
+		~IP6_NF_MANGLE
+		~IP6_NF_NAT"
+	# Bandwidth Limiting Support
+	use virt-network && CONFIG_CHECK+="
+		~BRIDGE_EBT_T_NAT
+		~IP_NF_TARGET_REJECT
+		~NET_ACT_POLICE
+		~NET_CLS_FW
+		~NET_CLS_U32
+		~NET_SCH_HTB
+		~NET_SCH_INGRESS
+		~NET_SCH_SFQ"
+
+	# Handle specific kernel versions for different features
+	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
+	if kernel_is ge 3 6; then
+		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
+		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
+	fi
+
+	ERROR_USER_NS="Optional depending on LXC configuration."
+
+	if [[ -n ${CONFIG_CHECK} ]]; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	touch "${S}/.mailmap"
+
+	default
+
+	if [[ ${PV} = *9999* ]]; then
+		# Reinitialize submodules as this is required for gnulib's bootstrap
+		git submodule init
+		# git checkouts require bootstrapping to create the configure script.
+		# Additionally the submodules must be cloned to the right locations
+		# bug #377279
+		./bootstrap || die "bootstrap failed"
+		(
+		    git submodule status .gnulib | awk '{ print $1 }'
+		    git hash-object bootstrap.conf
+		    git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
+		) >.git-module-status
+	fi
+
+	# Tweak the init script:
+	cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
+	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
+		-i "${S}/libvirtd.init" || die "sed failed"
+
+	eautoreconf
+}
+
+my_src_configure() {
+	local myeconfargs=(
+		$(use_with apparmor)
+		$(use_with apparmor apparmor-profiles)
+		$(use_with audit)
+		$(use_with caps capng)
+		$(use_with dbus)
+		$(use_with dtrace)
+		$(use_with firewalld)
+		$(use_with fuse)
+		$(use_with glusterfs)
+		$(use_with glusterfs storage-gluster)
+		$(use_with iscsi storage-iscsi)
+		$(use_with iscsi-direct storage-iscsi-direct)
+		$(use_with libvirtd)
+		$(use_with libssh)
+		$(use_with lvm storage-lvm)
+		$(use_with lvm storage-mpath)
+		$(use_with lxc)
+		$(use_with macvtap)
+		$(use_enable nls)
+		$(use_with numa numactl)
+		$(use_with numa numad)
+		$(use_with openvz)
+		$(use_with parted storage-disk)
+		$(use_with pcap libpcap)
+		$(use_with phyp)
+		$(use_with policykit polkit)
+		$(use_with qemu)
+		$(use_with qemu yajl)
+		$(use_with rbd storage-rbd)
+		$(use_with sasl)
+		$(use_with selinux)
+		$(use_with udev)
+		$(use_with vepa virtualport)
+		$(use_with virt-network network)
+		$(use_with wireshark-plugins wireshark-dissector)
+		$(use_with xen libxl)
+		$(use_with zfs storage-zfs)
+
+		--without-hal
+		--without-netcf
+		--without-sanlock
+
+		--with-esx
+		--with-init-script=systemd
+		--with-qemu-group=$(usex caps qemu root)
+		--with-qemu-user=$(usex caps qemu root)
+		--with-remote
+		--with-storage-fs
+		--with-vmware
+
+		--disable-static
+		--disable-werror
+
+		--localstatedir=/var
+		--enable-dependency-tracking
+	)
+
+	if use virtualbox && has_version app-emulation/virtualbox-ose; then
+		myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
+	else
+		myeconfargs+=( $(use_with virtualbox vbox) )
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	if [[ ${PV} = *9999* ]]; then
+		# Restore gnulib's config.sub and config.guess
+		# bug #377279
+		(cd ${S}/.gnulib && git reset --hard > /dev/null)
+	fi
+}
+
+my_src_test() {
+	# remove problematic tests, bug #591416, bug #591418
+	sed -i -e 's#commandtest$(EXEEXT) # #' \
+		-e 's#virfirewalltest$(EXEEXT) # #' \
+		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
+		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
+		tests/Makefile
+
+	export VIR_TEST_DEBUG=1
+	HOME="${T}" emake check
+}
+
+my_src_install() {
+	emake DESTDIR="${D}" \
+		SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
+
+	find "${D}" -name '*.la' -delete || die
+
+	# Remove bogus, empty directories. They are either not used, or
+	# libvirtd is able to create them on demand
+	rm -rf "${D}"/etc/sysconfig
+	rm -rf "${D}"/var
+
+	newbashcomp "${S}/tools/bash-completion/vsh" virsh
+	bashcomp_alias virsh virt-admin
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	systemd_install_serviced \
+		"${FILESDIR}"/libvirtd.service.conf libvirtd.service
+
+	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
+
+	newinitd "${S}/libvirtd.init" libvirtd
+	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
+	newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
+	newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
+
+	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
+	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
+
+	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
+	DISABLE_AUTOFORMATTING=true
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# we only ever want to generate this once
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
+	fi
+}
+
+pkg_postinst() {
+	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
+		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
+	fi
+
+	use libvirtd || return 0
+	# From here, only libvirtd-related instructions, be warned!
+
+	readme.gentoo_print_elog
+}
--- a/app-emulation/libvirt/libvirt-5.8.0.ebuild
+++ b/app-emulation/libvirt/libvirt-5.8.0.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -11,11 +11,11 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
 	SRC_URI=""
-	KEYWORDS=""
+	KEYWORDS="amd64"
 	SLOT="0"
 else
 	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 	SLOT="0/${PV}"
 fi

--- a/app-emulation/q4wine/q4wine-1.3.11.ebuild
+++ b/app-emulation/q4wine/q4wine-1.3.11.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-inherit xdg cmake-utils
+inherit xdg cmake

 # Upstream names the package PV-rX. We change that to
 # PV_pX so we can use portage revisions.
@ -54,5 +54,5 @@ src_configure() {
 		-DUSE_GZIP=OFF
 		-DWITH_DBUS=$(usex dbus ON OFF)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
--- a/app-emulation/qemu/qemu-4.1.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-4.1.0-r1.ebuild
@ -606,7 +606,7 @@ src_test() {
 }

 qemu_python_install() {
-	python_domodule "${S}/python/qemu/qmp.py"
+	python_domodule "${S}/python/qemu"

 	python_doscript "${S}/scripts/kvm/vmxcap"
 	python_doscript "${S}/scripts/qmp/qmp-shell"
--- a/app-emulation/qemu/qemu-4.2.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-4.2.0-r1.ebuild
@ -610,7 +610,7 @@ src_test() {
 }

 qemu_python_install() {
-	python_domodule "${S}/python/qemu/qmp.py"
+	python_domodule "${S}/python/qemu"

 	python_doscript "${S}/scripts/kvm/vmxcap"
 	python_doscript "${S}/scripts/qmp/qmp-shell"
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@ -608,7 +608,7 @@ src_test() {
 }

 qemu_python_install() {
-	python_domodule "${S}/python/qemu/qmp.py"
+	python_domodule "${S}/python/qemu"

 	python_doscript "${S}/scripts/kvm/vmxcap"
 	python_doscript "${S}/scripts/qmp/qmp-shell"
--- a/app-emulation/vagrant/Manifest
+++ b/app-emulation/vagrant/Manifest
@ -1,5 +1 @@
-DIST vagrant-2.1.5.tar.gz 1238788 BLAKE2B 8e3dfeb4d830fde1984c08b16422c99b51ce455fcc63e1fad0eca7860efccbf2e77edc13537bfa495345e585b559fe5462ae872decce036b45c1f54c453983ea SHA512 544216eb25c06a1ebddbadcc9d2d6a6dd9932e33d2554e3d51dba0e24a339b9afe0b85d1322bdb67c5de3d070aa4c854f1ccc931b23ea80f0625eb4d1f120238
-DIST vagrant-2.2.2.tar.gz 1223645 BLAKE2B 595d26a11f27a23a9e66386820dec7c23fbafe079e9e9750e7cbc928cac2e965782abbb062f6b04efd367b56297d040af2b4f4f56d6df06e604f018110e10329 SHA512 70c83fcd896ae3b84fac22c539eb85db9bf08c8f75108d5f2b86841821cf7a885b72565814519b6f2ef3422d84d2f67fc402b983b1a15c1edfd0dc78196cd957
-DIST vagrant-2.2.4.tar.gz 1244111 BLAKE2B ac6b92c1f2b1cc3428b3be8985b07a087f6a075a2b60c93abc74dbff1f5679f648c0bbfc1af772fc10e90899b856a9f318d5d2e4f5a4c9e04452ed95ea356088 SHA512 9d1e9dd42a009d4df159ae3887f43a2664714077a91013a8b63dad72d25d4a236e1dba6daf66443101904f89a5cd37baff65be2714124f7b9f822f26669bcc5a
-DIST vagrant-2.2.5.tar.gz 1272879 BLAKE2B f89aed3e07f12b3390f1db089cc15bc091ee19336174260d39534c32b69a5f4682cc4d84295f81aeec80781e942b66266b37b3032aba562471ecb596d9309e92 SHA512 dc95e566588987b9199e66ee5f548be573bd62e229d2e4de5447f43f25a1a7129377935ec6dc73cc1f53acc29c08b0a4fabebf1a58310f175cc6d37b856c9272
 DIST vagrant-2.2.6.tar.gz 1285530 BLAKE2B 802537b56429366ab0dab08d5490f2a5c1ec3810e9c04573ccd11f27078fc375f092ed70b27a7846813cbde5fdce0aa90399eba07e19a9d6ae7e11cb47204efe SHA512 6d8b5b1d4e5cc482404cf4c59e1b7cf9502a9819569b5098e44874733cee706f26adb4ac7994abe7e3307ca69d3003e2604dc859ce460c53d766d78b8d9fe22a
--- a/app-emulation/vagrant/files/support-vbox-6.1.patch
+++ b/app-emulation/vagrant/files/support-vbox-6.1.patch
@ -0,0 +1,75 @@
+From fb4e6985e142da56bad143d70600cd3695c91757 Mon Sep 17 00:00:00 2001
+From: Brian Cain <bcain@hashicorp.com>
+Date: Wed, 11 Dec 2019 13:25:11 -0800
+Subject: [PATCH] Fixes #11249: Add VirtualBox provider support for version
+ 6.1.x
+
+This commit adds support for VirtualBox version 6.1.x. It simply
+inherits from the base 6.0.x provider class.
+---
+ plugins/providers/virtualbox/driver/meta.rb      |  1 +
+ .../providers/virtualbox/driver/version_6_1.rb   | 16 ++++++++++++++++
+ plugins/providers/virtualbox/plugin.rb           |  1 +
+ website/source/docs/virtualbox/index.html.md     |  2 +-
+ 4 files changed, 19 insertions(+), 1 deletion(-)
+ create mode 100644 plugins/providers/virtualbox/driver/version_6_1.rb
+
+diff --git a/plugins/providers/virtualbox/driver/meta.rb b/plugins/providers/virtualbox/driver/meta.rb
+index 24547b4044..ed013737b0 100644
+--- a/plugins/providers/virtualbox/driver/meta.rb
+++ b/plugins/providers/virtualbox/driver/meta.rb
+@@ -64,6 +64,7 @@ def initialize(uuid=nil)
+             "5.1" => Version_5_1,
+             "5.2" => Version_5_2,
+             "6.0" => Version_6_0,
+            "6.1" => Version_6_1,
+           }
+ 
+           if @@version.start_with?("4.2.14")
+diff --git a/plugins/providers/virtualbox/driver/version_6_1.rb b/plugins/providers/virtualbox/driver/version_6_1.rb
+new file mode 100644
+index 0000000000..ebe417eb91
+--- /dev/null
+++ b/plugins/providers/virtualbox/driver/version_6_1.rb
+@@ -0,0 +1,16 @@
+require File.expand_path("../version_6_0", __FILE__)
+
+module VagrantPlugins
+  module ProviderVirtualBox
+    module Driver
+      # Driver for VirtualBox 6.1.x
+      class Version_6_1 < Version_6_0
+        def initialize(uuid)
+          super
+
+          @logger = Log4r::Logger.new("vagrant::provider::virtualbox_6_1")
+        end
+      end
+    end
+  end
+end
+diff --git a/plugins/providers/virtualbox/plugin.rb b/plugins/providers/virtualbox/plugin.rb
+index e058ec65ad..f2fbf47e55 100644
+--- a/plugins/providers/virtualbox/plugin.rb
+++ b/plugins/providers/virtualbox/plugin.rb
+@@ -59,6 +59,7 @@ module Driver
+       autoload :Version_5_1, File.expand_path("../driver/version_5_1", __FILE__)
+       autoload :Version_5_2, File.expand_path("../driver/version_5_2", __FILE__)
+       autoload :Version_6_0, File.expand_path("../driver/version_6_0", __FILE__)
+      autoload :Version_6_1, File.expand_path("../driver/version_6_1", __FILE__)
+     end
+ 
+     module Model
+diff --git a/website/source/docs/virtualbox/index.html.md b/website/source/docs/virtualbox/index.html.md
+index 558ef5f5d8..e9c1e79aad 100644
+--- a/website/source/docs/virtualbox/index.html.md
+++ b/website/source/docs/virtualbox/index.html.md
+@@ -13,7 +13,7 @@ Vagrant comes with support out of the box for [VirtualBox](https://www.virtualbo
+ a free, cross-platform consumer virtualization product.
+ 
+ The VirtualBox provider is compatible with VirtualBox versions 4.0.x, 4.1.x,
+-4.2.x, 4.3.x, 5.0.x, 5.1.x, 5.2.x, and 6.0.x. Other versions are unsupported and the provider
+4.2.x, 4.3.x, 5.0.x, 5.1.x, 5.2.x, 6.0.x, and 6.1.x. Other versions are unsupported and the provider
+ will display an error message. Please note that beta and pre-release versions
+ of VirtualBox are not supported and may not be well-behaved.
+ 
--- a/app-emulation/vagrant/files/vagrant-r1.in
+++ b/app-emulation/vagrant/files/vagrant-r1.in
@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-#
-# This is a wrapper to properly execute Vagrant within the embedded
-# Vagrant installation directory. This sets up proper environmental variables
-# so that everything loads and compiles to proper directories.
-
-for r in ruby26 ruby25 ruby24; do
-  # not all ruby versions are guaranteed to be installed
-  if ! command -v "${r}" >/dev/null 2>&1; then
-    continue
-  fi
-
-  VAGRANT_DIR="$( "${r}" -e 'print Gem::default_path[-1] + "/gems/vagrant-@VAGRANT_VERSION@"' )"
-
-  # Export the VAGRANT_EXECUTABLE so that pre-rubygems can optimize a bit
-  export VAGRANT_EXECUTABLE="${VAGRANT_DIR}/bin/vagrant"
-
-  if [ -f ${VAGRANT_EXECUTABLE} ] ;then
-    ruby="${r}"
-    break
-  fi
-done
-
-if [ -z ${ruby} ]; then
-  echo "Error: failed to find any usable ruby"
-  exit 1
-fi
-
-# Export GEM_HOME based on VAGRANT_HOME
-#
-# This needs to be set because Bundler includes gem paths
-# from RubyGems' Gem.paths.
-if [ -z ${VAGRANT_HOME} ]; then
-  VAGRANT_HOME="~/.vagrant.d"
-fi
-export GEM_HOME="${VAGRANT_HOME}/gems"
-
-# SSL certs
-export SSL_CERT_FILE="/etc/ssl/certs/ca-certificates.crt"
-
-# Export an environmental variable to say we're in a Vagrant
-# installer created environment.
-export VAGRANT_INSTALLER_ENV=1
-
-# This is currently used only in Vagrant::Plugin::Manager.system_plugins_file
-# to locate plugins configuration file.
-export VAGRANT_INSTALLER_EMBEDDED_DIR="/var/lib/vagrant"
-export VAGRANT_INSTALLER_VERSION=2
-
-# Export the OS as an environmental variable that Vagrant can access
-# so that it can behave better.
-export VAGRANT_DETECTED_OS="$(uname -s 2>/dev/null)"
-
-# Allow to install plugins even with deps in different slots (Bug #628648)
-export VAGRANT_DISABLE_STRICT_DEPENDENCY_ENFORCEMENT=1
-
-# Make it work with rvm (Bugs #474476 #628648)
-unset GEM_HOME GEM_PATH
-
-# Call the actual Vagrant bin with our arguments
-exec "${ruby}" "${VAGRANT_EXECUTABLE}" "$@"
--- a/app-emulation/vagrant/files/vagrant.in
+++ b/app-emulation/vagrant/files/vagrant.in
@ -4,7 +4,7 @@
 # Vagrant installation directory. This sets up proper environmental variables
 # so that everything loads and compiles to proper directories.

-for r in ruby25 ruby24; do
+for r in ruby26 ruby25 ruby24; do
  # not all ruby versions are guaranteed to be installed
  if ! command -v "${r}" >/dev/null 2>&1; then
    continue
--- a/app-emulation/vagrant/vagrant-2.1.5.ebuild
+++ b/app-emulation/vagrant/vagrant-2.1.5.ebuild
@ -1,82 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-USE_RUBY="ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
-RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="A tool for building and distributing development environments"
-HOMEPAGE="https://vagrantup.com/"
-SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+virtualbox"
-RESTRICT="test"
-
-RDEPEND="${RDEPEND}
-	app-arch/libarchive
-	net-misc/curl
-	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
-
-ruby_add_rdepend "
-	>=dev-ruby/childprocess-0.6.0
-	>=dev-ruby/erubis-2.7.0
-	<dev-ruby/i18n-0.8.0:*
-	>=dev-ruby/listen-3.1.5
-	>=dev-ruby/hashicorp-checkpoint-0.1.5
-	>=dev-ruby/log4r-1.1.9 <dev-ruby/log4r-1.1.11
-	>=dev-ruby/net-ssh-5.0.0:*
-	>=dev-ruby/net-sftp-2.1
-	>=dev-ruby/net-scp-1.2.0
-	dev-ruby/rest-client:2
-	<dev-ruby/mime-types-3:*
-"
-
-# upstream specifies rake>=12 but it apparently doesn't need something this
-# recent. Because vagrant builds fine with rake 10 and because stabilizing rake
-# is tricky, we specify a lower dependency requirement here. This way, we'll be
-# able to stabilize vagrant sooner.
-ruby_add_bdepend "
-	>=dev-ruby/rake-10.0.0
-"
-
-all_ruby_prepare() {
-	# remove bundler support
-	sed -i '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-
-	# loosen dependencies
-	sed -e '/hashicorp-checkpoint\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
-		-e '/ruby_dep/s/<=/>=/' \
-		-i ${PN}.gemspec || die
-
-	# remove windows-specific gems
-	sed -e '/wdm\|winrm/d' \
-		-i ${PN}.gemspec || die
-
-	# remove bsd-specific gems
-	sed -e '/rb-kqueue/d' \
-		-i ${PN}.gemspec || die
-
-	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
-}
-
-all_ruby_install() {
-	newbashcomp contrib/bash/completion.sh ${PN}
-	all_fakegem_install
-
-	# provide executable similar to upstream:
-	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
-	dobin "${PN}"
-
-	# directory for plugins.json
-	keepdir /var/lib/vagrant
-}
--- a/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild
+++ b/app-emulation/vagrant/vagrant-2.2.2-r2.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
-RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="A tool for building and distributing development environments"
-HOMEPAGE="https://vagrantup.com/"
-SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+virtualbox"
-RESTRICT="test"
-
-RDEPEND="${RDEPEND}
-	app-arch/libarchive
-	net-misc/curl
-	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
-
-ruby_add_rdepend "
-	>=dev-ruby/bcrypt_pbkdf-1.0.0
-	>=dev-ruby/childprocess-0.6.0
-	>=dev-ruby/ed25519-1.2.4
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/hashicorp-checkpoint-0.1.5
-	>=dev-ruby/i18n-1.1.1:1
-	>=dev-ruby/listen-3.1.5
-	<dev-ruby/log4r-1.1.11
-	<dev-ruby/mime-types-3:*
-	>=dev-ruby/net-ssh-5.0.0:*
-	>=dev-ruby/net-sftp-2.1
-	>=dev-ruby/net-scp-1.2.0
-	dev-ruby/rest-client:2
-	>=dev-ruby/rubyzip-1.2.2
-	>=dev-ruby/vagrant_cloud-2.0.0
-"
-
-# upstream specifies rake>=12 but it apparently doesn't need something this
-# recent. Because vagrant builds fine with rake 10 and because stabilizing rake
-# is tricky, we specify a lower dependency requirement here. This way, we'll be
-# able to stabilize vagrant sooner.
-ruby_add_bdepend "
-	>=dev-ruby/rake-10.5.0
-"
-
-all_ruby_prepare() {
-	# remove bundler support
-	sed -i '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-
-	# loosen dependencies
-	sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
-		-e '/ruby_dep/s/<=/>=/' \
-		-i ${PN}.gemspec || die
-
-	# remove windows-specific gems
-	sed -e '/wdm\|winrm/d' \
-		-i ${PN}.gemspec || die
-
-	# remove bsd-specific gems
-	sed -e '/rb-kqueue/d' \
-		-i ${PN}.gemspec || die
-
-	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbashcomp contrib/bash/completion.sh ${PN}
-
-	# provide executable similar to upstream:
-	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
-	dobin "${PN}"
-
-	# directory for plugins.json
-	keepdir /var/lib/vagrant
-
-	insinto /usr/share/vim/vimfiles/syntax/
-	doins contrib/vim/vagrantfile.vim
-}
--- a/app-emulation/vagrant/vagrant-2.2.4.ebuild
+++ b/app-emulation/vagrant/vagrant-2.2.4.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
-RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="A tool for building and distributing development environments"
-HOMEPAGE="https://vagrantup.com/"
-SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+virtualbox"
-RESTRICT="test"
-
-RDEPEND="${RDEPEND}
-	app-arch/libarchive
-	net-misc/curl
-	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
-
-ruby_add_rdepend "
-	>=dev-ruby/bcrypt_pbkdf-1.0.0
-	>=dev-ruby/childprocess-0.6.0
-	>=dev-ruby/ed25519-1.2.4
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/hashicorp-checkpoint-0.1.5
-	>=dev-ruby/i18n-1.1.1:1
-	>=dev-ruby/listen-3.1.5
-	<dev-ruby/log4r-1.1.11
-	<dev-ruby/mime-types-3:*
-	>=dev-ruby/net-ssh-5.1.0:*
-	>=dev-ruby/net-sftp-2.1
-	>=dev-ruby/net-scp-1.2.0
-	dev-ruby/rest-client:2
-	>=dev-ruby/rubyzip-1.2.2
-	>=dev-ruby/vagrant_cloud-2.0.2
-"
-
-# upstream specifies rake>=12 but it apparently doesn't need something this
-# recent. Because vagrant builds fine with rake 10 and because stabilizing rake
-# is tricky, we specify a lower dependency requirement here. This way, we'll be
-# able to stabilize vagrant sooner.
-ruby_add_bdepend "
-	>=dev-ruby/rake-10.5.0
-"
-
-all_ruby_prepare() {
-	# remove bundler support
-	sed -i '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-
-	# loosen dependencies
-	sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
-		-e '/ruby_dep/s/<=/>=/' \
-		-i ${PN}.gemspec || die
-
-	# remove windows-specific gems
-	sed -e '/wdm\|winrm/d' \
-		-i ${PN}.gemspec || die
-
-	# remove bsd-specific gems
-	sed -e '/rb-kqueue/d' \
-		-i ${PN}.gemspec || die
-
-	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbashcomp contrib/bash/completion.sh ${PN}
-
-	# provide executable similar to upstream:
-	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
-	dobin "${PN}"
-
-	# directory for plugins.json
-	keepdir /var/lib/vagrant
-
-	insinto /usr/share/vim/vimfiles/syntax/
-	doins contrib/vim/vagrantfile.vim
-}
--- a/app-emulation/vagrant/vagrant-2.2.5.ebuild
+++ b/app-emulation/vagrant/vagrant-2.2.5.ebuild
@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_GEMSPEC="vagrant.gemspec"
-RUBY_FAKEGEM_EXTRAINSTALL="keys plugins templates version.txt"
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit bash-completion-r1 ruby-fakegem
-
-DESCRIPTION="A tool for building and distributing development environments"
-HOMEPAGE="https://vagrantup.com/"
-SRC_URI="https://github.com/hashicorp/vagrant/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+virtualbox"
-RESTRICT="test"
-
-RDEPEND="${RDEPEND}
-	app-arch/libarchive
-	net-misc/curl
-	virtualbox? ( || ( app-emulation/virtualbox app-emulation/virtualbox-bin ) )"
-
-ruby_add_rdepend "
-	>=dev-ruby/bcrypt_pbkdf-1.0.0
-	>=dev-ruby/childprocess-0.6.0
-	>=dev-ruby/ed25519-1.2.4
-	>=dev-ruby/erubis-2.7.0
-	>=dev-ruby/hashicorp-checkpoint-0.1.5
-	>=dev-ruby/i18n-1.1.1:1
-	>=dev-ruby/listen-3.1.5
-	<dev-ruby/log4r-1.1.11
-	<dev-ruby/mime-types-3:*
-	>=dev-ruby/net-ssh-5.1.0:*
-	>=dev-ruby/net-sftp-2.1
-	>=dev-ruby/net-scp-1.2.0
-	dev-ruby/rest-client:2
-	>=dev-ruby/rubyzip-1.2.2
-	>=dev-ruby/vagrant_cloud-2.0.2
-"
-
-# upstream specifies rake>=12 but it apparently doesn't need something this
-# recent. Because vagrant builds fine with rake 10 and because stabilizing rake
-# is tricky, we specify a lower dependency requirement here. This way, we'll be
-# able to stabilize vagrant sooner.
-ruby_add_bdepend "
-	>=dev-ruby/rake-10.5.0
-"
-
-all_ruby_prepare() {
-	# remove bundler support
-	sed -i '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-
-	# loosen dependencies
-	sed -e '/hashicorp-checkpoint\|i18n\|listen\|net-ssh\|net-scp\|rake\|childprocess/s/~>/>=/' \
-		-e '/ruby_dep/s/<=/>=/' \
-		-i ${PN}.gemspec || die
-
-	# remove windows-specific gems
-	sed -e '/wdm\|winrm/d' \
-		-i ${PN}.gemspec || die
-
-	# remove bsd-specific gems
-	sed -e '/rb-kqueue/d' \
-		-i ${PN}.gemspec || die
-
-	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbashcomp contrib/bash/completion.sh ${PN}
-
-	# provide executable similar to upstream:
-	# https://github.com/hashicorp/vagrant-installers/blob/master/substrate/modules/vagrant_installer/templates/vagrant.erb
-	dobin "${PN}"
-
-	# directory for plugins.json
-	keepdir /var/lib/vagrant
-
-	insinto /usr/share/vim/vimfiles/syntax/
-	doins contrib/vim/vagrantfile.vim
-}
--- a/app-emulation/vagrant/vagrant-2.2.6-r1.ebuild
+++ b/app-emulation/vagrant/vagrant-2.2.6-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6
@ -52,6 +52,8 @@ ruby_add_bdepend "
 	>=dev-ruby/rake-10.5.0
 "

+PATCHES="${FILESDIR}/support-vbox-6.1.patch"
+
 all_ruby_prepare() {
 	# remove bundler support
 	sed -i '/[Bb]undler/d' Rakefile || die
@ -70,7 +72,7 @@ all_ruby_prepare() {
 	sed -e '/rb-kqueue/d' \
 		-i ${PN}.gemspec || die

-	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}-r1.in" > "${PN}" || die
+	sed -e "s/@VAGRANT_VERSION@/${PV}/g" "${FILESDIR}/${PN}.in" > "${PN}" || die
 }

 all_ruby_install() {
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-rust/Manifest
+++ b/app-eselect/eselect-rust/Manifest
@ -1 +1,2 @@
 DIST eselect-rust-20190311.tar.bz2 49358 BLAKE2B be8060638a7ee553275e230466de8bc5e3fb1059afb049b71b767794f4f8e3968af03a755270d892e20e5ca6aa3efc869d2fd031713f9e8ed516e6465aad19ff SHA512 98fb4502c1f5358e1a3fd2e91a0e9905aced990d62bb11414830b150e8d72fbab90c23518f9c30d04d015b4c303270a6332400bbb373cd4ea9dfbf0d0b3c942e
+DIST eselect-rust-20200101.tar.bz2 49740 BLAKE2B 4c1e767517e9f20002fac049a2ee23e47c52ccae9981316f7b7163f36a76e44dd516e7364100d1c4f5deb42dc5ddda94588639da06a71740d987bd163bc25e56 SHA512 836363e1c87b7f8e4e9c33b2cf6b8ba6846256630925676addec3d673a6e99965db19c42533de8aaf63d04713c3978f8ace73e5642071d80cd0e25a10b8cecb1
--- a/app-eselect/eselect-rust/eselect-rust-20200101.ebuild
+++ b/app-eselect/eselect-rust/eselect-rust-20200101.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+if [[ ${PV} == "99999999" ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
+else
+	SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Eselect module for management of multiple Rust versions"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Rust"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-admin/eselect-1.2.3"
+
+src_prepare() {
+	default
+	[[ ${PV} == "99999999" ]] && eautoreconf
+}
+
+pkg_postinst() {
+	if has_version 'dev-lang/rust' || has_version 'dev-lang/rust-bin'; then
+		eselect rust update --if-unset
+	fi
+}
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/librime/librime-1.5.3-r1.ebuild
+++ b/app-i18n/librime/librime-1.5.3-r1.ebuild
@ -22,7 +22,7 @@ fi

 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 ppc ppc64 ~sparc x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"

--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/BYVoid/OpenCC"

 LICENSE="Apache-2.0"
 SLOT="0/2"
-KEYWORDS="amd64 ~arm64 hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm64 hppa ppc ppc64 ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"

--- a/Show More
+++ b/Show More