Sync with portage [Sat Dec 26 23:09:04 MSK 2020].

3 years ago · 2843b51871
parent 8deb036505
commit 2843b51871
407 changed files with 4139 additions and 4013 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@ -1,2 +1,3 @@
 DIST libarchive-3.4.3.tar.gz 6990533 BLAKE2B 12f97e8e4032daf0fa8f9e1839f9c7ef80fda0b2a0ba703c67d860437fad6a293484a61417f72eff933179d544cfed45083e7886f462276bc6abbce1097e6256 SHA512 d00167dec6e65a0b17b46a1e3bb0242d85716dbc637afd233360cb515b2750dafe0ff0644b9e01ad23534340b405a8551f496c5e39fba9ee99355a515580d65d
 DIST libarchive-3.5.0.tar.gz 7017726 BLAKE2B 651c9e28d1a1b0a6dd2dbd2aefa0a47ba23d5fb5e96c1bc8c059152952c284f089ce16626b9fbc2cbea70dac2d16ab949235bf4c28f38235f23aeb6da3d69f0d SHA512 9a3d4ce9d4bc856c8d85b846d9d0c9f30369393aa107941c202ba0100c6bac009952c92d809e6981276b3bf91e9f37d018e7f1446b17c0c1c316fe5aafe15440
 DIST libarchive-3.5.1.tar.gz 7008338 BLAKE2B 243dfda2bd4582bbc20679328b89aae0c530475c822dcf9ff25c65df2017b8f18bb616142d6ab016ccea4a5aa1b410d46b913c2ee0afefd2fdb1a41cf51585d9 SHA512 08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996
--- a/app-arch/libarchive/libarchive-3.5.1.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.1.ebuild
@ -0,0 +1,141 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit libtool multilib-minimal toolchain-funcs
 DESCRIPTION="Multi-format archive and compression library"
 HOMEPAGE="https://www.libarchive.org/"
 SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
 LICENSE="BSD BSD-2 BSD-4 public-domain"
 SLOT="0/13"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux libressl lz4 +lzma lzo nettle static-libs +threads xattr +zlib zstd"
 RDEPEND="
 	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
 	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
 	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
 	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
 	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
 	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
 	kernel_linux? (
 		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
 	)
 	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
 	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
 	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
 	lzma? ( app-arch/xz-utils[threads=,${MULTILIB_USEDEP}] )
 	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
 	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
 	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
 	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	kernel_linux? (
 		virtual/os-headers
 		e2fsprogs? ( sys-fs/e2fsprogs )
 	)"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.3.3-libressl.patch
 	"${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch  # drop on next release
 )
 src_prepare() {
 	default
 	elibtoolize  # is required for Solaris sol2_ld linker fix
 }
 multilib_src_configure() {
 	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
 	local myconf=(
 		$(use_enable acl)
 		$(use_enable static-libs static)
 		$(use_enable xattr)
 		$(use_with blake2 libb2)
 		$(use_with bzip2 bz2lib)
 		$(use_with expat)
 		$(use_with !expat xml2)
 		$(use_with iconv)
 		$(use_with lz4)
 		$(use_with lzma)
 		$(use_with lzo lzo2)
 		$(use_with nettle)
 		$(use_with zlib)
 		$(use_with zstd)
 		# Windows-specific
 		--without-cng
 	)
 	if multilib_is_native_abi ; then
 		myconf+=(
 			--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
 			--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
 			--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
 		)
 	else
 		myconf+=(
 			--disable-bsdcat
 			--disable-bsdcpio
 			--disable-bsdtar
 		)
 	fi
 	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }
 multilib_src_compile() {
 	if multilib_is_native_abi ; then
 		emake
 	else
 		emake libarchive.la
 	fi
 }
 src_test() {
 	mkdir -p "${T}"/bin || die
 	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
 	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
 	local -x PATH=${T}/bin:${PATH}
 	multilib-minimal_src_test
 }
 multilib_src_test() {
 	# sandbox is breaking long symlink behavior
 	local -x SANDBOX_ON=0
 	local -x LD_PRELOAD=
 	emake check
 }
 multilib_src_install() {
 	if multilib_is_native_abi ; then
 		emake DESTDIR="${D}" install
 		# Create symlinks for FreeBSD
 		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
 			# Exclude cat for the time being #589876
 			for bin in cpio tar; do
 				dosym bsd${bin} /usr/bin/${bin}
 				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
 				doman "${T}"/${bin}.1
 			done
 		fi
 	else
 		local install_targets=(
 			install-includeHEADERS
 			install-libLTLIBRARIES
 			install-pkgconfigDATA
 		)
 		emake DESTDIR="${D}" "${install_targets[@]}"
 	fi
 	# Libs.private: should be used from libarchive.pc instead
 	find "${ED}" -type f -name "*.la" -delete || die
 }
 multilib_src_install_all() {
 	cd "${S}" || die
 	einstalldocs
 }
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@ -1,4 +1,3 @@
 DIST libvirt-6.10.0.tar.xz 8462796 BLAKE2B f1188cc869768682bdcb7ab763465705413ebc4fe418e37d4f5ef6a861507c4104a1844cd533fce905e24847918eba6e4e4f054f66b112e9fb54ee19a3653dfc SHA512 42e77a3542e9f15c3aeaab1639a80ee6539cb0f09a1e8324aa0059a8f6041acf20263a9556ac65c9a7a14693b0756020231085e4556ff54cf8329110018a2485
 DIST libvirt-6.7.0.tar.xz 8362140 BLAKE2B d0afe33fcdaab3cc0f2ea8c552e7550bcece018b049a3b58e5c05ee85b39e2b3ebf42fa1b70ddb1d2a541d1114b6b49734f23a889b3589397a30a672f27a3a56 SHA512 cabfb6aa65a3a1412b0111654ad3a7d0a6dfc63399a892c540ca39ab4e56f87626a067037e4480bb55418a371d2b5e9ac74862c92a3cdea69822ec3d158d769f
 DIST libvirt-6.8.0.tar.xz 8412092 BLAKE2B c118ca6b263054bb6941c62f3d1415f7ed1a3f29a35294272d04bc726643247ee5691e0310a1bf013faeba856d7aadd00a90fe8dbdca6ff4c7eb480e94d92fa2 SHA512 9b69f3dcceb5e40470a78908654faf51b643f6793e556f3115daa4bfe08743af290882dd51f15eb27c38d589eb210d495de7c44a40b363420ab4f4d3a6393cc9
 DIST libvirt-6.9.0.tar.xz 8432360 BLAKE2B 5cf577017158bab3ec5ad55e8e5944f4efd88cb3eb5460355ad0bfc1a30dba5c607b5b3523b8f9095552c494129ccb19bb89a6a0791469d5d47052c2375fa940 SHA512 ca9aed93589e91d383f9a5bddf5ba9fa20b849ba3b302017d625ba4910a0f942d1531006ddeaaa2622d121808105dec6e9bcb0c867f62e2fc546ce043675e175
--- a/app-emulation/libvirt/libvirt-6.7.0.ebuild
+++ b/app-emulation/libvirt/libvirt-6.7.0.ebuild
@ -1,344 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8,9} )
 inherit meson bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
 	SRC_URI=""
 	SLOT="0"
 else
 	SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
 	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	SLOT="0/${PV}"
 fi
 DESCRIPTION="C toolkit to manipulate virtual machines"
 HOMEPAGE="https://www.libvirt.org/"
 LICENSE="LGPL-2.1"
 IUSE="
 	apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
 	iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
 	parted pcap policykit +qemu rbd sasl selinux +udev +vepa
 	virtualbox +virt-network wireshark-plugins xen zfs
 "
 REQUIRED_USE="
 	firewalld? ( virt-network )
 	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
 	lxc? ( caps libvirtd )
 	openvz? ( libvirtd )
 	policykit? ( dbus )
 	qemu? ( libvirtd )
 	vepa? ( macvtap )
 	virt-network? ( libvirtd )
 	virtualbox? ( libvirtd )
 	xen? ( libvirtd )"
 BDEPEND="
 	acct-user/qemu
 	policykit? ( acct-group/libvirt )
 	app-text/xhtml1
 	dev-lang/perl
 	dev-libs/libxslt
 	dev-perl/XML-XPath
 	dev-python/docutils
 	virtual/pkgconfig"
 # gettext.sh command is used by the libvirt command wrappers, and it's
 # non-optional, so put it into RDEPEND.
 # We can use both libnl:1.1 and libnl:3, but if you have both installed, the
 # package will use 3 by default. Since we don't have slot pinning in an API,
 # we must go with the most recent
 RDEPEND="
 	app-misc/scrub
 	>=dev-libs/glib-2.48.0
 	dev-libs/libgcrypt:0
 	dev-libs/libnl:3
 	>=dev-libs/libxml2-2.7.6
 	>=net-analyzer/openbsd-netcat-1.105-r1
 	>=net-libs/gnutls-1.0.25:0=
 	net-libs/libssh2
 	net-libs/libtirpc
 	net-libs/rpcsvc-proto
 	>=net-misc/curl-7.18.0
 	sys-apps/dmidecode
 	sys-devel/gettext
 	sys-libs/ncurses:0=
 	sys-libs/readline:=
 	apparmor? ( sys-libs/libapparmor )
 	audit? ( sys-process/audit )
 	caps? ( sys-libs/libcap-ng )
 	dbus? ( sys-apps/dbus )
 	dtrace? ( dev-util/systemtap )
 	firewalld? ( >=net-firewall/firewalld-0.6.3 )
 	fuse? ( sys-fs/fuse:0= )
 	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
 	iscsi? ( sys-block/open-iscsi )
 	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
 	libssh? ( net-libs/libssh )
 	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
 	nfs? ( net-fs/nfs-utils )
 	numa? (
 		>sys-process/numactl-2.0.2
 		sys-process/numad
 	)
 	parted? (
 		>=sys-block/parted-1.8[device-mapper]
 		sys-fs/lvm2[-device-mapper-only(-)]
 	)
 	pcap? ( >=net-libs/libpcap-1.0.0 )
 	policykit? ( >=sys-auth/polkit-0.9 )
 	qemu? (
 		>=app-emulation/qemu-1.5.0
 		dev-libs/yajl
 	)
 	rbd? ( sys-cluster/ceph )
 	sasl? ( dev-libs/cyrus-sasl )
 	selinux? ( >=sys-libs/libselinux-2.0.85 )
 	virt-network? (
 		net-dns/dnsmasq[script]
 		net-firewall/ebtables
 		>=net-firewall/iptables-1.4.10[ipv6]
 		net-misc/radvd
 		sys-apps/iproute2[-minimal]
 	)
 	wireshark-plugins? ( net-analyzer/wireshark:= )
 	xen? (
 		>=app-emulation/xen-4.6.0
 		app-emulation/xen-tools:=
 	)
 	udev? (
 		virtual/libudev
 		>=x11-libs/libpciaccess-0.10.9
 	)
 	zfs? ( sys-fs/zfs )"
 DEPEND="${BDEPEND}
 	${RDEPEND}
 	${PYTHON_DEPS}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
 	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
 	"${FILESDIR}"/${PN}-6.7.0-doc-path.patch
 	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
 )
 pkg_setup() {
 	# Check kernel configuration:
 	CONFIG_CHECK=""
 	use fuse && CONFIG_CHECK+="
 		~FUSE_FS"
 	use lvm && CONFIG_CHECK+="
 		~BLK_DEV_DM
 		~DM_MULTIPATH
 		~DM_SNAPSHOT"
 	use lxc && CONFIG_CHECK+="
 		~BLK_CGROUP
 		~CGROUP_CPUACCT
 		~CGROUP_DEVICE
 		~CGROUP_FREEZER
 		~CGROUP_NET_PRIO
 		~CGROUP_PERF
 		~CGROUPS
 		~CGROUP_SCHED
 		~CPUSETS
 		~IPC_NS
 		~MACVLAN
 		~NAMESPACES
 		~NET_CLS_CGROUP
 		~NET_NS
 		~PID_NS
 		~POSIX_MQUEUE
 		~SECURITYFS
 		~USER_NS
 		~UTS_NS
 		~VETH
 		~!GRKERNSEC_CHROOT_MOUNT
 		~!GRKERNSEC_CHROOT_DOUBLE
 		~!GRKERNSEC_CHROOT_PIVOT
 		~!GRKERNSEC_CHROOT_CHMOD
 		~!GRKERNSEC_CHROOT_CAPS"
 	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
 		~DEVPTS_MULTIPLE_INSTANCES"
 	use macvtap && CONFIG_CHECK+="
 		~MACVTAP"
 	use virt-network && CONFIG_CHECK+="
 		~BRIDGE_EBT_MARK_T
 		~BRIDGE_NF_EBTABLES
 		~NETFILTER_ADVANCED
 		~NETFILTER_XT_CONNMARK
 		~NETFILTER_XT_MARK
 		~NETFILTER_XT_TARGET_CHECKSUM
 		~IP_NF_FILTER
 		~IP_NF_MANGLE
 		~IP_NF_NAT
 		~IP_NF_TARGET_MASQUERADE
 		~IP6_NF_FILTER
 		~IP6_NF_MANGLE
 		~IP6_NF_NAT"
 	# Bandwidth Limiting Support
 	use virt-network && CONFIG_CHECK+="
 		~BRIDGE_EBT_T_NAT
 		~IP_NF_TARGET_REJECT
 		~NET_ACT_POLICE
 		~NET_CLS_FW
 		~NET_CLS_U32
 		~NET_SCH_HTB
 		~NET_SCH_INGRESS
 		~NET_SCH_SFQ"
 	# Handle specific kernel versions for different features
 	kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
 	if kernel_is ge 3 6; then
 		CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
 		kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
 	fi
 	ERROR_USER_NS="Optional depending on LXC configuration."
 	if [[ -n ${CONFIG_CHECK} ]]; then
 		linux-info_pkg_setup
 	fi
 }
 src_prepare() {
 	touch "${S}/.mailmap" || die
 	default
 	# Tweak the init script:
 	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
 	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
 		-i "${S}/libvirtd.init" || die "sed failed"
 }
 src_configure() {
 	local emesonargs=(
 		$(meson_feature apparmor)
 		$(meson_use apparmor apparmor_profiles)
 		$(meson_feature audit)
 		$(meson_feature caps capng)
 		$(meson_feature dbus)
 		$(meson_feature dtrace)
 		$(meson_feature firewalld)
 		$(meson_feature fuse)
 		$(meson_feature glusterfs)
 		$(meson_feature glusterfs storage_gluster)
 		$(meson_feature iscsi storage_iscsi)
 		$(meson_feature iscsi-direct storage_iscsi_direct)
 		$(meson_feature libvirtd driver_libvirtd)
 		$(meson_feature libssh)
 		$(meson_feature lvm storage_lvm)
 		$(meson_feature lvm storage_mpath)
 		$(meson_feature lxc driver_lxc)
 		$(meson_feature macvtap)
 		$(meson_feature nls)
 		$(meson_feature numa numactl)
 		$(meson_feature numa numad)
 		$(meson_feature openvz driver_openvz)
 		$(meson_feature parted storage_disk)
 		$(meson_feature pcap libpcap)
 		$(meson_feature policykit polkit)
 		$(meson_feature qemu driver_qemu)
 		$(meson_feature qemu yajl)
 		$(meson_feature rbd storage_rbd)
 		$(meson_feature sasl)
 		$(meson_feature selinux)
 		$(meson_feature udev)
 		$(meson_feature vepa virtualport)
 		$(meson_feature virt-network driver_network)
 		$(meson_feature virtualbox driver_vbox)
 		$(meson_feature wireshark-plugins wireshark_dissector)
 		$(meson_feature xen driver_libxl)
 		$(meson_feature zfs storage_zfs)
 		-Dhal=disabled
 		-Dnetcf=disabled
 		-Dsanlock=disabled
 		-Ddriver_esx=enabled
 		-Dinit_script=systemd
 		-Dqemu_user=$(usex caps qemu root)
 		-Dqemu_group=$(usex caps qemu root)
 		-Ddriver_remote=enabled
 		-Dstorage_fs=enabled
 		-Ddriver_vmware=enabled
 		--localstatedir="${EPREFIX}/var"
 		-Drunstatedir="${EPREFIX}/run"
 	)
 	meson_src_configure
 }
 src_test() {
 	# remove problematic tests, bug #591416, bug #591418
 	sed -i -e 's#commandtest$(EXEEXT) # #' \
 		-e 's#virfirewalltest$(EXEEXT) # #' \
 		-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
 		-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
 		tests/Makefile
 	export VIR_TEST_DEBUG=1
 	meson_src_test
 }
 src_install() {
 	meson_src_install
 	# Remove bogus, empty directories. They are either not used, or
 	# libvirtd is able to create them on demand
 	rm -rf "${D}"/etc/sysconfig || die
 	rm -rf "${D}"/var || die
 	rm -rf "${D}"/run || die
 	newbashcomp "${S}/tools/bash-completion/vsh" virsh
 	bashcomp_alias virsh virt-admin
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 	systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
 	newinitd "${S}/libvirtd.init" libvirtd
 	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
 	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
 	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
 	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
 	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
 	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
 	DISABLE_AUTOFORMATTING=true
 	readme.gentoo_create_doc
 }
 pkg_preinst() {
 	# we only ever want to generate this once
 	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
 		rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml || die
 	fi
 }
 pkg_postinst() {
 	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
 		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
 	fi
 	use libvirtd || return 0
 	# From here, only libvirtd-related instructions, be warned!
 	readme.gentoo_print_elog
 }
