Sync with portage [Tue Dec 29 15:07:50 MSK 2020].

3 years ago · fb88b287d5
parent 8ff9333ae2
commit fb88b287d5
401 changed files with 1577 additions and 5271 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/conmon/conmon-2.0.22.ebuild
+++ b/app-emulation/conmon/conmon-2.0.22.ebuild
@ -3,6 +3,8 @@
 EAPI=7
 inherit toolchain-funcs
 EGIT_COMMIT="9c34a8663b85e479e0c083801e89a2b2835228ed"
 DESCRIPTION="An OCI container runtime monitor"
 HOMEPAGE="https://github.com/containers/conmon"
@ -16,7 +18,8 @@ RESTRICT="test"
 RDEPEND="dev-libs/glib:=
 	systemd? ( sys-apps/systemd:= )"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
 	dev-go/go-md2man"
 S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
@ -28,9 +31,12 @@ src_prepare() {
 			-e 's| $(PKG_CONFIG) --exists libsystemd | false |' \
 			-i Makefile || die
 	fi
 	sed -e 's|make -C tools|$(MAKE) -C tools|' -i Makefile || die
 	sed -e 's|^GOMD2MAN = .*|GOMD2MAN = go-md2man|' -i docs/Makefile || die
 }
 src_compile() {
 	tc-export CC
 	emake GIT_COMMIT="${EGIT_COMMIT}" \
 		all
 }
