Sync with portage [Tue Jun 22 08:44:51 MSK 2021].

3 years ago · 27d948b1d5
parent d43d24060a
commit 27d948b1d5
396 changed files with 4368 additions and 3650 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-antivirus/Manifest.gz
+++ b/app-antivirus/Manifest.gz
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@ -1 +1,2 @@
 DIST clamav-0.103.2.tar.gz 13387954 BLAKE2B de0ececd2fe4486d2e8194dbeb45bfb74086ab3eb45fcab7590e75aa5a2242981066a4e8fa99b571cf7278f4516d986ad1a24254a8fe2c5caf4c870b3179c4b6 SHA512 87d47c4529a57da0b47b3744a279996ca24fa74ce10d7e27a53c19c1e13098af680e0e48ed767122bb2bbd3f927302451da84ccf51a933e7e3556ef43cbe9f45
+DIST clamav-0.103.3.tar.gz 13389239 BLAKE2B 1846cceed39fbd48fcf973d05a57901cf6f9ccdbb4d7eae501e712d84ab4d0a662e4477696aa6a1446116db85a89603428d7092a55e18f7acb805016d3cd5431 SHA512 c2ee24a6f63735c064140aa5baa347d51e8240b2f7eced3480d05435202aedd481fa7057fd40ecbc2e93a62fe8b0cefb574d8accdf9acede643ffbe0d396686f
--- a/app-antivirus/clamav/clamav-0.103.3.ebuild
+++ b/app-antivirus/clamav/clamav-0.103.3.ebuild
@ -0,0 +1,234 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd tmpfiles
+
+DESCRIPTION="Clam Anti-Virus Scanner"
+HOMEPAGE="https://www.clamav.net/"
+SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="bzip2 doc clamonacc clamdtop clamsubmit iconv ipv6 libclamav-only milter metadata-analysis-api selinux systemd test uclibc xml"
+
+REQUIRED_USE="libclamav-only? ( !clamonacc !clamdtop !clamsubmit !milter !metadata-analysis-api )"
+
+RESTRICT="!test? ( test )"
+
+# Require acct-{user,group}/clamav at build time so that we can set
+# the permissions on /var/lib/clamav in src_install rather than in
+# pkg_postinst; calling "chown" on the live filesystem scares me.
+CDEPEND="acct-group/clamav
+	acct-user/clamav
+	dev-libs/libltdl
+	dev-libs/libmspack
+	|| ( dev-libs/libpcre2 >dev-libs/libpcre-6 )
+	dev-libs/tomsfastmath
+	>=sys-libs/zlib-1.2.2:=
+	bzip2? ( app-arch/bzip2 )
+	clamdtop? ( sys-libs/ncurses:0 )
+	clamsubmit? ( net-misc/curl dev-libs/json-c:= )
+	elibc_musl? ( sys-libs/fts-standalone )
+	iconv? ( virtual/libiconv )
+	!libclamav-only? ( net-misc/curl )
+	dev-libs/openssl:0=
+	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
+	xml? ( dev-libs/libxml2 )"
+
+# We need at least autoconf-2.69-r5 because that's the first (patched)
+# version of it in Gentoo that supports ./configure --runstatedir.
+BDEPEND=">=sys-devel/autoconf-2.69-r5
+	virtual/pkgconfig"
+
+DEPEND="${CDEPEND}
+	metadata-analysis-api? ( dev-libs/json-c:* )
+	test? ( dev-libs/check )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-clamav )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
+	"${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616
+	"${FILESDIR}/${PN}-0.103.0-system-tomsfastmath.patch" # 649394
+	"${FILESDIR}/${PN}-0.103.1-upstream-openrc.patch"
+)
+
+src_prepare() {
+	default
+
+	# Be extra sure that we're using the system copy of tomsfastmath
+	einfo "removing bundled copy of dev-libs/tomsfastmath"
+	rm -r libclamav/tomsfastmath || \
+		die "failed to remove bundled tomsfastmath"
+
+	AT_NO_RECURSIVE="yes" eautoreconf
+}
+
+src_configure() {
+	use elibc_musl && append-ldflags -lfts
+	use ppc64 && append-flags -mminimal-toc
+	use uclibc && export ac_cv_type_error_t=yes
+
+	# according to configure help it should be
+	# $(use_enable xml)
+	# but that does not work
+	# do not add this, since --disable-xml seems to override
+	# --without-xml
+	JSONUSE="--without-libjson"
+
+	if use clamsubmit || use metadata-analysis-api; then
+		# either of those 2 requires libjson.
+		# clamsubmit will be built as soon as libjson and curl are found
+		# but we only install the binary if requested
+		JSONUSE="--with-libjson=${EPREFIX}/usr"
+	fi
+
+	local myeconfargs=(
+		$(use_enable bzip2)
+		$(use_enable clamonacc)
+		$(use_enable clamdtop)
+		$(use_enable ipv6)
+		$(use_enable milter)
+		$(use_enable test check)
+		$(use_with xml)
+		$(use_with iconv)
+		${JSONUSE}
+		$(use_enable libclamav-only)
+		$(use_with !libclamav-only libcurl)
+		--with-system-libmspack
+		--cache-file="${S}"/config.cache
+		--disable-experimental
+		--disable-static
+		--disable-zlib-vcheck
+		--enable-id-check
+		--with-dbdir="${EPREFIX}"/var/lib/clamav
+		# Don't call --with-zlib=/usr (see bug #699296)
+		--with-zlib
+		--disable-llvm
+		--enable-openrc
+		--runstatedir=/run
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/var/lib/clamav || die
+
+	if ! use libclamav-only ; then
+		if use systemd; then
+			# The tmpfiles entry is behind USE=systemd because the
+			# upstream OpenRC service files should (and do) ensure that
+			# the directories they need exist and have the correct
+			# permissions without the help of opentmpfiles. There are
+			# years-old root exploits in opentmpfiles, the design is
+			# fundamentally flawed, and the maintainer is not up to
+			# the task of fixing it.
+			dotmpfiles "${FILESDIR}/tmpfiles.d/clamav.conf"
+			systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
+			systemd_dounit "${FILESDIR}/clamd.service"
+			systemd_newunit "${FILESDIR}/freshclamd.service-r1" \
+							"freshclamd.service"
+		fi
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/clamd.logrotate" clamd
+		newins "${FILESDIR}/freshclam.logrotate" freshclam
+		use milter && \
+			newins "${FILESDIR}/clamav-milter.logrotate" clamav-milter
+
+		# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s/^#\(PidFile .*\)/\1/" \
+			-e "s/^#\(LocalSocket .*\)/\1/" \
+			-e "s/^#\(User .*\)/\1/" \
+			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
+			-e "s:^\#\(LogTime\).*:\1 yes:" \
+			-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+			"${ED}"/etc/clamd.conf.sample || die
+
+		sed -i -e "s:^\(Example\):\# \1:" \
+			-e "s/^#\(PidFile .*\)/\1/" \
+			-e "s/^#\(DatabaseOwner .*\)/\1/" \
+			-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+			-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
+			-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
+			-e "s/^#\(DatabaseDirectory .*\)/\1/" \
+			"${ED}"/etc/freshclam.conf.sample || die
+
+		if use milter ; then
+			# Note: only keep the "unix" ClamdSocket and MilterSocket!
+			sed -i -e "s:^\(Example\):\# \1:" \
+				-e "s/^#\(PidFile .*\)/\1/" \
+				-e "s/^#\(ClamdSocket unix:.*\)/\1/" \
+				-e "s/^#\(User .*\)/\1/" \
+				-e "s/^#\(MilterSocket unix:.*\)/\1/" \
+				-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
+				"${ED}"/etc/clamav-milter.conf.sample || die
+
+			cat >> "${ED}"/etc/conf.d/clamd <<-EOF
+				MILTER_NICELEVEL=19
+				START_MILTER=no
+			EOF
+
+			systemd_newunit "${FILESDIR}/clamav-milter.service-r1" clamav-milter.service
+		fi
+
+		local i
+		for i in clamd freshclam clamav-milter
+		do
+			if [[ -f "${ED}"/etc/"${i}".conf.sample ]]; then
+				mv "${ED}"/etc/"${i}".conf{.sample,} || die
+			fi
+		done
+
+		# These both need to be writable by the clamav user.
+		# TODO: use syslog by default; that's what it's for.
+		diropts -o clamav -g clamav
+		keepdir /var/lib/clamav
+		keepdir /var/log/clamav
+	fi
+
+	if use doc ; then
+		local HTML_DOCS=( docs/html/. )
+		einstalldocs
+
+		if ! use libclamav-only ; then
+			doman docs/man/*.[1-8]
+		fi
+	fi
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	if use libclamav-only ; then
+		ewarn "Test target not available when USE=libclamav-only is set, skipping tests ..."
+		return 0
+	fi
+
+	emake quick-check
+}
+
+pkg_postinst() {
+	if use milter ; then
+		elog "For simple instructions how to setup the clamav-milter read the"
+		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
+	fi
+
+	local databases=( "${EROOT}"/var/lib/clamav/main.c[lv]d )
+	if [[ ! -f "${databases}" ]] ; then
+		ewarn "You must run freshclam manually to populate the virus database"
+		ewarn "before starting clamav for the first time."
+	fi
+
+	ewarn "This version of ClamAV provides separate OpenRC services"
+	ewarn "for clamd, freshclam, clamav-milter, and clamonacc. The"
+	ewarn "clamd service now starts only the clamd daemon itself. You"
+	ewarn "should add freshclam (and perhaps clamav-milter) to any"
+	ewarn "runlevels that previously contained clamd."
+}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
+++ b/app-crypt/dehydrated/dehydrated-0.7.0.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://github.com/lukas2511/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 ~riscv x86"
 IUSE="+cron"

 RDEPEND="acct-group/dehydrated
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@ -1,2 +1,2 @@
-DIST tpm2-tools-4.3.1.tar.gz 891993 BLAKE2B d145fd542952ebbf59bb82640b9ac41cc777dcd8f526683447e3a3fd22fd4c46ab59899418ae52382d88e05418b772afd7f10093c5e0ef4cba685470cf7a7c8e SHA512 0104b6bca9e56ee30c033f3ddb2ab75b683b07ff917b800ff8fde49ce5cdc6d42e5fff63ed3ee9700f656dbf34bca76cee7408c256f1e30d92148c506b0032f2
-DIST tpm2-tools-5.0.tar.gz 990855 BLAKE2B 5d39bbef0bc6f0d84f37c64c697260343a9f9e134bce015a6b529176195adb907672f35b85382b0a4785e40e368030ac347083086c3799bdfe86dced1ac69848 SHA512 ea57a28a61e28b78cae7067ff58facd8754fafab7a2689fd93f8b3374073b6ac30301a75f8ff5c654800ab469ee6604d0b8a86c310631b9545b816ecaa05968e
+DIST tpm2-tools-4.3.2.tar.gz 887708 BLAKE2B ee6fe3d0566138d6289d1a91252ccb106d36ff80d55f2d6f9ee30c8e16338d706e80085ac5f4f56a79bcb339e5dcb240efcf71d4003bcffdad366f3cd7a1165b SHA512 1aa47c62c3d2a83195ec649e50c0be2c8be39f926806d8d7cb96edc499c385d527661813e02024e98f83ae9ebcb22d7dadc507ddfab48be9bbe428d9439d7ee1
+DIST tpm2-tools-5.1.1.tar.gz 1044427 BLAKE2B 885ff61ad971c95d067bf8f9339de289f082f3103d1c382f45ac3ffbd4d5effc343ddc3c2c74b97b9d31f3f823d264991d1726c1f9c21d5c9b82ac1cdf714d3f SHA512 4e094dcffb66103773d85e866ab9ba8db5d0f205ff9658e08fe14e8e41250570a7f7274b4048934adf256ea41650fa498fc3d6da2786adc241a4bf2e8f7bf78e
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.2.ebuild
--- a/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
@ -25,9 +25,6 @@ RDEPEND="net-misc/curl:=
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	sys-devel/autoconf-archive"
-PATCHES=(
-	"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
-)

 src_prepare() {
 	sed -i \
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/gtg/gtg-0.4.0.ebuild
+++ b/app-office/gtg/gtg-0.4.0.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"
@ -40,7 +40,7 @@ BDEPEND="
 			dev-python/cheetah3[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
 		')
-		app-text/pdfjam
+		|| ( app-text/pdfjam >=app-text/texlive-core-2021 )
 		app-text/pdftk
 		dev-texlive/texlive-latex
 	)
--- a/app-office/gtg/gtg-0.5.ebuild
+++ b/app-office/gtg/gtg-0.5.ebuild
@ -40,7 +40,7 @@ BDEPEND="
 			dev-python/cheetah3[${PYTHON_USEDEP}]
 			dev-python/mock[${PYTHON_USEDEP}]
 		')
-		app-text/pdfjam
+		|| ( app-text/pdfjam >=app-text/texlive-core-2021 )
 		app-text/pdftk
 		dev-texlive/texlive-latex
 	)
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/pdfgrep/metadata.xml
+++ b/app-text/pdfgrep/metadata.xml
@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>flo@geekplace.eu</email>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type='person'>
+		<email>flow@gentoo.org</email>
+		<name>Florian Schmaus</name>
 	</maintainer>
 	<use>
 		<flag name="unac">Removing accents and ligatures before search</flag>
--- a/dev-embedded/Manifest.gz
+++ b/dev-embedded/Manifest.gz
--- a/dev-embedded/rpi-eeprom/Manifest
+++ b/dev-embedded/rpi-eeprom/Manifest
@ -1,2 +1,4 @@
 DIST rpi-eeprom_11.0-1.debian.tar.xz 10248 BLAKE2B a83230dc13ce296963ed206725d465a69536f5cd23f52076fda2601ceea06354f365e1f8b2d9a93a4396826b5e9d9ab5ad40fd6336116e693419fd3b4630b5e1 SHA512 939fa16fbd8c21340ca77cc74f3cee22772d25cd6dcb70c178d70c1762ae9b9acb9e7a070b2c3a7f114841712142284c1f2bdb23fb528a229507d8eae6477c84
 DIST rpi-eeprom_11.0.orig.tar.gz 8075596 BLAKE2B ccbd895de728566bfb0402c2378f6eb13f88948490e14f1e251f6440f3ef31879ea66c0fe94761e1abf40a23924742e8c2f33c49200e710542131091b223b292 SHA512 0ea2971b752a53a4529b2c3d3b814b9e743440397f8c4d21c9a06493561a37bc8cd8c0adaaab389f41b1697584d12641f49d7a93d6541f9dda3bba5d6dd1371c
+DIST rpi-eeprom_12.5-1.debian.tar.xz 11808 BLAKE2B 82eccb61fbac25c9f20343ebccd4571fbc0c3df0c2388b92474f2a9ba042c6da8dc26ed21dffbf2a81be7c10561cffacf8ed80cb63435b28632cba9d505363bf SHA512 33581d017f5817202f7fe62e89f1a09c25ff63b30a11eb61fc08dcba4a512332d9dc32d6431240981e9690625e76d7cb9a3f601ef59cc1a3eba222c4d3c64e81
+DIST rpi-eeprom_12.5.orig.tar.gz 13662998 BLAKE2B 6c3937f4c4a950c6cc78285134bb8ee0b5459e9c9ba39ac020c6cd5e0b0bb6d6647d788c81ff1d639a87dd825d8b5fcaa29318f63823e56f6884ec4ce9a52361 SHA512 82608eee6106380b09657d729013e953f50bba2a45084fb9d38238142505a4f51f1f7c586dbd10a29e79b02d0b82670498f3dae16e368506a8187f1076d790fc
--- a/dev-embedded/rpi-eeprom/rpi-eeprom-12.5_p1.ebuild
+++ b/dev-embedded/rpi-eeprom/rpi-eeprom-12.5_p1.ebuild
@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit python-r1 systemd
+
+DESCRIPTION="Updater for Raspberry Pi 4 bootloader and the VL805 USB controller"
+HOMEPAGE="https://github.com/raspberrypi/rpi-eeprom/"
+MY_P="${PN}-$(ver_cut 1-2)"
+MY_BASE_URL="https://archive.raspberrypi.org/debian/pool/main/r/${PN}/${PN}_$(ver_cut 1-2)"
+SRC_URI="${MY_BASE_URL}-$(ver_cut 4).debian.tar.xz
+	${MY_BASE_URL}.orig.tar.gz"
+S="${WORKDIR}"
+
+SLOT="0"
+LICENSE="BSD rpi-eeprom"
+KEYWORDS="~arm ~arm64"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="sys-apps/help2man"
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${PYTHON_DEPS}
+	sys-apps/flashrom
+	|| (
+		>=media-libs/raspberrypi-userland-0_pre20201022
+		>=media-libs/raspberrypi-userland-bin-1.20201022
+	)"
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:/etc/default/rpi-eeprom-update:/etc/conf.d/rpi-eeprom-update:' \
+		"${MY_P}/rpi-eeprom-update" || die "Failed sed on rpi-eeprom-update"
+	sed -i \
+		-e 's:/usr/bin/rpi-eeprom-update:/usr/sbin/rpi-eeprom-update:' \
+		"debian/rpi-eeprom.rpi-eeprom-update.service" || die "Failed sed on rpi-eeprom.rpi-eeprom-update.service"
+}
+
+src_install() {
+	pushd "${MY_P}" 1>/dev/null || die "Cannot change into directory ${MY_P}"
+
+	python_scriptinto /usr/sbin
+	python_foreach_impl python_newscript rpi-eeprom-config rpi-eeprom-config
+
+	dosbin rpi-eeprom-update
+	keepdir /var/lib/raspberrypi/bootloader/backup
+
+	for dir in critical stable beta; do
+		insinto /lib/firmware/raspberrypi/bootloader
+		doins -r firmware/${dir}
+	done
+
+	dodoc firmware/release-notes.md
+
+	help2man -N \
+		--version-string="${PV}" --help-option="-h" \
+		--name="Bootloader EEPROM configuration tool for the Raspberry Pi 4B" \
+		--output=rpi-eeprom-config.1 ./rpi-eeprom-config || die "Failed to create manpage for rpi-eeprom-config"
+
+	help2man -N \
+		--version-string="${PV}" --help-option="-h" \
+		--name="Checks whether the Raspberry Pi bootloader EEPROM is \
+			up-to-date and updates the EEPROM" \
+		 --output=rpi-eeprom-update.1 ./rpi-eeprom-update || die "Failed to create manpage for rpi-eeprom-update"
+
+	doman rpi-eeprom-update.1 rpi-eeprom-config.1
+
+	newconfd rpi-eeprom-update-default rpi-eeprom-update
+
+	popd 1>/dev/null || die
+
+	pushd debian 1>/dev/null || die "Cannot change into directory debian"
+
+	systemd_newunit rpi-eeprom.rpi-eeprom-update.service rpi-eeprom-update.service
+	newdoc changelog changelog.Debian
+
+	popd 1>/dev/null || die
+
+	newinitd "${FILESDIR}/init.d_rpi-eeprom-update-1" "rpi-eeprom-update"
+}
+
+pkg_postinst() {
+	elog 'To have rpi-eeprom-update run at each startup, enable and start either'
+	elog '/etc/init.d/rpi-eeprom-update (for openrc users)'
+	elog 'or'
+	elog 'rpi-eeprom-update.service (for systemd users)'
+	elog '/etc/conf.d/rpi-eeprom-update contains the configuration.'
+	elog 'FIRMWARE_RELEASE_STATUS="critical|stable|beta" determines'
+	elog 'which release track you get. "critical" is recommended and the default.'
+}
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/spark/Manifest
+++ b/dev-lang/spark/Manifest
@ -1,4 +1,6 @@
 DIST gnat-2019-20190517-18C94-src.tar.gz 8950160 BLAKE2B ce6b8ca0687b3d345db72a8b3216e67ba706cfd7f6ca98f45ec2ae356d9c5b3a42a4b3aac5e89285871157ddaca3aff1b970934de88f8190d84aff060bf1fc4b SHA512 4d57c97fc1f3d5274e0c4ffa536ec056e7c3f1619010affff008cd07a0bfa638d18fee1705a5dd76f12d168baef85677cc34ef40f5e52fd5292ac886c0d4c5ee
+DIST gnat-2021-20210519-19A70-src.tar.gz 8765762 BLAKE2B ef48f54c6109566e37bfa5dee9262305d0529b3dfd333ee28bc4e66f4709a0673f673d742bc04deb15dc145404f7618d350dbdf3f2a7ab37c861e57d011946fa SHA512 3cb79be024fdd9b738d99ffc8e224d32bb382b5da2d02b97b2061a5ea58456f33d4564c92e224af2713ce15fd5481edd715e5b9a52abc74fdc142f27e103c201
 DIST gnat-gpl-2018-src.tar.gz 8706578 BLAKE2B ba245fd91cc5263d5b8c159d9e75caf6bed21dcaa5fa43734af8775a4008ce5f96bfb84a8b5e6e734ff883314ab3219dacec3fe95a5baa33fb712bfb5ff8bce8 SHA512 0ff7e848ef77f7e772e2a1b01905307a91c332f32329456f5238c4b7eb46cc118709e8682a5fc826d98a7d99fd15a92c194f4a278f04bc465165cfa616cc3c2e
 DIST spark-2019-20190517-19665-src.tar.gz 22778220 BLAKE2B b0e2141c4b8aa603ee51fe984654c502d214cc5461cf7afba90926b4f3393772bc755a4ec8ef307496f5c052d3c478312f987b79d8b31bec3e9dba962cedd419 SHA512 9ee15e1ae80720a0295ec8a59e1b414f82a4044ebd47f81f8daea7a155720bb151714d9e9c2830612f5530d906f6c393e84ffde16982afef547f1c8edc27e97a
+DIST spark-2021-2021-20210519-19A1A-src.tar.gz 11361491 BLAKE2B 67f8d27ae68ef4929aafaf96c470394e093883619c5c778e804f1ff62c297d5a3f628e04e987fb06741cb824710599928a7ec3b94fa6d7af029cff35be0898c3 SHA512 b595516892f6054d3c856c30c4296be9cd61adca3ea2cffe3c9060fbab249d36ce1b8fff6f80e1e8173ef6e232dd9c2da8a581ae9964845120c03d09896b635c
 DIST spark-gpl-2018-src.tar.gz 20244517 BLAKE2B efb8120a869eaf79aa513ea3b3393dcefdb548e66a00a630bfb9d28a59785c15362c111df3635423a7312c491c9929a7bcd8e7161607dc4d3acd6d1c27f3ca3e SHA512 83490a95c2d6401bcd077a8ec508eaf18609b5b480ccd9f247f4bb61164b5e52e34473526cd49ebdf5fd15ac422ed4a121dc50cab96241db02af9e32812a4df8
--- a/dev-lang/spark/files/spark-2021-gentoo.patch
+++ b/dev-lang/spark/files/spark-2021-gentoo.patch
@ -0,0 +1,13 @@
+--- a/src/gnatprove/configuration.adb	2021-06-21 22:30:18.962850246 +0200
+++ b/src/gnatprove/configuration.adb	2021-06-21 22:31:03.621210570 +0200
+@@ -1269,7 +1269,9 @@
+ 
+          end if;
+ 
+-         Set_Path_From_Gnatls (Proj_Env.all, "gnatls", GNAT_Version);
+         Set_Path_From_Gnatls (Proj_Env.all,
+                               "gnatls",
+                               GNAT_Version);
+          Free (GNAT_Version);
+          Set_Object_Subdir (Proj_Env.all,
+                             Filesystem_String
--- a/dev-lang/spark/spark-2021.ebuild
+++ b/dev-lang/spark/spark-2021.ebuild
@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ADA_COMPAT=( gnat_2021 )
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit ada python-any-r1 toolchain-funcs multiprocessing
+
+ADA_MIRROR=https://community.download.adacore.com/v1
+ID=969ce28e217bd5aa4db549a544d20846408a5229
+MYP=${P}-2021-20210519-19A1A-src
+GNATID=005d2b2eff627177986d2517eb31e1959bec6f3a
+GNATDIR=gnat-${PV}-20210519-19A70-src
+
+DESCRIPTION="Software development for high-reliability applications."
+HOMEPAGE="http://libre.adacore.com"
+SRC_URI="${ADA_MIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz
+	${ADA_MIRROR}/${GNATID}?filename=${GNATDIR}.tar.gz -> ${GNATDIR}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-ada/gnatcoll-core[${ADA_USEDEP},shared]
+	sci-mathematics/alt-ergo
+	sci-mathematics/why3-for-spark"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-ada/gprbuild[${ADA_USEDEP}]"
+
+REQUIRED_USE="${ADA_REQUIRED_USE}"
+
+S="${WORKDIR}"/${MYP}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+pkg_setup() {
+	ada_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	ln -sf "${WORKDIR}"/${GNATDIR}/src/ada gnat2why/gnat_src || die
+	default
+	sed -i \
+		-e "s:gnatls:${GNATLS}:g" \
+		src/gnatprove/configuration.adb || die
+}
+
+src_compile() {
+	emake -C gnat2why GPRARGS="-XLIBRARY_TYPE=relocatable -v"
+	gprbuild -p -XLIBRARY_TYPE=relocatable -v -P gnatprove.gpr || die
+	emake -C include generate
+}
+
+src_install() {
+	# Create the fake prover scripts to help extract benchmarks.
+	insinto /usr/libexec/spark/bin/
+	doins benchmark_script/fake_*
+
+	gprbuild -q -c -u -gnats spark2014vsn.ads \
+		-XLIBRARY_TYPE=relocatable -v \
+		-gnatet="${D}"/usr/libexec/spark/bin/target.atp || die
+	insinto /usr/share/spark
+	doins share/spark/help.txt
+	doins -r share/spark/config
+	insinto /usr/share/spark/theories
+	doins share/spark/theories/*why
+	doins share/spark/theories/*mlw
+	insinto /usr/share/spark/runtimes
+	doins share/spark/runtimes/README
+	insinto /usr/include/spark
+	doins include/*.ad?
+	insinto /usr/lib/gnat
+	doins include/*.gpr
+	doins -r include/proof
+
+	dosym ../../../lib64/why3/why3server /usr/libexec/spark/bin/why3server
+	dobin install/bin/gnatprove
+	exeinto /usr/libexec/spark/bin
+	doexe install/bin/gnat2why
+	doexe install/bin/spark_memcached_wrapper
+	doexe install/bin/spark_report
+	doexe install/bin/spark_codepeer_wrapper
+	doexe install/bin/spark_semaphore_wrapper
+
+	einstalldocs
+}
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@ -1,3 +1,4 @@
 DIST libfmt-7.0.3.tar.gz 740047 BLAKE2B d12d6f59bcea5b4385c4d9ff5c563860cb9275d34d5747d9f8b95664aaa499661500b630d1f621698a7a3f8431326ac5a5273e6883d070aab7cb9aa84b0bcd41 SHA512 26afe55255414e27d58c2389fcc8643b64adc04ecc3604f87024e6421706833cbad8ee4caf514dfb7e88da4162ab3e5ff8ff81b83b5f2fb66e9959e4d1bf0f9a
 DIST libfmt-7.1.2.tar.gz 769401 BLAKE2B 66a14197a818cbc63e2219eb9f8aeb47cc575a712e3a8e20ad6e2316219bd4661446533f305a1a18b83723d5f530c59dcff17251488c3e811aa090b399bc16ca SHA512 e245a3860df4414ad7ea114d2d5686d0c8ae06fbc45f4af0a232ad4bbf0797e5845d731e307af67aad920d3587e5e424135bffeab09132690edb387c47f4fe15
 DIST libfmt-7.1.3.tar.gz 770029 BLAKE2B 745440a6f5876d47d4651d007d5968f77d8f5ac01ab5ec17ec5851130a5581e2aa7d359ae297ce7318023b0bf386f9c027e3e38c65f297ae874e607253a3493a SHA512 cfb2431de822202f17a6f34a302b1922b9cd696d8d4c27ad50ea08add781d2af9944db987603c2eb294ee7d73054a60cc11d3a0693f7f6db61949f3041cb9517
+DIST libfmt-8.0.0.tar.gz 804902 BLAKE2B 9330acbfb6ab47a484b4dbd3138d11cdd79f4233dfe8fefed41d67118eb19b2c00db5896ee883e2f5ff297170c2eb8dfa001cc6d7c6eff42b6285acd0ea91b5c SHA512 61768bf8b64c430f11536800985509ce436bbbe05cbe1dfb6045cfaf2f859af98eae1019ef602af8fec6946ae25e4d8adb589f0f738666b20beb3afe65ee760c
--- a/dev-libs/libfmt/libfmt-8.0.0.ebuild
+++ b/dev-libs/libfmt/libfmt-8.0.0.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib
+
+DESCRIPTION="Small, safe and fast formatting library"
+HOMEPAGE="https://github.com/fmtlib/fmt"
+
+LICENSE="MIT"
+IUSE="test"
+SLOT="0/$(ver_cut 1)"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/fmtlib/fmt.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/fmt-${PV}"
+fi
+
+DEPEND=""
+RDEPEND=""
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DFMT_CMAKE_DIR="$(get_libdir)/cmake/fmt"
+		-DFMT_LIB_DIR="$(get_libdir)"
+		-DFMT_TEST=$(usex test)
+	)
+	cmake_src_configure
+}
--- a/dev-libs/tvision/files/tvision-2.2.3-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch
+++ b/dev-libs/tvision/files/tvision-2.2.3-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch
@ -0,0 +1,56 @@
+From: "Salvador E. Tropea" <salvador@inti.gob.ar>
+Date: Thu, 17 Jun 2021 13:11:22 -0300
+Subject: [PATCH 1/4] Added `ar` command now can be configured from the
+ environment
+
+- Using the AR environment variable.
+- Related to issue: #1
+- Gentoo issue: https://bugs.gentoo.org/796278
+---
+ conflib.pl | 24 +++++++++++++++---------
+ 1 file changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/conflib.pl b/conflib.pl
+index 0abd33df..946bfa95 100644
+--- a/conflib.pl
+++ b/conflib.pl
+@@ -1386,21 +1386,27 @@ sub LookForGNUMake
+ 
+ sub LookForGNUar
+ {
+- my $test;
+- print 'Looking for GNU ar: ';
+ my ($ar, $test);
+ 
+- if ($conf{'GNU_AR'})
+ print 'Looking for GNU ar: ';
+ $ar=$conf{'GNU_AR'};
+ if ($ar)
+    {
+-    print "$conf{'GNU_AR'} (cached)\n";
+-    return $conf{'GNU_AR'};
+    print "$ar (cached)\n";
+    return $ar;
+   }
+ $ar=$ENV{'AR'};
+ if (!length($ar))
+   {
+    $ar='ar';
+    }
+  $conf{'UseRanLib'}=0;
+- $test=RunRedirect('ar --version',$ErrorLog);
+ $test=RunRedirect($ar.' --version',$ErrorLog);
+  if (($test=~/GNU ar/) || ($test=~/BSD ar/))
+    {
+-    $conf{'GNU_AR'}='ar';
+-    print "ar\n";
+-    return 'ar';
+    $conf{'GNU_AR'}=$ar;
+    print "$ar\n";
+    return $ar;
+    }
+  $test=RunRedirect('gar --version',$ErrorLog);
+  if ($test=~/GNU ar/)
+-- 
+2.32.0
+
--- a/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch
+++ b/dev-libs/tvision/files/tvision-2.2.3-0001-use-proper-AR.patch
@ -1,23 +0,0 @@
-From 017a1059067ab58a9286b3049505cb3e77696de5 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Mon, 14 Jun 2021 17:48:45 +0200
-Subject: [PATCH 2/2] use proper AR
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---
- intl/dummy/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/intl/dummy/Makefile b/intl/dummy/Makefile
-index c32b0a8..d47e185 100644
--- a/intl/dummy/Makefile
-+++ b/intl/dummy/Makefile
-@@ -2,4 +2,4 @@ RHIDE_GCC=gcc
- CC=$(RHIDE_GCC)
- 
- libtvfintl.a: intldummy.o
-	ar -rv libtvfintl.a intldummy.o
-+	$(AR) -rv libtvfintl.a intldummy.o
-- 
-2.32.0
-
--- a/dev-libs/tvision/files/tvision-2.2.3-0002-Added-configuration-option-to-exclude-libgpm.patch
+++ b/dev-libs/tvision/files/tvision-2.2.3-0002-Added-configuration-option-to-exclude-libgpm.patch
@ -0,0 +1,60 @@
+From: "Salvador E. Tropea" <salvador@inti.gob.ar>
+Date: Thu, 17 Jun 2021 13:28:36 -0300
+Subject: [PATCH 2/4] Added configuration option to exclude libgpm
+
+- Fixes #1
+---
+ config.pl | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/config.pl b/config.pl
+index 21d81ff3..424e3065 100644
+--- a/config.pl
+++ b/config.pl
+@@ -73,7 +73,14 @@ if ($OS eq 'DOS')
+ 
+ if ($OS eq 'UNIX')
+   {
+-   LookForGPM($GPMVersionNeeded);
+   if ($conf{'gpm'} eq 'no')
+     {
+      $conf{'HAVE_GPM'}='no';
+     }
+   else
+     {
+      LookForGPM($GPMVersionNeeded);
+     }
+    LookForNCurses($NCursesVersionNeeded);
+    LookForKeysyms();
+    LookForXlib();
+@@ -424,6 +431,10 @@ sub SeeCommandLine
+       {
+        $conf{'no-dynamic'}='yes';
+       }
+    elsif ($i eq '--without-gpm')
+      {
+       $conf{'gpm'}='no';
+      }
+ #    elsif ($i eq '--unsafe-memcpy')
+ #      {
+ #       $conf{'HAVE_UNSAFE_MEMCPY'}='yes';
+@@ -482,6 +493,7 @@ sub ShowHelp
+  print "--no-intl        : don't use international support.\n";
+  print "--without-static : don't create the static library.\n";
+  print "--without-dynamic: don't create the dynamic library.\n";
+ print "--without-gpm    : skip gpm library detection.\n";
+  print "--with-mss       : compiles with MSS memory debugger.\n";
+  print "--without-mss    : compiles without MSS [default].\n";
+  print "--with-ssc       : compiles using Simple Streams Compatibility.\n";
+@@ -532,7 +544,7 @@ sub GiveAdvice
+     print "  using this library reconfigure using --no-intl. Read about it in the readme.\n";
+     print "  [[[[[[[*******************>>>>> IMPORTANT!!! <<<<<*******************]]]]]]]\n";
+    }
+- if ((@conf{'HAVE_GPM'} eq 'no') && ($OSf eq 'Linux'))
+ if ((@conf{'HAVE_GPM'} eq 'no') && ($OSf eq 'Linux') && ($conf{'gpm'} ne 'no'))
+    {
+     print "\n";
+     print "* No mouse support for console! please install the libgpm package needed\n";
+-- 
+2.32.0
+
--- a/dev-libs/tvision/files/tvision-2.2.3-0003-Adjusted-c-years.patch
+++ b/dev-libs/tvision/files/tvision-2.2.3-0003-Adjusted-c-years.patch
@ -0,0 +1,34 @@
+From: "Salvador E. Tropea" <salvador@inti.gob.ar>
+Date: Thu, 17 Jun 2021 13:35:42 -0300
+Subject: [PATCH 3/4] Adjusted (c) years
+
+---
+ config.pl  | 2 +-
+ conflib.pl | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/config.pl b/config.pl
+index 424e3065..cda54600 100644
+--- a/config.pl
+++ b/config.pl
+@@ -1,5 +1,5 @@
+ #!/usr/bin/perl
+-# Copyright (C) 1999-2012 by Salvador E. Tropea (SET),
+# Copyright (C) 1999-2021 by Salvador E. Tropea (SET),
+ # see copyrigh file for details
+ #
+ # To specify the compilation flags define the CFLAGS environment variable.
+diff --git a/conflib.pl b/conflib.pl
+index 946bfa95..c8e70204 100644
+--- a/conflib.pl
+++ b/conflib.pl
+@@ -1,5 +1,5 @@
+ #!/usr/bin/perl
+-# Copyright (C) 1999-2004 by Salvador E. Tropea (SET),
+# Copyright (C) 1999-2021 by Salvador E. Tropea (SET),
+ # see copyrigh file for details
+ #
+ # Common configuration routines.
+-- 
+2.32.0
+
--- a/dev-libs/tvision/files/tvision-2.2.3-0004-Made-ar-command-configurable.patch
+++ b/dev-libs/tvision/files/tvision-2.2.3-0004-Made-ar-command-configurable.patch
@ -0,0 +1,23 @@
+From: "Salvador E. Tropea" <salvador@inti.gob.ar>
+Date: Thu, 17 Jun 2021 13:36:09 -0300
+Subject: [PATCH 4/4] Made ar command configurable.
+
+---
+ intl/dummy/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/intl/dummy/Makefile b/intl/dummy/Makefile
+index c32b0a8b..e24c1976 100644
+--- a/intl/dummy/Makefile
+++ b/intl/dummy/Makefile
+@@ -1,5 +1,6 @@
+ RHIDE_GCC=gcc
+RHIDE_AR=ar
+ CC=$(RHIDE_GCC)
+ 
+ libtvfintl.a: intldummy.o
+-	ar -rv libtvfintl.a intldummy.o
+	$(RHIDE_AR) -rv libtvfintl.a intldummy.o
+-- 
+2.32.0
+
--- a/dev-libs/tvision/tvision-2.2.3.ebuild
+++ b/dev-libs/tvision/tvision-2.2.3.ebuild
@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="examples nls"
+IUSE="examples gpm nls"

 DOCS=( readme.txt THANKS TODO )
 HTML_DOCS=( www-site/. )
@ -25,7 +25,6 @@ RDEPEND="
 	dev-libs/libbsd
 	media-libs/allegro:0[X]
 	sys-apps/util-linux
-	sys-libs/gpm
 	sys-libs/ncurses:0=
 	x11-libs/libICE
 	x11-libs/libSM
@ -36,6 +35,7 @@ RDEPEND="
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libxcb:=
+	gpm? ( sys-libs/gpm )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="sys-devel/gettext"
@ -43,7 +43,10 @@ BDEPEND="sys-devel/gettext"
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.2.1.4-flags.patch
 	"${FILESDIR}"/${PN}-2.2.1.4-ldconfig.patch
-	"${FILESDIR}"/${P}-0001-use-proper-AR.patch
+	"${FILESDIR}"/${P}-0001-Added-ar-command-now-can-be-configured-from-the-envi.patch
+	"${FILESDIR}"/${P}-0002-Added-configuration-option-to-exclude-libgpm.patch
+	"${FILESDIR}"/${P}-0003-Adjusted-c-years.patch
+	"${FILESDIR}"/${P}-0004-Made-ar-command-configurable.patch
 )

 src_configure() {
@ -58,6 +61,7 @@ src_configure() {
 		--x-include="${EPREFIX}/usr/include/X11"
 	)

+	use gpm || myconf+=( --without-gpm )
 	use nls || myconf+=( --no-intl )

 	# Note: Do not use econf here, this isn't an autoconf configure script,
--- a/dev-lua/Manifest.gz
+++ b/dev-lua/Manifest.gz
--- a/dev-lua/md5/metadata.xml
+++ b/dev-lua/md5/metadata.xml
@ -10,7 +10,6 @@
 		A hash (digest) function, a pair crypt/decrypt based on MD5 and CFB,
 		and a pair crypt/decrypt based on DES with 56-bit keys.
 	</longdescription>
-	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">keplerproject/md5</remote-id>
 	</upstream>
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
--- a/dev-ml/merlin/merlin-4.1-r2.ebuild
+++ b/dev-ml/merlin/merlin-4.1-r2.ebuild
@ -16,8 +16,6 @@ KEYWORDS="~amd64"
 IUSE="emacs +ocamlopt"

 RDEPEND="
-	app-emacs/auto-complete
-	app-emacs/company-mode
 	dev-ml/csexp:=
 	dev-ml/yojson:=
 	dev-ml/menhir:=
--- a/dev-perl/IO-Tty/IO-Tty-1.160.0.ebuild
+++ b/dev-perl/IO-Tty/IO-Tty-1.160.0.ebuild
@ -0,0 +1,13 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TODDR
+DIST_VERSION=1.16
+inherit perl-module
+
+DESCRIPTION="IO::Tty and IO::Pty modules for Perl"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
--- a/dev-perl/IO-Tty/Manifest
+++ b/dev-perl/IO-Tty/Manifest
@ -1 +1,2 @@
 DIST IO-Tty-1.12.tar.gz 24564 BLAKE2B da0b252d938b115e8cb7e46866829fcf76a56754c5c3cde8f64dcddda4c9bde9cb77a1b1a022dc8ff94f785d1e1020f76be3ff805c50f276902128d397039244 SHA512 23733e7832a0de370952420df8a781f85d28ff60eb4cd55be22147337bf5587f4e1ec7fcfc190ae3ad1fd9df0f9697f2d647e00739f4a2927b1ac9c81435454d
+DIST IO-Tty-1.16.tar.gz 26765 BLAKE2B 94de85df09ac717e36b2c9e469e6cbd707cc7c9c92eb1be729373856af944a2664fbc913441151e7b417ae6b5c1d62cbda4416e407e4849c1ac34181460efe11 SHA512 a6f28a8796992645c4b2ddab5b3a76f49e61a891442078ef8249088d077108ea63bb4c8000cf39d15d13801b82e1cfcbe6ea0e6542789ab28385d83e03f6a9de
--- a/dev-perl/IP-Anonymous/IP-Anonymous-0.40.0-r2.ebuild
+++ b/dev-perl/IP-Anonymous/IP-Anonymous-0.40.0-r2.ebuild
@ -1,19 +1,19 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7

-MODULE_AUTHOR=JTK
-MODULE_VERSION=0.04
+DIST_AUTHOR=JTK
+DIST_VERSION=0.04
 inherit perl-module

 DESCRIPTION="Perl port of Crypto-PAn to provide anonymous IP addresses"

 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""

-RDEPEND="dev-perl/Crypt-Rijndael"
-DEPEND="${RDEPEND}"
-
-SRC_TEST="do"
+RDEPEND="
+	>=dev-perl/Crypt-Rijndael-0.40.0
+"
+BDEPEND="${RDEPEND}
+"
--- a/dev-perl/IPC-Run/IPC-Run-20200505.0.0.ebuild
+++ b/dev-perl/IPC-Run/IPC-Run-20200505.0.0.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=TODDR
+DIST_VERSION=20200505.0
+inherit perl-module
+
+DESCRIPTION="system() and background procs w/ piping, redirs, ptys"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-perl/IO-Tty-1.80.0
+	dev-perl/Readonly
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		>=virtual/perl-Test-Simple-0.470.0
+	)
+"
--- a/dev-perl/IPC-Run/Manifest
+++ b/dev-perl/IPC-Run/Manifest
@ -1 +1,2 @@
 DIST IPC-Run-0.96.tar.gz 121644 BLAKE2B 83181fc4da8eb2199ac1978e2f593fb4579d2f4b6acff41f36ad2af866e07816c3ddbce8f1fb4e54a905fa00c3398df4ffa25eb10c49f677da23a4e0dc922fc8 SHA512 8a531a2126c15653ab0230813985cc7c83f2c3467c987757fc1f04c3c9952ee0246bcf743dcc4381351c72989f7271ede16962cca24e030404e414ff000c57a8
+DIST IPC-Run-20200505.0.tar.gz 127505 BLAKE2B ed2ab7be9f77a18e6dab7df78e641c77e30d4db27f1129199de14e6a75a412b6154f1a0d2c63edaaf2b5d1316b28d8e66836faaa9823dfe289992b915d421c3a SHA512 6f2e0cdbd66741a5185aa6f79c5d23189f6527e319ead385a033e482abed439a7e7fb1bbb7fa83c91c7b2971b31313a99b2b6510cc6aad3516ae6524a196d57c
--- a/dev-perl/IPC-ShareLite/IPC-ShareLite-0.170.0-r2.ebuild
+++ b/dev-perl/IPC-ShareLite/IPC-ShareLite-0.170.0-r2.ebuild
@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=5
+EAPI=7

-MODULE_AUTHOR=ANDYA
-MODULE_VERSION=0.17
+DIST_AUTHOR=ANDYA
+DIST_VERSION=0.17
 inherit perl-module

 DESCRIPTION="IPC::ShareLite module for perl"
@ -14,12 +14,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"

-DEPEND="test? ( virtual/perl-Test-Simple )"
 RDEPEND=""
+BDEPEND="test? ( virtual/perl-Test-Simple )"

-SRC_TEST=do
-
-src_test() {
-	perl_rm_files t/pod.t
-	perl-module_src_test
-}
+PERL_RM_FILES=( t/pod.t )
--- a/dev-perl/IPC-Shareable/IPC-Shareable-1.0.0.ebuild
+++ b/dev-perl/IPC-Shareable/IPC-Shareable-1.0.0.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=STEVEB
+DIST_VERSION=1.00
+inherit perl-module
+
+DESCRIPTION="Share Perl variables between processes"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=virtual/perl-Storable-0.607.0
+"
+BDEPEND="${RDEPEND}
+	>=virtual/perl-ExtUtils-MakeMaker-6.720.0
+	test? ( dev-perl/Test-SharedFork )
+"
--- a/dev-perl/IPC-Shareable/Manifest
+++ b/dev-perl/IPC-Shareable/Manifest
@ -1 +1,2 @@
 DIST IPC-Shareable-0.61.tar.gz 29730 BLAKE2B 004399eeea585a79614915dd32c7aec563a86a31ecf2f1b7ceeb44837f935294c3ce467e2bae6f699e0d1f64550440d1d6c183a9ce41d7259797179910e3428f SHA512 cc55053bbdb73868bd40d4c3d83e0929107c84fe2ff07c82235e7617eb0a3c204d4569ddbd16468732cd9d3a0c4cac3672f1f1ca1178d975f4a69ed7b96b75e9
+DIST IPC-Shareable-1.00.tar.gz 36058 BLAKE2B b33e36ce2a94ffc4ea7e7a1c04d40aed0566ff69bd761e298684486ef04f1e18b6aeac8038477bde4e8adb0b2e2902f762b3ba2979e294de02056ac5c34778ce SHA512 8704275b3335c0b2808158687263d88e8fa328fc00e71c7b2e43807088c1e2ae9bd511939230827037a81afb5a66656d250a258655d8e9d8036c03cf6db87be5
--- a/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild
+++ b/dev-perl/IPC-System-Simple/IPC-System-Simple-1.300.0.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=JKEENAN
+DIST_VERSION=1.30
+inherit perl-module
+
+DESCRIPTION="Run commands simply, with detailed diagnostics"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	virtual/perl-Scalar-List-Utils
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
--- a/dev-perl/IPC-System-Simple/Manifest
+++ b/dev-perl/IPC-System-Simple/Manifest
@ -1 +1,2 @@
 DIST IPC-System-Simple-1.25.tar.gz 29744 BLAKE2B 9e80c0d72d4857b401bc99a24117c23608af5e2bc468dd9bcf5465e71c3011141393214e07667b7552a0079764f7e489e5e1d417d4b4933dc7a485f7c0db40a4 SHA512 fda275786605eb80acaa6062cc51c32aa0e84f150e7ca7afcfe874f088ce7b8f9a97669e91bec24fdb05426db8b0f05552aa8853e44b08996e625281d1892f72
+DIST IPC-System-Simple-1.30.tar.gz 31902 BLAKE2B 2c75046c773afae5b13099050028146aecf276921322d93ff630b28ac5ac660ddb6bae0317ebdab782a4c4056e3fcfc5af0c78c679b6d2b815a969a6cd02d51e SHA512 82937df80ae38a9c21e43e256a21cdac1482d4a069eae282043d676ece06251a7139b752cd2b379a0f69ea9209ddd075607da86c6cb9b25f19cf90d91c28d72f
--- a/dev-perl/JavaScript-Minifier/JavaScript-Minifier-1.160.0.ebuild
+++ b/dev-perl/JavaScript-Minifier/JavaScript-Minifier-1.160.0.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DIST_AUTHOR=ZOFFIX
+DIST_VERSION=1.16
+inherit perl-module
+
+DESCRIPTION="Perl extension for minifying JavaScript code"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	virtual/perl-Exporter
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		virtual/perl-File-Spec
+		virtual/perl-IO
+		virtual/perl-Test-Simple
+	)
+"
--- a/dev-perl/JavaScript-Minifier/Manifest
+++ b/dev-perl/JavaScript-Minifier/Manifest
@ -1 +1,2 @@
 DIST JavaScript-Minifier-1.14.tar.gz 22368 BLAKE2B f784ebd40d74ba7e005eb3e1802ec479d8fda68947d9ec094912cf2f002b9a28a24f65a0be9c5f8f038f2473e9825e17b16af2fe68518c72e7da87a235e4bad2 SHA512 191dbf81672ea438c8c045c2fb0ebaeecee088630f77d91cb0518d800d815768d4695e8c32c5001492af1ab6b31f0bf69052701bf15e2b9a4981c4694620e251
+DIST JavaScript-Minifier-1.16.tar.gz 23523 BLAKE2B 9739d82dff16c7ae20c72351cdf7a8e221c73e3155c0687b1d83d75ea0b8f3848cc4c4599fdeebe3230ba6b49e4b36f0747d5fb056333284213a798b328aa7b3 SHA512 08341a6d329dd4f2bb8529c66135d9f25aff06c5f36f605d80a540aee21a6624aeb43ca45cd33378b88285af8d1771f894ab6083c7ba323cfdfe4fbbd10fe729
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
--- a/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
+++ b/dev-python/PyQt-builder/PyQt-builder-1.10.1-r1.ebuild
@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The PEP 517 compliant PyQt build system"
+HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/"
+
+MY_P=${PN}-${PV/_pre/.dev}
+if [[ ${PV} == *_pre* ]]; then
+	SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+fi
+S=${WORKDIR}/${MY_P}
+
+LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/sip-5.5[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx doc --no-autodoc
+
+python_prepare_all() {
+	# don't install prebuilt Windows DLLs
+	sed -i -e "s:'dlls/\*/\*',::" setup.py || die
+	rm -r "${PN/-/_}.egg-info" || die
+
+	distutils-r1_python_prepare_all
+}
--- a/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild
+++ b/dev-python/PyQt-builder/PyQt-builder-1.10.1.ebuild
@ -1,22 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="The PEP 517 compliant PyQt build system"
-HOMEPAGE="https://www.riverbankcomputing.com/software/pyqt-builder/ https://pypi.org/project/PyQt-builder/ https://www.riverbankcomputing.com/static/Docs/PyQt-builder/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 GPL-3 SIP )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-RDEPEND="dev-python/sip[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-src_install() {
-	distutils-r1_src_install
-}
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
@ -17,6 +17,6 @@ else
 fi
 S=${WORKDIR}/${MY_P}

-SLOT="0/$(ver_cut 1)"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="0/$(ver_cut 1)"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
--- a/dev-python/agate-dbf/Manifest
+++ b/dev-python/agate-dbf/Manifest
@ -1 +1,4 @@
 DIST agate-dbf-0.2.2.tar.gz 2863 BLAKE2B 112b03e1a02b70e63f77195a999a60a59b4e02af55da2b9d94e9d535f557c4193129dcb8ce3f91d93cbc6e19196705009574e3b9e5073f9934d00636bb4b2abd SHA512 3e99404dfcd521010bc3eb5899871dfc63581e03604f80b0a42d4db48f486137fd48685024decd380d346ac5c2089a0d19dd9229893e8d5337b9bd9d7b4eb3b6
+DIST agate-dbf-0.2.2_examples%2Ftest.dbf 1314 BLAKE2B 81d5507b88fe7f7c3866d8666feff12bf3b14451affd653d76239f8785037c908509de248ac4bc8dbebeba4b1a84d69a48bf97b83716fe489ceb39f8ccf0e935 SHA512 460f9a624a6fed58d1fe0484ff6f7fa081d595d8f1a04f4f449ef6de037e334abb9da0403622e5af8c7914e02cda2fa38c4058ef1bb650e59e50584b9ae73b2e
+DIST agate-dbf-0.2.2_examples%2Ftestdbf_converted.csv 896 BLAKE2B fe535d9b784088118fcd61b5378d49d92bac801be61e7900200625f267c8f9c454729376b292d809d3e6a6ee2a093e2a813524ff9199223cbc89a9a461feed40 SHA512 ddba24038d4500b97ff8b11b03a5260927a299f1732aa0a6bcb4746c52e04825f2f3d5d211141576736008ff7f56d0970b21c06f4afad53a4e4e0a873815516b
+DIST agate-dbf-0.2.2_tests%2Ftest_table.py 574 BLAKE2B 22a744ae20491632795a0b654d8ab1e8adc090d43d0a18352b83cfc1687c57d33f1159d96cb379743d293203412dbbbaae8c33be195ae9d868584671ff0ea74d SHA512 131d8a553bc9c7538959e1ae29b62c47cea3e14365afca4e92e4f36cc8dab7e4b00efa462db5e9ca0f51b5e3eda892cf91881d65bd1302fa80bd5b0f66fa4076
--- a/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
+++ b/dev-python/agate-dbf/agate-dbf-0.2.2.ebuild
@ -13,10 +13,45 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
-RDEPEND=""
+IUSE="test +xml"
+RESTRICT="!test? ( test )"

+# Other packages have BDEPEND="test? ( dev-python/agate-dbf[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
 RDEPEND="
-	>=dev-python/agate-1.5.0[${PYTHON_USEDEP}]
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
 	>=dev-python/dbfread-2.0.5[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
 "
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+AGATE_DBF_TEST_FILES=(
+	examples/test.dbf
+	examples/testdbf_converted.csv
+	tests/test_table.py
+)
+SRC_URI+=" test? ( "
+for extra_file in "${AGATE_DBF_TEST_FILES[@]}"; do
+	SRC_URI+=" https://raw.githubusercontent.com/wireservice/agate-dbf/${PV}/${extra_file} -> ${P}_${extra_file//\//%2F}"
+done
+SRC_URI+=" )"
+
+agate-dbf_src_prepare() {
+	local extra_file
+	if use test; then
+		for extra_file in "${AGATE_DBF_TEST_FILES[@]}"; do
+			mkdir -p "${extra_file%/*}" || die
+			cp "${DISTDIR}/${P}_${extra_file//\//%2F}" "${extra_file}" || die
+			[[${extra_file} == *.py ]] && { true >> "${extra_file%/*}/__init__.py" || die; }
+		done
+	fi
+}
+
+src_prepare() {
+	agate-dbf_src_prepare
+	distutils-r1_src_prepare
+}
--- a/dev-python/agate-excel/agate-excel-0.2.3.ebuild
+++ b/dev-python/agate-excel/agate-excel-0.2.3.ebuild
@ -15,10 +15,33 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 RDEPEND=""
-RESTRICT="test"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"

+# Other packages have BDEPEND="test? ( dev-python/agate-excel[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
 RDEPEND="
-	>=dev-python/agate-1.5.0[${PYTHON_USEDEP}]
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
 	>=dev-python/openpyxl-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-0.9.4[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
 "
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		tests/test_table_xlsx.py::TestXLSX::test_ambiguous_date
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}" || die
+}
--- a/dev-python/agate-sql/Manifest
+++ b/dev-python/agate-sql/Manifest
@ -0,0 +1 @@
+DIST agate-sql-0.5.6.tar.gz 9091 BLAKE2B 9094a2bfb500422e7fe75d1c83182af698aa92942a305a69301d45d92f01960a7ffc7908f0eb2b66556a856be0f7388e222034428afd269d402488c6c05abd36 SHA512 b4234a86f8bcd5b22bcb1e18d0cec0ba21c8a3521e15f767886241e16285cbd296683f83bd366a82d1e549679b3712663adc080950dedb24a0e6db5b2541050a
--- a/dev-python/agate-sql/agate-sql-0.5.6.ebuild
+++ b/dev-python/agate-sql/agate-sql-0.5.6.ebuild
@ -0,0 +1,58 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Adds SQL read/write support to agate."
+HOMEPAGE="https://github.com/wireservice/agate-sql https://pypi.org/project/agate-sql/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
+
+# Other packages have BDEPEND="test? ( dev-python/agate-sql[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.5.0"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.8[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	local sed_args=(
+		-e "/crate/d"
+		-e "/nose/d"
+		-e "/geojson/d"
+		-e "/Sphinx/d"
+		-e "/sphinx_rtd_theme/d"
+	)
+
+	sed "${sed_args[@]}" -i setup.py agate_sql.egg-info/requires.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_dialects
+		tests/test_agatesql.py::TestSQL::test_to_sql_create_statement_with_schema
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}" || die
+}
--- a/dev-python/agate-sql/metadata.xml
+++ b/dev-python/agate-sql/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/wireservice/agate-sql/issues</bugs-to>
+		<changelog>https://github.com/wireservice/agate-sql/blob/master/CHANGELOG.rst</changelog>
+		<remote-id type="pypi">agate-sql</remote-id>
+		<remote-id type="github">wireservice/agate-sql</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/agate/Manifest
+++ b/dev-python/agate/Manifest
@ -1 +1 @@
-DIST agate-1.6.1.tar.gz 137280 BLAKE2B cc022eb05865af0c3f2602d0e5da19a7cbc1516ffbac3900e8cf5c414ff9237151911036170632bfddc4ebe1d40192a3efc0fa73f5ec25a996345919165729ec SHA512 03cbd569a8cff8352ea7fc7469508f5aa5fd6e99381088b53711cc688f8fe9c19c50265852d2e1f9b92852509dbab9630359b72b504a46c9f0aaa37b14027ab9
+DIST agate-1.6.2.tar.gz 191216 BLAKE2B 63e89f6815a36dea956e8a919aeb926291eaf1f4d5eaac7f96dab97c6958dfee4788e18a4c1325a5b8cebf15df27b32e75409ddeab1289c1e8e548088fdc0ea7 SHA512 34d9e45d162bce69d28ad0ec07f5b410b2cdac831e5bd986ca8cb8902fd0ca1ec67663b2f956f42acaf18b8ca0fa169d5236aa4cee7457765e4e86d837e7794e
--- a/dev-python/agate/agate-1.6.1.ebuild
+++ b/dev-python/agate/agate-1.6.1.ebuild
@ -1,24 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines"
-HOMEPAGE="https://github.com/wireservice/agate https://pypi.org/project/agate/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-RDEPEND="
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}]
-	>=dev-python/parsedatetime-2.1[${PYTHON_USEDEP}]
-	>=dev-python/Babel-2.0[${PYTHON_USEDEP}]
-	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}]
-	>=dev-python/leather-0.3.2[${PYTHON_USEDEP}]
-"
--- a/dev-python/agate/agate-1.6.2.ebuild
+++ b/dev-python/agate/agate-1.6.2.ebuild
@ -0,0 +1,71 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A Python data analysis library that is optimized for humans instead of machines"
+HOMEPAGE="https://github.com/wireservice/agate https://pypi.org/project/agate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
+
+# Other packages have BDEPEND="test? ( dev-python/agate[xml] )"
+LEATHER_VERSION_DEP=">=dev-python/leather-0.3.2"
+TEST_AGAINST_RDEPEND="xml? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/pytimeparse-1.1.5[${PYTHON_USEDEP}]
+	>=dev-python/parsedatetime-2.1[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.0[${PYTHON_USEDEP}]
+	>=dev-python/isodate-0.5.4[${PYTHON_USEDEP}]
+	>=dev-python/pyicu-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/python-slugify-1.2.1[${PYTHON_USEDEP}]
+	${LEATHER_VERSION_DEP}[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${LEATHER_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+# @FUNCTION: pytest-expect-to-deselect
+# @USAGE: readarray -t pytest_args < <(pytest-expect-to-deselect <<<PYTEST_EXPECT_CONTENT)
+# @DESCRIPTION:
+# Read a pytest-expect pytest --xfail-file file from stdin and write
+# equivalent pytest --deselect arguments to stdout for consumption by
+# readarray -t. The generated pytest --deselect arguments are appropriate
+# for use as described here:
+# https://dev.gentoo.org/~mgorny/python-guide/pytest.html#skipping-tests-based-on-paths-names
+pytest-expect-to-deselect() {
+	while read -r; do
+		[[ ${REPLY} =~ ^[u]?\'([^\']*) ]] || continue
+		printf -- '%s\n' --deselect "${BASH_REMATCH[1]}" || return
+	done
+}
+
+python_test() {
+	# test_cast_format_locale fails with "locale.Error: unsupported locale setting"
+	# which appears to be triggered by these locale settings in the unit tests:
+	#
+	#   agate-1.6.2/tests/test_data_types.py:257:    def test_cast_format_locale(self):
+	#   agate-1.6.2/tests/test_data_types.py-258-        date_type = Date(date_format='%d-%b-%Y', locale='de_DE')
+	#   agate-1.6.2/tests/test_data_types.py:381:    def test_cast_format_locale(self):
+	#   agate-1.6.2/tests/test_data_types.py-382-        date_type = DateTime(datetime_format='%Y-%m-%d %I:%M %p', locale='ko_KR')
+
+	local -a pytest_args
+	readarray -t pytest_args < <(pytest-expect-to-deselect <<<"
+pytest-expect file v1
+(3, 8, 10, 'final', 0)
+u'tests/test_data_types.py::TestDate::test_cast_format_locale': FAIL
+u'tests/test_data_types.py::TestDateTime::test_cast_format_locale': FAIL
+")
+
+	epytest "${pytest_args[@]}" || die
+}
--- a/dev-python/csvkit/Manifest
+++ b/dev-python/csvkit/Manifest
@ -0,0 +1 @@
+DIST csvkit-1.0.5.tar.gz 3783495 BLAKE2B 19210c23480cb3068af74c922a3495612f40bbf5c4985f7018c9c185564dd0c101292f165ddd03440220f582bfdc1590e2f75e8e5c92edd71e76e46a73b26547 SHA512 62dc7a5eefeda9c8824b24f8844b6c1ead5449797d9d004111885b03a1989ad89d1f48b3b7d4a69130885b85cc3c1352910737e416fc19f2038525632b1569f6
--- a/dev-python/csvkit/csvkit-1.0.5.ebuild
+++ b/dev-python/csvkit/csvkit-1.0.5.ebuild
@ -0,0 +1,47 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A suite of utilities for converting to and working with CSV."
+HOMEPAGE="https://github.com/wireservice/csvkit https://pypi.org/project/csvkit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
+
+# Other packages have BDEPEND="test? ( dev-python/csvkit[xml] )"
+AGATE_VERSION_DEP=">=dev-python/agate-1.6.1"
+TEST_AGAINST_RDEPEND="xml? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+RDEPEND="
+	${AGATE_VERSION_DEP}[${PYTHON_USEDEP}]
+	>=dev-python/agate-excel-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/agate-dbf-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/agate-sql-0.5.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+
+	${TEST_AGAINST_RDEPEND}
+"
+BDEPEND="test? ( ${AGATE_VERSION_DEP}[xml,${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		tests/test_utilities/test_in2csv.py::TestIn2CSV::test_convert_dbf
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}" || die
+}
--- a/dev-python/csvkit/metadata.xml
+++ b/dev-python/csvkit/metadata.xml
@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/wireservice/csvkit/issues</bugs-to>
+		<changelog>https://github.com/wireservice/csvkit/blob/master/CHANGELOG.rst</changelog>
+		<remote-id type="pypi">csvkit</remote-id>
+		<remote-id type="github">wireservice/csvkit</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/dbfread/Manifest
+++ b/dev-python/dbfread/Manifest
@ -1 +1,2 @@
+DIST dbfread-2.0.7-src.tar.gz 33045 BLAKE2B 96798f00aba4c30e7e83b468f368ca6730a7e095c9fec5bf5515ac6a152022adbf5339cd9e68e85f4eccac211ed4e307b9abf22249ef6420d722fa213210d7d7 SHA512 cf591fa5800e5471025175a4bbbb54cb26dc2a83bf328776e4386860370d9421edd9edd62cb9e3d463794d526c561a0f4744bb67b5e376edd471dc95100bc2c7
 DIST dbfread-2.0.7.tar.gz 33212 BLAKE2B 03c9a0d93b13c7573b5bcec6c5af1ac43bd00ead2b3e83638f45344b2344062e86d764b095e699afdaea2405176ee15122c975a2f72b25bd167f5faaaf33043b SHA512 86c3a29e351b985984be67401a6dfe3e39cd92451a122788ade83d65313dde37a3706ce36c4365bd36ba1df62ee057b625f1e0f077aa4a248c7456258189f548
--- a/dev-python/dbfread/dbfread-2.0.7.ebuild
+++ b/dev-python/dbfread/dbfread-2.0.7.ebuild
@ -9,9 +9,32 @@ inherit distutils-r1

 DESCRIPTION="Read DBF Files with Python"
 HOMEPAGE="https://github.com/olemb/dbfread https://pypi.org/project/dbfread/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( https://github.com/olemb/dbfread/archive/refs/tags/${PV}.tar.gz ->  ${P}-src.tar.gz )"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 RDEPEND=""
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's|\[pytest\]|[tool:pytest]|' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local pytest_args test_name xfails
+
+	xfails=(
+		dbfread/test_read_and_length.py::test_len
+		dbfread/test_read_and_length.py::test_list
+	)
+
+	for test_name in "${xfails[@]}"; do
+		pytest_args+=(--deselect "${test_name}")
+	done
+
+	epytest "${pytest_args[@]}" || die
+}
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@ -1,2 +1,2 @@
 DIST grpcio-testing-1.37.1.tar.gz 16930 BLAKE2B 17f30c1c8266ab1fdb363aaafa80a51711be61a76048ff47b09954f0d5ab570d87a1fcff9b3531245c2dc7066e8f71034662ef524aee898af81d922646d3482b SHA512 bb32067abd145dc2b45b29fe2f01ea9cd4c2a9fe76b94f4c5392c26557118aba2e3032b2566809575311e2773a0afd408a3ae656e31deb93e978fb35ad64c98a
-DIST grpcio-testing-1.38.0.tar.gz 16637 BLAKE2B e5d63653baa3ddd7c85b04a8979a748703037aacd1daa25e3e066a14efbcf6e9a36352cb4fd14422490246e72f7d3bff2e445f659eaf890db31cec0ddfdf7445 SHA512 5bcd2204475329bfe7ea194380152bddd440d82cb31a3a2510bf253cd4c165c06e02b607f19e93d5860eec18e08ef39bd6ac105c6dc016bb2d083c1dd74fbee4
+DIST grpcio-testing-1.38.1.tar.gz 16862 BLAKE2B fad99b35851e36b4e80e8d5d1ec91fd5f22e21a37596b3240aa81128fc77b73c95ce83f0d0423a047c85b9dba428e94f9a2c1681971776c1a141c756026b7ce1 SHA512 2814247be309498ef9605d630afd4bdf1843b21e89a7d6742b27107499ac73ca60c2bbcbe9b76d2be765505025e887af9a2b2159b324f10e3d85960759aba23c
--- a/dev-python/grpcio-testing/grpcio-testing-1.38.1.ebuild
+++ b/dev-python/grpcio-testing/grpcio-testing-1.38.1.ebuild
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@ -1,2 +1,2 @@
 DIST grpcio-tools-1.37.1.tar.gz 2120381 BLAKE2B a0a0249166c4f2b0167ea3608f962d0cafae8d7ca7d9085649dc3ef70fb32a93240739c311dbdb59e29c5f1e3319f76f28bc97eebedd37c06b298099750d6730 SHA512 7fa77a822fd242c94547e93aaa7120648a25ddfc0af16a0c1b721e6e2df1fb02a4e29c260e0cd3b35f1b25fa74dcfd42065d0dc34e71fa489e7abbdf2e4ddb4a
-DIST grpcio-tools-1.38.0.tar.gz 2128330 BLAKE2B e2d191289dd7cb1edf85ed3d63dc2c469ed03f75145fdbf8dc0c300427c629dbf27a9c4393bf37ac29545dc5b959dff20a7ac6cef679f34aa6b395c556e9c01d SHA512 0aa5827d2f6e575874b9d1222f889a8d07e54c64d4a2e9fb76610cc5ca731789cf5e9eec2dd42462eda386d96ea519040e162e0ad8883c1fe9683289311cd8eb
+DIST grpcio-tools-1.38.1.tar.gz 2128280 BLAKE2B bd8f8a371e89c096ce0e7f458e88c7d00ee6d75f18c008e8e0daef37559afea1792cf874829e1a8bda315ae49cd6e453406a75705672032811b059c2189b6aee SHA512 7498443a42da8077b91972ccf78bc64d9906a4344d8f4ce17ae8e45f32c952baf0c84d20771f572e7c883a26022be32f6e0a46f1d0e79dc651f90193987892e5
--- a/dev-python/grpcio-tools/grpcio-tools-1.38.1.ebuild
+++ b/dev-python/grpcio-tools/grpcio-tools-1.38.1.ebuild
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@ -1,2 +1,2 @@
 DIST grpcio-1.37.1.tar.gz 21678919 BLAKE2B ea1c9a1ce1d888d0e9aca27a9e12ebcaca5c79b6f70a282e4e9a12a4aba982c2cef3f755cc2e789de2302071ce3abf12c91f329febd04159b3c8abded96818d5 SHA512 e7697a6d0da40b7d63be7f4f31223d2314bf16fcab8887a41bc4750c844a58ad55fd27fca0a9f1016fc725076a16c3b2db5a9eb040a86a2acb9f45083835d90e
-DIST grpcio-1.38.0.tar.gz 21391828 BLAKE2B efbbf42ad4e67a2c39369c47f345b2a823427341f3e535737d28ff4061941bc649bca179cab84ff5457bab2ccef49146fd2cf7daeb0cae7303e47f192f250feb SHA512 7def460f1a96df65b99fae8aa149428286002aecd14242f62885622fda1568f2d44fc69c3bea28cd1568e3eaa46f03b0fbfda2a9cee23e1e5dfb44ac99ffe597
+DIST grpcio-1.38.1.tar.gz 21392075 BLAKE2B 92f1ad9e119fe346bc1f8f10ffe7067fb736c975ecd276eb8ab37a3b25d0a818fff76cec164db5745ac157ba7b94b841c6e66bb332d9f3b2c08974cab415a973 SHA512 c4f831ee654eec78f01c099fa5a6d9dc7e9551b1db5e5c89e3b8bd4e5c3bae622aee32cac9212bb60bc1baec98e4a49f8e18c0043bc90d1144729dee337072f9
--- a/dev-python/grpcio/grpcio-1.38.0-r1.ebuild
+++ b/dev-python/grpcio/grpcio-1.38.0-r1.ebuild
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@ -1 +1,2 @@
 DIST gst-python-1.16.3.tar.xz 419932 BLAKE2B 3c3d7d8dbde7d77d57e340c68503c436ab03f8768be4dd67561b13712bf88d7f8025118cf6a2ff115fbd41b28dc9a3208f612d1b72bf449fd7b23be4437f837f SHA512 2b038c4fc4891ddcf09e58c9e3e8d8462c150589dbb8a1f8d0a1266cffe49fd83531b2eb97cd57baab0f416a2bb1ba81383b55bb953545f3eedc50b6895986c4
+DIST gst-python-1.18.4.tar.xz 158252 BLAKE2B 2fd60d2d451ae572cee2f7e9158e9c06e82cdd56c4fc70d2731aa0a46a21e495321ec02c97ecd9a946278ce9b7290a290b9f2bc13184582c1f8ff19e874d0e3a SHA512 6b9df9e4faaeb030f0596c9e52262c0f82b8854faf821497a840a762913dccb005321c60565754ef571e34976fcda481a41aefbbd486c2932377a95121433bf5
--- a/dev-python/gst-python/gst-python-1.18.4.ebuild
+++ b/dev-python/gst-python/gst-python-1.18.4.ebuild
@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_8,3_9} )
+
+inherit meson python-r1 xdg-utils
+
+DESCRIPTION="A Python Interface to GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=media-libs/gstreamer-${PV}:1.0[introspection]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection]
+	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+
+	# Avoid building & testing plugin - it must NOT be multi-python as gst-inspect will map in all libpython.so versions and crash or behave mysteriously.
+	# Python plugin support is of limited use (GIL gets in the way). If it's ever requested or needed, it should be a
+	# separate python-single-r1 media-plugins/gst-plugins-python package that only builds the plugin directory.
+	sed -e '/subdir.*plugin/d' -i meson.build || die
+	sed -e '/test_plugin.py/d' -i testsuite/meson.build || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	configuring() {
+		meson_src_configure \
+			-Dpython="${EPYTHON}"
+	}
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	python_foreach_impl meson_src_test
+}
+
+src_install() {
+	installing() {
+		meson_src_install
+		python_optimize
+	}
+	python_foreach_impl installing
+}
--- a/dev-python/leather/Manifest
+++ b/dev-python/leather/Manifest
@ -1 +1,2 @@
+DIST leather-0.3.3-src.tar.gz 40522 BLAKE2B 3c7e6a48615751b310b7f066f2a78a2494e00256cae2ebfb4633c9389cca2477c2265fcf8c68f37733568ef729db1a5daf02ddc640bf2a60f2b39127c9a38d91 SHA512 30ea50ac6f97c55ee695b0e175a27e1e64fd17da7b0686ca8595fe0e5067932e19e59368fe6441f8f291ec52be3e597a80f8e04a3fcc0eeae33b3a5b3030e1d6
 DIST leather-0.3.3.tar.gz 18391 BLAKE2B 0a81343251fcdea85873fea023e1d709a385b268c2900642764c1a0ae6abfa84d9dece0ef67ae152b716c93c1bdaf9671f8c5df8cf5605694af48e8f3552437a SHA512 3387353d4da129fa3601799efe8742aea08f94579caab7a5a05175ff7ad50a815fc7ca4aee5d1c390027bda3a9bf1ecd1ed5167575386a7a58f56625f5165350