--- a/app-emulation/virt-manager/virt-manager-3.2.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-3.2.0.ebuild
@ -26,14 +26,13 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="gtk policykit sasl"
-RDEPEND="!app-emulation/virtinst
+RDEPEND="${PYTHON_DEPS}
 	${PYTHON_DEPS}
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	$(python_gen_cond_dep '
 		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
 		dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-		dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/libvirt-python-6.10.0[${PYTHON_MULTI_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 		dev-python/requests[${PYTHON_MULTI_USEDEP}]
 	')
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@ -26,14 +26,13 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="gtk policykit sasl"
-RDEPEND="!app-emulation/virtinst
+RDEPEND="${PYTHON_DEPS}
 	${PYTHON_DEPS}
 	app-cdr/cdrtools
 	>=app-emulation/libvirt-glib-1.0.0[introspection]
 	$(python_gen_cond_dep '
 		dev-libs/libxml2[python,${PYTHON_MULTI_USEDEP}]
 		dev-python/argcomplete[${PYTHON_MULTI_USEDEP}]
-		dev-python/libvirt-python[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/libvirt-python-0.6.10[${PYTHON_MULTI_USEDEP}]
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 		dev-python/requests[${PYTHON_MULTI_USEDEP}]
 	')
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/texmacs/texmacs-1.99.11.ebuild
+++ b/app-office/texmacs/texmacs-1.99.11.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=6
-inherit cmake-utils xdg-utils gnome2-utils qmake-utils
+inherit cmake-utils xdg-utils
 MY_P=${P/tex/TeX}-src
@ -62,11 +62,11 @@ src_configure() {
 pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 pkg_postrm() {
 	xdg_desktop_database_update
 	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/ansifilter/ansifilter-2.17.ebuild
+++ b/app-text/ansifilter/ansifilter-2.17.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
 IUSE="qt5"
 RDEPEND="
--- a/app-text/enscript/enscript-1.6.6.ebuild
+++ b/app-text/enscript/enscript-1.6.6.ebuild
@ -9,7 +9,7 @@ DESCRIPTION="Powerful text-to-postscript converter"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/enscript/enscript.html"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 SLOT="0"
 LICENSE="GPL-3"
 IUSE="nls ruby"
@ -24,6 +24,7 @@ RDEPEND="nls? ( virtual/libintl )"
 src_prepare() {
 	epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch
 	epatch "${FILESDIR}"/enscript-1.6.5.2-php.st.patch
 	epatch "${FILESDIR}"/enscript-1.6.4-fsf-gcc-darwin.patch
 	use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch
 	sed -i src/tests/passthrough.test -e 's|tail +2|tail -n +2|g' || die
 	default
--- a/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch
+++ b/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch
@ -0,0 +1,37 @@
 darwin: __private_extern__ is an Apple-ism, we really don't want
 In particular FSF GCC barfs about this, which is much preferred over
 ancient gcc-apple (4.2.1).
 --- compat/regex.c
 +++ compat/regex.c
@@ -5539,9 +5539,6 @@
    It returns 0 if it succeeds, nonzero if it doesn't.  (See regex.h for
    the return codes and their meanings.)  */
 -#ifdef __APPLE__
 -__private_extern__
 -#endif
 int
 regcomp (preg, pattern, cflags)
     regex_t *preg;
@@ -5620,9 +5617,6 @@
    We return 0 if we find a match and REG_NOMATCH if not.  */
 -#ifdef __APPLE__
 -__private_extern__
 -#endif
 int
 regexec (preg, string, nmatch, pmatch, eflags)
     const regex_t *preg;
@@ -5728,9 +5722,6 @@
 /* Free dynamically allocated space used by PREG.  */
 -#ifdef __APPLE__
 -__private_extern__
 -#endif
 void
 regfree (preg)
     regex_t *preg;
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mariadb/mariadb-10.2.36.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.36.ebuild
@ -33,7 +33,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
--- a/dev-db/mariadb/mariadb-10.3.27.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.27.ebuild
@ -33,7 +33,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
--- a/dev-db/mariadb/mariadb-10.4.17.ebuild
+++ b/dev-db/mariadb/mariadb-10.4.17.ebuild
@ -33,7 +33,7 @@ REQUIRED_USE="jdbc? ( extraengine server !static )
 	?? ( tcmalloc jemalloc )
 	static? ( yassl !pam )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
--- a/dev-db/mysql/mysql-5.7.31.ebuild
+++ b/dev-db/mysql/mysql-5.7.31.ebuild
@ -28,7 +28,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
--- a/dev-db/mysql/mysql-5.7.32.ebuild
+++ b/dev-db/mysql/mysql-5.7.32.ebuild
@ -28,7 +28,7 @@ RESTRICT="!test? ( test ) libressl? ( test )"
 REQUIRED_USE="?? ( tcmalloc jemalloc )"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
--- a/dev-db/mysql/mysql-8.0.22.ebuild
+++ b/dev-db/mysql/mysql-8.0.22.ebuild
@ -37,7 +37,7 @@ REQUIRED_USE="?? ( tcmalloc jemalloc )
 	router? ( server )
 	tcmalloc? ( server )"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 # Shorten the path because the socket path length must be shorter than 107 chars
 # and we will run a mysql server during test phase
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.107.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.107.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="3.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND=">=virtual/jdk-1.8"
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@ -2,6 +2,7 @@ DIST erlang-23.0.4.tar.gz 56394805 BLAKE2B 10a4e9e3084ad2d1bb10fa736d86eb03fa6b2
 DIST erlang-23.1.1.tar.gz 56498218 BLAKE2B cd513a2d45aecc12503df8765e0f4170001373c0e6b35b4c01d7471906408558a3b6bbf9c189858fce3cb8fd7020270813550e2099f04c8094afc49dcd070016 SHA512 572164e601796bc7b0df3818c859b23872f148dcc72f44f611d9d5684b0c9974b00496aa0fd521dc01d0d3481556b6641d3cbd859bd7bfadefd15115728d16d9
 DIST erlang-23.1.4.tar.gz 56503340 BLAKE2B f4b26aa5882bb3d2218897706734798a80cbb5113008be70b2a0c793a5cc1eb01eb1ace17ae525e19f176e47ffc85b108240b7fec71cf8eedb4d67860ecaa98b SHA512 864b69fc69f3843dfe839faf1c1e86ec505282ec4d86ed1add445998ba28bcc623522471d8d8636a9cf1e24e84f99d5cae3880a4b1171abab9651ef242a55367
 DIST erlang-23.1.5.tar.gz 56508089 BLAKE2B 7784cbed8df68d449cbace6d84b37208b739a3b12fbed1117f05c765883d348e877001f5eba15ffdec5acc47725bf69d06a7f02b48766efa5496a8326fb8eb8c SHA512 dccb863ace1f3c3fd17c848bf21c982338546e2be2a3b81ade35bcefeb4ff75afff28ebe2363ccf7f4680417f83bbeaa51c74274a23621139b5a4be6bb824955
 DIST erlang-23.2.1.tar.gz 56580525 BLAKE2B 4b5d4be9d0501dd2eb5d44357ccc9a169dc3b5742380264a7929e6aebf1d003327b2c109aa7dc4ad668f1576376e54022ff240f41df7af9010184d643eae2371 SHA512 444c19fac295a979321ccde1f516156a25faa79d66437ddf7bc0a197f3fb8d2ddd6c056d565f9b6bc47e8444b8feda790c4844dbe95ec0b300428fb22c4e0531
 DIST erlang-23.2.tar.gz 56581092 BLAKE2B f3191b99465ab18eaf13c6d15f79ae150fb04337450b3ff145532aab0da229c44c082bb138a79c84860f09107a363c34e2b2505ce38c6c8dea1ede5fbe3ce044 SHA512 3bdb464992387c5a352c11bf9dc49c6a982dac10865d2b668d8db6fb45db15f4d79d38976d04fbbd51568ee9efb8b5295bb06b6fee37b81fde6fa43c51dcc313
 DIST erlang_doc_html_23.0.tar.gz 36238699 BLAKE2B bce5fb1d766d3a795728cf7c00529129690f52e5dbe7363095cb7e63d5331a4dfc05c2042d24f10c7f3facbd187284aa323a92c0ed7515c1750aee4cd890fbd4 SHA512 bd0b1adf8639674d31152024e1351105249c6e6f93f28362e9e4b66ce6daadbe5eef5917a5889c926130e81bd000cfc44895ebaa309bf9a0c1c125713b715927
 DIST erlang_doc_html_23.1.tar.gz 36285075 BLAKE2B e2e24ac4cecfc9c10853fd3718e8e332579a91bf25eaaf9e0fc2044d89bcd6d03fd251d6a8ab64a86439f1244e275ef398701b47933a741d4e64016838db48aa SHA512 c8fecb08344c9c7a4c7b911ac4f73e2d8c0c3778d665098c3377e055346a7ecfcc378bca28dff768c36dc7bf7447308f4fb58273875c22f2d6cd896fd6232656
--- a/dev-lang/erlang/erlang-23.1.4.ebuild
+++ b/dev-lang/erlang/erlang-23.1.4.ebuild
@ -22,7 +22,7 @@ LICENSE="Apache-2.0"
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 RDEPEND="
--- a/dev-lang/erlang/erlang-23.2.1.ebuild
+++ b/dev-lang/erlang/erlang-23.2.1.ebuild
@ -0,0 +1,159 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 WX_GTK_VER="3.0-gtk3"
 inherit elisp-common java-pkg-opt-2 systemd wxwidgets
 # NOTE: If you need symlinks for binaries please tell maintainers or
 # open up a bug to let it be created.
 UPSTREAM_V="$(ver_cut 1-2)"
 DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
 HOMEPAGE="https://www.erlang.org/"
 SRC_URI="https://github.com/erlang/otp/archive/OTP-${PV}.tar.gz -> ${P}.tar.gz
 	http://erlang.org/download/otp_doc_man_${UPSTREAM_V}.tar.gz -> ${PN}_doc_man_${UPSTREAM_V}.tar.gz
 	doc? ( http://erlang.org/download/otp_doc_html_${UPSTREAM_V}.tar.gz -> ${PN}_doc_html_${UPSTREAM_V}.tar.gz )"
 LICENSE="Apache-2.0"
 # We use this subslot because Compiled HiPE Code can be loaded on the exact
 # same build of ERTS that was used when compiling the code.  See
 # http://erlang.org/doc/system_principles/misc.html for more information.
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc emacs +hipe java +kpoll libressl odbc sctp ssl systemd tk wxwidgets"
 RDEPEND="
 	acct-group/epmd
 	acct-user/epmd
 	sys-libs/ncurses:0
 	sys-libs/zlib
 	emacs? ( >=app-editors/emacs-23.1:* )
 	java? ( >=virtual/jdk-1.8:* )
 	odbc? ( dev-db/unixODBC )
 	sctp? ( net-misc/lksctp-tools )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-0.9.7d:0= )
 		libressl? ( dev-libs/libressl:0= )
 	)
 	systemd? ( sys-apps/systemd )
 	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
 "
 DEPEND="${RDEPEND}
 	dev-lang/perl
 "
 S="${WORKDIR}/otp-OTP-${PV}"
 PATCHES=(
 	"${FILESDIR}"/18.2.1-wx3.0.patch
 	"${FILESDIR}"/${PN}-22.0-dont-ignore-LDFLAGS.patch
 	"${FILESDIR}"/${PN}-23.1.2-ac2.70.patch
 )
 SITEFILE=50"${PN}"-gentoo.el
 src_prepare() {
 	default
 	./otp_build autoconf || die
 }
 src_configure() {
 	use wxwidgets && setup-wxwidgets
 	local myconf=(
 		--disable-builtin-zlib
 		$(use_enable hipe)
 		$(use_enable kpoll kernel-poll)
 		$(use_with java javac)
 		$(use_enable sctp)
 		$(use_with ssl ssl "${EPREFIX}"/usr)
 		$(use_enable ssl dynamic-ssl-lib)
 		$(use_enable systemd)
 		$(usex wxwidgets "--with-wx-config=${WX_CONFIG}" "--with-wxdir=/dev/null")
 	)
 	econf "${myconf[@]}"
 }
 src_compile() {
 	emake
 	if use emacs ; then
 		pushd lib/tools/emacs &>/dev/null || die
 		elisp-compile *.el
 		popd &>/dev/null || die
 	fi
 }
 extract_version() {
 	local path="$1"
 	local var_name="$2"
 	sed -n -e "/^${var_name} = \(.*\)$/s::\1:p" "${S}/${path}/vsn.mk" || die "extract_version() failed"
 }
 src_install() {
 	local erl_libdir_rel="$(get_libdir)/erlang"
 	local erl_libdir="/usr/${erl_libdir_rel}"
 	local erl_interface_ver="$(extract_version lib/erl_interface EI_VSN)"
 	local erl_erts_ver="$(extract_version erts VSN)"
 	local my_manpath="/usr/share/${PN}/man"
 	[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version"
 	[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version"
 	emake INSTALL_PREFIX="${D}" install
 	if use doc ; then
 		# Note: we explicitly install docs into:
 		#     /usr/share/doc/${PF}/{doc,lib,erts-*}
 		# To maintain that layout we gather everything in 'html-docs'.
 		# See bug #684376.
 		mkdir html-docs || die
 		mv "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-* html-docs/ || die
 		local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" html-docs/. )
 		docompress -x /usr/share/doc/${PF}
 	else
 		local DOCS=("README.md")
 	fi
 	einstalldocs
 	dosym "../${erl_libdir_rel}/bin/erl" /usr/bin/erl
 	dosym "../${erl_libdir_rel}/bin/erlc" /usr/bin/erlc
 	dosym "../${erl_libdir_rel}/bin/escript" /usr/bin/escript
 	dosym "../${erl_libdir_rel}/lib/erl_interface-${erl_interface_ver}/bin/erl_call" /usr/bin/erl_call
 	dosym "../${erl_libdir_rel}/erts-${erl_erts_ver}/bin/beam.smp" /usr/bin/beam.smp
 	## Clean up the no longer needed files
 	rm "${ED}/${erl_libdir}/Install" || die
 	insinto "${my_manpath}"
 	doins -r "${WORKDIR}"/man/*
 	# extend MANPATH, so the normal man command can find it
 	# see bug 189639
 	newenvd - "90erlang" <<-_EOF_
 		MANPATH="${my_manpath}"
 	_EOF_
 	if use emacs ; then
 		elisp-install erlang lib/tools/emacs/*.{el,elc}
 		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
 			"${FILESDIR}/${SITEFILE}" > "${T}/${SITEFILE}" || die
 		elisp-site-file-install "${T}/${SITEFILE}"
 	fi
 	newinitd "${FILESDIR}"/epmd.init-r2 epmd
 	newconfd "${FILESDIR}"/epmd.confd-r2 epmd
 	use systemd && systemd_newunit "${FILESDIR}"/epmd.service-r1 epmd.service
 }
 pkg_postinst() {
 	use emacs && elisp-site-regen
 }
 pkg_postrm() {
 	use emacs && elisp-site-regen
 }
--- a/dev-lang/julia-bin/Manifest
+++ b/dev-lang/julia-bin/Manifest
@ -1,17 +1,10 @@
 DIST julia-1.2.0-freebsd-x86_64.tar.gz 82750080 BLAKE2B 2b95fedc8dbbc138c0794f42518cce280c62bb2442d6a0d53b809f21768497937b037e1e886cff19cb40d7a63f3e2ee8da0314250cab52e8b139724baff3ee91 SHA512 9c9af2e2346553ea5658ab5a9fe88539605774cd2737ac9bfb240b7fa3f9fd46f746d5dbdff2dd7405e8fbd33208c12a335b7d80cd0c78c62287ae5eb470fc8e
 DIST julia-1.2.0-linux-i686.tar.gz 87810731 BLAKE2B 1d72bf469f1dd3667ea00d038d18e20c10d9ceb579c61b2f30603bcd7ea55875423e4d54cbb774cfcc20044528f3ccd196131bb17cbaf7bf780fc5667c387e1e SHA512 ecd62047a0e36fe85a0442733949b19ca5d877fc2d2bced80566d1fcd6906345f66fb9114b6e687594e514b8c952d0352de5982f77f127e5196288431a1f64a9
 DIST julia-1.2.0-linux-x86_64.tar.gz 91990555 BLAKE2B 125313e7e53bddfcd64251fa2794e5b9d4bbbadb6100c1dc8f86039e13520859117f8ffcc2611d085805c9a80ad3544e88dd0e37803609e3b8b4097867fa8a5c SHA512 47e966d12204ffbefcdd8a60e850994df2247c37ee601f4147710d80e8e576672daaffe6d35d37fef644ea725f46d893832f096e24d938af856328299ad920d5
 DIST julia-1.3.0-freebsd-x86_64.tar.gz 86423604 BLAKE2B 5e36e49ebb708c4ec1c998b23861f69238b9bb2af337b0977df1a2de170869037577d422d3d2ddb359e537b9c75ba8cbe8e5963d42a832dba19f8bb4022a264d SHA512 b2c4a0e5ce379523ee606067d50b980fb9be6977f7d3d576b131183edfc72098be71bf0bede20d44f72ad7d0b414fe56eeaa67ca1cb47d36823721784da8526b
 DIST julia-1.3.0-linux-aarch64.tar.gz 78426016 BLAKE2B da758349e342a92194ff24e74dfb89ed9676bb97d8ffc15b80a305a5d75627b08a8939349b6de6aea294d64dd1386d1d24f5a8c793b368df38b86d06282222b7 SHA512 fa2a34aecbf83bd17f6ea24b55d30cfaab1916ea1c17b16271bbffaf93f430c262eb6d0ee9a9737a361a8dfad47126478ffa841c70cf9899e426607e12913e8b
 DIST julia-1.3.0-linux-armv7l.tar.gz 84672004 BLAKE2B e8d20943195a909d2db821f30df79f5020eb21ded179b795518db77772f5216fd04d88a7e21ef518b819349f6c3d5b681b1b7c7ff2ff2bf89a14d6ad48456f5f SHA512 2f6328a66f24aae0e6ed0ed5abb504805cf4a719a7ba30009966a1774f4e72630734c661c4de49cca37f5fa0fa766fa2eda29f01ee21ee3e2e3af81d2291f2dc
 DIST julia-1.3.0-linux-i686.tar.gz 90629130 BLAKE2B 027b045d71c209c3a935ac37d07fa89201d55b63e374038f5891fa751a87546aff63ffa0641f6b5041b4fbf1ed018cc6a809b56d3f732c134e3b98501fe92885 SHA512 fd772d0d3dbc11c357df26f980569315893a391604755e81421b6001b09e8e939f9a8e4bd0e0faa428fb4b08ac8f24a39bbe0875417630bf127d8b41324a9116
 DIST julia-1.3.0-linux-x86_64.tar.gz 95497903 BLAKE2B 2f67eb538c0277edaa97e95122bccf0f5822b7fc7a64a843aad7d421a22167de758a94011bf0e95a2b8b29c7d04e2b65451807bb36742206e88fcceab304f019 SHA512 4b286172622a2817378dae0720fa0a08d4f361b60adfb9685136fabc83d42bf439a22147051fb69d501e14947e42d2999ab081cfb3f60c44ee5d6a906758aaf3
 DIST julia-1.4.0-freebsd-x86_64.tar.gz 90034224 BLAKE2B 3150870a630c43d21520a52a9c009b777105f978f5b735c22ac1fa2a7599e30e09b1b7064149a83fedc52e7783b429e470358b82f21c51239b7761506269f066 SHA512 9f8cbe2065e05198f2a3edfdae17e2afa31c4a4c08ba4c3bcc31215ff6541c75a147009f87bd1028b6cdfac1f8616e07a948c8f8ee2586e61eacac53e33e3e87
 DIST julia-1.4.0-linux-aarch64.tar.gz 81685205 BLAKE2B 1a07a3ef94423d327e88b5cccb38360b23540806defeee1c64dc0656beee1b39008ca529e3d0cef7aab1e8947adb62fbbb1c6d248a0de2c63f3a5d14b3a5b684 SHA512 51b79e7b1fc85f67a26a595e84f88b656996cb8e14cd634076621b07690fc4f5d1ff1d71ce3a75243501bb7853bffda5d7428f03797570913cd3170dc13f651f
 DIST julia-1.4.0-linux-i686.tar.gz 94549552 BLAKE2B b058d81f55e7e579cff5b31054def68193be5032de02f09f6c4239e13bd73a630eee8ebd5f9ccd712f0e3be406932de51951202ec37b1534f20962db4eff5472 SHA512 f0363103713900a682fef900a745732714cd3dcbedbe2aa368afff768c24603241fc2f4be7419caf674e086f6cac59a8b14f3770e578959b7296cd5e26d6d5c9
 DIST julia-1.4.0-linux-x86_64.tar.gz 98969249 BLAKE2B bf0a79a8a8f1ed8c5668f2b2836414f8c0ae10199ee96eefea3d5bfefc0dde0902659556a572c3de6982477183d91f8e2f6d38f7334c50872f3257055a5310e3 SHA512 e2ac637d2bbe9ec4b900bc8f59263fdaa573cbe39ffbafd0e8280a5ba1906052f72816e4b5a12fab34f5b05ffd3f5cf95703c00d88f2f6ab6f022c3504cf1c95
 DIST julia-1.5.2-freebsd-x86_64.tar.gz 95898744 BLAKE2B dddafa63acc943bfc06eeae3fa9a3ef9b7484b29b88d37bf064ded255c836678f5d02dec0f7fa788bb763894acae5c51937882ed0391dcf66792198fec7dbce7 SHA512 13e4d1a7e01cd759d64c8ec3d85501904439fde5a9e2cb394963a8977035cd33b241fab27bf0642b069f202ead1d6c84f633002df3b27c4aa60e7adf45a3a8b1
 DIST julia-1.5.2-linux-aarch64.tar.gz 97088109 BLAKE2B 01aa5337cd1fc15655b596959cef8e54b56d8bb11fbced728df301a197aad550f0113b50c0b9e3cab34ea1082e176ced0398cde4e1d7c6d14a72b9a9cab937ea SHA512 09ac5360faae81eb9c78da5831d20f1f2d2c7a93561f6f2857015b579796a059cdecf529c283c9c37dd55163ce3e7b6cd175ee02734f1e11aa12f1163bd6587c
 DIST julia-1.5.2-linux-i686.tar.gz 101473619 BLAKE2B a87cb4cb38236e87041fac1012841d5aed25383bfb212188f4c23f4a961654d8a3b03b85dd5563f83620aa98323e2d2692107eda47559cf9ae332006453a139d SHA512 2ceb56bcae051815d585d3f36b4ae323ad7a3e383e75c07d87cb555fc2463d1a6017fd120f52a1f7110b803bfa546a34e62e8958765b52124612782ac3daf403
 DIST julia-1.5.2-linux-x86_64.tar.gz 105324048 BLAKE2B 410db75cb5b7ed269fd0d8f827773f50ff127ded3346e2f5fe908a1f9c0dd0f00b7600c5343853aaa0dfec3a616f657c52c96290f9c6ea012efcbc2a2b72e701 SHA512 5d14369b6296aa5fa0f7a58ce6b85dc25612ef508ee8dc1dcce7fe3a64de62b77daf419ea5d3a0a78345345787cb3ed563717ecc04df0c4d68b6d60593750f62
 DIST julia-1.5.2-musl-x86_64.tar.gz 101730667 BLAKE2B 1b213a246779815b79f47e6c287f0c7eb438dce42bc9e3e39681dcc0818c7a8c81f7040443c06fd323adb693c96b61cc69099c5df375cae119020ba9d0bb11cd SHA512 5cfbf7938f50286077e132815e10ce4e1e5a589a772ae3b946488d3126713e72ba393e1a45b3bc38b5bc43fc183e7f99b622c8c0d9d939330b142cdee24fccb3
 DIST julia-1.5.3-freebsd-x86_64.tar.gz 95919875 BLAKE2B 620c295a3d0fa9a31ed01b936ddabd001cee621969f61a9165e03ebee05cd1384c62bccd95f4df15ba49f9d6feec16f05c367820c0907919f67809ca136b70bc SHA512 e767bfb3cef034262dc12e0da4006e80d20cc7c971906f5ad355c971e7c751830972a2f4aa47d18fc2a79eb5454f8f160c0c38d536510291690fa6e1da3c83a3
 DIST julia-1.5.3-linux-aarch64.tar.gz 97086173 BLAKE2B 5353a516f24c151d6213ed4c6e189a8ac68933012bcda06084b5e6c1f3a230ebca896b1e8dd29b345c312f323283b4f9045efcece655ef055a797cd5eefbd774 SHA512 0988e229dc9f44230af84796dfb059aa87809c6af5d0e8a7debc4b696e98c45ccc042f956f678819e71afe29d5619421106208c6dce5dfe47aea98482b22c1e3
 DIST julia-1.5.3-linux-i686.tar.gz 101362522 BLAKE2B aba1270fc85cc1afc19856768a39d1cf1c40fb32b676be5da47dc7747294299a044a5202c547d19ad8aa56060b04d7583d7e7c19176f2fdbcccb863593fffccb SHA512 0abaab22626cbd4da4a2389b2aca639f993aa442a8423cba2fda3d9693e0dab4f5b82592691ad74bb7ddf1ae48739406b61fe76b7da626a1f22fe01077b011d2
 DIST julia-1.5.3-linux-x86_64.tar.gz 105260711 BLAKE2B b132fbe090ca4a4cba518efcf2e475f0ceaebcbe2e5ef4eee33697909995ea58d97c3e5015b96eaf2ff23e5ff6b5b67eed62b94a34580961d5671c4f019d4847 SHA512 f0460da198797c92d39d361278be6959e90b2b3d08e070b705c1a5de3a17c0e6b0b010a397d0b02e613d060959fff14c074cf12fdeb956e8f8565989f084d86b
 DIST julia-1.5.3-musl-x86_64.tar.gz 101802400 BLAKE2B da69c1b4ff5bde8692c3fc9ed3d60fd655a32121a0e11a4d1f00b5e4494cc4bcdb0e323a2644cca3a291fa7f7604925d387204df90cc19fee89048c4ba83b2d5 SHA512 e98c74ce2a49532a491a46efe81a2edc85103f9ec04347fe6b052cffdaecadcecb48a02b15ad71853fff6ebb2281498000e89d44732f36d31b6252a1a88bd0a6
--- a/dev-lang/julia-bin/julia-bin-1.3.0.ebuild
+++ b/dev-lang/julia-bin/julia-bin-1.3.0.ebuild
@ -1,47 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 MY_PN=${PN/-bin/}
 MY_P=${MY_PN}-${PV}
 MY_PV=$(ver_cut 1-2)
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="https://julialang.org/"
 SRC_URI="
 	x86? ( https://julialang-s3.julialang.org/bin/linux/x86/${MY_PV}/${MY_P}-linux-i686.tar.gz )
 	amd64? ( https://julialang-s3.julialang.org/bin/linux/x64/${MY_PV}/${MY_P}-linux-x86_64.tar.gz )
 	amd64-fbsd? ( https://julialang-s3.julialang.org/bin/freebsd/x64/${MY_PV}/${MY_P}-freebsd-x86_64.tar.gz )
 	arm? ( https://julialang-s3.julialang.org/bin/linux/armv7l/${MY_PV}/${MY_P}-linux-armv7l.tar.gz )
 	arm64? ( https://julialang-s3.julialang.org/bin/linux/aarch64/${MY_PV}/${MY_P}-linux-aarch64.tar.gz )
 "
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
 IUSE="elibc_glibc elibc_FreeBSD"
 RDEPEND="!dev-lang/julia"
 DEPEND="${RDEPEND}"
 RESTRICT="strip"
 QA_PREBUILT="*"
 S="${WORKDIR}/${MY_P}"
 src_install() {
 	insinto "/usr/$(get_libdir)/${MY_P}/"
 	doins -r ./etc
 	doins -r ./include
 	doins -r ./lib
 	doins -r ./share
 	exeinto "/usr/$(get_libdir)/${MY_P}/bin"
 	doexe bin/julia
 	cat > 99julia-bin <<-EOF
 		PATH="${EROOT}/usr/$(get_libdir)/${MY_P}/bin"
 	EOF
 	doenvd 99julia-bin
 }
--- a/dev-lang/julia-bin/julia-bin-1.4.0.ebuild
+++ b/dev-lang/julia-bin/julia-bin-1.4.0.ebuild
@ -1,46 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 MY_PN=${PN/-bin/}
 MY_P=${MY_PN}-${PV}
 MY_PV=$(ver_cut 1-2)
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="https://julialang.org/"
 SRC_URI="
 	x86? ( https://julialang-s3.julialang.org/bin/linux/x86/${MY_PV}/${MY_P}-linux-i686.tar.gz )
 	amd64? ( https://julialang-s3.julialang.org/bin/linux/x64/${MY_PV}/${MY_P}-linux-x86_64.tar.gz )
 	amd64-fbsd? ( https://julialang-s3.julialang.org/bin/freebsd/x64/${MY_PV}/${MY_P}-freebsd-x86_64.tar.gz )
 	arm64? ( https://julialang-s3.julialang.org/bin/linux/aarch64/${MY_PV}/${MY_P}-linux-aarch64.tar.gz )
 "
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~arm64 ~x86"
 IUSE="elibc_glibc elibc_FreeBSD"
 RDEPEND="!dev-lang/julia"
 DEPEND="${RDEPEND}"
 RESTRICT="strip"
 QA_PREBUILT="*"
 S="${WORKDIR}/${MY_P}"
 src_install() {
 	insinto "/usr/$(get_libdir)/${MY_P}/"
 	doins -r ./etc
 	doins -r ./include
 	doins -r ./lib
 	doins -r ./share
 	exeinto "/usr/$(get_libdir)/${MY_P}/bin"
 	doexe bin/julia
 	cat > 99julia-bin <<-EOF
 		PATH="${EROOT}/usr/$(get_libdir)/${MY_P}/bin"
 	EOF
 	doenvd 99julia-bin
 }
--- a/dev-lang/julia-bin/julia-bin-1.5.2.ebuild
+++ b/dev-lang/julia-bin/julia-bin-1.5.2.ebuild
@ -30,6 +30,7 @@ DEPEND="${RDEPEND}"
 RESTRICT="strip"
 QA_PREBUILT="*"
 QA_SONAME="*"
 S="${WORKDIR}/${MY_P}"
--- a/dev-lang/julia-bin/julia-bin-1.5.3.ebuild
+++ b/dev-lang/julia-bin/julia-bin-1.5.3.ebuild
@ -3,20 +3,26 @@
 EAPI=7
 MY_PN=${PN/-bin/}
-MY_P=${MY_PN}-${PV}
+MY_P=${MY_PN}-${PV/_/-}
 MY_PV=$(ver_cut 1-2)
 BASE_SRC_URI="https://julialang-s3.julialang.org/bin"
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="https://julialang.org/"
 SRC_URI="
-	x86? ( https://julialang-s3.julialang.org/bin/linux/x86/1.2/${MY_P}-linux-i686.tar.gz )
+	x86? ( ${BASE_SRC_URI}/linux/x86/${MY_PV}/${MY_P}-linux-i686.tar.gz )
-	amd64? ( https://julialang-s3.julialang.org/bin/linux/x64/1.2/${MY_P}-linux-x86_64.tar.gz )
+	amd64? (
-	amd64-fbsd? ( https://julialang-s3.julialang.org/bin/freebsd/x64/1.2/${MY_P}-freebsd-x86_64.tar.gz )
+		elibc_glibc? ( ${BASE_SRC_URI}/linux/x64/${MY_PV}/${MY_P}-linux-x86_64.tar.gz )
 		elibc_musl? ( ${BASE_SRC_URI}/musl/x64/${MY_PV}/${MY_P}-musl-x86_64.tar.gz )
 	)
 	amd64-fbsd? ( ${BASE_SRC_URI}/freebsd/x64/${MY_PV}/${MY_P}-freebsd-x86_64.tar.gz )
 	arm64? ( ${BASE_SRC_URI}/linux/aarch64/${MY_PV}/${MY_P}-linux-aarch64.tar.gz )
 "
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="elibc_glibc elibc_FreeBSD"
+IUSE="elibc_glibc"
 RDEPEND="!dev-lang/julia"
 DEPEND="${RDEPEND}"
@ -24,6 +30,7 @@ DEPEND="${RDEPEND}"
 RESTRICT="strip"
 QA_PREBUILT="*"
 QA_SONAME="*"
 S="${WORKDIR}/${MY_P}"
--- a/dev-lang/julia/Manifest
+++ b/dev-lang/julia/Manifest
@ -1,18 +1,10 @@
 DIST julia-1.2.0.tar.gz 8255435 BLAKE2B 286b7bd93cae247c545d9c384e244115f84daee977839022993e91c69013eb4107ac77d86f996ec7a8e9f863bf5cab29fb063437b822e5da79e72bc9e0db4b65 SHA512 c99b0b744508b43df4ee334f588dbb57a633969d7cb164d41b76d552c1d14f5ff6f06a8d0da7f7a48fd1e3a3b3c2379998c5af1bfdff4b0c17045132b82a40b8
 DIST julia-1.3.0.tar.gz 8793136 BLAKE2B e469d80c94e3b15b198011e62f591a699ec7218c755cf3e0c1be8f94e2a28e9800a10599a152f6865f534652d22f118bb14cd1886d257a96e6875562bce56f0c SHA512 c7fdc5c4435c82688fe608a7009ccee6d622f51a62578bf2323ad623acfd58bfb6ed1252f81481708b5b428c37292e078ce72b10df3fe32d29158b0726be2c2e
 DIST julia-1.4.0.tar.gz 7239281 BLAKE2B f11467cf91c2a72f03f77421537f4089bab6a1596ede27963551819453bea2a3a46cad9a43951df8857120a00a44f2f04eb5e23659ea4d1772feddb00ba85d2c SHA512 f8152a595f13932f6cad186cf2fdf2fb0bd64cc49bbb11a76d8299f4745ca6428823ead0e73a7bae1347f1b99bf1181d1f457587d13a7bfc7324ca81afc35cc1
 DIST julia-1.5.2.tar.gz 6945862 BLAKE2B 9dd9f83fb9ae251f66ae65e14a252b662c3c7d6f92638d91ef6e286032020052e1812f2891270854e0ddeda474afff55c8f87d300550503c1093f4c5e0a51959 SHA512 aa177d03bbde4f368dd2fb14f64d21130531616bcd544af7babbb7fb7c9ee5ea7528c756e10f78468aaffebbcbc6f48e92397c1c13dc3f130b64a82e478f43dc
 DIST julia-1.5.3.tar.gz 6949901 BLAKE2B 08f8496980a9bbb9effc0c72cb6b7a5ce1dbd1774735caa366ddc1bb5404117111c624a639f6eb48360061f9fc597a7b37dff24f8555f03ebc4a22524cbeb3b8 SHA512 9e644a64fd6e2caf0390a2bc470084406c078244e65b70a2e3b031d5806c1dff780273ccccfe4bccfd8c03778b7d3a44de7a84bd13f3512afe6864efa5a730fc
 DIST julia-Pkg-49908bffe83790bc7cf3c5d46faf3667f8902ad4.tar.gz 389738 BLAKE2B 1ed9201badf0a1db5142e0566bfe085b364e4681670937ac5fa53c15312ff8eb29d5e783b75fe3f4f379b041ba38c66ce94962fa7d98fcfd0b7b49acd1749d69 SHA512 a85aa80b3080794a8e3ae5ce54856e63457c461659c12fde5dde1b5ec33176ea06af49ee516d01ccd7b78d8358de2fe0ffcd5c6a6d5a5088cdcd76a0133780eb
 DIST julia-UnicodeData-13.0.0.txt 1851767 BLAKE2B 72bbcf352f2f6a004abb3f351fe5da160e83644feea8de0ca154b5a1aa78f36cb04b252d0c7b64a5eeca388e600b2875bb76bc2746ee799a1a6eff97c1fe8b06 SHA512 1a4a662e2ab33469976bf5f91aa6933ed9b73f6d4179a2daffb349e1869d7d6cfa885b164e82d15dcdad7458cd451c81add58d875eb0c70de854589dc97b2055
 DIST julia-cacert-2020-01-01.pem 223687 BLAKE2B 29d2ce73380897a5841deef1c7eb5e61ff3f5c278ab95286bbfdf5b1c4d41ae94402dc5cb376975977f2d31030e0df872273942a1b6cc91b7ff35ecfd7efc1c2 SHA512 cc129ae1a4377a43a74b0854b6eccb2b315cdfce018142d1dd5524fb64c8945cde067cb18f366351fa7d6af3f9f36cf21bc1f626f987f9e4627878472ea59cde
 DIST julia-dsfmt-2.2.3.tar.gz 291773 BLAKE2B 6ffae90494d72527920c80fc0fb005da1c7b84f8a03a7ecb0789434c0fff97359e5098e85431896dffccc7d5148c414e847aaba5feef648b8788421a466ff65e SHA512 6d8ddcd01aab3f9039f4f0288a8af53e290cc2f293ed8c4a8c9f3b3f12398e7eedfce8016117b425766ba89c61c86c13b3e420035b5f9bf91315b8b814c03662
-DIST julia-libgit2-b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3.tar.gz 4981505 BLAKE2B b2a414690de2c8eea5247260d76a3ff447e4f925a3c749e88cb9bfe96d1e3086be04534801fdf9d1eb1f8d84c6a6dc0eb4b6401be311ed3d5391ec9d481b1dda SHA512 7384a7eeeb36ac79d4e7e1336546e48f8fc820653f887f944c3902fcaae4e59d855679b39c5279b7372995934e549e34c526e1459a82032206913f9747b3dd08
+DIST julia-libuv-1fcc6d66f9df74189c74d3d390f02202bb7db953.tar.gz 1590342 BLAKE2B eca658f74421587aec78cb38f5a712033afb072e6425a6ce28fd5d4bac61e41cacbd5a850c1f2b29c386b944d1d9c4f16b7d090f7d2dd6b963b5dbc94ae18981 SHA512 70b0c738a60b4e476750b7de8d120e735359e2c36fcb3a8a38628a0ae326210ed3b15d793dfd5443d7aa5603e83e7d99f567aa4c1696846d950df9f83648669c
 DIST julia-libuv-2348256acf5759a544e5ca7935f638d2bc091d60.tar.gz 1555710 BLAKE2B 31ce57d23765c142799dd985a5511751d63238cf7e082fd1ad5574bf62201e9d6cb53b8da5dcc724765ccb4abd63da3ca6d6cbd45e078310c2ffa3859d09b8e4 SHA512 c8bf3c736a60feb0c6994aa7cd1b80e1a45bd6096aa66db320ddfc27b59a0797d303338ea75978619173e4f0a680254f3db29c9f6d1b84361030cc11c7729c98
 DIST julia-libuv-35b1504507a7a4168caae3d78db54d1121b121e1.tar.gz 1577394 BLAKE2B 8ab36f781619f710a64ddc6cf257a4c2f6d27ac22e33ed6f184902d0c6cc3a3941254e0a825071fcd57f869e3ccc5eaf71856539cf6b484358d5aafe383000a9 SHA512 5932e9105346e952fd0f51f79898e5b9c993261ec1558408437647ab3b3ce282562f1e0a16db5704cb66e7aa7a4c6a75dd7f0da498a98b1b6af48da88b4869f0
 DIST julia-libwhich-81e9723c0273d78493dc8c8ed570f68d9ce7e89e.tar.gz 4183 BLAKE2B c932e23b1b476d3fd16cf6f451efd5fc6d9c1ec2c53e8ac086340a100817d9b30dae3eff50b284a42c09b2bbae30b9e2fd38b2881f8cbf4974a89f3bd0c87599 SHA512 6fb77b715d70d9bc95a8546c3bf97bd3677c7ea344b88bb5bc3bbfac9dceabe8a8cde7a0f64dec884cde802e4a3000e30837d3f824b5a9242348c4fe061526a3
 DIST julia-utf8proc-0890a538bf8238cded9be0c81171f57e43f2c755.tar.gz 155521 BLAKE2B 32dc1a8fb641e89057d317e579f1802b7f7dfbdbea7f91c01b282b9a88c2fc6143743d5e45f46d6d465857cfe1b28bd39e9a0da19e80516536c57cb62b139d27 SHA512 95d6dba2bbdfc5003f6d21fd02c926c7db9661895010041aacee55fa11dc2524bcffaa90965e2a9a8f2a9e49e93ec7572d6a4de6d5d9f9e075b787537864ea20
 DIST julia-utf8proc-454f60150c7f023526d353e1e6b386f93ee0b116.tar.gz 154318 BLAKE2B 6173490aa458f300f29d6fc0f22b80ccff436f4c52df2ac54786a3f518a140ab6624cef0a7221c8e3800307c9b8490a604215fcb028001b1b95e7630b62ed85d SHA512 50a19aa56edc5c023611c40e75862f4c9c08e1bfad0bac9ec64413406cff8f409ff106a37f8c66202e563cbe3ae1d5a40036b14fd309651b50c30d3f205f08f5
 DIST julia-utf8proc-5c632c57426f2e4246e3b64dd2fd088d3920f9e5.tar.gz 154973 BLAKE2B 9696fae33c408abbddd2c5741a0c98b11474c7615d6610e53be919a3cce4a58f129de4ae36bb02636e94d1e57504103e8dd3a3faad3ce7c38e1dba0f513d2d47 SHA512 dec5d7e976bd808bc8edc39dda62b85ecb462b98b6059ace4acee27ec75f6839e0a2899a9baa225379ae5ffb5b568c63a666f52c9958075e5af0376f8a284534
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvm-9.0.1.src.tar.xz 33035112 BLAKE2B 5ae7ac42507cb14983eec0785dfc9b9c788cae75d5493ddf6734da55d3733cc90e35634aa39aa536654d4b68c3ccb7c2f989746f21c634c8989a57d9d32a15b2 SHA512 bfb6960a4dd1e18f4005f324f478a781c69e8ec7c20569d9b243fcb9372dc7733b254f26c683373537990cc9c109c78eaf0f65449629ee17caca1bce9b9ccccd
--- a/dev-lang/julia/julia-1.2.0.ebuild
+++ b/dev-lang/julia/julia-1.2.0.ebuild
@ -1,200 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 RESTRICT="test"
 inherit pax-utils toolchain-funcs
 MY_PV="${PV//_rc/-rc}"
 MY_LIBUV_V="2348256acf5759a544e5ca7935f638d2bc091d60"
 MY_UTF8PROC_V="454f60150c7f023526d353e1e6b386f93ee0b116"
 MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
 MY_DSFMT_V="2.2.3"
 MY_LLVM="6.0.1"
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="https://julialang.org/"
 SRC_URI="
 	https://github.com/JuliaLang/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz
 	https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
 	https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
 	https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
 	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
 	http://releases.llvm.org/${MY_LLVM}/llvm-${MY_LLVM}.src.tar.xz
 "
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND+="
 	dev-libs/double-conversion:0=
 	dev-libs/gmp:0=
 	dev-libs/libgit2:0=
 	>=dev-libs/libpcre2-10.23:0=[jit]
 	dev-libs/mpfr:0=
 	dev-libs/openspecfun
 	sci-libs/amd:0=
 	sci-libs/arpack:0=
 	sci-libs/camd:0=
 	sci-libs/ccolamd:0=
 	sci-libs/cholmod:0=
 	sci-libs/colamd:0=
 	sci-libs/fftw:3.0=[threads]
 	sci-libs/openlibm:0=
 	sci-libs/spqr:0=
 	sci-libs/umfpack:0=
 	sci-mathematics/glpk:0=
 	>=sys-libs/libunwind-1.1:0=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
 	>=virtual/blas-3.6
 	virtual/lapack"
 DEPEND="${RDEPEND}
 	dev-vcs/git
 	dev-util/patchelf
 	virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch
 	"${FILESDIR}"/${PN}-1.1.0-fix_llvm_install.patch
 )
 S="${WORKDIR}/${PN}-${MY_PV}"
 src_unpack() {
 	tounpack=(${A})
 	# the main source tree, followed by deps
 	unpack "${A/%\ */}"
 	mkdir -p "${S}/deps/srccache/"
 	for i in "${tounpack[@]:1}"; do
 		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
 	done
 }
 src_prepare() {
 	default
 	# Sledgehammer:
 	# - prevent fetching of bundled stuff in compile and install phase
 	# - respect CFLAGS
 	# - respect EPREFIX and Gentoo specific paths
 	# - fix BLAS and LAPACK link interface
 	sed -i \
 		-e 's|git submodule|${EPREFIX}/bin/true|g' \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
 		-e "s|/usr/include|${EPREFIX}/usr/include|g" \
 		deps/Makefile || die
 	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
 	libblas="${libblas%% *}"
 	libblas="lib${libblas#-l}"
 	local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
 	liblapack="${liblapack%% *}"
 	liblapack="lib${liblapack#-l}"
 	sed -i \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
 		-e "s|GENTOOLIBDIR|$(get_libdir)|" \
 		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
 		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
 		-e "s|= libblas|= ${libblas}|" \
 		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
 		-e "s|= liblapack|= ${liblapack}|" \
 		Make.inc || die
 	sed -i \
 		-e "s|,lib)|,$(get_libdir))|g" \
 		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
 		Makefile || die
 	sed -i \
 		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
 		src/Makefile || die
 	# disable doc install starting	git fetching
 	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
 }
 src_configure() {
 	# julia does not play well with the system versions of dsfmt, libuv,
 	# and utf8proc
 	# USE_SYSTEM_LIBM=0 implies using external openlibm
 	cat <<-EOF > Make.user
 		USE_SYSTEM_ARPACK:=1
 		USE_SYSTEM_BLAS:=1
 		USE_SYSTEM_DSFMT:=0
 		USE_SYSTEM_GMP:=1
 		USE_SYSTEM_GRISU:=1
 		USE_SYSTEM_LAPACK:=1
 		USE_SYSTEM_LIBGIT2:=1
 		USE_SYSTEM_LIBM:=0
 		USE_SYSTEM_LIBUNWIND:=1
 		USE_SYSTEM_LIBUV:=0
 		USE_SYSTEM_LLVM:=0
 		USE_SYSTEM_MPFR:=1
 		USE_SYSTEM_OPENLIBM:=1
 		USE_SYSTEM_OPENSPECFUN:=1
 		USE_SYSTEM_PATCHELF:=1
 		USE_SYSTEM_PCRE:=1
 		USE_SYSTEM_READLINE:=1
 		USE_SYSTEM_RMATH:=0
 		USE_SYSTEM_SUITESPARSE:=1
 		USE_SYSTEM_UTF8PROC:=0
 		USE_SYSTEM_ZLIB=1
 		VERBOSE=1
 		libdir="${EROOT}/usr/$(get_libdir)"
 	EOF
 }
 src_compile() {
 	# Julia accesses /proc/self/mem on Linux
 	addpredict /proc/self/mem
 	emake cleanall
 	emake julia-release \
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
 		USE_BINARYBUILDER=0
 	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
 	emake USE_BINARYBUILDER=0
 }
 src_test() {
 	emake test
 }
 src_install() {
 	# Julia is special. It tries to find a valid git repository (that would
 	# normally be cloned during compilation/installation). Just make it
 	# happy...
 	git init && \
 		git config --local user.email "whatyoudoing@example.com" && \
 		git config --local user.name "Whyyyyyy" && \
 		git commit -a --allow-empty -m "initial" || die "git failed"
 	emake install \
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
 		USE_BINARYBUILDER=0
 	cat > 99julia <<-EOF
 		LDPATH=${EROOT}/usr/$(get_libdir)/julia
 	EOF
 	doenvd 99julia
 	dodoc README.md
 	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
 	rmdir "${ED}"/usr/etc || die
 	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
 	rmdir "${ED}"/usr/share/doc/julia || die
 }
--- a/dev-lang/julia/julia-1.3.0.ebuild
+++ b/dev-lang/julia/julia-1.3.0.ebuild
@ -1,201 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 RESTRICT="test"
 inherit pax-utils toolchain-funcs
 MY_PV="${PV//_rc/-rc}"
 MY_LIBUV_V="35b1504507a7a4168caae3d78db54d1121b121e1"
 MY_UTF8PROC_V="5c632c57426f2e4246e3b64dd2fd088d3920f9e5"
 MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
 MY_DSFMT_V="2.2.3"
 MY_LLVM="6.0.1"
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="https://julialang.org/"
 SRC_URI="
 	https://github.com/JuliaLang/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz
 	https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
 	https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
 	https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
 	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
 	http://releases.llvm.org/${MY_LLVM}/llvm-${MY_LLVM}.src.tar.xz
 "
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND+="
 	dev-libs/double-conversion:0=
 	dev-libs/gmp:0=
 	dev-libs/libgit2:0=
 	>=dev-libs/libpcre2-10.23:0=[jit]
 	dev-libs/mpfr:0=
 	dev-libs/openspecfun
 	>=net-libs/mbedtls-2.2
 	net-libs/libssh2
 	sci-libs/amd:0=
 	sci-libs/arpack:0=
 	sci-libs/camd:0=
 	sci-libs/ccolamd:0=
 	sci-libs/cholmod:0=
 	sci-libs/colamd:0=
 	sci-libs/fftw:3.0=[threads]
 	sci-libs/openlibm:0=
 	sci-libs/spqr:0=
 	sci-libs/umfpack:0=
 	sci-mathematics/glpk:0=
 	>=sys-libs/libunwind-1.1:0=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
 	>=virtual/blas-3.6
 	virtual/lapack"
 DEPEND="${RDEPEND}
 	dev-vcs/git
 	dev-util/patchelf
 	virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch
 	"${FILESDIR}"/${PN}-1.1.0-fix_llvm_install.patch
 )
 S="${WORKDIR}/${PN}-${MY_PV}"
 src_unpack() {
 	tounpack=(${A})
 	# the main source tree, followed by deps
 	unpack "${A/%\ */}"
 	mkdir -p "${S}/deps/srccache/"
 	for i in "${tounpack[@]:1}"; do
 		cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
 	done
 }
 src_prepare() {
 	default
 	# Sledgehammer:
 	# - prevent fetching of bundled stuff in compile and install phase
 	# - respect CFLAGS
 	# - respect EPREFIX and Gentoo specific paths
 	# - fix BLAS and LAPACK link interface
 	sed -i \
 		-e 's|git submodule|${EPREFIX}/bin/true|g' \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
 		-e "s|/usr/include|${EPREFIX}/usr/include|g" \
 		deps/Makefile || die
 	local libblas="$($(tc-getPKG_CONFIG) --libs-only-l blas)"
 	libblas="${libblas%% *}"
 	libblas="lib${libblas#-l}"
 	local liblapack="$($(tc-getPKG_CONFIG) --libs-only-l lapack)"
 	liblapack="${liblapack%% *}"
 	liblapack="lib${liblapack#-l}"
 	sed -i \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
 		-e "s|GENTOOLIBDIR|$(get_libdir)|" \
 		-e "s|^JULIA_COMMIT = .*|JULIA_COMMIT = v${PV}|" \
 		-e "s|-lblas|$($(tc-getPKG_CONFIG) --libs blas)|" \
 		-e "s|= libblas|= ${libblas}|" \
 		-e "s|-llapack|$($(tc-getPKG_CONFIG) --libs lapack)|" \
 		-e "s|= liblapack|= ${liblapack}|" \
 		Make.inc || die
 	sed -i \
 		-e "s|,lib)|,$(get_libdir))|g" \
 		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
 		Makefile || die
 	sed -i \
 		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
 		src/Makefile || die
 	# disable doc install starting	git fetching
 	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
 }
 src_configure() {
 	# julia does not play well with the system versions of dsfmt, libuv,
 	# and utf8proc
 	# USE_SYSTEM_LIBM=0 implies using external openlibm
 	cat <<-EOF > Make.user
 		USE_SYSTEM_LLVM:=0
 		USE_SYSTEM_LIBUNWIND:=1
 		USE_SYSTEM_PCRE:=1
 		USE_SYSTEM_LIBM:=0
 		USE_SYSTEM_OPENLIBM:=1
 		USE_SYSTEM_DSFMT:=0
 		USE_SYSTEM_BLAS:=1
 		USE_SYSTEM_LAPACK:=1
 		USE_SYSTEM_GMP:=1
 		USE_SYSTEM_MPFR:=1
 		USE_SYSTEM_SUITESPARSE:=1
 		USE_SYSTEM_LIBUV:=0
 		USE_SYSTEM_UTF8PROC:=0
 		USE_SYSTEM_MBEDTLS:=1
 		USE_SYSTEM_LIBSSH2:=1
 		USE_SYSTEM_CURL:=1
 		USE_SYSTEM_LIBGIT2:=1
 		USE_SYSTEM_PATCHELF:=1
 		USE_SYSTEM_ZLIB:=1
 		USE_SYSTEM_P7ZIP:=1
 		VERBOSE=1
 		libdir="${EROOT}/usr/$(get_libdir)"
 	EOF
 }
 src_compile() {
 	# Julia accesses /proc/self/mem on Linux
 	addpredict /proc/self/mem
 	emake cleanall
 	emake julia-release \
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
 		USE_BINARYBUILDER=0
 	pax-mark m $(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')
 	emake USE_BINARYBUILDER=0
 }
 src_test() {
 	emake test
 }
 src_install() {
 	# Julia is special. It tries to find a valid git repository (that would
 	# normally be cloned during compilation/installation). Just make it
 	# happy...
 	git init && \
 		git config --local user.email "whatyoudoing@example.com" && \
 		git config --local user.name "Whyyyyyy" && \
 		git commit -a --allow-empty -m "initial" || die "git failed"
 	emake install \
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
 		USE_BINARYBUILDER=0
 	cat > 99julia <<-EOF
 		LDPATH=${EROOT}/usr/$(get_libdir)/julia
 	EOF
 	doenvd 99julia
 	dodoc README.md
 	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
 	rmdir "${ED}"/usr/etc || die
 	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
 	rmdir "${ED}"/usr/share/doc/julia || die
 }
--- a/dev-lang/julia/julia-1.4.0-r1.ebuild
+++ b/dev-lang/julia/julia-1.4.0-r1.ebuild
@ -1,192 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 RESTRICT="splitdebug"
 inherit llvm pax-utils toolchain-funcs
 MY_PV="${PV//_rc/-rc}"
 MY_CACERT_V="2020-01-01"
 MY_DSFMT_V="2.2.3"
 MY_LIBGIT2_V="b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3"
 MY_LIBUV_V="35b1504507a7a4168caae3d78db54d1121b121e1"
 MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
 MY_PKG_V="49908bffe83790bc7cf3c5d46faf3667f8902ad4"
 MY_UTF8PROC_V="5c632c57426f2e4246e3b64dd2fd088d3920f9e5"
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="https://julialang.org/"
 SRC_URI="
 	https://github.com/JuliaLang/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz
 	https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
 	https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
 	https://api.github.com/repos/libgit2/libgit2/tarball/${MY_LIBGIT2_V} -> ${PN}-libgit2-${MY_LIBGIT2_V}.tar.gz
 	https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
 	https://curl.haxx.se/ca/cacert-${MY_CACERT_V}.pem -> ${PN}-cacert-${MY_CACERT_V}.pem
 	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
 	https://dev.gentoo.org/~tamiko/distfiles/Pkg-${MY_PKG_V}.tar.gz -> ${PN}-Pkg-${MY_PKG_V}.tar.gz
 "
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 RDEPEND="
 	sys-devel/llvm:9=[llvm_targets_NVPTX(-)]
 "
 LLVM_MAX_SLOT=9
 RDEPEND+="
 	dev-libs/double-conversion:0=
 	dev-libs/gmp:0=
 	>=dev-libs/libpcre2-10.23:0=[jit,unicode]
 	dev-libs/mpfr:0=
 	dev-libs/openspecfun
 	>=net-libs/mbedtls-2.2
 	net-libs/libssh2
 	sci-libs/amd:0=
 	sci-libs/arpack:0=
 	sci-libs/camd:0=
 	sci-libs/ccolamd:0=
 	sci-libs/cholmod:0=
 	sci-libs/colamd:0=
 	sci-libs/fftw:3.0=[threads]
 	sci-libs/openlibm:0=
 	sci-libs/spqr:0=
 	sci-libs/umfpack:0=
 	sci-mathematics/glpk:0=
 	>=sys-libs/libunwind-1.1:0=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
 	>=virtual/blas-3.6
 	virtual/lapack"
 DEPEND="${RDEPEND}
 	dev-util/patchelf
 	virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.0-fix_build_system.patch
 	"${FILESDIR}"/${PN}-1.1.0-fix_llvm_install.patch
 	"${FILESDIR}"/${PN}-1.4.0-no_symlink_llvm.patch
 )
 S="${WORKDIR}/${PN}-${MY_PV}"
 src_unpack() {
 	tounpack=(${A})
 	# the main source tree, followed by deps
 	unpack "${A/%\ */}"
 	mkdir -p "${S}/deps/srccache/"
 	for i in "${tounpack[@]:1}"; do
 		if [[ $i == *Pkg* ]] || [[ $i = *Statistics* ]]; then
 			# Bundled Pkg and Statistics packages go into ./stdlib
 			local tarball="${i#julia-}"
 			cp "${DISTDIR}/${i}" "${S}/stdlib/srccache/${tarball}" || die
 			# and we have to fix up the sha1sum
 			local name="${tarball%-*}"
 			local sha1="${tarball#*-}"
 			sha1="${sha1%.tar*}"
 			einfo "using patched stdlib package \"${name}\""
 			sed -i -e "s/PKG_SHA1 = .*/PKG_SHA1 = ${sha1}/" "${S}/stdlib/${name}.version" || die
 		else
 			cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die
 		fi
 	done
 }
 src_prepare() {
 	default
 	# Sledgehammer:
 	# - prevent fetching of bundled stuff in compile and install phase
 	# - respect CFLAGS
 	# - respect EPREFIX and Gentoo specific paths
 	sed -i \
 		-e "s|git submodule|${EPREFIX}/bin/true|g" \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
 		-e "s|/usr/include|${EPREFIX}/usr/include|g" \
 		deps/Makefile || die
 	sed -i \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
 		-e "s|GENTOOLIBDIR|$(get_libdir)|" \
 		Make.inc || die
 	sed -i \
 		-e "s|,lib)|,$(get_libdir))|g" \
 		-e "s|\$(BUILD)/lib|\$(BUILD)/$(get_libdir)|g" \
 		Makefile || die
 	sed -i \
 		-e "s|ar -rcs|$(tc-getAR) -rcs|g" \
 		src/Makefile || die
 	# disable doc install starting	git fetching
 	sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die
 }
 src_configure() {
 	# julia does not play well with the system versions of dsfmt, libuv,
 	# and utf8proc
 	# USE_SYSTEM_LIBM=0 implies using external openlibm
 	cat <<-EOF > Make.user
 		USE_BINARYBUILDER:=0
 		USE_SYSTEM_LLVM:=1
 		USE_SYSTEM_LIBUNWIND:=1
 		USE_SYSTEM_PCRE:=1
 		USE_SYSTEM_LIBM:=0
 		USE_SYSTEM_OPENLIBM:=1
 		USE_SYSTEM_DSFMT:=0
 		USE_SYSTEM_BLAS:=1
 		USE_SYSTEM_LAPACK:=1
 		USE_SYSTEM_GMP:=1
 		USE_SYSTEM_MPFR:=1
 		USE_SYSTEM_SUITESPARSE:=1
 		USE_SYSTEM_LIBUV:=0
 		USE_SYSTEM_UTF8PROC:=0
 		USE_SYSTEM_MBEDTLS:=1
 		USE_SYSTEM_LIBSSH2:=1
 		USE_SYSTEM_CURL:=1
 		USE_SYSTEM_PATCHELF:=1
 		USE_SYSTEM_ZLIB:=1
 		USE_SYSTEM_P7ZIP:=1
 		VERBOSE=1
 		libdir="${EROOT}/usr/$(get_libdir)"
 	EOF
 }
 src_compile() {
 	# Julia accesses /proc/self/mem on Linux
 	addpredict /proc/self/mem
 	emake julia-release \
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
 	emake
 }
 src_test() {
 	emake test
 }
 src_install() {
 	emake install \
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
 		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
 	dodoc README.md
 	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
 	rmdir "${ED}"/usr/etc || die
 	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
 	rmdir "${ED}"/usr/share/doc/julia || die
 }
--- a/dev-lang/julia/julia-1.5.2-r1.ebuild
+++ b/dev-lang/julia/julia-1.5.2-r1.ebuild
@ -198,6 +198,9 @@ src_install() {
 	rmdir "${ED}"/usr/etc || die
 	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
 	rmdir "${ED}"/usr/share/doc/julia || die
 	# The appdata directory is deprecated.
 	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
 }
 pkg_postinst() {
--- a/dev-lang/julia/julia-1.4.0-r2.ebuild
+++ b/dev-lang/julia/julia-1.4.0-r2.ebuild
@ -3,19 +3,19 @@
 EAPI=7
 RESTRICT="splitdebug"
 inherit llvm pax-utils toolchain-funcs
 # correct versions for stdlibs are in deps/checksums
 # for everything else, run with network-sandbox and wait for the crash
 MY_PV="${PV//_rc/-rc}"
 MY_CACERT_V="2020-01-01"
 MY_DSFMT_V="2.2.3"
-MY_LIBGIT2_V="b3e1a56ebb2b9291e82dc027ba9cbcfc3ead54d3"
+MY_LIBUV_V="1fcc6d66f9df74189c74d3d390f02202bb7db953"
 MY_LIBUV_V="35b1504507a7a4168caae3d78db54d1121b121e1"
 MY_LIBWHICH_V="81e9723c0273d78493dc8c8ed570f68d9ce7e89e"
-MY_LLVM_V="8.0.1"
+MY_LLVM_V="9.0.1"
 MY_PKG_V="49908bffe83790bc7cf3c5d46faf3667f8902ad4"
-MY_UTF8PROC_V="5c632c57426f2e4246e3b64dd2fd088d3920f9e5"
+MY_UNICODE_V="13.0.0"
 MY_UTF8PROC_V="0890a538bf8238cded9be0c81171f57e43f2c755"
 DESCRIPTION="High-performance programming language for technical computing"
 HOMEPAGE="https://julialang.org/"
@ -23,12 +23,11 @@ SRC_URI="
 	https://github.com/JuliaLang/${PN}/releases/download/v${MY_PV}/${PN}-${MY_PV}.tar.gz
 	https://api.github.com/repos/JuliaLang/libuv/tarball/${MY_LIBUV_V} -> ${PN}-libuv-${MY_LIBUV_V}.tar.gz
 	https://api.github.com/repos/JuliaLang/utf8proc/tarball/${MY_UTF8PROC_V} -> ${PN}-utf8proc-${MY_UTF8PROC_V}.tar.gz
 	https://api.github.com/repos/libgit2/libgit2/tarball/${MY_LIBGIT2_V} -> ${PN}-libgit2-${MY_LIBGIT2_V}.tar.gz
 	https://api.github.com/repos/vtjnash/libwhich/tarball/${MY_LIBWHICH_V} -> ${PN}-libwhich-${MY_LIBWHICH_V}.tar.gz
 	https://curl.haxx.se/ca/cacert-${MY_CACERT_V}.pem -> ${PN}-cacert-${MY_CACERT_V}.pem
 	http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${MY_DSFMT_V}.tar.gz -> ${PN}-dsfmt-${MY_DSFMT_V}.tar.gz
 	http://www.unicode.org/Public/${MY_UNICODE_V}/ucd/UnicodeData.txt -> ${PN}-UnicodeData-${MY_UNICODE_V}.txt
 	https://dev.gentoo.org/~tamiko/distfiles/Pkg-${MY_PKG_V}.tar.gz -> ${PN}-Pkg-${MY_PKG_V}.tar.gz
-	!system-llvm? ( http://releases.llvm.org/${MY_LLVM_V}/llvm-${MY_LLVM_V}.src.tar.xz )
+	!system-llvm? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-${MY_LLVM_V}/llvm-${MY_LLVM_V}.src.tar.xz )
 "
 LICENSE="MIT"
@ -38,17 +37,23 @@ IUSE="system-llvm"
 RDEPEND="
 	system-llvm? ( sys-devel/llvm:9=[llvm_targets_NVPTX(-)] )
 	!system-llvm? ( dev-util/cmake )
 "
 LLVM_MAX_SLOT=9
 # Silence some QA warnings. The julia build system does not use user
 # defined CFLAGS for some of the generated binary modules.
 QA_FLAGS_IGNORED='.*'
 RDEPEND+="
 	dev-libs/double-conversion:0=
 	dev-libs/gmp:0=
 	dev-libs/libgit2:0
 	>=dev-libs/libpcre2-10.23:0=[jit,unicode]
 	dev-libs/mpfr:0=
 	dev-libs/openspecfun
 	>=net-libs/mbedtls-2.2
 	net-libs/libssh2
 	>=net-libs/mbedtls-2.2
 	sci-libs/amd:0=
 	sci-libs/arpack:0=
 	sci-libs/camd:0=
@ -60,6 +65,7 @@ RDEPEND+="
 	sci-libs/spqr:0=
 	sci-libs/umfpack:0=
 	sci-mathematics/glpk:0=
 	sci-mathematics/z3
 	>=sys-libs/libunwind-1.1:0=
 	sys-libs/readline:0=
 	sys-libs/zlib:0=
@ -114,7 +120,6 @@ src_prepare() {
 	# - respect EPREFIX and Gentoo specific paths
 	sed -i \
 		-e "s|git submodule|${EPREFIX}/bin/true|g" \
 		-e "s|GENTOOCFLAGS|${CFLAGS}|g" \
 		-e "s|/usr/include|${EPREFIX}/usr/include|g" \
 		deps/Makefile || die
@ -162,6 +167,7 @@ src_configure() {
 		USE_SYSTEM_MBEDTLS:=1
 		USE_SYSTEM_LIBSSH2:=1
 		USE_SYSTEM_CURL:=1
 		USE_SYSTEM_LIBGIT2:=1
 		USE_SYSTEM_PATCHELF:=1
 		USE_SYSTEM_ZLIB:=1
 		USE_SYSTEM_P7ZIP:=1
@ -175,21 +181,17 @@ src_compile() {
 	# Julia accesses /proc/self/mem on Linux
 	addpredict /proc/self/mem
-	emake julia-release \
+	emake \
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)"
 	pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')"
 	emake
 }
 src_test() {
 	emake test
 }
 src_install() {
 	emake install \
 		prefix="${EPREFIX}/usr" DESTDIR="${D}" \
-		CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+		CC="$(tc-getCC)" CXX="$(tc-getCXX)" AR="$(tc-getAR)" \
 		BUNDLE_DEBUG_LIBS=0
 	if ! use system-llvm ; then
 		cp "${S}/usr/lib/libLLVM"-?jl.so "${ED}/usr/$(get_libdir)/julia/" || die
@ -199,8 +201,11 @@ src_install() {
 	mv "${ED}"/usr/etc/julia "${ED}"/etc || die
 	rmdir "${ED}"/usr/etc || die
-	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/${PF} || die
+	mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die
 	rmdir "${ED}"/usr/share/doc/julia || die
 	# The appdata directory is deprecated.
 	mv "${ED}"/usr/share/{appdata,metainfo}/ || die
 }
 pkg_postinst() {
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@ -5,3 +5,5 @@ DIST lua-5.3.4-tests.tar.gz 103438 BLAKE2B ac82708022e7729039111c3df4fe24302c8d0
 DIST lua-5.3.6.tar.gz 303770 BLAKE2B 07c37c56f43095a4f6ca8eb8b3adf19afd53107c02b62b2bcb3619565cb2100d5f823493eef93092d5e312b30fc28885a6d9e8f0ba5a23b5bed86dc4515a5d61 SHA512 ccc380d5e114d54504de0bfb0321ca25ec325d6ff1bfee44b11870b660762d1a9bf120490c027a0088128b58bb6b5271bbc648400cab84d2dc22b512c4841681
 DIST lua-5.4.1-tests.tar.gz 128646 BLAKE2B 2dae666e89bacf986228a33fc665bbc510e738d9f8791933f5048e4bbecaf6cd59c5e70e488d332b16960225aac3b9fae46e500f3b54856bb6aabe8cd3a5c932 SHA512 ac7cf113d96f8fe2af4f104297a70debd3bede5997627fc18db6b5d9c78ff49e05a165f5855894def5656c6dcc2d7d9ccce741c90da17698a5c714a33828f49a
 DIST lua-5.4.1.tar.gz 353965 BLAKE2B e5b46fcf2eb2ea9bd235793cefec2bf19f185ed51b11bc6133bda4e3639f09194378b2fd55544972ee32576751e80bba87b3b61ec3d4a0910592d6e5cb4a4c77 SHA512 49ffbe814ec41e515fc8502b6958151c6c56aa171412f0b211ad9de934be2c958c3709d49435885ddea0fa6765ed511dafb3537558950ff3b4261338214f1571
 DIST lua-5.4.2-tests.tar.gz 128901 BLAKE2B 10e4f0e8760f9cbd4761fa26665008ae7412539f79a6a7687029808f08f0ae4a24721e787e2e87e5080c16e9dcce8577a7a39ddc6d3e483a3cfe11756139594e SHA512 1516c59deca211c38444bbf97b18e988e939209b03915d3691d756eeed31b52e8d3a1f05b71ac0b561965274c7b6f3afc4244cd2e9069995696e737e2d9dd40b
 DIST lua-5.4.2.tar.gz 353472 BLAKE2B 7e0e642684df635ed1c48db45989e86a2638024e30a170addf700b0c7d32276f1eaef80898539c671039c20cb0bed4861b12c58f4b8211653a17e89bad278d87 SHA512 9454a6ffd973598f2f4a2399834c31c4d5090bd12e716776e3189aa57760319d114ee64a8338bbc2ef5e08150bf0adc2ad94a1b2677f38538a43359969d4d920
--- a/dev-lang/lua/files/lua-5.4.2-make.patch
+++ b/dev-lang/lua/files/lua-5.4.2-make.patch
@ -0,0 +1,99 @@
 diff --git a/Makefile b/Makefile
 index 1797df9..90284d8 100644
 --- a/Makefile
 +++ b/Makefile
@@ -10,11 +10,11 @@ PLAT= guess
 # so take care if INSTALL_TOP is not an absolute path. See the local target.
 # You may want to make INSTALL_LMOD and INSTALL_CMOD consistent with
 # LUA_ROOT, LUA_LDIR, and LUA_CDIR in luaconf.h.
 -INSTALL_TOP= /usr/local
 +INSTALL_TOP= /usr
 INSTALL_BIN= $(INSTALL_TOP)/bin
 -INSTALL_INC= $(INSTALL_TOP)/include
 +INSTALL_INC= $(INSTALL_TOP)/include/lua$V
 INSTALL_LIB= $(INSTALL_TOP)/lib
 -INSTALL_MAN= $(INSTALL_TOP)/man/man1
 +INSTALL_MAN= $(INSTALL_TOP)/share/man/man1
 INSTALL_LMOD= $(INSTALL_TOP)/share/lua/$V
 INSTALL_CMOD= $(INSTALL_TOP)/lib/lua/$V
@@ -104,3 +104,18 @@ pc:
 .PHONY: all $(PLATS) help test clean install uninstall local dummy echo pc
 # (end of Makefile)
 +
 +# Use libtool for binary installs, etc.
 +
 +export V
 +export LIBTOOL = $(BROOT)/usr/bin/libtool --quiet --tag=CC
 +# See libtool manual about how to set this
 +
 +gentoo_clean:
 +	cd src; $(MAKE) $@
 +
 +gentoo_install:
 +	mkdir -p $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB)
 +	cd src; $(LIBTOOL) --mode=install $(INSTALL_EXEC) lua$V luac$V $(INSTALL_BIN)
 +	cd src; $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC)
 +	cd src; $(LIBTOOL) --mode=install $(INSTALL_DATA) liblua$V.la $(INSTALL_LIB)
 diff --git a/src/Makefile b/src/Makefile
 index 514593d..8af8f99 100644
 --- a/src/Makefile
 +++ b/src/Makefile
@@ -37,10 +37,10 @@ CORE_O=	lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem
 LIB_O=	lauxlib.o lbaselib.o lcorolib.o ldblib.o liolib.o lmathlib.o loadlib.o loslib.o lstrlib.o ltablib.o lutf8lib.o linit.o
 BASE_O= $(CORE_O) $(LIB_O) $(MYOBJS)
 -LUA_T=	lua
 +LUA_T=	lua$V
 LUA_O=	lua.o
 -LUAC_T=	luac
 +LUAC_T=	luac$V
 LUAC_O=	luac.o
 ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
@@ -60,10 +60,10 @@ $(LUA_A): $(BASE_O)
 	$(AR) $@ $(BASE_O)
 	$(RANLIB) $@
 -$(LUA_T): $(LUA_O) $(LUA_A)
 +origin$(LUA_T): $(LUA_O) $(LUA_A)
 	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
 -$(LUAC_T): $(LUAC_O) $(LUA_A)
 +origin$(LUAC_T): $(LUAC_O) $(LUA_A)
 	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
 test:
@@ -218,3 +218,30 @@ lzio.o: lzio.c lprefix.h lua.h luaconf.h llimits.h lmem.h lstate.h \
  lobject.h ltm.h lzio.h
 # (end of Makefile)
 +
 +export LIBTOOL = $(BROOT)/usr/bin/libtool --quiet --tag=CC
 +export LIB_VERSION = 6:1:1
 +
 +# The following rules use libtool for compiling and linking in order to
 +# provide shared library support.
 +
 +LIB_NAME = liblua$V.la
 +LIB_OBJS = $(CORE_O:.o=.lo) $(LIB_O:.o=.lo)
 +
 +%.lo %.o: %.c
 +	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
 +
 +$(LIB_NAME): $(LIB_OBJS)
 +	$(LIBTOOL) --mode=link $(CC) -version-info $(LIB_VERSION) \
 +            -rpath $(RPATH) $(LDFLAGS) -o $(LIB_NAME) $(LIB_OBJS) $(LIB_LIBS)
 +
 +$(LUA_T): $(LUA_O:.o=.lo) $(LIB_NAME)
 +	$(LIBTOOL) --mode=link $(CC) -static -export-dynamic $(LDFLAGS) -o $@ $(LUA_O:.o=.lo) $(LIB_NAME) $(LUA_LIBS)
 +
 +$(LUAC_T): $(LUAC_O:.o=.lo) $(LIB_NAME)
 +	$(LIBTOOL) --mode=link $(CC) -static $(LDFLAGS) -o $@ $(LUAC_O:.o=.lo) $(LIB_NAME)
 +
 +gentoo_clean:
 +	$(LIBTOOL) --mode=clean $(RM) $(ALL_O:.o=.lo) $(LIB_NAME) lua$V luac$V
 +
 +gentoo_all: $(LIB_NAME) $(LUA_T) $(LUAC_T)
--- a/dev-lang/lua/lua-5.4.2.ebuild
+++ b/dev-lang/lua/lua-5.4.2.ebuild
@ -0,0 +1,197 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools multilib multilib-minimal portability toolchain-funcs
 DESCRIPTION="A powerful light-weight programming language designed for extending applications"
 HOMEPAGE="http://www.lua.org/"
 TEST_PV="5.4.2"
 TEST_P="${PN}-${TEST_PV}-tests"
 SRC_URI="
 	http://www.lua.org/ftp/${P}.tar.gz
 	test? ( https://www.lua.org/tests/${TEST_P}.tar.gz )"
 LICENSE="MIT"
 SLOT="5.4"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+deprecated readline test test-complete"
 COMMON_DEPEND="
 	>=app-eselect/eselect-lua-3
 	readline? ( sys-libs/readline:0= )
 	!dev-lang/lua:0"
 DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}"
 BDEPEND="sys-devel/libtool"
 RESTRICT="!test? ( test )"
 MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/lua${SLOT}/luaconf.h
 )
 PATCHES=(
 	"${FILESDIR}"/lua-5.4.2-make.patch
 )
 src_prepare() {
 	default
 	# use glibtool on Darwin (versus Apple libtool)
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		sed -i -e '/LIBTOOL = /s:/libtool:/glibtool:' \
 			Makefile src/Makefile || die
 	fi
 	# correct lua versioning
 	sed -i -e 's/\(LIB_VERSION = \)6:1:1/\10:0:0/' src/Makefile || die
 	sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html || die
 	# Using dynamic linked lua is not recommended for performance
 	# reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
 	# Mainly, this is of concern if your arch is poor with GPRs, like x86
 	# Note that this only affects the interpreter binary (named lua), not the lua
 	# compiler (built statically) nor the lua libraries.
 	# upstream does not use libtool, but we do (see bug #336167)
 	cp "${FILESDIR}/configure.in" "${S}/configure.ac" || die
 	eautoreconf
 	# custom Makefiles
 	multilib_copy_sources
 }
 multilib_src_configure() {
 	sed -i \
 		-e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
 		-e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
 		src/luaconf.h \
 	|| die "failed patching luaconf.h"
 	econf
 }
 multilib_src_compile() {
 	tc-export CC
 	# what to link to liblua
 	liblibs="-lm"
 	liblibs="${liblibs} $(dlopen_lib)"
 	# what to link to the executables
 	mylibs=
 	use readline && mylibs="-lreadline"
 	cd src
 	local myCFLAGS=""
 	use deprecated && myCFLAGS="-DLUA_COMPAT_5_3"
 	use readline && myCFLAGS="-DLUA_USE_READLINE"
 	case "${CHOST}" in
 		*-mingw*) : ;;
 		*) myCFLAGS+=" -DLUA_USE_LINUX" ;;
 	esac
 	emake CC="${CC}" CFLAGS="${myCFLAGS} ${CFLAGS}" \
 			SYSLDFLAGS="${LDFLAGS}" \
 			RPATH="${EPREFIX}/usr/$(get_libdir)/" \
 			LUA_LIBS="${mylibs}" \
 			LIB_LIBS="${liblibs}" \
 			V=$(ver_cut 1-2) \
 			gentoo_all
 }
 multilib_src_install() {
 	emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
 			V=${SLOT} gentoo_install
 	case $SLOT in
 		0)
 			LIBNAME="lua"
 			INCLUDEDIR_SUFFIX=''
 			;;
 		*)	LIBNAME="lua${SLOT}"
 			INCLUDEDIR_SUFFIX="/lua${SLOT}"
 			;;
 	esac
 	# We want packages to find our things...
 	# A slotted Lua uses different directories for headers & names for
 	# libraries, and pkgconfig should reflect that.
 	local PATCH_PV=$(ver_cut 1-2)
 	cp "${FILESDIR}/lua.pc" "${WORKDIR}" || die
 	sed -r -i \
 		-e "/^INSTALL_INC=/s,(/include)$,\1/lua${SLOT}," \
 		-e "s:^prefix= :prefix= ${EPREFIX}:" \
 		-e "s:^V=.*:V= ${PATCH_PV}:" \
 		-e "s:^R=.*:R= ${PV}:" \
 		-e "s:/,lib,:/$(get_libdir):g" \
 		-e "/^Libs:/s:( )(-llua)($| ):\1-l${LIBNAME}\3:" \
 		-e "/^includedir=/s:include$:include${INCLUDEDIR_SUFFIX}:" \
 		"${WORKDIR}/lua.pc" || die
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	newins "${WORKDIR}/lua.pc" "lua${SLOT}.pc"
 	# Copy Debian's symlink support:
 	# https://salsa.debian.org/lua-team/lua5.3/blob/master/debian/rules#L19
 	# FreeBSD calls the pkgconfig 'lua-5.3.pc'
 	# Older systems called it 'lua53.pc'
 	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua-${SLOT}.pc"
 	dosym "lua${SLOT}.pc" "/usr/$(get_libdir)/pkgconfig/lua${SLOT/.}.pc"
 }
 multilib_src_install_all() {
 	DOCS="README"
 	HTML_DOCS="doc/*.html doc/*.png doc/*.css doc/*.gif"
 	einstalldocs
 	newman doc/lua.1 lua${SLOT}.1
 	newman doc/luac.1 luac${SLOT}.1
 	find "${ED}" -name '*.la' -delete || die
 	find "${ED}" -name 'liblua*.a' -delete || die
 }
 # Makefile contains a dummy target that doesn't do tests
 # but causes issues with slotted lua (bug #510360)
 src_test() {
 	debug-print-function ${FUNCNAME} "$@"
 	cd "${WORKDIR}/lua-${TEST_PV}-tests" || die
 	# https://www.lua.org/tests/
 	# There are two sets:
 	# basic
 	# complete.
 	#
 	# The basic subset is selected by passing -e'_U=true'
 	# The complete set is noted to contain tests that may consume too much memory or have non-portable tests.
 	# attrib.lua for example needs some multilib customization (have to compile the stuff in libs/ for each ABI)
 	TEST_OPTS="$(usex test-complete '' '-e_U=true')"
 	TEST_MARKER="${T}/test.failed"
 	rm -f "${TEST_MARKER}"
 	# If we are failing, set the marker file, and only check it after done all ABIs
 	abi_src_test() {
 		debug-print-function ${FUNCNAME} "$@"
 		TEST_LOG="${T}/test.${MULTIBUILD_ID}.log"
 		eval "${BUILD_DIR}"/src/lua${SLOT} ${TEST_OPTS} all.lua 2>&1 | tee "${TEST_LOG}" || die
 		grep -sq -e "final OK" "${TEST_LOG}" || echo "FAIL ${MULTIBUILD_ID}" >>"${TEST_MARKER}"
 		return 0
 	}
 	multilib_foreach_abi abi_src_test
 	if [ -e "${TEST_MARKER}" ]; then
 		cat "${TEST_MARKER}"
 		die "Tests failed"
 	fi
 }
 pkg_postinst() {
 	eselect lua set --if-unset "${PN}${SLOT}"
 	if has_version "app-editor/emacs"; then
 		if ! has_version "app-emacs/lua-mode"; then
 			einfo "Install app-emacs/lua-mode for lua support for emacs"
 		fi
 	fi
 }
--- a/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
+++ b/dev-lang/perl/files/perl-5.30.3-darwin-macos11.patch
@ -0,0 +1,180 @@
 https://github.com/Perl/perl5/pull/17946
 https://bugs.gentoo.org/757249
 ---
 From b382aafc793fe1007f9058a5145a1d39d56cef70 Mon Sep 17 00:00:00 2001
 From: Adam Hartley <git@ahartley.com>
 Date: Mon, 6 Jul 2020 22:59:42 +0100
 Subject: [PATCH 1/7] Add 11.x support for darwin.sh
 ---
 hints/darwin.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/hints/darwin.sh b/hints/darwin.sh
 index 0a91bc083c0..c0f06de1cab 100644
 --- a/hints/darwin.sh
 +++ b/hints/darwin.sh
@@ -301,7 +301,7 @@ case "$osvers" in  # Note: osvers is the kernel version, not the 10.x
    # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
    # capturing its value and adding it to the flags.
     case "$MACOSX_DEPLOYMENT_TARGET" in
 -    10.*)
 +    10.* | 11.*)
       add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
       add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
       ;;
@@ -327,7 +327,7 @@ EOM
     # "ProductVersion:    10.11"     "10.11"
         prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
     case "$prodvers" in
 -    10.*)
 +    10.* | 11.*)
       add_macosx_version_min ccflags $prodvers
       add_macosx_version_min ldflags $prodvers
       ;;
 From 960d1a5c4225d1dd12636a469e10a568464e4e7c Mon Sep 17 00:00:00 2001
 From: Adam Hartley <git@ahartley.com>
 Date: Wed, 8 Jul 2020 19:10:33 +0100
 Subject: [PATCH 3/7] Update error message
 ---
 hints/darwin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 diff --git a/hints/darwin.sh b/hints/darwin.sh
 index c0f06de1cab..988b766c4f4 100644
 --- a/hints/darwin.sh
 +++ b/hints/darwin.sh