--- a/app-emulation/docker/docker-19.03.13-r2.ebuild
+++ b/app-emulation/docker/docker-19.03.13-r2.ebuild
@ -170,7 +170,7 @@ pkg_setup() {
 			~AUFS_FS
 			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
 		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
 	fi
 	if use btrfs; then
--- a/app-emulation/docker/docker-19.03.14.ebuild
+++ b/app-emulation/docker/docker-19.03.14.ebuild
@ -170,7 +170,7 @@ pkg_setup() {
 			~AUFS_FS
 			~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
 		"
-		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
 	fi
 	if use btrfs; then
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/mc/mc-4.8.25-r1.ebuild
+++ b/app-misc/mc/mc-4.8.25-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm nls samba sftp +slang spell test unicode X +xdg"
 REQUIRED_USE="spell? ( edit )"
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@ -1,4 +1 @@
 DIST neofetch-6.0.0.tar.gz 115538 BLAKE2B ec1a019c873a6c48ca150f51cfc76174b8df6af629530906a638f3f19fdae0e926cb7512b14c90aa9af6b6fb4652f2f6c72128535c2b833d307ad58e66af9c5f SHA512 2613bbc3bd50fb11fb511dd2d3d37f8e86891c9abab5f25e5956f4458c43abd555ff7d129a24f7e5ff4ed76f7c69235b696a77326bce11d81dd81eb414ab3a8d
 DIST neofetch-6.1.0.tar.gz 118346 BLAKE2B d9a08cf0b3f9164e8e42e25434d3e23e3c0ebac5e3fe3e770d7a2bde67b127078977fdb44fcc5e11703cafbe0f68332d6d7a4df8ced235d4dbd4a525afc171b1 SHA512 a68b5021d02d217ae5bc67f3d542afe4aebf1cc891f083e276b58847b1dff4419e036dbd7694b7c49c19c615b13eb54c22db3e69e6143c3f10f3fc1966a22a2e
 DIST neofetch-7.0.0.tar.gz 90892 BLAKE2B 7cee56b0b3dd49cfaddec99cd10594c5792a24dac54bae99af2bd5f13ac1a1f152fee917175a6ce911fc9b6eecb0e92cec287448f78ec714634c9fbff07a2e50 SHA512 84dde5b34b0defc24ac472efd4354483e0438c5bbed25f1f39cec53eeeee0a7d8f10dcace736b720f0e1dfbe55342ef3f5e866501bc62aee40a09bef90bf13b5
 DIST neofetch-7.1.0.tar.gz 95400 BLAKE2B 32368d461835d95ba8203c560b2f6733594966cbaf809d877a46c08675284288565e3a21b14d94900dd66b778dc975339196f182732e2cd8bc1ccc9e6da6253e SHA512 fe1013fb54585c15ba556054478a2c8c503120387e81bd16bfdfbb6f3a188ed4124585540abf43da9209cbbe0d7fb90d50914cd6620137d00f013cfb6954a042
--- a/app-misc/neofetch/metadata.xml
+++ b/app-misc/neofetch/metadata.xml
@ -9,6 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<stabilize-allarches/>
 	<longdescription lang="en">
 		neofetch is a script that gathers information about your system and
 		prints it to the terminal next to an image, a distro's logo or any
--- a/app-misc/neofetch/neofetch-6.0.0.ebuild
+++ b/app-misc/neofetch/neofetch-6.0.0.ebuild
@ -1,28 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
 	KEYWORDS="amd64 ~mips x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
 fi
 DESCRIPTION="Simple information system script"
 HOMEPAGE="https://github.com/dylanaraps/neofetch"
 LICENSE="MIT-with-advertising"
 SLOT="0"
 IUSE="X"
 RDEPEND="sys-apps/pciutils
 	X? (
 		media-gfx/imagemagick
 		media-libs/imlib2
 		www-client/w3m[imlib]
 		x11-apps/xprop
 		x11-apps/xrandr
 		x11-apps/xwininfo
 	)"
--- a/app-misc/neofetch/neofetch-6.1.0.ebuild
+++ b/app-misc/neofetch/neofetch-6.1.0.ebuild
@ -1,28 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~mips ~ppc64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
 fi
 DESCRIPTION="Simple information system script"
 HOMEPAGE="https://github.com/dylanaraps/neofetch"
 LICENSE="MIT-with-advertising"
 SLOT="0"
 IUSE="X"
 RDEPEND="sys-apps/pciutils
 	X? (
 		media-gfx/imagemagick
 		media-libs/imlib2
 		www-client/w3m[imlib]
 		x11-apps/xprop
 		x11-apps/xrandr
 		x11-apps/xwininfo
 	)"
--- a/app-misc/neofetch/neofetch-7.0.0.ebuild
+++ b/app-misc/neofetch/neofetch-7.0.0.ebuild
@ -1,28 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
 fi
 DESCRIPTION="Simple information system script"
 HOMEPAGE="https://github.com/dylanaraps/neofetch"
 LICENSE="MIT-with-advertising"
 SLOT="0"
 IUSE="X"
 RDEPEND="sys-apps/pciutils
 	X? (
 		media-gfx/imagemagick
 		media-libs/imlib2
 		www-client/w3m[imlib]
 		x11-apps/xprop
 		x11-apps/xrandr
 		x11-apps/xwininfo
 	)"
--- a/app-misc/neofetch/neofetch-7.1.0.ebuild
+++ b/app-misc/neofetch/neofetch-7.1.0.ebuild
@ -5,7 +5,7 @@ EAPI=7
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~mips ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~mips ~ppc64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/dylanaraps/neofetch.git"
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/coolreader/coolreader-3.2.50.ebuild
+++ b/app-text/coolreader/coolreader-3.2.50.ebuild
@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/buggins/coolreader/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="wxwidgets"
 CDEPEND="sys-libs/zlib
--- a/app-text/xmldiff/xmldiff-2.4.ebuild
+++ b/app-text/xmldiff/xmldiff-2.4.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/Shoobx/xmldiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/duktape/duktape-2.6.0.ebuild
+++ b/dev-lang/duktape/duktape-2.6.0.ebuild
@ -13,7 +13,7 @@ LICENSE="MIT"
 # Upstream don't maintain binary compatibility
 # https://github.com/svaarala/duktape/issues/1524
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 PATCHES=(
 	"${FILESDIR}/${PN}-2.6.0-respect-tc-env.patch"
--- a/dev-lang/ruby/files/3.0/001-socksocket-fix.patch
+++ b/dev-lang/ruby/files/3.0/001-socksocket-fix.patch
@ -0,0 +1,15 @@
 Fix compilation with socks5 USE flag.
 Patch by Phobos Kappa in https://bugs.gentoo.org/762253
 --- a/ext/socket/sockssocket.c	2020-12-25 05:33:01.000000000 +0200
 +++ b/ext/socket/sockssocket.c	2020-12-28 15:42:50.310029778 +0200
@@ -34,7 +34,7 @@
 	init = 1;
     }
 -    return rsock_init_inetsock(sock, host, port, Qnil, Qnil, INET_SOCKS, Qnil);
 +    return rsock_init_inetsock(sock, host, port, Qnil, Qnil, INET_SOCKS, Qnil, Qnil);
 }
 #ifdef SOCKS5
--- a/dev-lang/ruby/ruby-3.0.0-r1.ebuild
+++ b/dev-lang/ruby/ruby-3.0.0-r1.ebuild
@ -0,0 +1,262 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools flag-o-matic multilib
 MY_P="${PN}-$(ver_cut 1-3)"
 S=${WORKDIR}/${MY_P}
 SLOT=$(ver_cut 1-2)
 MY_SUFFIX=$(ver_rs 1 '' ${SLOT})
 RUBYVERSION=${SLOT}.0
 DESCRIPTION="An object-oriented scripting language"
 HOMEPAGE="https://www.ruby-lang.org/"
 SRC_URI="https://cache.ruby-lang.org/pub/ruby/${SLOT}/${MY_P}.tar.xz"
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="berkdb debug doc examples gdbm ipv6 jemalloc jit libressl +rdoc rubytests socks5 +ssl static-libs systemtap tk xemacs"
 RDEPEND="
 	berkdb? ( sys-libs/db:= )
 	gdbm? ( sys-libs/gdbm:= )
 	jemalloc? ( dev-libs/jemalloc )
 	jit? ( || ( sys-devel/gcc:* sys-devel/clang:* ) )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl )
 	)
 	socks5? ( >=net-proxy/dante-1.1.13 )
 	systemtap? ( dev-util/systemtap )
 	tk? (
 		dev-lang/tcl:0=[threads]
 		dev-lang/tk:0=[threads]
 	)
 	dev-libs/libyaml
 	dev-libs/libffi:=
 	sys-libs/readline:0=
 	sys-libs/zlib
 	>=app-eselect/eselect-ruby-20201225
 "
 DEPEND="${RDEPEND}"
 BUNDLED_GEMS="
 	>=dev-ruby/minitest-5.14.2[ruby_targets_ruby30]
 	>=dev-ruby/power_assert-1.2.0[ruby_targets_ruby30]
 	>=dev-ruby/rake-13.0.3[ruby_targets_ruby30]
 	>=dev-ruby/rbs-1.0.0[ruby_targets_ruby30]
 	>=dev-ruby/rexml-3.2.4[ruby_targets_ruby30]
 	>=dev-ruby/rss-0.2.9[ruby_targets_ruby30]
 	>=dev-ruby/test-unit-3.3.7[ruby_targets_ruby30]
 	>=dev-ruby/typeprof-0.11.0[ruby_targets_ruby30]
 "
 PDEPEND="
 	${BUNDLED_GEMS}
 	virtual/rubygems[ruby_targets_ruby30]
 	>=dev-ruby/bundler-2.1.4[ruby_targets_ruby30]
 	>=dev-ruby/did_you_mean-1.5.0[ruby_targets_ruby30]
 	>=dev-ruby/json-2.5.1[ruby_targets_ruby30]
 	rdoc? ( >=dev-ruby/rdoc-6.3.0[ruby_targets_ruby30] )
 	xemacs? ( app-xemacs/ruby-modes )"
 src_prepare() {
 	eapply "${FILESDIR}"/"${SLOT}"/{001,010}*.patch
 	einfo "Unbundling gems..."
 	cd "$S"
 	# Remove bundled gems that we will install via PDEPEND, bug
 	# 539700.
 	rm -fr gems/* || die
 	touch gems/bundled_gems || die
 	# Don't install CLI tools since they will clash with the gem
 	rm -f bin/{racc,racc2y,y2racc} || die
 	sed -i -e '/executables/ s:^:#:' lib/racc/racc.gemspec || die
 	einfo "Removing bundled libraries..."
 	rm -fr ext/fiddle/libffi-3.2.1 || die
 	if use prefix ; then
 		# Fix hardcoded SHELL var in mkmf library
 		sed -i -e "s#\(SHELL = \).*#\1${EPREFIX}/bin/sh#" lib/mkmf.rb || die
 		if [[ ${CHOST} == *darwin* ]] ; then
 			# avoid symlink loop on Darwin (?!)
 			sed -i \
 				-e '/LIBRUBY_ALIASES=/s/lib$(RUBY_INSTALL_NAME).$(SOEXT)//' \
 				configure.ac || die
 			# make ar/libtool hack for Darwin work
 			sed -i \
 				-e "s/ac_cv_prog_ac_ct_AR='libtool/ac_cv_prog_AR='${CHOST}-libtool/" \
 				configure.ac || die
 		fi
 	fi
 	eapply_user
 	eautoreconf
 }
 src_configure() {
 	local modules= myconf=
 	# -fomit-frame-pointer makes ruby segfault, see bug #150413.
 	filter-flags -fomit-frame-pointer
 	# In many places aliasing rules are broken; play it safe
 	# as it's risky with newer compilers to leave it as it is.
 	append-flags -fno-strict-aliasing
 	# Socks support via dante
 	if use socks5 ; then
 		# Socks support can't be disabled as long as SOCKS_SERVER is
 		# set and socks library is present, so need to unset
 		# SOCKS_SERVER in that case.
 		unset SOCKS_SERVER
 	fi
 	# Increase GC_MALLOC_LIMIT if set (default is 8000000)
 	if [ -n "${RUBY_GC_MALLOC_LIMIT}" ] ; then
 		append-flags "-DGC_MALLOC_LIMIT=${RUBY_GC_MALLOC_LIMIT}"
 	fi
 	# ipv6 hack, bug 168939. Needs --enable-ipv6.
 	use ipv6 || myconf="${myconf} --with-lookup-order-hack=INET"
 	# Determine which modules *not* to build depending in the USE flags.
 	if ! use berkdb ; then
 		modules="${modules},dbm"
 	fi
 	if ! use gdbm ; then
 		modules="${modules},gdbm"
 	fi
 	if ! use ssl ; then
 		modules="${modules},openssl"
 	fi
 	if ! use tk ; then
 		modules="${modules},tk"
 	fi
 	# Provide an empty LIBPATHENV because we disable rpath but we do not
 	# need LD_LIBRARY_PATH by default since that breaks USE=multitarget
 	# #564272
 	INSTALL="${EPREFIX}/usr/bin/install -c" LIBPATHENV="" econf \
 		--program-suffix=${MY_SUFFIX} \
 		--with-soname=ruby${MY_SUFFIX} \
 		--with-readline-dir="${EPREFIX}"/usr \
 		--enable-shared \
 		--enable-pthread \
 		--disable-rpath \
 		--with-out-ext="${modules}" \
 		$(use_with jemalloc jemalloc) \
 		$(use_enable jit jit-support ) \
 		$(use_enable socks5 socks) \
 		$(use_enable systemtap dtrace) \
 		$(use_enable doc install-doc) \
 		--enable-ipv6 \
 		$(use_enable static-libs static) \
 		$(use_enable static-libs install-static-library) \
 		$(use_with static-libs static-linked-ext) \
 		$(use_enable debug) \
 		${myconf} \
 		--enable-option-checking=no
 	# Makefile is broken because it lacks -ldl
 	rm -rf ext/-test-/popen_deadlock || die
 }
 src_compile() {
 	emake V=1 EXTLDFLAGS="${LDFLAGS}" MJIT_CFLAGS="${CFLAGS}" MJIT_OPTFLAGS="" MJIT_DEBUGFLAGS=""
 }
 src_test() {
 	emake -j1 V=1 test
 	elog "Ruby's make test has been run. Ruby also ships with a make check"
 	elog "that cannot be run until after ruby has been installed."
 	elog
 	if use rubytests; then
 		elog "You have enabled rubytests, so they will be installed to"
 		elog "/usr/share/${PN}-${SLOT}/test. To run them you must be a user other"
 		elog "than root, and you must place them into a writeable directory."
 		elog "Then call: "
 		elog
 		elog "ruby${MY_SUFFIX} -C /location/of/tests runner.rb"
 	else
 		elog "Enable the rubytests USE flag to install the make check tests"
 	fi
 }
 src_install() {
 	# Remove the remaining bundled gems. We do this late in the process
 	# since they are used during the build to e.g. create the
 	# documentation.
 	rm -rf ext/json || die
 	rm -rf lib/bundler* lib/rdoc/rdoc.gemspec || die
 	# Ruby is involved in the install process, we don't want interference here.
 	unset RUBYOPT
 	local MINIRUBY=$(echo -e 'include Makefile\ngetminiruby:\n\t@echo $(MINIRUBY)'|make -f - getminiruby)
 	LD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
 	if [[ ${CHOST} == *darwin* ]] ; then
 		DYLD_LIBRARY_PATH="${S}:${ED}/usr/$(get_libdir)${DYLD_LIBRARY_PATH+:}${DYLD_LIBRARY_PATH}"
 		export DYLD_LIBRARY_PATH
 	fi
 	RUBYLIB="${S}:${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"
 	for d in $(find "${S}/ext" -type d) ; do
 		RUBYLIB="${RUBYLIB}:$d"
 	done
 	export LD_LIBRARY_PATH RUBYLIB
 	# Create directory for the default gems
 	local gem_home="${EPREFIX}/usr/$(get_libdir)/ruby/gems/${RUBYVERSION}"
 	mkdir -p "${D}/${gem_home}" || die "mkdir gem home failed"
 	emake V=1 DESTDIR="${D}" GEM_DESTDIR=${gem_home} install
 	# Remove installed rubygems and rdoc copy
 	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}/rubygems" || die "rm rubygems failed"
 	rm -rf "${ED}/usr/bin/"gem"${MY_SUFFIX}" || die "rm rdoc bins failed"
 	rm -rf "${ED}/usr/$(get_libdir)/ruby/${RUBYVERSION}"/rdoc* || die "rm rdoc failed"
 	rm -rf "${ED}/usr/bin/"{bundle,bundler,ri,rdoc}"${MY_SUFFIX}" || die "rm rdoc bins failed"
 	if use doc; then
 		emake DESTDIR="${D}" GEM_DESTDIR=${gem_home} install-doc
 	fi
 	if use examples; then
 		dodoc -r sample
 	fi
 	dodoc ChangeLog NEWS.md doc/NEWS* README*
 	if use rubytests; then
 		pushd test
 		insinto /usr/share/${PN}-${SLOT}/test
 		doins -r .
 		popd
 	fi
 }
 pkg_postinst() {
 	if [[ ! -n $(readlink "${EROOT}"/usr/bin/ruby) ]] ; then
 		eselect ruby set ruby${MY_SUFFIX}
 	fi
 	elog
 	elog "To switch between available Ruby profiles, execute as root:"
 	elog "\teselect ruby set ruby(23|24|...)"
 	elog
 }
 pkg_postrm() {
 	eselect ruby cleanup
 }
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@ -1,4 +1,2 @@
 DIST cryptopp565.zip 4220843 BLAKE2B 0c42da3564cdd175c2f2c5c4272caf826f21e47d2271c7f54acab86f5f79dcdad8d6cb946bc88f55fde6189bb2d24ad8fb03dda6b3b8c6f105434b55b8b217d0 SHA512 f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7
 DIST cryptopp700.zip 7296665 BLAKE2B 1b1a60e240a9d94b4edfea16beef0ec48ec26c61f7f9a3d89d29bd2e77b13a83ce942f81467bb90d3086253560a3c4acd6b89178dcb416ed4328340ad5222dfd SHA512 8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec
 DIST cryptopp820.zip 8859815 BLAKE2B 67aa850b887ae7aa869c9485bb18784492f6eec6cb12bf7c7cf84c776731eabf3c31965b47a60287e4e5a79dd3e9f0928dcfb185a0010a76f7cb96d2c3e8c6ae SHA512 753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5
 DIST cryptopp830.zip 9120687 BLAKE2B 777ae6a0716793dbbf40594e5f910783852df15e1d6444ddb9505e9f00e6ead0c17fcf6eb5d0b4d58881595fefa79d285bd2db1f1789716ffb59624c50823c3d SHA512 ad5219a66c5924d330d3646d0ff996dd235006f6812074bc4eb9e8c662a4f000ba20449d377f24b133d19ce682f7b2a3b2eb4c08857ce0f5bb39743d1d425147
--- a/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
+++ b/dev-libs/crypto++/crypto++-5.6.5-r1.ebuild
@ -1,60 +0,0 @@
 # 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="C++ class library of cryptographic schemes"
 HOMEPAGE="https://cryptopp.com"
 SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 LICENSE="Boost-1.0"
 SLOT="0/5.6" # subslot is so version
 KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
 IUSE="static-libs"
 BDEPEND="app-arch/unzip"
 S="${WORKDIR}"
 PATCHES=(
 	"${FILESDIR}/${PN}-5.6.4-nonative.patch"
 	"${FILESDIR}/${P}-CVE-2017-9434.patch"
 )
 pkg_setup() {
 	export CXX="$(tc-getCXX)"
 	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 	export PREFIX="${EPREFIX}/usr"
 }
 src_compile() {
 	# higher optimizations cause problems
 	replace-flags -O3 -O2
 	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
 	[[ ${CHOST} == *-darwin* ]] && append-cxxflags -DCRYPTOPP_DISABLE_ASM
 	emake -f GNUmakefile all shared
 }
 src_install() {
 	default
 	# remove leftovers as build system sucks
 	rm -fr "${ED}"/usr/bin "${ED}"/usr/share/cryptopp
 	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
 	# compatibility
 	dosym cryptopp "${EPREFIX}"/usr/include/crypto++
 	for f in "${ED}"/usr/$(get_libdir)/*; do
 		ln -s "$(basename "${f}")" "$(echo "${f}" | sed 's/cryptopp/crypto++/')" || die
 	done
 }
 pkg_preinst() {
 	# we switched directory to symlink
 	# make sure portage digests that
 	rm -fr "${EROOT}/usr/include/crypto++"
 	rm -fr "${EROOT}/usr/include/cryptopp"
 }
--- a/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
+++ b/dev-libs/crypto++/crypto++-7.0.0-r3.ebuild
@ -1,48 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit toolchain-funcs
 DESCRIPTION="C++ class library of cryptographic schemes"
 HOMEPAGE="https://cryptopp.com"
 SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 LICENSE="Boost-1.0"
 SLOT="0/7" # subslot is so version
 KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 BDEPEND="app-arch/unzip"
 S="${WORKDIR}"
 config_uncomment() {
 	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
 }
 pkg_setup() {
 	export CXX="$(tc-getCXX)"
 	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 	export PREFIX="${EPREFIX}/usr"
 }
 src_prepare() {
 	default
 	use asm || config_uncomment CRYPTOPP_DISABLE_ASM
 	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
 	[[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM
 }
 src_compile() {
 	emake -f GNUmakefile all shared libcryptopp.pc
 }
 src_install() {
 	default
 	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
 }
--- a/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
+++ b/dev-libs/crypto++/crypto++-8.2.0-r2.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 LICENSE="Boost-1.0"
 SLOT="0/8" # subslot is so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
 IUSE="+asm cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_pclmul cpu_flags_x86_sha cpu_flags_x86_sse2 cpu_flags_x86_sse4_2 cpu_flags_x86_ssse3 static-libs"
 BDEPEND="app-arch/unzip"
--- a/dev-libs/crypto++/crypto++-8.2.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.2.0.ebuild
@ -1,52 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit toolchain-funcs
 DESCRIPTION="C++ class library of cryptographic schemes"
 HOMEPAGE="https://cryptopp.com"
 SRC_URI="https://www.cryptopp.com/cryptopp${PV//.}.zip"
 LICENSE="Boost-1.0"
 SLOT="0/8" # subslot is so version
 KEYWORDS="~alpha amd64 ~arm arm64 hppa ppc ppc64 sparc x86 ~x64-macos"
 IUSE="+asm static-libs"
 BDEPEND="app-arch/unzip"
 S="${WORKDIR}"
 PATCHES=(
 	"${FILESDIR}/${P}-build.patch"
 )
 config_uncomment() {
 	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
 }
 pkg_setup() {
 	export CXX="$(tc-getCXX)"
 	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 	export PREFIX="${EPREFIX}/usr"
 }
 src_prepare() {
 	default
 	use asm || config_uncomment CRYPTOPP_DISABLE_ASM
 	# ASM isn't Darwin/Mach-O ready, #479554, buildsys doesn't grok CPPFLAGS
 	[[ ${CHOST} == *-darwin* ]] && config_uncomment CRYPTOPP_DISABLE_ASM
 }
 src_compile() {
 	emake -f GNUmakefile all shared libcryptopp.pc
 }
 src_install() {
 	default
 	use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
 }
--- a/dev-libs/crypto++/crypto++-8.3.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.3.0.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}"
 LICENSE="Boost-1.0"
 SLOT="0/8" # subslot is so version
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 IUSE="+asm static-libs"
 BDEPEND="app-arch/unzip"
--- a/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch
+++ b/dev-libs/crypto++/files/crypto++-5.6.4-nonative.patch
@ -1,28 +0,0 @@
 Index: work/GNUmakefile
 ===================================================================
 --- work.orig/GNUmakefile
 +++ work/GNUmakefile
@@ -125,23 +125,6 @@ ifeq ($(IS_X86)$(IS_X32)$(IS_CYGWIN)$(IS
  endif
 endif
 -# Guard use of -march=native
 -ifeq ($(GCC42_OR_LATER)$(IS_NETBSD),10)
 -   CXXFLAGS += -march=native
 -else ifneq ($(CLANG_COMPILER)$(INTEL_COMPILER),00)
 -   CXXFLAGS += -march=native
 -else
 -  # GCC 3.3 and "unknown option -march="
 -  # Ubuntu GCC 4.1 compiler crash with -march=native
 -  # NetBSD GCC 4.8 compiler and "bad value (native) for -march= switch"
 -  # Sun compiler is handled below
 -  ifeq ($(SUN_COMPILER)$(IS_X64),01)
 -    CXXFLAGS += -m64
 -  else ifeq ($(SUN_COMPILER)$(IS_X86),01)
 -    CXXFLAGS += -m32
 -  endif # X86/X32/X64
 -endif
 -
 # Aligned access required for -O3 and above due to vectorization
 UNALIGNED_ACCESS := $(shell $(EGREP) -c "^[[:space:]]*//[[:space:]]*\#[[:space:]]*define[[:space:]]*CRYPTOPP_NO_UNALIGNED_DATA_ACCESS" config.h)
 ifneq ($(UNALIGNED_ACCESS),0)
--- a/dev-libs/crypto++/files/crypto++-5.6.5-CVE-2017-9434.patch
+++ b/dev-libs/crypto++/files/crypto++-5.6.5-CVE-2017-9434.patch
@ -1,45 +0,0 @@
 From 07dbcc3d9644b18e05c1776db2a57fe04d780965 Mon Sep 17 00:00:00 2001
 From: Jeffrey Walton <noloader@gmail.com>
 Date: Wed, 10 May 2017 18:17:12 -0400
 Subject: [PATCH] Add Inflator::BadDistanceErr exception (Issue 414) The
 improved validation and excpetion clears the Address Sanitizer and Undefined
 Behavior Sanitizer findings
 ---
 zinflate.cpp | 8 +++++++-
 zinflate.h   | 4 ++++
 3 files changed, 14 insertions(+), 4 deletions(-)
 diff --git a/zinflate.cpp b/zinflate.cpp
 index 664efe6..fbd7505 100644
 --- a/zinflate.cpp
 +++ b/zinflate.cpp
@@ -550,12 +550,16 @@ bool Inflator::DecodeBody()
 						break;
 					}
 		case DISTANCE_BITS:
 +					if (m_distance >= COUNTOF(distanceExtraBits))
 +						throw BadDistanceErr();
 					bits = distanceExtraBits[m_distance];
 					if (!m_reader.FillBuffer(bits))
 					{
 						m_nextDecode = DISTANCE_BITS;
 						break;
 					}
 +					if (m_distance >= COUNTOF(distanceStarts))
 +						throw BadDistanceErr();
 					m_distance = m_reader.GetBits(bits) + distanceStarts[m_distance];
 					OutputPast(m_literal, m_distance);
 				}
 diff --git a/zinflate.h b/zinflate.h
 index e2fd237..c47d2f6 100644
 --- a/zinflate.h
 +++ b/zinflate.h
