gentoo (leap year) resync : 29.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
commit: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree: 9f47ee47c31a0f13f9496879cd88a1042550aa81 /sys-apps
parent: 53cba99042fa967e2a93da9f8db806fe2d035543 (diff)
95 files changed, 1155 insertions, 1682 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index c60a7dacb540..2fcfd32341ed 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 42071dac0866..d1c5bbc1f646 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -5,5 +5,5 @@ AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86
 AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22c72ff60aa4a3fe4129b81702801ddd4045629558a022f084906464f8bb5325f31d43680c626a5ede SHA512 72bd10fdd32879854ee044941636d530453488596bab7aa6785b109f6cd7e2f822e9ff04b43c7c4265b2f42de13ec7f6649f9a58fed3d93b51dd1a2b541be3d7
 AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f30aeddeba29bce2e1896126e8e4c82b41dd403f94d3f8ae9128448b0c5431c418ff82fd65df370653b5 SHA512 18a46176d043511af33fc77917e85dce5cb5deb30d2d86ea5261313a72c385b96c87fcd1fece9e555b6c424305d420876430a0a8fb11a5ec5edfef30f80dfd8d
 DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141
-EBUILD apparmor-2.13.3.ebuild 1502 BLAKE2B 10ad8cb49e3f216b9b97b3bdda55d308a9bb02691f541ac04bf05622a1978fdd98279da6c17b58a521f54242c460611d3e38537cf3b24909208b78057600656f SHA512 c17454f6d83c328591a65205fa1a69a0b55fcd537174e676f09ae05222b5cdf0e657214c759ccd4bb538749e65c21c1bcb77187c91f0762d845c98a6756ff67a
+EBUILD apparmor-2.13.3.ebuild 1501 BLAKE2B d71174bf84d654ec83b524f29a3b07005a0f635a26b39310c88a1d5a224f87bd51caa9ef6c3464a0ec5efc7fcaaef0501fbf35351995c27c4719285ce3b3dafd SHA512 3f6dc75808586ef5b50a62ac3a77aae2675b7551934b8909443246e41373a231212f6da8e34756b08da88a57deb9162f2bd141fc16d27a34fd7f94819558f919
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor/apparmor-2.13.3.ebuild b/sys-apps/apparmor/apparmor-2.13.3.ebuild
index 020f3e4ff37f..a4c693e37c5c 100644
--- a/sys-apps/apparmor/apparmor-2.13.3.ebuild
+++ b/sys-apps/apparmor/apparmor-2.13.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
@@ -42,7 +42,7 @@ src_prepare() {
 	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
 }
 
-src_compile()  {
+src_compile() {
 	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
 	use doc && emake pdf
 }
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 80673cf6a58b..5f9c10e6340b 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -3,6 +3,6 @@ DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b
 DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e
 EBUILD baselayout-2.4.1-r2.ebuild 8568 BLAKE2B 7358ffffccf270d7eb7d6cfc9ca181c8fdc11d748924cfa9cbc7e2f14a1f41f288a129a00798661ba1696800ea17b105401efac2b919a6769f39a9e3fc45f729 SHA512 97a2052691a9356ff26dfeafe0a2be01837924337e58af45915980eff87c5161377875983820e38ef0b61c085f8be91dbc82a17e5d853478e2fd37e2390af0eb
 EBUILD baselayout-2.6-r1.ebuild 9563 BLAKE2B 771900841b46825e7f5234aa996777e68aa230cbb40a13f54f29a688de215dec43c26f26135f6337e547b420bc3b3b85bae13b8a2fe718e458d1b54fab73688e SHA512 46146647432f3debb02a302958ca104edb46da99c2bb9c7e0515cc9a0f337138510aad409beabeec82020ff150a8d5c1a547a1b6c849f290225de6e6a4614a2f
-EBUILD baselayout-2.7.ebuild 9854 BLAKE2B ccaa74394d00bd251a300d5e2fe7a068eee41efda841e1e5d3f20652f4cea60e41befe929ce48c1b748b8368e6b06b86075ad7f195bee8923153fa80a3b501ce SHA512 8e434b0144d46b835491c0b98a88f2b8dcbd046e5aca2c287a4134f525dfa08333b13d2ce36af6a2966dbf270195fff9fa47f97afe9a14d432504a1d157d7bbc
+EBUILD baselayout-2.7.ebuild 9886 BLAKE2B 12b73b84df2f6aeafb3563dccf2c84c19c57cce9afaf0c35a6eeb4d73a6a9ba0b1a4535164aa9bc59a124e2a0bd52fdacc5814c24a2197c93422dcf9728608f8 SHA512 749a8f50930a88a92f5f6e00d49e20f1238f7fadf982298ee324ac6d08fd103a75b1699e26c4c0d0245fe7827ccb182cd15bbf90ed38010f0dd71a5621643a4b
 EBUILD baselayout-9999.ebuild 9854 BLAKE2B ccaa74394d00bd251a300d5e2fe7a068eee41efda841e1e5d3f20652f4cea60e41befe929ce48c1b748b8368e6b06b86075ad7f195bee8923153fa80a3b501ce SHA512 8e434b0144d46b835491c0b98a88f2b8dcbd046e5aca2c287a4134f525dfa08333b13d2ce36af6a2966dbf270195fff9fa47f97afe9a14d432504a1d157d7bbc
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild
index a4b8ca535ac9..ea29ca415bdf 100644
--- a/sys-apps/baselayout/baselayout-2.7.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7.ebuild
@@ -222,6 +222,7 @@ src_install() {
 		DESTDIR="${ED}" \
 		install
 	dodoc ChangeLog
+	rm "${ED}"/etc/sysctl.d/README
 
 	# need the makefile in pkg_preinst
 	insinto /usr/share/${PN}
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index f4c08cb95f7c..09689e874d8c 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,3 +1,5 @@
+AUX bubblewrap-0.3.1-selinux-configure.patch 5208 BLAKE2B 69db3066eebae54d34f02a02aa053a6bf5ed675329b3d18a4f261529a434d1c9dbfb637a3f96f4079a6adba586b666d7890370c8761c92dc9450f096a8368bbe SHA512 f6515a25c6b311c9b8336761c7daea2440964982f8a7a6587b6707ef9e9a5705ec380e13982b0765af205c221724ef418b44c3efd1b6e5f0c1788b143a88ef17
 DIST bubblewrap-0.3.1.tar.xz 209924 BLAKE2B bacc4080106cd9876bf0e1ad866a7397d7d232e61a720b52b5a6b9b0d860e625511ed15ac630aa71003fb9fa145ffa9d08ae2e6ba6d1411fd75e7d9568312717 SHA512 74e36caa56540a956158445f5f38c7ac5f7ff3c733ecaf85893de4607900e1fe4050db86a4435cbe18d722e90c5b39c466c555ea8ea8d4944da6207ef1011d67
 EBUILD bubblewrap-0.3.1-r1.ebuild 1052 BLAKE2B a1a1c85830ff989d7a8a879244f3bef3baaeffaf4fd8fdb5d1d4f8f35b82e249278278103c373373c00bc8bdd541ff906183d913e825cd6d4a5a61440e17cd91 SHA512 bf27b1bcaab8be6f41362f75e82881389bf414df620a82f3ee157661a925e87292607cd5d5c5ead28db832a0ae1418963054d6c4c66c0858152987e42adb3b6d
+EBUILD bubblewrap-0.3.1-r2.ebuild 1136 BLAKE2B 939a81795692cd5e101d835d8de0afe00a45dd05b77f6976ae86adf58f44a2ee1bf28bbcaf103299958db9368b4049b3112540bb483d692abdad8cd9a067a982 SHA512 8c3101a668a3ac28a37e55a7618b0dd4da6bb7482eb60648dbeb8fae03494c4ed0def4bd76ee6065acbe862f93c9b70c4c424ee2159d1b4f1d83671792d3d7a6
 MISC metadata.xml 342 BLAKE2B de8d3ba1c95b39bd6e582b27b186ef0805fd9be1fe6c806fb8bcfa28f7cafb3a2068be0e21baa13ca08895db0d0b666b5c1eab573f38fac251ce9d41c793866e SHA512 25752c1aae465ac49409e35c32863b945c1dc8989ddb4fab2999cf890cf4ec33fc82e9324e3af49c15a8580a566e5f737ec270646b4cc569c3c5dd472eb1b2bb
diff --git a/sys-apps/bubblewrap/bubblewrap-0.3.1-r2.ebuild b/sys-apps/bubblewrap/bubblewrap-0.3.1-r2.ebuild
new file mode 100644
index 000000000000..6eef70036753
--- /dev/null
+++ b/sys-apps/bubblewrap/bubblewrap-0.3.1-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 linux-info
+
+DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution"
+HOMEPAGE="https://github.com/projectatomic/bubblewrap"
+SRC_URI="https://github.com/projectatomic/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="selinux +suid"
+
+RDEPEND="
+	sys-libs/libseccomp
+	sys-libs/libcap
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+# tests require root priviledge
+RESTRICT="test"
+PATCHES=(
+	"${FILESDIR}/bubblewrap-0.3.1-selinux-configure.patch" # bug 674312
+)
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
+		linux-info_pkg_setup
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable selinux) \
+		"--enable-man" \
+		"--with-bash-completion-dir=$(get_bashcompdir)" \
+		"--with-priv-mode=$(usex suid setuid none)"
+}
diff --git a/sys-apps/bubblewrap/files/bubblewrap-0.3.1-selinux-configure.patch b/sys-apps/bubblewrap/files/bubblewrap-0.3.1-selinux-configure.patch
new file mode 100644
index 000000000000..b8fad6cc1685
--- /dev/null
+++ b/sys-apps/bubblewrap/files/bubblewrap-0.3.1-selinux-configure.patch
@@ -0,0 +1,224 @@
+Author: Jonas Jelten <jj@sft.mx>
+
+upstream decided to ship the generated ./configure file...
+here's the updated configure script with the missing PKG_PROG_PKG_CONFIG call
+
+===================================================================
+--- bubblewrap-0.3.1.orig/configure
++++ bubblewrap-0.3.1/configure
+@@ -5224,107 +5224,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ 
+-for ac_header in sys/capability.h
+-do :
+-  ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
+-if test "x$ac_cv_header_sys_capability_h" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_SYS_CAPABILITY_H 1
+-_ACEOF
+-
+-else
+-  as_fn_error $? "*** POSIX caps headers not found" "$LINENO" 5
+-fi
+-
+-done
+-
+-
+-# Check whether --enable-man was given.
+-if test "${enable_man+set}" = set; then :
+-  enableval=$enable_man;
+-else
+-  enable_man=maybe
+-fi
+-
+-
+-if test "$enable_man" != no; then :
+-
+-  # Extract the first word of "xsltproc", so it can be a program name with args.
+-set dummy xsltproc; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_path_XSLTPROC+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $XSLTPROC in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-XSLTPROC=$ac_cv_path_XSLTPROC
+-if test -n "$XSLTPROC"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+-$as_echo "$XSLTPROC" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-  if test -z "$XSLTPROC"; then :
+-
+-    if test "$enable_man" = yes; then :
+-
+-      as_fn_error $? "xsltproc is required for --enable-man" "$LINENO" 5
+-
+-fi
+-    enable_man=no
+-
+-else
+-
+-    enable_man=yes
+-
+-fi
+-
+-fi
+- if test "$enable_man" != no; then
+-  ENABLE_MAN_TRUE=
+-  ENABLE_MAN_FALSE='#'
+-else
+-  ENABLE_MAN_TRUE='#'
+-  ENABLE_MAN_FALSE=
+-fi
+-
+-
+-
+-# Check whether --with-bash-completion-dir was given.
+-if test "${with_bash_completion_dir+set}" = set; then :
+-  withval=$with_bash_completion_dir;
+-else
+-  with_bash_completion_dir=yes
+-fi
+-
+-
+-if test "x$with_bash_completion_dir" = "xyes"; then
+-
+ 
+ 
+ 
+@@ -5445,6 +5344,107 @@ $as_echo "no" >&6; }
+ 	fi
+ fi
+ 
++for ac_header in sys/capability.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "sys/capability.h" "ac_cv_header_sys_capability_h" "$ac_includes_default"
++if test "x$ac_cv_header_sys_capability_h" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_SYS_CAPABILITY_H 1
++_ACEOF
++
++else
++  as_fn_error $? "*** POSIX caps headers not found" "$LINENO" 5
++fi
++
++done
++
++
++# Check whether --enable-man was given.
++if test "${enable_man+set}" = set; then :
++  enableval=$enable_man;
++else
++  enable_man=maybe
++fi
++
++
++if test "$enable_man" != no; then :
++
++  # Extract the first word of "xsltproc", so it can be a program name with args.
++set dummy xsltproc; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_XSLTPROC+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  case $XSLTPROC in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
++  ;;
++  *)
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++  ;;
++esac
++fi
++XSLTPROC=$ac_cv_path_XSLTPROC
++if test -n "$XSLTPROC"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
++$as_echo "$XSLTPROC" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++  if test -z "$XSLTPROC"; then :
++
++    if test "$enable_man" = yes; then :
++
++      as_fn_error $? "xsltproc is required for --enable-man" "$LINENO" 5
++
++fi
++    enable_man=no
++
++else
++
++    enable_man=yes
++
++fi
++
++fi
++ if test "$enable_man" != no; then
++  ENABLE_MAN_TRUE=
++  ENABLE_MAN_FALSE='#'
++else
++  ENABLE_MAN_TRUE='#'
++  ENABLE_MAN_FALSE=
++fi
++
++
++
++# Check whether --with-bash-completion-dir was given.
++if test "${with_bash_completion_dir+set}" = set; then :
++  withval=$with_bash_completion_dir;
++else
++  with_bash_completion_dir=yes
++fi
++
++
++if test "x$with_bash_completion_dir" = "xyes"; then
++
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BASH_COMPLETION" >&5
+ $as_echo_n "checking for BASH_COMPLETION... " >&6; }
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 698acb179553..7c3d78399ad1 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -4,5 +4,5 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2
 AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.16.tar.gz 2093296 BLAKE2B 46c4f0d384d76dffd31c18a2d2df03d0658479d8f5b2d14b1db2bf0941fecdc023307ec035e3f977fde570a9f6493bbabd020ac2cd81b0577597e355f5a72522 SHA512 27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb
