Merge updates from master

24 files changed, 577 insertions, 95 deletions

diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index f777d0be04f2..075768e2b3a8 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -1,12 +1,13 @@
 DIST xpdf-4.02.tar.gz 912885 BLAKE2B 70dec3d213566c1a7c13edd05e4f6145b45ad4c4805843393e0f86a07820511a5187cd61a04adf3c3fc671840acdb3b1bbb19dda7dc101df75e564971f51b76f SHA512 72c9413fc7241dde5288137ca8a68c837d2a68e95e909dbe2afe8f374b5a7c92af4edf82918963d1c6388c947057fcf5f0ae1e6fbb2b31c3d5eb9a07d3c74ddc
+DIST xpdf-4.03.tar.gz 936046 BLAKE2B bd0198ec6be627edce6386f0d93b0921906b2c5f79b3eb02f89719e64cbe3ca3b2df53db8aecc6df3581eb022ca0d4c209a880760e5bbb3eb46b40b106d6d144 SHA512 5f8478c2c4863a3c50f9b45a6fec73c7e67a74adbeaa651dd2e29982ea4cf050740874ee670672f985a323c12c28c968c16238c4238aeb52810a45e2728d622f
 DIST xpdf-arabic.tar.gz 1057 BLAKE2B 5889fa5704a805b152886043ee32082d5e60044fb96f91d429661f823d1ea9c929dcae22460421a7c26a7aae43d5926263fa2a1ea4c07e0e130e67f2fb0b6fab SHA512 1ddaee045c0c3576bda0ebf065021e66e1ac6673d6872aff8e8afb3bae33dd927d920d89761553bade040d20e4b60eb286131bdb2f2d75ec1e833b9a9ce58d3e
-DIST xpdf-chinese-simplified.tar.gz 918277 BLAKE2B ad41cc6ceae8d5295e49e6cb6356885a77dd314fd55cae95f4adf7ca597c7d86c0029b2767b1ecae86883d31cf9acc5d67997e1ab7871f10d2b6550734bb3b34 SHA512 1f016ff06301cf445546b380fe4cf0c1c9ef08b5e37bd392ca975b4a54fa43afbe251c31e14f216c68fb38dcf04f40ab5baf828586734efb7881a755f92cc49e
-DIST xpdf-chinese-traditional.tar.gz 906297 BLAKE2B 63f4e482b0ba127331ae9adaa69a64ac868e5973d631cec57867ccab83566b61c37771be28c42d02994f574e7bf0fe16813d2d18d6ef5869dc1200f702d7c6dc SHA512 6fec238af3c76f149087bb4445786cb1de31fbcb17982b8da779e71a91e76c780dde7970515eaa6131db2e654d04d13aebe8d840203293b9072850c5d1e6ba0b
+DIST xpdf-chinese-simplified-20201222.tar.gz 912967 BLAKE2B 74eb8da7642147cc6a0d5ee92379823786a78d0dccbdc1d4eab46094d15009bbe72599152b5001c58e7a88bfbb2f7af515e3582e293367a5b0a12bb1c017e8e1 SHA512 91c80dc4173a7b40267af1c95708f24557fb56ffc72cbaf48e9adcb0fc310b1bb40f327a8f36b3c6024317e98a44a8ab04d99f6f7b1ea81e775686534f0251ef
+DIST xpdf-chinese-traditional-20201222.tar.gz 922808 BLAKE2B 39a9bc094061298eb2afbdb8a53d71bf4e1fb1fbe33ca7a8855a34e4ece1b319edc334db71fec72df1860362878b401557fb623eaa2ca8c7ed973d5344e57e75 SHA512 c7709409f00365fea83f92db74401b6afbe4ceab9290d9471b9226b71ff24823d19054472d5700fbd91043859e78958628b82afa8b0361544247a76cf9d21d1e
 DIST xpdf-cyrillic.tar.gz 1656 BLAKE2B 454b9a276106d61481fdb8da934ac0de50b86a99d882e27bc9e1cf09a03ae2156909df405de78413e0ac3b529af479b2fbdf5978cc1022cee25c50df6ef21f0e SHA512 ab1197c90f8cd3d8664ebbdc7ecefdfb8ec12e24da2f7616cad1d5bc9c7fd172c48db6a18d76172de8342377acc8e1dcd78bcf0fb1ef9f05cf94729e90586827
 DIST xpdf-greek.tar.gz 1259 BLAKE2B f9f695b55c48ee2956ccab1ba9c7ae5bcb2df0669efcb8e111c6100f957238ae73b18589e40dece8b0c38212f00a52c1dc381cc5efcca7c97fe261d72470bb6f SHA512 2e0e281e09e1abc2f0e40b6787703538d52cb62edcd4c4156698700a5f908afee290c62ad9a6ff4ea74bc42e0a8fe9a7765a212efbc223512d4bb442448ea52f
 DIST xpdf-hebrew.tar.gz 1317 BLAKE2B bfd5bddc250c1ae1e01fe68f1a4caa649d2a443d3c39565b5209d07f32d46e3474e6823f243b08ab6088e4686cb79e58fce5c9a3de271a77c6b1713fa58b1000 SHA512 0ebe652f8633151d13ef2403bd293682b511ab86c1391ce187f1fc0274f33bd9c7e6ec682c8f79ac4fd27c74ab81ad2ae334a75f26001092521cff9a73cd0b8a