--- a/dev-python/leather/leather-0.3.3-r1.ebuild
+++ b/dev-python/leather/leather-0.3.3-r1.ebuild
@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python charting for 80% of humans."
+HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( https://github.com/wireservice/leather/archive/refs/tags/${PV}.tar.gz -> ${P}-src.tar.gz ) "
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test +xml"
+RESTRICT="!test? ( test )"
+
+# Other packages have BDEPEND="test? ( dev-python/leather[xml] )"
+TEST_AGAINST_RDEPEND="xml? ( dev-python/lxml[${PYTHON_USEDEP}] )"
+RDEPEND="
+	${TEST_AGAINST_RDEPEND}
+	>=dev-python/six-1.6.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
--- a/dev-python/leather/leather-0.3.3.ebuild
+++ b/dev-python/leather/leather-0.3.3.ebuild
@ -1,17 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python charting for 80% of humans."
-HOMEPAGE="https://github.com/wireservice/leather https://pypi.org/project/leather/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-RDEPEND=">=dev-python/six-1.6.1[${PYTHON_USEDEP}]"
--- a/dev-python/pyflakes/pyflakes-2.3.1.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.3.1.ebuild
@ -3,7 +3,7 @@

 EAPI=7

-PYTHON_COMPAT=( pypy3 python3_{7..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 inherit distutils-r1

 DESCRIPTION="Passive checker for Python programs"
@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"

 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"

 PATCHES=(
 	"${FILESDIR}/${P}-fix-py3.10-tests.patch"
--- a/dev-python/pythran/Manifest
+++ b/dev-python/pythran/Manifest
@ -0,0 +1 @@
+DIST pythran-0.9.11.gh.tar.gz 3570395 BLAKE2B deada9a608ed3d883308389d5a6ddfee2f0f74ecc74f1fd87bcee75eecabcab2acd576425b8e92d6fc6b212377f1c7295e766db32082339c98670a964a49ea10 SHA512 c8939b918216803ad8e2a133b16f0d8ea939e4d87d07ddb1a3d131afb0ddb76962c489270431808fbf129e76b5f9dbdc2b625097f37df2eefdb9834d319d028a
--- a/dev-python/pythran/metadata.xml
+++ b/dev-python/pythran/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>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">serge-sans-paille/pythran</remote-id>
+		<remote-id type="pypi">pythran</remote-id>
+	</upstream>
+</pkgmetadata>
--- a/dev-python/pythran/pythran-0.9.11.ebuild
+++ b/dev-python/pythran/pythran-0.9.11.ebuild
@ -0,0 +1,44 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Ahead of Time compiler for numeric kernels"
+HOMEPAGE="
+	https://pypi.org/project/pythran/
+	https://github.com/serge-sans-paille/pythran/"
+SRC_URI="
+	https://github.com/serge-sans-paille/pythran/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	=dev-python/beniget-0.3*[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	=dev-python/gast-0.4*[${PYTHON_USEDEP}]
+	>=dev-python/networkx-2[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/pytest-runner/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x COLUMNS=80
+	epytest -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
--- a/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
+++ b/dev-python/pytimeparse/pytimeparse-1.1.8.ebuild
@ -13,3 +13,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+
+python_test() {
+	local unittest_args=(
+		--verbose
+		--locals
+		pytimeparse.tests.testtimeparse
+	)
+
+	"${PYTHON}" -m unittest "${unittest_args[@]}" || die "Tests failed with ${EPYTHON}"
+}
--- a/dev-python/sip/sip-5.5.0-r2.ebuild
+++ b/dev-python/sip/sip-5.5.0-r2.ebuild
@ -17,8 +17,8 @@ else
 fi
 S=${WORKDIR}/${MY_P}

-SLOT="5"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"

 RDEPEND="
--- a/dev-python/sip/sip-6.1.1.ebuild
+++ b/dev-python/sip/sip-6.1.1.ebuild
@ -17,8 +17,8 @@ else
 fi
 S=${WORKDIR}/${MY_P}

-SLOT="5"
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
+SLOT="5"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"

 RDEPEND="
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@ -1,5 +1,5 @@
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
 DIST cmake-3.19.7.tar.gz 9271358 BLAKE2B 379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f SHA512 6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a
-DIST cmake-3.20.3.tar.gz 9440009 BLAKE2B 25098305b2fb9d719ffd3a25936207d98901651a6d9c6fe0757d4da3619274021025d7ce9f78b3813826c8b52347f12321db905083839d3882a2ba85a294561c SHA512 ed2b8b04c759c4f7c5c363be33bf08e6677c710c1f937050a378ab5539136b919531e1c927b117b3d8d68d4bb613de8d92a3d4d50f3ab3bc98355febca779a1b
 DIST cmake-3.20.4.tar.gz 9440363 BLAKE2B b04cf6e41878b8626b13516ecbe9d27f0fe801437342217389b739f1549743be10620e06aa521de4ab7b1dcb8f0a8208bf8b3805cca54ac782c320d938c8d9b0 SHA512 f53902a917b8d7b949af305afed3b32fcf981c5c647a77ee7a3bcae1bb5620381a1eacdac4b86bd7e5ea0a7806ec5fbd9a4f4853553f78db4d41d7dd2867c99f
+DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008
--- a/dev-util/cmake/cmake-3.20.5.ebuild
+++ b/dev-util/cmake/cmake-3.20.5.ebuild
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@ -1,2 +1,2 @@
 DIST wesnoth-1.14.14.tar.gz 502931191 BLAKE2B 25bbead74d74bbce9c47b5ac9339fd5b4d996cb9f80137f0b1d9a600c71c82b732ed66937419a4dd59995311685960630415daf3fd3f51e8cf891f29a16ec024 SHA512 3924aa26b59445568472a10c5fe0e1ddf87eb0a878faf2bcc52d4618f5743dfeda103d1f4025f4a129628e6a25f4c16407e968d594769a0751ada2c9a733e2e4
-DIST wesnoth-1.15.12.tar.gz 509770568 BLAKE2B 6bdbbb132938ff1fd8c47fee8fd7311176e442c96261fafa4a2ba75798a87422f38dd1e6b9547828d5c86332473d03a82f923bc5070e65777ccc60046d949b27 SHA512 a8e104154cf91cb3c2d0d053cbb56f1b59f71b6a05510d49d1ee81368f2b8782ceceef37dc3961925c7d54b5bca6c649c8993cca0d4b9dc179fa3309827b7a59
+DIST wesnoth-1.15.14.tar.gz 513004602 BLAKE2B 04d0ec57a2b0627f778d1a82e592d11f360bf80b445b1faae7e3d708599b22e272be85848942edd9f2c1393bbe1979aaf3a249996ce9ae682c34de24b5c88c29 SHA512 09f803c34452d20aade2a8373c15be2f595d2ae8633885e321870aac742250430f376b753090fc6f03f19307f650972ba8477a2cc255e0fbafb2d7270d9610d2
--- a/games-strategy/wesnoth/wesnoth-1.15.12-r1.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.15.12-r1.ebuild
@ -47,6 +47,7 @@ src_prepare() {
 	cmake_src_prepare

 	sed 's@ coroutine@@' -i CMakeLists.txt || die
+	sed '/Boost::coroutine/d' -i src/CMakeLists.txt || die
 	if ! use doc ; then
 		sed -i \
 			-e '/manual/d' \
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
--- a/gnome-extra/cinnamon-screensaver/Manifest
+++ b/gnome-extra/cinnamon-screensaver/Manifest
@ -1,2 +1,2 @@
 DIST cinnamon-screensaver-4.8.1.tar.gz 141996 BLAKE2B 73a61e28210efc58a205357abd7b1ca5efce85c542a14ba0de1688ca3c6c86cc81cf02b7eee7d7a13d015d43b6084a0e5a5a0f417a3be77771ff969381c24726 SHA512 5f165cddf5cd3f079192179f2308e015d7d70ce52f5214a56f8fc4318fdc6d6fc2b522b1c8eca31b4799074e58bd93bdce282d9774d1a552616c9ae1a0b46cae
-DIST cinnamon-screensaver-5.0.4.tar.gz 154088 BLAKE2B 2aed90c5498bf9a6e39436c87fbcc58ededebbe9a7e977385a8335bbb11f900e27dff59815513d239b92a8feddb596b1ef56a2dcfcba97db937fc6074b139c5b SHA512 4510da4aa9372bdc683a9aee2b4388cb332a733dabc8666b5529783a0f7c4428101ae1f55d90e9150ba97a56f628a728f82a9d9edaffadc596ab246798bd60c1
+DIST cinnamon-screensaver-5.0.5.tar.gz 154090 BLAKE2B 5bfe290547fe1bb8cd67cd99781b6ab59e7c146fd9775e4b73544a697e3f56793a998dcd55124df2df568877a3abcb1938ab9a695325562f286e6c03b44f8789 SHA512 18cf174c372f2082b3984fab2fc6e18a41f0f508230fdf91e54b8d0d3c7cf1de1009327716eacf33a7975e0983882abb41944b1470b54f1bd77b7ced8570bea1
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.5.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-5.0.5.ebuild
--- a/gnome-extra/cinnamon-settings-daemon/Manifest
+++ b/gnome-extra/cinnamon-settings-daemon/Manifest
@ -1,2 +1,2 @@
 DIST cinnamon-settings-daemon-4.8.5.tar.gz 662123 BLAKE2B b3ddd72e55c10c2cacc6dd29145e381395bd2ef68db7082a0770bb3eb647964041ed023d4a8357f2adcf5e8c9f8f713bac837809ed5926cc0434c2dc3e5c90ad SHA512 4a1d128b3f6faf3e2c13420d3569d4fd8cfaa1798ba5cf83fcb692662b9888d22f9f4bfb6fe18af59d0632583a2730a07e3ab48cca12c357b2d318d205fd7d0a
-DIST cinnamon-settings-daemon-5.0.1.tar.gz 662519 BLAKE2B d481dbde1cb1c39298296f8bde506921ce75ce0e70fe443b7c9101c62a4163b0457f4df5127fd676ebf535a0d83792d83a95b3b230a46e62b978ba65c6af2fee SHA512 81f618587576cc0e7a65e2658b6a4ff941ab0d87d0db2629427a79de7e82cc58ef1301568f2ed232aed0edf2e79def4a7ccb8f76becec1fe50b4b528d01c3c58
+DIST cinnamon-settings-daemon-5.0.2.tar.gz 662807 BLAKE2B 3e467089b8cdc6bdf296c43e138cc71c316b71dc8a39c9ba78767624a6606db9cc1e9c14c1f12ffc7dbe98a0d9ccabacc5660a1b0a75cebe9ac429eef74f1c5b SHA512 6e68f7c9fd848a3c8fc39341523d5900b2ea72b341fedc6153cf3700e9d29c188e57dce4dd19c6d2eb18edad23dfaf66e29ed659c6f969b9721e2277f95cdf7b
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.2.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-5.0.2.ebuild
--- a/gnustep-apps/Manifest.gz
+++ b/gnustep-apps/Manifest.gz
--- a/gnustep-apps/sogo/Manifest
+++ b/gnustep-apps/sogo/Manifest
@ -1,2 +1 @@
-DIST sogo-4.3.2.tar.gz 34497548 BLAKE2B fd9e225488bbdb13b4204d1cec9ba0217049681d531e20db3d995a4928f0cd8ff658eb390a0f84375ee28fec2c7a36fb11d836939a8731e828be8d38728a6559 SHA512 eeae11c2e9c4f3d38e64ebdac4950980859af6486e229d1480c9ceb895b63229b42ceea9a17934bfd5e88c5f05c93567f5df5f29f7d68b7dafcdfc44054bc9af
 DIST sogo-5.1.1.tar.gz 34263214 BLAKE2B c6a415602c931e4c703608b05036a508513eeee08d53e095ba8fa2a19ca509522ad190f8c1db78698e03818e25f221f76c097016017fc2f0aaba016043c1447e SHA512 6da4472f991da39449d8fdb05371bdc933cff8835d3501a3be475a263acb38ec10ccc43e719fb56e75fe6f5b4acd8f1f0fe3ebf1d8e734f7dbd8f28494baaff6
--- a/gnustep-apps/sogo/sogo-4.3.2.ebuild
+++ b/gnustep-apps/sogo/sogo-4.3.2.ebuild
@ -1,102 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnustep-2 vcs-snapshot
-
-DESCRIPTION="Groupware server built around OpenGroupware.org and the SOPE application server"
-HOMEPAGE="http://www.sogo.nu"
-SRC_URI="https://github.com/inverse-inc/sogo/archive/SOGo-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="activesync gnutls +ssl"
-
-RDEPEND="
-	acct-user/sogo
-	dev-libs/libmemcached
-	net-misc/curl
-	net-misc/memcached
-	>=gnustep-libs/sope-${PV}[ldap]
-	activesync? ( dev-libs/libwbxml )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-"
-DEPEND="${RDEPEND}
-	>=gnustep-base/gnustep-make-2.6.3"
-
-src_prepare() {
-	gnustep-base_src_prepare
-	sed -e "s/validateArgs$//" -i configure \
-		|| die
-	if use activesync; then
-		sed -e 's/Tests\/Unit/ActiveSync &/g' \
-			-i GNUmakefile || die
-	fi
-
-	# Temporarily build with -fcommon for gcc 10
-	# Bug 725630
-	echo 'ADDITIONAL_OBJCFLAGS += -fcommon' >> general.make
-
-	default
-}
-
-src_configure() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	./configure \
-		--disable-strip \
-		--prefix=/usr \
-		--with-ssl="${ssl_provider}" \
-		$(use_enable debug) \
-		|| die "configure failed"
-}
-
-src_install() {
-	gnustep-base_src_install
-
-	newconfd "${FILESDIR}"/sogod.confd sogod
-	newinitd "${FILESDIR}"/sogod.initd sogod
-
-	insinto /etc/logrotate.d
-	newins Scripts/logrotate sogo
-	newdoc Apache/SOGo.conf SOGo-Apache.conf
-
-	insinto /etc/sogo
-	doins Scripts/sogo.conf
-
-	insinto /etc/cron.d
-	newins Scripts/sogo.cron sogo
-	keepdir /var/log/sogo
-
-	fowners sogo:sogo /var/log/sogo
-	fowners -R root:sogo /etc/sogo
-}
-
-pkg_postinst() {
-	gnustep-base_pkg_postinst
-	elog "SOGo documentation is available online at:"
-	elog "http://www.sogo.nu/downloads/documentation.html"
-	elog
-	elog "Apache sample configuration file is available in:"
-	elog "/usr/share/doc/${PF}"
-	if use activesync; then
-		ewarn "In order to use the SOGo ActiveSync support code in production environments,"
-		ewarn "you need to get a proper usage license. Check the documentation for details."
-	fi
-}
--- a/gnustep-libs/Manifest.gz
+++ b/gnustep-libs/Manifest.gz
--- a/gnustep-libs/sope/Manifest
+++ b/gnustep-libs/sope/Manifest
@ -1,2 +1 @@
-DIST sope-4.3.2.tar.gz 2203224 BLAKE2B a51f87ac5b6e2cbb432fa1a63f6240d9c3309d600d82040096f65140933d6ac2cc875dc3c0db88e1cd3ff944b3c85fd0155fde03ee27c894e3416c8aec9abedd SHA512 bbdd78d08af26f435f3faaaa89833b7f910443a971ccde34236af30bed54a6ff50b3bee52990902a74a40abf2050db53a198e208e10a515fd6353b0c9e6eb447
 DIST sope-5.1.1.tar.gz 2217045 BLAKE2B 0c4e3c0740c46d2da5cf5ea16e63ab01c930ab9a45dfec617d0a2ff05032f87d909e4471144031922f8635f22aa9bebc313a32eb7afa23341b9a70f63ba93b9e SHA512 17cbf131e6e0d25e296543eea1f6514c6ac0c40db7cd446abbe79c927211d17a31e3f46bdaaad5d6d86f8b52c701544004d645c2d827ce471db5a68750cc0525
--- a/gnustep-libs/sope/sope-4.3.2.ebuild
+++ b/gnustep-libs/sope/sope-4.3.2.ebuild
@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnustep-2 vcs-snapshot
-
-DESCRIPTION="A set of frameworks forming a complete Web application server environment"
-HOMEPAGE="http://www.sogo.nu/"
-SRC_URI="https://github.com/inverse-inc/sope/archive/SOPE-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gnutls ldap mysql postgres +ssl +xml"
-
-RDEPEND="
-	sys-libs/zlib
-	ldap? ( net-nds/openldap )
-	gnutls? ( net-libs/gnutls:= )
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	xml? ( dev-libs/libxml2:2 )
-"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local ssl_provider
-	if use ssl ; then
-		if use gnutls ; then
-			ssl_provider=gnutls
-		else
-			ssl_provider=ssl
-		fi
-	else
-		ssl_provider=none
-	fi
-
-	egnustep_env
-
-	# Non-standard configure script
-	./configure \
-		--disable-strip \
-		$(use_enable debug) \
-		$(use_enable ldap openldap) \
-		$(use_enable mysql) \
-		$(use_enable postgres postgresql) \
-		$(use_enable xml) \
-		--with-ssl="${ssl_provider}" \
-		--with-gnustep || die "configure failed"
-}
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`DIST agate-sql-0.5.6.tar.gz 9091 BLAKE2B 9094a2bfb500422e7fe75d1c83182af698aa92942a305a69301d45d92f01960a7ffc7908f0eb2b66556a856be0f7388e222034428afd269d402488c6c05abd36 SHA512 b4234a86f8bcd5b22bcb1e18d0cec0ba21c8a3521e15f767886241e16285cbd296683f83bd366a82d1e549679b3712663adc080950dedb24a0e6db5b2541050a`
				`@ -0,0 +1 @@`
				`DIST csvkit-1.0.5.tar.gz 3783495 BLAKE2B 19210c23480cb3068af74c922a3495612f40bbf5c4985f7018c9c185564dd0c101292f165ddd03440220f582bfdc1590e2f75e8e5c92edd71e76e46a73b26547 SHA512 62dc7a5eefeda9c8824b24f8844b6c1ead5449797d9d004111885b03a1989ad89d1f48b3b7d4a69130885b85cc3c1352910737e416fc19f2038525632b1569f6`
				`@ -0,0 +1 @@`
				`DIST pythran-0.9.11.gh.tar.gz 3570395 BLAKE2B deada9a608ed3d883308389d5a6ddfee2f0f74ecc74f1fd87bcee75eecabcab2acd576425b8e92d6fc6b212377f1c7295e766db32082339c98670a964a49ea10 SHA512 c8939b918216803ad8e2a133b16f0d8ea939e4d87d07ddb1a3d131afb0ddb76962c489270431808fbf129e76b5f9dbdc2b625097f37df2eefdb9834d319d028a`