@@ -96,6 +96,7 @@ public:
 	};
 	class UnexpectedEndErr : public Err {public: UnexpectedEndErr() : Err(INVALID_DATA_FORMAT, "Inflator: unexpected end of compressed block") {}};
 	class BadBlockErr : public Err {public: BadBlockErr() : Err(INVALID_DATA_FORMAT, "Inflator: error in compressed block") {}};
 +	class BadDistanceErr : public Err {public: BadDistanceErr() : Err(INVALID_DATA_FORMAT, "Inflator: error in bit distance") {}};
 	//! \brief RFC 1951 Decompressor
 	//! \param attachment the filter's attached transformation
--- a/dev-libs/kreport/kreport-3.2.0-r1.ebuild
+++ b/dev-libs/kreport/kreport-3.2.0-r1.ebuild
@ -16,7 +16,7 @@ HOMEPAGE="https://community.kde.org/KReport"
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 LICENSE="LGPL-2+"
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 RDEPEND="
 	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
--- a/dev-python/lxml/lxml-4.6.2-r1.ebuild
+++ b/dev-python/lxml/lxml-4.6.2-r1.ebuild
@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
--- a/dev-python/pyamg/pyamg-4.0.0.ebuild
+++ b/dev-python/pyamg/pyamg-4.0.0.ebuild
@ -19,6 +19,8 @@ RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pybind11[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]"
 # cannot be enabled by "distutils_enable_tests pytest"
 BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 distutils_enable_tests setup.py
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
--- a/dev-python/re-assert/re-assert-1.1.0.ebuild
+++ b/dev-python/re-assert/re-assert-1.1.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
--- a/dev-python/theano-pymc/Manifest
+++ b/dev-python/theano-pymc/Manifest
@ -1 +1,2 @@
 DIST theano-pymc-1.0.13.tar.gz 12975871 BLAKE2B 71528868885084d7c37f1f5cc5156aca5e764d09f0dc57aa46e21240ee2959aafb5882aef8977d9f215b051265d0d9bc3a7097ac0bb6d427cfc076ea6f591905 SHA512 da25e386965695a5630c54a671a7a573d0f0fae2eeeacf4f65130e4e4caf416373852ac14b1eb07ae39c194febe854d71fffe2adc24c348f64a4b73b43564229
 DIST theano-pymc-1.0.14.tar.gz 12979426 BLAKE2B e6db87a348d6e7003f8b1ff4e0634335d53d734ea922951edeaab06ec54d51f1d7930a03f6dca14979930abb6212f873d606a9adada46d5b606854c5d8a6c6a5 SHA512 4ddfe5978f33cea96b20763cb01eecf1ec6c0c6b97ac892d647e28b607e61b11862739e5836356ab87e2002e992febe35ce9e1e72d37732074be2dbed64b50b9
--- a/dev-python/theano-pymc/theano-pymc-1.0.14.ebuild
+++ b/dev-python/theano-pymc/theano-pymc-1.0.14.ebuild
@ -0,0 +1,42 @@
 # Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1 optfeature
 DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
 HOMEPAGE="https://github.com/pymc-devs/Theano-PyMC"
 SRC_URI="https://github.com/pymc-devs/Theano-PyMC/archive/rel-${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/Theano-PyMC-rel-${PV}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/scipy[${PYTHON_USEDEP}]"
 distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
 distutils_enable_tests pytest
 python_prepare_all() {
 	sed -i -e "s/, 'flake8'//" setup.py || die
 	sed -i -e "s/tests.\*/tests\*/" setup.py || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	distutils_install_for_testing
 	pytest -vv || die "Tests failed with ${EPYTHON}"
 }
 pkg_postinst() {
 	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
 	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
 }
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
--- a/dev-ruby/hoe/hoe-3.21.0.ebuild
+++ b/dev-ruby/hoe/hoe-3.21.0.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc Manifest.txt README.rdoc"
--- a/dev-ruby/metaclass/metaclass-0.0.4-r1.ebuild
+++ b/dev-ruby/metaclass/metaclass-0.0.4-r1.ebuild
@ -0,0 +1,25 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_GEMSPEC="metaclass.gemspec"
 inherit ruby-fakegem
 SRC_URI="https://github.com/floehopper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="Adds a __metaclass__ method to all Ruby objects"
 HOMEPAGE="https://github.com/floehopper/metaclass"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile test/test_helper.rb || die
 	sed -i -e 's/git ls-files/find/' -e '/\(test_files\|executables\)/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
--- a/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
+++ b/dev-ruby/minitest-global_expectations/minitest-global_expectations-1.0.1.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 inherit ruby-fakegem
--- a/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
+++ b/dev-ruby/minitest-power_assert/minitest-power_assert-0.3.1.ebuild
@ -3,7 +3,7 @@
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 RUBY_FAKEGEM_EXTRADOC="README.md"
--- a/dev-ruby/pkg-config/pkg-config-1.4.3.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.4.3.ebuild
@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@ -1,2 +1 @@
 DIST rack-protection-2.0.8.1.gem 16896 BLAKE2B 013fc8a5ceaadbfde52a7aca0dab8116cb01d6f034f3370d22a09545885a61adef92ad5ed9f82faf4434507a079ff9a0c3781b906ab6aba69fa032216f276fcb SHA512 264aef904d9ae1c38197ad4ad44f1638905bd180fc4bb402c47856c37168059e8e975ca2de5518b1e5cebf79b970024b7d9f5f8b8908880451357dea5e428562
 DIST rack-protection-2.1.0.gem 17408 BLAKE2B e4804273d346c76e9e7348bfa9575f16c9d415da9db4e8677782aed70fa613b6f322c82808707734276b8db60fce9d87fbbaac807c1b8df7f6bf1960c76ae244 SHA512 965388584a2cae9065ccc0d041bbd40951f22420f05e657586d710f87ae8f854a0be32c3274b9373f96b5f8eb19354d371e3bce9b2df83c013abfea99f16bded
--- a/dev-ruby/rack-protection/rack-protection-2.0.8.1.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-2.0.8.1.ebuild
@ -1,24 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 # There are no specs in the gem and the source cannot be downloaded separately.
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 inherit ruby-fakegem
 DESCRIPTION="This gem protects against typical web attacks"
 HOMEPAGE="https://github.com/rkh/rack-protection"
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_rdepend "dev-ruby/rack:*"
 # ruby_add_bdepend "test? ( dev-ruby/rack-test )"
--- a/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild
@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/rkh/rack-protection"
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_rdepend "dev-ruby/rack:*"
--- a/dev-ruby/rack-test/rack-test-1.1.0.ebuild
+++ b/dev-ruby/rack-test/rack-test-1.1.0.ebuild
@ -25,7 +25,7 @@ IUSE=""
 ruby_add_rdepend ">=dev-ruby/rack-1.0:* <dev-ruby/rack-3:*"
 ruby_add_bdepend "