@@ -313,7 +313,7 @@ case "$osvers" in  # Note: osvers is the kernel version, not the 10.x
 *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
 ***
 -*** Please either set it to 10.something, or to empty.
 +*** Please either set it to 10.something, 11.something or to empty.
 EOM
       exit 1
 From d633cced1d5174e19c5f2234a9fb4c7603cfb9db Mon Sep 17 00:00:00 2001
 From: Adam Hartley <git@ahartley.com>
 Date: Sat, 11 Jul 2020 11:41:27 +0100
 Subject: [PATCH 4/7] Update deprecated syscall check for 11.x and greater
 ---
 hints/darwin.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/hints/darwin.sh b/hints/darwin.sh
 index 988b766c4f4..4f73a9995e7 100644
 --- a/hints/darwin.sh
 +++ b/hints/darwin.sh
@@ -342,11 +342,11 @@ EOM
       exit 1
     esac
 -    # The X in 10.X
 +    prodvers_major=$(echo $prodvers|awk -F. '{print $1}')
     prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
     # macOS (10.12) deprecated syscall().
 -    if [ "$prodvers_minor" -ge 12 ]; then
 +    if [[ ( "$prodvers_minor" -ge 12 && "$prodvers_major" -eq 10 ) || "$prodvers_major" -ge 11 ]]; then
         d_syscall='undef'
         # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
         case "$MACOSX_DEPLOYMENT_TARGET" in
 From 9c3890f8521a7db6d9b2aa21561c7d0dae9fb91d Mon Sep 17 00:00:00 2001
 From: Adam Hartley <BytesGuy@users.noreply.github.com>
 Date: Wed, 22 Jul 2020 13:15:30 +0100
 Subject: [PATCH 5/7] Simplify syscall check
 ---
 hints/darwin.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 diff --git a/hints/darwin.sh b/hints/darwin.sh
 index 4f73a9995e7..40c84cf267a 100644
 --- a/hints/darwin.sh
 +++ b/hints/darwin.sh