-EBUILD dbus-1.12.16.ebuild 7335 BLAKE2B 2377700b5616ca3dba67866d6f483f18d22d404a67c995f298374593a4d5006125f8c4ffe5ac0f13453e902dcabd01c3249840e8cbf8f50503b1325158738c40 SHA512 a96bee928df5e4d157b1e2fe74913f6d32c457263a845320e35b5f949c8a1695c06566aff34527053ed976bc742b68f8176a7c88f09d51203f551a87affe6256
+EBUILD dbus-1.12.16.ebuild 7241 BLAKE2B 3cbcb110cfdac2d6fce35531ce9321fbf807ef61020f9abe4359e997f3c29ee19609b9eb75e73438498c50a4fa34b94e9cee8949b1096087d79205ca99c625a3 SHA512 f7ecdaa6bbaccd96cec63257ce6fa3f9c1a3bc07a6534ccb9b779e4012fc7161dcfd735e68fa8ac7524639de6cef1dd911961114ac26371703a77ec580a80886
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.16.ebuild b/sys-apps/dbus/dbus-1.12.16.ebuild
index 7a9f46fbf42a..66161f460be6 100644
--- a/sys-apps/dbus/dbus-1.12.16.ebuild
+++ b/sys-apps/dbus/dbus-1.12.16.ebuild
@@ -114,8 +114,6 @@ multilib_src_configure() {
 	# not on an SELinux profile.
 	myconf=(
 		--localstatedir="${EPREFIX}/var"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 		$(use_enable static-libs static)
 		$(use_enable debug verbose-mode)
 		--disable-asserts
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index 885dac630b9e..a8b1dab8ec4a 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,5 +1,5 @@
 DIST ed-1.15.tar.xz 67924 BLAKE2B 89a5614e528f974853d8c23060b77a872ae34675f6898b713543109d3a21d0d42b4d07fea5e86e842a34619617d342058ebb82655088320764295422f700fdc4 SHA512 b723353d4f2a1e719b79cb210750596c723be87c282ab96285524eb707d5ae15c242b2d7b0a282ce2ebd0aaf221cd2be41897e79f8fc17f10e9e318a9be487a0
-DIST ed-1.16-rc1.tar.xz 68492 BLAKE2B 8a47c6147203b19954064b07e733719a534f4e5cb8cf5f6b361ca926cb6d55127d70cfa9c176f65eda2988c2b9f9ca2fcf5be27e109f83ccfd38d1927830c76c SHA512 17bc689c1aab357597715e0f2a0c222296e5cd999e04084953ff943e66fa3e7e37dbaffdb706c92daeae625967541cd41b390c4d883f54985ca924691ece78b0
+DIST ed-1.16.tar.xz 68432 BLAKE2B 222ab30f72fb466372cd7ced75807e9324a916ca5962c6829d562476ae1d9ae9c01235a130e58f952bd6029b931f6362d2a695b35963ca32bb3cfa539dceab0d SHA512 45b29fb86c7e7d8569c02c8177a9c7f7e691e08e913bc07b301b34210b6dc27377858ce60dd695feb950ef436c86d7059ade90396364c95aefa3c1e7a9d3a2a4
 EBUILD ed-1.15-r1.ebuild 943 BLAKE2B 25a1ce803d7295c01cfab080b7d085b3d8dcc1ea2c7027d294ce0ba688c553d2db3a5e1b61082ce94d21e3bfbbd61800b4a2b9f35bfcd78fe2f25b75d299b428 SHA512 412948185b0fbe7a7ab57045a12564e78927fbecd58c4533d8dba218783d63a33cd9435afd595345c272b9d350497e0c37fa8f6b54b2eeb0ae054aad72441c2d
-EBUILD ed-1.16_rc1.ebuild 1032 BLAKE2B 36a3b62efc27129d34fa5305d84e46128f49112a3fe435d2a9142f6737d58ab58352c6f0ee22ef3759c57d0659fe4408d1a01fcb4f4809cf81d2bff1c44f7cd9 SHA512 57274e1af3db76a5065c12acd76bcac07e6b353c56ce5990d6a736a192d6f564097778efdaa9e4f791edc1f797900df21296201e9ccebe72d9f27bc3520fb7b9
+EBUILD ed-1.16.ebuild 1032 BLAKE2B 0e8bb63172581a67ada181fa66e692ab8e6e0c0a730978748f426cfa32fba8f6a17a124eda56d2ff9bd29f7f4fb8ba1c09ec601b1279bc77920ae845fc6da69c SHA512 730155bf6bfe87d8455d999df10b1ac5f39445d423fcd97fb33a6995f6600b09b1e327c548759dc14a2269c505758a57f31bd510da2d6edef64764d2c14b8104
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.16_rc1.ebuild b/sys-apps/ed/ed-1.16.ebuild
index a6f72b9487a9..52585afedc81 100644
--- a/sys-apps/ed/ed-1.16_rc1.ebuild
+++ b/sys-apps/ed/ed-1.16.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"
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 1689b7f30891..3ad5693edca2 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -6,7 +6,7 @@ AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b
 DIST etckeeper-1.18.14.tar.gz 93528 BLAKE2B b36316b4a92ae7f885a1c0c0974fa69a3c1cee06ab9eb0bbee8c025f76b1dffcd19ac2f92fed49372873f54234ec1e8da023cab98097562d3eecd862ca4d98c7 SHA512 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948
 DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c
 DIST etckeeper-1.18.8.tar.gz 84964 BLAKE2B 0429efb61e3d23a897413e472a66216051324381c670cc4842526539d9d173ed1918822d31a04e7e3fa2da7a5a6c805781227677316b8802a770ddb19f576b31 SHA512 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c
-EBUILD etckeeper-1.18.14.ebuild 1706 BLAKE2B f08688e6ccfcd7f2171548e58d76eef26e330b2082a825f9d9912f1cdccbbc581496fdbb47fb3d445334d445039f60daf0d08e434b7e112f39a847ea53ba1d53 SHA512 a3989e50aa459f9b5fb6f0b846dc3c1072c5d5d07c77991b191e017817c5e24b5156101c53822bd094daf18dfb0125a206859a26719abd71352be0eb19ed9e09
-EBUILD etckeeper-1.18.6.ebuild 1718 BLAKE2B 79005365182bb210feefd82d5b5230097433922fed15cc5efdb3fb81109d2f3493aaf0283e4eaf0a0cce4fc3cd059cdd411a7f649fd699cd2dba7b72fb598954 SHA512 91f3da5f0d1022e47038d45820b6e3daba1739fc9dd650a576023b8da487270b2f4babbaac30be91e99cbddd8b68595e2c8998fdaded81bf520154b6d0c91795
-EBUILD etckeeper-1.18.8.ebuild 1863 BLAKE2B 5d24b9337feaaba19b3b96d1999e7c6c8e763227d77db048a45add4ef750965386adb7667023eaf7427b250f7f80cb1551126abdf7be0a1a6ce47cfaa9f21828 SHA512 ca5bb103396b54d5d38124e267c22dbc0da2444b7ab85b6168be9289ce3ad08703c8bf15da3ab332c921c50a8d9262d4544973066eea8ab19999b74e72daa51b
+EBUILD etckeeper-1.18.14.ebuild 1708 BLAKE2B 8d2787ec9c1993c898e0a8b80be0c3f277b6db0fba1bb98dbeb492b5d09100da3215049777fa3dd1a8872cc696386043d5fd061ecca6e21b481802c72a84f5c1 SHA512 306adb935e2c86de47060119a23a4cd072190e800f779a1b94bae81724b8efe73684c1dc33ecbca9e84046ad9ad142dccd9d1cff10937f53d492e515c6182978
+EBUILD etckeeper-1.18.6.ebuild 1717 BLAKE2B bcc5ee6c6a4d0a90db29322045c2fd803da154a1f667b2c5c2772c775aa57810ad287e49819b638109298d20f125be0f9d215669eaf6030a020da7a03a44d938 SHA512 7b3e7cc6fb32a9690c717ee6a4771594104bc0208c2b19ad804774ccbd3c0fd7def7192836fd877b183efe6bfe3b42a4c6842430d1228b7213f1fd28eaeb4a5e
+EBUILD etckeeper-1.18.8.ebuild 1865 BLAKE2B ab0dc448bd4e4a4b66ec5f6a9f3138d23639a7c54966075f3d61533e9751b49d7f88ef73fe9d866cdec0e1b0f3d4df4fc37e9a7702426e2b3dba4c2218b946d2 SHA512 95f6501675893a560b58906553567fec84164d6965671cbd528733d5f83d7cc8d775bd0a35d4d093d3bbe6e43c95d08a1b857a698aa2fb2e0f904cc6f17b9221
 MISC metadata.xml 864 BLAKE2B 0c772a7199527cbbd5dad94b7ad84bda0c95c9213f2b767c3d4b7ee6a9f97f5f2abf7814730427c8792e37b93534e86401026e1bbd2e4cdd5562f038c9be1e7c SHA512 eb19c5aae26f92d59e6bfb12f823dcade3e63ff6bbc9b8d363b5c76de128fb049ff815e7bb5b10d9ffb7d24b3d165969fcd01a6b1151f041192a09be1fdf1663
diff --git a/sys-apps/etckeeper/etckeeper-1.18.14.ebuild b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
index 7935c8c83a3a..7ba7193c63e8 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
@@ -46,7 +46,7 @@ src_compile() {
 	:
 }
 
-src_install(){
+src_install() {
 	emake DESTDIR="${ED}" install
 
 	doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
@@ -64,7 +64,7 @@ src_install(){
 	fi
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	tmpfiles_process "${PN}.conf"
 
 	elog "${PN} supports git, mercurial and darcs"
diff --git a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
index 59f27252629f..6ac5a4243660 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ src_compile() {
 	:
 }
 
-src_install(){
+src_install() {
 	emake DESTDIR="${ED}" install
 
 	bzr_install() {
@@ -57,7 +57,7 @@ src_install(){
 	fi
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
 	elog "	dev-vcs/bzr"
 	elog "This ebuild just ensures at least one is installed!"
diff --git a/sys-apps/etckeeper/etckeeper-1.18.8.ebuild b/sys-apps/etckeeper/etckeeper-1.18.8.ebuild
index 2cd9ba354260..7c5d60b113f6 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.8.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,7 @@ src_compile() {
 	:
 }
 
-src_install(){
+src_install() {
 	emake DESTDIR="${ED}" install
 
 	bzr_install() {
@@ -62,7 +62,7 @@ src_install(){
 	fi
 }
 
-pkg_postinst(){
+pkg_postinst() {
 	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
 	elog "	dev-vcs/bzr"
 	elog "This ebuild just ensures at least one is installed!"
diff --git a/sys-apps/exa/Manifest b/sys-apps/exa/Manifest
index a90ea843ddd1..10a3ee61319b 100644
--- a/sys-apps/exa/Manifest
+++ b/sys-apps/exa/Manifest
@@ -1,111 +1,58 @@
-DIST aho-corasick-0.5.3.crate 252052 BLAKE2B aba67d996b22c336165be78c89f53a2164605544f82587ceb1145bdb850326c2889d1bdcc3e95a6c5bb1dc0a996902130ab8425a7b0b88b38daffbfc9f58e309 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31
 DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
 DIST ansi_term-0.12.0.crate 22762 BLAKE2B 4612905fc52d4aa67b9443f49f2e967e63688df1dbd3c3fe40c19774ee214bba6dccdd185deae40ee97b5c4913d2849b5bb202a90e6ce91c75d10d4081041af2 SHA512 ca41f0a8ff75fdd5a1033589d95a52e89bbc7bc8a23aba161cb8f7d32f85d909171483917dfcfe7db2b65b00221e026380286fbd2baa735666b6793a1ecb5d7f
-DIST ansi_term-0.8.0.crate 10340 BLAKE2B 188e05eac55d80054cb8982b659c6781c39bc412ab10db463abaaefa7ce8fe0bfaf5a6ebfd515ac0fb63877bc308524fe11fccf9cab4611a6b8d27e2babd2d3c SHA512 0bc2e0aaf8bd0f4a12007793c87226d533aa76bb83379bb363cfc3708530b97e9af17114bb311d7bb11509c206a377d4150084c80865b9fdfc9ad053fee69b43
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
 DIST autocfg-0.1.4.crate 10937 BLAKE2B 272fc9d216749941cb73d37d5233d1df4bde5abcf9a6e75ed928ee6493e9011922a06551dac1f6b1d0c34dce587c6ce1442ea62e88457c0cecf985e7a3d5e47e SHA512 811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce
-DIST bitflags-0.7.0.crate 10851 BLAKE2B 00a4e2b66275d6fc8a7374aeec275b5fdf0e2c197e7e90e56afe89ac45554d14ba2063aa26a486dd88d822939b6ea5a5b40936d45d8717e2a98e95ba1d3f501f SHA512 fdfe472c26e5486d1a3f1bfe5a27d26678781235c6e14b49bdb75388359cb78841f38d794fc4557548581a80a10b715d8840182c9ca3316049984a6b9f35b3c0
-DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
-DIST byteorder-0.4.2.crate 9092 BLAKE2B c2a76865d3573be7824ffd6af190326db9eca8f2a87da534e2ebb22b80fab0e1b8625a5b7c83759dbdf8c7f7c1089eacba5e439758986602507a8af54857cde3 SHA512 fa87ac7da8dee8ae0a0f389dad6bb0dc29bab7d854981c625f9c6aff425f156fd512fd8b107bbabce3369af4584d128ccbc8607c38505ab275dd63a9d3662887
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
 DIST cc-1.0.35.crate 44369 BLAKE2B e74583fd826dcda590d7d6b853f751a3f18b10705f62a35a954bfba2a38768870b43046d98b6e8535143cb40950bfd8daa21c86b1a24d30c3cab485b7bebeaea SHA512 6d2c2708d696598e403027b3ee3e4cda4d7119185bdc2ab8c825e36bb2b9f48f40b84392b708100b812ed4a74626b7fef5b3698a9f5513de8f00ff6d922a3f04
 DIST cfg-if-0.1.7.crate 7360 BLAKE2B 0f9a457501441c9d3408a40efb199eeee196490bc22f4c14565703ee09dacac2a0b4e1704c05853bd4662977d487c7723521cb733881a9bafad3ff46d775acd0 SHA512 30a1510f0a217e588e9a2c1ef51e6188d7437c63641284782262fa9a2ec78f04d0bbdac7ce32c0e8282e2e518d4b6c9d6ed0c2658baac412133ad1cc1f8d43a4
-DIST cmake-0.1.25.crate 11903 BLAKE2B 8c98a2db2cecf92a71c76a659983ff4d1211dcb6e9f735d5108d4a2e6b0e440f4aa75f5ca41c8e9cf702ee555000c7c98413f0920252a075136b086969bca19c SHA512 5e6a12e37adc94d8d06feed6f808fc281cfd05d25db73e2f78942d3bfb729ca3eafd6780845350fad9a002a3cb51024b1719307b0bfec8762413f59ec9b90023
-DIST conv-0.3.3.crate 22124 BLAKE2B 9a05d9beecbd288168438e920ab4f42075f1217f224c9dc91d8e23869808868274e108ae5f881da157276cd407a63f2e8dd990b7cd9fa1731045c2cbd2f3a48e SHA512 f050cff8528f0fb5a8dd936995c423c5478afc47041c3a8cc8611ceae3228098b80589fdadf78d0028e960fa354768440dd7084cf295a29f2c6aeb554f47a8cb
-DIST custom_derive-0.1.7.crate 10700 BLAKE2B 205c46bd4f052873ff9790974052f8d81ca1fb16815b591d20db96fb330ef5b782a54eca9c07615edc5e55ba93eb38fcd37c1225f49251e83ea6059ed2cc3910 SHA512 593a98f7c9adfbd07eeacbc6915d3de053ffb33076099f425f5a72c089ee0dfabab8ea31f525cd3eb5da5c19782925ddd14a3672bd9999c6866fd9f14150518c
-DIST datetime-0.4.5.crate 117339 BLAKE2B b1b689d33918e09d5caa8d7eb9ae0964f89b2e86489c5f704fe0658cd47d2f2c1b331f82c11a36bab866c2cda8c70383931b8a888cbc4078baca0bd12c99e215 SHA512 27dcaaf87883d2eed79c74b14b01eb076a7096498360b0ba9d7fbfdbdb0de7702b583fd9ce3c5fa7b2ff0e684b2baefc2b67c7cd2a2d7064c8c040accbcd3f6b
 DIST datetime-0.4.7.crate 117378 BLAKE2B c841917a4c8c46dd53c5ba18555b7ed385e80e0a5a71f6fd6433ca9c6c4ce7ffc78733590d020314cc9c17d2a43e64503f61e9aa9a9cd323ac233d0653233966 SHA512 c7b0503cae21628f64ba8740ffdf5798a7289ab7f6bb31fa02410bf36d7c5a0ace156ccbcb51fe57d7918e4885e608652af859b1e137a06b1a3b2d4a9a46bcc8
-DIST env_logger-0.3.5.crate 5950 BLAKE2B 89772523b6beaa965be1548a0193d92a0a334e301b23e94bcbd407c1e0d5c31ea999b75fbc48d007529ac7581f92866a654d0fd67cc2df329a1ba1ce53c0fdf6 SHA512 9650ba32bfaa8c013c04cf2eb68378874fed53a178332151bec8d7ac832ab2884f91fdc39c372d3c1677954b073212654fb570da1f3c708e4d5a25910d6c1181
 DIST env_logger-0.6.1.crate 28567 BLAKE2B a7302e44a807dcb1b523e1dde683a040837b1de2fbda5e8e7347478f77d4b7a39521aadd1d6d42dffbb6229e0dd6bd1b2b9fc47b860db45281a95612dd78faab SHA512 7e5142fa24e46aeb246515f42f9fc561364f266a693ec9f8c45dbe96d31174bf5663ef6233f41a5f96849dd19b61e2a97ab7ca1a7a55c51f741f4efa5af371c5
-DIST exa-0.8.0.crate 545186 BLAKE2B 01699655401d24fd701cb433901971e30a0ec5de88eefc2dd31d2b80155a54a71a3cf3811a0e2fe7b70f9de3b4feba28b350928d65be1638f5c5d6dc101167a6 SHA512 96671429c4b4a56021eb0f33a6a84eb332946690fe1bfde273ccbfa3b86d0cf0d1a47a5f28677dcd39bbfcf77d20070355428eaf6226b27313a7752ce09e773c
 DIST exa-0.9.0.crate 118381 BLAKE2B 9844e5145add04d806165a74253ebcab1f1d86db9e6f0ad713001155539f6309075d8d391f428eb2c8a2b22e20179a5bea42ec1d7cc8eff6224874ac6b894744 SHA512 fa798e962e4a70f98fc78ccc8eb4ae7dfd4c3c0fabca2d7f6627301ffa5042f4437c98c5698f3b4ddc77acc4162b9141e6dc2e7d2f2818ff4f03ba755a6278d6
-DIST gcc-0.3.53.crate 37116 BLAKE2B 9f3a6a1105d552184ce3bdc63e51b9771d0fec8e64569a5586efc362804ee4e8dd60ae324990a15b09359316e350ccd07e337422213cdaa11f0ab5ae12981339 SHA512 e10e73d628c6e601792ff7b4d69d3974ef7e51bfb8c7c27f275bc064ea9197319cddbc94fee72a267dd0547ca5f4e1d1f31bf98f8296996830ce3205bf1628e1
-DIST getopts-0.2.14.crate 16622 BLAKE2B 14dc08b56cc7d11bc58bfe952d2b3958c5b0054499f2a4bb7b7bcd100dbef5ab3c0fba4ac7f50b688512d71fd0a7eb27568c9f26023c451f0034883742ddeb45 SHA512 bb6101403b6d4ed6102dc84c69e95114c0f336924a3f45643a5a92ca82a2ad5ef6b0405e1975b84853831dcb7518b24d094a211a54cc2b46d32ff914e2f977bd
-DIST git2-0.6.8.crate 133449 BLAKE2B 7a189ed74b2e4f365a8de282486bf7f2269b4725a186bbe4c56a926d080f5cc83a5f94587783bd6b2b4e9816d6a64996e0152fbc786af1b88611b32b70a4aa56 SHA512 3565e917a16dfe3cef96e219970b25b84aac7eb481bbf8e7fd2b05ffeed98d6354df015e3f93379802fd9b8b34045f8a62069df18ff4bbba5812f3a1c62cb45d
 DIST git2-0.9.1.crate 151280 BLAKE2B d0c08fbfeb2928e3986cdf57baccc44f75454b2bbb4470593903391d552369a0daeaaf1a64038e4dfab2194c2a3255579ddd4700cc0ebfe881023855521beb1b SHA512 293a8d3c284bde2636ca600f5fcb460a6077783a15c4c3b4e5472d4486233d0c5aa18968cc4d0e9e019fa8a1706e04000c858f8c87e2d92d0114ad0f18f136b2
-DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
 DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
-DIST idna-0.1.4.crate 289112 BLAKE2B dfd3449388dcf894188bbc4bf36f82afd640a13d6aa091a876e6048ccd47f4f4e4c44510a27187ae978c9bb8d71fbd76058c2e501618dcd3b94f8762e2333721 SHA512 45e04b1e4619be105866ed098e486700951e1765ebc4aa84122266fc3995ceb2a99f30465ca9202cc5f35db049c7a64711b77f347e9c983b11c0840f7654a9a0
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 DIST iso8601-0.1.1.crate 7770 BLAKE2B 59f11b56722e612bb95ae80c3f666c5df656dedd4988bff4a9de6a6749dd49e68dc8944eb029afd4d133c3c3ac57608903a886ce34704a32598b637bff884cfe SHA512 c2c53777a69df5bb4bbc37e377dc064aa8f285a7532797cb9da278ed2b4766843583fb5535ae482335cd21ee67db176701e8c6e5d38c3a6ebdb8b05e82ed2aa0
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST lazy_static-0.2.8.crate 9950 BLAKE2B fff432af8299c8ae39f055a0c6bf0b8bdb7c3317b77ffc8a3c9b248e79434f8bb3f737596822fc5cf0dda7a2ce39616f699ca13a95d2f56cb619b3263beaf415 SHA512 21c6ea68cb40d187a19e6d960fe0d7e4671101f26b304e4cbe6124f1a3d983fc41c44c4ce9e0d9b984783b7ba94ea873236e48178bdf56cfb8c0a8cfb9ebe368
 DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
-DIST libc-0.2.30.crate 214259 BLAKE2B 076af36e8d696ec1852e785cd7c23d979e1d125022a881db9d4b4374668ba47a016f3f2f9bf1f6624f8d32d02d77e146e4d346fc7fd8f86625e50841c1e9bd2f SHA512 9b3bb9be4d559dd20b8fff3d1f8cdca4182325504664b7c0bc254b4102141d70be17ad8648488d190d455c38869e983eee655d4e141b652b64750f7bdae054af
 DIST libc-0.2.51.crate 397323 BLAKE2B 51306c2ab8eed6de1fabd4d59b7618ee74d8d699eaec776d21fa5df20c63cdd743a50ace3a37334b282e3050dd718faa9f95d359abd2495a2bb8de0384738b15 SHA512 d05693e7106e1887d94b23ddff5692111c2164e7ce59d9c60995af2a49fcf03ea8723e837370867c1177315aecdf25be82bf723c5e798ada66f5cc7886c22857
-DIST libgit2-sys-0.6.14.crate 4659537 BLAKE2B c8519caa65dcd6593243201b9f67c3e6390bdcbf95bb4f2bed92da8ca73f5899fbb08b15f358da8c98d7bbeabbc337d0f88b56303165d9919f97b8c04b45f46d SHA512 0be148d3536812558a865b7a4062ee5f9b6d9f490ba4a8f0a455cc2cbc49fbcfa9eabfa5ce076b06cd72ab0308cedcfc226739a06f402d4151bc37613573be50
 DIST libgit2-sys-0.8.1.crate 1264574 BLAKE2B a060ba4a460f345169c1ca3de30ddffd888197ce9b046b55b28ab92e7350d31a1aeb24f06c88d83b68a4bbc6be1b965cb9b51c91d1074f8f854bfebb37719713 SHA512 15cc37fde84725195441c066294392263a8cead13439c02a114b031c41dc6c508fe440b0866c4e70c6bac5060921629432d92cbb767429a75f8462a6854a6e72
-DIST libz-sys-1.0.16.crate 603527 BLAKE2B c7becaefde627e1e5aedc040db28f5f5d3035875672c8c4471b573c61cb86b848c4d23a1b6bad0b9c68b566258a13ebcddbf728a1b8bef2c48d2034d97414f99 SHA512 b0d06c12b550b2c5592652d5085f4174ad9da66b6ba430d8e66e18e119ff00d266a1a325966e799e04a2c170f5728a36614a2417a3c15a3fe8e6a68aaa07299e
 DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
 DIST locale-0.2.2.crate 18910 BLAKE2B f34c69403d81c86c6b178f8f28271e39ddec59696d11eb17c40bdbbcfe9be697184237f2ee3fa4c7b703067cc8c6dbb999a60884f81378b394994c53426e11fc SHA512 ae542f8811405fac032029885a59d39c922da7c1b59e69f5e0d73047d05ed803475b3aa9b486cce47abfdac03f5892013b822e896794e6dd80329b4f105be28f
-DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
 DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
-DIST magenta-0.1.1.crate 24465 BLAKE2B a63bceaa5a6cdfa5a7f4218d40cceed1c051dd678a4ddafe0d0f03d7159d58d14ad621fcdd936b2fd045a27229a8c31690a39aba55d8cc34d67e92320ab42085 SHA512 b9325fdc67e9ef2039a032efc5f300a57983c42491079f0908a8082b6b70d2c87524bf6777bc03f902835ddd227b9cf9b5c95d0ff2e7c2208594aa0ab8b4a019
-DIST magenta-sys-0.1.1.crate 5827 BLAKE2B 345f5040a11b1ffaef4ec7a02028dd4349848f1f6c425728ff88ec45bafd731960dd463421ac676199e4545369963bd82d6fee258ee7365582b57ec3f001a499 SHA512 1c4b2f0db05b9355830b193ce17d04575798f993115f85c0c82fa23165a19a9feac5e097d287eac10f0f6cef6b15159b7c782fddaedc0a1fa18ccdb876d19532
-DIST matches-0.1.6.crate 1916 BLAKE2B 0ed7a81450fc9f639755f4dde72c226e107d8f5d9eec7e191efaaa4423d0739e3778ea358294b17eb35f3ac2918bc04b4009aea52d7c5f4335144180b444e881 SHA512 0a613c6daba26056da06cbc4a8a66751412b8e5709bf0e24e45caef76e308b918a2f6038342f3428633e388fe7631fc3978673560829b0842c9ceadb4037fa90
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
-DIST memchr-0.1.11.crate 6977 BLAKE2B 44d270a5ad4916dfeb186b3997168cf80556f2afd1727b1e4c796942d48e8e453ea6182fd47526ecdfe5c6edf33ea9329b5a3864db9e681420e8c76cb726a9bc SHA512 96bbdb69913966326acba4bb82b8dfe0516edba225ac38b3355d60a2337ca620807750682fff3de7a2a38a7f70f0db7d8c1638701aacca7ab4c14098ba0fbcab
 DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
 DIST natord-1.0.9.crate 3866 BLAKE2B 8e8f576af50121e7571a1d919557ddc14a3c1511c12154a9cb74fa34cb5c2279406e1ae7ffb120242689e34d4f237d9548631f5a35f4f5d4369bafd8a728fcc6 SHA512 bf58eda54c759fecca1fd310bece370f26555bde1096081adc5bb1e9446a538f1652fb3049a52f898f4f62a2608805b72cb72dd52ff3fc9b88fe0a7c9071025a
 DIST nom-1.2.4.crate 68547 BLAKE2B 87ed1c1770772beed7e2b5faf9a63ce4ab506913ee104a7e36bd64a69ebd47b7a7bea2ebfe1cd14a54e87cc671340b6768cdd47de68f163e48253f02283a13ed SHA512 4a1000f56dedfd71b1f91d44c27c07519f81629f5fc24b469d179d59e8b3305c8ae1a418fa60193be1cb4289887af2ad9b9791dcbf1f6e7a5eda36171a314539
-DIST num-0.1.40.crate 30293 BLAKE2B 217c84209edeb7dadd005a0fab507ce6975815c4380919735ca0118877298fb78cecf33671c30848d8fea5bd94364e8e8a049c6bdab20a8dfdbad3dada0f510c SHA512 a2349448affe6da2d2b8ddc37efb1976bd9bbe838adff080ba276014d9acee6d5290b240e8bce07200fa2a216f34eea9c07b84051d94c6ba0747d0b2502bc6c3
-DIST num-bigint-0.1.40.crate 50381 BLAKE2B 2bc141ef07003b5674aa258ad17257cde10aa1f69d40fbb5a4fc98b29a5204d16de30b395c0b2e5abae93305f68ec9c76ada42d1bab4b8d36b0f755aae89fbaa SHA512 aa8d48860ff31d9c2a0313e5984098a21948bcbf11fe4cfbcfe5d66a4eb03c9b4525416da615ab8d41bf94681af3ea223e55e63b60c6e292661c39c4e3f686eb
-DIST num-complex-0.1.40.crate 15826 BLAKE2B 9775e4b199ec3146e28de008a90d6cb5dbaa43c6b74aa90dd52f1f54d57da79096d061fb3b83d6e41f9a91a36bda577eebcc2794d852986415652a66dc2a2414 SHA512 8620fea55aef267e19e3dd9e1801d91b265f5c4fbd542ca20ee01c84761f3aad2d595ae2c599d46062a1f459c502f1b23baea855270583b78668c8b57717c623
-DIST num-integer-0.1.35.crate 10413 BLAKE2B 9db5aab79c3ca7874e8b080b23deb88e113c67317e86bbe4d2f9178b4271a6d68d017d0bd0ba47e4cbdba2aa2bf816aca44a9763fe03a39746ad09bdab7c347c SHA512 141f07b433e363495cc899d164615748372e7135958af9e94354e75be9dedd348071592bfdaaf10f3f1e828d502df505aa28a709a58eb83ff2380e92fe3082b7
-DIST num-iter-0.1.34.crate 7351 BLAKE2B b7455eac48b49f53678b48e47c166759ea78f921d60bd9743820f85118d99b45462b10e841f0bb99352530b58ed630d9c5cb97706df7177d665150dd71135ac7 SHA512 c983cbf7bf7daea400305d90b18644070bf1b9e6783b463b8a79d41fa0b37bd6035c8cc462693f27f1fec833051f1a5e3b4394618476b96f45ccfc692f581a05
-DIST num-rational-0.1.39.crate 14112 BLAKE2B 94d8fe8def30e6a1191d88159b0a4552d85545531e9311d9fd969a5ea6a8465a6d58fc7261d52e37245bd8cd4bb7f94d1a59dc338a722a809dfcf5a3344c4c64 SHA512 d3af2bc97f524e6ee5b6e5ef58f583f9cf74b8e4b9913432115406a342e4ba273f4a53d0c64a29b1181422ddd120bf5408b17d7db8b4bb5c34a7fa6d6a6b6ded
-DIST num-traits-0.1.40.crate 22673 BLAKE2B 71797df46ef5fe9fd5d886d66dc29cead6affa85dcdc3a085d7e31047d12560877e7214b00fe38ebf99ea0a33d25771d29a3dbc10b966558a3cd547d0a525718 SHA512 3675fd14064b877e65bb3f9479e5d1486a932901e2ddadee54b4913577067ad9d1bc9544663cfd13116405fde9059032824d6228b3b987b91b3edf80c8e669b6
 DIST num-traits-0.1.43.crate 7659 BLAKE2B 313221a4364b18eb29e2d4c480209766c56b1ca2587a0ab8f668c71cfdefcd733d64be1430bea1846a77f075a26137fbe71f2f4d9be79688374cdbe9e0274ba4 SHA512 35ee0a41f8ae33b1e6656935585f540956a8155045992e7b488b9fdbcf0eb9c9adc90ed8128d45f248b9ac583114cf518c4c7de719b8c6627b29f2fbbac91f17
 DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
 DIST num_cpus-1.10.0.crate 10669 BLAKE2B 96500421a82aafbacbcf982e3041ddba40dd8ab7fb967d1fb386c2d543b7f3efe12e35c386602a20377e7dfe09f31ecc9094ee0a06aea588149bda7866fabedb SHA512 a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02
-DIST num_cpus-1.6.2.crate 8442 BLAKE2B 2abdaf71357a958cc3f968184cd1e74a9b1b4a8f4b3548a54dc65b10f560a580263479e99cd9cea37179a9cb9fce4db248c8c117802d4ac508884f589e9e156e SHA512 6136c6cd3e4a9c0f165f037e3e6af6502a3ffcdd0cc2d38635902f243124e5c6ccbd4db8e0bcb624e2ef824284145c0dd31c1cd5f708478334bc91f842c6050e
-DIST number_prefix-0.2.7.crate 4334 BLAKE2B c21895227b96d90ff50e69207a9d743084645ca270b5dd3da27fb17807bf16d0e69d4cc033671fe6e0a06cbccc1311c8daf361a72b8ed84cc721f29906db6393 SHA512 4cd656d199bcfb9a0c6c3e54a7f1730268f400324a723b3fb33db0645bb3bea1e7d60f8a4288946de80cc9826837d84a0b649cd9694c4d69d4dde7a243317485
 DIST number_prefix-0.3.0.crate 6291 BLAKE2B 24b232d965aa08a092d6bd65f0d28e5a93c7948b4831ad42bae067387908513a67a81dd85dcc8a2ae7d829abd6232409abd2ed4a15c993176b1c056351177998 SHA512 014c37c477b1c99c20461dfa6deb1692d93f10c592387bdb757d9220347ec7bfce5861e82029286cf3a64e9d53427cbfc40549e358c3fbaaebeb73e91b598107
 DIST openssl-src-111.3.0+1.1.1c.crate 5106252 BLAKE2B bc7bbcd8d9d43cb8d5dfdc5de2ee8beb506d4a1132337625a87481975bb8d7284224c05d16ea63504b0be72e0444da5dff0226ad461037ff201c4e57b66bef5e SHA512 4c7f0d5badb5d62e73cc324f069343f60a3431751e9b3adf4de1a474bba48767513508ce65019dfcc16433e0dc62fd36eaf1c6294b48e064f4575b40a847a64a
 DIST openssl-sys-0.9.47.crate 44276 BLAKE2B 021996a0f385d3f1a917a5404fb1112b6c6fac7e3aa38e7c37292a843a8b50d0218870f6724efbfcce3fea9e687385b1c94e7efa6badb734cd492e01b3270dea SHA512 8d3a38a5f403cbd957b069c60d80f790f2030490847113b3050afbe769b4c692b581ec763656042973167dee6ca70939fe0f15cc1150db67731fb3808d98b6cf
-DIST pad-0.1.4.crate 3620 BLAKE2B 82c7f651c13d3a6d01ff667fc228c85408c291ab88022d63d99462d16d66376cd64fe56c49212d87c5d987e3d3b276c6c6719e467342017777f25f1fc2b7d6a8 SHA512 361e1a5e8a60b1e2cab815143378fadfd21c8b99e83b3f127b22f245278ea105160dd7a1dbdde7889480c02fe86a5d90283f5f8408a72dc8f7be9280a1ea9215
 DIST pad-0.1.5.crate 4853 BLAKE2B 62db785d1805f1db76515fa588ddc1be344fdc89092f0a5575e5ac1c7fa66284894dbf4f9c8fe21f0da0b9f9245fa113f9e45f7b5bcc860b6bddbe2fdfc2eed7 SHA512 ebfdd66fa6a9dcf5f627dc7c469deb72870678bb6579877122534aad450618307ff345014cf777c5bd67306ac50de0a59bced3578951f661cace8e70c237f4ba
-DIST percent-encoding-1.0.0.crate 5408 BLAKE2B f3b1e426d02ec66c08eb1c4b22e53a09bf070a281a7b0bdf04a230c1664c88ba7867b41bdb93d70687bf2b747d5569c4d9e200ad8fa2828caae47ca370f2c70a SHA512 c2d5f58032df76e9c15d695c752f5f79c551ee2d8747c7da8c4a75db15a3d55ddf2f48c9b775f16bb15ae18ecb9efe17eed967bd207305e2ce3c3e9602c2bed6
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST pkg-config-0.3.14.crate 13565 BLAKE2B bc457c2bee4034e7b5a5303bddf078e0b3e52018eb7513c5fa610ec9b272b95fab6cbbe35281e86bf0f97883526d91dcf8c156ea83e7dc23da0924a395b6c811 SHA512 bf120f0694f44d7b83b431eb28fe14ef3aca4d08ae0c2c9edbf8f184c145ba3faa479a6ab25e2d7e9f9d9f2d9a3fc21674fd4ddfe88bcc4fadad40bd8285656d
-DIST pkg-config-0.3.9.crate 11055 BLAKE2B 8c8c9a4badcb2d2691a953b06a6c479794eae97e40d95509051ae34665ac467554849f050eafd83c03070c9239709b7873e1c33604a06acce396ddf678c96e34 SHA512 084e18e8c91ba6a1b305624d16c06f8f7df994c93cf86ccf443bc8f2669368a15bfa9875bc4f2933e94aa268e15fef783235c98558ba596cfc79dbd31f0b69d1
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
-DIST rand-0.3.16.crate 57389 BLAKE2B 264c351dd4f8a417470827ccc8a05cc4f828ce1fcf31533dff64f361ad81b00507d94f937e024f05ed7dccb213bd3d683d85a460653950e34f8ed1accbac2da9 SHA512 8a6e2cc30dc97e16173da840be42491f2f2e4312ee6628797d8ed45ff3a820dfc6ff6103f1f153ea85e54993f9a81f44e28e73203dc091ad806cd66e9761355c
-DIST redox_syscall-0.1.31.crate 13420 BLAKE2B 5e533c5db7dd026c490c4250761d105592a2958aba4643d50642d7e543f2850d09b8debadaebf1a7a5f4bcf4c9584bed3f7f6776d075681a4038d3bc53ba9499 SHA512 162655d5ba07857183a75bd7aaa3e190e8d1c2e80002319e5006a67c09a105fb3f3726fed1a116b7284712bf6a2bfde1607cb8b576251233c12b69582969a9f1
 DIST redox_syscall-0.1.54.crate 15668 BLAKE2B 2da177fdb698073829b29023e6cd0a2f422ad1cf1ac359b37d3f5cf4c12f6334eb241bd313fde0236afced49714af92469919d62119ad4ddc49448ab5d9a2589 SHA512 38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
-DIST regex-0.1.80.crate 185806 BLAKE2B d1bb6b363584528a11f0de67a0ebcda1d07a43d890acc7b5b8417f946e236d318708c6483fc6c7efdcb82509a116183400b39d939aed227821c9f5badba1c2a6 SHA512 a160d80f4ac9f1e17d1debe163584f2c6c2ba7a8c49c34a7e11ed945614fe1923714880515a31a1501566e254edad23be40307b452f9216915fa03d3dfaebda0
 DIST regex-1.1.6.crate 243429 BLAKE2B a41cf5b9fa83a7fd4e0a18b15d30f9faacc36267ab0546927061323427eabf4b66893a487f5f59043226d04b700e5ccdd77b47df0219562b6a6615453f271ffe SHA512 f2c039ea729f8360f086b83a8f3da4966932d9bf252ebdbd2058d0249afe997c08c2065efb597e88b55266a18fbe44aa61c67f49ec5047dc6a5bff310f04c32e
-DIST regex-syntax-0.3.9.crate 117427 BLAKE2B 81b0fbd7565902c6b87619b5f66bab9a7e3fc5d64e4085a2b600daedaaa0a294add31790bfca3c653ec79033272f14c89f34f5f49b32dd9991c0199b209eeb24 SHA512 85513709816b148a163b73495b1e0100203da6c37d50a7d64368efb82fdac45fdd083d31bce4b193e1aa5926943e5278eaec5b23b174c425b5954d7b716fa506
 DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
-DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884
-DIST scoped_threadpool-0.1.7.crate 265925 BLAKE2B ec006e23cd12cea3329e9f685642e2243923aed108589983a161622cf71d0d44ba385a07762c67909b720fada8be4211ed98271c44c78523fe906f8f575a0f8e SHA512 909ca290279660cef213da9f3b1111e5fffa389c1ecfc658861d483022d57075f0d0fc93770372ce8faa5adab0b68377a86e3762dfe13ea8da9442274b0cff3a
 DIST scoped_threadpool-0.1.9.crate 7800 BLAKE2B b6f887c1af054666ab7f717dfdafe5701bbc0a778169d885a1837202d4d215970af567ea620c6ef47db69fa664c6be65c782aa87d9efc1d9c8c280b6210e38f1 SHA512 df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33
 DIST smallvec-0.6.9.crate 21548 BLAKE2B 465f70349baa54a3b0ec1b21e732fc6b79362c866e24cb15acd09c753c4e4469a9f085859b5cc33c5a24849d64554dd64d6c66410c221c4c4bb6f3fae4b55dd9 SHA512 2bfd96b6c07a740b77c9d3221604e108bb730770970e7428a2a38d29711dff16eea08251e826d2d511d13a887c3256ec3a689e3c481ddb9029f47452fb2877e2
-DIST term_grid-0.1.6.crate 6593 BLAKE2B f34651d06dee2f4ef683f5cb68629d10326a4ce67e34bdb391482297d552060fbe604985f1ebefd6c9960c185be47a7b4b14034abc6891dd734a0a230a4f7909 SHA512 2fed7f16de47bcbbc6a27ff4572367c1990d3df8e5814e565975bd5589ffb22520d5dc929f696819d269827b71b8d10d3acb95e2da809f4d28662f5cf0c3812a
 DIST term_grid-0.1.7.crate 7353 BLAKE2B eb4d11b84995d8ca831c32c3b0c781244d7d97367aa6b877f1aaa21e6b10edad5a4597ab06d5c1b6a9cc00fbecd62fa3f28b9970119dec98c0eb5d0c74948b5f SHA512 12196d1f2579b6d593a7cdd34d74635b93fad710bcd682dd438143a9e814759346dc263dc8a65628b7ed8fc1dbcaa60fd9cec543d0cdae000cc5dc6fbb199bca
-DIST term_size-0.3.0.crate 9932 BLAKE2B 226f2cdf0cbda83803ab1fa8666c8f7be91f5e57b04367203417baa288793b4779a4d5f1cc5d95e40181d9acf8575632c735b13a1805ed9a23bc438ba221f003 SHA512 a466470372c09a6152f1fdaa3d631395410f4db938d0ba1db1695d66bf1620177f4dab4a9aade47de1d48019712072bfc91630cf4c088c56a5775f4d27dded8c
 DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
 DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
-DIST thread-id-2.0.0.crate 6108 BLAKE2B 616ecca5907d78d8ce4326d69cea3e4af6d7076f701f59865c0c67f3ef2b62b5d9cdcc5fd0f4806ea4d4010afce2fbc288809d590330308818616faa9f6a862e SHA512 9fc73cb13dd70f6f323161667f7a253b48c4e11d074457fa033b3617dcaf7ba9aa95f12801c4c045e7e9c07dd4b63a83f79701b489a9d97aefde07970064d9b0
-DIST thread_local-0.2.7.crate 10954 BLAKE2B 70a8545a0e9ab525c4246409d7b6c35e8675dffc58799b74f6286ee81f6b3a13a2d2d6a2fa38ed13cb83b5d6aad7e54d9896f004a8e623788d928d6cac975001 SHA512 adc9be75120fd9e27429d0116cc6774a519ed9a2348db122ea90864947e4c1e1c98aeef740e7f8d28861b1db0f4a9340e58e13c1b3ece1fb3320058ea7a47b35
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
-DIST unicode-normalization-0.1.5.crate 290328 BLAKE2B 47611127735629ab5ca8eca6a32754b3d14f0da384310b9915fff3f988c28590ce83b757258c7d09a1640e65b2b4307a1d5af96f39ee4f6a70a7aadfee955905 SHA512 e3a8d69080d7c85c140406fb7514c70c6af3c3c847d2a4d029d6494035d2a77f093b9d96e26bf59ad973187ccc8dfef1a4fadcc2eb2977b16ecad9f64bfca941
 DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
-DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
-DIST url-1.5.1.crate 71508 BLAKE2B cb7417b8936978eec32a17fba55d5858aa47d898e33b28006dde8baf57a7155b6cc67b2525f9549dd97281d7c45319ac5cc11cb9fdff9b0ea7c7b1617a32d180 SHA512 8867f76b4b7b463de889a8649be6255bee025a878ce5f25ab4ce7c0221934d7624495622de5e8895bb42b261aebf0cf4682577054a3fc7040486294d0b3cdd60
 DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
-DIST users-0.5.3.crate 16979 BLAKE2B 064bb4ce073051bce386543dd569951f8b3b6fd0205a156fb7084b5058a6d784ef8ff56867af18f974ed2743b0484b7e7a9fc04edad2502c0c78ea2582dbd2ae SHA512 47021f9867030b652f582e92c90e59c2b197ce9220dad5efc3f03d65d9c63608f57874661bf71350067ca89fe5a76034470dd8ec4c39ccb8e2e7c36bc15f6682
 DIST users-0.9.1.crate 20456 BLAKE2B 49a2dd188f8d944d361a4e58f3f437718af7510c2b684e22209058e97dfd9d5ecec2c901cbe2cef36ab74d11091b1280de8b94135da523f57b02372ed5571fe0 SHA512 e372f8402d241e924c77a13621053836a1a36a6a6b9b66d5e187a582be0a85638270ea140c048e07f6739ed228711095fc98705303c499f2b542fd548df0819a
-DIST utf8-ranges-0.1.3.crate 8422 BLAKE2B c044c53be4ae0ecba9117cfea6a2d8f26c326d4285ae4e3e5920a48c0a7817769dcef72974fdcb06d1428c2cf5a645fcb15268cf6a82de2bc2cbb858a888a338 SHA512 84bd9b67c423923b856452e113f0d786ac438bc7f9b4d4d9f31f6f91f141a8ac4c93f45f722ac5a8a4bac8eac0e355fe7db1eebc62391709326e9817eda8c374
 DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
-DIST vcpkg-0.2.2.crate 5870 BLAKE2B 32331747341e7e2bdbb896a6f4997a3f8ce5f261a9f2eed4309ed2639ab55660f9b81496e1f42d6c2ad9d3ffeba6275ed4c7d1d6a29fd148abd1e8784abd29cd SHA512 e56ca76a699a6a857d77e9710c1b0b0ab7a64b6f7128a9221b9a3fafb7365b3a008c7eb2a2323de449ffd5287d4b5664b9e6d0e1204e9b5a722ee848bdcdcb18
 DIST vcpkg-0.2.6.crate 9866 BLAKE2B c9c6e1a52e54d6d4103e0b833d77cdd4b2463123a5a12d7c15922bf782c7d56f0055ed5dc9d2bd236a14fb0ed6612c7b691d8a31a98e34b48f84228e6c10a567 SHA512 55678e3cbb7b1bf80e2589df3fc580bb595576a5f24e515819906082ed081e47a546d6825bb92fae56ed0157407244e1b77af1677f0380f2fdd15cc54853675e
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
@@ -114,8 +61,6 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
-DIST zoneinfo_compiled-0.4.5.crate 7260 BLAKE2B fe461bb585de1a606e8fe800b4df763a988be643a1499e6d4ec182cdd43ea0721ebbea30ed70da4b79fedb2376d2328c4a2bfff993a13046427f85465ad73225 SHA512 1b4248c68d12e2edab047e6067876e5d662b9dc5cf9bab33188082cee0b7aff6162d6288dcad4b08da85baeccbb0f8df81e426448aeda7027544518e3e7850dc
 DIST zoneinfo_compiled-0.4.8.crate 7959 BLAKE2B 06b41aa69298319760eef3959c9447d9078ced6ea409b95bc0a3de5d9ddc1006d022caa23a64f46a9c6abf1eb077681ffaa3e03af0d533ec65d3351a4ecb3ac7 SHA512 e5337233b464cb97501a2694972a5707f6762ee567416bae876e0ee72aa0bb9cfd152a9253ba97c9fcb24a59e6b2fd5417d5567f7e17336ddc8dee121ba76589
-EBUILD exa-0.8.0-r1.ebuild 1864 BLAKE2B 2b6dcc1c91530a53b955b886c61698d5eee82382a5c253e1060bf25c526eb06f486844b495a3d984b33e06f2b8b004b2994829af1c746a1c43cd6d1a98299347 SHA512 6b9355716b1778fb9d0f437ed8b06049c98e0b796225f705d1a221488e806005fc2e7f76895adc5d6d3aebcde0c859a2c44c107e66dd87ea9621bf81370cb263
-EBUILD exa-0.9.0.ebuild 1941 BLAKE2B 07606aa20a557ac7bfb7b2c17f1887add9248eda9e1d8d7200d15fecc7f8b184cd0e7c2b778bb03b6ae0ad46fb761abc7fc44db61aa1890c86c577d26702b90e SHA512 ce0fa5ee151c4b6de7a8f9465b87d97f49562ffc6252142a1eb446e5abe3cab522bf2fb6cbcb1e5fd5044a968ce6bb9cbff1cb8c31eb664d6553a0db1db6d937
+EBUILD exa-0.9.0.ebuild 1961 BLAKE2B e9aad1fd5a2a62d7dee9fac1abd580d0cec3bcb0e628451ab7dabbc31d7a7d2e61c512726eaac0c56294bfb1195dfcebecb667a784505335a5f28303a90a0464 SHA512 dac7a2b2cdc6f68e253589ec567b87d8ca35a52948eb303eb5e2e4c9fab7cdcf95c2dbaeb910d3308fe32312ab7eba7c7b7ebc9f5d34deca8e93640d68db5bc9
 MISC metadata.xml 801 BLAKE2B 26cfc79f2f068d554e61d425c1f74aa0196009a7664b6e76f10e19945ed909c91931bd711f444477fd60269c11e0c6304b4df03770c9332f08707c9dbf5b12db SHA512 aca6729adb1889417932bdea2e39aa4e3430617cc3b4e56665fc0a5518c2174fb44065d77df2386d131c03284ac031ae9da83a51dbd7050621d959818ff2553d
diff --git a/sys-apps/exa/exa-0.8.0-r1.ebuild b/sys-apps/exa/exa-0.8.0-r1.ebuild
deleted file mode 100644
index 164e0c033659..000000000000
--- a/sys-apps/exa/exa-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.5.3
-ansi_term-0.8.0
-bitflags-0.7.0
-bitflags-0.9.1
-byteorder-0.4.2
-cmake-0.1.25
-conv-0.3.3
-custom_derive-0.1.7
-datetime-0.4.5
-env_logger-0.3.5
-exa-0.8.0
-gcc-0.3.53
-getopts-0.2.14
-git2-0.6.8
-glob-0.2.11
-idna-0.1.4
-iso8601-0.1.1
-kernel32-sys-0.2.2
-lazy_static-0.2.8
-libc-0.2.30
-libgit2-sys-0.6.14
-libz-sys-1.0.16
-locale-0.2.2
-log-0.3.8
-magenta-0.1.1
-magenta-sys-0.1.1
-matches-0.1.6
-memchr-0.1.11
-natord-1.0.9
-nom-1.2.4
-num-0.1.40
-num-bigint-0.1.40
-num-complex-0.1.40
-num-integer-0.1.35
-num-iter-0.1.34
-num-rational-0.1.39
-num-traits-0.1.40
-num_cpus-1.6.2
-number_prefix-0.2.7
-pad-0.1.4
-percent-encoding-1.0.0
-pkg-config-0.3.9
-rand-0.3.16
-redox_syscall-0.1.31
-regex-0.1.80
-regex-syntax-0.3.9
-rustc-serialize-0.3.24
-scoped_threadpool-0.1.7
-term_grid-0.1.6
-term_size-0.3.0
-thread-id-2.0.0
-thread_local-0.2.7
-unicode-bidi-0.3.4
-unicode-normalization-0.1.5
-unicode-width-0.1.4
-url-1.5.1
-users-0.5.3
-utf8-ranges-0.1.3
-vcpkg-0.2.2
-winapi-0.2.8
-winapi-build-0.1.1
-zoneinfo_compiled-0.4.5
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="A modern replacement for 'ls' written in Rust"
-HOMEPAGE="https://the.exa.website/"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="+git"
-
-DEPEND="
-	git? (
-		dev-libs/libgit2:=
-		net-libs/http-parser:=
-	)
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT="test"
-
-QA_FLAGS_IGNORED="/usr/bin/exa"
-
-src_compile() {
-	cargo_src_compile $(usex git "" --no-default-features)
-}
-
-src_install() {
-	cargo_src_install $(usex git "" --no-default-features)
-
-	newbashcomp contrib/completions.bash exa
-
-	insinto /usr/share/zsh/site-functions
-	newins contrib/completions.zsh _exa
-
-	insinto /usr/share/fish/vendor_completions.d
-	newins contrib/completions.fish exa.fish
-
-	doman contrib/man/*
-}
diff --git a/sys-apps/exa/exa-0.9.0.ebuild b/sys-apps/exa/exa-0.9.0.ebuild
index 09ded01303f1..4be36c085f50 100644
--- a/sys-apps/exa/exa-0.9.0.ebuild
+++ b/sys-apps/exa/exa-0.9.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
@@ -76,9 +76,9 @@ DESCRIPTION="A modern replacement for 'ls' written in Rust"
 HOMEPAGE="https://the.exa.website/"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 
-LICENSE="MIT"
+LICENSE="Apache-2.0 MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="+git"
 
 DEPEND="
diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest
index be042ea0841e..41501d0a8a5f 100644
--- a/sys-apps/fd/Manifest
+++ b/sys-apps/fd/Manifest
@@ -1,99 +1,59 @@
-DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
 DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
-DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
 DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
-DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
 DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
-DIST cc-1.0.29.crate 42386 BLAKE2B 6145e3c18f4db24bb0f8b2bb8903c30623c5c63fc596375ef531fd5832ab5e22e896517022b5927dab756a72a69e33094543c665d6bc768d285307ec3f1fdba0 SHA512 8cfdbe735b547bbcb125ccfa54b4aa5273e8f952345713d42375376a388833bed791d1f28520821faa6586ec4c484ea210f19edafcd8a8c65793aa2fc3cd0756
 DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
-DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
-DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
-DIST crossbeam-channel-0.3.8.crate 79923 BLAKE2B dae78c49f0a2c425c20481a9ab1150fa8fc1c1bb8007747f3cfa9b9e763f72c8f440b62f7d6ccc6f5a92ad0545a2b0918d71fd3e7ce1bb4af95c583696d0cda1 SHA512 9b4c4b9345276b0227041a64f7ea4971dcd37ac5a2d404408d7e1875cd9a1318cbbee0cd91d4ba4b73201927ae61cf35382d2c8ef9461f21d71e802d01063583
 DIST crossbeam-channel-0.3.9.crate 86771 BLAKE2B d0898ecfa5aaccd03ed714b657aee7a3279f4242516c2943073e75d23f23437f34bf63b465bdfef6567030c998e7b3c6bd4f5fe2e0ee4b50a03d8a15396a2090 SHA512 4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919
-DIST crossbeam-utils-0.6.5.crate 31735 BLAKE2B adeec7df0627b73169e04b53883f44b9d4c54f0b97ef2e49cfadc565c5c3324bf3dfe39158a65ec4b6676a8fba2696d43b2ce1aea75fb8bf2120ff4ad9eb45f9 SHA512 5bcf3eed8f28d608b675aa4588b133393ced515e2f7fa37b413b34aa5ee550100899d957906dd04fcaee68cea57d2c8f230e06d6903f5ef117c9313d6cdbc2a8
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
-DIST ctrlc-3.1.1.crate 12110 BLAKE2B d6dcf6c132d64e5450c834c1e5c032f33be6fbcf2265c727b4541feb92a1d8df31b6c67e667e920a406f26604971e1715946e40d201a90b84d8d9258169443ac SHA512 31e7208a6e6d2b8ff2e00dd9e12cdba3ba9eac24418cd3df137648698bb9489f4bf0b7cb8b28bacf3300c44a6001b4c4fe7f87fc11d3d47e2f0cca7f8b0d70fd
 DIST ctrlc-3.1.3.crate 11792 BLAKE2B eada522e42753c751bae996f2e6af5cf9fd685c1e724c8c111ed7e74117be8e4053cd678c25a735578adc309d0a87cbc6e9d175406b8225d8c2edd2d4c7ce229 SHA512 b77b0ccfe31110c514795b390b0500cb7349d4dfa2367f6d6b9612cce3d9dfa4cbbf96018da71ff4488258a0aeb2911e0436df35ea52c3e6a464bcbe027f12e8
 DIST diff-0.1.11.crate 8165 BLAKE2B 6c651d00120b190b55b334c780ce7724e91f554cf3d85f99d8ae5f745bf4ced2e5b7d7aa307c6d0c2a6082534d238eb213868d3b528ea57a08a5e37ddc7051b8 SHA512 9c31d38bc29c9372984339b8d289317981ba483eee4430e936252b0fc44b1f500305082b19e6dc20b7d7fc81906f1c0d5c3f375b6db9f2c266e41c7015597073
-DIST fd-7.3.0.tar.gz 57694 BLAKE2B 2f5fc19117fe0a8a611a8ea2fa1b96e6c9677a5049706908f42132b6f2a1090b92dd080c518a266bdcd17ffc4301282ab073c2d7126459ed4b3ea7c75587d6fa SHA512 48a7a9b41463070d26c76018909c527c4a33efd6b6c7e68184ff1e477bb87483ce7ed49c214893a01de0c57579026fe0616b989d169eed001529d377028371d5
 DIST fd-7.4.0.tar.gz 60366 BLAKE2B 70cfaea591ed7d58ab068fba1cba20432e70d52ddab9b0dcc48570452b97abaa9881074312114483b2280ef0fdec8f4e9ec170cf48ffc7dc2986a68bc68ca80e SHA512 abe42ffedc8bb4ac5ddff9ccfe0d38dc70604ab0184b6e300a3800735d82d25f48b7b01d3cf94a5b661810d66f706517549dcb636b01fd41cf6d8b5b31eaef31
-DIST filetime-0.2.4.crate 12044 BLAKE2B 563df5750ef95e392f8458c0a23f106eb310d8e8e7253fba6b2b8245afb103a37b505fa41b915691b8f93ac9d6277e2940ee219a4993232781269c9876c5eb24 SHA512 a27ea45b6de09c93a818f56436e49ed358cd7cdab2a39913de159144da239bef14677b5b521633c68bb9a4f38e71d7e2404b6bf628348b3573e509c9440d0863
 DIST filetime-0.2.7.crate 13469 BLAKE2B 6ec71f64de621b86c0ea46856fd9a7f364820916922f88611bc324696d5d34c73600ddaa204bd2119e29b0b38cdbbabc55aee669d87e9d77408dfdd844200a8d SHA512 410d45d9ad4d657da1d2cd16de58963f3096cf6e1978ffa4579b3696f0f4926cda303df7c4d02cfa8d71560518032750729a4184160a31229d590cbbec471d6a
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fs_extra-1.1.0.crate 29292 BLAKE2B ea1b787484218733a2c107ff059f3e89357afc51c510da0f5f30e4c9289c722a7c810a0a08138673aa454445dfcb08caa986ac64165ac27476d9b709d819308f SHA512 c001a37a23a614f1752a45fbf392694911c8d06bb5af8b8a40f2dcba9c80c67ab634de0dd4fa951007072204b162430fed2c89bbb11ac2fca62dfa5cd4cbd46a
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST globset-0.4.2.crate 22474 BLAKE2B 0ae4fb4dcb52822a7c46d8e078ecac18775c1125c905e0769c0b204c2aa606828d902f4c0996899114e57ca39c42b43fa892d68f6ae7cd25f1ae58b71af74d89 SHA512 53b8d9cce33258882b8ad2bff526b31a94322742553ac2d01e41693a333947e0ed9d8a3c98f3ca2131731eb50935eec8f1f7b161338cf3cd10cb1a9f722570a6
 DIST globset-0.4.4.crate 22369 BLAKE2B 7265cf19e3f7a8e710be40760098242fe156ddfa974a59aa29018c2c317876049dec21e70f8b416ea9a0d16c33754118c7f070dd0e50de70cf8cc10e484a6030 SHA512 b9da7f4d67d4269b0b3564d65904c9cca0db7df6d33255f6022eee614f0ad03f3dc6f9e52e52fca7461308d9f01dac1f3588baf87aef735c266561b1119f9985
-DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
 DIST ignore-0.4.10.crate 49022 BLAKE2B 4e1fef531f800bf95bf1a601cb8f64d93ed46623217392368cd1f59fe6e353dae8e8e6d2a017c5b3bc89acf2a964eb682d30803f2d4ac3744935c4567d2675d1 SHA512 ef4b3f58bbdc3b5317a14244494ba9cad8e3d062f0c8e137dd2d33572dc8a06b20f59860aabafccb729dc682134aa4e2bdaea8c07b351aa73a8ebb00e361ceeb
-DIST ignore-0.4.6.crate 45507 BLAKE2B 3ab9c229049683b9fb32942dff77f9d8c5977d1e4aa331244f9de76c5bdaa2b48c94d93ad953a6ff37021c14556ef2bf5b0306a3f8bd632a2b93b42deff29fef SHA512 7876a7572e89379a3480208632c9f34d99a9ca835bc19c543ccad1a835449ac2107444e3c65d2980444a78572f571b5c669ee4600bd02a67d864b341cab757df
 DIST jemalloc-sys-0.3.2.crate 1344660 BLAKE2B c530eed197673dd515b41d504127c6c7abf75bb2dd0063b0a693be9502e3b5ae9db6d97dbf7fdd4bbab626ba1f788bf6b8e6804a476e109f22737bd2a79dcdff SHA512 b718dd98474d16fa5448bba62ac5e18a9e9798f31fce19dbeb4a12526c63e78f306454e0d9e2c6c5a3fd95660bfe82bb5fb09e4091cd8b43706eca2c4872b647
 DIST jemallocator-0.3.2.crate 16393 BLAKE2B 03c190b2f4c6cf01957a4e11d13a230dd55593e1845ae4179b60c62fa28eaed4dd27efb3113039ddab1e66a28c102d4d9c64169d0c10a1945bac162d2f613a79 SHA512 e3fd9d377d6465519e73a91d5639d47bfd6cdf5898d551c49e3efd3269d14a75bb9163980e13ff429e7dc637b8430cdfdb1f5d6ec52993fcf7b6247a69850ac6
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.48.crate 353045 BLAKE2B 707f0311abe07e9a5bb9a1d2597d5a25f837dff783dff827f0c9e224b9ef0c915bc1f7f76a4a0afce5faa5bfe7896bbf1d22e645aed0cdd0e1197dcb45e495df SHA512 3ca3482cbdf8a031c6dfbc063537cee95b1735f8224baaad562f29279554ffd17999bb02c5ca54b25c845f63e70868b76d5d4123dcfa65d86d6e466527f4ce99
 DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
-DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
-DIST lscolors-0.5.0.crate 15937 BLAKE2B 27c9d42fbdfa32ce9f01fc627c2a758544dccd72f2b63f232b4984287f61f5f4dc8788a30ad60ae92ddc374b7b993b577bbc0d11a03c61756af81cc672300fc0 SHA512 97d881cf248dee1a744e6016941abb80579518ede0883e419b6c452215ddc0b2a6336c6c6c254e4f463cfa7f3a648ea56fef1df0ff044daba98c2d03e1731013
 DIST lscolors-0.6.0.crate 17577 BLAKE2B 163fbb3b212af633d73a3ff73808ef13cb687e66afff5d3a15cef992ce6c4af8960baf826abfd098ce1a2d4fdb90178b780dd81404859be2ce748027f6a5448a SHA512 245e5d9fca5355d7135d089f9b1f66e4863b38829f52625366c6bf6eb7f1837d7b57ca30967843e2a6219b602618bd2048ab2a31912110083d177b7939f39e81
-DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
 DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
-DIST nix-0.11.0.crate 162039 BLAKE2B d468eebf5bcd55f0e46e533de6cd318e3f1e0f5c457c7f6d0424e3a71fb60b93e9bf9b2ee4c80d5fdc68b7f3360048a9b832f2181ad69dffc14269470cad4d47 SHA512 bb3ffc5ae6a8de37a96e9951e182c2916016678265a3c4efdee2ca4d26bc5f4192f4facabeac2978788143d2707094dc0517c13b08833cc1ddcdb6fc1125c874
 DIST nix-0.14.1.crate 185227 BLAKE2B ecd12ae7580879c960cd828a22109e5a7f209a24c4208bc04d4392f36726886b66b147dbd3a1f3705edd35e53187553c125dfd47589a326c032aab0a3d3c9ba2 SHA512 c6393f47cdff2134cd51ca3d6becf0309697a11ac9956e3979a2d6cd00a86545d1af4efd63f6d5e417a80b2d9b247a7416b7182156d9966e00c6da25a3bfdcb3
-DIST num_cpus-1.10.0.crate 10669 BLAKE2B 96500421a82aafbacbcf982e3041ddba40dd8ab7fb967d1fb386c2d543b7f3efe12e35c386602a20377e7dfe09f31ecc9094ee0a06aea588149bda7866fabedb SHA512 a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02
 DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
-DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845
 DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-DIST redox_syscall-0.1.51.crate 15646 BLAKE2B 5a033b0a20f50d66b3613cd0ef71a4a8f5a198ea3d9ad25752a4113ff1b54738ce820ace81f19b2f5de276509d52b6a69e709681fd006b132aa662e832e0f4df SHA512 cb84fc899f22b3c302654a959ce16a99518e8c39b8192634a0f3665dd052bbc6c4dd485ff66916dc20bbf8d494f59c1c761254bdbce6b184864c83325f6917e8
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
-DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
-DIST regex-1.1.0.crate 241219 BLAKE2B 37441c1cedfa7fac3904a3a261f618afbdc64e9bcbd9f6913c551ac2cffd454456fce71ae1aefda70cf32d000d990d4e97d9867ffa042abf0e71bdc9df3cbec1 SHA512 f60d9e7c5a8647a1e0d35e995e799335ae695903985cd9f90923ab6483172602e9493005b7c7bd3dee0824de992dcd2f03320d58419206a0d5cfb675c68c4745
 DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
 DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
-DIST regex-syntax-0.6.5.crate 272475 BLAKE2B b2ff299b4b87ab91c925a10faa8a09507272600a12558cade5b18ce615844223384e8420f2025dbd642bf80acb5f608a6c0f5ca59a4c391d4f417fdea15058b0 SHA512 37f2c69b425335a28b8945fcd58a3a39a9adde5588fdcd4b460da0fbd137e0727a7835d71b4e87ff29185c153379402891847d93047e40a578f778a62b324f5d
-DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
-DIST same-file-1.0.4.crate 8678 BLAKE2B a46a2572f18a9adb3a23c8142c78d55757f04e10ddf68568f6af810a6e30a4b212bbf21c453ccd9b2e5ea7c42c6216505a4119fc6f19645c28e5434e3e8d7847 SHA512 bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
-DIST smallvec-0.6.8.crate 21448 BLAKE2B 0491237d8bb9d9c89355c6f6538bd962d3eb56ecb6a670a0d94032c4705d34c629b930d9465fef34efc8b4463f5c88b6b849f75306a143d7aca9574da32c9bcf SHA512 0eddd68498a20bb124fd7bf00700c98ca00a58ddfb4e6116aed0d7647b898760c9b46593c96b16bffb86541dd37f04559b75110fb3b520b1b91ad6429250250b
-DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
-DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
-DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
-DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
-DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
-DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
-DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
-DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
-DIST walkdir-2.2.7.crate 23507 BLAKE2B 8c26d7970724f7fe2fb6b38f2d25ee4ffeacf115466c019c7fe082e9be1a3c3a0e076f248b53fca5f82234350e5f3d0521d8f7eef5463a372796e2485309dec0 SHA512 bf7c06f982383f4ac7c513bfaf18350924d57dfacb1e9469c1600cf578a759714fd51d261b7fa8c49d29293f24ce4075dc84ee267f5559459622fc97939d338c
 DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD fd-7.3.0-r1.ebuild 1850 BLAKE2B 1e2e2cb86cf804b1e65610c094d05639bf3b576c73ee15ad4f4b151f967246456fc81541aea849e3a0dcc8482579832beb847fbf43cf571054d7fec3cd287718 SHA512 02b0e1090e7068f5f0f4abb7076db5629ba069567e377cea4d49019b0a1616a43c7b4a9b8915a0f15b70f9aefeefb30601636ae4d20daeec48061bc29863aae6
-EBUILD fd-7.4.0.ebuild 2057 BLAKE2B 35c301018beb69a257f81d67e0e5dee36d8ed0642b934e1c75c4dcd60a07f9fb2bee415e091d7409075e311734677ec69b7ae7b9615f3fd658fd643ece6c4479 SHA512 86d956794764a0d7bf363ff7b4db03a0971855f8eb6835ae0b6129825055d6f5f19cdbda0199cfeb5e8e6342c0d56e964e077fb4f94a347953e11ba270502af7
+EBUILD fd-7.4.0.ebuild 2055 BLAKE2B 8b22369803867d82eea3f124823206d9b4a54a4330dabd41a965c7946b89eda8a98e15b897b09a91c02dd5e8c3917e6a96d44d86346048924e06fdbca0ad8e3d SHA512 9d8a6b7684e702d7e8710e4f6a6dd1fe995545e20fb8eed749150ec7246cec47d29f22f59f75582c88a61043f0d004e4d13c8730a57ef74e9dfd201d85d68241
 MISC metadata.xml 574 BLAKE2B cd747fc4e172f68394809255369afc79c95ce0667115fdda99bb38635a267be76880a75d781d1988f1ec3a0ca4b139e74c9f97c7faf65ac240c40ee9f4f92e6f SHA512 4be62b10ffe12ecb6d4284ff29006f9d884590dac7f67658eb985906ac1bce609230f1385e388061111cfeae70de4df999d55e834b987b69f24bdb878548f758
diff --git a/sys-apps/fd/fd-7.3.0-r1.ebuild b/sys-apps/fd/fd-7.3.0-r1.ebuild
deleted file mode 100644
index 66ffd10fadf6..000000000000
--- a/sys-apps/fd/fd-7.3.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CRATES="
-aho-corasick-0.6.9
-ansi_term-0.11.0
-atty-0.2.11
-bitflags-1.0.4
-cc-1.0.29
-cfg-if-0.1.6
-clap-2.32.0
-crossbeam-channel-0.3.8
-crossbeam-utils-0.6.5
-ctrlc-3.1.1
-diff-0.1.11
-filetime-0.2.4
-fnv-1.0.6
-fuchsia-cprng-0.1.1
-globset-0.4.2
-humantime-1.2.0
-ignore-0.4.6
-kernel32-sys-0.2.2
-lazy_static-1.2.0
-libc-0.2.48
-log-0.4.6
-lscolors-0.5.0
-memchr-2.2.0
-nix-0.11.0
-num_cpus-1.10.0
-quick-error-1.2.2
-rand-0.4.6
-rand_core-0.3.1
-rand_core-0.4.0
-rdrand-0.4.0
-redox_syscall-0.1.51
-redox_termios-0.1.1
-regex-1.1.0
-regex-syntax-0.6.5
-remove_dir_all-0.5.1
-same-file-1.0.4
-smallvec-0.6.8
-strsim-0.7.0
-tempdir-0.3.7
-term_size-0.3.1
-termion-1.5.1
-textwrap-0.10.0
-thread_local-0.3.6
-ucd-util-0.1.3
-unicode-width-0.1.5
-unreachable-1.0.0
-utf8-ranges-1.0.2
-vec_map-0.8.1
-version_check-0.1.5
-void-1.0.2
-walkdir-2.2.7
-winapi-0.2.8
-winapi-0.3.6
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.2
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="Alternative to find that provides sensible defaults for 80% of the use cases"
-HOMEPAGE="https://github.com/sharkdp/fd"
-SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-DEPEND=">=virtual/rust-1.31.0"
-RDEPEND=""
-
-QA_FLAGS_IGNORED="/usr/bin/fd"
-
-src_compile() {
-	export SHELL_COMPLETIONS_DIR="${T}/shell_completions"
-	cargo_src_compile
-}
-
-src_install() {
-	cargo_src_install
-
-	newbashcomp "${T}"/shell_completions/fd.bash fd
-	insinto /usr/share/zsh/site-functions
-	doins "${T}"/shell_completions/_fd
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${T}"/shell_completions/fd.fish
-	dodoc README.md
-	doman doc/*.1
-}
diff --git a/sys-apps/fd/fd-7.4.0.ebuild b/sys-apps/fd/fd-7.4.0.ebuild
index a3416f336c6a..3830f11f72d3 100644
--- a/sys-apps/fd/fd-7.4.0.ebuild
+++ b/sys-apps/fd/fd-7.4.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=6
@@ -71,7 +71,7 @@ SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 ISC MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 DEPEND="!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )"
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 1d368bc4e90a..c00ec210f44e 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -4,5 +4,5 @@ AUX findutils-4.6.0-gnulib-mb.patch 1005 BLAKE2B 0e08a1c35c8e66b2dcade10b33b5390
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
 DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
 EBUILD findutils-4.6.0-r1.ebuild 1959 BLAKE2B 4fb5c4d83a95cd5d06f228c1a678c92755a084a33c16caefacd2a134b53672d2a7c1a89104434b4634eb4a4a4f4473a77cf86f6c2234c1b57a2afa03165ab67f SHA512 1f0a54ddd86a8c6ea39e9515311beb3ddcdcd3b2d371bcfcfbf1a9cb45b4f86ffe9e8220df2d14593ac9f64d3d2333287eec9f9a4727271dcc53b4e0e3958d3e
-EBUILD findutils-4.7.0.ebuild 1689 BLAKE2B b185b21f4273c65e3ebf30dc216b79afde1b51493da909085a4ece0f79725e7c201b9fee4d6684081e2a454bc75506e3a7e718f2e90ead5d68af87aa9cde5733 SHA512 0f1a35f86716de18a620b57e2b0cd5c275078f79f5e4b6f6de4c283b08ec0b8ac6b4b86d41fa51f455c698e4a37bf16beb3316d25733398dc2de97bb370bb2e0
+EBUILD findutils-4.7.0.ebuild 1681 BLAKE2B d4c3776cf0e5be2fb9c32e8bee3ae2bdc9c9b323ed39f76dd398492da4a6bdaa0525c2ed7a0870577b473285723bc0b009ab50a90c8e43c1ef0e42885969e853 SHA512 c91e42db1f676b2ab1375bd632271fc0794320a6d5a1458e743a0b2650e3b481bb58a12c1223138e85171dd138ab9526f48ceea2bee18a80f7799e483aa84d2a
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.7.0.ebuild b/sys-apps/findutils/findutils-4.7.0.ebuild
index 17f3de810dd5..f295892cc090 100644
--- a/sys-apps/findutils/findutils-4.7.0.ebuild
+++ b/sys-apps/findutils/findutils-4.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls selinux static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/firejail-lts/Manifest b/sys-apps/firejail-lts/Manifest
index 9efe45a80fb5..93f41b6785cf 100644
--- a/sys-apps/firejail-lts/Manifest
+++ b/sys-apps/firejail-lts/Manifest
@@ -4,6 +4,6 @@ DIST firejail-0.9.38.12.tar.bz2 164962 BLAKE2B c89252548c70e347c6a841a8460501622
 DIST firejail-lts-0.9.56.2.tar.gz 934289 BLAKE2B ff8b27f57da90cd94d3ec9b83c8398b7c569b09008f61094bd9aca15e996cd7a4d559e87168228271ccba4c9fe8e1ce97fa5045596f950f3ac2d8593b9ea5838 SHA512 75edc0405fa3fd7f2f5d7831f7f4e838ed63bacadd7f9a869a1611908c716a333251b602ff0bd70e3f98627418e84541b26790d34e644f60d97e84e9c33f873a
 EBUILD firejail-lts-0.9.38.10.ebuild 734 BLAKE2B 2d3797be4ba77f171452cc2c8b13f4eb1e3a9ddda7461349c863342d9fbe51dcc6ac4a8118676a311bdd59b6ba34b080ae8fe7d17699713fd607c47ba321ff6c SHA512 182d12ca0dcb10a125f7feebe5ecb3d18887bdac555dd470aef6e11bd60a01a6ff3c33a00b6e4ca1adf5ca3de1e062eab59cb802b8ff6dac8e6726e117401ec4
 EBUILD firejail-lts-0.9.38.12.ebuild 735 BLAKE2B 9cc47a2b6a6538f8b61a3d5b6c4cbf9f4c6f4b505b04a8a7567006a8d54b84cd0288b1801aee72fbef0ab63cab90a6aeb7c92a9e5fe1a8bba738399e5cc77b26 SHA512 e0b340593f6b0afe5e04e4af2c1e7984f145dde6b363edd81c01e21fcaddba4b05165c35226ea3a65b938981ad898c977596652816f40541f871606134224ab9
-EBUILD firejail-lts-0.9.56.2-r1.ebuild 1265 BLAKE2B 7a150df0f3ba65bbff8debbc00e241bf544be6440113c3ee91dc8fe158dd4a1ac26c01cd05d89baddcd888a13f4a3883aa739fda8860a2140f13ca0f382ff9e3 SHA512 93bf9af9bfc214d6c91480a33dcdf4adaa950e55be69de1cd9541319913b07380468a10d56fbf7c17996d3b22a0fe53703fdce2f89c9c99185e638ab19316810
-EBUILD firejail-lts-0.9.56.2.ebuild 1202 BLAKE2B f125d620f1ff397190c20cb2735550524281caf0da113b11fbab9dc1fe23073705d4e3d263648eadf1f6c62fdacf613513419e8bf7a26fd104cb67efd175a8a6 SHA512 fe8af41b1991d61ff713c7a6df6b55c204fbdff0c2b4705a8a373ad04e6b4547c5ebb8991bee9c20d1e0e07935c359832bc4c86d92f0075f93854158d161f0ed
+EBUILD firejail-lts-0.9.56.2-r1.ebuild 1218 BLAKE2B 1abff91b6673411d50c1344ae9322cbb06c2c49af9a23d8bf824f87a6c72d95b4f698bab52098d4258323e344ad066a187e58b59e03a9db06db5dfeb7dfce558 SHA512 e690e2611af4e206c2286b0358d1d6fcb74ebcc98c5e80257ce8f280a5f996c4f91988777ae43362e7b51b0e4d17889b970a122435b70ea971b8206f1d3c8303
+EBUILD firejail-lts-0.9.56.2.ebuild 1156 BLAKE2B fcaa32557d4c1b69ac17c0856ff91c258a46ab9b814ac543fa37c8780bacdad80495310088a69da449e0a273de2f7f861f505bd2c27b13b74e863e957524b45b SHA512 9db40765f01cdbcd428df57deb8972ec8a3b257a956ae3ee8bafd2f5e5390de3ed6224e9b318df48a61c846c69d524c1a6e145b958fc15bdb1fc96c1de6af21e
 MISC metadata.xml 1400 BLAKE2B 437e79721042570066912df3b69a81848ec3fa969eacf8a9b82140faef658b0607a97114426ec426c68cb26e7e76acd1c4be09c81f8f9e96bc67987f9a637302 SHA512 51128fc3ef400e9f80e2bf2ae87420c8187c33b4944827ed35fcb15d81c2213bde726902e77396f1d93331456e8bc94ab7b1386c80f46385c2a9553ae6a970c1
diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
index 0cd44b693c7e..b1aae3c00dae 100644
--- a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
+++ b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-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=7
@@ -38,7 +38,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable apparmor) \
 		$(use_enable globalcfg) \
 		$(use_enable network) \
@@ -46,5 +45,4 @@ src_configure() {
 		$(use_enable suid) \
 		$(use_enable userns) \
 		$(use_enable whitelist)
-
 }
diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild
index 7ded7fe5cedd..b2a3e4c3d744 100644
--- a/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild
+++ b/sys-apps/firejail-lts/firejail-lts-0.9.56.2.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
@@ -36,7 +36,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		$(use_enable apparmor) \
 		$(use_enable globalcfg) \
 		$(use_enable network) \
diff --git a/sys-apps/fwts/Manifest b/sys-apps/fwts/Manifest
index 537980f6b758..a978938e61a7 100644
--- a/sys-apps/fwts/Manifest
+++ b/sys-apps/fwts/Manifest
@@ -1,3 +1,3 @@
 DIST fwts_17.02.00.orig.tar.gz 3489625 BLAKE2B 04133b8fe251923b5cf4e146bd52d3d102c3080629a85c0205fd6aeb19b315f10657da28dc7de37ae4601599dc7033354268b88bb0768b56550fe1606bd000bf SHA512 1dcbd7f120b5c09127f1242d41d7cf5ec15e6b049fb0b0590fec221849c0195a18ee4b07b66c1de29cbb241ef39f6e11c26dcd2bc7c0a4c23bf2efaec5372b70
-EBUILD fwts-17.02.00.ebuild 1128 BLAKE2B 9fd64caf9b310f9db9c9588e6bc652fcef6cb039cd05e10b0baf990a6d457d439967259f43ea660d53785a95eaa7119e52b490bb6c8336ca1bff513b47c9c001 SHA512 595c4a4d3434dc472ef019b71c33204cbb505ab1498ecc2812ef34aeefadaad0760acc0745d797769b86c31dc57e8804fa067e179f514a6cd711a902d91f3ee9
+EBUILD fwts-17.02.00.ebuild 1126 BLAKE2B 49e4a42f531c778bc118fd8c7fef09c756cc395fce3426c406bbbd274620f7344359bce0ce1c4b1918a6839ec7caddbdff4dabe072be9735433607ff7ac1736e SHA512 ddb18c63d887e1d3abd3a2def0d3267f76ca70de59088ff25ad05660e261ed276bd3699835bc2719d5ba3f15a5c1891f86745132e02aa38fb89fadc2120e7174
 MISC metadata.xml 241 BLAKE2B f00f58ea265e1a7321a74a2e8a86824f7a1930a6e99162af446a1c1f831139711d626045b21215856a29e6ba4575bc38c7ab965ffb547757dbf4305235245039 SHA512 9a4d0499ef0c9cb67816755a3313bbba0b42f01b35d5d7da31dfe3e14a94fead3b8c202b95ffd4a9c5edbda7b046045b19095924b57a08cd97aacbda5bbd4550
diff --git a/sys-apps/fwts/fwts-17.02.00.ebuild b/sys-apps/fwts/fwts-17.02.00.ebuild
index d86714e02ca0..f17665061e40 100644
--- a/sys-apps/fwts/fwts-17.02.00.ebuild
+++ b/sys-apps/fwts/fwts-17.02.00.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
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}
 
-src_prepare(){
+src_prepare() {
 	default
 	sed -i -e 's/-Wall -Werror/-Wall/' configure.ac {,src/,src/lib/src/}Makefile.am || die
 	sed -i -e 's:/usr/bin/lspci:'$(type -p lspci)':' src/lib/include/fwts_binpaths.h || die
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 952591d495a8..deea970a727a 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,8 +1,11 @@
+AUX fwupd-1.3.8-report_uploading.patch 875 BLAKE2B 460db033bdb0ea865402ce938b586221c3543e9b4e0dc4e09504f1364a4cfff81e59cf38eb9732b89075eec8000f9afdb3ccf26002f829a4ae4ecf21ce92a723 SHA512 f89718b2aa695b44a2f382e6c5f5e0114f4086710d112d33c764f8450d8c2cfc4d3b14ee87c9f76c9c155d8fd2f70c5701a267487476bae190825978080a0879
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
 DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
 DIST fwupd-1.3.6.tar.gz 2207849 BLAKE2B 465055d90576d4c0a7812f2554d2bc3298a12030816a2469ce653d28f9ea81e363c401355191d41b200975a615cfc64b954e0cced6b6f6bbfbbf26f63163a25e SHA512 20a5f346563b1cb8296f31ea448f336d8b54df2e5296524e2fa040a31001838b0de4a88f0d4aad9f5eeaeb4acc46919c0effb254ce681556db00cec5a4a1bc78
 DIST fwupd-1.3.7.tar.gz 2223704 BLAKE2B e86603542dc76ec355912fae86721b8e60cea8bef34224cf5f157d3a91058deafc2804761ece472f0264ef42d7fa2b77d935a1638c9db3a6c0722c0659ce6a59 SHA512 6734533193be40051a565609905097c76d9f53c53075e37f560408be698774be0867383877b2acbcd2e5a92c817afdd30532f3d94465b27311b31c825a38481e
+DIST fwupd-1.3.8.tar.gz 2246170 BLAKE2B b55df322c64947bcccc7bf05daaec2c5b2f646a4e53d757482dcd4d33e94d725315e6456bf69d5dbca3ef870437e1cc2a861537fc7af9b059497f119f08477de SHA512 0f0aa380adc5e167e49db4261b50bee9c905786afcd44b5fe221f42a77306219d40888989e0b16448535eaf077baed12de56b6cca42f91fca09c4a8384f243e4
 EBUILD fwupd-1.2.11.ebuild 3841 BLAKE2B e4e3bc8c24019820ab5e2ac4afc84385fd97743b6c7f13564947010504a2ab548a9e593e922c3e7a98d2a86c90e05f4c46c70508903280e5937dd025a6441c19 SHA512 36921af2092640f1da1eaf0bf5fd52d5116f33e9218eb0355767a5b2590620942a74ee8d28c0351015d25e725c106783b10904f66aec84579f69a3ec2b1867a5
 EBUILD fwupd-1.3.6.ebuild 4074 BLAKE2B e0a15aca14f956e4f07c008114d3ea26437bc5a2e2220fe4e6296f596306cc4b43bbf6107f26c9e4ddd980b31b2806fb2b74fa98223aae00349da4b68aa54c0f SHA512 d118e5801846d35da86aa1c0b47f1bc217665e4c7356210587c9ed217416fe9c530e4df1f8942f8356b342ad288524acf8a84a1110fec35acba30a584dfcb343
 EBUILD fwupd-1.3.7.ebuild 4107 BLAKE2B e4dbfb28be95ac707c8fbd29fa5336415f4864dac394b75e5458489444c8fb66bceea72ca074825729d716e6625608f5a898053ac23d425c5e5e0bf9def958a2 SHA512 10bebe2bb2d346fcb10f140d8483fd649b184f5ecbd467b279e708db3de7395f847d2b8fc3babad9294d63c6233a40ce3fe8c477d44af0c72b51bee22549915f
+EBUILD fwupd-1.3.8.ebuild 4209 BLAKE2B de17002a4e62e9ebabb9e96a7e119be7ec2415f9fdf22a1e3396b9f8af2b63fe47047d6cf071e1a8011434b9183f6ef0718f4a2add45f85349da4389367e7791 SHA512 8d1c1a2c84ac2c6ae675e81b87bf9270cb8c583735f42fba57518d402171666e8b0ee676bc6bdedc67bd5a2b11115e867f3b5cf2f838186c35d52cc625a00fe9
 MISC metadata.xml 1400 BLAKE2B e2baf5dbca095abc30bc3f59774d8bae41439077869ece11807d87843227d44b4d6aaa28c82809dc179a1d620b0de8fa49d23a95461658f9f4fa392e2c75e5c6 SHA512 13fe991997037e814131b4c7d5089b8aa11b43029e2a13d6708060d7c4b7c3cf8ec696eb777546242d87ede48362ddd54fe022735787b9fc7e6d31517321384d
diff --git a/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch b/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch
new file mode 100644
index 000000000000..c0e006a7536d
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.3.8-report_uploading.patch
@@ -0,0 +1,34 @@
+From 5c7e17276c8eb0c2a845cecb7d644a4bccf80519 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <mario.limonciello@dell.com>
+Date: Thu, 13 Feb 2020 12:06:41 -0600
+Subject: [PATCH] fu-util: fix a logic error in report uploading introduced in
+ e076d48afb74d1447936d353f12781755f13b047
+
+Fixes: #1770
+---
+ src/fu-util.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/src/fu-util.c b/src/fu-util.c
+index 5bcffedeb..e6531c90c 100644
+--- a/src/fu-util.c
++++ b/src/fu-util.c
+@@ -286,16 +286,12 @@ fu_util_maybe_enable_automatic (FuUtilPrivate *priv, GPtrArray *remotes, GError
+ 							 NULL, error))
+ 				return FALSE;
+ 		}
+-		return TRUE;
++		break;
+ 	default:
+ 		break;
+ 	}
+ 
+-	g_set_error_literal (error,
+-			     FWUPD_ERROR,
+-			     FWUPD_ERROR_NOTHING_TO_DO,
+-			     "invalid option selected");
+-	return FALSE;
++	return TRUE;
+ }
+ 
+ static gboolean
diff --git a/sys-apps/fwupd/fwupd-1.3.8.ebuild b/sys-apps/fwupd/fwupd-1.3.8.ebuild
new file mode 100644
index 000000000000..ca087051eeb6
--- /dev/null
+++ b/sys-apps/fwupd/fwupd-1.3.8.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
+
+DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
+HOMEPAGE="https://fwupd.org"
+SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	^^ ( consolekit elogind minimal systemd )
+	dell? ( uefi )
+	minimal? ( !introspection )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="$(vala_depend)
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )
+	man? (
+		app-text/docbook-sgml-utils
+		sys-apps/help2man
+	)
+	test? (
+		thunderbolt? ( dev-util/umockdev )
+		net-libs/gnutls[tools]
+	)
+"
+DEPEND="${PYTHON_DEPS}
+	>=app-arch/gcab-1.0
+	app-arch/libarchive:=
+	dev-db/sqlite
+	>=dev-libs/glib-2.45.8:2
+	dev-libs/json-glib
+	dev-libs/libgpg-error
+	dev-libs/libgudev:=
+	>=dev-libs/libgusb-0.2.9[introspection?]
+	>=dev-libs/libxmlb-0.1.13
+	$(python_gen_cond_dep '
+		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
+	')
+	>=net-libs/libsoup-2.51.92:2.4[introspection?]
+	virtual/libelf:0=
+	virtual/udev
+	consolekit? ( >=sys-auth/consolekit-1.0.0 )
+	dell? (
+		sys-libs/efivar
+		>=sys-libs/libsmbios-2.4.0
+	)
+	elogind? ( sys-auth/elogind )
+	gpg? (
+		app-crypt/gpgme
+		dev-libs/libgpg-error
+	)
+	!minimal? (
+		>=sys-auth/polkit-0.103
+	)
+	nvme? ( sys-libs/efivar )
+	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
+	redfish? ( sys-libs/efivar )
+	systemd? ( >=sys-apps/systemd-211 )
+	thunderbolt? (
+		sys-apps/thunderbolt-software-user-space
+	)
+	tpm? ( app-crypt/tpm2-tss )
+	uefi? (
+		app-crypt/tpm2-tss
+		media-libs/fontconfig
+		media-libs/freetype
+		sys-boot/gnu-efi
+		sys-boot/efibootmgr
+		>=sys-libs/efivar-33
+		x11-libs/cairo
+	)
+"
+# Block sci-chemistry/chemical-mime-data for bug #701900
+RDEPEND="
+	!<sci-chemistry/chemical-mime-data-0.1.94-r4
+	${DEPEND}
+	sys-apps/dbus
+"
+
+PATCHES=(
+	# https://github.com/fwupd/fwupd/issues/1770
+	"${FILESDIR}"/${P}-report_uploading.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use nvme; then
+		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
+	fi
+}
+
+src_prepare() {
+	default
+	# c.f. https://github.com/fwupd/fwupd/issues/1414
+	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
+		-i plugins/thunderbolt/meson.build || die
+	vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		--localstatedir "${EPREFIX}"/var
+		-Dbuild="$(usex minimal standalone all)"
+		$(meson_use agent)
+		$(meson_use amt plugin_amt)
+		$(meson_use consolekit)
+		$(meson_use dell plugin_dell)
+		$(meson_use elogind)
+		$(meson_use gpg)
+		$(meson_use gtk-doc gtkdoc)
+		$(meson_use man)
+		$(meson_use nvme plugin_nvme)
+		$(meson_use pkcs7)
+		$(meson_use redfish plugin_redfish)
+		$(meson_use synaptics plugin_synaptics)
+		$(meson_use systemd)
+		$(meson_use test tests)
+		$(meson_use thunderbolt plugin_thunderbolt)
+		$(meson_use tpm plugin_tpm)
+		$(meson_use uefi plugin_uefi)
+		# Requires libflashrom which our sys-apps/flashrom
+		# package does not provide
+		-Dplugin_flashrom="false"
+		# Dependencies are not available (yet?)
+		-Dplugin_modem_manager="false"
+	)
+	export CACHE_DIRECTORY="${T}"
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if ! use minimal ; then
+		sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
+			"${FILESDIR}"/${PN}-r1 \
+			> "${T}"/${PN} || die
+		doinitd "${T}"/${PN}
+
+		if ! use systemd ; then
+			# Don't timeout when fwupd is running (#673140)
+			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
+				-i "${ED}"/etc/${PN}/daemon.conf || die
+		fi
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	elog "In case you are using openrc as init system"
+	elog "and you're upgrading from <fwupd-1.1.0, you"
+	elog "need to start the fwupd daemon via the openrc"
+	elog "init script that comes with this package."
+}
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index d063819cc4b6..a76e3d26b4fe 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,5 +1,7 @@
 DIST gptfdisk-1.0.3.tar.gz 199924 BLAKE2B f664398cb58d081ad19e267a370a4a7363e1060358aac394d87cd5874efe558fbd7bea4a33da871287c144b664c60e283d3338ca88d7d494503afe9a0b652e7a SHA512 80d437bfa2365abfffbd4812ea928fcebd52c5421de321cf190d395549e32c5ebdbb2d060cc4b95f77fe13cdd719f4d2bb3d0ed5d97792b100325f92d7c852d7
 DIST gptfdisk-1.0.4.tar.gz 204075 BLAKE2B 45be16bd4e8312e4797a70c07447702a7f966edec94a9e9e17cff89eee51bf33cb9418dcac2a103e68ea2ebb8df4e7a997fd006bfa4109cfd774838bd4bd7d19 SHA512 2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf
+DIST gptfdisk-1.0.5.tar.gz 205973 BLAKE2B e026dd4b4f2b63ca660feef34a1fdfb14034d0d64e4828fddf4a0c63756cbc840b3292231838f0c016256be2358069bde8a17ef0e33dec355c48406a9a930e75 SHA512 3d3a59e3488dd3d6bda5d103b9ad8b7936752210346b9787ddc936681498fba90577b6ae950c471d09a01bf6405fce32038ff1777c52db0b21e5277737fe3703
 EBUILD gptfdisk-1.0.3.ebuild 1242 BLAKE2B fc2f462366344366fffcda0e083869cc414757dea23890e44b2b350095346c1dbd22caf559f911563cd2671313f4db8cedc7fe87c998de155afb75f2b5389f21 SHA512 29a75dbd8eca9d740238cf3990385aa7d93a9095c0ecdc778a2a09e755eb2e8ab42ba5f70a928bc678f0f8439d79eb64519711aebf0e126092dd930e9c4e2a49
-EBUILD gptfdisk-1.0.4.ebuild 1254 BLAKE2B 254054a09a965918a1f9c08d07f671a02b47cb6d7688158bb985c0072bd1bf3e357cb7a8b0502eb11eeacd6b227ece6629371425e5140eabb4d67a7e769f92be SHA512 315f7b2547974cf27a33b30e860cb7291f57ba60006207c1bb6779b119c3d8e8feddebf613abc316913b354cde7fd99108c326aa905cf120d67b6ed9c1d92a2a
+EBUILD gptfdisk-1.0.4.ebuild 1243 BLAKE2B aed2cc611c225eeb33e7fd3072232c9341bd1d750ac6cf195cb3f75fa5d591247e33e2c5ad656a301fc904fff6ca41c9c1886dbeaa71604f2bf398972f7f44d8 SHA512 6a9aea49f29bc906d834d22c9d91a35e7112c0543d39960c0c3dda89b4ed363b1dc5e42766b480eba0311e36b83c3bd7ff5450e336740bc073bd8781a158bd12
+EBUILD gptfdisk-1.0.5.ebuild 1251 BLAKE2B 47a900ddfdf051e80f28f9c0ed3cb4649e7d1c8009aa978aba5f31c38565388249b5aa192173a8409fbd868a5a568f9a8b78c577b4f726e1f353516eac232dd8 SHA512 54a7a0f1ed2ca43c78261925be662a8ed46502a6e8f457aaed42da151e2b2804a92b0ef73db1a167e83cc9f8edd199b22e9bbae93c8167ab0bc7f2b52acb59f3
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
index 5f5ea9aeddda..382c4ff6df1a 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.5.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.5.ebuild
new file mode 100644
index 000000000000..253b6a84a848
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="https://www.rodsbooks.com/gdisk/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="kernel_linux ncurses static"
+
+# libuuid from util-linux is required.
+RDEPEND="!static? (
+		dev-libs/popt
+		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
+		kernel_linux? ( sys-apps/util-linux )
+	)"
+DEPEND="
+	${RDEPEND}
+	static? (
+		dev-libs/popt[static-libs(+)]
+		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
+		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+	)
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	tc-export CXX PKG_CONFIG
+
+	if ! use ncurses ; then
+		sed -i \
+			-e '/^all:/s:cgdisk::' \
+			Makefile || die
+	fi
+
+	sed \
+		-e '/g++/s:=:?=:g' \
+		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
+		-i Makefile || die
+
+	use static && append-ldflags -static
+}
+
+src_install() {
+	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
+	doman *.8
+	dodoc NEWS README
+}
diff --git a/sys-apps/gradm/Manifest b/sys-apps/gradm/Manifest
index 9fd4b3abd3a8..bd4060368670 100644
--- a/sys-apps/gradm/Manifest
+++ b/sys-apps/gradm/Manifest
@@ -3,8 +3,10 @@ DIST gradm-3.1-201603152148.tar.gz 91549 BLAKE2B a569ebbac10418ad69effb47a4102bd
 DIST gradm-3.1-201607172312.tar.gz 91667 BLAKE2B 207f86d12789ada00eeb3bc813863d671be54265eff7649a40960ab41296977d0e36dc60ebc482514e1803050026783d43017e7423e25e4d652f813cfb3e75c0 SHA512 61f14038ee555b99e4d0096dd01697d8adba45e057ffceadb44eafbdfba807b53030684c5073d169c005902acfa6baa673975ed4ab00ad035941c209f8f1d2e2
 DIST gradm-3.1-201608131257.tar.gz 91949 BLAKE2B e1dc55706a0c8492b2d0716cfe8abb4efdcd3829da725f412bd6882e28b34e0f52eb796fb9ff0b25db93512893d9d7dafe1aa54f44fa2f3b329adb48d4bc14b4 SHA512 0947abda8d4085fd6f4a569a29f146d6f093c7013ea3aba50df4fb740487b93696b63ab475eb862cfcd26aeb62cd69a55c3d6083b91a2eb9349ad566735f8cfe
 DIST gradm-3.1-201708012022.tar.gz 92238 BLAKE2B 220a2cba3f01e92adc6bf959cfa1721d6ea41247be2c6b742577c434071fe80d0135773e18b9a8a89f1c893c9cd03443e29af0e0b027c97422e4a743f8b6c960 SHA512 1c319ce5b102ad54d0c4d0c43222ed755719bb2568c9a4575b62965a73b0765265dc7068488e5e34df52ed9382b17e4bf1b32a8eef20a4d7a534f3f9a4ba2b3d
+DIST gradm-3.1-201903191516.tar.gz 92504 BLAKE2B e302f77cd3b27e5288a63a578a8161784161b024ff9740e0fbbd75edc66e918025082cf6c860b7be21be14cea2cbe0ed38376a528309aabb574a5bb909bcd1be SHA512 224f87035c2604640f14a6cafc94b16aae765bbaf457675cc189fe7c8b73450281bc16456d1c59cc8926c920601293840a148f4193e708c83509aef2a25fbd9f
 EBUILD gradm-3.1.201603152148.ebuild 1079 BLAKE2B c4dc23c49a67e287c7bb5d7f200f5ae44c713a98df5ca246e7af6357f4af451a99800eb69b14f5e030e688cb638e8dfe68ad4a01af9e7d0c7d6dc6297e8c88b7 SHA512 8b4f2130078db6de540c63c7853dcf51e52f1c1e0029d87d23b0a8953b1c4bdca744b0a0a11bd8ac1510f89dc898f9e708f5373c719b8815058a99aad8ac29d3
 EBUILD gradm-3.1.201607172312.ebuild 1079 BLAKE2B c4dc23c49a67e287c7bb5d7f200f5ae44c713a98df5ca246e7af6357f4af451a99800eb69b14f5e030e688cb638e8dfe68ad4a01af9e7d0c7d6dc6297e8c88b7 SHA512 8b4f2130078db6de540c63c7853dcf51e52f1c1e0029d87d23b0a8953b1c4bdca744b0a0a11bd8ac1510f89dc898f9e708f5373c719b8815058a99aad8ac29d3
 EBUILD gradm-3.1.201608131257.ebuild 1081 BLAKE2B d5801d4236212c6ed59a95ca6a341bf73c98862b5097329bb2797b3fdbd73a9e8ee5f240be28076516761b6002a65b5d394d3db9603067330c627550ddb4272c SHA512 f0b7fe6ed9de901c69ff515d92f6c4889ca1b3dfb22b7b2a397015392059eb9d0e1c0b4ff2e737f34d4cf44c9e3a6340cc089a2e1501197a64e80b8565a7e7dd
 EBUILD gradm-3.1.201708012022.ebuild 1081 BLAKE2B d5801d4236212c6ed59a95ca6a341bf73c98862b5097329bb2797b3fdbd73a9e8ee5f240be28076516761b6002a65b5d394d3db9603067330c627550ddb4272c SHA512 f0b7fe6ed9de901c69ff515d92f6c4889ca1b3dfb22b7b2a397015392059eb9d0e1c0b4ff2e737f34d4cf44c9e3a6340cc089a2e1501197a64e80b8565a7e7dd
+EBUILD gradm-3.1.201903191516.ebuild 1045 BLAKE2B 435bfad4428c4d083695e4d20475f70a499ad5409ec7fbe1200234dcef7e99af16f703cccb839342f416fe3cfe3dc5967d12f3eedd9e18c59766a089f4795d40 SHA512 0b61da8dcd907a0b4b06e24826903e0eccde2fa37074e01f5caeaa42294db555e874dc19c21d6fa121341c02b90f99b40da851687c356981057ec1dae4d31ac4
 MISC metadata.xml 363 BLAKE2B 27b81c37d5a0f685942eda5610d73a0933a7654282c851a92bc352f27676c609452b6c7a3f3bb94c0fa358fa360c5c113aac6acd24e186347912f61cf4a0bdf3 SHA512 b848c5de5ed09c4843c3e75d59ea4697c5d1c1fa2ce8c9e9a0bf38b5102d57f25aa626f3c6295f4f3a345b1cedc15553fb45b460bf41e73df43eb2eef6e00281
diff --git a/sys-apps/gradm/gradm-3.1.201903191516.ebuild b/sys-apps/gradm/gradm-3.1.201903191516.ebuild
new file mode 100644
index 000000000000..35dd8bc4384a
--- /dev/null
+++ b/sys-apps/gradm/gradm-3.1.201903191516.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs udev
+
+MY_PV="$(ver_rs 2 -)"
+
+DESCRIPTION="Administrative interface for the grsecurity Role Based Access Control system"
+HOMEPAGE="https://www.grsecurity.net/"
+SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/gradm/${PN}-${MY_PV}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="pam"
+
+RDEPEND=""
+DEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	pam? ( sys-libs/pam )"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/respect-gentoo-env-r3.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e "s:/lib/udev:$(get_udevdir):" Makefile || die
+}
+
+src_compile() {
+	local target
+	use pam || target="nopam"
+
+	emake ${target} CC="$(tc-getCC)" OPT_FLAGS="${CFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	fperms 711 /sbin/gradm
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "Be sure to set a password with 'gradm -P' before enabling learning mode."
+	ewarn
+}
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index 2ba4c65c99eb..fb83033832e0 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -5,6 +5,6 @@ DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4 SHA512 c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
 EBUILD hwloc-1.11.10.ebuild 2195 BLAKE2B 4cfd04182449a5d01d3ba48d029bba8a514e6b559c829681d63c303a8dae91ebd628df48e8db4c4a33ed1ad8654d16a1122848a9d6f579fd90ae6e6660e21c19 SHA512 ee00586fe98f049ce09ab15a4b97644982c9630c44cc569717682eb76451ff558592ae7fb6b5908ca8957e655fd949a8969977b8845932f10f825032eccc2b73
 EBUILD hwloc-1.11.13.ebuild 2176 BLAKE2B 5492e4cc844737ffd61a07791e83494c0b9061c3e0c261c23c812b3b35b9708d91138fce18e85dbf0883795454259292877b762debb8ed0066a7be14947b5af6 SHA512 2a61fd7b84d9686a84236f8aea65e3f2f00536a2cbcf32accbb62d67b73627fbb70035e929a757420f5099b773bbaee3e74984e93796c61bf3f0180d7a6bb599
-EBUILD hwloc-1.11.2-r1.ebuild 2164 BLAKE2B 80688c68d866867e4a2a31b2b2071df100b98e883ea17aa78d312482ec2da87fc6809e41dcdd683d1a1945c445f9f9829ce26d5733b0d702e1c29a0491d5edc7 SHA512 375eb415c3e80b8c747eb501a12226eabfd2e3b89ad7501954da05f02b857ccdf3d05872802c5653d719a60bab1d34f53f39001e7ff9cd851f6aeed36ba4b409
+EBUILD hwloc-1.11.2-r1.ebuild 2139 BLAKE2B aaaf6e038f4e6fc8b33ba4701a48d656d2aab92b90dfe1ae9ff04f0097ac9819b2c20437dd0919b5e07bcd2418eab78e8eeacd93d045b6df1c4ba682305baff2 SHA512 64cb97511d438f8cee0e979ad232c4f663bc82391347f12b915a94d28a684e27d2405e4b7e08c519e8f34edd7fb98e49dc70953dcbba00acdff32c79cb6c3c18
 EBUILD hwloc-2.0.4.ebuild 2047 BLAKE2B fdabf052b4b9ac1c5f4c3f7192eb12894f6eb2ff1a48baaf7c652df7840bfbcbc01c99225e3b600516e26f1b4a63d0fe84f59eed9deb5d7bbe06f666f916bd1b SHA512 e4e6d67475fcd51e569571c0cab0bc678d79e75825dff3e511bf26bd43ff4b7b757f0038aaf248bebfd6d6cef1a6c5f0b098d5736d8590c18ae5271d1bd61e79
 MISC metadata.xml 1263 BLAKE2B 31a2da3a73430d956f12a029941ee5439ab374be53be55a505f9de83735eab843cd60ca48230bdefa0e8dd3f53b8276dccb62df847364bb79e737f8770fa2553 SHA512 9c21fd25ba0f5046ab051e58884c67d3627040bf66b58d114fa504e411aefe3411c591e356a419e955269e74cafba06ac9fe335b1bb9c43253c029accef1d166
diff --git a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
index 4230766967a0..d4be5c943bbe 100644
--- a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
@@ -54,7 +54,6 @@ multilib_src_configure() {
 	export HWLOC_PKG_CONFIG=$(tc-getPKG_CONFIG) #393467
 	use cuda && local LDFLAGS="${LDFLAGS} -L/opt/cuda/$(get_libdir)"
 	local myeconfargs=(
-		--disable-silent-rules
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}
 		$(use_enable cairo)
 		$(use_enable cuda)
diff --git a/sys-apps/ifd-gempc/Manifest b/sys-apps/ifd-gempc/Manifest
index a18ca6f29b7a..704d74330c45 100644
--- a/sys-apps/ifd-gempc/Manifest
+++ b/sys-apps/ifd-gempc/Manifest
@@ -1,4 +1,4 @@
 AUX reader.conf 246 BLAKE2B 9d8f4b1066d8b30577de625966f40455e4de7773c3387417da454d0a513604c4205b93cab32bd7443c3527fb921082aeb3b1bade369a93f630c3e8f3a084965e SHA512 57ae0939bb88fa67224583fcce555eeb4d088c5c0667a4ddd02323a45554f391a1d9b6d5a124b7e3e9dc933806b0067deb7f159611a9df89e922d8a3f23e737c
 DIST ifd-gempc-1.0.7.tar.gz 76712 BLAKE2B 5ae734ff97865a66d993fc67a2ee5537875773b8275a2125c8853ddf0006cea61f20cd38571be44126cb2cfeb16a6778d6917fd056616e24997a3aed85226e76 SHA512 dde143bd2ca46cca91f979ddbb300f0b5fea37ecfa0c67058d887fcd56edf58adecce85dd05c7af25329fdfcfdf5bf7a52d4dc24061231a234180aad3df44a93
-EBUILD ifd-gempc-1.0.7.ebuild 1537 BLAKE2B 6cac5b7566bb320861d7caa73f99631a16528d2fbd1a7988857c1aad6cf33dd3649936a87286a1d97cddb257942f01aab7aa952149ffa36b0bc6074497fdc303 SHA512 57e0bdc819803442ccf03134cc68b58ffc35e342075f2d236717640059c6af37d0c5081f560e6d08e87990a0d615b695f681481775bb76ddd3de87c0d94bac8a
+EBUILD ifd-gempc-1.0.7.ebuild 1533 BLAKE2B dce7e61eac74b7b1101e6edd9d9f3a28d464193763c6d2bb2cf5a67fb1d8ad974c648d07568e96bb3cf44de99eb832fb2f80bface4f51ee421e74e0c5aa38963 SHA512 bccb36256cdc07db90ea81463db0b66f84b5167cefd26712414a13f8fbc88c88ecb185e9a9061965cdf8347d1f0d27ba501ecdb11936924c556a774700720a4a
 MISC metadata.xml 323 BLAKE2B 2ee45beb0620e037d819dab92d0849da60b391d9ac33eb004b77de9d5b14ad8afbf1021eeacc005819b59b9191afffcafbbeafb027687996ec39a8cd73c674ad SHA512 e8e4055840bec6320a0bd76fd12cffd63fa63e96f53dd3623f2ae9697fbd992cb7961d5d7eb327b296dae035eb0f645848bfe1bb30a09958efb60543a6459fa2
diff --git a/sys-apps/ifd-gempc/ifd-gempc-1.0.7.ebuild b/sys-apps/ifd-gempc/ifd-gempc-1.0.7.ebuild
index 2ce84f5f3eae..7e89f583238f 100644
--- a/sys-apps/ifd-gempc/ifd-gempc-1.0.7.ebuild
+++ b/sys-apps/ifd-gempc/ifd-gempc-1.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ src_compile() {
 	emake CC="$(tc-getCC)"
 }
 
-src_install () {
+src_install() {
 	emake CC="$(tc-getCC)" DESTDIR="${D}" install
 	einstalldocs
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 599b32f69e65..f9857a9c1805 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -2,7 +2,9 @@ AUX kmod-26-libressl.patch 4014 BLAKE2B db7a2ce3206210cd0358d136c8d0568dae077399
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
+DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
 EBUILD kmod-25.ebuild 4915 BLAKE2B 3b833bea7471c9b0c531b33164091214b24da4aa3045b66ac9067d35b8ab67503565f147e6104fa3c10e270e40e583b98091c470d40a858aef1e48b63306064e SHA512 d6495c1f1a1315b4ba7b45ba667860e70024a9dadfdff39d36793e2bf8bb58b2aef41f6937537e3ac84aed123aaa8f0a90b841de3d7343f270a1f459fed8ec70
 EBUILD kmod-26-r3.ebuild 5092 BLAKE2B 42cce75d72692d8dfc5ea4543486edbe7d760aaaaa9589ec16a41c18753f6bba588e0edd0aa64b77cfaced3138b88c1d09e0b25e0c230069cc0fd80100c9f418 SHA512 daa95f1e52df65a2da90cc1d816420825c2588685f466c9d204855ff39f3a9e18d6b523c344d61d7bbe5ec105f41e3658d4f1bf5bb52623f17979ed613d85aa8
-EBUILD kmod-9999.ebuild 5036 BLAKE2B 8e1535f44fb14c0f625e29da315805ca0862837a8a8305cff2b7e6be549ad64cab5a06e610e1bf738ab076b20cfc879cf60e233e95634829255bd37eada3f01b SHA512 49ea18cb6679221f538ba1a7e1971120dc55ab67dcb7fe868784d73109b88e91fc5b3a77714a80d2c8fbfbeb85f13eae43184d127d316c31a4d610c1017f256a
+EBUILD kmod-27.ebuild 5150 BLAKE2B 880134642d59e4640e21e83a15babc4c09200bd53afdaef9c96f5fb620d37b612f8edffd5bf2f416fb342a206f215fda0a7ebb02aa2796905aa4b202439980f2 SHA512 2a77e044815e00b615616609f26912c1a910bedade0bc07d43631112bfa4c473afcc54564f67d21b625eeeab34840eb5a49b3652632d1ae7e103d19085621f28
+EBUILD kmod-9999.ebuild 5150 BLAKE2B 880134642d59e4640e21e83a15babc4c09200bd53afdaef9c96f5fb620d37b612f8edffd5bf2f416fb342a206f215fda0a7ebb02aa2796905aa4b202439980f2 SHA512 2a77e044815e00b615616609f26912c1a910bedade0bc07d43631112bfa4c473afcc54564f67d21b625eeeab34840eb5a49b3652632d1ae7e103d19085621f28
 MISC metadata.xml 612 BLAKE2B 9459d066baed069ea60ef5fb72dd5a63a9980f041573aa24d67995a69539b468c31be12c96cc2dc396183c8b98064f8d30dbcc7cca346318c1f2356cb3037879 SHA512 4cce069924c603b69f08c37d83379af6889678106df5d4aa62d758138973277ab6b79ed021939bd8cfafefd27173404b7c155ba8ffa89efb9bebf458327be36f
diff --git a/sys-apps/kmod/kmod-27.ebuild b/sys-apps/kmod/kmod-27.ebuild
new file mode 100644
index 000000000000..e0a5eee807df
--- /dev/null
+++ b/sys-apps/kmod/kmod-27.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools bash-completion-r1 multilib python-r1
+
+if [[ ${PV} == 9999* ]]; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	#inherit libtool
+fi
+
+DESCRIPTION="library and tools for managing linux kernel modules"
+HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
+
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="debug doc libressl lzma pkcs7 python static-libs +tools zlib"
+
+# Upstream does not support running the test suite with custom configure flags.
+# I was also told that the test suite is intended for kmod developers.
+# So we have to restrict it.
+# See bug #408915.
+RESTRICT="test"
+
+# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
+RDEPEND="!sys-apps/module-init-tools
+	!sys-apps/modutils
+	!<sys-apps/openrc-0.13.8
+	!<sys-apps/systemd-216-r3
+	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
+	python? ( ${PYTHON_DEPS} )
+	pkcs7? (
+		!libressl? ( >=dev-libs/openssl-1.1.0:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-util/gtk-doc
+		dev-util/gtk-doc-am
+	)
+	lzma? ( virtual/pkgconfig )
+	python? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		virtual/pkgconfig
+		)
+	zlib? ( virtual/pkgconfig )
+"
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND}
+		dev-libs/libxslt"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS="NEWS README TODO"
+
+src_prepare() {
+	default
+
+	if [[ ! -e configure ]] || use doc ; then
+		if use doc; then
+			cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
+			gtkdocize --copy --docdir libkmod/docs || die
+		else
+			touch libkmod/docs/gtk-doc.make
+		fi
+		eautoreconf
+	else
+		elibtoolize
+	fi
+
+	# Restore possibility of running --enable-static wrt #472608
+	sed -i \
+		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
+		configure || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--with-bashcompletiondir="$(get_bashcompdir)"
+		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
+		$(use_enable debug)
+		$(usex doc '--enable-gtk-doc' '')
+		$(use_enable static-libs static)
+		$(use_enable tools)
+		$(use_with lzma xz)
+		$(use_with pkcs7 openssl)
+		$(use_with zlib)
+	)
+
+	local ECONF_SOURCE="${S}"
+
+	kmod_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		run_in_build_dir econf "${myeconfargs[@]}" "$@"
+	}
+
+	BUILD_DIR="${WORKDIR}/build"
+	kmod_configure --disable-python
+
+	if use python; then
+		python_foreach_impl kmod_configure --enable-python
+	fi
+}
+
+src_compile() {
+	emake -C "${BUILD_DIR}"
+
+	if use python; then
+		local native_builddir=${BUILD_DIR}
+
+		python_compile() {
+			emake -C "${BUILD_DIR}" -f Makefile -f - python \
+				VPATH="${native_builddir}:${S}" \
+				native_builddir="${native_builddir}" \
+				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
+				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
+		}
+
+		python_foreach_impl python_compile
+	fi
+}
+
+src_install() {
+	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
+	einstalldocs
+
+	if use python; then
+		local native_builddir=${BUILD_DIR}
+
+		python_install() {
+			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
+				VPATH="${native_builddir}:${S}" \
+				install-pkgpyexecLTLIBRARIES \
+				install-dist_pkgpyexecPYTHON
+		}
+
+		python_foreach_impl python_install
+	fi
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	if use tools; then
+		local cmd
+		for cmd in depmod insmod modprobe rmmod; do
+			dosym ../bin/kmod /sbin/${cmd}
+		done
+
+		# These are also usable as normal user
+		for cmd in lsmod modinfo; do
+			dosym kmod /bin/${cmd}
+		done
+	fi
+
+	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
+	softdep uhci_hcd pre: ehci_hcd
+	softdep ohci_hcd pre: ehci_hcd
+	EOF
+
+	insinto /lib/modprobe.d
+	doins "${T}"/usb-load-ehci-first.conf #260139
+
+	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
+}
+
+pkg_postinst() {
+	if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then
+		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
+		rm -f "${EROOT}"/etc/runlevels/boot/static-nodes
+	fi
+
+	# Add kmod to the runlevel automatically if this is the first install of this package.
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT}"/etc/runlevels/sysinit
+		fi
+		if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes
+		fi
+	fi
+
+	if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then
+		if [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+			ewarn
+			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
+			ewarn "kernel modules to have required static nodes!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add kmod-static-nodes sysinit"
+		fi
+	fi
+}
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 1ba782da2719..e0a5eee807df 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit bash-completion-r1 multilib python-r1
+inherit autotools bash-completion-r1 multilib python-r1
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
-	inherit autotools git-r3
+	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	inherit libtool
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	#inherit libtool
 fi
 
 DESCRIPTION="library and tools for managing linux kernel modules"
@@ -41,14 +41,19 @@ RDEPEND="!sys-apps/module-init-tools
 		libressl? ( dev-libs/libressl:0= )
 	)
 	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-util/gtk-doc
+		dev-util/gtk-doc-am
+	)
 	lzma? ( virtual/pkgconfig )
 	python? (
 		dev-python/cython[${PYTHON_USEDEP}]
 		virtual/pkgconfig
 		)
-	zlib? ( virtual/pkgconfig )"
+	zlib? ( virtual/pkgconfig )
+"
 if [[ ${PV} == 9999* ]]; then
 	DEPEND="${DEPEND}
 		dev-libs/libxslt"
@@ -61,8 +66,9 @@ DOCS="NEWS README TODO"
 src_prepare() {
 	default
 
-	if [[ ! -e configure ]] ; then
+	if [[ ! -e configure ]] || use doc ; then
 		if use doc; then
+			cp "${EROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
 			gtkdocize --copy --docdir libkmod/docs || die
 		else
 			touch libkmod/docs/gtk-doc.make
@@ -85,7 +91,7 @@ src_configure() {
 		--with-bashcompletiondir="$(get_bashcompdir)"
 		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
 		$(use_enable debug)
-		$(use_enable doc gtk-doc)
+		$(usex doc '--enable-gtk-doc' '')
 		$(use_enable static-libs static)
 		$(use_enable tools)
 		$(use_with lzma xz)
@@ -143,7 +149,7 @@ src_install() {
 		python_foreach_impl python_install
 	fi
 
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 
 	if use tools; then
 		local cmd
@@ -169,23 +175,23 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
+	if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then
 		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
+		rm -f "${EROOT}"/etc/runlevels/boot/static-nodes
 	fi
 
 	# Add kmod to the runlevel automatically if this is the first install of this package.
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
+		if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then
+			mkdir -p "${EROOT}"/etc/runlevels/sysinit
 		fi
-		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
+		if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then
+			ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes
 		fi
 	fi
 
-	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
+	if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then
+		if [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
 			ewarn
 			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
 			ewarn "kernel modules to have required static nodes!"
diff --git a/sys-apps/kmscon/Manifest b/sys-apps/kmscon/Manifest
index fedd791383eb..2243f87d43e3 100644
--- a/sys-apps/kmscon/Manifest
+++ b/sys-apps/kmscon/Manifest
@@ -2,6 +2,6 @@ AUX kmscon-SIGUNUSED.patch 385 BLAKE2B 0384e96bb5809d7b8c702f2cfe79e885bd469b4bf
 AUX kmscon-sysmacros-fix.patch 339 BLAKE2B c088bf8bad2ac171af219e763f404b6311c67541ac4febf0e8a02349783c49720912eebbc31f0a7c124b563394477ef9de4e2461931a20ae8c4448a1dd0ea593 SHA512 2b227b6cfa959002938209e85e0aac85d4bd4c567a7023ce0734f5d2131b001f29bdb3a62304d295747adb487ff10da9df4080c87139120da2eb9c8dda6f18df
 DIST kmscon-8.tar.xz 950068 BLAKE2B 7c4bbcc6eb0967d8e38e05a3e6fac60109a0ce468bc8967364b621274a9af4dd12a31af692be2efe0cc234af36f760836ec421b6567460efd4b7b1c3d913f44b SHA512 ac1581c2520a9c30406848dafc27231b38d392b2176e3ed4dd95b03cd54e256dd22f09e04057fc089effbbe08eb25546164bb885e0e5cbdbd752d4c27d07a41d
 DIST kmscon-8_p20180906.tar.gz 1156350 BLAKE2B 52c024ca6e9652b468efb23d38cda34bf0c05e1e2bb4268435e17adb8858439ac6bf0e1783cfdd24a48fcb2dcf7c1cb20eee09aeb90db08c2e94224d01efeff7 SHA512 2ccdc5b30df6d96ac7a75d01d674b295bcdb0d445169716638a20c9884b090bbfe509e0aee79cb674a2d9b0eb18ea6284b9d4e2939cb5bf290cade4c1a02487a
-EBUILD kmscon-8-r1.ebuild 2669 BLAKE2B 5c362a5562574170e3b1abef0a15ba2706aec8e4b218a0605517d6005c1008aecaf7507adf76bba7f359e01c31d75aa6d3c365a7b498c5fde63785340bb2668a SHA512 641dc662ca97523c38a3a7e0eda12630302a8a2957660b77bc08612cb143dcbbc0185dd1a6a087d4b86ca1aaa9c937acde48c536f10017ccb98d4f5609749fba
-EBUILD kmscon-8_p20180906.ebuild 2547 BLAKE2B 3ebd1582f27d5b65500b869f8dd01ef568b57cc3f21f30f42ddf356774c199687ba62aef28a03c2402e351ed66f85dd66184966319736ab42de4da7a150d8230 SHA512 e91b9cea898f9fe291196471553fce1f5b299636b28e005561542662e24444a9b630b41a04ed2baaee925354749fcf064aef44343ebeb7dc5c95dda85ca7d732
+EBUILD kmscon-8-r1.ebuild 2629 BLAKE2B ef7bdf7dd668ffef089ba1ebc29934be4c1c69762ac5f4609f82fa6fc486f409676bfab47169e79eca7137ec23087652cc57d1301508df239e0db75b8cab9cc2 SHA512 d0df146aafad885a7df195ae7a918391ba34eb67efc88aa314febfd5bc8060472734662ebcdf5b9a91f5d8a4ab322712186cbbc8f0e28276e3890e1104867800
+EBUILD kmscon-8_p20180906.ebuild 2507 BLAKE2B 29a8fcedf189419eae51be86bfc6bebdd008af8d7393000a3c51f02741216b5eaf4971a178ef2bf6ae4303e9d5ab08769d6543da02b929204ef9c6844d6298b9 SHA512 592b95c54321d697ce426b7ced9e09d39bd866b03dc8fae7ca778d90c1cd7fd2f409a1b72cfd92eabd5231abb8675cb9e21268e7fd5eeb32c2c3506492cd190c
 MISC metadata.xml 664 BLAKE2B 7c1efe65339f48a43b2fe2134fbd23c3145a73671bcec300af6f6700454b9c1a852f5ff9a5e17a94c263186f31e7703853973da5b5489ede6e59c5648f890f8d SHA512 95cfea7cb2c3c2e07a234af335dc708be83f3e6239231faf28c4e9544a37cb6ae8f619000b15382357c26fd01e2656666f8b13f0717e8b529999ca347d8b8230
diff --git a/sys-apps/kmscon/kmscon-8-r1.ebuild b/sys-apps/kmscon/kmscon-8-r1.ebuild
index 0266f4a63a2b..31ab17695d03 100644
--- a/sys-apps/kmscon/kmscon-8-r1.ebuild
+++ b/sys-apps/kmscon/kmscon-8-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
@@ -125,7 +125,6 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable optimizations) \
 		$(use_enable systemd multi-seat) \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--with-video=${VIDEO} \
 		--with-fonts=${FONTS} \
 		--with-renderers=${RENDER} \
diff --git a/sys-apps/kmscon/kmscon-8_p20180906.ebuild b/sys-apps/kmscon/kmscon-8_p20180906.ebuild
index e74c5c761b77..ad7c9809336b 100644
--- a/sys-apps/kmscon/kmscon-8_p20180906.ebuild
+++ b/sys-apps/kmscon/kmscon-8_p20180906.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
@@ -123,7 +123,6 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable optimizations) \
 		$(use_enable systemd multi-seat) \
-		--htmldir=/usr/share/doc/${PF}/html \
 		--with-video=${VIDEO} \
 		--with-fonts=${FONTS} \
 		--with-renderers=${RENDER} \
diff --git a/sys-apps/likwid/Manifest b/sys-apps/likwid/Manifest
index d4e788b630eb..9268a4bcabea 100644
--- a/sys-apps/likwid/Manifest
+++ b/sys-apps/likwid/Manifest
@@ -1,6 +1,6 @@
 AUX likwid-4.3.1-fix-gnustack.patch 1014 BLAKE2B 68ac831c96f826156238bbb4178c4923cb869a2757928af12f788a01067fb129326fec0c7a98b073f504f0aa8234d42dcd9fe7cdb0185b8107a6db3962cfbc08 SHA512 ab12e2ebebfca5c87b1ad2c89c5073aaa6987e8d440cfdfffc107233fc5b66c6562f25fdbd6720df3c1477becaaa3c3ac470fa4f99ac15bb78ea09fa06460a4b
 DIST likwid-4.3.3.tar.gz 1579433 BLAKE2B 9ec468bba009dec860b24c9c55c3d6023ffda3ab0985d835796686ba52d1d3372b2bfce926cf229388978de34e1ab0b41d8d27c88623c51c3e8ff1e9d674906b SHA512 ae4d68e238bc40e4a4ab5df628561c9bb7a0ef8727d5779dba2c32fff0be1dd333532bee7e4c197e5fe286de81d35b863ef09f4bc8b9f9145360e6e461f3d94e
 DIST likwid-4.3.4.tar.gz 1584829 BLAKE2B dcd1c3a0c5e549dc3d22bb98120339521e270da55460f5af9f2fe04849af0fe1ac4d9b881883a4efc3695ceb087d1afad5bcc55b55543199d2c33b0f5012cc68 SHA512 f1ee930a98d160728078a81a2cdc798ec62ac484545ced937131e6a6443e5ac23b8e597d31c7b1b9f67c1169e1c662c366cf1098158cb467d9f7ff12946b08a2
-EBUILD likwid-4.3.3.ebuild 5525 BLAKE2B acf7c8406f2214a73316355eddb48e6df34486dac26b19a3591aa447f8c5b2426cd988d27a1d38b6e24b5aa57d8f6d9025b3bda9fa259cb61b39606bb04f19f5 SHA512 fb000432478a1219153a45b05b389455cc462d017a6a965b0d25733fe05248cdf16a4c50887b4dc62b4877a31498ea810d230de2dfdcf14a8b1ce72f1a65aa95
-EBUILD likwid-4.3.4.ebuild 5525 BLAKE2B acf7c8406f2214a73316355eddb48e6df34486dac26b19a3591aa447f8c5b2426cd988d27a1d38b6e24b5aa57d8f6d9025b3bda9fa259cb61b39606bb04f19f5 SHA512 fb000432478a1219153a45b05b389455cc462d017a6a965b0d25733fe05248cdf16a4c50887b4dc62b4877a31498ea810d230de2dfdcf14a8b1ce72f1a65aa95
+EBUILD likwid-4.3.3.ebuild 5524 BLAKE2B f1f755a47c7ecd2f8f549dcb264f22fa11641038c50b8e0aaea538145c724e92b8b0d86066441240aba2c961a5aa897963457797a480dbbbfacdcf9847d01a05 SHA512 fbd78dcadcf4e66b3e4b37b7fa4345d7c52ebdc10fcb340f2dad878889b836ba6b19090b3d17c96ff9dcdc6e3f72092de8141a6ffb7bb8be217dec45de0bb950
+EBUILD likwid-4.3.4.ebuild 5524 BLAKE2B f1f755a47c7ecd2f8f549dcb264f22fa11641038c50b8e0aaea538145c724e92b8b0d86066441240aba2c961a5aa897963457797a480dbbbfacdcf9847d01a05 SHA512 fbd78dcadcf4e66b3e4b37b7fa4345d7c52ebdc10fcb340f2dad878889b836ba6b19090b3d17c96ff9dcdc6e3f72092de8141a6ffb7bb8be217dec45de0bb950
 MISC metadata.xml 333 BLAKE2B bb0321ece26d2e67d8c0cce9895247e8dcb84d72ca1b0186f066e639805e4006d9a8288403042c6fd96fd02489b554eb208843eafe436140f6e352121e5b1806 SHA512 bc44f5e8d86426c7fc32dc2d75c42d85a456c69cacccc1f44dbb8c561defb1748dd665fcc916d3a6577766a3d7bbd0944fa73f7df04b2d17b3fd3353929fa2e2
diff --git a/sys-apps/likwid/likwid-4.3.3.ebuild b/sys-apps/likwid/likwid-4.3.3.ebuild
index 1f4427478f9a..02a836a19c6d 100644
--- a/sys-apps/likwid/likwid-4.3.3.ebuild
+++ b/sys-apps/likwid/likwid-4.3.3.ebuild
@@ -139,7 +139,7 @@ src_compile() {
 		"${src_compile_opts[@]}"
 }
 
-src_install () {
+src_install() {
 	export_emake_opts
 	emake \
 		"${src_compile_opts[@]}" \
diff --git a/sys-apps/likwid/likwid-4.3.4.ebuild b/sys-apps/likwid/likwid-4.3.4.ebuild
index 1f4427478f9a..02a836a19c6d 100644
--- a/sys-apps/likwid/likwid-4.3.4.ebuild
+++ b/sys-apps/likwid/likwid-4.3.4.ebuild
@@ -139,7 +139,7 @@ src_compile() {
 		"${src_compile_opts[@]}"
 }
 
-src_install () {
+src_install() {
 	export_emake_opts
 	emake \
 		"${src_compile_opts[@]}" \
diff --git a/sys-apps/lsd/Manifest b/sys-apps/lsd/Manifest
index c83124591e42..4b93c044753a 100644
--- a/sys-apps/lsd/Manifest
+++ b/sys-apps/lsd/Manifest
@@ -8,21 +8,14 @@ DIST chrono-humanize-0.0.11.crate 11546 BLAKE2B dc0627852f00daa020f529fc37d5caee
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
-DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST glob-0.2.11.crate 18065 BLAKE2B 8531890ce378023f0119baccd5c556f297128d3f09c07d320d5cdc3c90032447f2e5a4f2fad0097bd3c6faf93b83256b387d232b3c9f9d3c40e54c48245321eb SHA512 91a1a751bc4ed3b13154aa056180f2b8123c33627cbe972bdd7986fb0b6f1ef90e59abd4128d6e4db5e69523d757440c7df9b9721a61f5ea5a091ffc9843e10e
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST libc-0.2.44.crate 347920 BLAKE2B 04fd82a1aab02a25a1201f6c463c0b30547e69dbca161f9b0ad87bfcc5b9b8427267fad3534c0a900c23fdb808b8477e20047dac396c8d000657266753786abf SHA512 fda87b206acb1a65be60784516c7d4f4aacb1ce53063e3c67a6a5335a02b3a7232867d11b0cdc574131d562fd98471df8bd0427cc5790c4add0556b2a090b284
 DIST libc-0.2.55.crate 400416 BLAKE2B 157b4f9d221f562e37ccfdd662a6777c8c6c45d1d2c9f9ff0f9d4d1bdf1aa66dac9f61a220e5be65fd7bc01273335eed86291e158f64da26bd7b398af26663e2 SHA512 649155c45a098dc043a42a0df19a7a43100f104bda1ce1a3bad9e5070b5a9c3a73f67197e286fb508c9257315b2e1d2a6eb4cba35f909ef0a2b1f61e1a29b196
 DIST lscolors-0.5.0.crate 15937 BLAKE2B 27c9d42fbdfa32ce9f01fc627c2a758544dccd72f2b63f232b4984287f61f5f4dc8788a30ad60ae92ddc374b7b993b577bbc0d11a03c61756af81cc672300fc0 SHA512 97d881cf248dee1a744e6016941abb80579518ede0883e419b6c452215ddc0b2a6336c6c6c254e4f463cfa7f3a648ea56fef1df0ff044daba98c2d03e1731013
-DIST lsd-0.14.0.tar.gz 33646 BLAKE2B b0bc5f8c9ef764e8e2c1a17da144e507ff6181bbde88a002950b47fb1678f4f4790e1cdc9e438c59ebf8e84eb7ef4c7a6308a45c21c75d63b56d0b5078bef987 SHA512 f1c17b63769f7c390a36e2ff99caf6d1da326fefc041a992986f756614a70db5aae4c87a0a33e416a6096d8ce65f0c0cbed50d168a8d0ca6dc2e97f0065593a0
-DIST lsd-0.15.1.crate 38136 BLAKE2B 6540beb147161fbce2bc59fd97221b961d87a0fe27f23c7b7e168ee80c219854ab1929f4fc92afa2cf70dc82b8ee2c9f7694e9aa9bac91f3c37ccfb981e8e53d SHA512 ab1ba61901c372a39a7e26eda5b53adceb0b357dec998f880d23a8e97c3addc16bf1d6e21cac262f23bec3d4061b3e9f6734d85d856b8e649e8b33805acf094a
-DIST lsd-0.15.1.tar.gz 40728 BLAKE2B 6e3b6c432f23b476bdf53cc0a6bdb353c9c4151e718cb6b848824c9a128c4e34f4c34ab9ff415bc76124e15addcaa989d629ddde009a4599dab146323a7607e8 SHA512 58a280615e72f9dc685e49532d147c17d94be099f80400add15b983d5945d98004a6a636f7f7a76809376dc07cab25f44d716a4b00456db0201c34f935952ed3
 DIST lsd-0.16.0.crate 39872 BLAKE2B cdf78606856d689e22edad5cf1f4f555edff2030e1b10ff0e706f7dbbe98c5836ef4a8ad6d061fd3c968f8499815b79c97595d0fff43d513e8fec40a4f3a632b SHA512 cd761e039f810c6fcb925228bdbc284ea0a3a9b16a11038de3086bf89ad1f99b442e33a0020612079bc40e7adb1a3ae056565f4022e2714bc9cc47767e7fc03e
 DIST lsd-0.16.0.tar.gz 43284 BLAKE2B fb8813f33fa487afea428a3dd3a01fe6c9e56616a8c69e7a97430e41deb4a0ed0cd5b4c6ee79ba02d145267d2fd2ee2167365b81fdcf868bec2cdce0a98a1535 SHA512 562c070d3e716af26ff3a54632cd176a1b95471fbb7e947f8175f89df483ff5b337d1a0d7578fa6ee41f77fa7ed1a618d37e91ebf1b8428e6a857918b415aa39
 DIST num-integer-0.1.39.crate 17881 BLAKE2B 1398b54766719f6fe298fb20489373ef774f1466349bcb96479610c00bb0f6f54b1a794def2841a0bf70558f6e5a080b528071ad5c64baa82bfac084354fa203 SHA512 1e00ef9fe5adcc312b4b8a59923015eb1387d90e6b3d7239b3aabcd83a9e67f2384b3a383d84ce8cdc82a470770f56373a89f0a679727a5fcc8f5bdb1f1209e3
 DIST num-traits-0.2.6.crate 39923 BLAKE2B 7bd781368c553622620f0d62a09f2c82fd26d4e6378ea8fc51b0e655dcf0561701881027f46f7a98da1bc25b777c62ab7338387c776a9e5e3463ea53a7efe922 SHA512 db638c662737972f07bc7ab82b923bece8a6c04719199ec0c7ca90140ac11e4fd1e4eb3748a69ddd3ad2791d4f5f5f69a00ce8aae92a647d9015d130f85b6b4c
-DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
 DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
 DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
@@ -38,7 +31,6 @@ DIST redox_syscall-0.1.43.crate 15212 BLAKE2B cd2e3bbd3cad2568bb61d71931f84b9c09
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
-DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST tempfile-3.0.8.crate 24549 BLAKE2B 839b7637add53e91b232246739b21a60c28bd54704b65da889bc92733fd117d9aa46289c44d94974c9c24d7d532c97a4ad7c64617e1df8bec21671ecd16419e4 SHA512 88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00
 DIST term_grid-0.1.7.crate 7353 BLAKE2B eb4d11b84995d8ca831c32c3b0c781244d7d97367aa6b877f1aaa21e6b10edad5a4597ab06d5c1b6a9cc00fbecd62fa3f28b9970119dec98c0eb5d0c74948b5f SHA512 12196d1f2579b6d593a7cdd34d74635b93fad710bcd682dd438143a9e814759346dc263dc8a65628b7ed8fc1dbcaa60fd9cec543d0cdae000cc5dc6fbb199bca
 DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
@@ -47,7 +39,6 @@ DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
 DIST time-0.1.40.crate 29518 BLAKE2B 9102a29eeeda597100e8e9f1e6a021df99678383d02264c8b94b07f5bef73aac5f0cc77345aa5d7d5db3f33d67581b4970e5a80597773afc726bcf73d1415b5b SHA512 a14753e598ae9def3f479741968bfba028e55debdfb1243cd1becfbf468d2c5fd8457aca720197e16a6a2c63e58e07c51cab5712327ad8ae37605a2825a29bc9
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
-DIST users-0.8.1.crate 18406 BLAKE2B 9e6c36e04a64fc5e1e33a4a5714bd360d10c254cd4140c008e00cbdca7b1699e0f66aaabf8dfb8d9c9142ceed4c39af357d6d754c07fe2aa38364128fd6fbe97 SHA512 04de8d9943d9b929ddf060e08f7a019662a0ce9fb7423a8c09c81d52462bf86988f99c29f51d19ff2c72f53cc9d2179f3a57a68e544611427a1c016cf8a474b0
 DIST users-0.9.1.crate 20456 BLAKE2B 49a2dd188f8d944d361a4e58f3f437718af7510c2b684e22209058e97dfd9d5ecec2c901cbe2cef36ab74d11091b1280de8b94135da523f57b02372ed5571fe0 SHA512 e372f8402d241e924c77a13621053836a1a36a6a6b9b66d5e187a582be0a85638270ea140c048e07f6739ed228711095fc98705303c499f2b542fd548df0819a
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
@@ -57,7 +48,5 @@ DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD lsd-0.14.0.ebuild 1154 BLAKE2B 45ffaf39e643b70e0e2453713aca6ba322272da53bd0ce000a5339a61e775182489b4ef2dd631188e8e64f1171a46e9c3e2e711b80d132226f8a34b7f6185de6 SHA512 dd2bb09ad11b71b76450b65cd9e9746560c2772ccff84bf63da732f821389d3ed680bacc9e4730c52f6122150088edf675e79299f2265a864c3dae267c3d6a11
-EBUILD lsd-0.15.1.ebuild 1189 BLAKE2B 3bec96ad60243b563b8c8890081cf93a6d09f64b4dacbe911a1dd9073d8254b899ad117cdf7f100a5587e07cf7d7f26546e5bd2374378ad3bfaad0420e98ff1d SHA512 ba21e92adf01cb1d1f2b8bd0ca3bdd92d481c75595da711f678763b8e308e1ef8977c00f6ade5d67a8d2c1a76ec12cdc4fd33357105ae070777a4e0e0395aaf4
-EBUILD lsd-0.16.0.ebuild 1374 BLAKE2B 49ad2f24d1abed9b14e21a8f39b1dfd0ed03852031924bfc72f008a55378c972a92549682d7fef901cfd614df761a0c2311661c546c2ebed89f58064c56e81d4 SHA512 ace02a735799b2b0effe0427a136ba2d5c058525255523d8bc994c1a7df58995aef9ebd6dadbd193801a4ce30b23375e2147aa278e60f76980bb533565be6134
+EBUILD lsd-0.16.0.ebuild 1392 BLAKE2B c1b8865714c255758cce5d34664ba768436fc50e4eb86eb9b5d6cd1794f6e7f0f902be5f586f44e3546765261345b0725340351403351a50284b841d917930a4 SHA512 d5e9098898f97cc1e6e5e2c796c90c66f6965967164871aabf876277f95b8214fcc552dad926ae8d4b27c91bdfc3a2a582055d185bb83fdcdec1e3bb0f7384c7
 MISC metadata.xml 759 BLAKE2B 46f9729d738136d537cfed0a59cb6be6821b5b59bd4381171fce99943119cc477c54b03f303be47451ba9f8929fe94bb62c32881eb730ec11e306517afca505a SHA512 98a410b73a6a4f51f3e949a6e78087052580ce53e4720528aa9e97d3ddb052b6d6e1055cd2609f07d7a605c499e620843842461d514ddc84644f6cac007be599
diff --git a/sys-apps/lsd/lsd-0.14.0.ebuild b/sys-apps/lsd/lsd-0.14.0.ebuild
deleted file mode 100644
index e8451f706387..000000000000
--- a/sys-apps/lsd/lsd-0.14.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-ansi_term-0.11.0
-atty-0.2.11
-bitflags-1.0.4
-chrono-0.4.6
-chrono-humanize-0.0.11
-clap-2.32.0
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-kernel32-sys-0.2.2
-libc-0.2.44
-lscolors-0.5.0
-num-integer-0.1.39
-num-traits-0.2.6
-rand-0.4.3
-redox_syscall-0.1.43
-redox_termios-0.1.1
-remove_dir_all-0.5.1
-strsim-0.7.0
-tempdir-0.3.7
-term_grid-0.1.7
-term_size-0.3.1
-terminal_size-0.1.8
-termion-1.5.1
-textwrap-0.10.0
-time-0.1.40
-unicode-width-0.1.5
-users-0.8.1
-vec_map-0.8.1
-version_check-0.1.5
-winapi-0.2.8
-winapi-0.3.6
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A modern ls with a lot of pretty colors and awesome icons"
-HOMEPAGE="https://github.com/Peltoche/lsd"
-SRC_URI="https://github.com/Peltoche/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND=">=virtual/rust-1.31.0"
-
-QA_FLAGS_IGNORED="/usr/bin/lsd"
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-}
diff --git a/sys-apps/lsd/lsd-0.15.1.ebuild b/sys-apps/lsd/lsd-0.15.1.ebuild
deleted file mode 100644
index 4eb55bcbe8f0..000000000000
--- a/sys-apps/lsd/lsd-0.15.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-ansi_term-0.11.0
-atty-0.2.11
-bitflags-1.0.4
-chrono-0.4.6
-chrono-humanize-0.0.11
-clap-2.32.0
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-glob-0.2.11
-kernel32-sys-0.2.2
-libc-0.2.55
-lscolors-0.5.0
-lsd-0.15.1
-num-integer-0.1.39
-num-traits-0.2.6
-rand-0.4.3
-redox_syscall-0.1.43
-redox_termios-0.1.1
-remove_dir_all-0.5.1
-strsim-0.7.0
-tempdir-0.3.7
-term_grid-0.1.7
-term_size-0.3.1
-terminal_size-0.1.8
-termion-1.5.1
-textwrap-0.10.0
-time-0.1.40
-unicode-width-0.1.5
-users-0.9.1
-vec_map-0.8.1
-version_check-0.1.5
-wild-2.0.1
-winapi-0.2.8
-winapi-0.3.6
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A modern ls with a lot of pretty colors and awesome icons"
-HOMEPAGE="https://github.com/Peltoche/lsd"
-SRC_URI="https://github.com/Peltoche/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-BDEPEND=">=virtual/rust-1.31.0"
-
-QA_FLAGS_IGNORED="/usr/bin/lsd"
-
-src_install() {
-	cargo_src_install
-	einstalldocs
-}
diff --git a/sys-apps/lsd/lsd-0.16.0.ebuild b/sys-apps/lsd/lsd-0.16.0.ebuild
index 39b576d104c9..41bda95080ef 100644
--- a/sys-apps/lsd/lsd-0.16.0.ebuild
+++ b/sys-apps/lsd/lsd-0.16.0.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
@@ -62,9 +62,9 @@ HOMEPAGE="https://github.com/Peltoche/lsd"
 SRC_URI="https://github.com/Peltoche/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 	$(cargo_crate_uris ${CRATES})"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 BSD-2 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/lsvpd/Manifest b/sys-apps/lsvpd/Manifest
new file mode 100644
index 000000000000..5c3732a2919f
--- /dev/null
+++ b/sys-apps/lsvpd/Manifest
@@ -0,0 +1,3 @@
+DIST lsvpd-1.7.10.tar.gz 89862 BLAKE2B a2fa6f85822313b5cf17ec9207ddd533ffb1cb4a3ee2e32416d6b646930f8499c3d8994ab6cd21b1d4d01be1c32f13e2bd1206cc073bbcbaf8cb9722993a1510 SHA512 0ee9b8329e9ea7eac6b502051a5ecc5af28642aa3f14af9cecd0217ea6637a548eaeab2e5631534041dfd849701e0905a0618b1ab62162b9af493ab0f8ad7ff4
+EBUILD lsvpd-1.7.10.ebuild 575 BLAKE2B c5f93a9b8e866ab6c07ab716f37aaa571c27a5bf9606c198fdf8107ea8bcc9936e3d0748f116d8bd1b8da32ba4c26093efa159681aa0aae0bfee0785e2ca9309 SHA512 8ca6d60982f851c230f9a95b4f6caff791af16f6bc9e9bf7f9eed5062bd14cf1462705f55abfdefefd9930b1436befd7489839dbd3b63cfeac01d383d5b27b7a
+MISC metadata.xml 988 BLAKE2B 1029729819fe1c2f8b197e27a127de88fb0a72cd6671a27cb08effdb81108b2be892860bc97012f6cb903d509ca3eb9fe4bf0f59c0642f93b19e0f453e7f276f SHA512 f20dfdcc425ead51943d39d8a5dec0f38baa023cd204a446e63f0f50588d51519a83af3fb6004ede20aa0d0d63ef5d9523d491759fc849951fbceaf96bef254b
diff --git a/sys-apps/lsvpd/lsvpd-1.7.10.ebuild b/sys-apps/lsvpd/lsvpd-1.7.10.ebuild
new file mode 100644
index 000000000000..8dfb6ff3bd44
--- /dev/null
+++ b/sys-apps/lsvpd/lsvpd-1.7.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Utility to List Device Vital Product Data (VPD)"
+HOMEPAGE="https://github.com/power-ras/lsvpd"
+SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~ppc64"
+IUSE=""
+
+RDEPEND="
+	dev-db/sqlite:3
+	sys-apps/sg3_utils
+	sys-libs/librtas
+	sys-libs/libvpd
+	sys-libs/zlib
+"
+
+DEPEND="${RDEPEND}
+	virtual/os-headers
+"
+
+BDEPEND=""
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-apps/lsvpd/metadata.xml b/sys-apps/lsvpd/metadata.xml
new file mode 100644
index 000000000000..76b562ad8fee
--- /dev/null
+++ b/sys-apps/lsvpd/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ppc@gentoo.org</email>
+		<name>Gentoo Linux PowerPC Development</name>
+	</maintainer>
+	<longdescription>
+		The lsvpd package contains all of the lsvpd, lscfg and lsmcode commands.
+		These commands, along with a scanning program called vpdupdate, constitute
+		a hardware inventory system. The lsvpd command provides Vital Product Data
+		(VPD) about hardware components to higher-level serviceability tools. The
+		lscfg command provides a more human-readable format of the VPD, as well as
+		some system-specific information. lsmcode lists microcode and firmware
+		levels. lsvio lists virtual devices.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">power-ras/lsvpd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 88ee5819e1ad..371fef769c12 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,12 +1,12 @@
 AUX man-db.cron 217 BLAKE2B 38f11fe7c3b1bcdd9c81cc904ec9b22af3722cacf1b30fa1fd80d4416743aa2f8f4c2a9246b0037c7cc9fbf23af430af10f69a7bb6c3dbb8f809c9a49cb31cf4 SHA512 81a7082d7f0cdf17d8277af7142aaa98feb8c12cf41bb96c12af53fdd3e436a4d15a57ef76fb90390133cfdb25e1bb1b16e17a39b39b6517afc529b871426331
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c7f70bb970973eb3f2178aa4323bcdebc7f39f142ec0144dbe55a9f86aba15d9fe281d2662d280b8e6dca9452f24 SHA512 623c5e7f8b7c289908b2c926f8777293b8d39aeceef0d2509d701a8b0bfa81408650f655c8608318221786c751a79ee91124b07993de5298cd7fa6d8bb737301
-DIST man-db-2.8.6.1.tar.xz 1829328 BLAKE2B 5dce50a4d5003a370595b3db0b1d7f01c54b53d26f011307bd91447cdeed410ea20a6720b12eae301d21c0b9674ed84b055f38f44e09d5543ce1647dff8b5bca SHA512 0c43cdddf2e07cd4a2225e098ea4cbfb2842a9bbf08bfb073058be0d66efac3a77ca0f8725564677c8f61e671f471c76f1dbba77a7601d7a63bb81350ef51bb5
 DIST man-db-2.8.7.tar.xz 1839012 BLAKE2B 19b438b1083cfd838421f29ed053fe85686929bc9f2105fe399ea99622f138bca2c8888a17cddb9223362db2d5f9c4bb3669865ecf749fe845ea8e4223027f67 SHA512 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9
 DIST man-db-2.9.0.tar.xz 1857216 BLAKE2B b797c1bc48027346114d35f00624686daa7e139cf5836e207b482d645009b95577bc13cbad3f1b2498e8c7e8c2f530d43aa8dec96ebad6bb84e6cc77064319d1 SHA512 7deb4421c7944276c6edf974b1336ee2f6605ee470c98d374544e2fcaa32ec2afe077c5fd020fc1f74df058384a293b8ad5a92d86b1c15a949573af46ba09cda
+DIST man-db-2.9.1.tar.xz 1875456 BLAKE2B 42d7d5f49bf19e031bde18dd60cbf18a7656e8756f2cc5d3789cab6ea82283115ed0303ae2f7f7ffd3e32310302b7b70b4e39704bd5c2a08ab60a38905d8c448 SHA512 ae2d1e9f293795c63f5a9a1a765478a9a59cbe5fe6f759647be5057c1ae53f90baee8d5467921f3d0102300f2111a5026eeb25f78401bcb16ce45ad790634977
 EBUILD man-db-2.7.6.1-r2.ebuild 3175 BLAKE2B 4b31b2ed3147c80332ea5de476e97f2c4ed8444464e647ac5d9647798498ecfc5532f753e0a280ca76e78530296ce348d2cd9c7ce015fd3a31e8dd3d7edbf75c SHA512 b4f9bca1717cfa1c488d7cc6f162eb984c03c3c308e74690ce0a9ee67c2dba67bfd4c3c6877db9b86d0ad60fc5874b42aa459399c7f72313c7091baaadf2d7c4
-EBUILD man-db-2.8.6.1.ebuild 3460 BLAKE2B 4442e511e90674a1b511fde4829b30399a79dc0b483c213e4a7de8d2e331300a5a99a7fa45ad30cd5896d6a57e7c580affc524e41cbbba28b97a2c3af3a6a55a SHA512 0907ed049803b9c04f8b454cdd6ff8f8cb235b8b531502d0ef55f5022b75af2b51189b4472ed382e161f70600dff1e62202bd499a7c7d24577378a44b21f1860
-EBUILD man-db-2.8.7.ebuild 3471 BLAKE2B ecc2767847f36a0cfed4f71e82e2bb683f219b2efb236bf0b8135368154e37139c82ae293b8e7911aa128169fc9b620a5f1b83b76b8d3784a6e66b9dd97af6b5 SHA512 88b299762e788380d0e5ee3b59834345b6050fdd5b200a5e355fd41d1967019df67f18b1a6ec2fdf1da0ddf17cfd5509fe6cb71beb4dfad07c2a660cfba47531
+EBUILD man-db-2.8.7.ebuild 3465 BLAKE2B 1316fc94431ef91d88f5db50f5e7c8a7b77a39ffdf8fdc7f6e0b5c57198df1d2c62c83e990170faa51c56051a41be90ba4cee9dd742ad116212489a8c52b159a SHA512 af71614eebb52a88b3ac461c761b7bc67fbb9edccd3c585862bec9515fd24fc7ce7e8f7a2bb57394715360be9529d10768e85fd6788446a5ae7d8617dfa851b6
 EBUILD man-db-2.9.0.ebuild 4019 BLAKE2B 51ebbcad346410f4030b19ca787b36b0d86e32e0c54e9fb74b4dc95384868775dc777a30b101e4dea9e4b1c265567a5c53fbb686aaa9857eec6c7e5b9fc5be9c SHA512 732da754f75d4773cb267b30aac7b6076134e4183fc1572e95f0299cfd01fa470bc775f18753e7259443ee84db81c4109e73a97de360de093db90ee4077536c7
+EBUILD man-db-2.9.1.ebuild 4019 BLAKE2B 309bfd5e5c1c28848f542bf1b7fe1364349a8a34e9ba94b9beb71237d12f17b64b6692eba783a6f2cf0251fee00f08bf3b7bf6bf96879ecba63e0f4e1b837c23 SHA512 3dfd23b1931a06cf418e8d03a2f7752746a164a4a68e6760323b374b2ff9b08a82202dd49ad63582d516cf41398b0175b5e0572ee79d4e4f4889eb2a6be4f17a
 EBUILD man-db-9999.ebuild 4019 BLAKE2B 51ebbcad346410f4030b19ca787b36b0d86e32e0c54e9fb74b4dc95384868775dc777a30b101e4dea9e4b1c265567a5c53fbb686aaa9857eec6c7e5b9fc5be9c SHA512 732da754f75d4773cb267b30aac7b6076134e4183fc1572e95f0299cfd01fa470bc775f18753e7259443ee84db81c4109e73a97de360de093db90ee4077536c7
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.8.7.ebuild b/sys-apps/man-db/man-db-2.8.7.ebuild
index f4fbb8a7f88f..270ee83e29f1 100644
--- a/sys-apps/man-db/man-db-2.8.7.ebuild
+++ b/sys-apps/man-db/man-db-2.8.7.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
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-db/man-db-2.8.6.1.ebuild b/sys-apps/man-db/man-db-2.9.1.ebuild
index 4d2bfc884fe9..9cc7f136966d 100644
--- a/sys-apps/man-db/man-db-2.8.6.1.ebuild
+++ b/sys-apps/man-db/man-db-2.9.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
@@ -8,7 +8,7 @@ inherit systemd
 DESCRIPTION="a man replacement that utilizes berkdb instead of flat files"
 HOMEPAGE="http://www.nongnu.org/man-db/"
 if [[ "${PV}" = 9999* ]] ; then
-	inherit git-r3
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
@@ -23,8 +23,8 @@ CDEPEND="
 	!sys-apps/man
 	>=dev-libs/libpipeline-1.5.0
 	sys-apps/groff
-	berkdb? ( sys-libs/db:= )
 	gdbm? ( sys-libs/gdbm:= )
+	!gdbm? ( berkdb? ( sys-libs/db:= ) )
 	!berkdb? ( !gdbm? ( sys-libs/gdbm:= ) )
 	seccomp? ( sys-libs/libseccomp )
 	zlib? ( sys-libs/zlib )
@@ -52,6 +52,36 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	if [[ "${PV}" == *9999 ]] ; then
+		git-r3_src_unpack
+
+		# We need to mess with gnulib :-/
+		EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \
+		EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	if [[ "${PV}" == *9999 ]] ; then
+		local bootstrap_opts=(
+			--gnulib-srcdir=../gnulib
+			--no-bootstrap-sync
+			--copy
+			--no-git
+		)
+		AUTORECONF="/bin/true" \
+		LIBTOOLIZE="/bin/true" \
+		sh ./bootstrap "${bootstrap_opts[@]}" || die
+
+		eautoreconf
+	fi
+}
+
 src_configure() {
 	export ac_cv_lib_z_gzopen=$(usex zlib)
 	local myeconfargs=(
diff --git a/sys-apps/mount-gtk/Manifest b/sys-apps/mount-gtk/Manifest
index c753699f58f3..1c90562203d0 100644
--- a/sys-apps/mount-gtk/Manifest
+++ b/sys-apps/mount-gtk/Manifest
@@ -2,5 +2,5 @@ AUX mount-gtk-1.4.2-c++11.patch 1125 BLAKE2B 25871ab418def7d5723455afbf481be81f0
 DIST mount-gtk-1.4.2.tar.gz 232132 BLAKE2B 7c6be675db2fd11ce36501e8b247ddbb5a786b28698c4195c329b310cabc710f6df65f7869ec2bbece2edfd54820b8de88a0a7b20d442fe3d6e27ab5e93689fc SHA512 90fa174238d19bf009f5863e5571030091681038ddbfdc06c7a39f8859b78d9864b398899d66463d0f8a189e484201c7a32753b38898e0f5d55970feb85420ba
 DIST mount-gtk-1.4.4.tar.gz 240716 BLAKE2B 25244bfea0db577c3bfb61abb9acea4cdab41e9cad3173dc472c57ca39b7739e3cfef0501ecb874faf1bd8cd92e0cfd8b48ecc5aadcbe4294309aa692593c376 SHA512 85ed7e5bd92d6ea15a8fd907a0bca4bc7e64861b03e922bc28827108820f1fb4daa87b94a16f468c87d741a8d456f27f755e06b2049f2a95ce4ab00d395763d2
 EBUILD mount-gtk-1.4.2.ebuild 858 BLAKE2B 80c7eea632ae9694cbe22fa1b01cf36f47f456fd6058010d557834e5738f67e5210af91a8cf3bf48014567eefd9c6e2aed5b54416cd054121868f97c9adc4904 SHA512 ccf32adf1b708c6330b706a9485a560e3ec5016f784e059ace30324b7c567a346fb8581d0efd9c79d707bef88475b8eadad1565ec42f23f2fabcedd22d4d574e
-EBUILD mount-gtk-1.4.4.ebuild 818 BLAKE2B c57015c6a089e80b42dbb73e9288a7fb55d2c65515dcf52f0aac52a9cb18714005be14b88820a50a7d8af339619941ca60b4280f13f2fcadf00e8ab918bb457e SHA512 d31433c615117d841e01fc8d988607d9820a1c0be025fa9900bdf05a3a71573db2ae61f4098293c3ba5564d56a8f75e56c3e4c4460ae9bed9c78ef0059b317a2
+EBUILD mount-gtk-1.4.4.ebuild 788 BLAKE2B a62cdbc7cdd29c02cbede00409dd0aef3f6305e0b3ea1d6ebc111610b0b9d68c767189f691b3e11cdd36ec8622ddba64165856be3603ef5d46174b9a9ea30e56 SHA512 35f57f13a320bba11b4b2943641678244f3322934d915d30ef92d693bee95d44b9637ddd8638dfe99497ea6852ff0529eac41349b3ca69750bee4ebf012bb2b8
 MISC metadata.xml 355 BLAKE2B 2057650f632b2f484a75473cf9bb2054392e41704767bd7d33c3182230e4e386b4d99cc1b654b2e3b5b5c0d06cc574cf9f097ae78bd981334abbbcd4eece2d82 SHA512 a2160b97106975c45262beb68b1c6e1412edf2df400868ece4a93c1318a2e24b0a178cca0b0a4ac7c766e0a3c1e98b1a812d0fe079ec1412a05aaa1eb5f8d8e3
diff --git a/sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild b/sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild
index 563968c6477e..c8cf9d128bbf 100644
--- a/sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild
+++ b/sys-apps/mount-gtk/mount-gtk-1.4.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -37,5 +37,5 @@ src_prepare() {
 src_configure() {
 	# acinclude.m4 is broken and environment flags override these:
 	append-cxxflags -fexceptions -frtti -fsigned-char -fno-check-new -pthread
-	econf --docdir=/usr/share/doc/${PF}
+	econf
 }
diff --git a/sys-apps/onerng/Manifest b/sys-apps/onerng/Manifest
index 535559e78966..dd31e697ccab 100644
--- a/sys-apps/onerng/Manifest
+++ b/sys-apps/onerng/Manifest
@@ -1,3 +1,4 @@
 DIST onerng-3.6.tar.gz 108126 BLAKE2B 717fc2b795aa991fdca28e2032da0a7729c487cb684361799421f806f60ae4cb70e8d29cd72de2eec9bdf38e4bf1d530261fc19bfbee6e95360a7648b8a45858 SHA512 d2f2bceb458e1441c4321526e5477ecb26df9f84e8554df723b97c3f09ad4c04149ac844bb88a182abf5350566cd5762c35137ba3c6b71685671a69ba12ccc58
 EBUILD onerng-3.6-r2.ebuild 788 BLAKE2B e5a568a58ccff089e72c7759ca6c25d07abb1886f6216f43db832a74f63e03a167d4dcf3ce5b428080fc78efd10dc230df390efd5a05b168d4726009ce78b221 SHA512 cb50d54fb602d03446f63debd83aeae6523f273a96ee85545baac09a6739bd6435ddd85b2815a18eb15093ca9fd8d892b82c76287ca761672e0aebeefc7ba3ac
+EBUILD onerng-3.6-r3.ebuild 828 BLAKE2B 2fb2f83c3bf220c2b1b1807f8797147025a18acc2aba5fb49bdf0bd176f25f566bb95bbf4d002f38be9f133c5de009d6cea35c96836ec297ae6dfbd0143530bc SHA512 8bf54ecb21e7d5f8045ef810878ba9fa841734bb9772e3e9e8d05d66190612fb65523d829b0e933f99f5190a468db20decf32784db45bf0c4e92c7594b69652c
 MISC metadata.xml 715 BLAKE2B 2d4b842c0ea11b2633764e385898ce8df514a289b482c5e528b962ce00d97289abbd666acc367b1f170f95b785409712950b44b284a550fc796a3017fdbd10a9 SHA512 4f004de8fd56338d850d2fbcb4c8bd94f695f55b2c16eff687f1985a22f86094b4f01f63599029f52d0056a8e6f214f7f0396413093ea8cd01970be29d0092ee
diff --git a/sys-apps/onerng/onerng-3.6-r3.ebuild b/sys-apps/onerng/onerng-3.6-r3.ebuild
new file mode 100644
index 000000000000..3ec2cfa3ec6a
--- /dev/null
+++ b/sys-apps/onerng/onerng-3.6-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-single-r1 udev
+
+MY_P="${P/-/_}"
+
+DESCRIPTION="Software for the Open Hardware Random Number Generator called OneRNG"
+HOMEPAGE="https://www.onerng.info/"
+SRC_URI="https://github.com/OneRNG/onerng.github.io/raw/master/sw/${MY_P}.orig.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="virtual/udev"
+
+RDEPEND="
+	${DEPEND}
+	${PYTHON_DEPS}
+	app-crypt/gnupg
+	$(python_gen_cond_dep 'dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}]')
+	sys-apps/rng-tools
+	sys-process/at
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index c256660f98e2..55c73114fefe 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -1,3 +1,5 @@
 DIST osinfo-db-tools-1.4.0.tar.gz 519089 BLAKE2B 2c2e0cdbcd0a795f8deb09727b8b971748f5d0ecc08449238d3054cbd947a0f6059456d4e9feadded47cd0e0aaa87132f1bec7524a3183115dd459eca989d1b0 SHA512 f4813f948551f630cc9936986abc3ef4455647ec529b353dc4fee71f8071beeebac0a2ee1988cede92ea3635bca9bedd400ac9f275e3f5592ff50236d97cfb91
+DIST osinfo-db-tools-1.6.0.tar.gz 547189 BLAKE2B 38db3118d618d620a137b12021fbcf9caffe1e0f67252d2eb7c514d4f25969b152679f55b493bb64abc0925ff07ccea897acfd809d17d7257db2b33a690f4878 SHA512 a3bdf9d913b388b0f567a14245f57c4f1da9dae40d723f8e76096ffdae9d7a8e587ed4832e3e59c820bc01bbb2b74815b3fefd8e1f47cebd903091457fdee951
 EBUILD osinfo-db-tools-1.4.0.ebuild 856 BLAKE2B 038ba8148b42ea03985e3f898b791876a87b30080f369f228d61d74f65a0f013bc2c9b321f2b12357c2a4d4140a6aa11270019d1f9bdb3ec892dd62732a774ec SHA512 17aacd592fd949ffec601cf416b3f07fcc3562b6cb1ad5562cefa94b861959364f72da470133defe109c4aaca3f0dd497479339511933affb9ccd3ecb201e6fa
+EBUILD osinfo-db-tools-1.6.0-r1.ebuild 1296 BLAKE2B a1a99a1fafeb1748f59186a701981675475ad60644c9dbafddcc5e266dbc12e1bce12353b072f05a41061d8ea18973ae3ff3fae146c8781d67796eadfdd41f64 SHA512 1add0750f95629e65c7ddf6198fce1d7dff47fa30bb5e5f9a3a994578e01f18376bcac6c3eb72ace433462bc11fdabd29439a78d7ee7b8f69feff33a52c60476
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild
new file mode 100644
index 000000000000..1d3a019cc342
--- /dev/null
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit python-any-r1 gnome2
+
+DESCRIPTION="Tools for managing the osinfo database"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Blocker on old libosinfo as osinfo-db-validate was part of it before
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libxml2-2.6.0
+	>=app-arch/libarchive-3.0.0:=
+	dev-libs/json-glib
+	net-libs/libsoup:2.4
+	!<sys-libs/libosinfo-1.0.0
+"
+# perl dep is for pod2man (and syntax check but only in git, but configure check exists in release)
+# libxslt is checked for in configure.ac, but never used in 1.1.0
+DEPEND="${RDEPEND}
+	>=dev-libs/libxslt-1.0.0
+	virtual/pkgconfig
+	>=sys-devel/gettext-0.19.8
+	dev-lang/perl
+	test? (
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	use test && \
+		has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
+		has_version "dev-python/requests[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 3c8963e573d2..666ca7e1b8a1 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,5 +1,7 @@
 DIST osinfo-db-20190218.tar.xz 82712 BLAKE2B d026b428171127b5048357ae75e2601fc184b9e2e5dd7224a7ba1a439ebf20e567bd910ab4b8a0920d3f8c0e2e8be637086920ab905a8fd8eb98c772a13c234d SHA512 e6b6f0e8b965ecf5a6c38071f3b2d5646123a6d84a5d5ebfb59995f10ae0aa8985bc5caeb1a4de396b92be0466291bc82247f33138f7954c847651eb682fdad3
 DIST osinfo-db-20190319.tar.xz 85668 BLAKE2B 9e1d95379c659dc325a0fa5d7d8e6abc6c486839cbf42d78e0964583f19258f2e6669e685bc09cd13f17ecd04cc3d1cf3188d862d12d2825636a76d9d2999b8f SHA512 fb06adeaf639e71b02bec30dafbc405e903d490cd8038d4fe94de63c4d0bb9f617a469e59d11fd4dfc5c1c0d9a6094b888ce5867634c0cbe501e5195316a8e75
+DIST osinfo-db-20200214.tar.xz 99572 BLAKE2B 0342b35c5e370d98a23ccc36c72233ac2d92d11d30330b6188101cd9451e7c557849c3d1d65c0d469d6539c5b4347a4fc16eb7a5a92493bd5a2a887fb19ade08 SHA512 b51f62f2d31b4da9cc6162b3798cdef0993b7cea2c884cbeffb4e81de027bbd077ab1c3d871391e456b41e87bf2a3e80244c01a49f39db53285cca0596ec09b4
 EBUILD osinfo-db-20190218.ebuild 668 BLAKE2B 0e4e429414a0a894b5dacf340fd5ce5be4dd7aa60d86c6c1508f7b60af03535831b9b8c55ff470f8ddaad5526425a5d805cc4fa17db2fd5aa880a73c9809e8c5 SHA512 b2ef8af5554474858ace472c8e7230cac8bf77efc45c6ecae37642eb719e3d5bcaeff6a52580bfd8d840c288e38455242ea8ea756cb6eb7eaf68c6521cd4618f
 EBUILD osinfo-db-20190319.ebuild 668 BLAKE2B 0e4e429414a0a894b5dacf340fd5ce5be4dd7aa60d86c6c1508f7b60af03535831b9b8c55ff470f8ddaad5526425a5d805cc4fa17db2fd5aa880a73c9809e8c5 SHA512 b2ef8af5554474858ace472c8e7230cac8bf77efc45c6ecae37642eb719e3d5bcaeff6a52580bfd8d840c288e38455242ea8ea756cb6eb7eaf68c6521cd4618f
+EBUILD osinfo-db-20200214.ebuild 671 BLAKE2B 1a1edab17c338bbc4067cbf99b89e362307a142f5c53c2ad2dd72bec89b88a13843b66a0552156bc1c7d3437641cefd767d6c3877d93cd7216fadc2b1c3c3da7 SHA512 a46832e3fbb2f8e5eb6632632896faeb184da58a01a1297fcfee5151b6235578a13ae413a2a48031399da2be31f050607cf7d71c32a65fbc944eb9d45d14a04a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20200214.ebuild b/sys-apps/osinfo-db/osinfo-db-20200214.ebuild
new file mode 100644
index 000000000000..ee488fdf635f
--- /dev/null
+++ b/sys-apps/osinfo-db/osinfo-db-20200214.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="osinfo database files"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	sys-apps/osinfo-db-tools
+"
+# we don't depend on intltool here, contrary to README, as the tarball already
+# contains the processed results with translations in XML files
+
+src_unpack() { :; }
+
+src_install() {
+	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
+}
diff --git a/sys-apps/paxctl/Manifest b/sys-apps/paxctl/Manifest
index 3feef5bfcce5..ff5b46ff1724 100644
--- a/sys-apps/paxctl/Manifest
+++ b/sys-apps/paxctl/Manifest
@@ -1,7 +1,7 @@
 DIST paxctl-0.7.tar.bz2 7642 BLAKE2B fe9dbf6a673e677556b7667a036cdb5243c064fb9a10dda49783b408ed66d6bb072c478b529fa58cd2795b19c3128d6ae83c4aa4f11e19fd835c16a7df1aa4ad SHA512 d715d7466c5d5b402a7b6c44257b959c81234b8b72dc3bad4ad1080f66da784b348e73fadd3b2072ddec6c6b08f042a35cbf9d63cb890ef9efceb1e2e8d56d0a
 DIST paxctl-0.8.tar.gz 8027 BLAKE2B 3d2e1b22b3bbe0912c2b3ab4ae864c9eb01e949349c382b4b395983f5787ffb6b6b5681329c81aa82231e8b779badf0c46a41cb43b967eef48892488b957d736 SHA512 9357601a96a7780bf900621e8b88e8e7cd323159084f62f30cd6967319fffabe08efff3596612fd05a1daf639610bb15d998f4a954c980ab4f45c9a0cc80037c
 DIST paxctl-0.9.tar.gz 8109 BLAKE2B b26049dedfa82890e5445b5baca8379d37a184124d468d895339f1dad6142e4d2ac8fe393df42a68c6aec8a03b151cd412c2996a098ed460265f4c7fe9ca519f SHA512 4048544bd05ed6eb37866034ade8482b8d017110ed9a639f220e8d2e32bb3dfb6c913a986c8fd41829e88efa793f7552eaa2a6d6b2af533c44a5754a5ab8650f
-EBUILD paxctl-0.7-r2.ebuild 774 BLAKE2B a26ababfb4891c7b91d1e4f9a32ef7ad71a54c3a3665ddb5194982bbafc415c7b44853caa3d070f851a76cab09f3df4fd575d98db0ea4dfe02654a325be4185c SHA512 5d26df86e56cb8d10af948d859a372a97371ae5afa05e8045ad37edbbd3d83798c11ecc454ec73b5178e20cfd4f260a3ec564304881d44113cc194395545927a
-EBUILD paxctl-0.8.ebuild 785 BLAKE2B 274c3219e7fbb01233a9b0d9c52f1fd29b3344e734b01dd8a470947c58a80028ec4a98916550af077ae066c9582d26e53aad4cfa7fbd4d80b35bc69714a0dbd9 SHA512 89e8c94e82697ee908532e8e5a176b91964bd9aa01a87a7dae23b692d4c7fcb389be9303a04bdf2fdc52ace71e3f24a5f21e8992ff4662d66710e62827b84700
-EBUILD paxctl-0.9.ebuild 779 BLAKE2B 8bd3d35baf37fb0ebd33766814d3851719685c2798dea6f6f933ebf41a820883d453c8608fcf6283fd32dc0c0014f5849933f9388a0bc794721bc30a910409c5 SHA512 effb171794fa1893d1863f927b8f3bcc1d51be64e39a3d9731a9b282f7336a27e1e3495dc3138634ddaa8ba04d379f340d27741ef7b4689dca18b04d595d3667
+EBUILD paxctl-0.7-r2.ebuild 773 BLAKE2B bc2c444103ff0bafd19070cec5d8d3c171080ae15b8922e6fb5247f40ca84401a2c6d070a1f7bfcbbc45f3dad8746e95eaa717cd4bf9b89847eb65aab8738bb4 SHA512 9018205d38ff88dadad643e4b82695147bea3899743c10bbca5fd03b5265bd80846f98e8350574f04c70bbbcb35abbf385ba2f6c5527b173d25c48ee0e4b3456
+EBUILD paxctl-0.8.ebuild 781 BLAKE2B 6f1dbc13d0d2deac6d634cd5d30d09962ad87424d68fadf8ddb5cdbd7ec4f20e131bd0ed91404123676d1cf7be3ae853974f7a3889d60941ead22706160af89c SHA512 a89e6d84f34734106cf9bb25af45151e0629c2b12765836e3fba865edc9dd1927522229e0a9c61ba672f10b97be1cd138b9c2ef9476638dff7e046b3614f4258
+EBUILD paxctl-0.9.ebuild 778 BLAKE2B 059fb76b059441abace7c3f39bec7ed8f16331a05059abc8cc398d975c9ea7fd32344c700fa6a35e59dada2189b0d7ea307e103ba038a28d0b9699fb615f0cc4 SHA512 c555bd96482c3dd19bb7d2e24210c7cf4afe9a4ad88b2304428d87cc6c39dc4308cc3ad437703815159c37ffb71ad73c2a8a3b5707537881aba8aa32fb53950f
 MISC metadata.xml 363 BLAKE2B 27b81c37d5a0f685942eda5610d73a0933a7654282c851a92bc352f27676c609452b6c7a3f3bb94c0fa358fa360c5c113aac6acd24e186347912f61cf4a0bdf3 SHA512 b848c5de5ed09c4843c3e75d59ea4697c5d1c1fa2ce8c9e9a0bf38b5102d57f25aa626f3c6295f4f3a345b1cedc15553fb45b460bf41e73df43eb2eef6e00281
diff --git a/sys-apps/paxctl/paxctl-0.7-r2.ebuild b/sys-apps/paxctl/paxctl-0.7-r2.ebuild
index 9f7330ab2d6a..81c900164e31 100644
--- a/sys-apps/paxctl/paxctl-0.7-r2.ebuild
+++ b/sys-apps/paxctl/paxctl-0.7-r2.ebuild
@@ -31,7 +31,7 @@ src_compile() {
 		LDFLAGS="${LDFLAGS}"
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${ED}" install
 	dodoc README ChangeLog
 }
diff --git a/sys-apps/paxctl/paxctl-0.8.ebuild b/sys-apps/paxctl/paxctl-0.8.ebuild
index 2cc81d119138..d312a62fe96f 100644
--- a/sys-apps/paxctl/paxctl-0.8.ebuild
+++ b/sys-apps/paxctl/paxctl-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -31,7 +31,7 @@ src_compile() {
 		LDFLAGS="${LDFLAGS}"
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${ED}" install
 	dodoc README ChangeLog
 }
diff --git a/sys-apps/paxctl/paxctl-0.9.ebuild b/sys-apps/paxctl/paxctl-0.9.ebuild
index 86033de6cf34..3a0964c832d1 100644
--- a/sys-apps/paxctl/paxctl-0.9.ebuild
+++ b/sys-apps/paxctl/paxctl-0.9.ebuild
@@ -31,7 +31,7 @@ src_compile() {
 		LDFLAGS="${LDFLAGS}"
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${ED}" install
 	dodoc README ChangeLog
 }
diff --git a/sys-apps/pcsc-slb-rf72-drv/Manifest b/sys-apps/pcsc-slb-rf72-drv/Manifest
index 3f89ad14f102..2c56d92c13ce 100644
--- a/sys-apps/pcsc-slb-rf72-drv/Manifest
+++ b/sys-apps/pcsc-slb-rf72-drv/Manifest
@@ -1,5 +1,5 @@
 AUX pcsc-slb-rf72-drv-1.1.0-openct.patch 1211 BLAKE2B bc4e93838809a3782d3a7dd8ce325a807057e27ea78fb05a1da827be89b02ea75b86617bd2a4dc3399f783750fb3b1f0fdb27403aeb2f87b463cce4c6b2a7964 SHA512 c2191b78d507d59c0b4d8ab211eac37c0d7205aa9078dc9105129d0dc658a2fb94126cc862e60772272a314726d955e8f8c1d851fd649cfd27c3c48e65e65aba
 AUX reader.conf 275 BLAKE2B f59922513d20a8b79e8c74a2cd55523b7ac488f76da5932971670060f78e1ff6613ef5c6bed64ea80c4b9514d3034de3ac4f83782bc46d1e2dea71ecdc523c98 SHA512 8c7de2c3504b23ec27b3437e1b321a23dd87db9fef51ead002a8c5b3c569e713e36cebe06a40071c95508568712f10f3b42609d6adb6254f63acf8ecef79f32e
 DIST slb_rf72-drv-1.1.0.tar.gz 53110 BLAKE2B f5ff955ca7dda46d792a0595de8ede4559926014874a1b79183e3a7a311e79784d98bee71f45d701f18fafcc561669eced8b090ad1a0d38c5102ecec92f59ba1 SHA512 93fd5dc9e38d89a0ae3f8c5adcdf2b4cefd8caabf7cac0e0551795b8b4190031ae7c7e30962dc90c6e8c5fcec6db99d4d14f00b8a7787ec043e366ef344ebd9e
-EBUILD pcsc-slb-rf72-drv-1.1.0-r2.ebuild 1525 BLAKE2B 77154d9e707358ce7ae67fec759713598fc845e64d3487b9a370221551801dcce2a4d60c730421fcad0198b58002b78fba57072ca7d3d9bc30f99d5a4be16e66 SHA512 c4124ad466e6047eb285bbea643754f74807c2e9910e65e593812644a5078cca490aa29f6bd275a3577acc1c43d93da61a330db12896b0a5ef0c7bc376f13ac7
+EBUILD pcsc-slb-rf72-drv-1.1.0-r2.ebuild 1521 BLAKE2B c38a257cdd106ddc6b53c4de4b0b12fb4558bcc54e8ed4942909cb1fbd129a4cfd452370264a74b7d913bdc149d9846f1d81b9e298be0eac3932408736d4f65a SHA512 e146786e9d41c9dce890e047783f5a7d24ac00aabce478bde56c2e6a541454b0c352fd013ab4c2233693fe1af0bfb06854232cab7b5c42bdc6781a75f6f69e1b
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild
index 17644f426dfc..39b7d34cb31a 100644
--- a/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild
+++ b/sys-apps/pcsc-slb-rf72-drv/pcsc-slb-rf72-drv-1.1.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ src_compile() {
 	emake CC="$(tc-getCC)" LD="$(tc-getLD)"
 }
 
-src_install () {
+src_install() {
 	local pcscdir="$(pkg-config --variable=usbdropdir libpcsclite)"
 	local conf="/etc/reader.conf.d/${PN}.conf"
 
diff --git a/sys-apps/pnputils/Manifest b/sys-apps/pnputils/Manifest
index f056837f275e..02b23ca5d428 100644
--- a/sys-apps/pnputils/Manifest
+++ b/sys-apps/pnputils/Manifest
@@ -1,4 +1,4 @@
 AUX pnputils-0.1-makefile.patch 836 BLAKE2B 4ad883a208c9799ef94b238aa8ec3e0fbecf92a99a73ee413a9ef56a8e131262c8c4125c141974afe22914955152294ca6dbd0acca87246612e04916e0a19411 SHA512 5833c8a35244784fc30a55b4ba53da463222576ba3cc9c15accf25ec0850544d5a863252fc9718ca832550708237f0f7edaf94a278f17c7f04728b24a6c9b9df
 DIST pnputils_0.1.orig.tar.gz 16991 BLAKE2B 699e55dd62e90ef0f5dde40f34c60d1b0d2e47c0cfdd06a82dcb739fd952181a74e7ec5fb90afe2bf91f5c997e9cb6dc7da2c4a1454f9f858e5d28ba324ab1d0 SHA512 0f3b612f29b6c6c79221d9f5e27163dc7766159eeb16c2e1b494305cc4c6c50e9c12cee7c1be9bf12642c9adc568b622822b34d9f5f6a421d2b8f6f784fa62ba
-EBUILD pnputils-0.1.ebuild 524 BLAKE2B c6e49775e2f6600e3424b1a2f37604f5c486e1ad89ab716f0f7ec75cd1df65122d5faba7ec0680ac76fddd43d68d4c64c84b7b186c8910651e82d2843c7e6555 SHA512 0519a01ea494d3007d5809a42d1fb25f0a46418e4919209ff45609b018ac029a311250cf3a6569fb1eab21a919dd73bf8f2d7eb68f7b0f0666b63bf4d1f77d17
+EBUILD pnputils-0.1.ebuild 523 BLAKE2B 556dab907ce9fa50811436fa876c6a49dffa45525aa667415158d44ad545f9e9d8ad6ba4971b1b8bf13fc7dc00e49af930ee6ffc154b2335737befb03bfcd50f SHA512 02993317136d3dfe5da870ef895fd81fe8e8e9be8ec9c2cc1f11dc842f6c7754ec6a0c5a065d581c3c3de7e751ca0c4eb6cd0888dcb39ee53a445fe771ef7a7a
 MISC metadata.xml 461 BLAKE2B 518f40b53b66ab4ca7d3b4b25530e7f6b59aaf3d6b4f70ba5ef622685b42d9145cd0f4a5a29b669a1c72c9257180a207973bcfdd5da9a3b1c8a0ffdfcda08aeb SHA512 d3f31b9ad193ab5cfbf59e6de58c4e60deac59e824e86c92c5fc5fc3d71a1a6086a6af7cfad8e1f243d625f37e4034fd255bdb2b71281b4fba05631c5d033479
diff --git a/sys-apps/pnputils/pnputils-0.1.ebuild b/sys-apps/pnputils/pnputils-0.1.ebuild
index 7f182f88bb64..0919a9fa409f 100644
--- a/sys-apps/pnputils/pnputils-0.1.ebuild
+++ b/sys-apps/pnputils/pnputils-0.1.ebuild
@@ -19,7 +19,7 @@ src_compile() {
 	emake CC="$(tc-getCC)" all
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${ED}" install
 	einstalldocs
 }
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 8454e64936d1..34d0c773d1c6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,19 +3,10 @@ AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906
 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
 DIST portage-2.3.79.tar.bz2 1038675 BLAKE2B 7a6cff28fa1d4b54607e9416914ab534d250718b082a9789a36be057933867a8a3befd7c99d404b058f67b92c6ee975323c37251fe89d3e3e46865daf0fea25e SHA512 23101644185fb7c6eff12f015d442599b3af744f7b13dcb630f47a7f27c1392c46bd4aa5fa32d403dcf058cc3cc1d56cef00fd8c34dda811388eb268761c0797
 DIST portage-2.3.84.tar.bz2 1043069 BLAKE2B 85ccc209011ef5206e0aaf768ec0276449f5a691f62f8dd65b812b6a285030796180acce89e9f2c8ae05fe4f59505133535f0374bf076846f819477d0a62d231 SHA512 49797ded65091ea7450f3c37e4ca1efb4205bc67e873295b5060ee6d39c1c63313fc1caa8c2f6c7afa6b352cef6d7ef04b8371c66a3ade05ac734b46f807bfd7
-DIST portage-2.3.85-bug-706186.patch 2603 BLAKE2B 6a7d236594a01514dab4fcffaec16542f1334ba8c4f14ab2e01ebed2fb1bfbdf291863132a6726cd7968bd713894970418384307aac003208dd73a50d39a67a6 SHA512 00bd251d3df04f88dc676bdda933a12534bd2d6399b588014a5bc13bf73d5b321e0635ba31083df5c47675e98644e55a1f1fec2f5a7aad86cb6c5375fc642fa7
-DIST portage-2.3.85.tar.bz2 1046025 BLAKE2B 721999b1200b69d2fd3fdd8f4690859f44e6796bdbef1636a80f09ff7625cdff437d183b4e3bdb7d4455b4da9f067adf199106c6b7bdf9b0d5d5ae7a30c7ce03 SHA512 f42f6d87df0bde5e143b7c8b901556c325b9f8250131db400543b54040eb931f9b541ad8211b35942c4bbd99fcfdea6ead93459e57b03173f5bcb37e64a85304
-DIST portage-2.3.86.tar.bz2 1046806 BLAKE2B 6aadfcf17eacc8f7b82645a82fce96b7d90e93d797704c5b04fe437cbe587440dea8f8e39847c2c95eacf383e4525d4f015ee26b41694c156f907bd22d6663fb SHA512 fad0e89fd2c831ebd8cfd1fe080433c4696f408008f463a151e6fd4f3a2ab2a81249dd0db76f28c7d2cdf0e14e5163c3898c7ca22e7f0edb2e882e1ab7bda95e
-DIST portage-2.3.87.tar.bz2 1046448 BLAKE2B bbcb31a362d89bc81cdedb03be431792dab53d983d35f10853e6a68c2e2fb3da8ddd237305e78ab5946c8199f4dd7a3a41f023912a50abe9fa96bcf7ac35af75 SHA512 47a4d4901c2ecc9df8e38fa804efeb8583928a77e45a9b19dd8edd7e1323911762c357ad0bc1a182d8389225282660f4ef6e442e8addc087e404d561466c3b86
-DIST portage-2.3.88.tar.bz2 1048081 BLAKE2B d84b13686d09d125863835467989a11787333dea18a7eabb48560e6847c54643155a98c74d061e08b991064bfa9236e0a617a06beabb575162c4968e4cc13fe8 SHA512 ec043bbd7667f810e1a7c7fd3cae19b81adac1c323d7c488d1e4e809d9cec7c7f13bc2e5b8769a03b9f8aa78e389f5680e15b6a8f0f3543cf43d0f43fb7ee5f7
 DIST portage-2.3.89.tar.bz2 1048621 BLAKE2B 1353f0697a977eb395abd857c8cc43c839912f4bd31436c6620d10e3dc29dc32ee9970478ad0f569b02f14989c48a7d956a233c7db22e172897a49a98fd2a94d SHA512 fa453d3134139fc1f435d6388aa7d6271cd680d08ea1736269a917c12500bb463a81afc956ddd0045e98784bcdbb6541c333be6ff0c2a00feeb482b637f08e98
 EBUILD portage-2.3.69.ebuild 8117 BLAKE2B 5a680c3d769e61cfd63a2613fe29952cb205c59d5c4fc9069895f6f3af07042e755dadf06c1303c7370962558cd854a4f6de929a32b50b83ce651502bd395aaa SHA512 a5c66f4e57a450428d263ed74961175e1b2ebe9c4081dfe6a75b4d2a2fc25555f882be74a9f1e4d9e4184e6588ed78daba3e38838f2eaa2fb15cdcca902c1f4c
 EBUILD portage-2.3.79.ebuild 8706 BLAKE2B 6f011fb264b74d493f338206e7237e908a1e882299faf7ea5682b058fcbbfbc603dbd125344dc5f939af46b3df5ebe69525f4970e378f1d424d4a82891b6c9e4 SHA512 4150faaae9f39442689441fc03537542aa7e6447489f848e33b5f08c2fba29e478d02d91a12dbd14fb42f6509a50faf780549a37f60ae89bf54cebe6634a168c
 EBUILD portage-2.3.84-r1.ebuild 8907 BLAKE2B b8ea438fe87920ec138871a00e02ea053bf8b01a29b3f273f1b0d920314e714e0b9f744f228399aab5f2057f03fd9f27ecb121bcd78d2692913ff7ac0313b032 SHA512 4fe53274396653f3ce63251afae2564eff321740a355fa693284cd998a63bc55c542a674f878aa800a806782438062f12c939a945825dbbb71214b8396776555
-EBUILD portage-2.3.85-r1.ebuild 9068 BLAKE2B 2bc3f22e598af5876d491d8dfe6d5c09e0b23799cc8d48a314687ee7348dca30f9a2b108e6a7c8bc0e989ba59fd96693d577625cf7b9accfb2e5efbcc45e2924 SHA512 09a1176c275a83a25677e18150142b9df46ca83d8b99f7755181f36980f259f3504dcf45833386e989835d763362b5dd027dff84b85ae897905ef8c6783df72e
-EBUILD portage-2.3.86.ebuild 8738 BLAKE2B 661f810944f512016d98a7b7ce9005f6bdab444fc2fc10e3fd3f0d958372d38e2c5cb5cbe744674f25e6eaabd7657956e00dbf8bd1316d8b72d24cf60f7ca0f3 SHA512 eb581642860da1e01cd4e607bf24383b4d14a3a1d42ead6ced5d983c466a98b1742a777e763772849120d30227de550001104d97d65c905502883bde1c4ab137
-EBUILD portage-2.3.87.ebuild 8362 BLAKE2B bdc941b86140e015725fe23435ab438507cf464f495e867b605c9bd8fae2588c673f533803937ac73d5c148aec89361743a83e9576c3b7bff1efe40161fb439d SHA512 963d81d6c24c36b76fc2bcffaac51d4c6f714c8475d70d7ca974da9a6f1e454d28ae214518607bc52a63bda0d2dc795006e63e21fe44822b992b76b31bbafe6f
-EBUILD portage-2.3.88.ebuild 8651 BLAKE2B 40d49821e5d53d7bb797f9f53d6fabbe6e38e9fc3f72a282f0e66e78baa58ab8dcb48862f9d5f8cfde6ba3a520f6a2bad7814cdcc16e8d15712879653225acf7 SHA512 3b099cf3790b90b15a855bd17435109d6310cc0edac116c9531088178c172f128cbf0f28648bd134057ced367f91e3c5c4be701b64839565912a27605b464c00
-EBUILD portage-2.3.89.ebuild 8651 BLAKE2B 40d49821e5d53d7bb797f9f53d6fabbe6e38e9fc3f72a282f0e66e78baa58ab8dcb48862f9d5f8cfde6ba3a520f6a2bad7814cdcc16e8d15712879653225acf7 SHA512 3b099cf3790b90b15a855bd17435109d6310cc0edac116c9531088178c172f128cbf0f28648bd134057ced367f91e3c5c4be701b64839565912a27605b464c00
+EBUILD portage-2.3.89.ebuild 8650 BLAKE2B c03106fe492beef8bc9e681600d28c0f7d538cf0c7371131080931bc9ac5b86bb6550af22dbb82056488f0254037648dcf271ff9d1e8fb34718491907183b38c SHA512 3ce7136609d0ce38bd2f9e85737b715322583479df6408a8b00b0d08035c70d216f123cf150760ecdc2e736c8749571bb7160df1495f1a64951e050f5e6bdec3
 EBUILD portage-9999.ebuild 7794 BLAKE2B 3b6487927a5a689ec37052d38fd2940d099d81b64bcffd48ac3083adfd282504d5399cc12ae8b266d49147f793c411eddc99a9d081522dde054fb6e31b3a9a0f SHA512 b5b9ce2235d2145cbe467167ca2391b996327ed52a84d139da292518ce76ecbda2df0eaa88eddd7197dece2520a49ec369a5ec123bcade99d562b6196b6cbff0
 MISC metadata.xml 1508 BLAKE2B 23da1db6792f98d7c5c6ff0f260c69f76110438c6fd97ffb24552100f6a2e5c8264d0bd787f45367900b9ffa5ce5346badbf53a9f6be7867e725451c33b4f41a SHA512 f6712987c3062b960f76b6752c80ffa6069cec2d8ff743641164e275677ac8126fe2af6ab1588e91712ba6bbb11f73c6de42d6296d67af55ccac3ca48554162c
diff --git a/sys-apps/portage/portage-2.3.85-r1.ebuild b/sys-apps/portage/portage-2.3.85-r1.ebuild
deleted file mode 100644
index b99c3df60e6e..000000000000
--- a/sys-apps/portage/portage-2.3.85-r1.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=(
-	pypy3
-	python3_6 python3_7 python3_8
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 epatch linux-info systemd prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? (
-		$(python_gen_cond_dep '
-			>=dev-python/epydoc-2.0[${PYTHON_USEDEP}]
-		' 'python2*')
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	https://github.com/gentoo/portage/commit/27d653052549e5d1880ab68be12f3b82857506fe.patch -> ${P}-bug-706186.patch"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Omit hunk for the unit test which is not included in this source tree.
-	head -n 52 "${DISTDIR}/${P}-bug-706186.patch" > "${WORKDIR}/${P}-bug-706186.patch" || die
-	epatch "${WORKDIR}/${P}-bug-706186.patch"
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f ! -name etc-update -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	python_export PYTHON_SITEDIR
-	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/portage/portage-2.3.86.ebuild b/sys-apps/portage/portage-2.3.86.ebuild
deleted file mode 100644
index e5d1c88a69c4..000000000000
--- a/sys-apps/portage/portage-2.3.86.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=(
-	pypy3
-	python3_6 python3_7 python3_8
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 linux-info systemd prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? (
-		$(python_gen_cond_dep '
-			>=dev-python/epydoc-2.0[${PYTHON_USEDEP}]
-		' 'python2*')
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f ! -name etc-update -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	python_export PYTHON_SITEDIR
-	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/portage/portage-2.3.87.ebuild b/sys-apps/portage/portage-2.3.87.ebuild
deleted file mode 100644
index 566fecc2aa19..000000000000
--- a/sys-apps/portage/portage-2.3.87.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=(
-	pypy3
-	python3_6 python3_7 python3_8
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 linux-info systemd prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-SLOT="0"
-IUSE="build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f ! -name etc-update -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	python_export PYTHON_SITEDIR
-	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/portage/portage-2.3.88.ebuild b/sys-apps/portage/portage-2.3.88.ebuild
deleted file mode 100644
index 0188237e0e12..000000000000
--- a/sys-apps/portage/portage-2.3.88.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=(
-	pypy3
-	python3_6 python3_7 python3_8
-	python2_7
-)
-PYTHON_REQ_USE='bzip2(+),threads(+)'
-
-inherit distutils-r1 linux-info systemd prefix
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-SLOT="0"
-IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
-
-DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	apidoc? (
-		dev-python/sphinx
-		dev-python/sphinx-epytext
-	)"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-# For whirlpool hash, require python[ssl] (bug #425046).
-# For compgen, require bash[readline] (bug #445576).
-# app-portage/gemato goes without PYTHON_USEDEP since we're calling
-# the executable.
-RDEPEND="
-	>=app-arch/tar-1.27
-	dev-lang/python-exec:2
-	!build? (
-		>=sys-apps/sed-4.0.5
-		app-shells/bash:0[readline]
-		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
-		rsync-verify? (
-			>=app-portage/gemato-14[${PYTHON_USEDEP}]
-			>=app-crypt/openpgp-keys-gentoo-release-20180706
-			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
-		)
-	)
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_musl? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	kernel_linux? ( sys-apps/util-linux )
-	>=app-misc/pax-utils-0.1.17
-	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
-	xattr? ( kernel_linux? (
-		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
-	) )
-	!<app-admin/logrotate-3.8.0
-	!<app-portage/gentoolkit-0.4.6
-	!<app-portage/repoman-2.3.10"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=installsources requires debugedit and rsync
-
-SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-TARBALL_PV=${PV}
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
-
-pkg_pretend() {
-	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
-
-	check_extra_config
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
-
-	if use gentoo-dev; then
-		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
-		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
-			-i lib/_emerge/create_depgraph_params.py || \
-			die "failed to patch create_depgraph_params.py"
-
-		einfo "Enabling additional FEATURES for gentoo-dev..."
-		echo 'FEATURES="${FEATURES} strict-keepdir"' \
-			>> cnf/make.globals || die
-	fi
-
-	if use native-extensions; then
-		printf "[build_ext]\nportage-ext-modules=true\n" >> \
-			setup.cfg || die
-	fi
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i lib/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use build || ! use rsync-verify; then
-		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
-			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
-			-i cnf/repos.conf || die "sed failed"
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
-			-w "/_BINARY/" lib/portage/const.py
-
-		einfo "Prefixing shebangs ..."
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done < <(find . -type f ! -name etc-update -print0)
-
-		einfo "Adjusting make.globals, repos.conf and etc-update ..."
-		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
-
-		if use prefix-guest ; then
-			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
-				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
-				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
-				-i cnf/repos.conf || die "sed failed"
-		fi
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
-		patch make.conf.example "make.conf.example.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-	fi
-}
-
-python_compile_all() {
-	local targets=()
-	use doc && targets+=( docbook )
-	use apidoc && targets+=( apidoc )
-
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install() {
-	# Install sbin scripts to bindir for python-exec linking
-	# they will be relocated in pkg_preinst()
-	distutils-r1_python_install \
-		--system-prefix="${EPREFIX}/usr" \
-		--bindir="$(python_get_scriptdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
-		--sbindir="$(python_get_scriptdir)" \
-		--sysconfdir="${EPREFIX}/etc" \
-		"${@}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local targets=()
-	use doc && targets+=(
-		install_docbook
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-	use apidoc && targets+=(
-		install_apidoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
-
-	# install docs
-	if [[ ${targets[@]} ]]; then
-		esetup.py "${targets[@]}"
-	fi
-
-	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
-
-	# Due to distutils/python-exec limitations
-	# these must be installed to /usr/bin.
-	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
-	einfo "Moving admin scripts to the correct directory"
-	dodir /usr/sbin
-	for target in ${sbin_relocations}; do
-		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
-		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
-	done
-}
-
-pkg_preinst() {
-	python_setup
-	python_export PYTHON_SITEDIR
-	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
-	env -u DISTDIR \
-		-u PORTAGE_OVERRIDE_EPREFIX \
-		-u PORTAGE_REPOSITORIES \
-		-u PORTDIR \
-		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
-		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
-
-	# elog dir must exist to avoid logrotate error for bug #415911.
-	# This code runs in preinst in order to bypass the mapping of
-	# portage:portage to root:root which happens after src_install.
-	keepdir /var/log/portage/elog
-	# This is allowed to fail if the user/group are invalid for prefix users.
-	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
-		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
-	fi
-
-	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
-		elog "The emerge --autounmask option is now disabled by default, except for"
-		elog "portions of behavior which are controlled by the --autounmask-use and"
-		elog "--autounmask-license options. For backward compatibility, previous"
-		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
-		elog "Users can get the old behavior simply by adding --autounmask to the"
-		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
-		elog "change, see https://bugs.gentoo.org/658648."
-	fi
-}
diff --git a/sys-apps/portage/portage-2.3.89.ebuild b/sys-apps/portage/portage-2.3.89.ebuild
index 0188237e0e12..a5f1eff29051 100644
--- a/sys-apps/portage/portage-2.3.89.ebuild
+++ b/sys-apps/portage/portage-2.3.89.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
diff --git a/sys-apps/rkflashtool/Manifest b/sys-apps/rkflashtool/Manifest
index 11f493b25e78..0c426cd5d402 100644
--- a/sys-apps/rkflashtool/Manifest
+++ b/sys-apps/rkflashtool/Manifest
@@ -1,4 +1,4 @@
 AUX rkflashtool-6.1-missing-version.h 149 BLAKE2B 044dcc4db5b5262208ca68013c20dc783d91f5fb80d78fbf8ec97f6ca2b3b1e32049cf3e3559448b92d06d87dcf47735295769c53b1f199430ead67170cba8d7 SHA512 796cf5691b7594d1a88d7f685f880b6f56955251b6203f7493170929d3c2b0161aa92cd9ec638a01825c1dbbcdbe6dd217bf8640287074cd33978fe49d66e810
 DIST rkflashtool-6.1-src.tar.xz 13924 BLAKE2B 278ea18fc046fad68e9b31c477132559855fc3b3aae27f2ee3444819362289266eb73cdea30a4c71b3eeeaa7454c4c5a8fc9716772dd68150f4ff88a49fe1c08 SHA512 d7054e61a706ed3e51539556a1441f64cb20a2dafa6f625df384cec9296bdee30714a1c98cfd69d2a656e370387a2bdb86c258fe6b1216bd9c57831ed3de8ea7
-EBUILD rkflashtool-6.1.ebuild 756 BLAKE2B 4a78c484543cf287b1fb9693b6861b68e9225e9de0d30abe1a75f7ce16a3f873fabd87df0d1236502d79ae79d8333a50a36467a9b1083284f74ef3632ead9fdd SHA512 18792da7cbdb0e7ba48cc5576144075e302d4841f72ed8c6bfab4f791cb6a3953fea8cc0ee0ece4653f871f0955a25469b8e1e60c1da9e3db0a8a4301e34ff57
+EBUILD rkflashtool-6.1.ebuild 755 BLAKE2B 2879b10af6818545f270e7a0b277228b2c2fc81a618ab089d0fa2ed2757fb3abe6e7286333834abc664f6c2f2768d6aba2c2bccb6ca2b219ea4ecd74567b7c3d SHA512 22f567ff8ea7b6a68c61a74e2cd11a43cfbcf6d5cb01a85800fdbeaf1578fec3c3064308acb7f554c858aff787f3e62300b1fe21f96ea8803bcca9e2f64db612
 MISC metadata.xml 248 BLAKE2B c05f5a88c617045ac08897611fbe185695bcdca633cc4911802e4de481404a4d08f0ac6f16d4efbdc66aa244bfc1632da95156d8098517e91d1e561e7f7b87b4 SHA512 94a760c6e6c71a04932d5e3897eb806fbc672718e3b6e3febf2fc619b08b8f21308b2342b3214a80426eed444405012b1103128ffe5c1ba89a059df1dd9d099d
diff --git a/sys-apps/rkflashtool/rkflashtool-6.1.ebuild b/sys-apps/rkflashtool/rkflashtool-6.1.ebuild
index 8b4518ba94ab..d4b936000f91 100644
--- a/sys-apps/rkflashtool/rkflashtool-6.1.ebuild
+++ b/sys-apps/rkflashtool/rkflashtool-6.1.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=5
@@ -19,7 +19,7 @@ S=${WORKDIR}/${P}-src
 RDEPEND="virtual/libusb:1"
 DEPEND="${RDEPEND}"
 
-src_prepare(){
+src_prepare() {
 	cp "${FILESDIR}"/${P}-missing-version.h version.h || die
 	sed -i -e "s/CC	=/CC ?=/"\
 		-e "s/CFLAGS	=/CFLAGS ?=/"\
@@ -27,7 +27,7 @@ src_prepare(){
 	tc-export CC
 }
 
-src_install(){
+src_install() {
 	dodoc README
 	dobin rkcrc  rkflashtool rkmisc  rkpad  rkparameters  rkparametersblock  rkunpack  rkunsign
 }
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index ccf4484fb30e..85f3d29829a3 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -9,10 +9,10 @@ AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f1
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-244.tar.gz 8445963 BLAKE2B 19751fb9c058a079694ee1b991259fd3f1fa30ae98ca38bbe8caadfc5628db7848c7f742a1b11781fbd67f911adda917d7a4da1dddb63064907f86f47e5a3256 SHA512 08f260fb15b5eb273faafda826dd9154e9a02841b4c5911cc1c7e1445072ad51389f8cced7b9acf112737c20fd56b2fbf48b3f914733c934c774d38a23b616fb
 DIST systemd-245-rc1.tar.gz 8961356 BLAKE2B ed04166ead57c2f1cc1a1ca2f0041cae134b503d3448ea9fdd799e12d81f45721ee304d4aabd96d3eab8ea1321b283820e8d2a850b41733e40f07fd419f67b95 SHA512 2ef9a295f3897c6642a2fac2e3c73467ece9bc6fc196cc4f3707b9c23af2581eb9f74def78909d57513b67604bf1cf6dc5dbb31c6d435f7997677d09a73d006b
-DIST systemd-stable-244.2.tar.gz 8484718 BLAKE2B 7ba41c443aa3e34379c24eb1590bd1090037a03178dd76cf8324ee50a1d7e82d2da27abdf9ea7c6b9b0b5467d15625dd432739878e8b482636a9f4bae802f2a5 SHA512 fad6c9da7bf7b6f572ea411e70bea7a44e9be0b373cb86cbe5a77a08cd1b5e4f4f3ae6bfa001194e14a9849313a9151e3fdeee62c93f18f15439a657a05783e2
-EBUILD systemd-243-r2.ebuild 14599 BLAKE2B b292513681d3a9f0ff8f47532eee29266f9cae7c498668e871b0fc2a14fe6c36d6b56d2851266ee27fbe634c914a8dd1d97533ac700b83503d98bf72133b3a74 SHA512 833614b3ea2f84fe515d0fb9695818b3f61d5be8139736b7a9dfa7c212e5901fbfb2528c4711aede74572254fc269e24901c5dd644ef6be482d9b653efbe0b9c
-EBUILD systemd-244.2.ebuild 14628 BLAKE2B ef14b715983b3d11b9fbe4bc1319e8fa3aae0f58b8f75083da2808839ad763b4820e7aba81bbd302996729607bd5f1407be72e32fa5a690a44b813cf11358259 SHA512 7fa3a6b5ea2226ac7dd6433dc71c8fbcc9d406823a000ff181bd7e2e85569b91c7238312ae98af8fbfb7b54bbaf3feabde75909f2e5fead9176e8e4df8d26efb
-EBUILD systemd-244.ebuild 14579 BLAKE2B 4f8355320376c19d670f7a587442f1806a01f2f03d4fc8cafd33c1b83160886710d20df1edf86d00c919691e1d02bd9e57e992b7488e440e84cfde43e84821dd SHA512 634238afd9de2ce6896fd23a44943a359283b338ba08b42496f7163fad0f23de94b19bed502b78ed44d7b3652b69e66281dc08174db42d3071e801561c900a92
-EBUILD systemd-245_rc1-r1.ebuild 14639 BLAKE2B 63ec56aed53d47bde7ea948e20d9af295a5c136bdd9e7abf987c3782103a122440e9eb1ceedc1d58563336450da087e6a4029fc0776ef1ad290d31fd27cb758e SHA512 7f1fda14a18723b5411d5e5b4a44a6952b0fd25f2bbce3892d6378d04b6fc17af5dfb2ff109fffd58dde2305bd894d5a17080c9a5bb8c715ebf3e06e8851c374
-EBUILD systemd-9999.ebuild 14631 BLAKE2B 774d430a7943c43fa83f10d32ebe4124f0f3998f65f059fdd0fdd4cbfacc2f3846e6e78d18b5ede4b0d63496f92b2b2b52fd6239ebaaa158522ad0a1900d74a7 SHA512 0f270c3831370f68f6516ff76db1bc1bb91124203d5555e2f02772d0ffc306c072619a4aa4a7f54bd4dc000ffac19d395b181d40438959199cc4bb7e1a8bfedf
-MISC metadata.xml 2019 BLAKE2B 84de0a0abc3f16fab60db2343d8e1f0dee8a3f03ac97bffd01167820815f4d41d87c118b81041046c8cafa6316fb7e5bfe9d6a5de550bf617ace56ccf69efb0d SHA512 086189b961c0f3be70beb1d86fd36508d0821407243e74cf896360f76ce04be544aac211d60685256080fa75e1ac0ae33211501cc11ee98913f3b8d322ac9f03
+DIST systemd-stable-244.3.tar.gz 8484735 BLAKE2B 25125ecdae59c852e8ceb45b7ed0b76631b301ab4026c4e389c4bc12090fe41f5918411a75bd20f38b6b3993445df93c850ba98f8d9b30fd24fc4e25f8355a3d SHA512 f8e83fa3e57ac8fdbed61b66bb45fd0eafa6fb36eda26f10690d93f34b03daab6ce4e7eff45b79dcaf59f11f41c1b022d1d9314f576c50ad28f6bb5901f1b18d
+EBUILD systemd-243-r2.ebuild 14551 BLAKE2B 7cc961a76f605d29fac9f931de5cd940d86bf8d113b5f9411f3da43a39632967e08c7065b26b8de55352f3ef9922a366b4756ad84e45544b75b08e51e882c602 SHA512 0d30a2ff1c48fa61ea34b6d9b2da84bb776f332c327c172cfbd68e1adf7a21488b28619f080190a84c81e62a7215f5f0bcabe5f8ed653afae5ebdd4a4448d40b
+EBUILD systemd-244.3.ebuild 14547 BLAKE2B 5b747e450e2cc3408082ef17704dfab6564bcdadee7f3b9339fb379d47146a1ffa30d4844d5e8d63b669cdcb58bfc75537ffeb058e7d018c4152636d8ff047a9 SHA512 060abc374a7f35347109109907075a302b6481012c1a8cafc40634986ff214177106ac03b8fca7c29de23b5576800032c19b911b929786bb3564309a8c19381b
+EBUILD systemd-244.ebuild 14531 BLAKE2B 97622ec92021c12016bb8f1e2181eef6573af83e4e71bc5bca31c05fbf3eea2ba674f77b69e152aa49bf4dae0068483df244c5ba29efc58fd2b995062286fa48 SHA512 871185ea400df7ca5bc90467a37b62380da20d8149f7d8f47f629e95a37da209c4754c397fefc6d11be58aee6a878534c2ea66ec479a2b63bfbebd1348dcbc67
+EBUILD systemd-245_rc1-r2.ebuild 14832 BLAKE2B 844021148e36863564bfd260f277919998f9c6ebb792796fb1ae9e9a46c72c8c04b2505b851da0c6c89ac1e6e9cca9ed1edfc99aaaf452272f52aff2a5d0e98b SHA512 85df145d991791c8330ac8dd5b7c6dd08d5cf62d1bf11998672016582452fedd5d25a2e5fbddab012034a55f06298b06614091849939497ff77aefc00f220e50
+EBUILD systemd-9999.ebuild 14742 BLAKE2B f19eab68908becf058b7e6e706204425951c392c010c9259ff7703771c899e046287fee721cd65f8b06f2cd1de5b509799c7ffebd16cff502d150b7e7645d509 SHA512 d757c4e343f546371dd409193b8eff4cb10a864b1cc2722434ca0278211e2efc399070654a4635cc76718e6620e0e6b5dd0c565a32b2f4912f941da08b14c7ea
+MISC metadata.xml 2170 BLAKE2B 40691c4b4248e8296325a2cd167f1485c28f50a2814320e151c03ac7293023b5720f8200ea6a314f853ac330994de2b8b79d50a4ee8412454be95c22c9580176 SHA512 77351af149533d7c8a8a0cb0308cae1fae1f45eaa533a52209fb63c9cb3aa54b0782796fccd480ab2c41c5ba7e2eda8e195f4b68a1a2487a9dfd0b22ea874c1f
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index d62c5159c4bb..fdbbc809fd18 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -23,6 +23,8 @@
 		<flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
 		<flag name="lz4">Enable lz4 compression for the journal</flag>
 		<flag name="nat">Enable support for network address translation in networkd</flag>
+		<flag name="pkcs11">Enable PKCS#11 support for cryptsetup and homed</flag>
+		<flag name="pwquality">Enable password quality checking in homed</flag>
 		<flag name="qrcode">Enable qrcode output support in journal</flag>
 		<flag name="resolvconf">Install resolvconf symlink for systemd-resolve</flag>
 		<flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag>
diff --git a/sys-apps/systemd/systemd-243-r2.ebuild b/sys-apps/systemd/systemd-243-r2.ebuild
index 738ac85b5c0c..5c4c417bc344 100644
--- a/sys-apps/systemd/systemd-243-r2.ebuild
+++ b/sys-apps/systemd/systemd-243-r2.ebuild
@@ -32,7 +32,6 @@ MINKV="3.11"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
 	acl? ( sys-apps/acl:0= )
 	apparmor? ( sys-libs/libapparmor:0= )
 	audit? ( >=sys-process/audit-2:0= )
@@ -100,7 +99,6 @@ RDEPEND="${COMMON_DEPEND}
 		sys-apps/coreutils[kill(-)]
 	) )
 	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
 	!sys-fs/eudev
 	!sys-fs/udev
 "
diff --git a/sys-apps/systemd/systemd-244.2.ebuild b/sys-apps/systemd/systemd-244.3.ebuild
index f7e0552b4cc7..1acea5bfd495 100644
--- a/sys-apps/systemd/systemd-244.2.ebuild
+++ b/sys-apps/systemd/systemd-244.3.ebuild
@@ -37,7 +37,6 @@ MINKV="3.11"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
 	acl? ( sys-apps/acl:0= )
 	apparmor? ( sys-libs/libapparmor:0= )
 	audit? ( >=sys-process/audit-2:0= )
@@ -105,7 +104,6 @@ RDEPEND="${COMMON_DEPEND}
 		sys-apps/coreutils[kill(-)]
 	) )
 	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
 	!sys-fs/eudev
 	!sys-fs/udev
 "
@@ -149,7 +147,7 @@ pkg_pretend() {
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
 			~TIMERFD ~TMPFS_XATTR ~UNIX
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
 			~!SYSFS_DEPRECATED_V2"
 
 		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
diff --git a/sys-apps/systemd/systemd-244.ebuild b/sys-apps/systemd/systemd-244.ebuild
index 17788d8dde38..49383fe9a6f3 100644
--- a/sys-apps/systemd/systemd-244.ebuild
+++ b/sys-apps/systemd/systemd-244.ebuild
@@ -32,7 +32,6 @@ MINKV="3.11"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
 	acl? ( sys-apps/acl:0= )
 	apparmor? ( sys-libs/libapparmor:0= )
 	audit? ( >=sys-process/audit-2:0= )
@@ -100,7 +99,6 @@ RDEPEND="${COMMON_DEPEND}
 		sys-apps/coreutils[kill(-)]
 	) )
 	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
 	!sys-fs/eudev
 	!sys-fs/udev
 "
diff --git a/sys-apps/systemd/systemd-245_rc1-r1.ebuild b/sys-apps/systemd/systemd-245_rc1-r2.ebuild
index 81388352a216..3ab16fd6edd8 100644
--- a/sys-apps/systemd/systemd-245_rc1-r1.ebuild
+++ b/sys-apps/systemd/systemd-245_rc1-r2.ebuild
@@ -7,10 +7,15 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
 	inherit git-r3
 else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
 	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
+	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
@@ -23,7 +28,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -32,7 +37,6 @@ MINKV="3.11"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
 	acl? ( sys-apps/acl:0= )
 	apparmor? ( sys-libs/libapparmor:0= )
 	audit? ( >=sys-process/audit-2:0= )
@@ -55,7 +59,9 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
 	nat? ( net-firewall/iptables:0= )
 	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
 	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
 	qrcode? ( media-gfx/qrencode:0= )
 	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
 	selinux? ( sys-libs/libselinux:0= )
@@ -100,7 +106,6 @@ RDEPEND="${COMMON_DEPEND}
 		sys-apps/coreutils[kill(-)]
 	) )
 	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
 	!sys-fs/eudev
 	!sys-fs/udev
 "
@@ -144,7 +149,7 @@ pkg_pretend() {
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
 			~TIMERFD ~TMPFS_XATTR ~UNIX
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
 			~!SYSFS_DEPRECATED_V2"
 
 		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
@@ -273,8 +278,10 @@ multilib_src_configure() {
 		-Dxz=$(meson_use lzma)
 		-Dlibiptc=$(meson_multilib_native_use nat)
 		-Dpam=$(meson_use pam)
+		-Dp11kit=$(meson_multilib_native_use pkcs11)
 		-Dpcre2=$(meson_multilib_native_use pcre)
 		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dpwquality=$(meson_multilib_native_use pwquality)
 		-Dqrencode=$(meson_multilib_native_use qrcode)
 		-Dseccomp=$(meson_multilib_native_use seccomp)
 		-Dselinux=$(meson_multilib_native_use selinux)
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 2a74ef0ef0b3..6454de6e1695 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
 
 REQUIRED_USE="importd? ( curl gcrypt lzma )"
 RESTRICT="!test? ( test )"
@@ -37,7 +37,6 @@ MINKV="3.11"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
 	acl? ( sys-apps/acl:0= )
 	apparmor? ( sys-libs/libapparmor:0= )
 	audit? ( >=sys-process/audit-2:0= )
@@ -60,7 +59,9 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
 	nat? ( net-firewall/iptables:0= )
 	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
+	pkcs11? ( app-crypt/p11-kit:0= )
 	pcre? ( dev-libs/libpcre2 )
+	pwquality? ( dev-libs/libpwquality:0= )
 	qrcode? ( media-gfx/qrencode:0= )
 	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
 	selinux? ( sys-libs/libselinux:0= )
@@ -105,7 +106,6 @@ RDEPEND="${COMMON_DEPEND}
 		sys-apps/coreutils[kill(-)]
 	) )
 	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
 	!sys-fs/eudev
 	!sys-fs/udev
 "
@@ -149,7 +149,7 @@ pkg_pretend() {
 			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
 			~TIMERFD ~TMPFS_XATTR ~UNIX
 			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
 			~!SYSFS_DEPRECATED_V2"
 
 		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
@@ -276,8 +276,10 @@ multilib_src_configure() {
 		-Dxz=$(meson_use lzma)
 		-Dlibiptc=$(meson_multilib_native_use nat)
 		-Dpam=$(meson_use pam)
+		-Dp11kit=$(meson_multilib_native_use pkcs11)
 		-Dpcre2=$(meson_multilib_native_use pcre)
 		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dpwquality=$(meson_multilib_native_use pwquality)
 		-Dqrencode=$(meson_multilib_native_use qrcode)
 		-Dseccomp=$(meson_multilib_native_use seccomp)
 		-Dselinux=$(meson_multilib_native_use selinux)
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index cfb2b098cc55..7f2a9d42e315 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -6,5 +6,5 @@ DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 BLAKE2B 2e507269b14e5cf3e1a599b4c
 DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
 EBUILD tcp-wrappers-7.6.22-r1.ebuild 2482 BLAKE2B c872dce38e5ae757ae66223deea3ff54a7d5fcf798f036544b958136ec86b65af6a38de0b4f9e3493d1779077c7695608e391d7baaed1cafb5d1b03aff89e235 SHA512 e53367eebaedf81e99d6f2996d14e1de980c4848a64e7dc43e5e90085ac0e74e77be2c4713959a99804a85c698cebead65ae7ebffbc6f463eccd4435db6fad47
-EBUILD tcp-wrappers-7.6.28.ebuild 2432 BLAKE2B 3ba3b41e85cfee2edec206407c4fc8117977025cf2601d5c1486dad2fe7a3228cdb2c9b4ee6b1a05f07c5bddb6c5e26fd6e8f27c0a2f184345b4e65420094202 SHA512 5c1da0e7763ba6704428209382993695a82b5e1e7abe211e34e1dd42fe59282553e5476c82e7f4c92d7ec3c982e9c1745117e11fa179d5a4984b7dd5025ed049
+EBUILD tcp-wrappers-7.6.28.ebuild 2425 BLAKE2B 4702a06c1818dfccc29c42907e8903d2137c1389cfeff9cc39c22c61519462e7ca80b86551fd1d6e6a5ea2be82ab4640fb623f90f446a798a638d1ccf81a3a50 SHA512 5ecdb9a4d4ae9ff911abbe9798d9a7bbca55289401d1ce19f02101f50e26febcfcb9c7da6064411310715c972a42b68276c40fcb8b9cf388b4d23f8eaa0a6d00
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
index 851b32e5265a..e37ddc9c2952 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
 
 LICENSE="tcp_wrappers_license"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 netgroups static-libs"
 
 RDEPEND=""
diff --git a/sys-apps/usbguard/Manifest b/sys-apps/usbguard/Manifest
index df38e4a4dd87..8a1bb689d786 100644
--- a/sys-apps/usbguard/Manifest
+++ b/sys-apps/usbguard/Manifest
@@ -1,5 +1,5 @@
 AUX usbguard-0.7.6-usbguard-dbus.openrc 278 BLAKE2B 58f11c693e25436605af6ad41a1f618e30b20f336cda6a11db480fdda65022c28ce84d6aa9e804c1344221f3aa4ab8a262094106bb677414c2b24e7971f9acad SHA512 f66bee161324610755371fa04199fcd81887c1a55ab73cc1922be719d61e8315b7a869e1d8af6c3df2d6922b07027dced3605e63b130e8f094fcb606aea20b9e
 AUX usbguard-0.7.6-usbguard.openrc 309 BLAKE2B d5297058d0ee8ce0f9fc91f2158f4aef5f077e1087800449a0319038d677a2a70274305058cd104ba30529b3c9daf82ffbe16ca5cdf20a3b4817e66d499d08c5 SHA512 512a08f59caf9de22b0776473a1ea9a4322b05c6286c99dac3055e0c6d52c78542448c33e19708338080cfdcdfcfb0f9868e8c523155e978c0161c262081da09
 DIST usbguard-0.7.6.tar.gz 1189194 BLAKE2B 4fefd9ccf13b094f64942559f481144f08986dc71154b87c1623459d2429c07e2738a17877d3f6c275e83ce904067b1284c588c9a95023c7205cc5e21ca118f0 SHA512 0b0d42276e48baac2dc1f9031eec25e3f622a8d6178cb0400b97c7d32005bfa158b60fd286fdc66206a8684658fefaf6389ef93511e942f025e75671d7455628
-EBUILD usbguard-0.7.6-r1.ebuild 1939 BLAKE2B 1aa5a2b004220759ee7183279f94dfb1132f97da5d7507208f6c69ae932b68ab1385ba9da78f261e9de9f01a4d756ec810b8ddd6b7646ef2875f1dfecd3decc8 SHA512 8685e97b343b13291a28aa0372e1f85cdc288e59b969488bcd88c4c161a1837de1da3f8da5925eb49cb89f6ab8d9cb6c20a3214ef62d23d25ff9f769baf1c4a2
+EBUILD usbguard-0.7.6-r1.ebuild 1907 BLAKE2B 5cde16f4d987a58407ced3161b78840464b349d647cb32652cc6090e3d18946b711226610af2a69bb2facabf58708eac7fa2dc74976d9f0775c608c774906e3c SHA512 3678951cba045a47164edf3bf18ec977fd96a14ca89a14afca515d6c83a22f9ea3273286c463d80147befa52c60ecda53a52f94c8c03ab04a06b83f72147c6b1
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild b/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
index ec5fcfb642d2..aa7debe0b591 100644
--- a/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
+++ b/sys-apps/usbguard/usbguard-0.7.6-r1.ebuild
@@ -52,7 +52,6 @@ src_configure() {
 		$(use_with ldap)
 		$(use_with policykit polkit)
 		$(use_enable systemd)
-		--disable-dependency-tracking
 	)
 
 	econf "${myargs[@]}"
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
commit	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree	9f47ee47c31a0f13f9496879cd88a1042550aa81 /sys-apps
parent	53cba99042fa967e2a93da9f8db806fe2d035543 (diff)