-DIST xpdf-japanese.tar.gz 1011166 BLAKE2B 67c2e8045214462737aa2332aa6ddba35581866e22bece5c166aa3fa808da0dddae11b7e9bcfe50f00087b74f1e7694ac8e407268cdefcab1fe60163eb3bdf70 SHA512 0d7b6e4c31caae1ec49d43f108d2dacc76fa84b79e9794d2d0071f33d7fadfacd533f0da1d5bcac3ec1c0757dbd6be4279acac1d148620e1d89d7a9af0966a08
-DIST xpdf-korean.tar.gz 526847 BLAKE2B e1640f6df0bc1e126b2e0f010403fc3ff068a8171d31cc616dfaff43170acfa69ff5dc0ac732d346d6aa9b2b21549b21e11f98f5038050b5075ee7fff8a93444 SHA512 871a9de0e40d7ef9fb42bb2d90558875f5b84962d7f811d5a18f4b68fadbe7c34e2c18c660a160c9ed9539adc22684985f296c77af2ed3bf604d9989bdcb3d1d
+DIST xpdf-japanese-20201222.tar.gz 1012686 BLAKE2B 14d59d2dd73dc9be913fb7557bce4844d2babbb88a573f9b962e7cc39e55268bb1a93c69c59585dc6b8aea8e6d771571e0105d1b9ee008ff07c80ae606125ed4 SHA512 f4e33525038f89c7b6ffb06b5b49726ab66ad1d61f5d0b813054ccefc035871e50996f31f3f67e6079eccf4c00619f582bdb2e1059df70e0101731a1e067d950
+DIST xpdf-korean-20201222.tar.gz 809664 BLAKE2B 3c3a4397f25ae74ed8bd68d0736144b9f644f79757ce48f435030cc675650aaa919ee95e8ad7a8b039777f3505c78fdf335cfefbf780957b7c5442a25c5e10c4 SHA512 1b829f276f9fbf0ab637cef345f1343faa582af2db95f68003c01d1ec96ca0d9ab38093502ac666ad7b4ce55120a9103bd492a9fea1e8287983227d45ebc378f
 DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f3595601f6e9f31a3fba9bc0d35f28e0016 SHA512 5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild b/app-text/xpdf/xpdf-4.02-r4.ebuild
index e887f2ce9966..00c9ecd93881 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.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
@@ -7,22 +7,22 @@ inherit cmake desktop xdg
 
 DESCRIPTION="The PDF viewer and tools"
 HOMEPAGE="https://www.xpdfreader.com"
-SRC_URI="https://xpdfreader-dl.s3.amazonaws.com/${P}.tar.gz
+SRC_URI="https://dl.xpdfreader.com/old/${P}.tar.gz
 	i18n? (
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-arabic.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-simplified.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-chinese-traditional.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-cyrillic.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-greek.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-hebrew.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-japanese.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-korean.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-latin2.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-thai.tar.gz
-		https://xpdfreader-dl.s3.amazonaws.com/xpdf-turkish.tar.gz
+		https://dl.xpdfreader.com/xpdf-arabic.tar.gz
+		https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz
+		https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz
+		https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
+		https://dl.xpdfreader.com/xpdf-greek.tar.gz
+		https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
+		https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz
+		https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz
+		https://dl.xpdfreader.com/xpdf-latin2.tar.gz
+		https://dl.xpdfreader.com/xpdf-thai.tar.gz
+		https://dl.xpdfreader.com/xpdf-turkish.tar.gz
 	)"
 