@@ -342,11 +342,10 @@ EOM
       exit 1
     esac
 -    prodvers_major=$(echo $prodvers|awk -F. '{print $1}')
 -    prodvers_minor=$(echo $prodvers|awk -F. '{print $2}')
 +    darwin_major=$(echo $osvers|awk -F. '{print $1}')
 -    # macOS (10.12) deprecated syscall().
 -    if [[ ( "$prodvers_minor" -ge 12 && "$prodvers_major" -eq 10 ) || "$prodvers_major" -ge 11 ]]; then
 +    # macOS 10.12 (darwin 6.0.0) deprecated syscall().
 +    if [ "$darwin_major" -ge 6 ]; then
         d_syscall='undef'
         # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
         case "$MACOSX_DEPLOYMENT_TARGET" in
 From 99ff8934992102a3db63805e8ba9710577de164e Mon Sep 17 00:00:00 2001
 From: Adam Hartley <BytesGuy@users.noreply.github.com>
 Date: Wed, 22 Jul 2020 13:15:53 +0100
 Subject: [PATCH 6/7] Update darwin.sh
 ---
 hints/darwin.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 diff --git a/hints/darwin.sh b/hints/darwin.sh
 index 40c84cf267a..1709d224f7c 100644
 --- a/hints/darwin.sh
 +++ b/hints/darwin.sh
