Sync with portage [Fri Mar 19 18:12:06 MSK 2021].

4 years ago · 1563e303ac
parent f8e3b40714
commit 1563e303ac
342 changed files with 7426 additions and 2543 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
--- a/app-benchmarks/siege/metadata.xml
+++ b/app-benchmarks/siege/metadata.xml
@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		Siege is an http load testing and benchmarking utility. It was designed to let
 		web developers measure their code under duress, to see how it will stand up to load on the internet.
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@ -9,3 +9,4 @@ DIST emacs-25.3.tar.xz 42854740 BLAKE2B 4f4e2572bbef48b75c561497fc22046081e56099
 DIST emacs-26.3.tar.xz 44415140 BLAKE2B aa8434e6431992ee40402f03a890dd2c49784ee76f437888efe61d66b9aa2bdb816eb0bfe1055e9e154a8bb3ed065fee71623741b474d465a96964618ec775e3 SHA512 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
 DIST emacs-27.1.91.tar.xz 44608052 BLAKE2B 50d4da099bb542a01f7a62d73ac33cf445fc667af9c81a7c44f4a477d50a29854b14be2fd28eb937d2a039b9d3726b84e5d66d5a667109473e9485ab36b70fcd SHA512 37efc0e472522f498cbd45b6bd734ed34348f7ccf07fb06aed106df6ec86cb0b077d5a54df76abc3147e5d97284f6e9e1a7166d3c32b9a072aecca8c13f8965b
 DIST emacs-27.1.tar.xz 43752012 BLAKE2B 433fbf234c711954269e7e10348abbd4a2bc4c357a59164c625a5ccee2de85a149636c70ad3fad3c09dbbd24900badfd2c0c645017bb33ab3e25d3decff72057 SHA512 dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