-LICENSE="GPL-2 GPL-3 i18n? ( BSD )"
+LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
diff --git a/app-text/xpdf/xpdf-4.03.ebuild b/app-text/xpdf/xpdf-4.03.ebuild
new file mode 100644
index 000000000000..486c4bc16290
--- /dev/null
+++ b/app-text/xpdf/xpdf-4.03.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg
+
+DESCRIPTION="The PDF viewer and tools"
+HOMEPAGE="https://www.xpdfreader.com"
+SRC_URI="https://dl.xpdfreader.com/${P}.tar.gz
+	i18n? (
+		https://dl.xpdfreader.com/xpdf-arabic.tar.gz
+		https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz
+		https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz
+		https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz
+		https://dl.xpdfreader.com/xpdf-greek.tar.gz
+		https://dl.xpdfreader.com/xpdf-hebrew.tar.gz
+		https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz
+		https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz
+		https://dl.xpdfreader.com/xpdf-latin2.tar.gz
+		https://dl.xpdfreader.com/xpdf-thai.tar.gz
+		https://dl.xpdfreader.com/xpdf-turkish.tar.gz
+	)"
+
+LICENSE="|| ( GPL-2 GPL-3 ) i18n? ( BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
+
+BDEPEND="
+	icons? ( gnome-base/librsvg )
+"
+DEPEND="
+	cups? (
+		dev-qt/qtprintsupport:5[cups]
+		net-print/cups
+	)
+	fontconfig? ( media-libs/fontconfig )
+	libpaper? ( app-text/libpaper )
+	utils? ( png? ( media-libs/libpng:0 ) )
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/freetype
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}
+	dev-qt/qtsvg:5
+	media-fonts/urw-fonts
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-automagic.patch
+	"${FILESDIR}"/${PN}-visibility.patch
+	"${FILESDIR}"/${PN}-shared-libs.patch
+)
+
+DOCS=( ANNOUNCE CHANGES README )
+
+src_prepare() {
+	sed -i \
+		"s|/usr/local/etc|${EPREFIX}/etc|;
+		 s|/usr/local|${EPREFIX}/usr|" \
+		doc/sample-xpdfrc || die
+
+	if use i18n; then
+		sed -i "s|/usr/local|${EPREFIX}/usr|" "${WORKDIR}"/*/add-to-xpdfrc || die
+	fi
+
+	xdg_environment_reset
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DA4_PAPER=$(usex metric)
+		-DNO_FONTCONFIG=$(usex fontconfig off on)
+		-DNO_TEXT_SELECT=$(usex textselect off on)
+		-DOPI_SUPPORT=$(usex opi)
+		-DSPLASH_CMYK=$(usex cmyk)
+		-DWITH_LIBPAPER=$(usex libpaper)
+		-DWITH_LIBPNG=$(usex png)
+		-DXPDFWIDGET_PRINTING=$(usex cups)
+		-DSYSTEM_XPDFRC="${EPREFIX}/etc/xpdfrc"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use icons; then
+		sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
+		cd xpdf-qt
+		mkdir $sizes
+		local i
+		for i in $sizes; do
+			rsvg-convert xpdf-icon.svg -w $i -h $i -o $i/xpdf.png
+		done
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	domenu "${FILESDIR}/xpdf.desktop"
+	newicon -s scalable xpdf-qt/xpdf-icon.svg xpdf.svg
+	if use icons; then
+		local i
+		for i in $sizes; do
+			doicon -s $i xpdf-qt/$i/xpdf.png
+		done
+		unset sizes
+	fi
+
+	insinto /etc
+	newins doc/sample-xpdfrc xpdfrc
+
+	local d i
+	if use utils; then
+		for d in "bin" "share/man/man1"; do
+			pushd "${ED}/usr/${d}" || die
+			for i in pdf*; do
+				mv "${i}" "x${i}" || die
+			done
+			popd || die
+		done
+
+		einfo "PDF utilities were renamed from pdf* to xpdf* to avoid file collisions"
+		einfo "with other packages"
+	else
+		rm -rf "${ED}"/usr/bin/pdf* \
+			   "${ED}"/usr/share/man/man1/pdf* \
+			   "${ED}"/usr/$(get_libdir) || die
+	fi
+
+	if use i18n; then
+		for i in arabic chinese-simplified chinese-traditional cyrillic greek \
+				 hebrew japanese korean latin2 thai turkish; do
+			insinto "/usr/share/xpdf/${i}"
+			doins -r $(find -O3 "${WORKDIR}/xpdf-${i}" -maxdepth 1 -mindepth 1 \
+				! -name README ! -name add-to-xpdfrc || die)
+
+			cat "${WORKDIR}/xpdf-${i}/add-to-xpdfrc" >> "${ED}/etc/xpdfrc" || die
+		done
+	fi
+}
diff --git a/dev-haskell/linear/Manifest b/dev-haskell/linear/Manifest
index 14c2db0ce468..93fb4424e81a 100644
--- a/dev-haskell/linear/Manifest
+++ b/dev-haskell/linear/Manifest
@@ -1 +1 @@
-DIST linear-1.20.9.tar.gz 49250 BLAKE2B ae51a3d7c7570ffa2e43ba9c7170c53f010050ab83ffe5f99f6717c76c4b78e462919f3938a0b7db5f654d4a65241abe87dc167ac5dba78db0097d8a806ee33d SHA512 4b3fc0d1f0cfc79b67cb3c0fe823ca7f1f02b7b3deab98c32ec56b12f5764a6a18db9cbe2218e91b3efa5deea6675d4ddf166a1600a9aa8b7ad3f1da68cb6f52
+DIST linear-1.21.3.tar.gz 54001 BLAKE2B debc60d15256947f9134f5debff4b07b206aa5d1aac3e63fb5ae239b881987369b5d2766a658dcdc5225a978f4b464b65c76a0fbb00312b650d7c13bf818e25b SHA512 0fc979f1e2cad5d24ea9385469d8b230f53976e9405b762dfe2d2cafb40239d7785e2ef5ad0dd1b482718e05023ba1e79fad0ce3e6886c1510c76f27a2a5ff02
diff --git a/dev-haskell/linear/linear-1.20.9.ebuild b/dev-haskell/linear/linear-1.21.3.ebuild
index 2a04c9081129..033a163d5e5a 100644
--- a/dev-haskell/linear/linear-1.20.9.ebuild
+++ b/dev-haskell/linear/linear-1.21.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.9999
+# ebuild generated by hackport 0.6.7.9999
 #hackport: flags: -herbie
 
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite rebuild-after-doc-workaround"
 inherit haskell-cabal
 
 DESCRIPTION="Linear Algebra"
@@ -18,15 +18,14 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+template-haskell"
 
-RESTRICT=test # broken on USE=doc
-
 RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[profile?]
-	>=dev-haskell/base-orphans-0.5:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
+	>=dev-haskell/base-orphans-0.8.3:=[profile?] <dev-haskell/base-orphans-1:=[profile?]
 	>=dev-haskell/bytes-0.15:=[profile?] <dev-haskell/bytes-1:=[profile?]
 	>=dev-haskell/cereal-0.4.1.1:=[profile?] <dev-haskell/cereal-0.6:=[profile?]
 	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1:=[profile?]
 	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
 	>=dev-haskell/lens-4.15.2:=[profile?] <dev-haskell/lens-5:=[profile?]
+	>=dev-haskell/random-1.0:=[profile?] <dev-haskell/random-1.3:=[profile?]
 	>=dev-haskell/reflection-1.3.2:=[profile?] <dev-haskell/reflection-3:=[profile?]
 	>=dev-haskell/semigroupoids-5.2.1:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
 	>=dev-haskell/semigroups-0.9:=[profile?] <dev-haskell/semigroups-1:=[profile?]
@@ -40,15 +39,13 @@ RDEPEND=">=dev-haskell/adjunctions-4:=[profile?] <dev-haskell/adjunctions-5:=[pr
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18.1.3
 	>=dev-haskell/cabal-doctest-1 <dev-haskell/cabal-doctest-1.1
-	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.17
+	test? ( >=dev-haskell/doctest-0.11.1 <dev-haskell/doctest-0.18
 		>=dev-haskell/hunit-1.2.5
 		>=dev-haskell/simple-reflect-0.3.1
 		>=dev-haskell/test-framework-0.8
 		>=dev-haskell/test-framework-hunit-0.3 )
 "
 
-PATCHES=("${FILESDIR}"/${P}-base-orphans-0.8.3.patch)
-
 src_configure() {
 	haskell-cabal_src_configure \
 		--flag=-herbie \
diff --git a/dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0-r2.ebuild b/dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0-r2.ebuild
index 8ad922bbd826..acd3c476b4fa 100644
--- a/dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0-r2.ebuild
+++ b/dev-perl/Conf-Libconfig/Conf-Libconfig-0.100.0-r2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for libconfig"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~m68k ~s390 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 0a580c9569d4..3dfbc0629c60 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -2,3 +2,4 @@ DIST alembic-1.4.3.tar.gz 1108131 BLAKE2B d9c8b6d6aebce7a45194dd6c654f4a2627714a
 DIST alembic-1.5.0.tar.gz 1128073 BLAKE2B 067ebe7a8ee9b14fc782e0f5268990b07a8ae91ab8ae89daee119bb64f30b8cb966ff22ce71c67e476fafce7ae418952f253645b0f5b5b8a1abbf7f562794138 SHA512 a667e5b176770061c27ea7fdaafdbcdad64d968e22e729083fadd8e002530cc43909a955c3ccaa04329c393ab3f27ec5b944b03ba0ae5d29609b940e7cfb8ad5
 DIST alembic-1.5.1.tar.gz 1128404 BLAKE2B 70a2ce16adcf317c9376f77d8fa88e9eef3aa4090de5f933187f47df9fe6ac40a25df75d6c74c50c3be23dd3cef13d465eb2ddae4ea83558d01ebffd8effe241 SHA512 2fe490c46c253123333f0496fe28b59956efc78924f145b69ba95e5cb1cc091a72047c1aa5f8a85924ec59ad0aba2bfa143b9cad475dedc6f849c38695c08601
 DIST alembic-1.5.2.tar.gz 1129660 BLAKE2B ab8800adb9a46e98adfed558a98328cbb06f53c4e1c47a7ac2f9f559e807aa81955295496404569aff53bee449213bc40232d070403e72098a27e789ea2a7b96 SHA512 35a00cee17d626aec55d6fe5b99dec58dfc52167a1ff1559cb69a45b9eccdaf1a0ceb58f8c2bd0d6e590ac2577fea32d82b412b5e706d0b9c183775d44253668
+DIST alembic-1.5.3.tar.gz 1132015 BLAKE2B b3a1e54b365f1b60edbb2c3052d3a0b822e6f3dfe398d58ba3dc9504cf081476abf7af79dab2233629765185a7d1d69af7fabcdbe8328c54b39c81034e55ceab SHA512 0859b21b35854ddcb98f020a03659cdb4c56833a84f868db545aae51b62eddf3c4f76c0d00dd1d5fbd1259766b90f9f5b11e1f5e99db8d8752015aded12ca185
diff --git a/dev-python/alembic/alembic-1.5.3.ebuild b/dev-python/alembic/alembic-1.5.3.ebuild
new file mode 100644
index 000000000000..32d428a7bdf3
--- /dev/null
+++ b/dev-python/alembic/alembic-1.5.3.ebuild
@@ -0,0 +1,33 @@
+# 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="database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="https://github.com/sqlalchemy/alembic"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/aniso8601/Manifest b/dev-python/aniso8601/Manifest
index ce91cb896697..883a1eded4a9 100644
--- a/dev-python/aniso8601/Manifest
+++ b/dev-python/aniso8601/Manifest
@@ -1 +1,2 @@
 DIST aniso8601-8.0.0.tar.gz 37007 BLAKE2B bb5f42928308fab7746cbea364c03db4813b1b25883495d0488eb755e14f465300662b07c4ccfd03328a0c0f07ed87056ccc13f2652648c4838b0433740fc3ab SHA512 1e6c43f77993e829833d819f7c2b9b1d31f30ca46e258faac0e0b3be864da07436ae34f05710309302477bb3eede5966c95ef3b124c9b353b306c2272dc4cb9d
+DIST aniso8601-8.1.1.tar.gz 39143 BLAKE2B d72161923e164032e1b9e4ed317d688d70b2a16bec6c23966f76abbb4d10f24def18df41fcca4e8f45e6145f4f067ec5483f34305a33eee3445d4706df188a99 SHA512 f9c3412c5e7dec04cca56df5806a747779848adb90137293368b4d50c365692b1d1f792a00f57172925229ccdee34ef5b50cc2d06f4c9b4d697c651e5a2e3674
diff --git a/dev-python/aniso8601/aniso8601-8.1.1.ebuild b/dev-python/aniso8601/aniso8601-8.1.1.ebuild
new file mode 100644
index 000000000000..298eb44a792c
--- /dev/null
+++ b/dev-python/aniso8601/aniso8601-8.1.1.ebuild
@@ -0,0 +1,19 @@
+# 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 library for parsing ISO 8601 strings"
+HOMEPAGE="https://bitbucket.org/nielsenb/aniso8601/ https://pypi.org/project/aniso8601/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 7f83d0142195..ddddcf3220e1 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1 +1,2 @@
 DIST aws-sam-translator-1.33.0.tar.gz 817801 BLAKE2B 6e50f299b077f6d0240ee4db80450f766589c5349c323cd846c9ef42dc08bfcb7f8f80099c7d1ecf940d3ba1c2e4628842bf4b1f12e8fcc6c83100f5a375125d SHA512 72fadce4851d782e37e786132d98bcc364c92a1fa48addf715f0d2cf28e286e8cb8835de05fccc67c153d45ed8ba9fd3b7445333f8d96cd70b6c854b8b34c5d6
+DIST aws-sam-translator-1.34.0.tar.gz 831469 BLAKE2B fa6820ef8640b649c9866d3e33ca5bb889bb8041ad15ce93b672ba0d84a3396db03ac55c877f303359f20ef1afdcadb257b84616a4376640279ff47dd9d86b43 SHA512 704bb55c99485e37d8fda853ee8b4f36472c8ccc83951bbc48eaaf2a0049765820c9036ad48a0c03b2d267378e5bf3c3155986ceee2e6efae8bb28bff1e68ec7
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.34.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.34.0.ebuild
new file mode 100644
index 000000000000..80ea0cfde10c
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.34.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="https://github.com/aws/serverless-application-model
+	https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	# don't install tests
+	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index ec55bcdecaf5..3b2fd761b7d1 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -4,3 +4,4 @@ DIST boto3-1.16.56.tar.gz 344547 BLAKE2B da32affd031a7efd7f55ec390f657d02caaf37d
 DIST boto3-1.16.60.tar.gz 344983 BLAKE2B c479bc65a04ef01576b046452b125eef931274923dcc3122ca216affd7de55198ace650cf3923fe062ee9a1246d9bd6b2a9e512b88aa91ca5dd8426f3c341958 SHA512 cc7764ace2f94b657de3f6fba977c0b8dcf3e71d159e3ea93fe2d2a6c2e02357655dc08d5ad21e4884173f5a79204c8405d833b4f78063e7f071e7ff8299de7f
 DIST boto3-1.16.61.tar.gz 345049 BLAKE2B 542dc15da302d9eeec31d99d2ee0c1229e4155b1f02ffb295819b0365ad9a9f4b87d2adc67e35b760b5a9be27cfb6c6445c5f22472c1a45d8ffca536f2737b51 SHA512 3e27c6b5c638171941b33a6e22b167a6e2bb5609c9e10cf4b7b2991a81ea5a03d3cb911ff1cf53aaf875327463cfb8437f3922c767d51a8386d665d8ec642096
 DIST boto3-1.16.62.tar.gz 345246 BLAKE2B 26b88075e2d5a14b98a3868c4c8f6c7f13d4188c73f5c6884971fb7e3f61ec7f2f371d95f381150b630c94fb2d0d4abc8ba1cf48ecbbce44a23890e15a72ee45 SHA512 1dfa6f45caf57bffe33308bafc68ffa8180d34349a7d84862c6a105139e7ec5134c932fd0050e2ea4375a066724c002c52b6809f0f9fe2a831f48967f86dcc78
+DIST boto3-1.16.63.tar.gz 345303 BLAKE2B e6877aeb3efd8018188eaf687b96e604f6b6b4910ae1a96d6f0d6db335f836d223f3f3216990a8a1eed3af91830ef8effd52f2c16148bb05dd4a6d69f777ef76 SHA512 25df3e65feb6c89c865021311d3c63bb52b5e48ef2e09813f548b1cc4c28b462969b4c3ec5192ab8b02ab9faef28f9ff042ea78f22d19a8df96f1211a9e1a763
diff --git a/dev-python/boto3/boto3-1.16.63.ebuild b/dev-python/boto3/boto3-1.16.63.ebuild
new file mode 100644
index 000000000000..7be6516ff810
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.63.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_{6..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}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index abd9536e1fbb..6eb78b570b8a 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,3 +4,4 @@ DIST botocore-1.19.56.tar.gz 7390812 BLAKE2B 3bec12ce19f39f12a72f7f59f226568cb5a
 DIST botocore-1.19.60.tar.gz 7432208 BLAKE2B 6dd879a5c0c812dd218a71f9712758ec6195b4770afc582bb1e062be360e7909e33ef62896e08be1bc8c57840333cc6fb8f4ce3817b248acff58258654b6a138 SHA512 d38a278dbca897b06d4d7589084b6f3d385051ec346a716b9ce90f1e8980abc2c617f94aa6e3f13960fc86820393dd7c1ed2d391a6bf1fea3edc6f1ba750b24d
 DIST botocore-1.19.61.tar.gz 7432779 BLAKE2B 09fe171532dc5672d5265712b9af1149008cc9a1e3c6d6c6754f332bfc1fb89effe5a5d1f2a7f52ae049ed58db8d07c1187533e6f8d36952b1010a692392dff4 SHA512 9a1095f305c3d2c00cb2ee902cfb46b8e3ab7b2b6757308072c1adeed3632bec7c422be3febbf23de796f0b303a2e9e27877273316e8c9f4a21e32295fb055c1
 DIST botocore-1.19.62.tar.gz 7435742 BLAKE2B 94562f0f42878e5b5aa59e7b36e60c7c8014a356041a9c4e043e3abdf2b029727e05a34a254047374fdbafe830aa982ae6b34682573f8fe2175fa2de3642bf1c SHA512 0c702e207b904593788c7f7a290308730ed2cbe6b67c1566e2c53c45a68d9a5a8a45be67f6a0e2e5e6d1ffce5488508a5680d2f8a83c31f329d1a2878a52e7fb
+DIST botocore-1.19.63.tar.gz 7437996 BLAKE2B b55aa80cf4f17538e5876f61492d15916111c216aff455a1366d12293579bd2c3d4e9c5e2a51e91ee117ac0469743b898cd314abc693a466e99fe332deea95c2 SHA512 11c616f5574df986f576078c18a1f65149ccd01ac21575fd610e2dec0598387cc4d55c05a8ffeed3e7c2fb1809a699d6c6c0c9b57482cbb895146a6a1cddb65b
diff --git a/dev-python/botocore/botocore-1.19.63.ebuild b/dev-python/botocore/botocore-1.19.63.ebuild
new file mode 100644
index 000000000000..fa25adc1c1ff
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.63.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_{6..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}"
+}
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 2dfc74497551..91ae6efec956 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,2 +1,3 @@
 DIST packaging-20.7.gh.tar.gz 75182 BLAKE2B f3ba27ec33db576273609f28aabb5edab4acd07d8174c96e3a1608eacdc1a571d2ce96cc4e38c50c964ae5a716bbca077effd6dea039b25ac7bd6ce5707ae08b SHA512 4da8f66af066ac92b47664d21af34a02526cd1639cb766927670bec0ac8c7416116834c847678a29862a46faeda7e2f2393744be315cdfbbb8bd55a04ceb942c
 DIST packaging-20.8.gh.tar.gz 76310 BLAKE2B f6a220bf8ed61e4ced5cdb93eac8a83310d5c1abc11861e3eca64ef08e3fa2617a9dedd9006fd833df37da5bd7a33c216fb78b9151b1c72121fbb0a27e7b88d3 SHA512 77c77da9298635274de58b856b8738ab279749f736264212e6ecdeab47db607ea9c6ae696952f0702e9557d1fd2b89c7277a2c81ff55081593f49ebcd6eb74d4
+DIST packaging-20.9.gh.tar.gz 78041 BLAKE2B d87c66aa39cfb832a26a350981722ad40a9193b70ca447030405ee474586cc12e4ae5f4dc7fbc5da6944b717545f3d3f7caac376a3da1ab95aa26429723dc6f6 SHA512 fb71f1036cfaacbe94fdee663af31d6ad1960f73ecc95cba87b461c2d7d2ea90085853bb4682b146492d8c48f784b60ef082e3b1259269857166b143cd9a920b
diff --git a/dev-python/packaging/packaging-20.9.ebuild b/dev-python/packaging/packaging-20.9.ebuild
new file mode 100644
index 000000000000..7b526eafdbd7
--- /dev/null
+++ b/dev-python/packaging/packaging-20.9.ebuild
@@ -0,0 +1,35 @@
+# 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="Core utilities for Python packages"
+HOMEPAGE="
+	https://github.com/pypa/packaging/
+	https://pypi.org/project/packaging/"
+SRC_URI="
+	https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( Apache-2.0 BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest --capture=no --strict -vv || die
+}
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index a06c9de78abe..a9b430a711ea 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1 +1,2 @@
 DIST pyotp-2.4.1.tar.gz 15232 BLAKE2B 0690364209bbbfc7bdaddc0204168a584696b98d974b203513ce8f6ffef9751ed1c9d19b7f875631805cf704ca494b2412eb731b0415fdedbae7f57ece630981 SHA512 4bd60ecef1ae22207732a539e5b46c3ca35fa6158da552e537aa522bfe2a2e0743f7426c437cd93cc9901ce5b834cbd9d9e4481eb95478871367f1d5373b67af
+DIST pyotp-2.5.1.tar.gz 15503 BLAKE2B 73cbfb37f0d795b5d7a538e7b973c0281f161226559df1a8db20d4df5121c0efbe8dc8b0bed806903a83dace3388efca6c1ec84a6b7ef21becbd020c04074ffc SHA512 628bcc4c18c469dff9007cbe2f4a9b55a2100e1845e3196fbf2f55fd37b6c95a0d4d5df7a31f8df3e84b8a1b48151cb8048574cf1cda6bc7c098c5c0fb6e5649
diff --git a/dev-python/pyotp/pyotp-2.5.1.ebuild b/dev-python/pyotp/pyotp-2.5.1.ebuild
new file mode 100644
index 000000000000..cf8967a7eb75
--- /dev/null
+++ b/dev-python/pyotp/pyotp-2.5.1.ebuild
@@ -0,0 +1,18 @@
+# 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="PyOTP is a Python library for generating and verifying one-time passwords."
+HOMEPAGE="https://github.com/pyauth/pyotp https://pypi.org/project/pyotp/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 4ea9f8f47eb8..96fc03add985 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,2 +1,3 @@
 DIST slixmpp-1.4.2.tar.gz 864608 BLAKE2B 9689b274a9c787174248c094329ea33783627a45ef39708a611013454953de4fa8799ca5a35950a3f3ed49bebf5c56f6f2bea079bcc2a3dce7d2648bfd812371 SHA512 3b3356352af8d7ec8cca15210c0524ce0bb5e313d8c5455bec13e82aec261f6d094a99df9f08642418a0e4abea4ee1ff607e42e1c166b9be1c26534b690c330b
 DIST slixmpp-1.5.2.tar.gz 886383 BLAKE2B 6b5ed074ab182f449bf7d2919c241694ea4ff24567546c50a3d228af7708826fb9bfd89b4fccf8a31ae2909399b57caa752a71c187cffbe133bab13b41da814f SHA512 4f377246526c03ae02ece370ba8c9fa7c26a89eca7a012a1a89b8186b6c226d72287c15a7668ca85bfc8f2200765406dbc0fa9cb0e358c3755f551df8eb0d59f
+DIST slixmpp-1.7.0.tar.gz 931610 BLAKE2B bb84e33681cc2701dbfc164ad4e727236dbe5fe1206a4c4e93843f9cbd870b6b3efb03b89ae61ddde4249c4928a81edaea9caf1d04b88e3b5cb0e81b1fe3fad7 SHA512 1f70f6b0419877865b80213a50ba181639cbf64fd808695d7a95eae460635a537492f72bed0e6d77d33dc9a5da4ec505da4cd44526bdee2a39b56b98a9974cfc
diff --git a/dev-python/slixmpp/metadata.xml b/dev-python/slixmpp/metadata.xml
index 97309be0a01b..b0ebc663f799 100644
--- a/dev-python/slixmpp/metadata.xml
+++ b/dev-python/slixmpp/metadata.xml
@@ -5,6 +5,10 @@
 		<email>andrey_utkin@gentoo.org</email>
 		<name>Andrey Utkin</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">slixmpp</remote-id>
 	</upstream>
diff --git a/dev-python/slixmpp/slixmpp-1.7.0.ebuild b/dev-python/slixmpp/slixmpp-1.7.0.ebuild
new file mode 100644
index 000000000000..0f5e88aa5f6c
--- /dev/null
+++ b/dev-python/slixmpp/slixmpp-1.7.0.ebuild
@@ -0,0 +1,38 @@
+# 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 3 library for XMPP"
+HOMEPAGE="https://lab.louiz.org/poezio/slixmpp"
+LICENSE="MIT"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	net-dns/libidn
+"
+RDEPEND="
+	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	${DEPEND}
+"
+
+distutils_enable_tests unittest
+
+python_test() {
+	"${EPYTHON}" ./run_tests.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass
index 4908e4491e60..6099363bc9a5 100644
--- a/eclass/haskell-cabal.eclass
+++ b/eclass/haskell-cabal.eclass
@@ -29,6 +29,15 @@
 #                  only used for packages that use libghc internally and _must_
 #                  not pull upper versions
 #   test-suite --  add support for cabal test-suites (introduced in Cabal-1.8)
+#   rebuild-after-doc-workaround -- enable doctest test failue workaround.
+#                  Symptom: when `./setup haddock` is run in a `build-type: Custom`
+#                  package it might cause cause the test-suite to fail with
+#                  errors like:
+#                  > <command line>: cannot satisfy -package-id singletons-2.7-3Z7pnljD8tU1NrslJodXmr
+#                  Workaround re-reginsters the package to avoid the failure
+#                  (and rebuilds changes).
+#                  FEATURE can be removed once https://github.com/haskell/cabal/issues/7213
+#                  is fixed.
 
 inherit eutils ghc-package multilib toolchain-funcs
 
@@ -53,6 +62,28 @@ inherit eutils ghc-package multilib toolchain-funcs
 # linking 'setup' faster.
 : ${GHC_BOOTSTRAP_FLAGS:=}
 
+# @ECLASS-VARIABLE: CABAL_EXTRA_HADDOCK_FLAGS
+# @DESCRIPTION:
+# User-specified additional parameters passed to 'setup haddock'.
+# example: /etc/portage/make.conf:
+#    CABAL_EXTRA_HADDOCK_FLAGS="--haddock-options=--latex --haddock-options=--pretty-html"
+: ${CABAL_EXTRA_HADDOCK_FLAGS:=}
+
+# @ECLASS-VARIABLE: CABAL_EXTRA_HOOGLE_FLAGS
+# @DESCRIPTION:
+# User-specified additional parameters passed to 'setup haddock --hoogle'.
+# example: /etc/portage/make.conf:
+#    CABAL_EXTRA_HOOGLE_FLAGS="--haddock-options=--show-all"
+: ${CABAL_EXTRA_HOOGLE_FLAGS:=}
+
+# @ECLASS-VARIABLE: CABAL_EXTRA_HSCOLOUR_FLAGS
+# @DESCRIPTION:
+# User-specified additional parameters passed to 'setup hscolour'.
+# example: /etc/portage/make.conf:
+#    CABAL_EXTRA_HSCOLOUR_FLAGS="--executables --tests"
+: ${CABAL_EXTRA_HSCOLOUR_FLAGS:=}
+
+
 # @ECLASS-VARIABLE: CABAL_EXTRA_TEST_FLAGS
 # @DESCRIPTION:
 # User-specified additional parameters passed to 'setup test'.
@@ -99,6 +130,7 @@ for feature in ${CABAL_FEATURES}; do
 		nocabaldep) CABAL_FROM_GHC=yes;;
 		ghcdeps)    CABAL_GHC_CONSTRAINT=yes;;
 		test-suite) CABAL_TEST_SUITE=yes;;
+		rebuild-after-doc-workaround) CABAL_REBUILD_AFTER_DOC_WORKAROUND=yes;;
 
 		# does nothing, removed 2016-09-04
 		bin)        ;;
@@ -222,43 +254,17 @@ cabal-mksetup() {
 		> "${setup_src}" || die "failed to create default Setup.hs"
 }
 
-cabal-hscolour() {
-	set -- hscolour "$@"
-	echo ./setup "$@"
-	./setup "$@" || die "setup hscolour failed"
+haskell-cabal-run_verbose() {
+	echo "$@"
+	"$@" || die "failed: $@"
 }
 
-cabal-haddock() {
-	set -- haddock "$@"
-	echo ./setup "$@"
-	./setup "$@" || die "setup haddock failed"
-}
-
-cabal-hoogle() {
-	ewarn "hoogle USE flag requires doc USE flag, building without hoogle"
-}
-
-cabal-hscolour-haddock() {
-	# --hyperlink-source implies calling 'setup hscolour'
-	set -- haddock --hyperlink-source
-	echo ./setup "$@"
-	./setup "$@" --hyperlink-source || die "setup haddock --hyperlink-source failed"
-}
-
-cabal-hoogle-haddock() {
-	set -- haddock --hoogle
-	echo ./setup "$@"
-	./setup "$@" || die "setup haddock --hoogle failed"
-}
-
-cabal-hoogle-hscolour-haddock() {
-	cabal-hscolour-haddock
-	cabal-hoogle-haddock
+cabal-hscolour() {
+	haskell-cabal-run_verbose ./setup hscolour "$@"
 }
 
-cabal-hoogle-hscolour() {
-	ewarn "hoogle USE flag requires doc USE flag, building without hoogle"
-	cabal-hscolour
+cabal-haddock() {
+	haskell-cabal-run_verbose ./setup haddock "$@"
 }
 
 cabal-die-if-nonempty() {
@@ -342,10 +348,34 @@ cabal-configure() {
 	fi
 
 	# currently cabal does not respect CFLAGS and LDFLAGS on it's own (bug #333217)
-	# so translate LDFLAGS to ghc parameters (without filtering)
+	# so translate LDFLAGS to ghc parameters (with mild filtering).
 	local flag
-	for flag in   $CFLAGS; do cabalconf+=(--ghc-option="-optc$flag"); done
-	for flag in  $LDFLAGS; do cabalconf+=(--ghc-option="-optl$flag"); done
+	for flag in   $CFLAGS; do
+		case "${flag}" in
+			-flto|-flto=*)
+				# binutils does not support partial linking yet:
+				# https://github.com/gentoo-haskell/gentoo-haskell/issues/1110
+				# https://sourceware.org/PR12291
+				einfo "Filter '${flag}' out of CFLAGS (avoid lto partial linking)"
+				continue
+				;;
+		esac
+
+		cabalconf+=(--ghc-option="-optc$flag")
+	done
+	for flag in  $LDFLAGS; do
+		case "${flag}" in
+			-flto|-flto=*)
+				# binutils does not support partial linking yet:
+				# https://github.com/gentoo-haskell/gentoo-haskell/issues/1110
+				# https://sourceware.org/PR12291
+				einfo "Filter '${flag}' out of LDFLAGS (avoid lto partial linking)"
+				continue
+				;;
+		esac
+
+		cabalconf+=(--ghc-option="-optl$flag")
+	done
 
 	# disable executable stripping for the executables, as portage will
 	# strip by itself, and pre-stripping gives a QA warning.
@@ -512,38 +542,30 @@ cabal_src_compile() {
 	has src_configure ${HASKELL_CABAL_EXPF} || haskell-cabal_src_configure "$@"
 	cabal-build
 
-	if [[ -n "${CABAL_USE_HADDOCK}" ]] && use doc; then
-		if [[ -n "${CABAL_USE_HSCOLOUR}" ]] && use hscolour; then
-			if [[ -n "${CABAL_USE_HOOGLE}" ]] && use hoogle; then
-				# hoogle, hscolour and haddock
-				cabal-hoogle-hscolour-haddock
-			else
-				# haddock and hscolour
-				cabal-hscolour-haddock
-			fi
-		else
-			if [[ -n "${CABAL_USE_HOOGLE}" ]] && use hoogle; then
-				# hoogle and haddock
-				cabal-hoogle-haddock
-			else
-				# just haddock
-				cabal-haddock
-			fi
+	if [[ -n "$CABAL_USE_HADDOCK" ]] && use doc; then
+		if [[ -n "$CABAL_USE_HSCOLOUR" ]] && use hscolour; then
+			# --hyperlink-source implies calling 'setup hscolour'
+			haddock_args+=(--hyperlink-source)
+		fi
+
+		cabal-haddock "${haddock_args[@]}" $CABAL_EXTRA_HADDOCK_FLAGS
+
+		if [[ -n "$CABAL_USE_HOOGLE" ]] && use hoogle; then
+			cabal-haddock --hoogle $CABAL_EXTRA_HOOGLE_FLAGS
+		fi
+		if [[ -n "${CABAL_REBUILD_AFTER_DOC_WORKAROUND}" ]]; then
+			ewarn "rebuild-after-doc-workaround is enabled. This is a"
+			ewarn "temporary worakround to deal with https://github.com/haskell/cabal/issues/7213"
+			ewarn "until the upstream issue can be resolved."
+			cabal-build
 		fi
 	else
-		if [[ -n "${CABAL_USE_HSCOLOUR}" ]] && use hscolour; then
-			if [[ -n "${CABAL_USE_HOOGLE}" ]] && use hoogle; then
-				# hoogle and hscolour
-				cabal-hoogle-hscolour
-			else
-				# just hscolour
-				cabal-hscolour
-			fi
-		else
-			if [[ -n "${CABAL_USE_HOOGLE}" ]] && use hoogle; then
-				# just hoogle
-				cabal-hoogle
-			fi
+		if [[ -n "$CABAL_USE_HSCOLOUR" ]] && use hscolour; then
+			cabal-hscolour $CABAL_EXTRA_HSCOLOUR_FLAGS
+		fi
+
+		if [[ -n "$CABAL_USE_HOOGLE" ]] && use hoogle; then
+			ewarn "hoogle USE flag requires doc USE flag, building without hoogle"
 		fi
 	fi
 }