@@ -344,8 +344,8 @@ EOM
     darwin_major=$(echo $osvers|awk -F. '{print $1}')
 -    # macOS 10.12 (darwin 6.0.0) deprecated syscall().
 -    if [ "$darwin_major" -ge 6 ]; then
 +    # macOS 10.12 (darwin 16.0.0) deprecated syscall().
 +    if [ "$darwin_major" -ge 16 ]; then
         d_syscall='undef'
         # If deploying to pre-10.12, suppress Time::HiRes's detection of the system clock_gettime()
         case "$MACOSX_DEPLOYMENT_TARGET" in
 From 1b712e4b359d9508461a0a832d06baa6e589b955 Mon Sep 17 00:00:00 2001
 From: Adam Hartley <BytesGuy@users.noreply.github.com>
 Date: Thu, 23 Jul 2020 19:53:07 +0100
 Subject: [PATCH 7/7] Future proof version check
 ---
 hints/darwin.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 diff --git a/hints/darwin.sh b/hints/darwin.sh
 index 1709d224f7c..fdfbdd4a3b9 100644
 --- a/hints/darwin.sh
 +++ b/hints/darwin.sh
@@ -301,7 +301,7 @@ case "$osvers" in  # Note: osvers is the kernel version, not the 10.x
    # We now use MACOSX_DEPLOYMENT_TARGET, if set, as an override by
    # capturing its value and adding it to the flags.
     case "$MACOSX_DEPLOYMENT_TARGET" in
 -    10.* | 11.*)
 +    [1-9][0-9].*)
       add_macosx_version_min ccflags $MACOSX_DEPLOYMENT_TARGET
       add_macosx_version_min ldflags $MACOSX_DEPLOYMENT_TARGET
       ;;
@@ -313,7 +313,7 @@ case "$osvers" in  # Note: osvers is the kernel version, not the 10.x
 *** Unexpected MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
 ***
 -*** Please either set it to 10.something, 11.something or to empty.
 +*** Please either set it to a valid macOS version number (e.g., 10.15) or to empty.
 EOM
       exit 1
@@ -327,7 +327,7 @@ EOM
     # "ProductVersion:    10.11"     "10.11"
         prodvers=`sw_vers|awk '/^ProductVersion:/{print $2}'|awk -F. '{print $1"."$2}'`
     case "$prodvers" in
 -    10.* | 11.*)
 +    [1-9][0-9].*)
       add_macosx_version_min ccflags $prodvers
       add_macosx_version_min ldflags $prodvers
       ;;