+DIST emacs-27.2-rc1.tar.xz 44630360 BLAKE2B aec7da38f23c440dbea4205ad22b90a61d3abae4e40c65185b250d3cadcf8f39e626f0ef09e032a897ffe6d40afd5a1ac192246332f1384745454bcaa91bb077 SHA512 9c6f337fb593594a92df5024fa47a28abbc59e4d2c06d807ecc1bed33cfb94df46d1e8a04e3f4aa4ca82e8fdd64d1e82b5a0423dc22cb6b1dd4571dca22ea4a8
--- a/app-editors/emacs/emacs-27.2_rc1.ebuild
+++ b/app-editors/emacs/emacs-27.2_rc1.ebuild
@ -0,0 +1,446 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+if [[ ${PV##*.} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs.git"
+	EGIT_BRANCH="emacs-27"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/emacs"
+	S="${EGIT_CHECKOUT_DIR}"
+	SLOT="${PV%%.*}-vcs"
+else
+	# FULL_VERSION keeps the full version number, which is needed in
+	# order to determine some path information correctly for copy/move
+	# operations later on
+	FULL_VERSION="${PV%%_*}"
+	SRC_URI="mirror://gnu/emacs/${P}.tar.xz"
+	S="${WORKDIR}/emacs-${FULL_VERSION}"
+	# PV can be in any of the following formats:
+	# 27.1                 released version (slot 27)
+	# 27.1_rc1             upstream release candidate (27)
+	# 27.0.9999            live ebuild (slot 27-vcs)
+	# 27.0.90              upstream prerelease snapshot (27-vcs)
+	# 27.0.50_pre20191223  snapshot by Gentoo developer (27-vcs)
+	if [[ ${PV} == *_pre* ]]; then
+		SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
+		S="${WORKDIR}/emacs"
+	elif [[ ${PV//[0-9]} != "." ]]; then
+		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
+	fi
+	SLOT="${PV%%.*}"
+	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+fi
+
+DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
+HOMEPAGE="https://www.gnu.org/software/emacs/"
+
+LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
+IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif +gmp gpm gsettings gtk gui gzip-el harfbuzz imagemagick +inotify jpeg json kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int Xaw3d xft +xpm xwidgets zlib"
+RESTRICT="test"
+
+RDEPEND="app-emacs/emacs-common-gentoo[games?,gui(-)?]
+	sys-libs/ncurses:0=
+	acl? ( virtual/acl )
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	games? ( acct-group/gamestat )
+	gmp? ( dev-libs/gmp:0= )
+	gpm? ( sys-libs/gpm )
+	!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
+	json? ( dev-libs/jansson )
+	kerberos? ( virtual/krb5 )
+	lcms? ( media-libs/lcms:2 )
+	libxml2? ( >=dev-libs/libxml2-2.2.0 )
+	mailutils? ( net-mail/mailutils[clients] )
+	!mailutils? ( acct-group/mail net-libs/liblockfile )
+	selinux? ( sys-libs/libselinux )
+	ssl? ( net-libs/gnutls:0= )
+	systemd? ( sys-apps/systemd )
+	zlib? ( sys-libs/zlib )
+	gui? ( !aqua? (
+		x11-libs/libICE
+		x11-libs/libSM
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+		x11-libs/libxcb
+		x11-misc/xbitmaps
+		gconf? ( >=gnome-base/gconf-2.26.2 )
+		gsettings? ( >=dev-libs/glib-2.28.6 )
+		gif? ( media-libs/giflib:0= )
+		jpeg? ( virtual/jpeg:0= )
+		png? ( >=media-libs/libpng-1.4:0= )
+		svg? ( >=gnome-base/librsvg-2.0 )
+		tiff? ( media-libs/tiff:0 )
+		xpm? ( x11-libs/libXpm )
+		imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
+		xft? (
+			media-libs/fontconfig
+			media-libs/freetype
+			x11-libs/libXft
+			x11-libs/libXrender
+			cairo? ( >=x11-libs/cairo-1.12.18 )
+			harfbuzz? ( media-libs/harfbuzz:0= )
+			m17n-lib? (
+				>=dev-libs/libotf-0.9.4
+				>=dev-libs/m17n-lib-1.5.1
+			)
+		)
+		gtk? (
+			x11-libs/gtk+:3
+			xwidgets? (
+				net-libs/webkit-gtk:4=
+				x11-libs/libXcomposite
+			)
+		)
+		!gtk? (
+			motif? (
+				>=x11-libs/motif-2.3:0
+				x11-libs/libXpm
+				x11-libs/libXmu
+				x11-libs/libXt
+			)
+			!motif? (
+				Xaw3d? (
+					x11-libs/libXaw3d
+					x11-libs/libXmu
+					x11-libs/libXt
+				)
+				!Xaw3d? ( athena? (
+					x11-libs/libXaw
+					x11-libs/libXmu
+					x11-libs/libXt
+				) )
+			)
+		)
+	) )"
+
+DEPEND="${RDEPEND}
+	gui? ( !aqua? ( x11-base/xorg-proto ) )"
+
+BDEPEND="app-eselect/eselect-emacs
+	sys-apps/texinfo
+	virtual/pkgconfig
+	gzip-el? ( app-arch/gzip )"
+
+RDEPEND="${RDEPEND}
+	!app-editors/emacs-vcs:27
+	app-eselect/eselect-emacs"
+
+EMACS_SUFFIX="emacs-${SLOT}"
+SITEFILE="20${EMACS_SUFFIX}-gentoo.el"
+
+src_prepare() {
+	if [[ ${PV##*.} = 9999 ]]; then
+		FULL_VERSION=$(sed -n 's/^AC_INIT([^,]*,[ \t]*\([^ \t,)]*\).*/\1/p' \
+			configure.ac)
+		[[ ${FULL_VERSION} ]] || die "Cannot determine current Emacs version"
+		einfo "Emacs branch: ${EGIT_BRANCH}"
+		einfo "Commit: ${EGIT_VERSION}"
+		einfo "Emacs version number: ${FULL_VERSION}"
+		[[ ${FULL_VERSION} =~ ^${PV%.*}(\..*)?$ ]] \
+			|| die "Upstream version number changed to ${FULL_VERSION}"
+	fi
+
+	eapply_user
+
+	# Fix filename reference in redirected man page
+	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
+
+	#AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+	strip-flags
+	filter-flags -pie					#526948
+
+	if use ia64; then
+		replace-flags "-O[2-9]" -O1		#325373
+	else
+		replace-flags "-O[3-9]" -O2
+	fi
+
+	local myconf
+
+	if use alsa; then
+		use sound || ewarn \
+			"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
+		myconf+=" --with-sound=alsa"
+	else
+		myconf+=" --with-sound=$(usex sound oss)"
+	fi
+
+	if ! use gui; then
+		einfo "Configuring to build without window system support"
+		myconf+=" --without-x --without-ns"
+	elif use aqua; then
+		einfo "Configuring to build with Nextstep (Macintosh Cocoa) support"
+		myconf+=" --with-ns --disable-ns-self-contained"
+		myconf+=" --without-x"
+	else
+		myconf+=" --with-x --without-ns"
+		myconf+=" $(use_with gconf)"
+		myconf+=" $(use_with gsettings)"
+		myconf+=" $(use_with toolkit-scroll-bars)"
+		myconf+=" $(use_with gif)"
+		myconf+=" $(use_with jpeg)"
+		myconf+=" $(use_with png)"
+		myconf+=" $(use_with svg rsvg)"
+		myconf+=" $(use_with tiff)"
+		myconf+=" $(use_with xpm)"
+		myconf+=" $(use_with imagemagick)"
+
+		if use xft; then
+			myconf+=" --with-xft"
+			myconf+=" $(use_with cairo)"
+			myconf+=" $(use_with harfbuzz)"
+			myconf+=" $(use_with m17n-lib libotf)"
+			myconf+=" $(use_with m17n-lib m17n-flt)"
+		else
+			myconf+=" --without-xft"
+			myconf+=" --without-cairo"
+			myconf+=" --without-libotf --without-m17n-flt"
+			use cairo && ewarn \
+				"USE flag \"cairo\" has no effect if \"xft\" is not set."
+			use m17n-lib && ewarn \
+				"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
+		fi
+
+		local f line
+		if use gtk; then
+			einfo "Configuring to build with GIMP Toolkit (GTK+)"
+			while read line; do ewarn "${line}"; done <<-EOF
+				Your version of GTK+ will have problems with closing open
+				displays. This is no problem if you just use one display, but
+				if you use more than one and close one of them Emacs may crash.
+				See <https://gitlab.gnome.org/GNOME/gtk/-/issues/221> and
+				<https://gitlab.gnome.org/GNOME/gtk/-/issues/2315>.
+				If you intend to use more than one display, then it is strongly
+				recommended that you compile Emacs with the Athena/Lucid or the
+				Motif toolkit instead.
+			EOF
+			myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
+			for f in motif Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"gtk\" is set."
+			done
+		elif use motif; then
+			einfo "Configuring to build with Motif toolkit"
+			myconf+=" --with-x-toolkit=motif"
+			for f in Xaw3d athena; do
+				use ${f} && ewarn \
+					"USE flag \"${f}\" has no effect if \"motif\" is set."
+			done
+		elif use athena || use Xaw3d; then
+			einfo "Configuring to build with Athena/Lucid toolkit"
+			myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
+		else
+			einfo "Configuring to build with no toolkit"
+			myconf+=" --with-x-toolkit=no"
+		fi
+		! use gtk && use xwidgets && ewarn \
+			"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
+	fi
+
+	if tc-is-cross-compiler; then
+		# Configure a CBUILD directory when cross-compiling to make tools
+		mkdir "${S}-build" && pushd "${S}-build" >/dev/null || die
+		ECONF_SOURCE="${S}" econf_build --without-all --without-x-toolkit
+		popd >/dev/null || die
+		# Don't try to execute the binary for dumping during the build
+		myconf+=" --with-dumping=none"
+	else
+		myconf+=" --with-dumping=pdumper"
+	fi
+
+	econf \
+		--program-suffix="-${EMACS_SUFFIX}" \
+		--includedir="${EPREFIX}"/usr/include/${EMACS_SUFFIX} \
+		--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
+		--localstatedir="${EPREFIX}"/var \
+		--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
+		--without-compress-install \
+		--without-hesiod \
+		--without-pop \
+		--with-file-notification=$(usev inotify || usev gfile || echo no) \
+		--with-pdumper \
+		$(use_enable acl) \
+		$(use_with dbus) \
+		$(use_with dynamic-loading modules) \
+		$(use_with games gameuser ":gamestat") \
+		$(use_with gmp libgmp) \
+		$(use_with gpm) \
+		$(use_with json) \
+		$(use_with kerberos) $(use_with kerberos kerberos5) \
+		$(use_with lcms lcms2) \
+		$(use_with libxml2 xml2) \
+		$(use_with mailutils) \
+		$(use_with selinux) \
+		$(use_with ssl gnutls) \
+		$(use_with systemd libsystemd) \
+		$(use_with threads) \
+		$(use_with wide-int) \
+		$(use_with zlib) \
+		${myconf}
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# Build native tools for compiling lisp etc.
+		emake -C "${S}-build" src
+		emake lib	   # Cross-compile dependencies first for timestamps
+		# Save native build tools in the cross-directory
+		cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die
+		# Specify the native Emacs to compile lisp
+		emake -C lisp all EMACS="${S}-build/src/emacs"
+	fi
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install
+
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die
+	mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die
+	mv "${ED}"/usr/share/metainfo/{emacs-,}${EMACS_SUFFIX}.appdata.xml || die
+
+	# move info dir to avoid collisions with the dir file generated by portage
+	mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} || die
+	touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
+	docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
+
+	# movemail must be setgid mail
+	if ! use mailutils; then
+		fowners root:mail /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+		fperms 2751 /usr/libexec/emacs/${FULL_VERSION}/${CHOST}/movemail
+	fi
+
+	# avoid collision between slots, see bug #169033 e.g.
+	rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
+	rm -rf "${ED}"/usr/share/{appdata,applications,icons}
+	rm -rf "${ED}/usr/$(get_libdir)"
+	rm -rf "${ED}"/var
+
+	# remove unused <version>/site-lisp dir
+	rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp
+
+	# remove COPYING file (except for etc/COPYING used by describe-copying)
+	rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING
+
+	if use systemd; then
+		insinto /usr/lib/systemd/user
+		sed -e "/^##/d" \
+			-e "/^ExecStart/s,emacs,${EPREFIX}/usr/bin/${EMACS_SUFFIX}," \
+			-e "/^ExecStop/s,emacsclient,${EPREFIX}/usr/bin/&-${EMACS_SUFFIX}," \
+			etc/emacs.service | newins - ${EMACS_SUFFIX}.service
+		assert
+	fi
+
+	if use gzip-el; then
+		# compress .el files when a corresponding .elc exists
+		find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
+			-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
+		assert "gzip .el failed"
+	fi
+
+	local cdir
+	if use source; then
+		cdir="/usr/share/emacs/${FULL_VERSION}/src"
+		insinto "${cdir}"
+		# This is not meant to install all the source -- just the
+		# C source you might find via find-function
+		doins src/*.{c,h,m}
+	elif has installsources ${FEATURES}; then
+		cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src"
+	fi
+
+	sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF || die
+	X
+	;;; ${EMACS_SUFFIX} site-lisp configuration
+	X
+	(when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
+	Y  (setq find-function-C-source-directory
+	Y	"${EPREFIX}${cdir}")
+	X  (let ((path (getenv "INFOPATH"))
+	X	(dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}")
+	X	(re "\\\\\`${EPREFIX}/usr/share\\\\>"))
+	X    (and path
+	X	 ;; move Emacs Info dir before anything else in /usr/share
+	X	 (let* ((p (cons nil (split-string path ":" t))) (q p))
+	X	   (while (and (cdr q) (not (string-match re (cadr q))))
+	X	     (setq q (cdr q)))
+	X	   (setcdr q (cons dir (delete dir (cdr q))))
+	X	   (setq Info-directory-list (prune-directory-list (cdr p)))))))
+	EOF
+	elisp-site-file-install "${T}/${SITEFILE}" || die
+
+	dodoc README BUGS CONTRIBUTE
+
+	if use gui && use aqua; then
+		dodir /Applications/Gentoo
+		rm -rf "${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app
+		mv nextstep/Emacs.app \
+			"${ED}"/Applications/Gentoo/${EMACS_SUFFIX^}.app || die
+	fi
+
+	local DOC_CONTENTS="You can set the version to be started by
+		/usr/bin/emacs through the Emacs eselect module, which also
+		redirects man and info pages. Therefore, several Emacs versions can
+		be installed at the same time. \"man emacs.eselect\" for details.
+		\\n\\nIf you upgrade from a previous major version of Emacs, then
+		it is strongly recommended that you use app-admin/emacs-updater
+		to rebuild all byte-compiled elisp files of the installed Emacs
+		packages."
+	if use gui; then
+		DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs.
+			Installing media-fonts/font-adobe-{75,100}dpi on the X server's
+			machine would satisfy basic Emacs requirements under X11.
+			See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs
+			for how to enable anti-aliased fonts."
+		use aqua && DOC_CONTENTS+="\\n\\n${EMACS_SUFFIX^}.app is in
+			\"${EPREFIX}/Applications/Gentoo\". You may want to copy or
+			symlink it into /Applications by yourself."
+	fi
+	tc-is-cross-compiler && DOC_CONTENTS+="\\n\\nEmacs did not write
+		a portable dump file due to being cross-compiled.
+		To create this file at run time, execute the following command:
+		\\n${EMACS_SUFFIX} --batch -Q --eval='(dump-emacs-portable
+		\"/usr/libexec/emacs/${FULL_VERSION}/${CHOST}/emacs.pdmp\")'"
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	# move Info dir file to correct name
+	if [[ -d ${ED}/usr/share/info ]]; then
+		mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} || die
+	fi
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	readme.gentoo_print_elog
+
+	if use livecd; then
+		# force an update of the emacs symlink for the livecd/dvd,
+		# because some microemacs packages set it with USE=livecd
+		eselect emacs update
+	elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then
+		# refresh symlinks in case any installed files have changed
+		eselect emacs set ${EMACS_SUFFIX}
+	else
+		eselect emacs update ifunset
+	fi
+}
+
+pkg_postrm() {
+	elisp-site-regen
+	eselect emacs update ifunset
+}
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/fuse-utils/fuse-utils-1.4.3-r1.ebuild
+++ b/app-emulation/fuse-utils/fuse-utils-1.4.3-r1.ebuild
@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

 inherit autotools

@ -14,13 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="audiofile gcrypt jpeg png zlib"

-RDEPEND=">=app-emulation/libspectrum-1.4.4[gcrypt?,zlib?]
+RDEPEND=">=app-emulation/libspectrum-1.4.4[audiofile?,gcrypt?,zlib?]
 	audiofile? ( >=media-libs/audiofile-0.3.6 )
 	jpeg? ( virtual/jpeg:0 )
 	png? ( media-libs/libpng:0 )
 	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"

 PATCHES=(
 	"${FILESDIR}"/remove-local-prefix.patch
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@ -1 +1,2 @@
 DIST fuse-1.5.7.tar.gz 1634568 BLAKE2B 9d2f3c310132dc57336995c31adeb37d727506719d1089b2009a2f44cbfa59fc9c4e9252aeff64cdd22b7326328518b5da33af51be687f321b891b9d1dd2b646 SHA512 ac11e03fc203f98433253fb72d7700cf6285ad8662147f318bb4ceda3888bc865b80d85473a3b2bda9e0971989b1579fc928f41ddabbf01d58358362066be13d
+DIST fuse-1.6.0.tar.gz 1686171 BLAKE2B d1e6b166f2f649f408349b16a5eb40dd414750ed7a805eb6505b6c81be6ed7bcaa4e6f0b14057645172add1b1a77881f90b64767390fe1a64a486168f452d29d SHA512 5096b24b5b3d812942a7ad401b886b6a99f5493686912cb4aff18ede65404ae97a9bcafa6337aaed4378382f2a170918797d7d4570bb809476be5aa9fc625b8b
--- a/app-emulation/fuse/fuse-1.6.0.ebuild
+++ b/app-emulation/fuse/fuse-1.6.0.ebuild
@ -0,0 +1,117 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Free Unix Spectrum Emulator by Philip Kendall"
+HOMEPAGE="http://fuse-emulator.sourceforge.net"
+SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alsa ao backend-X backend-fbcon +backend-gtk3 backend-sdl backend-svga gpm joystick memlimit png -pulseaudio +xml +zlib"
+
+# TODO:
+# - allow using sdl audio driver without using for the UI
+# - allow using sdl joystick support with gtk3 or X UI in place of libjsw
+# - when using sdl for one of the above but not the UI, allow using sdl2 instead
+
+# At most one audio driver and at most one UI back-end can be enabled at a time
+REQUIRED_USE="?? ( alsa ao backend-sdl pulseaudio )
+	?? ( backend-X backend-fbcon backend-gtk3 backend-sdl backend-svga )"
+
+RDEPEND="
+	>=app-emulation/libspectrum-1.5.0[zlib?]
+	dev-libs/glib:2
+	alsa? ( media-libs/alsa-lib )
+	ao? ( media-libs/libao )
+	backend-X? ( x11-libs/libX11 x11-libs/libXext )
+	backend-gtk3? ( x11-libs/gtk+:3 )
+	backend-sdl? ( media-libs/libsdl[joystick,sound] )
+	backend-svga? ( media-libs/svgalib )
+	gpm? ( backend-fbcon? ( sys-libs/gpm ) )
+	joystick? ( !backend-sdl? ( media-libs/libjsw ) )
+	png? ( media-libs/libpng:0= )
+	pulseaudio? ( media-sound/pulseaudio )
+	xml? ( dev-libs/libxml2:2 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	backend-fbcon? ( virtual/linux-sources )"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README THANKS )
+
+PATCHES=(
+	"${FILESDIR}"/remove-local-prefix.patch
+)
+
+_fuse_audio_driver() {
+	if use alsa; then
+		echo "alsa"
+	elif use ao; then
+		echo "libao"
+	elif use backend-sdl; then
+		echo "sdl"
+	elif use pulseaudio; then
+		echo "pulseaudio"
+	else
+		echo "null"
+	fi
+}
+
+src_prepare() {
+	xdg_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--enable-desktop-integration
+		--without-win32
+		--with-audio-driver="$(_fuse_audio_driver)"
+		$(use_with gpm)
+		$(use_with joystick)
+		$(use_enable memlimit smallmem)
+		$(use_with png)
+		$(use_with xml libxml2)
+		$(use_with zlib)
+	)
+
+	# The pure-X UI hasn't got its own configure argument, instead it is
+	# what is used under Linux if all other back-ends have been disabled
+	# - and all except the Gtk+ one are off by default.
+	if use backend-X; then
+		myconf+=("--without-gtk")
+	elif use backend-fbcon; then
+		myconf+=("--with-fb")
+	elif use backend-gtk3; then
+		myconf+=("--with-gtk")
+	elif use backend-sdl; then
+		myconf+=("--with-sdl")
+	elif use backend-svga; then
+		myconf+=("--with-svgalib")
+	else
+		myconf+=("--with-null-ui")
+	fi
+
+	if use joystick; then
+		myconf+=( $(use_enable backend-sdl ui-joystick) )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	emake test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	if use pulseaudio; then
+		ewarn "The PulseAudio driver in ${PN} is experimental"
+	fi
+}
--- a/app-emulation/fuse/metadata.xml
+++ b/app-emulation/fuse/metadata.xml
@ -10,6 +10,7 @@
 	</upstream>
 	<use>
 		<flag name="backend-fbcon">Use framebuffer rendering backend</flag>
+		<flag name="backend-gtk3">Use Gtk+ rendering backend</flag>
 		<flag name="backend-sdl">Use SDL rendering backend</flag>
 		<flag name="backend-svga">Use svgalib rendering backend</flag>
 		<flag name="backend-X">Use X11 rendering backend</flag>
--- a/app-emulation/libspectrum/Manifest
+++ b/app-emulation/libspectrum/Manifest
@ -1 +1,2 @@
 DIST libspectrum-1.4.4.tar.gz 568684 BLAKE2B b6ab4fc4173e7de9a7c3b14fda03420a56f02c5c590770158443bc37bee99a55dd3bdf6864f8ca33adb5ed59f4abd5c5b97736456ba2e6e6aaa2b49e07097cc4 SHA512 83bb9242010d49898531bb62e0d4d55439b0b6a548b57a7932f074429aca70cf252dfb195e9751384510b08c98bd6bc8eefd8cb3f82b0c8d07fa245ba66e9fe2
+DIST libspectrum-1.5.0.tar.gz 602354 BLAKE2B fc62437ececfe2c86b475efa512bf7aa7c5af182e16a00f75f77f78656fca01d46a71ac90b38008ff46e5fd0710b1c671b283d65544b5556d98e8c5b66525c35 SHA512 55f4cf623bc6c469a0fd80751ada694259d834c19d98400ba244aabf2ac21fed7cdd6de069d9ed7326e099bd3bd62c42cfb8a669b64ae002f90a52563fa2dcd1
--- a/app-emulation/libspectrum/libspectrum-1.5.0.ebuild
+++ b/app-emulation/libspectrum/libspectrum-1.5.0.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Spectrum emulation library"
+HOMEPAGE="http://fuse-emulator.sourceforge.net/libspectrum.php"
+SRC_URI="mirror://sourceforge/fuse-emulator/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="audiofile bzip2 gcrypt zlib"
+
+RDEPEND="dev-libs/glib:2
+	audiofile? ( >=media-libs/audiofile-0.3.6 )
+	bzip2? ( >=app-arch/bzip2-1.0 )
+	gcrypt? ( dev-libs/libgcrypt:0 )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/remove-local-prefix.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_with audiofile libaudiofile)
+		$(use_with bzip2)
+		$(use_with gcrypt libgcrypt)
+		$(use_with zlib)
+	)
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# check only builds test executable but doesn't run it
+	emake check
+	./test/test || die
+}
+
+src_install() {
+	default
+	dodoc doc/*.txt *.txt
+}
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@ -1,5 +1,5 @@
-DIST xen-4.13.2-upstream-patches-3.tar.xz 63660 BLAKE2B 80abc9529ff49e782b64d4b5032f724e7d95fd255c2a06b7065c693d5765e1db1df44ebd5ce00c5a1e1ff24e1e5d344b0c2e459c68282e58fa20963e208272d2 SHA512 35288a1feac1316c33586dad55685e2c6a30100795e31852f78455003ce3dd6906074bea023655ee545a97fe4a0a8ad9a05ab91fd83186e61e5b57d10aa6b155
 DIST xen-4.13.2-upstream-patches-4.tar.xz 65324 BLAKE2B 0e71e4600fffcf1341a52103a6318485c1da54101ec59dbdb9824be5a5ed1f977135a9c3e4ce48cf14922aa0a2e3ff5097dc870286e3b142d060c22d78079cb3 SHA512 3f0e41b685655c7753204862ea6b8e502ff4b4f76e4788ca07ab93a4bb3c636d24ad933c578f7c6e4c866cfb0d6b7b7234124da7c2fed0a4b34f2fbe401c56e1
+DIST xen-4.13.2-upstream-patches-5.tar.xz 76580 BLAKE2B 8eeab100c14d769174e7d935d4e081ffc2d72b771f8022ce5c31b89d860ddba5381baf55b87443dc3bc555b404595492d30bc7f2a103c77762004acfce70446e SHA512 5dd5c63267e9542626315efec94642901cff55f4a1f8148c58f86677254381242fce3d6c5c0ae72665b452441c54647d0b9a132a2a18ffb4ff7eaad86ef227de
 DIST xen-4.13.2.tar.gz 39037826 BLAKE2B ad2b7c3003ca29e5e60a85c581f706ef87d99eadf939ed36ebe8f6698582f7a29dbdaf502039b60a0afe7ad4ae6ce89713e69dc8b8a7d5abe65063da7f1baa5b SHA512 cd3092281c97e9421e303aa288aac04dcccd5536ba7c0ff4d51fbf3d07b5ffacfe3456ba06f5cf63577dafbf8cf3a5d9825ceb5e9ef8ca1427900cc3e57b50a3
-DIST xen-4.14.1-upstream-patches-1.tar.xz 11676 BLAKE2B 0d593b34e3b1b95b57c54ccc96666eb5bf36d63ba742dd9d6e6f5facdf57be62e1f8375beb23926967e6ea23c1e4fa459bb5087652716d7e45b2309440f81b0d SHA512 e530883d17738b4821fa36fd39a7597bdb42810e40740c7a3363c22945d71af80312340f6d33b18f5999498e59036f22033b7babe217bac7700702d007d5d881
+DIST xen-4.14.1-upstream-patches-2.tar.xz 22920 BLAKE2B 890cd9bcc3c72b4ed192476a913de0377d50ddeb180e0d6dc4720e86662387a699ad74b263adf2b867b2421fcf3efdcacaa17bf581643afc50c9dc7e8a3dfc60 SHA512 ca0e53f40fe23d9a6c6374b460fcc0c8063e511f03ca86c02291fcb73bf9f91594de6fd615609997e0aac2e9c59ccc8512e4151a1d2646a70f3b5bacd95ad325
 DIST xen-4.14.1.tar.gz 39970115 BLAKE2B 21e5838b2b4d78420dcaaae2b8fc98ac876230217e6a3764aa643920150b8cef96025663e6a2fc423ab15f7f470b62547e91ce1be0337fc78f00c148c7ff40ab SHA512 c75cbec82793435f5a7026626ffdb2e9a2166b42d2be4b2f1194240e0312458124f0ebd53eeb02ce7330c22afe402a28a96b32f8af66e41e9416fe94535724c9
--- a/app-emulation/xen/xen-4.13.2-r6.ebuild
+++ b/app-emulation/xen/xen-4.13.2-r6.ebuild
@ -15,8 +15,8 @@ if [[ $PV == *9999 ]]; then
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="amd64 ~arm -x86"
-	UPSTREAM_VER=3
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=5
 	SECURITY_VER=
 	GENTOO_VER=

@ -138,7 +138,7 @@ src_install() {
 		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
 	fi

-	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+	emake LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" DESTDIR="${D}" -C xen ${myopt} install

 	# make install likes to throw in some extra EFI bits if it built
 	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
--- a/app-emulation/xen/xen-4.14.1-r2.ebuild
+++ b/app-emulation/xen/xen-4.14.1-r2.ebuild
@ -16,7 +16,7 @@ if [[ $PV == *9999 ]]; then
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm -x86"
-	UPSTREAM_VER=1
+	UPSTREAM_VER=2
 	SECURITY_VER=
 	GENTOO_VER=

--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/xmldiff/metadata.xml
+++ b/app-text/xmldiff/metadata.xml
@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		A python tool that figures out the differences between two
 		similar XML files, in the same way the diff utility does.
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/pg_activity/Manifest
+++ b/dev-db/pg_activity/Manifest
@ -1 +1,2 @@
 DIST pg_activity-1.6.2.tar.gz 127561 BLAKE2B 5ddebd3068ddc33196903892c01b947ffc50ecff7ec790e196626e87ee8933ff79242e3ba61c207ea1020535c5d85dbbc4ac9e4825a19ab98004bb27ea0b6a6c SHA512 fd743f369201c6ec3762373c39969b2b7632d79a8fb9c8ebd12a88b66b91915c30e445e93162844b4a176cf7e13009c9c8136e973180b00e7cc708ecd66b4853
+DIST pg_activity-2.1.3.tar.gz 277297 BLAKE2B 9677ebad581e2e66e266e5433454e054274693a8e2e5a959c5f807ec1641f3b02a4c202eac7bddb7abe7e51e131d32d25a513a439e97aca996e79be6e1e9c0be SHA512 e28c75d1b88f6b530820d82327d6428d2388341bd09ba4efec5e80e753aee17e995b4e6d5ee8b35b3b972f20aa1228d525fe0c4bdcb8e365795d568a4a25c076
--- a/dev-db/pg_activity/pg_activity-2.1.3.ebuild
+++ b/dev-db/pg_activity/pg_activity-2.1.3.ebuild
@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Realtime PostgreSQL database server monitoring tool"
+HOMEPAGE="https://github.com/dalibo/pg_activity"
+SRC_URI="https://github.com/dalibo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+SLOT="0"
+LICENSE="POSTGRESQL"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/blessed[${PYTHON_USEDEP}]
+	dev-python/humanize[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	test? (
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# https://github.com/dalibo/pg_activity/issues/201
+	export COLUMNS="80"
+	epytest -k 'not test_ui.txt'
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman docs/man/${PN}.1
+}
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@ -1,2 +1,3 @@
 DIST elixir-1.10.4.tar.gz 2331003 BLAKE2B 8cb54bcb16762ae345ad9d36a25c28696fd5bb57cf97c5037c21458671e001cfe51a722287243c6a70fe3cea65c9c219e759c8312fc168e93974ac5f0870b47a SHA512 844e405cf344539a9d32dc7f1ead0dc1dfb0d70a9ab718269f4e25e5262f611f96346f5be93cf8e34a75c58c6aabb12e8a796c5cb182955922510c270ef169e7
 DIST elixir-1.11.3.tar.gz 2394406 BLAKE2B 066e11651265d63c713809f1968b7dc7faf70e8254ef0aec1978a3db0f92da6bb894e882a1a6c1ba8da13d234c91dc84d2d750b0e044e4cd8706986ec7b2f382 SHA512 4962bb9fcf5f4190a8da22a3e42df5b4e521d73771f6a067edb482b911b0f9fbd2883841d06d94ae4ad6b1db2f61f691e5de4c118c722a16f95830c67ce3e45b
+DIST elixir-1.11.4.tar.gz 2396885 BLAKE2B f63e835991420bce8cacd38a920637aa5656c0372bd09e8c0a357a24bcca9a06350973f1453f482d3854a48712471c55389c3bd530df46a19c20a359376b779d SHA512 5dc940a31a31ae1c1537f874c15e58311cc0b0452f61e923bdfde0a5cfef3d8003eb3e85be320eb0acfb7bc0c0c0dc8ac965dec6727257c244048268fbf38ceb
--- a/dev-lang/elixir/elixir-1.11.4.ebuild
+++ b/dev-lang/elixir/elixir-1.11.4.ebuild
@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="https://elixir-lang.org"
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-lang/erlang-21:0=[ssl]
+"
+# 'mix' tool collides with sci-biology/phylip, bug #537514
+RDEPEND="${DEPEND}
+	!!sci-biology/phylip
+"
+DEPEND+="
+	test? ( dev-vcs/git )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.9.1-disable-network-tests.patch
+	"${FILESDIR}"/${PN}-1.10.3-no-Q.patch
+	"${FILESDIR}"/${PN}-1.10.3-epmd-daemon.patch
+	"${FILESDIR}"/${PN}-1.11.2-mksh.patch
+)
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="${EPREFIX}/usr" install
+	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
+}
--- a/dev-lang/mlton/files/mlton-20070826-no-execmem.patch
+++ b/dev-lang/mlton/files/mlton-20070826-no-execmem.patch
@ -1,29 +0,0 @@
-From 544930de3b1c754fa8803169902a63bce7cc02ba Mon Sep 17 00:00:00 2001
-From: Adam Goode <adam@spicenitz.org>
-Date: Wed, 6 Feb 2008 20:17:51 -0500
-Subject: [PATCH] Remove PROT_EXEC from mprotect
-
-It looks like mprotect is used here as part of signal handling.
-There doesn't seems to be a reason to have the area of memory
-marked as executable. In fact, on Fedora 9, this causes MLton
-compiled binaries (including MLton itself) to fail.
---
- runtime/platform/mmap-protect.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/runtime/platform/mmap-protect.c b/runtime/platform/mmap-protect.c
-index f0dea49..df42215 100644
--- a/runtime/platform/mmap-protect.c
-+++ b/runtime/platform/mmap-protect.c
-@@ -7,7 +7,7 @@ void *GC_mmapAnon_safe_protect (void *start, size_t length,
-         if (mprotect (low, dead_low, PROT_NONE))
-                 diee ("mprotect failed");
-         result = (void*)((pointer)low + dead_low);
-        if (mprotect (result, length, PROT_READ | PROT_WRITE | PROT_EXEC))
-+        if (mprotect (result, length, PROT_READ | PROT_WRITE))
-                 diee ("mprotect failed");
-         high = (void*)((pointer)result + length);
-         if (mprotect (high, dead_high, PROT_NONE))
-- 
-1.5.4
-
--- a/dev-lang/mlton/files/mlton-20130715-no-PIE.patch
+++ b/dev-lang/mlton/files/mlton-20130715-no-PIE.patch
@ -1,66 +0,0 @@
--- mlton-20130715-orig/bin/upgrade-basis	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/bin/upgrade-basis	2013-12-17 18:17:24.165889500 +1100
-@@ -28,7 +28,7 @@
- tmp="$$.sml"
- 
- echo "val () = print \"I work\"" >"$tmp"
-if ! mlton "$tmp" 1>&2; then
-+if ! mlton -link-opt -fno-PIE "$tmp" 1>&2; then
-         die "Error: cannot upgrade basis because the compiler doesn't work"
- fi
- 
--- mlton-20130715-orig/mlton/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mlton/Makefile	2013-12-17 23:35:06.137421195 +1100
-@@ -106,7 +106,7 @@
- 	rm -f control/version.sml
- 	$(MAKE) control/version.sml
- 	@echo 'Compiling mlton (takes a while)'
-	mlton $(FLAGS) $(FILE)
-+	mlton $(FLAGS) -link-opt -fno-PIE $(FILE)
- 
- .PHONY: def-use
- def-use: mlton.def-use
--- mlton-20130715-orig/mllex/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mllex/Makefile	2013-12-18 07:03:29.592171611 +1100
-@@ -21,7 +21,7 @@
- 
- $(NAME): $(NAME).mlb $(shell PATH="$(BIN):$$PATH" && "$(MLTON)" -stop f $(NAME).mlb)
- 	@echo 'Compiling $(NAME)'
-	"$(MLTON)" $(FLAGS) $(NAME).mlb
-+	"$(MLTON)" $(FLAGS) -link-opt -fno-PIE $(NAME).mlb
- 
- html/index.html: $(TEX_FILES)
- 	mkdir -p html
--- mlton-20130715-orig/mlnlffigen/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mlnlffigen/Makefile	2013-12-18 11:55:33.590660407 +1100
-@@ -22,7 +22,7 @@
- 
- $(NAME): $(NAME).mlb $(shell PATH="$(BIN):$$PATH" && "$(MLTON)" -stop f $(NAME).mlb)
- 	@echo 'Compiling $(NAME)'
-	$(MLTON) $(FLAGS) $(NAME).mlb
-+	$(MLTON) $(FLAGS) -link-opt -fno-PIE $(NAME).mlb
- 
- .PHONY: clean
- clean:
--- mlton-20130715-orig/mlprof/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mlprof/Makefile	2013-12-20 14:02:50.292677796 +1100
-@@ -21,7 +21,7 @@
- 
- $(NAME): $(NAME).mlb $(shell PATH="$(BIN):$$PATH" && "$(MLTON)" -stop f $(NAME).mlb)
- 	@echo 'Compiling $(NAME)'
-	$(MLTON) $(FLAGS) $(NAME).mlb
-+	$(MLTON) $(FLAGS) -link-opt -fno-PIE $(NAME).mlb
- 
- .PHONY: clean
- clean:
--- mlton-20130715-orig/mlyacc/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/mlyacc/Makefile	2013-12-20 15:01:26.567775876 +1100
-@@ -41,7 +41,7 @@
- 
- $(NAME): $(NAME).mlb $(shell PATH="$(BIN):$$PATH" && "$(MLTON)" -stop f $(NAME).mlb)
- 	@echo 'Compiling $(NAME)'
-	"$(MLTON)" $(FLAGS) $(NAME).mlb
-+	"$(MLTON)" $(FLAGS) -link-opt -fno-PIE $(NAME).mlb
- 
- src/yacc.lex.sml: src/yacc.lex
- 	rm -f src/yacc.lex.sml && \
--- a/dev-lang/mlton/files/mlton-20130715-split-make-for-pax-mark.patch
+++ b/dev-lang/mlton/files/mlton-20130715-split-make-for-pax-mark.patch
@ -1,11 +0,0 @@
--- mlton-20130715-orig/Makefile	2013-07-16 05:59:09.000000000 +1000
-+++ mlton-20130715/Makefile	2013-12-27 13:29:35.259563131 +1100
-@@ -58,7 +58,7 @@
- 
- .PHONY: all-no-docs
- all-no-docs:
-	$(MAKE) dirs runtime compiler basis-no-check script mlbpathmap constants libraries tools
-+	$(MAKE) basis-no-check script mlbpathmap constants libraries tools
- # Remove $(AOUT) so that the $(MAKE) compiler below will remake MLton.
- # We also want to re-run the just-built tools (mllex and mlyacc)
- # because they may be better than those that were used for the first
--- a/dev-lang/moarvm/moarvm-2021.02.ebuild
+++ b/dev-lang/moarvm/moarvm-2021.02.ebuild
@ -9,7 +9,6 @@ MY_PN="MoarVM"
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
 	inherit git-r3
-	KEYWORDS=""
 	S="${WORKDIR}/${P}"
 else
 	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
--- a/dev-lang/python/python-3.6.13.ebuild
+++ b/dev-lang/python/python-3.6.13.ebuild
@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"

--- a/dev-lang/python/python-3.9.2.ebuild
+++ b/dev-lang/python/python-3.9.2.ebuild
@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="PSF-2"
 SLOT="${PYVER}"
-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="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline +sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"

--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/fddl/fddl-20111124-r1.ebuild
+++ b/dev-libs/fddl/fddl-20111124-r1.ebuild
@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7

-inherit cmake-utils multilib vcs-snapshot
+inherit cmake vcs-snapshot

 DESCRIPTION="Free Decision Diagram Library"
 HOMEPAGE="http://itval.sourceforge.net/ https://github.com/atomopawn/FDDL"
@ -12,12 +12,11 @@ SRC_URI="https://dev.gentoo.org/~pinkbyte/distfiles/snapshots/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""

 DOCS=( AUTHORS ChangeLog INSTALL RELEASE )

 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare

 	# Remove references to files that were not shipped,
 	# prefer dynamic linking
--- a/dev-libs/libindicator/files/libindicator-12.10.1-no-werror.patch
+++ b/dev-libs/libindicator/files/libindicator-12.10.1-no-werror.patch
@ -0,0 +1,196 @@
+https://bugs.gentoo.org/698774
+--- a/libindicator/Makefile.am
+++ b/libindicator/Makefile.am
+@@ -57,7 +57,7 @@ libindicator_la_CFLAGS = \
+ 	$(LIBINDICATOR_CFLAGS) \
+ 	$(COVERAGE_CFLAGS) \
+ 	-DG_LOG_DOMAIN=\"libindicator\" \
+-	-Wall -Werror
+	-Wall
+ 
+ libindicator_la_LIBADD = \
+ 	$(LIBINDICATOR_LIBS)
+--- a/tests/Makefile.am
+++ b/tests/Makefile.am
+@@ -38,7 +38,7 @@ test_loader_SOURCES = \
+ 	test-loader.c
+ 
+ test_loader_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
+ 	-DBUILD_DIR="\"$(builddir)\""
+ 
+@@ -57,7 +57,7 @@ test_desktop_shortcuts_SOURCES = \
+ 	test-desktop-shortcuts.c
+ 
+ test_desktop_shortcuts_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	-DSRCDIR="\"$(srcdir)\"" \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
+ 	-DBUILD_DIR="\"$(abs_builddir)\""
+@@ -91,7 +91,7 @@ libdummy_indicator_blank_la_SOURCES = \
+ 	dummy-indicator-blank.c
+ 
+ libdummy_indicator_blank_la_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_blank_la_LIBADD = \
+@@ -111,7 +111,7 @@ libdummy_indicator_null_la_SOURCES = \
+ 	dummy-indicator-null.c
+ 
+ libdummy_indicator_null_la_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_null_la_LIBADD = \
+@@ -131,7 +131,7 @@ libdummy_indicator_signaler_la_SOURCES = \
+ 	dummy-indicator-signaler.c
+ 
+ libdummy_indicator_signaler_la_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_signaler_la_LIBADD = \
+@@ -151,7 +151,7 @@ libdummy_indicator_simple_la_SOURCES = \
+ 	dummy-indicator-simple.c
+ 
+ libdummy_indicator_simple_la_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_simple_la_LIBADD = \
+@@ -172,7 +172,7 @@ libdummy_indicator_entry_func_la_SOURCES = \
+ 	dummy-indicator-entry-func.h
+ 
+ libdummy_indicator_entry_func_la_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_entry_func_la_LIBADD = \
+@@ -192,7 +192,7 @@ libdummy_indicator_visible_la_SOURCES = \
+ 	dummy-indicator-visible.c
+ 
+ libdummy_indicator_visible_la_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ libdummy_indicator_visible_la_LIBADD = \
+@@ -214,7 +214,7 @@ service_shutdown_timeout_SOURCES = \
+ 	service-shutdown-timeout.c
+ 
+ service_shutdown_timeout_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_shutdown_timeout_LDADD = \
+@@ -240,7 +240,7 @@ service_manager_no_connect_SOURCES = \
+ 	service-manager-no-connect.c
+ 
+ service_manager_no_connect_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_manager_no_connect_LDADD = \
+@@ -272,7 +272,7 @@ service_manager_connect_SOURCES = \
+ 	service-manager-connect.c
+ 
+ service_manager_connect_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_manager_connect_LDADD = \
+@@ -286,7 +286,7 @@ service_manager_connect_service_SOURCES = \
+ 	service-manager-connect-service.c
+ 
+ service_manager_connect_service_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_manager_connect_service_LDADD = \
+@@ -319,7 +319,7 @@ service_version_manager_SOURCES = \
+ 	service-version-manager.c
+ 
+ service_version_manager_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_manager_LDADD = \
+@@ -334,7 +334,7 @@ service_version_bad_service_SOURCES = \
+ 	service-version-bad-service.c
+ 
+ service_version_bad_service_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_bad_service_LDADD = \
+@@ -349,7 +349,7 @@ service_version_good_service_SOURCES = \
+ 	service-version-good-service.c
+ 
+ service_version_good_service_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_good_service_LDADD = \
+@@ -376,7 +376,7 @@ service_version_multiwatch_manager_SOURCES = \
+ 	service-version-multiwatch-manager.c
+ 
+ service_version_multiwatch_manager_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_multiwatch_manager_LDADD = \
+@@ -391,7 +391,7 @@ service_version_multiwatch_manager_impolite_SOURCES = \
+ 	service-version-multiwatch-manager-impolite.c
+ 
+ service_version_multiwatch_manager_impolite_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_multiwatch_manager_impolite_LDADD = \
+@@ -406,7 +406,7 @@ service_version_multiwatch_service_SOURCES = \
+ 	service-version-multiwatch-service.c
+ 
+ service_version_multiwatch_service_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_version_multiwatch_service_LDADD = \
+@@ -432,7 +432,7 @@ service_manager_nostart_connect_SOURCES = \
+ 	service-manager-nostart-connect.c
+ 
+ service_manager_nostart_connect_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir)
+ 
+ service_manager_nostart_connect_LDADD = \
+--- a/tools/Makefile.am
+++ b/tools/Makefile.am
+@@ -17,7 +17,7 @@ indicator_loader_SOURCES = \
+ 	indicator-loader.c
+ 
+ indicator_loader_CFLAGS = \
+-	-Wall -Werror \
+	-Wall \
+ 	$(LIBINDICATOR_CFLAGS) -I$(top_srcdir) \
+ 	-DBUILD_DIR="\"$(builddir)\""
+ 
--- a/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch
+++ b/dev-libs/libindicator/files/libindicator-12.10.1-nonbash.patch
@ -0,0 +1,23 @@
+https://bugs.gentoo.org/777087
+https://bugs.launchpad.net/libindicator/+bug/1502925
+Thanks-to: orbea <orbea@riseup.net>
+--- a/configure.ac
+++ b/configure.ac
+@@ -15,7 +15,7 @@ AM_INIT_AUTOMAKE([1.11 -Wall tar-pax])
+ 
+ AM_MAINTAINER_MODE([enable])
+ 
+-AM_SILENT_RULES([yes])]
+AM_SILENT_RULES([yes])
+ 
+ # Check for programs
+ AC_PROG_CC
+@@ -66,7 +66,7 @@ AS_IF([test "x$with_gtk" = x3],
+ AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
+ 
+ LT_LIB_M
+-LIBINDICATOR_LIBS+="$LIBM"
+LIBINDICATOR_LIBS="${LIBINDICATOR_LIBS} $LIBM"
+ 
+ ##############################
+ # Custom Junk
--- a/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
+++ b/dev-libs/libindicator/files/libindicator-ldflags-spacing.patch
@ -1,3 +1,4 @@
+https://bugs.launchpad.net/libindicator/+bug/1502925
 --- a/configure.ac	2012-07-11 14:07:33.167169453 -0400
 +++ b/configure.ac	2015-10-04 09:59:31.023669616 -0400
@@ -66,7 +66,7 @@
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
-inherit autotools eutils flag-o-matic ltprune virtualx multilib-minimal
+EAPI=7
+
+inherit autotools flag-o-matic virtualx multilib-minimal

 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
 HOMEPAGE="https://launchpad.net/libindicator"
@ -14,31 +15,43 @@ KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

-RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+RDEPEND="
+	>=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	virtual/pkgconfig
-	test? ( dev-util/dbus-test-runner )"
+	test? ( dev-util/dbus-test-runner )
+"
+
+PATCHES=(
+	# Fixed version of https://bugs.launchpad.net/libindicator/+bug/1502925
+	"${FILESDIR}"/${PN}-12.10.1-nonbash.patch
+	"${FILESDIR}"/${PN}-12.10.1-no-werror.patch
+)

 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+	default
+
 	eautoreconf
 }

 multilib_src_configure() {
 	append-flags -Wno-error

-	myconf=(
+	local myconf=(
 		--disable-static
 		--with-gtk=2
 	)
-	local ECONF_SOURCE=${S}
-	econf "${myconf[@]}"
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }

 multilib_src_test() {
-	Xemake check #391179
+	# bug #391179
+	virtx emake
 }

 multilib_src_install() {
@ -46,10 +59,12 @@ multilib_src_install() {
 }

 multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
+	default
+
+	find "${ED}" -name '*.la' -delete || die

 	rm -vf \
 		"${ED}"/usr/lib*/libdummy-indicator-* \
-		"${ED}"/usr/share/${PN}/*indicator-debugging
+		"${ED}"/usr/share/${PN}/*indicator-debugging \
+		|| die
 }
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
-inherit autotools eutils flag-o-matic ltprune virtualx multilib-minimal
+EAPI=7
+
+inherit autotools flag-o-matic virtualx multilib-minimal

 DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
 HOMEPAGE="https://launchpad.net/libindicator"
@ -14,32 +15,42 @@ KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"

-RDEPEND=">=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
-	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
+RDEPEND="
+	>=dev-libs/glib-2.22[${MULTILIB_USEDEP}]
+	>=x11-libs/gtk+-3.2:3[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	virtual/pkgconfig
 	test? ( dev-util/dbus-test-runner )"

+PATCHES=(
+	# Fixed version of https://bugs.launchpad.net/libindicator/+bug/1502925
+	"${FILESDIR}"/${PN}-12.10.1-nonbash.patch
+	"${FILESDIR}"/${PN}-12.10.1-no-werror.patch
+)
+
 src_prepare() {
-	# https://bugs.launchpad.net/libindicator/+bug/1502925
-	epatch "${FILESDIR}"/${PN}-ldflags-spacing.patch
+	default
+
 	eautoreconf
 }

 multilib_src_configure() {
 	append-flags -Wno-error

-	myconf=(
+	local myconf=(
 		--disable-static
 		--with-gtk=3
 	)
-	local ECONF_SOURCE=${S}
-	econf "${myconf[@]}"
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
 }

 multilib_src_test() {
-	Xemake check #391179
+	# bug #391179
+	virtx emake
 }

 multilib_src_install() {
@ -47,6 +58,7 @@ multilib_src_install() {
 }

 multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files --all
+	default
+
+	find "${ED}" -name '*.la' -delete || die
 }
--- a/dev-libs/libsigsegv/libsigsegv-2.13.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.13.ebuild
@ -29,6 +29,6 @@ src_configure() {

 src_install() {
 	emake DESTDIR="${D}" install
-	rm "${ED}/usr/$(get_libdir)"/*.la || die
+	rm -f "${ED}/usr/$(get_libdir)"/*.la || die
 	dodoc AUTHORS ChangeLog* NEWS PORTING README
 }
--- a/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch
+++ b/dev-libs/libtomcrypt/files/libtomcrypt-1.18.2-slibtool.patch
@ -0,0 +1,72 @@
+https://github.com/libtom/libtomcrypt/pull/433
+https://bugs.gentoo.org/777084
+
+From ccc18b9eda52c31cc70a3e46eb33b87b3c076d65 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@fredslev.dk>
+Date: Mon, 13 Aug 2018 19:20:37 -0700
+Subject: [PATCH] makefile.shared: Support rlibtool.
+
+When building libtomcrypt with rlibtool instead of libtool it will fail
+when rlibtool fails to parse the generated libtool which does not exist.
+
+Since rlibtool should be the default choice for most slibtool users in
+the future this patch will use slibtool-shared instead which will
+correctly build the shared library.
+
+This could also help build the shared library on additional targets and
+hosts where the stock libtool does not have shared libraries enabled.
+---
+ makefile.shared | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/makefile.shared b/makefile.shared
+index 98ec2b501..c72f2ac8d 100644
+--- a/makefile.shared
+++ b/makefile.shared
+@@ -16,19 +16,24 @@
+ 
+ PLATFORM := $(shell uname | sed -e 's/_.*//')
+ 
+ifeq ($(LIBTOOL),rlibtool)
+  TGTLIBTOOL:=slibtool-shared
+endif
+
+ ifndef LIBTOOL
+   ifeq ($(PLATFORM), Darwin)
+     LIBTOOL:=glibtool
+   else
+     LIBTOOL:=libtool
+   endif
+  TGTLIBTOOL=$(LIBTOOL)
+ endif
+ ifeq ($(PLATFORM), CYGWIN)
+   NO_UNDEFINED:=-no-undefined
+ endif
+-LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(CC)
+-INSTALL_CMD = $(LIBTOOL) --mode=install install
+-UNINSTALL_CMD = $(LIBTOOL) --mode=uninstall rm
+LTCOMPILE = $(TGTLIBTOOL) --mode=compile --tag=CC $(CC)
+INSTALL_CMD = $(TGTLIBTOOL) --mode=install install
+UNINSTALL_CMD = $(TGTLIBTOOL) --mode=uninstall rm
+ 
+ #Output filenames for various targets.
+ ifndef LIBNAME
+@@ -49,15 +54,15 @@ src/ciphers/aes/aes_enc.o: src/ciphers/aes/aes.c src/ciphers/aes/aes_tab.c
+ LOBJECTS = $(OBJECTS:.o=.lo)
+ 
+ $(LIBNAME): $(OBJECTS)
+-	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) $(LOBJECTS) $(EXTRALIBS) -o $@ -rpath $(LIBPATH) -version-info $(VERSION_LT) $(NO_UNDEFINED)
+	$(TGTLIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) $(LOBJECTS) $(EXTRALIBS) -o $@ -rpath $(LIBPATH) -version-info $(VERSION_LT) $(NO_UNDEFINED)
+ 
+ test: $(call print-help,test,Builds the library and the 'test' application to run all self-tests) $(LIBNAME) $(TOBJECTS)
+-	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) -o $(TEST) $(TOBJECTS) $(LIBNAME) $(EXTRALIBS)
+	$(TGTLIBTOOL) --mode=link --tag=CC $(CC) $(LTC_LDFLAGS) -o $(TEST) $(TOBJECTS) $(LIBNAME) $(EXTRALIBS)
+ 
+ # build the demos from a template
+ define DEMO_template
+ $(1): $(call print-help,$(1),Builds the library and the '$(1)' demo) demos/$(1).o $$(LIBNAME)
+-	$$(LIBTOOL) --mode=link --tag=CC $$(CC) $$(LTC_LDFLAGS) $$^ $$(EXTRALIBS) -o $(1)
+	$$(TGTLIBTOOL) --mode=link --tag=CC $$(CC) $$(LTC_LDFLAGS) $$^ $$(EXTRALIBS) -o $(1)
+ endef
+ 
+ $(foreach demo, $(strip $(DEMOS)), $(eval $(call DEMO_template,$(demo))))
--- a/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
+++ b/dev-libs/libtomcrypt/libtomcrypt-1.18.2-r2.ebuild
@ -20,6 +20,10 @@ SLOT="0/1"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="+gmp +libtommath tomsfastmath"

+# Enforce at least one math provider
+# bug #772935
+REQUIRED_USE="|| ( gmp libtommath tomsfastmath )"
+
 BDEPEND="
 	sys-devel/libtool
 	virtual/pkgconfig
@ -31,6 +35,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"

+PATCHES=(
+	"${FILESDIR}"/${P}-slibtool.patch
+)
+
 mymake() {
 	# Standard boilerplate
 	# Upstream use homebrewed makefiles
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@ -1,5 +1,4 @@
 DIST nss-3.58.tar.gz 81846254 BLAKE2B f8e7d0b231916b197ad21706a057d055f8377059d76d4f09aff523cc4cd071a3184f02dc488259df22109b70be7b8a5d5fa7ea2273a830de825cc9a8c95dcca9 SHA512 03d2ab1517ac07620ea3f02dcf680cf019e0129006ff2559b2d0a047036340c20b98c9679b17a594e5502aa30e158caf309f046901b9ec7c7adeeaa13ec50b80
-DIST nss-3.60.1.tar.gz 82036869 BLAKE2B 71f4ab4ee41a05b05493bb43bd0ebaa6258122ddf6bc82af565121ec32f72ae0f187ac2383501ed8e228b32b796f75a89538c76f737530215b3c6448ef1242a3 SHA512 ba398ddad6f90f3562a041b7fd5fc7b72eb20961cc5c1f4890c3b0d95d438404b26ae6feb54cb8c650707134479a915e1f522f0e9257bc2ede053dd0811156d5
-DIST nss-3.61.tar.gz 82034245 BLAKE2B f04dd0dd79d44abd335799ee53bb2229ab0c65f5b9d5bf5b61e49fb33ae2eb5c061c278d5e03328e697a6f0f461411ca35df79afb9ab51df9b555cb410c0167b SHA512 b2fb2288d20b49097b6b24286ee39ec839ebabe2a84afe2d6a31dbefa9c2d1386dc85c97e41011eb11b12b1e4a410242c84648ac19bbabb7432dba460305bb37
 DIST nss-3.62.tar.gz 82159506 BLAKE2B 9abd7504766fb57214a16608a7299f8cf6d25c9a4e285665eabd812bce536ba244b698de31fd53796148f3856e4bee6c8a03ce5b6c5234a9337d7af8f300f007 SHA512 7044008ea8e5d6f658da96e202a896e24a1ffa29d7ca862f32ed37cfa09adf8c2d5fbc371e3af6bc5151b2d1216c38207976b41888d5ad8efd4dc3049cb5831d
+DIST nss-3.63.tar.gz 82167087 BLAKE2B 3db1aea3aea8373ba8e285a5a87e8b5e39107af8cc5977701fb2fe29b6e7657dba1b1ea3bf80aa0768b0d5f6d130cacc3e029eec69b071a0d87da0825860ffd9 SHA512 2f1f75dce7fd049453cbcf53263a3d9d4d9e62ad2cc2fef4dd0d5645fe14dad4ce47ed64aae507a09214d7fccbe83c142844121f55b44783e5a1bcfe24ea671c
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
--- a/dev-libs/nss/nss-3.61.ebuild
+++ b/dev-libs/nss/nss-3.61.ebuild
@ -1,358 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib toolchain-funcs multilib-minimal
-
-NSPR_VER="4.29"
-RTM_NAME="NSS_${PV//./_}_RTM"
-
-DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
-SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
-	cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )"
-
-LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert utils"
-# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
-RDEPEND="
-	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${P}/${PN}"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/nss-config
-)
-
-PATCHES=(
-	# Custom changes for gentoo
-	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
-	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
-	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
-)
-
-src_prepare() {
-	if use cacert ; then #521462
-		PATCHES+=(
-			"${DISTDIR}/${PN}-cacert-class1-class3.patch"
-		)
-	fi
-
-	default
-
-	pushd coreconf >/dev/null || die
-	# hack nspr paths
-	echo 'INCLUDES += -I$(DIST)/include/dbm' \
-		>> headers.mk || die "failed to append include"
-
-	# modify install path
-	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
-		-i source.mk || die
-
-	# Respect LDFLAGS
-	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
-	popd >/dev/null || die
-
-	# Fix pkgconfig file for Prefix
-	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
-		config/Makefile || die
-
-	# use host shlibsign if need be #436216
-	if tc-is-cross-compiler ; then
-		sed -i \
-			-e 's:"${2}"/shlibsign:shlibsign:' \
-			cmd/shlibsign/sign.sh || die
-	fi
-
-	# dirty hack
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
-		lib/ssl/config.mk || die
-	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
-		cmd/platlibs.mk || die
-
-	multilib_copy_sources
-
-	strip-flags
-}
-
-multilib_src_configure() {
-	# Ensure we stay multilib aware
-	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
-}
-
-nssarch() {
-	# Most of the arches are the same as $ARCH
-	local t=${1:-${CHOST}}
-	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
-	esac
-}
-
-nssbits() {
-	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
-	if [[ ${1} == BUILD_ ]]; then
-		cc=$(tc-getBUILD_CC)
-	else
-		cc=$(tc-getCC)
-	fi
-	echo > "${T}"/test.c || die
-	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
-	case $(file "${T}/${1}test.o") in
-		*32-bit*x86-64*) echo USE_X32=1;;
-		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
-		*32-bit*|*ppc*|*i386*) ;;
-		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
-	esac
-}
-
-multilib_src_compile() {
-	# use ABI to determine bit'ness, or fallback if unset
-	local buildbits mybits
-	case "${ABI}" in
-		n32) mybits="USE_N32=1";;
-		x32) mybits="USE_X32=1";;
-		s390x|*64) mybits="USE_64=1";;
-		${DEFAULT_ABI})
-			einfo "Running compilation test to determine bit'ness"
-			mybits=$(nssbits)
-			;;
-	esac
-	# bitness of host may differ from target
-	if tc-is-cross-compiler; then
-		buildbits=$(nssbits BUILD_)
-	fi
-
-	local makeargs=(
-		CC="$(tc-getCC)"
-		CCC="$(tc-getCXX)"
-		AR="$(tc-getAR) rc \$@"
-		RANLIB="$(tc-getRANLIB)"
-		OPTIMIZER=
-		${mybits}
-	)
-
-	# Take care of nspr settings #436216
-	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
-	unset NSPR_INCLUDE_DIR
-
-	export NSS_ALLOW_SSLKEYLOGFILE=1
-	export NSS_ENABLE_WERROR=0 #567158
-	export BUILD_OPT=1
-	export NSS_USE_SYSTEM_SQLITE=1
-	export NSDISTMODE=copy
-	export FREEBL_NO_DEPEND=1
-	export FREEBL_LOWHASH=1
-	export NSS_SEED_ONLY_DEV_URANDOM=1
-	export USE_SYSTEM_ZLIB=1
-	export ZLIB_LIBS=-lz
-	export ASFLAGS=""
-	# Fix build failure on arm64
-	export NS_USE_GCC=1
-	# Detect compiler type and set proper environment value
-	if tc-is-gcc; then
-		export CC_IS_GCC=1
-	elif tc-is-clang; then
-		export CC_IS_CLANG=1
-	fi
-
-	local d
-
-	# Build the host tools first.
-	LDFLAGS="${BUILD_LDFLAGS}" \
-	XCFLAGS="${BUILD_CFLAGS}" \
-	NSPR_LIB_DIR="${T}/fakedir" \
-	emake -j1 -C coreconf \
-		CC="$(tc-getBUILD_CC)" \
-		${buildbits-${mybits}}
-	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
-
-	# Then build the target tools.
-	for d in . lib/dbm ; do
-		CPPFLAGS="${myCPPFLAGS}" \
-		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		NSPR_LIB_DIR="${T}/fakedir" \
-		emake -j1 "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
-	done
-}
-
-# Altering these 3 libraries breaks the CHK verification.
-# All of the following cause it to break:
-# - stripping
-# - prelink
-# - ELF signing
-# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
-# Either we have to NOT strip them, or we have to forcibly resign after
-# stripping.
-#local_libdir="$(get_libdir)"
-#export STRIP_MASK="
-#	*/${local_libdir}/libfreebl3.so*
-#	*/${local_libdir}/libnssdbm3.so*
-#	*/${local_libdir}/libsoftokn3.so*"
-
-export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
-
-generate_chk() {
-	local shlibsign="$1"
-	local libdir="$2"
-	einfo "Resigning core NSS libraries for FIPS validation"
-	shift 2
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
-		local chkname=lib${i}.chk
-		"${shlibsign}" \
-			-i "${libdir}"/${libname} \
-			-o "${libdir}"/${chkname}.tmp \
-		&& mv -f \
-			"${libdir}"/${chkname}.tmp \
-			"${libdir}"/${chkname} \
-		|| die "Failed to sign ${libname}"
-	done
-}
-
-cleanup_chk() {
-	local libdir="$1"
-	shift 1
-	local i
-	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
-		# If the major version has changed, then we have old chk files.
-		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
-			&& rm -f "${libfname}.chk"
-	done
-}
-
-multilib_src_install() {
-	pushd dist >/dev/null || die
-
-	dodir /usr/$(get_libdir)
-	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
-	local i
-	for i in crmf freebl nssb nssckfw ; do
-		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
-	done
-
-	# Install nss-config and pkgconfig file
-	dodir /usr/bin
-	cp -L */bin/nss-config "${ED}"/usr/bin || die
-	dodir /usr/$(get_libdir)/pkgconfig
-	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
-
-	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
-	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
-		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
-		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
-		|| die "could not create nss-softokn.pc"
-
-	# all the include files
-	insinto /usr/include/nss
-	doins public/nss/*.{h,api}
-	insinto /usr/include/nss/private
-	doins private/nss/{blapi,alghmac,cmac}.h
-
-	popd >/dev/null || die
-
-	local f nssutils
-	# Always enabled because we need it for chk generation.
-	nssutils=( shlibsign )
-
-	if multilib_is_native_abi ; then
-		if use utils; then
-			# The tests we do not need to install.
-			#nssutils_test="bltest crmftest dbtest dertimetest
-			#fipstest remtest sdrtest"
-			# checkcert utils has been removed in nss-3.22:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
-			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
-			# certcgi has been removed in nss-3.36:
-			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
-			nssutils+=(
-				addbuiltin
-				atob
-				baddbdir
-				btoa
-				certutil
-				cmsutil
-				conflict
-				crlutil
-				derdump
-				digest
-				makepqg
-				mangle
-				modutil
-				multinit
-				nonspr10
-				ocspclnt
-				oidcalc
-				p7content
-				p7env
-				p7sign
-				p7verify
-				pk11mode
-				pk12util
-				pp
-				rsaperf
-				selfserv
-				signtool
-				signver
-				ssltap
-				strsclnt
-				symkeyutil
-				tstclnt
-				vfychain
-				vfyserv
-			)
-			# install man-pages for utils (bug #516810)
-			doman doc/nroff/*.1
-		fi
-		pushd dist/*/bin >/dev/null || die
-		for f in ${nssutils[@]}; do
-			dobin ${f}
-		done
-		popd >/dev/null || die
-	fi
-
-	# Prelink breaks the CHK files. We don't have any reliable way to run
-	# shlibsign after prelink.
-	dodir /etc/prelink.conf.d
-	printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
-		> "${ED}"/etc/prelink.conf.d/nss.conf
-}
-
-pkg_postinst() {
-	multilib_pkg_postinst() {
-		# We must re-sign the libraries AFTER they are stripped.
-		local shlibsign="${EROOT}/usr/bin/shlibsign"
-		# See if we can execute it (cross-compiling & such). #436216
-		"${shlibsign}" -h >&/dev/null
-		if [[ $? -gt 1 ]] ; then
-			shlibsign="shlibsign"
-		fi
-		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	multilib_pkg_postrm() {
-		cleanup_chk "${EROOT}"/usr/$(get_libdir)
-	}
-
-	multilib_foreach_abi multilib_pkg_postrm
-}
--- a/dev-libs/nss/nss-3.60.1.ebuild
+++ b/dev-libs/nss/nss-3.60.1.ebuild
@ -94,11 +94,12 @@ nssarch() {
 	# Most of the arches are the same as $ARCH
 	local t=${1:-${CHOST}}
 	case ${t} in
-		aarch64*)echo "aarch64";;
-		hppa*)   echo "parisc";;
-		i?86*)   echo "i686";;
-		x86_64*) echo "x86_64";;
-		*)       tc-arch ${t};;
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
 	esac
 }