-	test? ( dev-ruby/sinatra:2 || ( dev-ruby/rack:2.1 dev-ruby/rack:2.0 ) )"
+	test? ( dev-ruby/sinatra:2 )"
 all_ruby_prepare() {
 	rm Gemfile* || die
--- a/dev-ruby/rqrcode_core/Manifest
+++ b/dev-ruby/rqrcode_core/Manifest
@ -1,2 +1,3 @@
 DIST rqrcode_core-0.1.0.tar.gz 20241 BLAKE2B 1d6f97cd8e1188c0a3ba0246d2102a901ac64fb0bb08317479f9061d3273ea49388e4a6ea02c8de6b54f8e928aefab62fe8b0dca8ba9f7ed31625cf84965df4b SHA512 30ba73f45d69360b0efbf543a774c709a4397bd8f726f4edeaa830397187cd5c7535ac5816d65cea00f356f7111f69629f03fa508b7a7fc91d5618c4cebd8167
 DIST rqrcode_core-0.1.2.tar.gz 20165 BLAKE2B 7d8cabcb2258a667c3b27fcbd11988bbe5cba849b191c45f3288b4d096a6d13df614e64977ce633ec829f0350bbd7ee153342070845f5ed0d6121e6e2aab321a SHA512 9e4362b3b72193a20e44b636b3dfdbb7e496667b147e391660464ea6fd279720cbf4419e3d94561b61bee291c56fee8a3171f2287e2660f071dbda8d7153285b
 DIST rqrcode_core-0.2.0.tar.gz 20167 BLAKE2B 68ddad8e908404a9e156cffd0d1f2704671ffeaca0ce48a2a74b3512076d89812f19b537cbef98f3b0ae046486ab11f7681b187a07fb53539afb188bdcc87c21 SHA512 96a1fc3484aabfc30b9a26da705405e56cb82168d34ce252f35481b03142ddab359dfbfc4601d12f67f5a65d466120fc0a295c66c0a7ae07401b58cbd8d5c47a
--- a/dev-ruby/rqrcode_core/rqrcode_core-0.2.0.ebuild
+++ b/dev-ruby/rqrcode_core/rqrcode_core-0.2.0.ebuild
@ -0,0 +1,28 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_BINWRAP=""
 RUBY_FAKEGEM_GEMSPEC="rqrcode_core.gemspec"
 inherit ruby-fakegem
 DESCRIPTION="Library for encoding QR Codes"
 HOMEPAGE="https://github.com/whomwah/rqrcode_core/"
 SRC_URI="https://github.com/whomwah/rqrcode_core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile || die
 	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
--- a/dev-ruby/rspec-core/Manifest
+++ b/dev-ruby/rspec-core/Manifest
@ -1,5 +1,6 @@
 DIST rspec-core-2.99.2-git.tgz 212935 BLAKE2B 37195012f79aca3a1959f9143e2f5cbab63230ab07ea97928d6f66face8d07ab54d87f19535f5f235c441b2da6dec17ef2a889e9ccd7e83d987086e24afd1b82 SHA512 e13bc3384fd85c367481a8651c14be4a412cba5f58e12a8f4ab14b5d2768a7b92191b81e000e7dbf6a28275b41044d8b3eb70a04e4b30b5bf88db98cbec4cc44
 DIST rspec-core-3.10.0-git.tgz 396978 BLAKE2B 6fb8947598234351595a8832e47baf941f2ca3e8bd39570fba79b9539a7af51144ef41a257d309eddab895ba1e8ba7fe1efb22c855aaab7f1556998d7024ef4a SHA512 f00531021e20fd389dd7a5129ff3bf338c3fa35dfa5e15b0b73ba16eb081d3d7ed2014b1b2ea4ad2682e06f2822c2b895736ac9e80d6af3fba1aecb5cfcea8a3
 DIST rspec-core-3.10.1-git.tgz 398302 BLAKE2B 3ecd2a93b77435ef44dd7e52e2987155f71de3b04376dfbfc9c831ce075b4105f6a23a210f8508784b66c46f1126c188a3bd0548cc4f24060373b9c7e0b79101 SHA512 2d134e742e36cfaac0a52fa7ebd949391cfe58419956536a65fa3aefa2c7f3638fe19f7324ca3e0d2642cc5a9d33de11b09bd571844f1cfae9c077e5f27563d5
 DIST rspec-core-3.8.2-git.tgz 387788 BLAKE2B e6cf93f5cef70f53039b6c22fc875cff58eaff4c0c7d4e75d23dedfbe16081980c6fe575d3082dbe6ed9edc8e81f0cbb9e29618da78af40a94c517a859f9d793 SHA512 2fe88ee3d66ecf134562dfa7b1001f23a1a750640c4f65cdec64d85dd735e0fde9d91479286f8f9c38064746813f41632d12d21b3926724ccd7c9ded50d2a7c8
 DIST rspec-core-3.9.1-git.tgz 392102 BLAKE2B e41d4d930201e854015b486eb97e32f356027a837930f061f6282215a0d7e80db99c30c8b537d10f9359380512b46a03fe10ec382f5403704cdc7f0c1796aeed SHA512 2da714ebf35e78be789758857efbebc69548df7a11fff8bcd74a854b61485ef726cf0cec781e27a97d20f4eac0010aad50656b6074248c94b1833d4cb267189a
 DIST rspec-core-3.9.3-git.tgz 396080 BLAKE2B ea52a33586dc32af49a72950c7dbf24eef52a74891b2d7004ec4c5083e2e6d63c602f5033fba3a8ec1dfe6e8da349208b468a79b4e16aa5150d2fc8e93055c0e SHA512 f821ae3017c0fd9ac7f3ced0e81d0ebc54f2c17261f426c58a46c0bf1debb20efca7acc4b751b671e160de72ce5790f897bcb55d5d276fab228a4ea8d388a046
--- a/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
+++ b/dev-ruby/rspec-core/rspec-core-3.10.1.ebuild
@ -0,0 +1,91 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 USE_RUBY="ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_TASK_TEST="none"
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 # Also install this custom path since internal paths depend on it.
 RUBY_FAKEGEM_EXTRAINSTALL="exe"
 RUBY_FAKEGEM_GEMSPEC="rspec-core.gemspec"
 inherit ruby-fakegem
 DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
 HOMEPAGE="https://github.com/rspec/rspec-core"
 SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 LICENSE="MIT"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="highlight"
 SUBVERSION="$(ver_cut 1-2)"
 ruby_add_rdepend "
 	=dev-ruby/rspec-support-${SUBVERSION}*
 	highlight? ( >=dev-ruby/coderay-1.1.1 )
 "
 ruby_add_bdepend "test? (
 		>=dev-ruby/nokogiri-1.5.2
 		>=dev-ruby/coderay-1.1.1
 		dev-ruby/syntax
 		>=dev-ruby/thread_order-1.1.0
 		>=dev-ruby/rspec-expectations-3.8.0:3
 		>=dev-ruby/rspec-mocks-2.99.0:3
 		>=dev-ruby/rspec-support-3.9.1:3
 	)"
 all_ruby_prepare() {
 	# Don't set up bundler: it doesn't understand our setup.
 	sed -i -e '/[Bb]undler/d' Rakefile || die
 	# Avoid dependency on cucumber since we can't run the features anyway.
 	sed -i -e '/[Cc]ucumber/ s:^:#:' Rakefile || die
 	# Duplicate exe also in bin. We can't change it since internal stuff
 	# also depends on this and fixing that is going to be fragile. This
 	# way we can at least install proper bin scripts.
 	cp -R exe bin || die
 	# Avoid unneeded dependency on git.
 	sed -i -e 's/git ls-files --/find/' rspec-core.gemspec || die
 	# Avoid aruba dependency so that we don't end up in dependency hell.
 	sed -i -e '/ArubaLoader/,/^end/ s:^:#:' -e '/Aruba/ s:^:#:' spec/spec_helper.rb || die
 	rm -f spec/support/aruba_support.rb || die
 	rm -f spec/integration/{bisect_runners,failed_line_detection,filtering,order,persistence_failures,suite_hooks_errors}_spec.rb || die
 	rm -f spec/integration/{spec_file_load_errors,output_stream,fail_if_no_examples}_spec.rb || die
 	# Avoid a spec failing due to path issues
 	sed -i -e '/does not load files in the default path when run by ruby/,/end/ s:^:#:' \
 		spec/rspec/core/configuration_spec.rb || die
 	# Avoid a spec that depends on dev-ruby/rspec to lessen circular
 	# dependencies, bug 662328
 	sed -i -e '/loads mocks and expectations when the constants are referenced/askip "gentoo: bug 662328"' spec/rspec/core_spec.rb || die
 	# Avoid a spec depending on specifics on local networks
 	# This fails when localhost resolves to ::1 which may be a
 	# ruby regression in the drb/acl code.
 	rm -f spec/rspec/core/bisect/server_spec.rb || die
 }
 each_ruby_prepare() {
 	sed -i -e 's:ruby -e:'${RUBY}' -e:' spec/rspec/core_spec.rb || die
 }
 each_ruby_test() {
 	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -Ilib bin/rspec spec || die "Tests failed."
 }
 all_ruby_install() {
 	all_fakegem_install
 	ruby_fakegem_binwrapper rspec /usr/bin/rspec-3 'gem "rspec", "~>3.0"'
 }
--- a/dev-ruby/rspec-expectations/Manifest
+++ b/dev-ruby/rspec-expectations/Manifest
@ -1,5 +1,6 @@
 DIST rspec-expectations-2.99.2-git.tgz 106884 BLAKE2B 5b31c8681306d5c688f62fc3fc6adf7be6cabad6df6fd16195c71787d73495924233d793633fa041a94d796f63c9ff97c58e6f4a75bdc09dfbe56e770bb6a5c9 SHA512 6042cafe225b2b16df458c7bf69e1694b637afcac6f6195e35a0be199432610457ccaa3e7e4bd114b27a7a6c3d530d94f4c0603c65f469cbadc55bd3f75b6f3a
 DIST rspec-expectations-3.10.0-git.tgz 211125 BLAKE2B 50fc17eadc94b94a28bf56b1ba6af1d45afe3f62548533515c49eb434becc11ce12f6b6fbd92e98483a1e7c97beec4f0dbb87bc00f3dc9fa1f6877480dab331e SHA512 edb0be319ca2459425498ebe84db0f712dd9d97b36c8a1d99a810ad16f877226bdf9b88c8e84a8379659179868a173745501ce933519727eae20619cb15c4b2d
 DIST rspec-expectations-3.10.1-git.tgz 212281 BLAKE2B a1872a7f71c198db1662eca48bcb34c054f05c16193395962cb47a7fa230c2f0f83bedee302a0ab6a81380a361640177ac3370d8829faa6bd362c07e3a551e5e SHA512 35999542bf70ff04a472e50434abb8815cac8bf10b680da458f5e0e6ee290a1a6356a22cc12f0a8a6310cf282bb6cd99f922fcc63a0cf1e252b167e451bcf7d4
 DIST rspec-expectations-3.8.4-git.tgz 200149 BLAKE2B 45fe4cdc4b032bb773ef0e7d3e9b75e6d14a6e8c1850ad6fd84991d85a61860730caa9f191aa9d1ce4e21c85dadd2c52bb69bd0a1454f5ab918dc1e563fc54f1 SHA512 0ecb16f11ccf19c02c40ce587f33846fb2241f1663dd87f012b9b782338c213362dac624c434dee6e00ad2cc7ec4a1cd0af7f2edf1a8e9ebb0a0dfb31cd244d8
 DIST rspec-expectations-3.8.6-git.tgz 200343 BLAKE2B 9d668216c18716344e8c249086bcbf2b70e7c1a5a0d1f3a5328fe03752ef4ace6f5029219314016a4bb00ef482f440702a2adb7d9fe49392b5b1c6ec15f6a2e5 SHA512 9ded8de53127f63f2117f5ef64b6608b643586be498d8df24909366ce159a8bb95c9d8771633b777897f3e4ad3c9a12e3dfe62b2310513320b3d9656d24a120a
 DIST rspec-expectations-3.9.1-git.tgz 203727 BLAKE2B 47db054658bdec43c252fd5ac155e7ca794d60ecf8c8b0d3c8e072cf05629153c9778ad618619e5cde5400c95a85c1520f2b9fc3824699af33805fa187549115 SHA512 23a453a46c3eb3bd3f2a39f48f62f05832cf559b570ba0e09235dd6299687254491bab50f5502fefe69dbdeefa09e9d8c5568bc77d0b6b658bb469e197e67572
--- a/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
+++ b/dev-ruby/rspec-expectations/rspec-expectations-3.10.1.ebuild
@ -0,0 +1,47 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 USE_RUBY="ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 inherit ruby-fakegem
 DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
 HOMEPAGE="https://github.com/rspec/rspec-expectations"
 SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 LICENSE="MIT"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 SUBVERSION="$(ver_cut 1-2)"
 ruby_add_rdepend ">=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*
 	=dev-ruby/rspec-support-${SUBVERSION}*"
 ruby_add_bdepend "test? (
 		>=dev-ruby/rspec-mocks-3.2.0:3
 		>=dev-ruby/rspec-support-3.5.0:3
 	)"
 all_ruby_prepare() {
 	# Don't set up bundler: it doesn't understand our setup.
 	sed -i -e '/[Bb]undler/d' Rakefile || die
 	# Remove the Gemfile to avoid running through 'bundle exec'
 	rm -f Gemfile || die
 	# fix up the gemspecs
 	sed -i \
 		-e '/git ls/d' \
 		-e '/add_development_dependency/d' \
 		"${RUBY_FAKEGEM_GEMSPEC}" || die
 }
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@ -1,3 +1,4 @@
 DIST rspec-rails-3.8.3.tar.gz 138053 BLAKE2B dab5764d65d484a8a808a2104a3ab093c2ef2e822cacd136996eddb767a972f89df9a459509e701e5541f6b9c42a3b700a4daa816c0391474e004b4558feb2a7 SHA512 210a278cf82c20c4f5ef7faa5e253b9e18609d34467e91cb8728e6116c7cfb15d17fe8941fc15b776bb169e0275df623535b86fc160afe3e49432948f246a165
 DIST rspec-rails-3.9.1.tar.gz 143459 BLAKE2B 87a691df63a438b15b5726a802632c16373c784cc66216c1b099ed7e36e0916fdfe7ca1fb964904678b779b8fa90f0659971c4af00f9ca3a1071adf2216466bd SHA512 247acda67672ea3fa0641ea36d6209c8876597c63180979713db257e02cb4282b122af4cc0aa540dae984acdb16afdc4359012360b951f0599710fe422cdccac
 DIST rspec-rails-4.0.1.tar.gz 153383 BLAKE2B b2591fe27e992df11404f792e7efe1e18fa023e0b4b7c076f7ffc86e83228a013f06206c687167966413641aea654f57f0d1c0a057ecdfd9c1579fd38d08fcfd SHA512 97b06a8696181fb0209e376780860935f1c22cd9a2ae5977efd45217ab74e6cc0260687bb2ccd22f28cf69f2a73ded43c51ac8d43d0d0b6b0bd0fb3e547d920b
 DIST rspec-rails-4.0.2.tar.gz 153760 BLAKE2B ba609fe316a27c21f140df41b63916cb9a70e77302e3dbe1fa565024e85504e63d4f7bd575117f91f9762bdadf5b462acadefdde1d36a6a731227fa2e2cd5ed7 SHA512 4b4567ba896a80fd487ddcca466d23d6b9e634354f8b70d0146ddbf0c119628406ba8aad4e16bce577e63cc4d3d476c270c4c2f1ad1956bde7529f318b717cf9
--- a/dev-ruby/rspec-rails/rspec-rails-4.0.2.ebuild
+++ b/dev-ruby/rspec-rails/rspec-rails-4.0.2.ebuild
@ -0,0 +1,54 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 #RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
 inherit ruby-fakegem
 DESCRIPTION="RSpec's official Ruby on Rails plugin"
 HOMEPAGE="https://rspec.info/"
 SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 KEYWORDS="~amd64"
 IUSE=""
 ruby_add_rdepend ">=dev-ruby/activesupport-4.2:*
 	>=dev-ruby/actionpack-4.2:*
 	>=dev-ruby/railties-4.2:*
 	>=dev-ruby/rspec-3.10:3"
 # Depend on the package being already installed for tests, because
 # requiring ammeter will load it, and we need a consistent set of rspec
 # and rspec-rails for that to work.
 ruby_add_bdepend "test? (
 	>=dev-ruby/capybara-2.2.0
 	>=dev-ruby/ammeter-1.1.2
 	~dev-ruby/rspec-rails-${PV}
 )"
 all_ruby_prepare() {
 	# Remove .rspec options to avoid dependency on newer rspec when
 	# bootstrapping.
 	echo "--require spec_helper" > .rspec || die
 	# Avoid bundler-specific specs.
 	rm -f spec/sanity_check_spec.rb || die
 	# Avoid broken controller generator specs for now.
 	rm -fr spec/generators/rspec || die
 	# Fix gemspec.
 	sed -e 's/git ls-files --/find/' \
 		-i ${RUBY_FAKEGEM_GEMSPEC} || die
 }