--- a/dev-lang/perl/perl-5.30.3-r1.ebuild
+++ b/dev-lang/perl/perl-5.30.3-r1.ebuild
@ -51,7 +51,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="berkdb debug doc gdbm ithreads minimal"
@ -140,8 +140,6 @@ pkg_setup() {
 		*-openbsd*)   osname="openbsd" ;;
 		*-darwin*)    osname="darwin" ;;
 		*-solaris*)   osname="solaris" ;;
 		*-interix*)   osname="interix" ;;
 		*-aix*)       osname="aix" ;;
 		*-cygwin*)    osname="cygwin" ;;
 		*)            osname="linux" ;;
 	esac
@ -342,6 +340,10 @@ src_prepare() {
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fix install_name (soname) not to reference $D
 		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
 		# Upstreamed, but not in this version.
 		# Need to recognise macOS 11 / 10.16. #757249
 		eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch"
 	fi
 	default
@ -463,6 +465,10 @@ src_configure() {
 	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
 		append-cflags -Dinline=__inline__
 	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
 	[[ ${CHOST} == sparc-*-solaris* ]] && \
 		myconf -Ud_flock
 	# fix unaligned access misdetection
 	# https://rt.perl.org/Public/Bug/Display.html?id=133495
 	# https://rt.perl.org/Public/Bug/Display.html?id=133803
@ -478,7 +484,7 @@ src_configure() {
 		# Set a hook to check for each detected library whether it actually works.
 		export libscheck="
 			( echo 'main(){}' > '${T}'/conftest.c &&
-			  $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
 			) || xxx=/dev/null"
 		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
--- a/dev-lang/perl/perl-5.30.3-r2.ebuild
+++ b/dev-lang/perl/perl-5.30.3-r2.ebuild
@ -53,7 +53,7 @@ if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
 # SOMEWHAT EXPERIMENTAL CODE, DO NOT USE WITHOUT AN ADULT PRESENT, CHECK CHANGELOG
 # FOR DETAILS
 KEYWORDS=""
-# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="berkdb debug doc gdbm ithreads"
@ -142,8 +142,6 @@ pkg_setup() {
 		*-openbsd*)   osname="openbsd" ;;
 		*-darwin*)    osname="darwin" ;;
 		*-solaris*)   osname="solaris" ;;
 		*-interix*)   osname="interix" ;;
 		*-aix*)       osname="aix" ;;
 		*-cygwin*)    osname="cygwin" ;;
 		*)            osname="linux" ;;
 	esac
@ -424,6 +422,10 @@ src_prepare() {
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fix install_name (soname) not to reference $D
 		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
 		# Upstreamed, but not in this version.
 		# Need to recognise macOS 11 / 10.16. #757249
 		eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch"
 	fi
 	default
@ -619,6 +621,10 @@ src_configure() {
 	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
 		append-cflags -Dinline=__inline__
 	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
 	[[ ${CHOST} == sparc-*-solaris* ]] && \
 		myconf -Ud_flock
 	# fix unaligned access misdetection
 	# https://rt.perl.org/Public/Bug/Display.html?id=133495
 	# https://rt.perl.org/Public/Bug/Display.html?id=133803
@ -634,7 +640,7 @@ src_configure() {
 		# Set a hook to check for each detected library whether it actually works.
 		export libscheck="
 			( echo 'main(){}' > '${T}'/conftest.c &&
-			  $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
 			) || xxx=/dev/null"
 		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
--- a/dev-lang/perl/perl-5.30.3.ebuild
+++ b/dev-lang/perl/perl-5.30.3.ebuild
@ -51,7 +51,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="berkdb debug doc gdbm ithreads"
@ -137,8 +137,6 @@ pkg_setup() {
 		*-openbsd*)   osname="openbsd" ;;
 		*-darwin*)    osname="darwin" ;;
 		*-solaris*)   osname="solaris" ;;
 		*-interix*)   osname="interix" ;;
 		*-aix*)       osname="aix" ;;
 		*-cygwin*)    osname="cygwin" ;;
 		*)            osname="linux" ;;
 	esac
--- a/dev-lang/perl/perl-5.32.0-r1.ebuild
+++ b/dev-lang/perl/perl-5.32.0-r1.ebuild
@ -53,7 +53,7 @@ if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
 # SOMEWHAT EXPERIMENTAL CODE, DO NOT USE WITHOUT AN ADULT PRESENT, CHECK CHANGELOG
 # FOR DETAILS
 KEYWORDS=""
-# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="berkdb debug doc gdbm ithreads minimal"
@ -145,8 +145,6 @@ pkg_setup() {
 		*-openbsd*)   osname="openbsd" ;;
 		*-darwin*)    osname="darwin" ;;
 		*-solaris*)   osname="solaris" ;;
 		*-interix*)   osname="interix" ;;
 		*-aix*)       osname="aix" ;;
 		*-cygwin*)    osname="cygwin" ;;
 		*)            osname="linux" ;;
 	esac
@ -427,6 +425,10 @@ src_prepare() {
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fix install_name (soname) not to reference $D
 		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
 		# Upstreamed, but not in this version.
 		# Need to recognise macOS 11 / 10.16. #757249
 		eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch"
 	fi
 	default
@ -622,6 +624,10 @@ src_configure() {
 	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
 		append-cflags -Dinline=__inline__
 	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
 	[[ ${CHOST} == sparc-*-solaris* ]] && \
 		myconf -Ud_flock
 	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
 	# Prefix itself we don't do multilib either, so make sure perl can find
 	# something compatible.
@ -629,7 +635,7 @@ src_configure() {
 		# Set a hook to check for each detected library whether it actually works.
 		export libscheck="
 			( echo 'main(){}' > '${T}'/conftest.c &&
-			  $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
 			) || xxx=/dev/null"
 		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
--- a/dev-lang/perl/perl-5.32.0.ebuild
+++ b/dev-lang/perl/perl-5.32.0.ebuild
@ -51,7 +51,7 @@ LICENSE="|| ( Artistic GPL-1+ )"
 SLOT="0/${SUBSLOT}"
 if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="berkdb debug doc gdbm ithreads minimal"
@ -141,8 +141,6 @@ pkg_setup() {
 		*-openbsd*)   osname="openbsd" ;;
 		*-darwin*)    osname="darwin" ;;
 		*-solaris*)   osname="solaris" ;;
 		*-interix*)   osname="interix" ;;
 		*-aix*)       osname="aix" ;;
 		*-cygwin*)    osname="cygwin" ;;
 		*)            osname="linux" ;;
 	esac