--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@ -1 +1 @@
-DIST tree-sitter-0.19.3.tar.gz 2865501 BLAKE2B 0a2480457e7b82dcbd3217ef7f36f10db9dd07f277bd8318642867135d7f54a8fed6207f2017b125c7a8f9155040518e58cdb2a70504928896f0be9da3bf89a9 SHA512 49997fc69249a7fa935cf8a66d44bf4ba8dc8f19e56d3e0ea3ff08ed4bf2334b274b1d119989bdc7d693b284148cf7537e5f2acf5708661232bcb03f8a52c552
+DIST tree-sitter-0.19.4.tar.gz 2869774 BLAKE2B 4f39a565d12f2fa0cb3a68c2015fd83a3445e5951a2293e1b37ac6c98c430aaeb1e219d33b11691de2c198b0039dd2319df53ab3be8c136c25a744f1c355d48c SHA512 269a9022f11c153c2dc09446273cc65de3f4fbab7ce2c42605b1b41abc5c98368660f6f10a5fd2deb751d6b9f21cf52a4351fcfec21bd6459be681e16eb2efc0
--- a/dev-libs/tree-sitter/tree-sitter-0.19.4.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.19.4.ebuild
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@ -1 +1,2 @@
 DIST uriparser-0.9.4.tar.bz2 174551 BLAKE2B b95f270685757052fca02fae0a029f08de8bc14bea733bd56e62f0bcdc6592f015453ed38c87171cea9054618328dc94a512ff816519f70594653451f751c4f8 SHA512 c5e671ce2589aacd2c562e66facbee9e1cad3101e840f40b7ebdb917fa669e0c3ae7ed75623692f601655c0b82c10bcfe3086ad628beac8f965e613228e67ecd