--- a/dev-ruby/rspec-support/Manifest
+++ b/dev-ruby/rspec-support/Manifest
@ -1,4 +1,5 @@
 DIST rspec-support-3.10.0-git.tgz 72853 BLAKE2B 59c585800013fff2dea15ad33dfeed430c9a932206623bb368f4f4660682f537391090cc8538f9052ebafcab336ebd2fdc79003844330adc447be6d977e5648b SHA512 f7183f01b7a7ad55360823617a88a46b2351063d85d81bbd722ecf8b4bb41d014c9ae0af6123caa9405374d484aa61971153f4c59d009986aa20e93afd4a177d
 DIST rspec-support-3.10.1-git.tgz 74378 BLAKE2B b0b077c50572b654a8aec6dbbacb77a5ccbb68772a1a33c59ce1b424f0bfb6b72d1d4770234a8dec23a4126dc825189f67811913580f94570af7b8c33e217ab3 SHA512 e7240e591b76dc714880dc91da1e755a0d44d81f0de6861858293f4132a353b3b41a96175a58d81813222f254e6dfaac92170ab2fd3a8bd8e73ce7ba924e614f
 DIST rspec-support-3.8.2-git.tgz 69112 BLAKE2B 84600d3e2b4d847618f7f53efdf60be3836c7ba6c586de88cdf085e84749e616ad556683b1e7b588b9aec08adee10054e64ae1daf69c6ad58a00d1c2447171f7 SHA512 9fb9f8f2507edee5e7c414d32c1641803eed7a5e17fd300308449277ec6efb786f07207d8f28bcea0a669b8d76a2da53057488d149990ae973c0f7a0343180dc
 DIST rspec-support-3.8.3-git.tgz 69654 BLAKE2B 1ea3eed0602655fbf5f92cdc14217eb8377d980378c9835a342840bb7a00bb1cf095b6fe57a24f80c01ce1835b398ac3c1bd11ac1f95a90b501be6a000e8f6d2 SHA512 90d678e08ca93be30ace986a60aba4c4a81a58d7c56d34863aca70f91efe92480299970aa7eb158e3f8c4878b1ea3303aa0afabfc8c7782bc78f7f63b90b4f9a
 DIST rspec-support-3.9.0-git.tgz 69705 BLAKE2B 96d5cea9c63e6ec2acdbbfc4b7253acc26dbf5202c3bafc4a461123380db7d56958d2bbc787eaf3f1c480801441f6a134e1f29b1d3ce23b1bd3225fe4d8f37a5 SHA512 10e8fa4af59097891219f00e2ced5940e7a5bc67d946fbd348683d2246a4a491e62f7bac6bb757e14d82bb0ba970fe5633609ca4ab2c97c4900719b8004cf4b5
--- a/dev-ruby/rspec-support/rspec-support-3.10.1.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.10.1.ebuild
@ -0,0 +1,51 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 USE_RUBY="ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
 inherit ruby-fakegem
 DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
 HOMEPAGE="https://github.com/rspec/rspec-support"
 SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 LICENSE="MIT"
 SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_bdepend "test? ( >=dev-ruby/rspec-3.9.0:3 >=dev-ruby/thread_order-1.1.0 )"
 all_ruby_prepare() {
 	sed -i -e '/git ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
 	# Remove spec that, by following symlinks, tries to scan pretty much
 	# the whole filesystem.
 	rm spec/rspec/support/caller_filter_spec.rb || die
 	# Avoid spec that requires a dependency on git
 	sed -i -e '/library wide checks/,/]/ s:^:#:' spec/rspec/support_spec.rb || die
 	# Avoid a spec requiring a specific locale
 	sed -i -e '/copes with encoded strings/ s/RSpec::Support::OS.windows?/true/' spec/rspec/support/differ_spec.rb || die
 	# Avoid a brittle spec depending on ruby implementation details
 	# should be fixed upstream in next version
 	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
 }
 each_ruby_prepare() {
 	# Use the ruby version being tested
 	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
 }
 each_ruby_test() {
 	RUBYLIB=lib ${RUBY} -S rspec spec || die
 }
--- a/dev-ruby/ruby-oembed/Manifest
+++ b/dev-ruby/ruby-oembed/Manifest
@ -1,2 +1,3 @@
 DIST ruby-oembed-0.13.1.gem 4509184 BLAKE2B 212cdb606a1155349c23c1c06f25fedbcc2436dc22a52c8f405b63e27457881617b41d79db15e92e5caac8094c7a9ea912f1b16d994448f5296d3c6117062f17 SHA512 d87f65f1d76d485488c81d4fa2b2df5580a03104a16e3af5e65e6987f4652b3f5652ebcb0a79eab882ef0e5cc9c7b35537032a849de7b848b609f13ca3b83dd8
 DIST ruby-oembed-0.14.0.gem 4510208 BLAKE2B c27df5f0cb48e64b754ecbf526dbb82efff66401ca28a9a45243c5e78397a114203a1a997545055fe2ef45c49bfcdc2005540af9b35b97b8f278e8a173211218 SHA512 101a9f8a35bfa5cd5fb7ecab1f8ee8b616286d6d880506c936ec20fb1749bc6c4ed7c61ebd9ea2247017567ca7e885dc9d83b38f3c55ed9e97a1b7cbe7e53d29
 DIST ruby-oembed-0.14.1.gem 4511232 BLAKE2B 7cb0bdd437c774dd87f4b4ca5234239a52b53cd1720eac6dc8cea75b792fdb55e4cb51c17e96498a4f62ce6b7cc078b7d92085b1ac59223bf8328209b6a071c4 SHA512 8cb9d74ece3879e8c1889df276f99173a35876f2e45b0786e698588ee3f4cc6a63195e0e42501fb3ccc9cee75dd3aeb4558a396a03cf9c4e215a2cf7baebaf2f
--- a/dev-ruby/ruby-oembed/ruby-oembed-0.14.1.ebuild
+++ b/dev-ruby/ruby-oembed/ruby-oembed-0.14.1.ebuild
@ -0,0 +1,37 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 USE_RUBY="ruby25 ruby26"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
 inherit ruby-fakegem
 DESCRIPTION="An oEmbed consumer library written in Ruby."
 HOMEPAGE="https://github.com/judofyr/ruby-oembed"
 LICENSE="MIT"
 KEYWORDS="~amd64"
 SLOT="0"
 IUSE="test"
 ruby_add_bdepend "test?
 	(
 		dev-ruby/json
 		dev-ruby/vcr:5
 		dev-ruby/xml-simple
 		dev-ruby/nokogiri
 		dev-ruby/webmock:3
 	)"
 all_ruby_prepare() {
 	# Remove bundler but keep vcr version requirement
 	rm -f Gemfile || die
 	sed -i -e '1igem "vcr", "~> 5.0"' spec/spec_helper.rb || die
 	# Avoid development dependencies
 	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
 }
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@ -1,2 +1 @@
 DIST sinatra-2.0.8.1.tar.gz 507102 BLAKE2B 7b88f50b2b2960c17aaa4f0ffbffaf70ece16c1bb29b3ee4706904ebc8e779ad84058ca49ae7cea28f86e635eb9b10ab6f5d94c6eeb4de72637bf5b74d4cac42 SHA512 c6c166e14f2be53cda18263121876ca191c670e12c2c42abb10d0f4a0d8db2916210a6775ef894cf00201c445cd185e5f13c5cd8a1ab0e78e12faa6cb51ee69b
 DIST sinatra-2.1.0.tar.gz 511138 BLAKE2B 05eea600695abf6ee9b2ef0eb2a215c106ac45a343a60017f2cdf8aba8733c1ba5c55235a9c35a4665659797754f78e28d6b8fb1e24391e99a2336ee150bacff SHA512 7127593bd44a5648407631f05d5db04100db30ae862c37e22dc264025fe271336c25df3c47839e41ba200da98be6c7b985852cd53d494a8bbda90fe701a89fe0
--- a/dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild
+++ b/dev-ruby/sinatra/sinatra-2.0.8.1-r1.ebuild
@ -1,34 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_TASK_TEST="test:core"
 RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
 RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
 inherit ruby-fakegem
 DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
 HOMEPAGE="http://www.sinatrarb.com/"
 SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="2"
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
 IUSE=""
 ruby_add_rdepend "
 	dev-ruby/mustermann:1
 	|| ( dev-ruby/rack:2.1 dev-ruby/rack:2.0 )
 	~dev-ruby/rack-protection-${PV}
 	dev-ruby/tilt:2"
 ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder dev-ruby/activesupport )"
 ruby_add_bdepend "doc? ( dev-ruby/yard )"
 all_ruby_prepare() {
 	sed -i -e '1igem "rack", "<2.2"' test/helper.rb || die
 }
--- a/dev-ruby/sinatra/sinatra-2.0.8.1.ebuild
+++ b/dev-ruby/sinatra/sinatra-2.0.8.1.ebuild
@ -1,30 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 RUBY_FAKEGEM_TASK_TEST="test:core"
 RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
 RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
 inherit ruby-fakegem
 DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
 HOMEPAGE="http://www.sinatrarb.com/"
 SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="2"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 ruby_add_rdepend "
 	dev-ruby/mustermann:1
 	dev-ruby/rack:2.0
 	~dev-ruby/rack-protection-${PV}
 	dev-ruby/tilt:2"
 ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder dev-ruby/activesupport )"
 ruby_add_bdepend "doc? ( dev-ruby/yard )"
--- a/dev-ruby/sinatra/sinatra-2.1.0.ebuild
+++ b/dev-ruby/sinatra/sinatra-2.1.0.ebuild
@ -18,7 +18,7 @@ SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 ruby_add_rdepend "
--- a/dev-ruby/stringex/stringex-2.8.5.ebuild
+++ b/dev-ruby/stringex/stringex-2.8.5.ebuild
@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
--- a/dev-ruby/syntax/syntax-1.2.2.ebuild
+++ b/dev-ruby/syntax/syntax-1.2.2.ebuild
@ -3,7 +3,7 @@
 EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@ -4,3 +4,4 @@ DIST test-unit-3.3.5.gem 133120 BLAKE2B 8a799d05fc25a11421eb2385b435de5fc53ffdbf
 DIST test-unit-3.3.6.gem 133120 BLAKE2B bbe79ee41f1e25b49099eb00c8c72dcdafd1b7cbae723c1b78240da000f433877790549c6b0503f654f28d86c87bb125578a6d87b41e8b0a28caba87dad1477c SHA512 af8a632117410b486920e77a5bf91afb774a548166ca5cdb2bdeac6c995bf2da6206d2b00e6904024e5e9bf0f68edf9872192faa471297e64c5d4bd4c554fae3
 DIST test-unit-3.3.7.gem 121856 BLAKE2B 507c9c538e89156d620b229e0144258def17975d41fa569178bb0c47761d5afdfd6cc8a99e3255e72df7a3eeeb65358faf1ed81571c12242559990762a09f69c SHA512 42419c947433330f06d68a26dc2c5e8309658d75aac44f6e391e02085eae1819937fa3ba86e86231dfca91e8de86252b7bc79dc5ffa1e1fb8b0f0ec9074a0056
 DIST test-unit-3.3.8.gem 121856 BLAKE2B f47ef205c566fc404d7ffb9380502ae18224c395f65e3ab663472ec4874d0e77b0cb13a5ba80525965ff340c3941168773d6ceca6891036a8ec57bfcaa4ffbd8 SHA512 fba6a7ab4c87c07950498a372a21f888d87f1e1b0e5b49deb97aab4e2815fb85b979aa8afc6e8a6c4a9ad648371f1d9de968958350d0ecab10dfdd2bc0a2c112
 DIST test-unit-3.3.9.gem 121856 BLAKE2B f8ac1568aabc7d53c79715c6b141d3f2be0782e35dda36fc6184e7b7bbae419e883b94f163333e4e1a186c07f55cef181a2d86d4531e3968667e8c5fcfe8e36c SHA512 8e2a1516d33811793aacbf0b31b9609b43437ea6800cfe6c97b1c96395a8eea7c42f2788dd86b6decfda184a27e5818646bbe313d39ce3799a0869f62a0c4c32
--- a/dev-ruby/test-unit/test-unit-3.3.9.ebuild
+++ b/dev-ruby/test-unit/test-unit-3.3.9.ebuild
@ -0,0 +1,33 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 RUBY_FAKEGEM_EXTRADOC="README.md doc-install/text/*.md"
 inherit ruby-fakegem
 DESCRIPTION="An xUnit family unit testing framework for Ruby"
 HOMEPAGE="https://rubygems.org/gems/test-unit"
 LICENSE="|| ( Ruby GPL-2 ) PSF-2"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 ruby_add_rdepend "dev-ruby/power_assert"
 all_ruby_prepare() {
 	mv doc doc-install || die "moving doc directory out of the way failed"
 }
 each_ruby_test() {
 	${RUBY} test/run-test.rb || die "testsuite failed"
 }
 all_ruby_install() {
 	all_fakegem_install
 	newbin "${FILESDIR}"/testrb-3 testrb-2
 }
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@ -1,2 +1,3 @@
 DIST yard-0.9.20-git.tgz 921130 BLAKE2B 37b1b2524147a1a8cb36c3835cce4e7666e2c8d3d5c187eb402000fb251df64111c4f104957ac9d28bd0e8d9328eb1d97571337ae54479626dcaab3cf07625a6 SHA512 b7e035a3598c8ef32fcbaae57254c0fb0cba875606b434571da2ef754f3171b5c42a4b3a45bd4bf41bce368f6fb7e448567f601a9cab5fbdae695bbec1b73608
 DIST yard-0.9.25-git.tgz 930253 BLAKE2B 35531a7e90ab99bad8d236ea4774a8aebc50eff5d78f60e2dfea8edb2af965dc60e8c02f8a1f95166e80d6f1ce21aca051b92b2511b88a7d87d2cc90e58bcd17 SHA512 855bf05ce45a965d534191b036831ec1cedc848e21196ed93cc7984d744328d9d5ba39664b4539a707a1556984990360cd27e085b830501ac8d72c6cebb3e689
 DIST yard-0.9.26-git.tgz 930901 BLAKE2B 19baaefc54269bbc7eee053b42f2be85644a062cbf55b0fafb63748876aad3a3143767855f4ee7b10a1ae814110a6cf63c01e4055e054aeb31bf8512e793d80d SHA512 0f70a089d5e5ba33e326b0ae0cc84a2cacfc5a3f3080545d5fc5bb324dedbbbf65116cc9412b3496c09b2b6c15514e854a741a1fd7e2ae782804d6e4ac28fcd9