@ -343,6 +341,10 @@ src_prepare() {
 	if [[ ${CHOST} == *-darwin* ]] ; then
 		# fix install_name (soname) not to reference $D
 		sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die
 		# Upstreamed, but not in this version.
 		# Need to recognise macOS 11 / 10.16. #757249
 		eapply "${FILESDIR}/${PN}-5.30.3-darwin-macos11.patch"
 	fi
 	default
@ -464,6 +466,10 @@ src_configure() {
 	[[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \
 		append-cflags -Dinline=__inline__
 	# flock on 32-bit sparc Solaris is broken, fall back to fcntl
 	[[ ${CHOST} == sparc-*-solaris* ]] && \
 		myconf -Ud_flock
 	# Prefix: the host system needs not to follow Gentoo multilib stuff, and in
 	# Prefix itself we don't do multilib either, so make sure perl can find
 	# something compatible.
@ -471,7 +477,7 @@ src_configure() {
 		# Set a hook to check for each detected library whether it actually works.
 		export libscheck="
 			( echo 'main(){}' > '${T}'/conftest.c &&
-			  $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
+				$(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null
 			) || xxx=/dev/null"
 		# Use all host paths that might contain useful stuff, the hook above will filter out bad choices.
--- a/dev-lang/tcl/Manifest
+++ b/dev-lang/tcl/Manifest
@ -1,3 +1,4 @@
 DIST tcl-core8.6.10-src.tar.gz 6008840 BLAKE2B 592f708492e56da3577f190adc3da4f2979f32a570dfc29cb53fde58a83d804223dfe9527b76d094de3005a6e12dda73674573bab3af2e591b4573163b81b9c0 SHA512 de31ac8fc5226c831198af88befa05ccb1842dcfd209690e25b907f062033b3ae7a77bc12e85c4210ce85cfd7c598060e03fc81b0e624d422bfe4df655cc9068
 DIST tcl-core8.6.8-src.tar.gz 5887483 BLAKE2B 2b8428652e451b817fe63a811f910001929cdcbc8a8361cdf4f7df8e13cbf9b18c94a91c22c0f09cc46dc0174a66c44774b485539a8f24c14faee6658547b6b8 SHA512 36e6079b582c205e8c89435b361ef96550541357f473aea2ca4e6f01bd84e50ebd1474a75a1ae90640b9a5b392fb01ddfa71f0fa28e409b3569d88c32b4ddb69
 DIST tcl-core8.6.9-src.tar.gz 5932010 BLAKE2B ddc0cff12aeeebbf8d1c799db9e154a9ecbe2a2e2afce97c6f15c408301b7a40119bd1c861aa724c178bd9abfe0616c7bcafd9cf6714ed49cf882c9085222cf3 SHA512 306a38a27729b764bae2eae6c4cdd8cd6aee5de6bd924d6a487c8691ee874e4459abc1fa785183c2f6ff4d2d57be98093dd7460c5a668cf994e8f1c31516ae67
 DIST tcl8.5.17-src.tar.gz 4546317 BLAKE2B 27031dd3bd5790d03692e77edf91eb7fae8a40d8d193d8c8ce4e79b21f90e683bfc9d5b71764760223987fb163be844e6096d0aea1058b8ce255731d97e2a0ea SHA512 ad5ddb4cd6378fd6bbea8cd85ceb1cf90392b2e8c49fbfb3e4b35c81d3ae3e3f087697c41fcba8c8e06de1d9e7539397e26d58b864dc01ba65abe4ba4efa9568
--- a/dev-lang/tcl/files/tcl-8.6.10-multilib.patch
+++ b/dev-lang/tcl/files/tcl-8.6.10-multilib.patch
@ -0,0 +1,11 @@
 --- a/unix/configure.in	2020-12-26 10:39:12.107965844 +0100
 +++ b/unix/configure.in	2020-12-26 10:39:44.821378776 +0100
@@ -773,7 +773,7 @@
 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
 -test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
 +test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
 PRIVATE_INCLUDE_DIR='$(includedir)'
 HTML_DIR='$(DISTDIR)/html'
--- a/dev-lang/tcl/tcl-8.6.10.ebuild
+++ b/dev-lang/tcl/tcl-8.6.10.ebuild
@ -0,0 +1,136 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 MY_P="${PN}${PV}"
 DESCRIPTION="Tool Command Language"
 HOMEPAGE="http://www.tcl.tk/"
 SRC_URI="mirror://sourceforge/tcl/${PN}-core${PV}-src.tar.gz"
 LICENSE="tcltk"
 SLOT="0/8.6"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug +threads"
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}"
 SPARENT="${WORKDIR}/${MY_P}"
 S="${SPARENT}"/unix
 PATCHES=(
 	"${FILESDIR}"/${P}-multilib.patch
 	"${FILESDIR}"/${PN}-8.6.8-conf.patch # Bug 125971
 	"${FILESDIR}"/${PN}-8.6.9-include-spec.patch # Bug 731120
 )
 src_prepare() {
 	find \
 		"${SPARENT}"/compat/* \
 		"${SPARENT}"/doc/try.n \
 		-delete || die
 	pushd "${SPARENT}" &>/dev/null || die
 	default
 	popd &>/dev/null || die
 	# httpold tests require netowk
 	rm ../tests/httpold.test \
 		../tests/env.test \
 		../tests/http.test \
 		|| die
 	# workaround stack check issues, bug #280934
 	use hppa && append-cflags "-DTCL_NO_STACK_CHECK=1"
 	tc-export CC
 	sed \
 		-e '/chmod/s:555:755:g' \
 		-i Makefile.in || die
 	sed \
 		-e 's:-O[2s]\?::g' \
 		-i tcl.m4 || die
 	mv configure.{in,ac} || die
 	eautoconf
 	multilib_copy_sources
 }
 multilib_src_configure() {
 	# We went ahead and deleted the whole compat/ subdir which means
 	# the configure tests to detect broken versions need to pass (else
 	# we'll fail to build).  This comes up when cross-compiling, but
 	# might as well get a minor configure speed up normally.
 	export ac_cv_func_memcmp_working="yes"
 	export tcl_cv_str{str,toul,tod}_unbroken="ok"
 	export tcl_cv_strtod_buggy="no"
 	econf \
 		$(use_enable threads) \
 		$(use_enable debug symbols)
 }
 multilib_src_install() {
 	#short version number
 	local v1=$(ver_cut 1-2)
 	local mylibdir=$(get_libdir)
 	S= default
 	# fix the tclConfig.sh to eliminate refs to the build directory
 	# and drop unnecessary -L inclusion to default system libdir
 	sed \
 		-e "/^TCL_BUILD_LIB_SPEC=/s:-L$(pwd) *::g" \
 		-e "/^TCL_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
 		-e "/^TCL_SRC_DIR=/s:${SPARENT}:${EPREFIX}/usr/${mylibdir}/tcl${v1}/include:g" \
 		-e "/^TCL_BUILD_STUB_LIB_SPEC=/s:-L$(pwd) *::g" \
 		-e "/^TCL_STUB_LIB_SPEC=/s:-L${EPREFIX}/usr/${mylibdir} *::g" \
 		-e "/^TCL_BUILD_STUB_LIB_PATH=/s:$(pwd):${EPREFIX}/usr/${mylibdir}:g" \
 		-e "/^TCL_LIBW_FILE=/s:'libtcl${v1}..TCL_DBGX..so':\"libtcl${v1}\$\{TCL_DBGX\}.so\":g" \
 		-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
 	if use prefix && [[ ${CHOST} != *-darwin* && ${CHOST} != *-mint* ]] ; then
 		sed \
 			-e "/^TCL_CC_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|g" \
 			-e "/^TCL_LD_SEARCH_FLAGS=/s|'$|:${EPREFIX}/usr/${mylibdir}'|" \
 			-i "${ED}"/usr/${mylibdir}/tclConfig.sh || die
 	fi
 	# install private headers
 	insinto /usr/${mylibdir}/tcl${v1}/include/unix
 	doins *.h
 	insinto /usr/${mylibdir}/tcl${v1}/include/generic
 	doins "${SPARENT}"/generic/*.h
 	rm -f "${ED}"/usr/${mylibdir}/tcl${v1}/include/generic/{tcl,tclDecls,tclPlatDecls}.h || die
 	# install symlink for libraries
 	dosym libtcl${v1}$(get_libname) /usr/${mylibdir}/libtcl$(get_libname)
 	dosym libtclstub${v1}.a /usr/${mylibdir}/libtclstub.a
 	if multilib_is_native_abi; then
 		dosym tclsh${v1} /usr/bin/tclsh
 		dodoc "${SPARENT}"/{ChangeLog*,README.md,changes}
 	fi
 }
 pkg_postinst() {
 	for version in ${REPLACING_VERSIONS}; do
 		if ver_test 8.6 -lt ${version}; then
 			echo
 			ewarn "You're upgrading from <${P}, you must recompile the other"
 			ewarn "packages on your system that link with tcl after the upgrade"
 			ewarn "completes. To perform this action, please run revdep-rebuild"
 			ewarn "in package app-portage/gentoolkit."
 			ewarn "If you have dev-lang/tk and dev-tcltk/tclx installed you should"
 			ewarn "upgrade them before this recompilation, too,"
 			echo
 		fi
 	done
 }
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@ -1,3 +1,4 @@
 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++-8.3.0.ebuild
+++ b/dev-libs/crypto++/crypto++-8.3.0.ebuild
@ -0,0 +1,49 @@
 # 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"
 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"
 IUSE="+asm static-libs"
 BDEPEND="app-arch/unzip"
 config_uncomment() {
 	sed -i -e "s://\s*\(#define\s*$1\):\1:" config.h || die
 }
 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_configure() {
 	export CXX="$(tc-getCXX)"
 	export LIBDIR="${EPREFIX}/usr/$(get_libdir)"
 	export PREFIX="${EPREFIX}/usr"
 	tc-export AR RANLIB
 	default
 }
 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/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@ -6,9 +6,13 @@ DIST cudnn-10.1-linux-x64-v7.6.1.34.tgz 521806738 BLAKE2B 9804ed394cf58f0c415d45
 DIST cudnn-10.1-linux-x64-v7.6.2.24.tgz 522872521 BLAKE2B 6424ade8443521138b36bb528105bc482202ff475dd3eb3aaa7f992e8ad8b67628ac1b464d10056f16bb5766fb8464abe8ae406f8766831d248b90796d146c1e SHA512 3451c113b4dcb8aaa33b2740e0e0b60d121ef02525c4e8ece3d7afd76b3472f704a90eb69d1a06f2bc94a981c2bfa3bea2f3bd057dcbdc6eecdea1056563057d
 DIST cudnn-10.1-linux-x64-v7.6.5.32.tgz 523418497 BLAKE2B 28febb24382d411faa870cd42e999431d1ee1d083c09903ee4a8f5bee676981c60f6daf6cd256978db69345397db743a7a6f6187376520f5c4f968f6177e0201 SHA512 1073bc42c2c36fce6b710882a04a4035d66d95c410200b9d50953e993d7b801cc3a837e42843ad2447e62ea5dfc8ba22c8a803464716c56ffb811aa278645771
 DIST cudnn-10.1-linux-x64-v8.0.4.30.tgz 678710754 BLAKE2B 5ad59925a500968eef8306c7e207c12ea2f55deecd2d044d7f1f158b76264aeb954f3029d1eaa5ef2aa6939c56e39177af28fc00cc04e2fdf26f9091ef46f3ca SHA512 419f2875a0b362107ede5d238250496c1011cb8e1fdaada1ebdca8737e9df4eaddd1d3a25feeb0ef9baa0100c9f84507e527ed922b676f7883e0594b017ed9d9
 DIST cudnn-10.1-linux-x64-v8.0.5.39.tgz 684924546 BLAKE2B 4bcab6d2347e06040ec46d4e2a8b3f5a8eaa2317ae86a8d852013956ca74e56d5079af9eff4b687b2a9e43fc1d244407c29d38f424db7c5b78a9c297839b5629 SHA512 af357c3be22e733891858ef0430005a19e52b8fa28ddac869fc7715f2ca8acbc51180f269ef8bba95f09de46fce76ac566c8d0edf420aea4c8b2fe44456e98bf
 DIST cudnn-10.2-linux-x64-v7.6.5.32.tgz 548210361 BLAKE2B 51fdd14f0bbc5a029bddca94ab7ae56ee77c16fdc525c78b986bb3dc1e0525943e5ab17eb81e356ef92c985ee467bd87a6670c343a96136d932ace86bb649437 SHA512 943c1afc0b7711dec87931770eaa567e25361a31ed5e1edabcc3f81df72880428611308e8032a28dc197e8c5edfebe3f67cc9d22a21eb569d8b254d8eb84eac6
 DIST cudnn-10.2-linux-x64-v8.0.4.30.tgz 700128057 BLAKE2B 9883cb5993850b9dc0fe703925be4980b7768a6b1be940058f727e69e5d606f25b54ec3368fd22dddcc39092ac488ded4a9078c4ebb743e12c59688413c056cd SHA512 ab41425bc5fad91e9a4270059d8125efc93407956b64c2ecc926506d4c826f33fb7561b143b159e92b286937e940f05fb2f4059747ee80c28b1e7a4d8b53c000
 DIST cudnn-10.2-linux-x64-v8.0.5.39.tgz 706337907 BLAKE2B 1dda021f7c313b53fe6024bd7c0eccf3746a55b7399a63cf3160f2a474fd36e33273d8714dc099fed901b6be3dfac51d14033cdb0fe85c2019222127b695c9ef SHA512 867fc7ff9336656431069f01d5f59bb5da09d51dc38ba723d066a1b338646b704969a5c7595551b357b98e7d2204863d4d2b7a84708480e16dc3dbb604f26339
 DIST cudnn-11.0-linux-x64-v8.0.4.30.tgz 1048904376 BLAKE2B cb9ee44998ca17f670430e2e0641d3f804ff468e1b9fedc88ae6827b340917a89a8dafce88318f30f70333b06dea87c6f7b76851b3fbad6902b020b79e1cb085 SHA512 3364625e24bf5e57ceb4e38cf4eca81341245d9ba354816247537c943c70f9981719cf94873b19aa23b45c64d16a0374c0b9f60328e76f8e5b38f6c88610bff4
 DIST cudnn-11.0-linux-x64-v8.0.5.39.tgz 1085996495 BLAKE2B f8c9a9f75a25a7433bde9661c7d1843fe150f3d22cdcfc2682241159bcc777c2ad1892b5ed27f90097e45faaba4dd5e7fcda3c124061165e4ee1f808cbcad928 SHA512 5622a2d0bcc94405b9f83b3531f95204b6e24b43e7117b73d4d232bc5c25fb1a870a62be1310591fad83184e040dcfdf5358515550fd00cecd39a3002ac670c3
 DIST cudnn-11.1-linux-x64-v8.0.4.30.tgz 1510998061 BLAKE2B 1829886516d75ef6015cdbfe26ab8508d9e99d9a3c39b2fedc236663e509f4bfe9adaa54814906a2bb5b885379d4e2349e46d3580f815acdb16e9f73d51574d9 SHA512 57615fef93f0897ede6d65da255a61f2e84d25ef46cd85c5f65558ba4bd8fee6f1ff06a4b0ecf20d0ff92bfd019a3068c719cdcd0de0eb2d16b18caee4aae610
 DIST cudnn-11.1-linux-x64-v8.0.5.39.tgz 1548325637 BLAKE2B 6c846156b3d6b2c286ea2ec639dcaf887ca172b23d98bed5227c312a4cf79381d5b81c763e6237cb57f3ad47500042cef6d454d43755110defcb6f98b6e7a28a SHA512 f704df22336376a9053a7c1f22e650beab61c6829325e0c221416f38a867180a65f9aca7a6f14f5a61c0b450d24a1dff27df47d996d3d26ff1c300b9bedaacc6
 DIST cudnn-9.1-linux-x64-v7.tgz 343081241 BLAKE2B 22c2fbef38a05e7929ccc28410dfdbff906b2c3e97e0419cf83988c2fc2340005e4a944d43b1a215b0c3458b2cad03480b7e537ae93861924c28ec1010a530fb SHA512 7eadb64a3d5e49aec2761e6f7dc0295c1d356910b114eed450c47081fc81b6e3b7748f3a4153f6a9d957691e3689cd52823bfa12816b1950dfc8794d6f332749
 DIST cudnn-9.2-linux-x64-v7.1.tgz 421083972 BLAKE2B 1a1dd6708132d6ad6f8f541694b1406de4a26b7bb78b6198bc8ec5ddde2172d0cc0dc540c7c446a2f941ad11cfafa562235d17129ab8e6aa641433c35c8d31d6 SHA512 2f67c905976eb041512eb012a7cc98e1f408ec867f6a1d9d440afbcddc622c03c40de10386e44e4ab138c1a4ad040d39b0e9243f68e22975ca27ec297be25c5d
--- a/dev-libs/cudnn/cudnn-8.0.5.39.ebuild
+++ b/dev-libs/cudnn/cudnn-8.0.5.39.ebuild
@ -0,0 +1,40 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
 HOMEPAGE="https://developer.nvidia.com/cuDNN"
 SRC_URI="cuda11-1? ( cudnn-11.1-linux-x64-v${PV}.tgz )
 	cuda11-0? ( cudnn-11.0-linux-x64-v${PV}.tgz )
 	cuda10-2? ( cudnn-10.2-linux-x64-v${PV}.tgz )
 	cuda10-1? ( cudnn-10.1-linux-x64-v${PV}.tgz )"
 SLOT="0/8"
 KEYWORDS="~amd64 ~amd64-linux"
 RESTRICT="fetch"
 LICENSE="NVIDIA-cuDNN"
 QA_PREBUILT="*"
 IUSE="cuda10-1 cuda10-2 cuda11-0 +cuda11-1"
 REQUIRED_USE="^^ ( cuda10-2 cuda10-1 cuda11-0 cuda11-1 )"
 S="${WORKDIR}"
 DEPEND="cuda11-1? ( =dev-util/nvidia-cuda-toolkit-11.1* )
 	cuda11-0? ( =dev-util/nvidia-cuda-toolkit-11.0* )
 	cuda10-2? ( =dev-util/nvidia-cuda-toolkit-10.2* )
 	cuda10-1? ( =dev-util/nvidia-cuda-toolkit-10.1* )"
 RDEPEND="${DEPEND}"
 src_install() {
 	insinto /opt/cuda
 	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
 	insinto /opt/cuda/targets/x86_64-linux/include
 	doins -r cuda/include/*
 	insinto /opt/cuda/targets/x86_64-linux/lib
 	doins -r cuda/lib*/*
 }
--- a/dev-libs/isl/isl-0.23-r1.ebuild
+++ b/dev-libs/isl/isl-0.23-r1.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://isl.gforge.inria.fr/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0/23"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="static-libs"
 RDEPEND=">=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}]"
--- a/dev-libs/libpqxx/libpqxx-7.2.1.ebuild
+++ b/dev-libs/libpqxx/libpqxx-7.2.1.ebuild
@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 inherit python-any-r1
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 DESCRIPTION="Standard front-end for writing C++ programs that use PostgreSQL"
 SRC_URI="https://github.com/jtv/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
--- a/dev-libs/libzia/Manifest
+++ b/dev-libs/libzia/Manifest
@ -1,4 +1,2 @@
 DIST libzia-4.21.tar.gz 631871 BLAKE2B 8c54ae86e38569914c05da6c11b8ffe2c349884fb4e8ea00b05b88da12f6ee4e80ddac82f1790b67586c24d9df5b0ab71053fc80479cfdde22250a034db6dbef SHA512 e4277dfc3c004a0a1d1ccd8a11431e46344763ff5df68403b451e2be4b6bd00862fe2af0e15ce9017c3d6144d301e792f9279632687697e0dd4a238c805b04a8
 DIST libzia-4.22.tar.gz 626973 BLAKE2B 6cc87ce5bb11824fc6fbaebbf1ab3c4728884d626c18455088e02d61f84d361f194d07567eed5408671e0c31c015e1fb1d9245294457e699a0342f8487778023 SHA512 1b04460e3706e13e7b6e680a1c58c72131a7f7436a40e9b74ddfd1119cb8507e509658081b9d2daa8eb085f101091a897f8ffec518d74d4409cbd07d999d2c40
 DIST libzia-4.23.tar.gz 627405 BLAKE2B 913173aca367dd660b8e04502e1198072e99e9ece5cd30ef2d4ad528292b3aba00799d89ee336bdf6a1cebf43118610caddfeeedccdd4b5af48bd54ac795066b SHA512 c34aff9b8a19713ea9881ea5a58a038fe7f0127c3503c845ecd6187ab07f90f7ae2727331e43b9cfb6b8db15d8dcbf80b2e1f4105bb4a34e9b30d9778d3a815b
 DIST libzia-4.24.tar.gz 630318 BLAKE2B 83792c75e776b039788d46568a967690e10086b1f5daf3304a658721f1139bbed65b41a8fdcfe213757d342287696c383be7668be111896388b292086ca2cd0a SHA512 e7952822861d7702494309d70e9d7385c5dfa929b521387bc81883d4316a5fae96c5776b00f81da6dcbaa2965fdf30ac8a8a1b9963806d36454ebd6886ddcbd1
--- a/dev-libs/libzia/libzia-4.21.ebuild
+++ b/dev-libs/libzia/libzia-4.21.ebuild
@ -1,44 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools
 DESCRIPTION="platform abstraction code for tucnak package"
 HOMEPAGE="http://tucnak.nagano.cz"
 SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="ftdi"
 RDEPEND="dev-libs/glib:2
 	x11-libs/gtk+:2
 	media-libs/libsdl
 	media-libs/libpng:0
 	ftdi? ( dev-embedded/libftdi:0 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 MAKEOPTS+=" -j1"
 src_prepare() {
 	eapply_user
 	sed -i -e "s/docsdir/#docsdir/g" \
 		-e "s/docs_/#docs_/g" Makefile.am || die
 	eautoreconf
 }
 src_configure() {
 	econf \
 		$(use_with ftdi) --with-sdl \
 		--with-png --without-bfd \
 		--disable-static
 }
 src_install() {
 	emake DESTDIR="${D}" install
 	find "${D}" -name '*.la' -type f -delete || die
 }
--- a/dev-libs/libzia/libzia-4.22.ebuild
+++ b/dev-libs/libzia/libzia-4.22.ebuild
@ -1,48 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 inherit autotools
 DESCRIPTION="platform abstraction code for tucnak package"
 HOMEPAGE="http://tucnak.nagano.cz"
 SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="ftdi"
 RDEPEND="dev-libs/glib:2
 	x11-libs/gtk+:2
 	media-libs/libsdl
 	media-libs/libpng:0
 	ftdi? ( dev-embedded/libftdi:0 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 MAKEOPTS+=" -j1"
 src_prepare() {
 	eapply_user
 	sed -i -e "s/docsdir/#docsdir/g" \
 		-e "s/docs_/#docs_/g" Makefile.am || die
 	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
 	sed -i -e 's/@LDFLAGS@//' libzia.pc.in || die
 	eautoreconf
 }
 src_configure() {
 	econf \
 		$(use_with ftdi) --with-sdl \
 		--with-png --without-bfd \
 		--disable-static
 }
 src_install() {
 	emake DESTDIR="${D}" install
 	find "${D}" -name '*.la' -type f -delete || die
 }
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
--- a/dev-lua/luadoc/Manifest
+++ b/dev-lua/luadoc/Manifest
@ -1 +0,0 @@
 DIST luadoc-3.0.1.tar.gz 108824 BLAKE2B 52092feeb22cdcd7570ba5d54c57598d16688daba7c90d81dc975cfd2545c5e42e6f4b8f1bdc150c877f6b953cbb193d03d1a02f0ac48cfbc5cf1ec4a91b101c SHA512 413b40e72cc0699c00caf47fe3d7233c8619bfd6064eac001762bcb2ae0b21ccc6f800bd05566cd83924546e5616d1e5840d8bc20ec6d1f1c7a64910a9df6be2
--- a/dev-lua/luadoc/luadoc-3.0.1.ebuild
+++ b/dev-lua/luadoc/luadoc-3.0.1.ebuild
@ -1,36 +0,0 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DESCRIPTION="LuaDoc is a documentation tool for Lua source code"
 HOMEPAGE="http://luadoc.luaforge.net/"
 SRC_URI="http://luaforge.net/frs/download.php/3185/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE=""
 DEPEND=""
 RDEPEND=">=dev-lang/lua-5.1.3
 	dev-lua/luafilesystem"
 src_prepare() {
 	default
 	sed -i \
 		-e "s|/usr/local|\$(DESTDIR)/usr|" \
 		-e "s|lib|$(get_libdir)|" \
 		-e "s|lua5.1|lua|" \
 		config || die
 	# lua-5.1.3
 	find . -name '*.lua' -exec sed -i -e "s/gfind/gmatch/g" {} + || die
 }
 src_install() {
 	default
 	docinto html
 	dodoc -r doc/us/.
 }
--- a/dev-lua/luadoc/metadata.xml
+++ b/dev-lua/luadoc/metadata.xml
@ -1,11 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
  <!-- maintainer-needed -->
  <longdescription lang="en">
    LuaDoc is a documentation generator tool for Lua source code.
    It parses the declarations and documentation comments in a set of Lua
    source files and produces a set of XHTML pages describing the commented
    declarations and functions.
  </longdescription>
 </pkgmetadata>
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@ -1,3 +1 @@
 DIST argcomplete-1.12.0.tar.gz 53625 BLAKE2B 29b4f620537a087629c63dc71c6a0101d40967145680518b566b9c81e3e744c5d73e1ed016795f0ea4338be4e8f20b7df1968e388e1ff09308e012ed1ba6d0c0 SHA512 5e21e3caf1dcee661c0dadf28d7b127147325475fe3ae569fae8797a762c34b55125df9f52de8d76f0aa6dd4efdac260a358b325a7659beae02b1dedab501c18
 DIST argcomplete-1.12.1.tar.gz 53677 BLAKE2B 85c5d75b59875b6fe5bb932ed05916f3af23ef64b993544c69ae431d9e6b5d8c23a9bd35d76b570538ce8e722a6ffc8cbcbfbc9209fbf29ddb000c60a809c03c SHA512 236871966361ac781c04f52c02d90c20badabad12d34bd7c5cb1cf1a74d442f9147e04b320530b55abc0490f7bcd11494cdc13ed5c339c91737f1c979010d096
 DIST argcomplete-1.12.2.tar.gz 53861 BLAKE2B 59a8472818aef4967cb978302bd98b206b206beaf37ac7743b1e3460e3f184e4fe2dccbb48e1b436dfd1127248d3fa2f10ace81ba35c744d93adb5efedd7e470 SHA512 3099507eac285b396df1c02d7e7bdedc1dd26aaf599a81147ebaabe211a97362ddb94533c9bc733d30a9fe84fcb9d6b52794e4c12f99f881b320280d0d1479f0
--- a/dev-python/argcomplete/argcomplete-1.12.0-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.12.0-r1.ebuild
@ -1,35 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit distutils-r1
 DESCRIPTION="Bash tab completion for argparse"
 HOMEPAGE="https://pypi.org/project/argcomplete/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="
 	$(python_gen_cond_dep '
 		<dev-python/importlib_metadata-2[${PYTHON_USEDEP}]
 	' -2 python3_{5,6,7} pypy3)"
 # pip is called as an external tool
 BDEPEND="
 	test? (
 		app-shells/fish
 		app-shells/tcsh
 		dev-python/pexpect[${PYTHON_USEDEP}]
 		>=dev-python/pip-19
 	)"
 python_test() {
 	"${EPYTHON}" test/test.py -v || die
 }
--- a/dev-python/argcomplete/argcomplete-1.12.1-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.12.1-r1.ebuild
@ -1,35 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit distutils-r1
 DESCRIPTION="Bash tab completion for argparse"
 HOMEPAGE="https://pypi.org/project/argcomplete/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="
 	$(python_gen_cond_dep '
 		<dev-python/importlib_metadata-3[${PYTHON_USEDEP}]
 	' -2 python3_{5,6,7} pypy3)"
 # pip is called as an external tool
 BDEPEND="
 	test? (
 		app-shells/fish
 		app-shells/tcsh
 		dev-python/pexpect[${PYTHON_USEDEP}]
 		>=dev-python/pip-19
 	)"
 python_test() {
 	"${EPYTHON}" test/test.py -v || die
 }
--- a/dev-python/argcomplete/argcomplete-1.12.2.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.12.2.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@ -1,3 +1 @@
 DIST httpretty-0.9.6.tar.gz 7147633 BLAKE2B e1d02ddfce5ca987c6ef1a17723544f86a8573c2a6a26ec197072021e52015efce5064af21bfbe1ec03f3ac11c21717a80f114b5be2526b113e3bc0a608702f4 SHA512 bc1c64d34370209c732bc12dd9935600b647507ab2c8f18c85f348e9b5e853618ba39e10e5a073b35036e6cbe3db2cb7a342a721d0e4affa81fe178fd0b75d92
 DIST httpretty-1.0.2.tar.gz 399185 BLAKE2B 033e954fccf6a351c09dac3c1585ddc65f064eca109dfd8f499fd510ea09ba3ce5198d3f4b54fb832b47425ab721ddc1b2da596b6066028bda1f0a1303cdc0ed SHA512 f9ef1c82f4fe3a31696e06228cea512664c5118b3c32910d7810d1fcf16b05d31b9b55db7bb6bd64967aadb162a2952757627439769db9117164b8248de9049c
 DIST httpretty-1.0.3.tar.gz 411707 BLAKE2B b2211457c937e19f8110bc28446a2b78a8042a742341c0492589def7447e819f051d301e9d254260778f349302ccf6fc163a9f2280a55af925ae353752450320 SHA512 a6349257376c12198d0bf7923245c34f6b8a0889946ba0c2551fd3379a8d9a8e4610de81c66f945656c1879ad3fb1485f2f4148634fcc4e156b9f0a59f7dd758
--- a/dev-python/httpretty/httpretty-0.9.6.ebuild
+++ b/dev-python/httpretty/httpretty-0.9.6.ebuild
@ -1,43 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7} )
 inherit distutils-r1
 DESCRIPTION="HTTP client mock for Python"
 HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="amd64 ~arm64 ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
 		dev-python/sure[${PYTHON_USEDEP}]
 		dev-python/httplib2[${PYTHON_USEDEP}]
 		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
 		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
 )"
 python_prepare_all() {
 	# remove useless deps
 	sed -i -e '/randomly/d' -e '/rednose/d' setup.cfg || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	nosetests -v tests || die "Tests fail with ${EPYTHON}"
 }
--- a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
+++ b/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
@ -1,49 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 DESCRIPTION="HTTP client mock for Python"
 HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]"
 # redis skipped as it requires a redis server running
 DEPEND="
 	test? (
 		dev-python/eventlet[${PYTHON_USEDEP}]
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-python/httplib2[${PYTHON_USEDEP}]
 		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
 		dev-python/pyopenssl[${PYTHON_USEDEP}]
 		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
 		dev-python/sure[${PYTHON_USEDEP}]
 		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
 )"
 python_prepare_all() {
 	# remove useless deps
 	sed -i -e '/randomly/d' -e '/rednose/d' setup.cfg || die
 	# tests requiring network access
 	rm tests/functional/test_passthrough.py || die
 	# requires running redis server
 	# it is skipped correctly but it causes unnecessary dep on redis-py
 	rm tests/functional/bugfixes/test_redis.py || die
 	distutils-r1_python_prepare_all
 }
 python_test() {
 	nosetests -v tests || die "Tests fail with ${EPYTHON}"
 }
--- a/dev-python/httpretty/httpretty-1.0.3.ebuild
+++ b/dev-python/httpretty/httpretty-1.0.3.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-python/ifaddr/metadata.xml
+++ b/dev-python/ifaddr/metadata.xml
@ -8,6 +8,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
 	<!-- not suitable for ALLARCHES - uses cdll -->
 	<upstream>
 		<remote-id type="pypi">ifaddr</remote-id>
 	</upstream>
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@ -1,6 +1,4 @@
 DIST importlib_metadata-1.7.0.tar.gz 29233 BLAKE2B a8cd97a384ab06201025fcbdc401fb25788c2eb1dd4f1697ca00e79634cbce32b984cb8a7c2aeacfb0871f92857d08f3ce9c3ae43d698df7401db91add07b6ca SHA512 31f7cda6a1149ca2040032945b19b55d2e97ef8be67db1423c2c2cbb79da3dead46338f3c9eb03b46f9202fca08ed7bf388adc25d34903ddff4b2873c8a89aba
 DIST importlib_metadata-2.0.0.tar.gz 29289 BLAKE2B 4ec24db057006affe1dee20e021a47d385770b1aa905db4ff4223d59f19b53dc85c21475875074664a84a0fb6994493735f5e098d38f938816ebc69dced7a40d SHA512 3f789d717f04f7649dd4a75895669b4f9b875671937035c1c76bd089504afff8c2ba5bfb6a91096ba29eccadc88dca98ea1da5107772fd2053541db15c52b16a
 DIST importlib_metadata-3.1.0.tar.gz 29246 BLAKE2B 2144e10601e089e26e1d85269ed067d505de8ca86071524e038e87850420f42701b36fad5e1fe01529230333d5f23e0882f17a279bacfa39da335f3d968987dd SHA512 24d20d7658c2d15d2207d3660bd181016a16d0a2e3c86b8e86f7f95baab18f01f1a8753942d15ab648a40431bfc6db7d5109339575ef1a50802403eb580baede
 DIST importlib_metadata-3.1.1.tar.gz 32217 BLAKE2B 85155574f554146d89fedbaeffa5b5842c5c76f98d0f8488a019cded9fc7e45323b31a9cb612f81c379feb822a0e5a44f86566510c5bccaa344cbe10ef8676e9 SHA512 a0a3fc0c4cb08ba5676ae144a2176e9b2e02d122a09c1be67fe0c1e1c8304aeac4f624fa060898b20f99f67f9cfee2bdf1177d82cd12e5879edfa268e02cdce3
 DIST importlib_metadata-3.2.0.tar.gz 32793 BLAKE2B e99fc4544ec64bc320754b1bac80ab021fd4212930cb2b28fc44cd6f6c9691214fce2fc408aa65147ae45df589e5ad64d4681e29620a16ffd1d3231faebde077 SHA512 3e744ebaa4606477252243b6e473c33b70332879385719835a4187d5edad135f0f9076c26e4843aea4497c2a5a2b51fa7b5654e9ff97a8f5ec3808053dccc734
 DIST importlib_metadata-3.3.0.tar.gz 33549 BLAKE2B 6646cf7f8dbbeeadd7b4e9e572a59c14e2f17444dcd84aef817e27b299cbc3f0fa868657a59221a42ea8c49c5cc75e9e170a787df3e3014808d19eff1f89debf SHA512 af2215405b0f7e120d2745f3736d021174e611ad226abe64b496192a210e85786e78560349f1188deb3bffbfceb36385e9fbac20f4447aafb025a1d735c333ac
--- a/dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.ebuild
@ -1,41 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 inherit distutils-r1
 DESCRIPTION="Read metadata from Python packages"
 HOMEPAGE="https://importlib-metadata.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
 		dev-python/packaging[${PYTHON_USEDEP}]
 		dev-python/pyfakefs[${PYTHON_USEDEP}]
 	)
 "
 distutils_enable_sphinx "${PN}/docs" \
 	'>=dev-python/rst-linker-1.9'
 distutils_enable_tests unittest
 python_prepare_all() {
 	# remove dep on setuptools_scm
 	sed -e 's:test_find_local:_&:' \
 		-i importlib_metadata/tests/test_integration.py || die
 	distutils-r1_python_prepare_all
 }
--- a/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 RDEPEND="dev-python/zipp[${PYTHON_USEDEP}]"
 BDEPEND="
--- a/dev-python/importlib_metadata/importlib_metadata-3.2.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.2.0.ebuild
@ -1,40 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 # Included in Python >= 3.8
 PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 inherit distutils-r1
 DESCRIPTION="Read metadata from Python packages"
 HOMEPAGE="https://github.com/python/importlib_metadata"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
 	dev-python/zipp[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
 		dev-python/packaging[${PYTHON_USEDEP}]
 		dev-python/pyfakefs[${PYTHON_USEDEP}]
 	)
 "
 distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
 distutils_enable_tests unittest
 python_prepare_all() {
 	# Skip a test that requires pep517 which is not in the tree
 	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
 	distutils-r1_python_prepare_all
 }
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@ -1,2 +1,3 @@
 DIST ipywidgets-7.5.1.tar.gz 5656334 BLAKE2B 8bd98f523b619bea02e01ae5faffb08040dc5011905dd69510728b02736e66444b3c3cdf1e7272884c1df97f610aff790063f783e1d0939786669ef39cd1fc94 SHA512 856b3e4dad331766eff6e5f1fd31984a4b6ede5c678ffd51a4896f6448dac53ba181ccec2821f10e07e0f1095318427affe19f1420d0337bc3d37ef1e0a9ea0d
 DIST ipywidgets-7.6.0.tar.gz 4066107 BLAKE2B 5e5f9f6fca1e554ef2b6157a493435148a9832c7f69ec1245e24828363e2a9a1edea804236beaff1f0870d3c7aa028d329e18bc7b1aade7b212110dda3be018a SHA512 eee04406d90f8cadab0208923d51679677b6f630417b69acd0382fcb69cf3d727e47e5abde071939f0b5f45b8b0e72d0bf9316e41508c2c0df7518bfb322db51
 DIST ipywidgets-7.6.1.tar.gz 4066110 BLAKE2B 81f46c91352c8c490c588263489e5e6b2de07df4a0ed8a94e620abd16d064a0776330bb4e3cacf610e99c5528deeca18fe019c9f573d67de212b8271bae29210 SHA512 7a69f57d378c76b0c4aea1878e5a5f19adfca0acf3ec362ebddad5b05513c3bb078321c3c700f91da78dace2adb468d6182cd650da6ae299cd7022329368e538
--- a/dev-python/ipywidgets/ipywidgets-7.6.1.ebuild
+++ b/dev-python/ipywidgets/ipywidgets-7.6.1.ebuild
@ -0,0 +1,27 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="threads(+)"
 inherit distutils-r1
 DESCRIPTION="IPython HTML widgets for Jupyter"
 HOMEPAGE="https://ipywidgets.readthedocs.io/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
 	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
 	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
 	>=dev-python/widgetsnbextension-3.5.0[${PYTHON_USEDEP}]
 "
 distutils_enable_tests pytest
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@ -1,4 +1,5 @@
 DIST django-stubs-1.5.0.tar.gz 180400 BLAKE2B 0619a76f89fe4fad456a82e3048009f25fdfd8b8e3071fd5a0cc0eebd62b3e9e8b77d29c5e4e8d1e0297fc466cc7e0c49771750b609fff49516e2aa1499c198b SHA512 c3e89f02a22561b5446e1cc0f01be791767984b5791fe5bd362ec6128e2ba7b32e921f9ee719a80ace05f7f0c84a912731700b457761f64617c1415cd232c7da
 DIST jedi-0.17.1.tar.gz 472489 BLAKE2B 7486925cb307f6a25538c2f5d52763802222561cfc4beca1637e433f4450b06ef328204e75779b6b2ac4ca2cfcf5ab647daecd329941ca6fb0ae2a5dd2bd8b5f SHA512 0a9d552d2b4c45730c9cccf06ebb434b159b755acea0dbaddf5f628dccf8e9c752e03d151258e377b817f1a25fb9ca8e0289dbd2da290f55dc719883413b65cf
 DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557993fd33e246a1fb516992a16a7382db9e18e0c0414ff5d927008c8148e9bbd8ee0dbd62368d01a31611c326 SHA512 cd96faa6f9cd6e8ad8b9a52ceaa6a84f30c8ced51b20d621932f0babf1b90bbc445fbe5ffd11a4f0e356bf20bdd1da756ccc3574e5fc978883de72dfdb519977
 DIST jedi-0.18.0.tar.gz 462786 BLAKE2B 35021ed1566fffc24056060f16b8a0aa6f8b6e382f716ff5978711fd66340e96f4e0b628463aadead5605db32cfc20df06a6c53a9b435658f1c455a6212da6e5 SHA512 fcee84496285a0b0b1cf1f3827593d0603bd87c84baf725cc7bdbf594979f49729b18a29b7465848413bdd3a5670fcc41187dd3eadbd9750d77788c5a9408dbf
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ b/dev-python/jedi/jedi-0.18.0.ebuild
@ -0,0 +1,70 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6..9} )
 inherit distutils-r1
 TYPESHED_P="typeshed-jedi_v0.16.0"
 DJANGO_STUBS_P="django-stubs-v1.5.0"
 DESCRIPTION="Autocompletion library for Python"
 HOMEPAGE="https://github.com/davidhalter/jedi"
 SRC_URI="
 	https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz
 		-> ${P}.tar.gz
 	https://github.com/davidhalter/typeshed/archive/${TYPESHED_P#typeshed-}.tar.gz
 		-> ${TYPESHED_P}.tar.gz
 	https://github.com/davidhalter/django-stubs/archive/${DJANGO_STUBS_P#django-stubs-}.tar.gz
 		-> ${DJANGO_STUBS_P/v/}.tar.gz"
 LICENSE="MIT
 	test? ( Apache-2.0 )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 RDEPEND="=dev-python/parso-0.8*[${PYTHON_USEDEP}]"
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
 python_prepare_all() {
 	# upstream includes these as submodules ...
 	rmdir "${S}"/jedi/third_party/{django-stubs,typeshed} || die
 	mv "${WORKDIR}/${DJANGO_STUBS_P/v/}" \
 		"${S}/jedi/third_party/django-stubs" || die
 	mv "${WORKDIR}/${TYPESHED_P}" \
 		"${S}/jedi/third_party/typeshed" || die
 	# don't run doctests, don't depend on colorama
 	sed -i "s:'docopt',:: ; s:'colorama',::" setup.py || die
 	sed -i "s: --doctest-modules::" pytest.ini || die
 	# test_complete_expanduser relies on $HOME not being empty
 	> "${HOME}"/somefile || die
 	# TODO: investigate
 	sed -e 's:test_local_import:_&:' \
 		-i test/test_utils.py || die
 	sed -e '/with sqlite3\.connect/,+2d' \
 		-i test/completion/stdlib.py || die
 	rm test/completion/django.py || die
 	# these tests fail with various pytest<->python version combinations
 	rm test/completion/pytest.py || die
 	# tests relying on pristine virtualenv
 	# this relies on test* not matching anything else
 	sed -e "/#\? \['test'\]/,+1d" \
 		-i test/completion/on_import.py || die
 	# this one's broken by 'path' module (dev-python/path-py)
 	sed -e 's:test_os_issues:_&:' \
 		-i test/test_inference/test_imports.py || die
 	sed -e 's:test_venv_and_pths:_&:' \
 		-i test/test_inference/test_sys_path.py || die
 	distutils-r1_python_prepare_all
 }
--- a/dev-python/jeepney/jeepney-0.6.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.6.0.ebuild
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 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"
 IUSE="examples"
 BDEPEND="
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@ -1,4 +1,3 @@
 DIST libvirt-python-6.10.0.tar.gz 212567 BLAKE2B 0ba583646c16c8e298a4cde789dca9c0f4920a3ac7e241134e251e5d0fc426a37c297870571acc673de2ce14c3de5bb7069316805581ce33cc044090930dd599 SHA512 bc9d65fa82cf021c0929c8f2760a31de606d52c860d15d1961438fd763131f05fa3f4e12f0030b45ad12c3ae40d84b21167091ae810376487b7aae11c2e3ab2b
 DIST libvirt-python-6.7.0.tar.gz 208597 BLAKE2B 335bd89133b688586a55193635b4b75dabe6dd4a741a450e49067ac8a9b9d9da54787b50c23bc6d5322a7fecbe513422f02450e09d541cb112ccfd499ce18101 SHA512 7d5a7f87abc01285c2030c9408838d4e1496d0d0316b9ab775749e49719fa66c20114aad2bd281d6783e2cb4d47ceac5ac60ac584e881288d0b0d9cc76d5b2cb
 DIST libvirt-python-6.8.0.tar.gz 210034 BLAKE2B 667c2713bf9c0936f444c5b621f5af4e5273deda31496bc01c8834286a0ec0eb1c056006549cc5d129ef597264f8582acee62db3a2fd375daa4ebbceacb8fcc1 SHA512 6d2f82fafd414047cff16f0ad655fefd69c8c0da04be07d27da44e3ab17dd03e4e4ff102be1c30948c361268f57ea312978f9198fd128bfb54a3c1a07150e6af
 DIST libvirt-python-6.9.0.tar.gz 210366 BLAKE2B 384d8ce4d6c91f7185484e3ad35572a3245712c59f416d0f117ce7936d1e6234458c3454a8d773ee287de4d529eae7229e3dd67111df7955369cd36b028be1cc SHA512 d15a80de5418586f769101525464efc88154c9038f59c805030a60b4b711f11f15531f4e1fd01575e1646397342fefa38fca9371e8146157b61f607b3c286fe1
--- a/dev-python/libvirt-python/libvirt-python-6.7.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-6.7.0.ebuild
@ -1,46 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=no
 MY_P="${P/_rc/-rc}"
 inherit distutils-r1
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
 	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
 	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
 S="${WORKDIR}/${P%_rc*}"
 DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 DEPEND="virtual/pkgconfig"
 BDEPEND="test? (
 	dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/nose[${PYTHON_USEDEP}]
 )"
 distutils_enable_tests setup.py
 python_install_all() {
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 	distutils-r1_python_install_all
 }
--- a/dev-python/lz4/lz4-3.1.1.ebuild
+++ b/dev-python/lz4/lz4-3.1.1.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="app-arch/lz4"
 DEPEND="
--- a/dev-python/pony/metadata.xml
+++ b/dev-python/pony/metadata.xml
@ -4,6 +4,7 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pony</remote-id>
 	</upstream>
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@ -0,0 +1 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
--- a/dev-python/pyside2-tools/metadata.xml
+++ b/dev-python/pyside2-tools/metadata.xml
@ -2,10 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>martin.dummer@gmx.net</email>
+		<email>fordfrog@gentoo.org</email>
-	</maintainer>
+		<name>Miroslav Šulc</name>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
 		<flag name="tools">Install supplementary tools (rcc, uic, designer)</flag>
 	</use>
 </pkgmetadata>
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.1.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.1.ebuild
@ -0,0 +1,125 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 # TODO: Add PyPy once officially supported. See also:
 #     https://bugreports.qt.io/browse/PYSIDE-535
 PYTHON_COMPAT=( python3_{6..8} )
 CMAKE_IN_SOURCE_BUILD=1
 inherit cmake python-r1 virtualx
 MY_P=pyside-setup-opensource-src-${PV}
 DESCRIPTION="PySide development tools (lupdate, rcc, uic)"
 HOMEPAGE="https://wiki.qt.io/PySide2"
 SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
 # Though "LICENSE-uic" suggests the "pyside2uic" directory to be dual-licensed
 # under the BSD 3-clause and GPL v2 licenses, this appears to be an oversight;
 # all files in this (and every) directory are licensed only under the GPL v2.
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test tools"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # Note that:
 # * "pyside2uic" imports the "PySide2.QtGui" and "PySide2.QtWidgets" C
 #   extensions and hence requires "widgets", which includes "gui" as well.
 # * "dev-qt/qtchooser" installs binaries conflicting with the "tools" USE flag.
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-python/pyside2-${PV}[widgets,${PYTHON_USEDEP}]
 "
 RDEPEND="${COMMON_DEPEND}
 	tools? ( !dev-qt/qtchooser )
 "
 DEPEND="${COMMON_DEPEND}
 	test? ( virtual/pkgconfig )
 "
 S=${WORKDIR}/${MY_P}/sources/${PN}
 DOCS=( README.md )
 src_prepare() {
 	cmake_src_prepare
 	python_copy_sources
 	pyside-tools_prepare() {
 		pushd "${BUILD_DIR}" >/dev/null || die
 		if python_is_python3; then
 			# Remove Python 2-specific paths.
 			rm -rf pyside2uic/port_v2 || die
 			# Generate proper Python 3 test interfaces with the "-py3" option.
 			sed -i -e \
 				's~${PYSIDERCC_EXECUTABLE}~"${PYSIDERCC_EXECUTABLE} -py3"~' \
 				tests/rcc/CMakeLists.txt || die
 		else
 			# Remove Python 3-specific paths.
 			rm -rf pyside2uic/port_v3 || die
 		fi
 		# Force testing against the current Python version.
 		sed -i -e "/pkg-config/ s:shiboken2:&-${EPYTHON}:" \
 			tests/rcc/run_test.sh || die
 		popd >/dev/null || die
 	}
 	python_foreach_impl pyside-tools_prepare
 }
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTS=$(usex test)
 	)
 	pyside-tools_configure() {
 		local mycmakeargs=(
 			"${mycmakeargs[@]}"
 			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
 		)
 		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
 	}
 	python_foreach_impl pyside-tools_configure
 }
 src_compile() {
 	pyside-tools_compile() {
 		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
 	}
 	python_foreach_impl pyside-tools_compile
 }
 src_test() {
 	# tests work only if tools USE flag enabled
 	if [ use tools ]; then
 		pyside-tools_test() {
 			local -x PYTHONDONTWRITEBYTECODE
 			CMAKE_USE_DIR="${BUILD_DIR}" virtx cmake_src_test
 		}
 		python_foreach_impl pyside-tools_test
 	fi
 }
 src_install() {
 	pyside-tools_install() {
 		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_install
 	}
 	python_foreach_impl pyside-tools_install
 	use tools || rm "${ED}"/usr/bin/{rcc,uic,designer} || die
 	# Remove the broken "pyside_tool.py" script. By inspection, this script
 	# reduces to a noop. Moreover, this script raises the following exception:
 	#     FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin/../pyside_tool.py': '/usr/bin/../pyside_tool.py'
 	rm "${ED}"/usr/bin/pyside_tool.py
 }