+DIST uriparser-0.9.5.tar.bz2 176501 BLAKE2B 5ec3d993e60c62f2478e4012354cf82f2e4155ea1a69e9a3d6611d1765fe0f3b8ba5382c928852a5fd215f51ebb0688c9d713e9f1208f18f5ce2d8b8f0fb1dca SHA512 44d36a33565b7724d721e2b5e689530227bc87e609ee78f1d23e7353480191313b1b91039c7a046566d14b83eb320c97d75e74c8ef4841e1b9c8559c3feddb34
--- a/dev-libs/uriparser/uriparser-0.9.5.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.5.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Strictly RFC 3986 compliant URI parsing library in C"
+HOMEPAGE="https://uriparser.github.io/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="+doc qt5 test unicode"  # +doc to address warning RequiredUseDefaults
+
+REQUIRED_USE="qt5? ( doc ) test? ( unicode )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? ( >=dev-cpp/gtest-1.8.1 )
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.5.8
+		media-gfx/graphviz
+		qt5? ( dev-qt/qthelp:5 )
+	)
+"
+
+DOCS=( AUTHORS ChangeLog THANKS )
+
+src_configure() {
+	local mycmakeargs=(
+		-DURIPARSER_BUILD_CHAR=ON
+		-DURIPARSER_BUILD_DOCS=$(usex doc ON OFF)
+		-DURIPARSER_BUILD_TESTS=$(usex test ON OFF)
+		-DURIPARSER_BUILD_TOOLS=ON
+		-DURIPARSER_BUILD_WCHAR_T=$(usex unicode ON OFF)
+
+		# The usex wrapper is here to address this warning:
+		#   One or more CMake variables were not used by the project:
+		#   CMAKE_DISABLE_FIND_PACKAGE_Qt5Help
+		$(usex doc "$(cmake_use_find_package qt5 Qt5Help)")
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc && use qt5; then
+		dodoc "${BUILD_DIR}"/doc/*.qch
+		docompress -x /usr/share/doc/${PF}/${P}.qch
+	fi
+}
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
--- a/dev-ml/merlin/Manifest
+++ b/dev-ml/merlin/Manifest
@ -0,0 +1,2 @@
+DIST merlin-3.4.2.tar.gz 11016272 BLAKE2B 6fa55423df7ae8f7a8056e90be630f148dd101194de1921605843caf805bd6c9694fa3fe5b8c2f8eff5d57d7d0e9d8653036b6165a49af655158925c7af87d2f SHA512 8225366ebf27ca656ca89fe00d5aec581487ae332aeab81568e7606eaf575648a7614d4d2de8e0757a4e69c6f4014fefa4574c95da13d42acb310c9dd58a468a
+DIST merlin-4.1.tar.gz 2136082 BLAKE2B 3e7e1996611f0cefb3a33b2a78cd36b6e8b84d48bc48f46c45ba340c4be1b93b4a1876f8f4192e911c1c384c416ad7502ba3c7a2abb72eff01215f9fb26bfaf0 SHA512 f0f3ada007f8214b97a8557bddca87eded48ee01a8bb88aba6476e52881ead52d9f47e2666a9292b5c6a490e4cfdc7d8bb322e8489f78eaac7b0f80b6d1e87bc
--- a/dev-ml/merlin/files/50merlin-gentoo.el
+++ b/dev-ml/merlin/files/50merlin-gentoo.el
@ -0,0 +1,4 @@
+(push "@SLITELISP@" load-path) ; directory containing merlin.el
+(autoload 'merlin-mode "merlin" "Merlin mode" t)
+(add-hook 'tuareg-mode-hook 'merlin-mode)
+(add-hook 'caml-mode-hook 'merlin-mode)
--- a/dev-ml/merlin/merlin-3.4.2.ebuild
+++ b/dev-ml/merlin/merlin-3.4.2.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt"
+
+RDEPEND="
+	app-emacs/auto-complete
+	app-emacs/company-mode
+	dev-ml/csexp:=
+	dev-ml/yojson:=
+	>=dev-lang/ocaml-4.09:=
+	<dev-lang/ocaml-4.12:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+}
+
+src_compile() {
+	dune_src_compile
+
+	if use emacs ; then
+		# Build the emacs integration
+		cd emacs || die
+
+		# iedit isn't packaged yet
+		rm merlin-iedit.el || die
+
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		cd "${S}/emacs" || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/dev-ml/merlin/merlin-4.1.ebuild
+++ b/dev-ml/merlin/merlin-4.1.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: vim-plugin, although it's not clear how to make it work here
+inherit elisp-common dune
+
+DESCRIPTION="Context sensitive completion for OCaml in Vim and Emacs"
+HOMEPAGE="https://github.com/ocaml/merlin"
+SRC_URI="https://github.com/ocaml/merlin/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs +ocamlopt"
+
+RDEPEND="
+	app-emacs/auto-complete
+	app-emacs/company-mode
+	dev-ml/csexp:=
+	dev-ml/yojson:=
+	=dev-lang/ocaml-4.11*:=
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+DEPEND="${RDEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	default
+
+	# Handle installation via the eclass
+	rm emacs/dune || die
+}
+
+src_compile() {
+	dune_src_compile
+
+	if use emacs ; then
+		# Build the emacs integration
+		cd emacs || die
+
+		# iedit isn't packaged yet
+		rm merlin-iedit.el || die
+
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	dune_src_install
+
+	if use emacs ; then
+		cd "${S}/emacs" || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/dev-ml/merlin/metadata.xml
+++ b/dev-ml/merlin/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ocaml/merlin</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/Faker/Faker-6.6.2.ebuild
+++ b/dev-python/Faker/Faker-6.6.2.ebuild
@ -0,0 +1,28 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@ -3,3 +3,4 @@ DIST Faker-6.4.1.tar.gz 1073921 BLAKE2B 1434375b8341ad3143e5977b26fd22af69aee2e3
 DIST Faker-6.5.1.tar.gz 1074618 BLAKE2B dfcd80c170ae1f68c4eb541804b4f91c5c2821669e51d3231daa92c6b2818b30e6ff6a6328e5836f534a7d1ddd24d4b089adffc461e785642d7663088ba47251 SHA512 7681e9afa48f39c3a7dd41ef48e70025a4a225de3cbb6b8272279f353df7d4b956a2398ae0d84926fc1e72530accda4b2407e1b0cee116494bccfbaaf21bc38d
 DIST Faker-6.6.0.tar.gz 1114719 BLAKE2B 2e3639eba6ad74784ef30e2e7e6aa8b9fdc61c1d64babb256994068e1f54133841225b6549b4edde3539c3888acdcacf3029fe7daa414fd1142e2c1df8ac201d SHA512 1e72fa5672e310ff846f0945481d60db3749d916b37cd4e267c8ca4ffc5a2eab067622f618e9b4c8bc704155be413424f197b5796a86975b86219556116e0d47
 DIST Faker-6.6.1.tar.gz 1115484 BLAKE2B b5c99a61cf0937c10bf2eab0e34c51f38eb1aa7e87f47bbd8618874a24278bc7c2230acaffbea69f51cca760e3f3de73d32ccc487201c3bae7a544511aadac94 SHA512 a15c42291656d32f962ee50217e67cfd4038e39a6c4ba4cca6708d4ad9b4698a2b946d899e53968f4a9c2fee02c494ba756cbcc4014b16a8adeb73c83b9b428a
+DIST Faker-6.6.2.tar.gz 1115505 BLAKE2B 40bc09cafa1dfdda05bbf6c78380c5c3c0de85157dae856251063b0f099e32a08009a223dff70e3b3c037d572e4249cfee942b8749f78bd52506191dc180a13c SHA512 b6b75fd1891644e49d47acacfab9e705540003f18a8df413683e7ff0a3fb1283ede9f6020b19aee1a242a4a002ac1a34713701f283aae2089ee52d84c00764f4
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@ -14,4 +14,6 @@ DIST boto3-1.17.27.tar.gz 349887 BLAKE2B 1fde4af489c98b8c4f77660ad278abf6641f70d
 DIST boto3-1.17.28.tar.gz 350316 BLAKE2B a6fab50a064fd81337c013bb2516ba2baaa520aa8e7f08418ddaf9b6f0d99a1c8b8eb29b8fee6ab48620430153a0caf4bd296448e1de35a26a972d2e4bbf6df8 SHA512 c26800e18bb254707f0c7e7005b22b1270eae8bf0b8c13f6bcbbe46105ff7439b36c9c80863aefd1037df314abc687bf9b00045d12fb0d3b7337b02605810876
 DIST boto3-1.17.29.tar.gz 350960 BLAKE2B 8192d2ea8165b7d10ffdd56b30ba3fadf6f2373c61fc3a9b61713bd299f246ec1b00dce897254f954a93b3b7c150e1cbe8ddf4f0a5894a071e656963d3a06299 SHA512 f662a39aa66ffead103f1d8153ba4175a4905a96b152c1c23030ead3b731cdd008a50dea5f7192d719df2240f35e0290d9b4b3c00e87e77b5d396be7e707be8f
 DIST boto3-1.17.30.tar.gz 351634 BLAKE2B e6ad4b4e09ae45684ccd799da45dcf7844149b3dd735a378e90949fd4d533df494b93ef1b97c09057336bae63103bc03f8ce1e9500a5293c617fc8267bc35e89 SHA512 d2b6ac1307ccfe71fba12ea5838726c52c4f45a9467a9b0cf01c4e6898fa0744f6c7ea4cca7294b025dcd21b9e1f15d8aabd15c56e2796035b33e8e3c52f1e45
+DIST boto3-1.17.31.tar.gz 352268 BLAKE2B eefb7bcc3c6809fc03de2f175d5c3cfa750bc8650d56d5ee18608077a88a1c09ea79c2de1ce67f7d48129d5c948a7e5e30ab261c55a381ccf5c030dc42ff0ee0 SHA512 2d603a307575ff04877105ac98068d96b676faaa89b73ef470d9341951d5fcc148a57c7e80867d93bf257854ec700f61e48575ceebe19591091bbf2a68701138
+DIST boto3-1.17.32.tar.gz 352337 BLAKE2B 0d453ecd51d17291f10d2ffa4ae7b1036dced70a5ca0eafdc5f3073829942ecde57fe20f4d0139bfb2f75bdc47a000624281258ff621b98683ea41eae1a4bc71 SHA512 1bf61e3fcd2d650a534de5e7ed471bbdfeb2be6771f1dbde057ea2e3f3b6a29d6022011b5df90bae5c7ff231aec63ec49501cc3bd42421ec510d73e712060aad
 DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993
--- a/dev-python/boto3/boto3-1.17.31.ebuild
+++ b/dev-python/boto3/boto3-1.17.31.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
--- a/dev-python/boto3/boto3-1.17.32.ebuild
+++ b/dev-python/boto3/boto3-1.17.32.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@ -14,4 +14,6 @@ DIST botocore-1.20.27.tar.gz 7518860 BLAKE2B 73a5a5302a0adfe9c72ec40f0edec8fc97f
 DIST botocore-1.20.28.tar.gz 7526082 BLAKE2B 523db8ca7ff9ae87ad30fe539f20b34f4627b3a60f58635778d81b7ab055ac7cfbe04b4c4ca6508284dd37f2e6b953210ed2def9608026490332d200f306f7a9 SHA512 f3af2bd784b96a2778361a83d0ad61e5108b0a90b3756575bc4b93aaddb13a0a07e6589f582f03ca95252b272e1f84c350c5a2e1f342f98627f70e8f42350c18
 DIST botocore-1.20.29.tar.gz 7533728 BLAKE2B 75ca3262805177118d0f1a6060d98badf54b07f3b607c4c1c0d057045f671474b11493819030a9e65080af0cdd48c8ea686836b7c9ef7bfe6098babf260f221d SHA512 92d3887929b34e5e6a80b1330e00e6a72d8cfd96b81cc36eed969361db4756607c7c447af73b05f5ff0c27699e32636df12627693c667dea0a9955d2553ea35e
 DIST botocore-1.20.30.tar.gz 7534280 BLAKE2B bfa6066e8e2c28475807b8a469257cc8fc6dfb17de231e25db411223a55bc897534e90aa2d7f2a89a21378f8dbbbae52e553333292c1726d11c60cfeea4f4f7a SHA512 3d0d2cc120a1aaa225ebbd2a9393e0d413653c44e55f99094f36d62993737a2f2b5d63a64225e207c4a21b60971fb40eb8c30059efe77cdad6681ce00d4da5ac
+DIST botocore-1.20.31.tar.gz 7544090 BLAKE2B c8c158f69463e2eaf3c817d7577bd449724bf0a409e65bd83734cb7af3c0211999e4f7d240da97f017829ee04cbd4f69af0e7ea589adcfb413498dfd831630c9 SHA512 a7f8c02b4518a25e1eb0299b3cec5791810e81b7b6b1d8c9ef2e94cd9fcba21bdcdfc3fe96955e134fc0acb78e27aff850ee352a718d2bf518c8480287a1eb26
+DIST botocore-1.20.32.tar.gz 7543258 BLAKE2B 464b1b32d32f25874cf73a57c281436a6c6095d69dbd90ac6566fbfacb58fea4162e61d58092708c243917398fb9c1898feb3ed7903515a0a2f24c6cf16278d3 SHA512 e7a7a1fac7fab4e6ec49e38909c306ed7f54b544ebe85cefb0a743aa44882707b51877d4872926be282117ecfeeef564f1345b2be8daed9cd54dcd970d5d6811
 DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df
--- a/dev-python/botocore/botocore-1.20.31.ebuild
+++ b/dev-python/botocore/botocore-1.20.31.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
--- a/dev-python/botocore/botocore-1.20.32.ebuild
+++ b/dev-python/botocore/botocore-1.20.32.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
--- a/dev-python/cbor2/cbor2-5.2.0.ebuild
+++ b/dev-python/cbor2/cbor2-5.2.0.ebuild
@ -2,8 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS="bdepend"
+PYTHON_COMPAT=( python3_{7..9} )

 inherit distutils-r1

@ -11,23 +10,13 @@ DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
 HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

-IUSE="test"
-RESTRICT="!test? ( test )"
-
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~x86"

-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="${DEPEND}"
+distutils_enable_tests pytest

 python_prepare_all() {
-
 	# remove pytest-cov dep
 	sed -e "s/pytest-cov//" \
 		-e "s/--cov //" \
@ -36,4 +25,16 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }

-distutils_enable_tests pytest
+python_test() {
+	local deselect=()
+
+	if use arm || use x86; then
+		# https://github.com/agronholm/cbor2/issues/99
+		deselect+=(
+			tests/test_decoder.py::test_huge_truncated_bytes
+			tests/test_decoder.py::test_huge_truncated_string
+		)
+	fi
+
+	epytest ${deselect[@]/#/--deselect }
+}
--- a/dev-python/flask-sqlalchemy/Manifest
+++ b/dev-python/flask-sqlalchemy/Manifest
@ -1 +1,2 @@
 DIST Flask-SQLAlchemy-2.4.4.tar.gz 132193 BLAKE2B 044885af05463bfe377ef503baea6fe8b4a988e1f23aa6e8165ba76f85626d5b596226eabd7d69b984848149c8401b136806e8a68ed568d4cce97acbf402cbb4 SHA512 9d952a39f3d116306ae15c8f802780c987e54dbe519612a9b699bb77e8a45f272e90f994697f881283d1eaf5767d42eaef2ca017d22c08e48596d385d942b1ee
+DIST Flask-SQLAlchemy-2.5.1.tar.gz 132750 BLAKE2B 6378766e9ae5e697f9a0fe23471f0264e5ac1f4c824657e5197f6c35f9f12eb756528641c1078b1bf470170c557c3201314a80b922b4ab84e4664a0ccaad2a6c SHA512 5d483418204030837e62769d45c16af88c5be6dbafc7c340cc4e67ef1736ea5102f506156119864cd7673cf382b0d3f27050bda64273b93ef4805fce9e1a0f6f
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4-r1.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.4.4-r1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="Flask-SQLAlchemy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy support for Flask applications"
+HOMEPAGE="https://pypi.org/project/Flask-SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+RDEPEND="
+	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/pallets-sphinx-themes \
+	dev-python/sphinx-issues
--- a/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
+++ b/dev-python/flask-sqlalchemy/flask-sqlalchemy-2.5.1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"

 RDEPEND="
 	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
--- a/dev-python/google-auth-oauthlib/metadata.xml
+++ b/dev-python/google-auth-oauthlib/metadata.xml
@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
--- a/dev-python/lark-parser/Manifest
+++ b/dev-python/lark-parser/Manifest
@ -1 +1,2 @@
+DIST lark-parser-0.11.2.tar.gz 225851 BLAKE2B b4fec8701287237442d8fd3b2519f75f70f153a0d9deba8b39ba3317df358fe1ddda738f320ff689a7a8965ab157fefea7eb121ea980c6a6d8ca1b42d63941c9 SHA512 277be4e6d56d8e2747df434518d6d7918c149a67c3f6af3f978858be86f3fae9248989823c2429dbdff4a1c1615753607f5487fd9d6705cfafec698cb9d47e4b
 DIST lark-parser-0.7.8.tar.gz 276204 BLAKE2B c2d103f41b7b6ccb988c5935c53e422d495980c1d64cba125e9d27b9b7bf03c0864904e6c2c6b40ec56e8975a8051f1a18c9da126d02fe149dc3684ea7d41c30 SHA512 52eed1a5f26fa7ba79820298a8f6f7594b2351797abdaf8fd96f76e15a11711805955e055164ce287f7204edf3d19116562795cf56db464b4f2f15e40e1da561
--- a/dev-python/lark-parser/lark-parser-0.11.2.ebuild
+++ b/dev-python/lark-parser/lark-parser-0.11.2.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to propose a modern general-purpose parsing library for Python"
+HOMEPAGE="https://github.com/lark-parser/lark"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/regex[${PYTHON_USEDEP}]
+		dev-python/js2py[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	"${EPYTHON}" -m tests || die "Tests fail with ${EPYTHON}"
+}
--- a/dev-python/markdown/markdown-2.6.11.ebuild
+++ b/dev-python/markdown/markdown-2.6.11.ebuild
@ -16,8 +16,7 @@ SRC_URI="mirror://pypi/M/${PN^}/${P^}.tar.gz"

 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc
-~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 RESTRICT="test"

--- a/dev-python/pgspecial/metadata.xml
+++ b/dev-python/pgspecial/metadata.xml
@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andreacerisara@gmail.com</email>
-		<name>Andrea Cerisara</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		PGSpecial provides an API to execute meta-commands
 		(AKA "special", or "backslash commands") on PostgreSQL.
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@ -1 +1,2 @@
 DIST pydocstyle-5.1.1.tar.gz 70759 BLAKE2B 3cdb519d7f9459a201c9b7bc3002e69dae76b79758b155198b3101c6817c66db01616723e789dd8105d0339d6163fec02ab50db2370b13d3a8d1c5a17ecded6c SHA512 70c7408dfa4c8e54a3abf0548a9af26a7ad7ee0bb76f3a41bf6f2297ce09c13c03ab5e066b1b15404ba6390ddfcacbc5e199d8b73ee74e3b184759d88c8b2a51
+DIST pydocstyle-6.0.0.tar.gz 72143 BLAKE2B 1036a5eab38a38bda0f98371f7e4094248cf5057a9afd8743a478f153a5f06feab6b3e7d6be031615b5e88c388786f59a0619f774f492e40a722f39973051d5b SHA512 609a10307aa24513f476ef639771fc095fe7a65ffd8d530fad02886369c62969c69a5134fd0ec79a1e07d1b6cb8f920c3478db546c26aefb0e45771777c02a0b
--- a/dev-python/pydocstyle/pydocstyle-6.0.0.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-6.0.0.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python docstring style checker"
+HOMEPAGE="https://github.com/PyCQA/pydocstyle/"
+SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
+
+distutils_enable_tests --install pytest
+# Requires network to lookup github issues
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
+
+src_prepare() {
+	# no, seriously, you don't need to install it yourself
+	sed -i -e '/pip/d' src/tests/test_integration.py || die
+
+	distutils-r1_src_prepare
+}
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@ -1 +1,2 @@
 DIST reno-3.2.0.tar.gz 77316 BLAKE2B 43fe83a5f4c3e812daa3d2456f6c3b0bc7ba661193187f05527108e7b182dd078ec7a26b39e2939d51efc231e60f3d503479a4729b391faf764fa1e5d941c967 SHA512 b0399e5472afa4c883af563949cf4083571ee6dfcc05babb9845fa44fb9cfa2d0a1be6f315915597c22e86e0504102cb4f90aee59273ccbaceb15e93ed078b65
+DIST reno-3.3.0.tar.gz 81168 BLAKE2B 46afacfa437c9d5fed49d454edaf92b96ffbd677de02d91c7fd431b5ae98764918e099dd486345907446a19b2c94a1c36ac5cff9cf6d911438b48d41d9585ba1 SHA512 0fb6ff09e71b829cabe452693aac0c3a14d44f75f93e8934ebd0b0861e7dcd749a92b7bf19bc4f46202ecb02840edd6d5e5787c8b8a5b64a6b91fb52fe18287d
--- a/dev-python/reno/reno-3.3.0.ebuild
+++ b/dev-python/reno/reno-3.3.0.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Release notes manager, storing release notes in a git repo and building docs"
+HOMEPAGE="https://pypi.org/project/reno/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/dulwich-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.11[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-2.1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+	)
+"
+
+# The doc needs to be built from a git repository
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Some tests need to be run from a git repository
+	rm reno/tests/test_{cache,semver}.py || die
+	distutils-r1_python_prepare_all
+}
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@ -1 +1,3 @@
 DIST s3transfer-0.3.4.tar.gz 118954 BLAKE2B 71436d3c8921650dfd2c3aec8a0ddbb2cdee8bb82da605b7a7cc38af112eccb9e2742720c597e01aff57fdd067f8a16a9789f5d5b56dd13f84977607e16ef470 SHA512 012b50cebff200dff3a424241bd0a1aa32bf88cb57a4e3a4616d96aac7c8d5d07e7bfee3a298195f55630d01925d27a3063701d915c6bd080dc2e9f7c01880e9
+DIST s3transfer-0.3.5.tar.gz 118959 BLAKE2B 8666ec91058752a1862582f886d373bd4eebbb3684571e1fcb0648e2c4ef3f24366b4e496960715487b6f1fb7fdc96f0031ee48259984f2bcdfbb2a8fe3d33bb SHA512 2a5a0b3163a8ae7097d82f897afec97533acc0d1a03271b5e261bc0b98a9af5a0fa0d594cc4cb701c1698bbc347d10b2b105c4393f349bfd5ef628d1844e7ddb
+DIST s3transfer-0.3.6.tar.gz 118877 BLAKE2B 0567b69ee71bd470b3b5bccce3db3e923eee6d8744d9e0e5a1789f3ba5f419742859f530ab43295e5ccb7ffe3c04da8db7ef92c973afac97ff2580bc13c6934f SHA512 3bf97f080b63a88f2860051ef9c0ecd4f06adf1a22eb5bd57c543532f7e85c39f722f0c9cd24022ac0ed3a54ca48a089a10b86703cb866730e265e53acbe602f
--- a/dev-python/s3transfer/s3transfer-0.3.5.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.3.5.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests/{unit,functional}
+}
--- a/dev-python/s3transfer/s3transfer-0.3.6.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.3.6.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="An Amazon S3 Transfer Manager"
+HOMEPAGE="https://github.com/boto/s3transfer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/botocore[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest tests/{unit,functional}
+}
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@ -1 +1,2 @@
+DIST soupsieve-2.2.1.tar.gz 99298 BLAKE2B 94532421f3b8e49d6ab75a54a60ac861a78eee9f6792ded096e39a8a43d46d195cff9b7d8feab918b0f2debc8a6dd35226ab714384fa7f4d795176e269b6c4cb SHA512 c1339cfca237af7f8915b6d644b8271f769f9a37aa68f8acf536236551baaf9bb44a2f2a736f9168a7649cde14d37b8c24614c9491acbf81e3f4fdaea96b4928
 DIST soupsieve-2.2.tar.gz 99261 BLAKE2B 637bed198a62a7f92f6b3c022dcb9a579c15a3dcb1e3581b5a18b9ff804c2075c976c3478f86d2400841c177f3160dc05da41991ca56731c91e6db5b95262671 SHA512 26402c831c19c9b133442dd8ea31363e1eadc3cafe172b933cdbc746df6dc9961e930d4fbe8399b847848bf3fcd5893d2449e912ed0cdf8766468997acf5ee87
--- a/dev-python/soupsieve/soupsieve-2.2.1.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A modern CSS selector implementation for BeautifulSoup"
+HOMEPAGE="https://github.com/facelessuser/soupsieve/
+	https://pypi.org/project/soupsieve/"
+SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		dev-python/beautifulsoup[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r1.ebuild
+++ b/dev-util/idea-community/idea-community-2021.3.1.203.6682.168-r1.ebuild
@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 2-6)"
+MY_PV="$(ver_cut 1-3)"
+MY_PN="idea"
+# Using the most recent Jetbrains Runtime binaries available at the time of writing
+# ( jre 11.0.8 build 1098.1  )
+JRE11_BASE="11_0_8"
+JRE11_VER="1098.1"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~arm64"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+		amd64? ( https://bintray.com/jetbrains/intellij-jbr/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
+	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
+	GPL-2 GPL-2-with-classpath-exception ISC
+	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
+	MPL-1.0 MPL-1.1 OFL ZLIB"
+
+DEPEND="
+	|| (
+		~dev-java/openjdk-11.0.9_p11:11
+		~dev-java/openjdk-bin-11.0.9_p11:11
+	)"
+RDEPEND="${DEPEND}
+	dev-java/jansi-native
+	dev-libs/libdbusmenu
+	=dev-util/lldb-10*"
+
+BDEPEND="dev-util/patchelf"
+RESTRICT="splitdebug"
+S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-jdk.patch"
+)
+
+src_unpack() {
+	default_src_unpack
+	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+}
+
+src_prepare() {
+
+	default_src_prepare
+
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
+
+	rm -vf ${PLUGIN_DIR}/libavplugin*
+	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
+	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
+	rm -vf "${S}"/bin/libdbm64*
+	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
+
+	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
+		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
+		do
+			if [[ -f "$file" ]]; then
+			  patchelf --set-rpath '$ORIGIN' $file || die
+			fi
+		done
+	fi
+
+	patchelf --replace-needed liblldb.so liblldb.so.10 "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend || die "Unable to patch LLDBFrontend for lldb"
+	if use arm64; then
+		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
+	else
+		rm -vf "${S}"/lib/pty4j-native/linux/aarch64/libpty.so
+	fi
+
+	sed -i \
+		-e "\$a\\\\" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
+		-e "\$a# package manager. See bug #704494" \
+		-e "\$a#-----------------------------------------------------------------------" \
+		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
+
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+
+	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	if [[ -d ${JRE_DIR} ]]; then
+		for jrebin in $JRE_BINARIES; do
+			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+		done
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@ -1,3 +1,3 @@
 DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
-DIST pkgconf-1.7.2.tar.xz 292944 BLAKE2B dd0197afb75590e18b6ec8c76f9a7109edc3a0934b6b9ef7bf4006ffa73b0083d2a4aa120f2f3bd0a0e9d5fd564fd7d387aedeaa297fe72c63bc440518a51c6d SHA512 b0376178e93743fd844bdc94b5fa2678521ffe5022323e20f3c5196d500a87c3546d0edc2ac22e92cb528348116e2826d6f144bd7bd18d3f0afaa5cda74f25cd
 DIST pkgconf-1.7.3.tar.xz 293148 BLAKE2B b0fdad9e86c7e2aaf5f268de779730e55e14d6f0ddbec50f354b888aa9ca284f6d1d4c462f00b815cd6e0e17a3b41025ce77485f66a7d527f519a7b80283774d SHA512 37b6c4f9f3b93970e35b6970fde22fbbde65e7fa32a5634b3fdfc25cc1f33843582722ad13d9a8e96fd6768406fcbe86bf5feb76996ddd0bb66d6ff91e65f0b6
+DIST pkgconf-1.7.4.tar.xz 293888 BLAKE2B af814174b59e3ea7009230f639a6237226caafb22300946904dd10810c0b5cfcbfeea21767a3a1d2c2b5cb1fe4b7b1d995a52d820fcfce3adb383c66762b7576 SHA512 92c080684898b42824a1f1a7e3ce8a600896fc9c20fcf263f032b856fa4c7139607f87ba44d18ed358b8c5f4f04477708800d20a4e10f96e4268a55682f7f0c1
--- a/dev-util/pkgconf/pkgconf-1.7.4.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.7.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 2012-2020 Gentoo Authors
+# Copyright 2012-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.sr.ht/~kaniini/pkgconf"
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	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 ~x64-cygwin ~ppc-macos ~x64-macos"
 fi

 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
@ -30,11 +30,7 @@ BDEPEND="
 	)
 "
 RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
+	pkg-config? ( !dev-util/pkgconfig )
 "

 MULTILIB_CHOST_TOOLS=(
@ -44,6 +40,8 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	default

+	[[ ${CHOST} == *-darwin9 ]] && eapply "${FILESDIR}"/${P}-darwin9.patch
+
 	[[ ${PV} == "9999" ]] && eautoreconf
 	if use pkg-config; then
 		MULTILIB_CHOST_TOOLS+=(
@ -54,7 +52,12 @@ src_prepare() {

 multilib_src_configure() {
 	local ECONF_SOURCE="${S}"
-	econf --disable-static
+	local args=(
+		--disable-static
+		--with-system-includedir="${EPREFIX}/usr/include"
+		--with-system-libdir="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)"
+	)
+	econf "${args[@]}"
 }

 multilib_src_test() {
--- a/dev-util/rebar-bin/Manifest
+++ b/dev-util/rebar-bin/Manifest
@ -1,2 +1 @@
-DIST rebar-bin-3.13.2 839684 BLAKE2B f7aab86b015549bb13a7fe2b3b0c64fc6b8383f46adef2fd50a080983a411f936d1c416be60eac70a2ea72439831c9a5e0e85381168ca973d6fcfbfa198e0987 SHA512 33cb7b083cd0e90159e06d6b21c1e8047cc5a2d49c469ae15449fefb8576427f2088977a294c677548f0543eb06cb25ad4c165e8df4b373e3562a7adc6125a94
-DIST rebar-bin-3.6.2 694889 BLAKE2B 3a8f5562a0c984caf5d7b3ba1063a90bf110a60cea316eaf88f5199b890e186f85193dc0302b36dc31051d3552912c8d1582f563f989df97ee28364a3f47512a SHA512 8fb5c7737d70fc7a706b1e124ab660550e8637da9258338016ab2e260f1c6d662548ef723705cd18210050d052e79945578623d9e9892e08dbfdb9cb04fd89fb
+DIST rebar-bin-3.14.4 943940 BLAKE2B b9196c44407783f5cdeec6d56acad20837b2f9c550e5dd1cc16d7190a5dd9897cf4044720175db216f154beed093fc81b4a3c26702e7f4675473924dc7508530 SHA512 35a8ca34a26c7fe0b7edc22ca0589b3813827ee6d59f49e7b2669186fc6183d4efd33c258a4659f14421bbe2b2d7c7c464ab7fd36f87297faa3c6f812945eb2d
--- a/dev-util/rebar-bin/metadata.xml
+++ b/dev-util/rebar-bin/metadata.xml
@ -1,7 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<stabilize-allarches/>
+	<maintainer type="person" proxied="yes">
+		<email>matt@offtopica.uk</email>
+		<name>Matt Smith</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Rebar3 is an Erlang tool that makes it easy to create, develop, and
 		release Erlang libraries, applications, and systems in a repeatable
--- a/dev-util/rebar-bin/rebar-bin-3.14.4.ebuild
+++ b/dev-util/rebar-bin/rebar-bin-3.14.4.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=7
--- a/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
+++ b/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=${P#-bin}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
-HOMEPAGE="https://github.com/erlang/rebar3"
-
-SRC_URI="https://github.com/erlang/rebar3/releases/download/${PV}/rebar3 -> ${P}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-lang/erlang"
-DEPEND=""
-
-S="${WORKDIR}"
-
-QA_PREBUILT="/usr/bin/rebar3"
-
-src_unpack() {
-	cp -v "${DISTDIR}/${P}" "${S}/rebar3" || die
-}
-
-src_install() {
-	dobin rebar3
-}
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
+RESTRICT="!test? ( test )"

 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
--- a/dev-util/systemtap/systemtap-4.0-r2.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r2.ebuild
@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
+RESTRICT="!test? ( test )"

 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
--- a/dev-util/systemtap/systemtap-4.4.ebuild
+++ b/dev-util/systemtap/systemtap-4.4.ebuild
@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="libvirt selinux sqlite +ssl test zeroconf"
+RESTRICT="!test? ( test )"

 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
--- a/dev-vcs/git-extras/Manifest
+++ b/dev-vcs/git-extras/Manifest
@ -0,0 +1 @@
+DIST git-extras-6.1.0.tar.gz 153503 BLAKE2B 3450edecb3116e19ffcf918b118aee04f025c06d812e29e8701f35a3c466b13d2578d41c8e1ee93327743d0019bf98bb3f397189e19435f89e3a259ff1b82747 SHA512 098415339177f802299d93947e2979a2fc6c2935eb2d735cd71ad76e035d5489e4c8d9009e2673c109b28e393319745be249cc195814087d59b436f4a56dabab
--- a/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch
+++ b/dev-vcs/git-extras/files/git-extras-6.1.0-no-bash-completion-install.patch
@ -0,0 +1,12 @@
+We shouldn't install this manually via the Makefile - or to that location.
+--- a/Makefile
+++ b/Makefile
+@@ -69,8 +69,6 @@ install: check
+ 		cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX); \
+ 		echo "cp -f man/git-*.1 $(DESTDIR)$(MANPREFIX)"; \
+ 	fi
+-	@mkdir -p $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
+-	cp -f etc/bash_completion.sh $(DESTDIR)$(SYSCONFDIR)/bash_completion.d/git-extras
+ 	@echo ""
+ 	@echo "If you are a zsh user, you may want to 'source $(CODE_DIR)etc/git-extras-completion.zsh'" \
+ 		"and put this line into ~/.zshrc to enable zsh completion"
--- a/dev-vcs/git-extras/git-extras-6.1.0.ebuild
+++ b/dev-vcs/git-extras/git-extras-6.1.0.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Git utilities -- repo summary, repl, changelog population, author commit percentages and more"
+HOMEPAGE="https://github.com/tj/git-extras"
+SRC_URI="https://github.com/tj/git-extras/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x64-macos"
+
+RDEPEND="
+	app-shells/bash
+	dev-vcs/git
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.1.0-no-bash-completion-install.patch
+)
+
+src_prepare() {
+	default
+
+	# For now, don't force including the git completion
+	# sed -i -e "1 i source $(get_bashcompdir)\/git" etc/bash_completion.sh || die
+}
+
+src_configure() {
+	return
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		SYSCONFDIR="${EPREFIX}/etc" \
+		install
+
+	# TODO: Unfortunately, none of the completion seems to
+	# actually work for me yet(?)
+
+	#newbashcomp "${S}"/etc/bash_completion.sh ${PN}
+
+	#insinto /usr/share/zsh/site-functions
+	#newins "${S}"/etc/${PN}-completion.zsh _${PN}
+
+    #insinto /usr/share/fish/vendor_completions.d
+    #doins "${S}"/etc/${PN}.fish
+}
--- a/dev-vcs/git-extras/metadata.xml
+++ b/dev-vcs/git-extras/metadata.xml
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tj/git-extras</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-vcs/git-publish/Manifest
+++ b/dev-vcs/git-publish/Manifest
@ -0,0 +1 @@
+DIST git-publish-1.7.0.tar.gz 21569 BLAKE2B 1438e5018ebe7d258fee2527597e56080b574765a87b03d814b6d0d41c68397cba6099866382e9f2c560d8bab58214fb9e5f54f0127433917178337df81ff789 SHA512 dbf343e0284c52edd42ba8d844a9db90810ddd02e7a98bcd1c2af72cd9f5242e9c0a9ea921edf47583bfe05943288286e57a018a7a6b2dcf25bae4f663225025
--- a/dev-vcs/git-publish/git-publish-1.7.0.ebuild
+++ b/dev-vcs/git-publish/git-publish-1.7.0.ebuild
@ -0,0 +1,43 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit python-single-r1
+
+DESCRIPTION="Tool for preparing and storing patch revisions as git tag"
+HOMEPAGE="https://github.com/stefanha/git-publish"
+SRC_URI="https://github.com/stefanha/git-publish/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+man"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-vcs/git
+"
+BDEPEND="${PYTHON_DEPS}
+	man? ( dev-lang/perl )
+"
+
+src_prepare() {
+	default
+	python_fix_shebang git-publish
+}
+
+src_compile() {
+	if use man; then
+		pod2man --center "git-publish Documentation" --release "${PV}" \
+			git-publish.pod git-publish.1 || die
+	fi
+}
+
+src_install() {
+	dobin git-publish
+	use man && doman git-publish.1
+	insinto /usr/share/${PN}/hooks
+	doins hooks/pre-publish-send-email.example
+}
--- a/dev-vcs/git-publish/metadata.xml
+++ b/dev-vcs/git-publish/metadata.xml
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription>
+		git-publish prepares patches and stores them as git tags for future reference.
+		It works with individual patches as well as patch series. Revision numbering
+		is handled automatically.
+	</longdescription>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">stefanha/git-publish</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-vcs/git-pw/Manifest
+++ b/dev-vcs/git-pw/Manifest
@ -0,0 +1 @@
+DIST git-pw-2.0.0.tar.gz 32151 BLAKE2B f8ef04b31cb4457ac9bae333bae65deb7d17469cd25a3724a27201dab0c05f98151a5ec1066cb9d2de81d82360f4e46eaa59ebd08904dfa0d16106f589e17e4c SHA512 83ac4d56091bfe9b03733939fb3e4feab22ce4455eebe8508bc730705b69054a2f060cfb8a1ea469476d9519809a89116ff56210efe4cd76e50df5a5d40886fc
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST git-extras-6.1.0.tar.gz 153503 BLAKE2B 3450edecb3116e19ffcf918b118aee04f025c06d812e29e8701f35a3c466b13d2578d41c8e1ee93327743d0019bf98bb3f397189e19435f89e3a259ff1b82747 SHA512 098415339177f802299d93947e2979a2fc6c2935eb2d735cd71ad76e035d5489e4c8d9009e2673c109b28e393319745be249cc195814087d59b436f4a56dabab`
				`@ -0,0 +1 @@`
				`DIST git-publish-1.7.0.tar.gz 21569 BLAKE2B 1438e5018ebe7d258fee2527597e56080b574765a87b03d814b6d0d41c68397cba6099866382e9f2c560d8bab58214fb9e5f54f0127433917178337df81ff789 SHA512 dbf343e0284c52edd42ba8d844a9db90810ddd02e7a98bcd1c2af72cd9f5242e9c0a9ea921edf47583bfe05943288286e57a018a7a6b2dcf25bae4f663225025`
				`@ -0,0 +1 @@`
				`DIST git-pw-2.0.0.tar.gz 32151 BLAKE2B f8ef04b31cb4457ac9bae333bae65deb7d17469cd25a3724a27201dab0c05f98151a5ec1066cb9d2de81d82360f4e46eaa59ebd08904dfa0d16106f589e17e4c SHA512 83ac4d56091bfe9b03733939fb3e4feab22ce4455eebe8508bc730705b69054a2f060cfb8a1ea469476d9519809a89116ff56210efe4cd76e50df5a5d40886fc`