--- a/dev-ruby/yard/yard-0.9.26.ebuild
+++ b/dev-ruby/yard/yard-0.9.26.ebuild
@ -0,0 +1,58 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 USE_RUBY="ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC="yard"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 RUBY_FAKEGEM_DOCDIR="doc docs"
 RUBY_FAKEGEM_EXTRAINSTALL="templates"
 RUBY_FAKEGEM_GEMSPEC="yard.gemspec"
 inherit ruby-fakegem
 DESCRIPTION="Documentation generation tool for the Ruby programming language"
 HOMEPAGE="https://yardoc.org/"
 # The gem lakes the gemspec file needed to pass tests.
 SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 ruby_add_bdepend "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
 ruby_add_bdepend "test? ( dev-ruby/rack )"
 all_ruby_prepare() {
 	sed -i -e '/[Bb]undler/ s:^:#:' spec/spec_helper.rb || die
 	sed -i -e '/samus/I s:^:#:' Rakefile || die
 	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
 	# Avoid specs that make assumptions on load ordering that are not
 	# true for us. This may be related to how we install in Gentoo. This
 	# also drops a test requirement on dev-ruby/rack.
 	rm -f spec/cli/server_spec.rb || die
 	# Avoid specs that only work with bundler
 	sed -i -e '/#initialize/,/^  end/ s:^:#:' spec/cli/yri_spec.rb || die
 	sed -e '/overwrites options with data in/askip "wrong assumptions on file access"' \
 		-e '/loads any gem plugins starting with/askip "wrong assumptions on file access"' \
 		-i spec/config_spec.rb || die
 	# Avoid redcarpet-specific spec that is not optional
 	sed -i -e '/autolinks URLs/askip "make redcarpet optional"' spec/templates/helpers/html_helper_spec.rb || die
 	# Avoid asciidoc-specific spec that is not optional
 	sed -i -e '/\(AsciiDoc specific\|AsciiDoc header\)/askip "skipping asciidoc test"' spec/templates/helpers/html_helper_spec.rb || die
 }
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
--- a/dev-scheme/guile-json/Manifest
+++ b/dev-scheme/guile-json/Manifest
@ -1 +1,2 @@
 DIST guile-json-4.4.0.tar.gz 157157 BLAKE2B 1fafbfeb2fc8cf643c9a4daced12dbbc8976eee82041530aa0c86a6ee3b1665539ff911624dc8c2eb1d5b60d7390b9a6f07801f66b6862a173baf903420560bd SHA512 42629a4b68b83927edb71e5ae3871f9d83765dd04158c061a776e1dc6bedfc2298d0d7659e7c460a67c077a2b8423bd65529bd57f4093713cbe488d15cfcd304
 DIST guile-json-4.4.1.tar.gz 158009 BLAKE2B a08a9e52fbccbc2dc8ad18bfd07ab37ab914cb8f3287331ea29ef76a234afc906b78c15775114b3d13187e0ad8a986379fcce43461119738b307e982f58c4b5a SHA512 c204b69f17b022c300f8edbbf9c800d02b7b82eea0064fdcd52b01b325e3d5f36caa64841bba7218e8d71748db60a3233be5f25ce28914cf71f5ac93826c3c88
--- a/dev-scheme/guile-json/guile-json-4.4.1.ebuild
+++ b/dev-scheme/guile-json/guile-json-4.4.1.ebuild
@ -0,0 +1,27 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DESCRIPTION="JSON module for Guile"
 HOMEPAGE="https://savannah.nongnu.org/projects/guile-json/"
 SRC_URI="http://download.savannah.nongnu.org/releases/guile-json/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND=">=dev-scheme/guile-2.0.0"
 DEPEND="${RDEPEND}"
 # guile generates ELF files without use of C or machine code
 # It's a portage's false positive. bug #677600
 QA_FLAGS_IGNORED='.*[.]go'
 src_prepare() {
 	default
 	# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112
 	find "${S}" -name "*.scm" -exec touch {} + || die
 }
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.20.1.ebuild
@ -18,7 +18,7 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="knots"
 DEPEND="
--- a/dev-util/clazy/clazy-1.8.ebuild
+++ b/dev-util/clazy/clazy-1.8.ebuild
@ -12,7 +12,7 @@ S="${WORKDIR}"
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 arm64 ~x86"
+KEYWORDS="amd64 arm64 ~x86"
 IUSE=""
 RDEPEND="
--- a/dev-util/colm/colm-0.13.0.7.ebuild
+++ b/dev-util/colm/colm-0.13.0.7.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://www.colm.net/files/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 BDEPEND="app-text/asciidoc"
--- a/dev-util/ragel/ragel-7.0.0.12.ebuild
+++ b/dev-util/ragel/ragel-7.0.0.12.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://www.colm.net/files/ragel/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="vim-syntax"
 DEPEND="~dev-util/colm-0.13.0.7"
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
--- a/eclass/kernel-2.eclass
+++ b/eclass/kernel-2.eclass
@ -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
 # @ECLASS: kernel-2.eclass
@ -53,10 +53,10 @@
 # @ECLASS-VARIABLE: K_PREPATCHED
 # @DEFAULT_UNSET
 # @DESCRIPTION:
-# if the patchset is prepatched (ie: mm-sources,
+# if the patchset is prepatched (ie: pf-sources,
-# ck-sources, ac-sources) it will use PR (ie: -r5) as
+# zen-sources etc) it will use PR (ie: -r5) as the
-# the patchset version for
+# patchset version for and not use it as a true package
-# and not use it as a true package revision
+# revision
 # @ECLASS-VARIABLE:  K_EXTRAEINFO
 # @DEFAULT_UNSET