--- a/dev-python/rebulk/Manifest
+++ b/dev-python/rebulk/Manifest
@ -1,2 +1,3 @@
 DIST rebulk-2.0.1.tar.gz 258115 BLAKE2B d19210911cf89cb7c371819e384da95c2159eb92abf9f027cbdf1803a18054c556e73364ae10c5bb0b5007cbdb2156b2118d22d6e278b6a02055bacbcbdbc322 SHA512 7d453b7ba952994dec3258aa95a3f6090e6f8afb5a674c1b5e54e036f41022b887d3d65d21f2023ae6e2596cce3baf52d33fc23708498a4f0aef26d3594c8289
 DIST rebulk-3.0.0.gh.tar.gz 252364 BLAKE2B 669f25fa4cf25d4de426552eafd1f3463c05e42eb6f587b8c15d0d319c9c81e515d8461c5c412bd89a483d619374af0a93849deb0ccb3af9ccd7617ebd908504 SHA512 eb474b8b8509f291938bc3c96ef591b8233a41b9eb28f7957f3d20e098140ac6d80a1337c6ff1c89eeea4c34f94eb37af811d2200a8f2a574fc93b8fa1ea3c5d
 DIST rebulk-3.0.1.gh.tar.gz 252585 BLAKE2B ff10847d9743972c65a6a5ae3efe77acf0364770c2998401ac08d22a829bc25caf1e0c2a7decd0c2546d2bceb05b094cbd9d9cfcc7127d433b8c30fd6084c5bb SHA512 21d022bb564a416885139aa673b3fc8b762817df12d8868a2a0e8d99cc813b781d04bad4372e5ac0dbbe6239d879c506639dd87c89f92faf078ff306239d6b6d
--- a/dev-python/rebulk/rebulk-3.0.1.ebuild
+++ b/dev-python/rebulk/rebulk-3.0.1.ebuild
@ -0,0 +1,30 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 inherit distutils-r1
 DESCRIPTION="Python library that performs advanced searches in strings"
 HOMEPAGE="https://github.com/Toilal/rebulk https://pypi.org/project/rebulk/"
 SRC_URI="
 	https://github.com/Toilal/rebulk/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 LICENSE="MIT Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 distutils_enable_tests pytest
 python_prepare_all() {
 	# Remove base64-encoded zip archive with pytest.
 	rm runtests.py || die
 	# Disable unconditional dependency on dev-python/pytest-runner.
 	sed -i -e "s|'pytest-runner'||g" setup.py || die
 	distutils-r1_python_prepare_all
 }
--- a/dev-python/setproctitle/setproctitle-1.2.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.2.ebuild
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 distutils_enable_tests pytest
--- a/dev-python/theano/theano-1.0.5.ebuild
+++ b/dev-python/theano/theano-1.0.5.ebuild
@ -18,6 +18,9 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 # Tests sometimes hang. dev-python/theano-pymc is better. #738416
 # This package is on the way out anyway for that fork.
 RESTRICT="test"
 BDEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )"
 RDEPEND="
--- a/dev-python/tox/tox-3.20.1-r1.ebuild
+++ b/dev-python/tox/tox-3.20.1-r1.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
--- a/dev-python/tox/tox-3.20.1.ebuild
+++ b/dev-python/tox/tox-3.20.1.ebuild
@ -1,70 +0,0 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
 inherit distutils-r1
 DESCRIPTION="virtualenv-based automation of test activities"
 HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
 SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 # doc disabled because of missing deps in tree
 IUSE="test"
 RESTRICT="!test? ( test )"
 RDEPEND="
 	dev-python/filelock[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
 		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
 	' python3_{5,6,7} pypy3)
 	dev-python/packaging[${PYTHON_USEDEP}]
 	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
 	dev-python/pip[${PYTHON_USEDEP}]
 	dev-python/py[${PYTHON_USEDEP}]
 	>=dev-python/six-1.14[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
 	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
 # TODO: figure out how to make tests work without the package being
 # installed first.
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
 		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
 		dev-python/pathlib2[${PYTHON_USEDEP}]
 		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
 	)"
 src_prepare() {
 	distutils-r1_src_prepare
 	# broken without internet
 	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
 		tests/unit/session/test_provision.py || die
 	sed -i -e 's:test_provision_interrupt_child:_&:' \
 		tests/integration/test_provision_int.py || die
 	# broken with our mock version (?)
 	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
 		tests/unit/test_venv.py || die
 	# broken with Gentoo Python layout
 	sed -i -e 's:test_tox_get_python_executable:_&:' \
 		-e 's:test_find_alias_on_path:_&:' \
 		tests/unit/interpreters/test_interpreters.py || die
 	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 }
 python_test() {
 	distutils_install_for_testing
 	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
 }
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@ -1,3 +1,4 @@
 DIST tqdm-4.53.0.tar.gz 179940 BLAKE2B 022fd8eae70a38306d201981bd6c2e469791abc86e3e10bf2bcbe4936e4e6791dc24b3e064c6adb830fd908a1544389fdba8f7017bee17632925c1bcc3d42349 SHA512 ffb06058a71e31497ced0b6b5ce8671a7e958968e0a08e1b68dc9f3a9acac415c1708f6669d369ab484bbc07a8fc06716ed32fde70f22c0dbd8242417f95a713
 DIST tqdm-4.54.0.tar.gz 178664 BLAKE2B 68d0f054b2c95079e13ad9df3e9467f48925311151e5eed94795d3fab232301da99c2704daafd80f748037a467d25416913f0921d6b7c44d725c5ed6861fe347 SHA512 dbb2a61df848ebd84ab805134b7e7297e1cf7626abaa830a08159ce7b1852eba40a6a7f2cc7c8445294a184bbfbd69bf08430371f3e2d71f6a622a271ba49e95
 DIST tqdm-4.54.1.tar.gz 178633 BLAKE2B 10a9314405f1565a130baaef3b4d23fb8606b954fb6e70ec1fffd21a531957432254d3081085f8cb2e55ab103ac17ad23683a5a945917e278fcc61760ee69b90 SHA512 ba9dde2bd2f39d10bfdb0f624f1e60db12fef79732aee1fa21049e37ab60ffafbe097ab124bb3fbd34d9f4efa10e317ab7d594551ae612c0f6c37c2ce9395997
 DIST tqdm-4.55.0.tar.gz 161594 BLAKE2B 890bbb47db356678be2c3edd893d70b085f5bc8fefbf87f12ba8c69fe14ac523a1eed6e335fb84f2ff43b2b0fea901411f8a72b24212cb2ad5ef4955ec8f2df5 SHA512 84062f7d2a109e4067e0868990b6e53578c7c2ec2b81a0cbdc980c91d2d82a8bda37e0c9688777fcf14cc80b7ddf7b28b7a5acfe37608e37903fe45908103913
--- a/dev-python/tqdm/tqdm-4.55.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.55.0.ebuild
@ -0,0 +1,50 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 inherit distutils-r1
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 fi
 DESCRIPTION="Add a progress meter to your loops in a second"
 HOMEPAGE="https://github.com/tqdm/tqdm"
 LICENSE="MIT"
 SLOT="0"
 IUSE="examples"
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]"
 distutils_enable_tests pytest
 python_test() {
 	# Skip unpredictable performance tests
 	pytest -vv --ignore 'tests/tests_perf.py' ||
 		die "Tests failed with ${EPYTHON}"
 }
 python_install() {
 	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
 	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
 	distutils-r1_python_install
 }
 python_install_all() {
 	if use examples; then
 		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 	distutils-r1_python_install_all
 }
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
--- a/Show More
+++ b/Show More
		`@ -1 +0,0 @@`
			`DIST luadoc-3.0.1.tar.gz 108824 BLAKE2B 52092feeb22cdcd7570ba5d54c57598d16688daba7c90d81dc975cfd2545c5e42e6f4b8f1bdc150c877f6b953cbb193d03d1a02f0ac48cfbc5cf1ec4a91b101c SHA512 413b40e72cc0699c00caf47fe3d7233c8619bfd6064eac001762bcb2ae0b21ccc6f800bd05566cd83924546e5616d1e5840d8bc20ec6d1f1c7a64910a9df6be2`
		`@ -0,0 +1 @@`
							`DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306`