--- a/games-util/Manifest.gz
+++ b/games-util/Manifest.gz
--- a/games-util/gamemode/gamemode-1.6.ebuild
+++ b/games-util/gamemode/gamemode-1.6.ebuild
@ -45,8 +45,7 @@ DOCS=(
 pkg_pretend() {
 	elog
 	elog "GameMode needs a kernel capable of SCHED_ISO to use its soft realtime"
-	elog "feature. Examples of kernels providing that are sys-kernel/ck-sources"
+	elog "feature. Example of a kernel providing that is sys-kernel/pf-sources."
 	elog "and sys-kernel/pf-sources."
 	elog
 	elog "Support for soft realtime is completely optional. It may provide the"
 	elog "following benefits with systems having at least four CPU cores:"
--- a/games-util/gamemode/gamemode-9999.ebuild
+++ b/games-util/gamemode/gamemode-9999.ebuild
@ -45,8 +45,7 @@ DOCS=(
 pkg_pretend() {
 	elog
 	elog "GameMode needs a kernel capable of SCHED_ISO to use its soft realtime"
-	elog "feature. Examples of kernels providing that are sys-kernel/ck-sources"
+	elog "feature. Example of a kernel providing that is sys-kernel/pf-sources."
 	elog "and sys-kernel/pf-sources."
 	elog
 	elog "Support for soft realtime is completely optional. It may provide the"
 	elog "following benefits with systems having at least four CPU cores:"
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
--- a/kde-misc/krename/krename-5.0.1-r1.ebuild
+++ b/kde-misc/krename/krename-5.0.1-r1.ebuild
@ -13,7 +13,7 @@ HOMEPAGE="https://apps.kde.org/en/krename https://userbase.kde.org/KRename"
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 LICENSE="GPL-2"
--- a/kde-misc/tellico/tellico-3.3.4-r1.ebuild
+++ b/kde-misc/tellico/tellico-3.3.4-r1.ebuild
@ -14,7 +14,7 @@ HOMEPAGE="https://tellico-project.org/"
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="https://tellico-project.org/files/${P}.tar.xz
 		https://dev.gentoo.org/~asturm/distfiles/${P}-no-khtml.patch.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm64 ~x86"
 fi
 LICENSE="|| ( GPL-2 GPL-3 )"
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@ -1,4 +1,2 @@
 DIST postfix-3.5.6.tar.gz 4613310 BLAKE2B b7d236677cc698bb7028b39a25441c1163e65112573756da6c17b3ef64d0917f86fdcb96ab4a20f13ccee0381420301b57e1e41c3fad11d28c7ad70bd2e1f7e3 SHA512 9187981357a3861d735b8601c61851a5b9e53cde5668a0ebc62ca8b922a2629e53fe3369af6beb9df1a6fe6d4d87822d8882e27410a460ea8c98418b17287b9c
 DIST postfix-3.5.7.tar.gz 4613756 BLAKE2B 9fa7de3e6d7d20c549c6f26d77d9a0973e789f1b6650a13be08ddc35d047b0ba6e7e75dcb5749e0772cd1e821a9e2f40891c0422bc47a90be166cc937050bc52 SHA512 7828210bc9d3eadfd47f1121ae2f7ca057e03391048e8e79fbf2f96f6677f5e17145f5869d6f5c0b735ecd8584f420df7ba4922f54686f1a5be663bff257f2c2
 DIST postfix-3.5.8.tar.gz 4614733 BLAKE2B 13166e854f70987f981bb5e7e5dabfaa73b3170ab16fc1ff8f70f6b98a0697ac980bdf74bbfb39fdfd1972f922a31a28882b1575b79fd8f01d81e08e68d756bc SHA512 0abb07d99e343b76e6a26b4a090af9d592f4dfd03c8c737cc72bfb0f4267dafcbb0cb0aa7b6255f8b834c9289d89a5c47b167be3758239309937cb77e0d9464b
 DIST postfix-3.6-20201212.tar.gz 4683741 BLAKE2B 9c6f1e4488c955d5760cd921a546e2f2add363c70fbca7aede45721bfb16f00dc246ad887945054f0e047c49c17a5d4390a826ca4d357c452390e1da88366397 SHA512 2473a5542189a7973a8cdb767552c1cc819607674c0bf29358adef5fd8d7b19010bd4af62e24f061c5deed8feb787962f4827ceb6958bf93437f179332cdeb83
--- a/mail-mta/postfix/postfix-3.5.6.ebuild
+++ b/mail-mta/postfix/postfix-3.5.6.ebuild
@ -1,316 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit flag-o-matic pam systemd toolchain-funcs
 MY_PV="${PV/_rc/-RC}"
 MY_SRC="${PN}-${MY_PV}"
 MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
 RC_VER="2.7"
 DESCRIPTION="A fast and secure drop-in replacement for sendmail"
 HOMEPAGE="http://www.postfix.org/"
 SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
 IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 DEPEND=">=dev-libs/libpcre-3.4
 	dev-lang/perl
 	berkdb? ( >=sys-libs/db-3.2:* )
 	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
 	eai? ( dev-libs/icu:= )
 	ldap? ( net-nds/openldap )
 	ldap-bind? ( net-nds/openldap[sasl] )
 	lmdb? ( >=dev-db/lmdb-0.9.11 )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nis? ( net-libs/libnsl )
 	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:* )
 	sasl? (  >=dev-libs/cyrus-sasl-2 )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( >=dev-libs/libressl-2.9.1:0= )
 	)"
 RDEPEND="${DEPEND}
 	acct-group/postfix
 	acct-group/postdrop
 	acct-user/postfix
 	memcached? ( net-misc/memcached )
 	net-mail/mailbase
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim
 	!mail-mta/mini-qmail
 	!mail-mta/msmtp[mta]
 	!mail-mta/netqmail
 	!mail-mta/nullmailer
 	!mail-mta/qmail-ldap
 	!mail-mta/sendmail
 	!mail-mta/opensmtpd
 	!mail-mta/ssmtp[mta]
 	!net-mail/fastforward
 	selinux? ( sec-policy/selinux-postfix )"
 REQUIRED_USE="ldap-bind? ( ldap sasl )"
 S="${WORKDIR}/${MY_SRC}"
 PATCHES=(
 	"${FILESDIR}/${PN}-libressl-certkey.patch"
 	"${FILESDIR}/${PN}-libressl-server.patch"
 )
 src_prepare() {
 	default
 	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
 		src/util/sys_defs.h || die "sed failed"
 	# change default paths to better comply with portage standard paths
 	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
 }
 src_configure() {
 	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
 	do
 		local AUXLIBS_${name}=""
 	done
 	# Make sure LDFLAGS get passed down to the executables.
 	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
 	AUXLIBS_PCRE="$(pcre-config --libs)"
 	use pam && mylibs="${mylibs} -lpam"
 	if use ldap; then
 		mycc="${mycc} -DHAS_LDAP"
 		AUXLIBS_LDAP="-lldap -llber"
 	fi
 	if use mysql; then
 		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
 		AUXLIBS_MYSQL="$(mysql_config --libs)"
 	fi
 	if use postgres; then
 		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
 		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
 	fi
 	if use sqlite; then
 		mycc="${mycc} -DHAS_SQLITE"
 		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
 	fi
 	if use ssl; then
 		mycc="${mycc} -DUSE_TLS"
 		mylibs="${mylibs} -lssl -lcrypto"
 	fi
 	if use lmdb; then
 		mycc="${mycc} -DHAS_LMDB"
 		AUXLIBS_LMDB="-llmdb -lpthread"
 	fi
 	if ! use eai; then
 		mycc="${mycc} -DNO_EAI"
 	fi
 	# broken. and "in other words, not supported" by upstream.
 	# Use inet_protocols setting in main.cf
 	#if ! use ipv6; then
 	#	mycc="${mycc} -DNO_IPV6"
 	#fi
 	if use sasl; then
 		if use dovecot-sasl; then
 			# Set dovecot as default.
 			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
 		fi
 		if use ldap-bind; then
 			mycc="${mycc} -DUSE_LDAP_SASL"
 		fi
 		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
 		mylibs="${mylibs} -lsasl2"
 	elif use dovecot-sasl; then
 		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
 	fi
 	if ! use nis; then
 		mycc="${mycc} -DNO_NIS"
 	fi
 	if ! use berkdb; then
 		mycc="${mycc} -DNO_DB"
 		if use cdb; then
 			# change default hash format from Berkeley DB to cdb
 			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
 		fi
 	fi
 	if use cdb; then
 		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
 		# Tinycdb is preferred.
 		if has_version dev-db/tinycdb ; then
 			einfo "Building with dev-db/tinycdb"
 			AUXLIBS_CDB="-lcdb"
 		else
 			einfo "Building with dev-db/cdb"
 			CDB_PATH="/usr/$(get_libdir)"
 			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
 				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
 			done
 		fi
 	fi
 	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
 	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
 	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
 	filter-lfs-flags
 	# Workaround for bug #76512
 	if use hardened; then
 		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
 	fi
 	# Remove annoying C++ comment style warnings - bug #378099
 	append-flags -Wno-comment
 	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
 	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
 	emake makefiles shared=yes dynamicmaps=no pie=yes \
 		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
 		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
 		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
 		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
 		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
 		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
 }
 src_install() {
 	LD_LIBRARY_PATH="${S}/lib" \
 	/bin/sh postfix-install \
 		-non-interactive \
 		install_root="${D}" \
 		config_directory="/etc/postfix" \
 		manpage_directory="/usr/share/man" \
 		command_directory="/usr/sbin" \
 		mailq_path="/usr/bin/mailq" \
 		newaliases_path="/usr/bin/newaliases" \
 		sendmail_path="/usr/sbin/sendmail" \
 		|| die "postfix-install failed"
 	# Fix spool removal on upgrade
 	rm -Rf "${D}"/var
 	keepdir /var/spool/postfix
 	# Install rmail for UUCP, closes bug #19127
 	dobin auxiliary/rmail/rmail
 	# Provide another link for legacy FSH
 	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
 	# Install qshape, posttls-finger and collate
 	dobin auxiliary/qshape/qshape.pl
 	doman man/man1/qshape.1
 	dobin bin/posttls-finger
 	doman man/man1/posttls-finger.1
 	dobin auxiliary/collate/collate.pl
 	newdoc auxiliary/collate/README README.collate
 	# Performance tuning tools and their manuals
 	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
 	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
 	# Set proper permissions on required files/directories
 	keepdir /var/lib/postfix
 	fowners -R postfix:postfix /var/lib/postfix
 	fperms 0750 /var/lib/postfix
 	fowners root:postdrop /usr/sbin/post{drop,queue}
 	fperms 02755 /usr/sbin/post{drop,queue}
 	keepdir /etc/postfix
 	keepdir /etc/postfix/postfix-files.d
 	if use mbox; then
 		mypostconf="mail_spool_directory=/var/spool/mail"
 	else
 		mypostconf="home_mailbox=.maildir/"
 	fi
 	LD_LIBRARY_PATH="${S}/lib" \
 	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
 		-e ${mypostconf} || die "postconf failed"
 	insinto /etc/postfix
 	newins "${FILESDIR}"/smtp.pass saslpass
 	fperms 600 /etc/postfix/saslpass
 	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
 	# do not start mysql/postgres unnecessarily - bug #359913
 	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
 	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
 	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
 	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
 	# postfix set-permissions expects uncompressed man files
 	docompress -x /usr/share/man
 	pamd_mimic_system smtp auth account
 	if use sasl; then
 		insinto /etc/sasl2
 		newins "${FILESDIR}"/smtp.sasl smtpd.conf
 	fi
 	# header files
 	insinto /usr/include/postfix
 	doins include/*.h
 	if has_version mail-mta/postfix; then
 		# let the sysadmin decide when to change the compatibility_level
 		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
 	fi
 	systemd_dounit "${FILESDIR}/${PN}.service"
 }
 pkg_preinst() {
 	if has_version '<mail-mta/postfix-3.4'; then
 		elog
 		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
 		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
 		elog "Before backing out to an older Postfix version, edit the master.cf"
 		elog "file and remove the postlog entry."
 		elog
 	fi
 }
 pkg_postinst() {
 	if [[ ! -e /etc/mail/aliases.db ]] ; then
 		ewarn
 		ewarn "You must edit /etc/mail/aliases to suit your needs"
 		ewarn "and then run /usr/bin/newaliases. Postfix will not"
 		ewarn "work correctly without it."
 		ewarn
 	fi
 	# check and fix file permissions
 	"${EROOT}"/usr/sbin/postfix set-permissions
 	# configure tls
 	if use ssl ; then
 		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
 			elog "To configure client side TLS settings:"
 			elog "${EROOT}"/usr/sbin/postfix tls enable-client
 		fi
 		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
 			elog "To configure server side TLS settings:"
 			elog "${EROOT}"/usr/sbin/postfix tls enable-server
 		fi
 	fi
 }
--- a/mail-mta/postfix/postfix-3.5.7.ebuild
+++ b/mail-mta/postfix/postfix-3.5.7.ebuild
@ -1,316 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit flag-o-matic pam systemd toolchain-funcs
 MY_PV="${PV/_rc/-RC}"
 MY_SRC="${PN}-${MY_PV}"
 MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
 RC_VER="2.7"
 DESCRIPTION="A fast and secure drop-in replacement for sendmail"
 HOMEPAGE="http://www.postfix.org/"
 SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
 LICENSE="|| ( IBM EPL-2.0 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
 DEPEND=">=dev-libs/libpcre-3.4
 	dev-lang/perl
 	berkdb? ( >=sys-libs/db-3.2:* )
 	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
 	eai? ( dev-libs/icu:= )
 	ldap? ( net-nds/openldap )
 	ldap-bind? ( net-nds/openldap[sasl] )
 	lmdb? ( >=dev-db/lmdb-0.9.11 )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	nis? ( net-libs/libnsl )
 	pam? ( sys-libs/pam )
 	postgres? ( dev-db/postgresql:* )
 	sasl? (  >=dev-libs/cyrus-sasl-2 )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( >=dev-libs/libressl-2.9.1:0= )
 	)"
 RDEPEND="${DEPEND}
 	acct-group/postfix
 	acct-group/postdrop
 	acct-user/postfix
 	memcached? ( net-misc/memcached )
 	net-mail/mailbase
 	!mail-mta/courier
 	!mail-mta/esmtp
 	!mail-mta/exim
 	!mail-mta/mini-qmail
 	!mail-mta/msmtp[mta]
 	!mail-mta/netqmail
 	!mail-mta/nullmailer
 	!mail-mta/qmail-ldap
 	!mail-mta/sendmail
 	!mail-mta/opensmtpd
 	!mail-mta/ssmtp[mta]
 	!net-mail/fastforward
 	selinux? ( sec-policy/selinux-postfix )"
 REQUIRED_USE="ldap-bind? ( ldap sasl )"
 S="${WORKDIR}/${MY_SRC}"
 PATCHES=(
 	"${FILESDIR}/${PN}-libressl-certkey.patch"
 	"${FILESDIR}/${PN}-libressl-server.patch"
 )
 src_prepare() {
 	default
 	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
 		src/util/sys_defs.h || die "sed failed"
 	# change default paths to better comply with portage standard paths
 	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
 }
 src_configure() {
 	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
 	do
 		local AUXLIBS_${name}=""
 	done
 	# Make sure LDFLAGS get passed down to the executables.
 	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
 	AUXLIBS_PCRE="$(pcre-config --libs)"
 	use pam && mylibs="${mylibs} -lpam"
 	if use ldap; then
 		mycc="${mycc} -DHAS_LDAP"
 		AUXLIBS_LDAP="-lldap -llber"
 	fi
 	if use mysql; then
 		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
 		AUXLIBS_MYSQL="$(mysql_config --libs)"
 	fi
 	if use postgres; then
 		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
 		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
 	fi
 	if use sqlite; then
 		mycc="${mycc} -DHAS_SQLITE"
 		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
 	fi
 	if use ssl; then
 		mycc="${mycc} -DUSE_TLS"
 		mylibs="${mylibs} -lssl -lcrypto"
 	fi
 	if use lmdb; then
 		mycc="${mycc} -DHAS_LMDB"
 		AUXLIBS_LMDB="-llmdb -lpthread"
 	fi
 	if ! use eai; then
 		mycc="${mycc} -DNO_EAI"
 	fi
 	# broken. and "in other words, not supported" by upstream.
 	# Use inet_protocols setting in main.cf
 	#if ! use ipv6; then
 	#	mycc="${mycc} -DNO_IPV6"
 	#fi
 	if use sasl; then
 		if use dovecot-sasl; then
 			# Set dovecot as default.
 			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
 		fi
 		if use ldap-bind; then
 			mycc="${mycc} -DUSE_LDAP_SASL"
 		fi
 		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
 		mylibs="${mylibs} -lsasl2"
 	elif use dovecot-sasl; then
 		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
 	fi
 	if ! use nis; then
 		mycc="${mycc} -DNO_NIS"
 	fi
 	if ! use berkdb; then
 		mycc="${mycc} -DNO_DB"
 		if use cdb; then
 			# change default hash format from Berkeley DB to cdb
 			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
 		fi
 	fi
 	if use cdb; then
 		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
 		# Tinycdb is preferred.
 		if has_version dev-db/tinycdb ; then
 			einfo "Building with dev-db/tinycdb"
 			AUXLIBS_CDB="-lcdb"
 		else
 			einfo "Building with dev-db/cdb"
 			CDB_PATH="/usr/$(get_libdir)"
 			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
 				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
 			done
 		fi
 	fi
 	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
 	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
 	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
 	filter-lfs-flags
 	# Workaround for bug #76512
 	if use hardened; then
 		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
 	fi
 	# Remove annoying C++ comment style warnings - bug #378099
 	append-flags -Wno-comment
 	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
 	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
 	emake makefiles shared=yes dynamicmaps=no pie=yes \
 		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
 		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
 		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
 		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
 		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
 		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
 }
 src_install() {
 	LD_LIBRARY_PATH="${S}/lib" \
 	/bin/sh postfix-install \
 		-non-interactive \
 		install_root="${D}" \
 		config_directory="/etc/postfix" \
 		manpage_directory="/usr/share/man" \
 		command_directory="/usr/sbin" \
 		mailq_path="/usr/bin/mailq" \
 		newaliases_path="/usr/bin/newaliases" \
 		sendmail_path="/usr/sbin/sendmail" \
 		|| die "postfix-install failed"
 	# Fix spool removal on upgrade
 	rm -Rf "${D}"/var
 	keepdir /var/spool/postfix
 	# Install rmail for UUCP, closes bug #19127
 	dobin auxiliary/rmail/rmail
 	# Provide another link for legacy FSH
 	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
 	# Install qshape, posttls-finger and collate
 	dobin auxiliary/qshape/qshape.pl
 	doman man/man1/qshape.1
 	dobin bin/posttls-finger
 	doman man/man1/posttls-finger.1
 	dobin auxiliary/collate/collate.pl
 	newdoc auxiliary/collate/README README.collate
 	# Performance tuning tools and their manuals
 	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
 	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
 	# Set proper permissions on required files/directories
 	keepdir /var/lib/postfix
 	fowners -R postfix:postfix /var/lib/postfix
 	fperms 0750 /var/lib/postfix
 	fowners root:postdrop /usr/sbin/post{drop,queue}
 	fperms 02755 /usr/sbin/post{drop,queue}
 	keepdir /etc/postfix
 	keepdir /etc/postfix/postfix-files.d
 	if use mbox; then
 		mypostconf="mail_spool_directory=/var/spool/mail"
 	else
 		mypostconf="home_mailbox=.maildir/"
 	fi
 	LD_LIBRARY_PATH="${S}/lib" \
 	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
 		-e ${mypostconf} || die "postconf failed"
 	insinto /etc/postfix
 	newins "${FILESDIR}"/smtp.pass saslpass
 	fperms 600 /etc/postfix/saslpass
 	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
 	# do not start mysql/postgres unnecessarily - bug #359913
 	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
 	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
 	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
 	mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
 	# postfix set-permissions expects uncompressed man files
 	docompress -x /usr/share/man
 	pamd_mimic_system smtp auth account
 	if use sasl; then
 		insinto /etc/sasl2
 		newins "${FILESDIR}"/smtp.sasl smtpd.conf
 	fi
 	# header files
 	insinto /usr/include/postfix
 	doins include/*.h
 	if has_version mail-mta/postfix; then
 		# let the sysadmin decide when to change the compatibility_level
 		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
 	fi
 	systemd_dounit "${FILESDIR}/${PN}.service"
 }
 pkg_preinst() {
 	if has_version '<mail-mta/postfix-3.4'; then
 		elog
 		elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
 		elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
 		elog "Before backing out to an older Postfix version, edit the master.cf"
 		elog "file and remove the postlog entry."
 		elog
 	fi
 }
 pkg_postinst() {
 	if [[ ! -e /etc/mail/aliases.db ]] ; then
 		ewarn
 		ewarn "You must edit /etc/mail/aliases to suit your needs"
 		ewarn "and then run /usr/bin/newaliases. Postfix will not"
 		ewarn "work correctly without it."
 		ewarn
 	fi
 	# check and fix file permissions
 	"${EROOT}"/usr/sbin/postfix set-permissions
 	# configure tls
 	if use ssl ; then
 		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
 			elog "To configure client side TLS settings:"
 			elog "${EROOT}"/usr/sbin/postfix tls enable-client
 		fi
 		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
 			elog "To configure server side TLS settings:"
 			elog "${EROOT}"/usr/sbin/postfix tls enable-server
 		fi
 	fi
 }
--- a/media-fonts/Manifest.gz
+++ b/media-fonts/Manifest.gz
--- a/media-fonts/fontawesome/fontawesome-5.15.1.ebuild
+++ b/media-fonts/fontawesome/fontawesome-5.15.1.ebuild
@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FortAwesome/${MY_PN}.git"
 else
 	SRC_URI="https://github.com/FortAwesome/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm arm64 ~ppc64 x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
--- a/media-gfx/slic3r/metadata.xml
+++ b/media-gfx/slic3r/metadata.xml
@ -12,7 +12,8 @@
    <longdescription lang="en">
        Slic3r is the tool you need to convert a 3D model into printing instructions for your 3D printer. It cuts the model into horizontal slices (layers), generates toolpaths to fill them and calculates the amount of material to be extruded.
    </longdescription>
-    <upstream>
+    <upstream >
-        <remote-id type="github">alexrj/Slic3r</remote-id>
+        <bugs-to>https://github.com/slic3r/Slic3r/issues</bugs-to>
        <remote-id type="github">slic3r/Slic3r</remote-id>
    </upstream>
 </pkgmetadata>
--- a/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
+++ b/media-gfx/slic3r/slic3r-1.3.1_pre20200824.ebuild
@ -5,9 +5,11 @@ EAPI=7
 inherit desktop eutils perl-module
 COMMIT="92abbc42dfdd5385c1f9c3a450e2f3da835f8b8d"
 DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)"
 HOMEPAGE="https://slic3r.org"
-SRC_URI="https://github.com/alexrj/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/slic3r/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 LICENSE="AGPL-3 CC-BY-3.0"
 SLOT="0"
@ -15,7 +17,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+gui test"
 RESTRICT="!test? ( test )"
 # check Build.PL for dependencies
 RDEPEND="!=dev-lang/perl-5.16*
 	>=dev-libs/boost-1.55[threads]
 	dev-perl/Class-XSAccessor
@ -103,7 +104,7 @@ src_install() {
 	exeinto "${VENDOR_LIB}"/Slic3r
 	doexe slic3r.pl
-	dosym "${VENDOR_LIB}/Slic3r/slic3r.pl" /usr/bin/slic3r.pl
+	dosym "${VENDOR_LIB}/Slic3r/slic3r.pl" "${EPREFIX}/usr/bin/slic3r.pl"
 	make_desktop_entry "slic3r.pl --gui %F" \
 		Slic3r \
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
--- a/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch
+++ b/media-libs/openjpeg/files/openjpeg-2.4.0-gnuinstalldirs.patch
@ -4,7 +4,7 @@ Date: Thu, 11 Apr 2019 13:10:57 +0200
 Subject: [PATCH] Use GNUInstallDirs for standard installation directories
 Raises minimum cmake version by a little.
- Later rebased by sam@gentoo.org for 2.4.0
+(Later rebased by sam@gentoo.org for 2.4.0)
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -7,7 +7,7 @@
@ -81,7 +81,22 @@ Raises minimum cmake version by a little.
 	option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
 endif()
-@@ -366,14 +335,14 @@ if(BUILD_PKGCONFIG_FILES)
+@@ -342,14 +311,6 @@ install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
 )
 #-----------------------------------------------------------------------------
 -# install CHANGES and LICENSE
 -if(BUILD_DOC)
 -if(EXISTS ${OPENJPEG_SOURCE_DIR}/CHANGES)
 -  install(FILES CHANGES DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
 -endif()
 -
 -install(FILES LICENSE DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
 -endif()
 include (cmake/OpenJPEGCPack.cmake)
@@ -366,14 +327,14 @@ if(BUILD_PKGCONFIG_FILES)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
@ -98,7 +113,7 @@ Raises minimum cmake version by a little.
   endif()
 #
   if(BUILD_JPIP)
-@@ -381,7 +350,7 @@ if(BUILD_PKGCONFIG_FILES)
+@@ -381,7 +342,7 @@ if(BUILD_PKGCONFIG_FILES)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
@ -107,7 +122,7 @@ Raises minimum cmake version by a little.
   endif()
 #
   if(BUILD_JP3D)
-@@ -389,7 +358,7 @@ if(BUILD_PKGCONFIG_FILES)
+@@ -389,7 +350,7 @@ if(BUILD_PKGCONFIG_FILES)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
     ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
   install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
@ -318,7 +333,7 @@ Raises minimum cmake version by a little.
 +mandir=${prefix}/@CMAKE_INSTALL_MANDIR@
 +docdir=${prefix}/@CMAKE_INSTALL_DOCDIR@
 +libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@ 
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@OPENJPEG_INSTALL_SUBDIR@
 Name: openjp3d
 Description: JPEG2000 Extensions for three-dimensional data (Part 10)
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@ -1 +1 @@
-Tue, 29 Dec 2020 06:08:35 +0000
+Tue, 29 Dec 2020 11:38:32 +0000
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@ -1 +1 @@
-Tue, 29 Dec 2020 06:08:35 +0000
+Tue, 29 Dec 2020 11:38:32 +0000
--- a/Show More
+++ b/Show More
`@ -1 +1,2 @@`
	`DIST theano-pymc-1.0.13.tar.gz 12975871 BLAKE2B 71528868885084d7c37f1f5cc5156aca5e764d09f0dc57aa46e21240ee2959aafb5882aef8977d9f215b051265d0d9bc3a7097ac0bb6d427cfc076ea6f591905 SHA512 da25e386965695a5630c54a671a7a573d0f0fae2eeeacf4f65130e4e4caf416373852ac14b1eb07ae39c194febe854d71fffe2adc24c348f64a4b73b43564229`	`DIST theano-pymc-1.0.13.tar.gz 12975871 BLAKE2B 71528868885084d7c37f1f5cc5156aca5e764d09f0dc57aa46e21240ee2959aafb5882aef8977d9f215b051265d0d9bc3a7097ac0bb6d427cfc076ea6f591905 SHA512 da25e386965695a5630c54a671a7a573d0f0fae2eeeacf4f65130e4e4caf416373852ac14b1eb07ae39c194febe854d71fffe2adc24c348f64a4b73b43564229`
		`DIST theano-pymc-1.0.14.tar.gz 12979426 BLAKE2B e6db87a348d6e7003f8b1ff4e0634335d53d734ea922951edeaab06ec54d51f1d7930a03f6dca14979930abb6212f873d606a9adada46d5b606854c5d8a6c6a5 SHA512 4ddfe5978f33cea96b20763cb01eecf1ec6c0c6b97ac892d647e28b607e61b11862739e5836356ab87e2002e992febe35ce9e1e72d37732074be2dbed64b50b9`
`@ -1,2 +1 @@`
	`DIST rack-protection-2.0.8.1.gem 16896 BLAKE2B 013fc8a5ceaadbfde52a7aca0dab8116cb01d6f034f3370d22a09545885a61adef92ad5ed9f82faf4434507a079ff9a0c3781b906ab6aba69fa032216f276fcb SHA512 264aef904d9ae1c38197ad4ad44f1638905bd180fc4bb402c47856c37168059e8e975ca2de5518b1e5cebf79b970024b7d9f5f8b8908880451357dea5e428562`
	`DIST rack-protection-2.1.0.gem 17408 BLAKE2B e4804273d346c76e9e7348bfa9575f16c9d415da9db4e8677782aed70fa613b6f322c82808707734276b8db60fce9d87fbbaac807c1b8df7f6bf1960c76ae244 SHA512 965388584a2cae9065ccc0d041bbd40951f22420f05e657586d710f87ae8f854a0be32c3274b9373f96b5f8eb19354d371e3bce9b2df83c013abfea99f16bded`	`DIST rack-protection-2.1.0.gem 17408 BLAKE2B e4804273d346c76e9e7348bfa9575f16c9d415da9db4e8677782aed70fa613b6f322c82808707734276b8db60fce9d87fbbaac807c1b8df7f6bf1960c76ae244 SHA512 965388584a2cae9065ccc0d041bbd40951f22420f05e657586d710f87ae8f854a0be32c3274b9373f96b5f8eb19354d371e3bce9b2df83c013abfea99f16bded`
`@ -1,2 +1 @@`
	`DIST sinatra-2.0.8.1.tar.gz 507102 BLAKE2B 7b88f50b2b2960c17aaa4f0ffbffaf70ece16c1bb29b3ee4706904ebc8e779ad84058ca49ae7cea28f86e635eb9b10ab6f5d94c6eeb4de72637bf5b74d4cac42 SHA512 c6c166e14f2be53cda18263121876ca191c670e12c2c42abb10d0f4a0d8db2916210a6775ef894cf00201c445cd185e5f13c5cd8a1ab0e78e12faa6cb51ee69b`
	`DIST sinatra-2.1.0.tar.gz 511138 BLAKE2B 05eea600695abf6ee9b2ef0eb2a215c106ac45a343a60017f2cdf8aba8733c1ba5c55235a9c35a4665659797754f78e28d6b8fb1e24391e99a2336ee150bacff SHA512 7127593bd44a5648407631f05d5db04100db30ae862c37e22dc264025fe271336c25df3c47839e41ba200da98be6c7b985852cd53d494a8bbda90fe701a89fe0`	`DIST sinatra-2.1.0.tar.gz 511138 BLAKE2B 05eea600695abf6ee9b2ef0eb2a215c106ac45a343a60017f2cdf8aba8733c1ba5c55235a9c35a4665659797754f78e28d6b8fb1e24391e99a2336ee150bacff SHA512 7127593bd44a5648407631f05d5db04100db30ae862c37e22dc264025fe271336c25df3c47839e41ba200da98be6c7b985852cd53d494a8bbda90fe701a89fe0`
`@ -1 +1,2 @@`
	`DIST guile-json-4.4.0.tar.gz 157157 BLAKE2B 1fafbfeb2fc8cf643c9a4daced12dbbc8976eee82041530aa0c86a6ee3b1665539ff911624dc8c2eb1d5b60d7390b9a6f07801f66b6862a173baf903420560bd SHA512 42629a4b68b83927edb71e5ae3871f9d83765dd04158c061a776e1dc6bedfc2298d0d7659e7c460a67c077a2b8423bd65529bd57f4093713cbe488d15cfcd304`	`DIST guile-json-4.4.0.tar.gz 157157 BLAKE2B 1fafbfeb2fc8cf643c9a4daced12dbbc8976eee82041530aa0c86a6ee3b1665539ff911624dc8c2eb1d5b60d7390b9a6f07801f66b6862a173baf903420560bd SHA512 42629a4b68b83927edb71e5ae3871f9d83765dd04158c061a776e1dc6bedfc2298d0d7659e7c460a67c077a2b8423bd65529bd57f4093713cbe488d15cfcd304`
		`DIST guile-json-4.4.1.tar.gz 158009 BLAKE2B a08a9e52fbccbc2dc8ad18bfd07ab37ab914cb8f3287331ea29ef76a234afc906b78c15775114b3d13187e0ad8a986379fcce43461119738b307e982f58c4b5a SHA512 c204b69f17b022c300f8edbbf9c800d02b7b82eea0064fdcd52b01b325e3d5f36caa64841bba7218e8d71748db60a3233be5f25ce28914cf71f5ac93826c3c88`
`@ -1 +1 @@`
	`Tue, 29 Dec 2020 06:08:35 +0000`	`Tue, 29 Dec 2020 11:38:32 +0000`