Merge updates from master

12 files changed, 318 insertions, 142 deletions

diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 7fdc374218ed..3a03eb163b0c 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,2 +1 @@
-DIST libarchive-3.5.1.tar.gz 7008338 BLAKE2B 243dfda2bd4582bbc20679328b89aae0c530475c822dcf9ff25c65df2017b8f18bb616142d6ab016ccea4a5aa1b410d46b913c2ee0afefd2fdb1a41cf51585d9 SHA512 08ddd74bef4cef0981739da202879f36cf7ca33a8f6d438724588efe3ab8477f2f1d0cccf7b8ed0bedfc0c8d0cab16ee3ae5c0c6e83b6811bc650d7d7471a996
 DIST libarchive-3.5.2.tar.gz 7054934 BLAKE2B 1fc6ee0166573658dc5e0f170113c07ecdaa76b287cbf68bdee63ccd198dad615b3f2803a3fc1aed303cd1f7f32033e6d8e782ef6a8a991562cdc2a375894c9e SHA512 2003ec9b24086373451bd7317bdab86d81627f087c14a6f7df1a92e131a216749f9aa352504c3d04dc82b62078b59aeea5aad5543b7e6c1c21fcafa2955d3762
diff --git a/app-arch/libarchive/libarchive-3.5.1-r1.ebuild b/app-arch/libarchive/libarchive-3.5.1-r1.ebuild
deleted file mode 100644
index 495a49a99ae6..000000000000
--- a/app-arch/libarchive/libarchive-3.5.1-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit libtool multilib-minimal toolchain-funcs
-
-DESCRIPTION="Multi-format archive and compression library"
-HOMEPAGE="https://www.libarchive.org/"
-SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD BSD-2 BSD-4 public-domain"
-SLOT="0/13"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="acl blake2 +bzip2 +e2fsprogs expat +iconv kernel_linux lz4 +lzma lzo nettle static-libs xattr +zlib zstd"
-
-RDEPEND="
-	acl? ( virtual/acl[${MULTILIB_USEDEP}] )
-	blake2? ( app-crypt/libb2[${MULTILIB_USEDEP}] )
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	expat? ( dev-libs/expat[${MULTILIB_USEDEP}] )
-	!expat? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
-	iconv? ( virtual/libiconv[${MULTILIB_USEDEP}] )
-	kernel_linux? (
-		xattr? ( sys-apps/attr[${MULTILIB_USEDEP}] )
-	)
-	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] )
-	lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] )
-	nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	kernel_linux? (
-		virtual/os-headers
-		e2fsprogs? ( sys-fs/e2fsprogs )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch  # drop on next release
-)
-
-src_prepare() {
-	default
-	elibtoolize  # is required for Solaris sol2_ld linker fix
-}
-
-multilib_src_configure() {
-	export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
-
-	local myconf=(
-		$(use_enable acl)
-		$(use_enable static-libs static)
-		$(use_enable xattr)
-		$(use_with blake2 libb2)
-		$(use_with bzip2 bz2lib)
-		$(use_with expat)
-		$(use_with !expat xml2)
-		$(use_with iconv)
-		$(use_with lz4)
-		$(use_with lzma)
-		$(use_with lzo lzo2)
-		$(use_with nettle)
-		$(use_with zlib)
-		$(use_with zstd)
-
-		# Windows-specific
-		--without-cng
-	)
-	if multilib_is_native_abi ; then
-		myconf+=(
-			--enable-bsdcat=$(tc-is-static-only && echo static || echo shared)
-			--enable-bsdcpio=$(tc-is-static-only && echo static || echo shared)
-			--enable-bsdtar=$(tc-is-static-only && echo static || echo shared)
-		)
-	else
-		myconf+=(
-			--disable-bsdcat
-			--disable-bsdcpio
-			--disable-bsdtar
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		emake libarchive.la
-	fi
-}
-
-src_test() {
-	mkdir -p "${T}"/bin || die
-	# tests fail when lbzip2[symlink] is used in place of ref bunzip2
-	ln -s "${BROOT}/bin/bunzip2" "${T}"/bin || die
-	local -x PATH=${T}/bin:${PATH}
-	multilib-minimal_src_test
-}
-
-multilib_src_test() {
-	# sandbox is breaking long symlink behavior
-	local -x SANDBOX_ON=0
-	local -x LD_PRELOAD=
-	# some locales trigger different output that breaks tests
-	local -x LC_ALL=C
-	emake check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		emake DESTDIR="${D}" install
-
-		# Create symlinks for FreeBSD
-		if ! use prefix && [[ ${CHOST} == *-freebsd* ]]; then
-			# Exclude cat for the time being #589876
-			for bin in cpio tar; do
-				dosym bsd${bin} /usr/bin/${bin}
-				echo '.so bsd${bin}.1' > "${T}"/${bin}.1
-				doman "${T}"/${bin}.1
-			done
-		fi
-	else
-		local install_targets=(
-			install-includeHEADERS
-			install-libLTLIBRARIES
-			install-pkgconfigDATA
-		)
-		emake DESTDIR="${D}" "${install_targets[@]}"
-	fi
-
-	# Libs.private: should be used from libarchive.pc instead
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-multilib_src_install_all() {
-	cd "${S}" || die
-	einstalldocs
-}
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch
new file mode 100644
index 000000000000..33858f763db0
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.54.0-makefile-deps.patch
@@ -0,0 +1,110 @@
+https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=4874418fd031617212336b8b55f8fcba3b9cfb68#patch1
+https://bugs.gentoo.org/800125
+
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Thu, 6 May 2021 12:23:59 +0100
+Subject: [PATCH] Remove makefile reference to non-existent header file
+
+Fixes (spurious) parallel make failure on the cluster
+--- a/base/lib.mak
++++ b/base/lib.mak
+@@ -488,7 +488,6 @@ gxcoord_h=$(GLSRC)gxcoord.h
+ gxcpath_h=$(GLSRC)gxcpath.h
+ gxdda_h=$(GLSRC)gxdda.h
+ gxdevbuf_h=$(GLSRC)gxdevbuf.h
+-gxdevrop_h=$(GLSRC)gxdevrop.h
+ gxdevmem_h=$(GLSRC)gxdevmem.h
+ gxdhtres_h=$(GLSRC)gxdhtres.h
+ gxfont0_h=$(GLSRC)gxfont0.h
+@@ -2407,13 +2406,13 @@ $(GLD)roplib.dev : $(LIB_MAK) $(ECHOGS_XE) $(roplib_) $(LIB_MAK) $(MAKEDIRS)
+ 
+ $(GLOBJ)gdevdrop_1.$(OBJ) : $(GLSRC)gdevdrop.c $(AK) $(gx_h) $(gserrors_h) \
+  $(memory__h) $(gxdevsop_h) $(gsbittab_h) $(gsropt_h) $(gxcindex_h) \
+- $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxdevrop_h) $(gxgetbit_h) \
++ $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxgetbit_h) \
+  $(gdevmem_h) $(gdevmrop_h) $(gdevmpla_h) $(stdint__h) $(LIB_MAK) $(MAKEDIRS)
+ 	$(GLCC) $(D_)WITH_CAL$(_D) $(I_)$(CALSRCDIR)$(_I) $(GLO_)gdevdrop_1.$(OBJ) $(C_) $(GLSRC)gdevdrop.c
+ 
+ $(GLOBJ)gdevdrop_0.$(OBJ) : $(GLSRC)gdevdrop.c $(AK) $(gx_h) $(gserrors_h) \
+  $(memory__h) $(gxdevsop_h) $(gsbittab_h) $(gsropt_h) $(gxcindex_h) \
+- $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxdevrop_h) $(gxgetbit_h) \
++ $(gxdcolor_h) $(gxdevice_h) $(gxdevmem_h) $(gxgetbit_h) \
+  $(gdevmem_h) $(gdevmrop_h) $(gdevmpla_h) $(stdint__h) $(LIB_MAK) $(MAKEDIRS)
+ 	$(GLCC) $(GLO_)gdevdrop_0.$(OBJ) $(C_) $(GLSRC)gdevdrop.c
+ 
+@@ -5585,75 +5584,6 @@ $(GLSRC)gxdevbuf.h:$(GLSRC)std.h
+ $(GLSRC)gxdevbuf.h:$(GLSRC)stdpre.h
+ $(GLSRC)gxdevbuf.h:$(GLGEN)arch.h
+ $(GLSRC)gxdevbuf.h:$(GLSRC)gs_dll_call.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxdevcli.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxcmap.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxtext.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gstext.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsnamecl.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gstparam.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxfmap.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsfunc.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxcspace.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxrplane.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscsel.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxfcache.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsfont.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsimage.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsdcolor.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxcvalue.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxbcache.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsropt.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxdda.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxpath.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxfrac.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxtmap.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxftype.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscms.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsrect.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gslparam.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsdevice.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscpm.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscspace.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsgstate.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsxfont.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsdsrc.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsiparam.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxfixed.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscompt.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsmatrix.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gspenum.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxhttile.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsparam.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsrefct.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gp.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)memento.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)memory_.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsuid.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsstruct.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxsync.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxbitmap.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)srdline.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)scommon.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsbitmap.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsccolor.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxarith.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)stat_.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gpsync.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsstype.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsmemory.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gpgetenv.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gscdefs.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gslibctx.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gxcindex.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)stdio_.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gsccode.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)stdint_.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gssprintf.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gstypes.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)std.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)stdpre.h
+-$(GLSRC)gxdevrop.h:$(GLGEN)arch.h
+-$(GLSRC)gxdevrop.h:$(GLSRC)gs_dll_call.h
+ $(GLSRC)gxdevmem.h:$(GLSRC)gxdevcli.h
+ $(GLSRC)gxdevmem.h:$(GLSRC)gxcmap.h
+ $(GLSRC)gxdevmem.h:$(GLSRC)gxtext.h
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
index 710ac1d7f7a7..8c45437e8efb 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0-r1.ebuild
@@ -69,7 +69,9 @@ src_prepare() {
 		eapply "${WORKDIR}/patches/"*.patch
 	fi
 
+	# Upstream patches
 	eapply "${FILESDIR}"/${P}-CVE-2021-3781.patch
+	eapply "${FILESDIR}"/${P}-makefile-deps.patch
 
 	default
 
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 1b3c35b5a91a..9cbdaff79d89 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -3,3 +3,4 @@ DIST google-api-python-client-2.18.0.tar.gz 26442309 BLAKE2B 84f0cadeed015e9e0ca
 DIST google-api-python-client-2.19.1.tar.gz 26659303 BLAKE2B b1b5064c39b7e0d31e7ee01a7556a9ea6feaac1782d6714e50a32f0dfafedcab59628a1ff32774c426136d7ab796a1a6baf1f9ce7fbd1d233149c3a62648f280 SHA512 85272cd0741caed6ff76b930a69a67f1683886df82681b49f3069243dd40ef3f12febc7c1004ecf230d96bae005a8725d502032a9c85eb1bf9e4ee37af7018b9
 DIST google-api-python-client-2.20.0.tar.gz 26723285 BLAKE2B 3c0cb64ea8c58fe20356cd097676bc7741ea454e61d9dc8807689fe2296c3ddd0da1cb208a639e8b47a981437dea39de9a7c26b669c7dc27a79a0c5ca4a6c463 SHA512 bed0b1a0e0c5384c80e337339e9c5526e0cd5b2d39a3bd69fec1c65a3fed5bf26e6f4f983daed7663d2cd6c47b8a2a7ad54395f8e5dada2b49c15d98a9ff04dd
 DIST google-api-python-client-2.21.0.tar.gz 26754841 BLAKE2B e09b48d80d72e56656b366bd60972cde91d0c705ffe94b61d168e808e575a42f1dbbefdaf21ead1e57bab54a1b2453ba39ed5ae1d2ee616a5ba1418acc9f7534 SHA512 c572e5eab313e01ae94b026e32cf40fb479154942168cc09f2b74f184383ff5fc27cc5c0ae48c34d8ddbd8abe8840520a62a43708bd601341d5b32460f5f07df
+DIST google-api-python-client-2.22.0.tar.gz 26831856 BLAKE2B da93f1bca651cc01819c5f5ab43a6c767662db7eb85efb9aa08d2f9b54bc9efcc7622bff3207604ffafea9c88de8a393f5084c225078d896da5fdee1f2e56350 SHA512 427ead4173ed14b2df0560e35c5ff48a98d4abb5d449c26f84d9e7bb169bf46402eaaea0dab7988dbefd5ceee975b19a160cd797d2169030bb5bf1a54accda11
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.22.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.22.0.ebuild
new file mode 100644
index 000000000000..2bf8009bdc63
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.22.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	epytest tests ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index 6140a382e39e..f4e9b31b30e0 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1,2 +1,3 @@
 DIST huawei-lte-api-1.4.18.tar.gz 29701 BLAKE2B 0e242f2f2208646c9f3291dab8397a80934bce3757fb79b58fdcee389a087788962cfaea3350d7b95e53ff3e0f1fbefdf7ea6714266872fc1591848a4fb84462 SHA512 4750fcc84fff46c76f42715e6668d402b9057f8dd826276ad0682e9bac76742c86566794d4aaab7aa9ebf17d06246c4d4cc9385ee1fff9642ff5c995491fc646
+DIST huawei-lte-api-1.5.2.tar.gz 31969 BLAKE2B ced0afc9c1b878d30ac4d3fb731cdebd6c2a658a7ace7d74f5e3641c049d5eaeab5fe1edd4678b791da0ebd22c78c4c7b10f56e2bb4f224788d1f1cdd8f31c6a SHA512 7d7b8b0248ef6080aa990ce06e196653f315605d771c312c490976cd950dfa962affe47f8df3366a645e0d499606514618e1e24976f434258ca22bd9ccf34237
 DIST huawei-lte-api-1.5.tar.gz 31741 BLAKE2B eded2f2ba04dfa8973a5ccd627996770b93e2509aeb2d0ff40dafc9a5ee0f6d242d032d310102297a1f56ee255b10f0e6e02c3a0ad687b6006e31ad8b53fb32e SHA512 f235664464abc23da85a36b17f356c7be65e686e06bbaba9aa06c728fa04ae5ab4fa32168c4fb2914a22472564d8f3365f9fe47f33e1892f923e6934dbd692b0
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.5.2.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.5.2.ebuild
new file mode 100644
index 000000000000..70850fbcf204
--- /dev/null
+++ b/dev-python/huawei-lte-api/huawei-lte-api-1.5.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="API For huawei LAN/WAN LTE Modems"
+HOMEPAGE="https://github.com/Salamek/huawei-lte-api"
+SRC_URI="https://github.com/Salamek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# https://github.com/Salamek/huawei-lte-api/issues/86
+	sed "s:'pytest-runner'::" -i setup.py || die
+
+	# make cryptodome-friendly
+	find -name '*.py' -exec \
+		sed -i -e 's:Cryptodome:Crypto:g' {} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index afbe92eee441..23a013759092 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1 +1,2 @@
 DIST sentry-sdk-1.3.1.tar.gz 219705 BLAKE2B 3fc8f81a5f762f400c70ae1c83ab46e97ec4641a61b86dc5b5a2cdbc22395b60fd53cef2d3d2dbfaaceb2d0bd32b842344fcaab898900b7dee2bd34ae3660f8b SHA512 60d819880b3d5316cad1ae4d236820f410c22c75c97d54d681f43ac6dfb503d3c5817314dd2db37107902b4e28d4f981ade200413388ecaf534135829723ef38
+DIST sentry-sdk-1.4.0.tar.gz 230870 BLAKE2B 8cad1f0046219b60af982d3a01ae67aa1b018c4c8815c2adae834beeea6015057791abff6e1213a4a5902fe62e56f232dcb0cb355927c2f986751145dc633962 SHA512 b1f3021b4a67c2c4e13109ec3e189d1e133f07ecad18bc3e0ebd7b99e90b53aa83cac2cc567b8b47763892a9e06e1795aca497f146cbaae15952c880f9c160cd
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.4.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.4.0.ebuild
new file mode 100644
index 000000000000..d0881dad90d7
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-1.4.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/zope-event[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		tests/integrations/httpx/test_httpx.py
+		tests/integrations/requests/test_requests.py
+		tests/integrations/stdlib/test_httplib.py
+		# wtf is it supposed to do?!
+		tests/integrations/gcp/test_gcp.py
+		# hangs
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		tests/test_client.py::test_databag_depth_stripping
+		tests/test_client.py::test_databag_string_stripping
+		tests/test_client.py::test_databag_breadth_stripping
+		# incompatible version?
+		tests/integrations/falcon/test_falcon.py
+		# test_circular_references: apparently fragile
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+		# test for new feature, fails with IndexError
+		tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index 6e96254c9407..81c73c035016 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,2 +1,3 @@
 DIST testfixtures-6.18.0.tar.gz 121584 BLAKE2B abf90012fe79d148c44d72a8aaa5277c95a33933c7b753eecdcaeb11279b4439ad9ea394270e440d9681c22789a17738d367b66adf3d04cf6e6289713c1ead59 SHA512 e6552e6b1837ae4ee4754ce3675bdbf2a68d8e46b892382bd8320290050f2c296348ef6310ce3ff46962bf1978c351fe2cdb853a73c9f800f68818f81d5caec9
 DIST testfixtures-6.18.1.tar.gz 121731 BLAKE2B c31873d3ebbe47d5d3035d6aaaf674472efb32b061080df711ee558bf91d1b01d417ded4eaebf7436132fd7b9233437e735fa60dee47777d032fc1b610fd1de3 SHA512 088c6480eecc9862e91a0188ab45620be3d8f8898ebb284dc932155fffbd9f75ebbab9425fe4db8dee75ee8fcf82d8c27b950a3f9298e9f7ca420744c65edd91
+DIST testfixtures-6.18.2.tar.gz 122026 BLAKE2B 2b30c03ae71a300883ace52dc80e06c6b6610283687fa8df4ded1678991a47e8186de57060458a2fe98fc8eeb8fae8299081697a6471bdedcca2772405c91c6d SHA512 ee27d9944e8e8ec770199b115a50274f7167e9d3d3d866b0d0bbe7fec8a939b25a469ecac0158aaa486b129e078077c5822e7500ad473f98ba59862424413e15
diff --git a/dev-python/testfixtures/testfixtures-6.18.2.ebuild b/dev-python/testfixtures/testfixtures-6.18.2.ebuild
new file mode 100644
index 000000000000..c2e4ba7a58fd
--- /dev/null
+++ b/dev-python/testfixtures/testfixtures-6.18.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
+HOMEPAGE="https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/sybil[${PYTHON_USEDEP}]
+		>=dev-python/twisted-18[${PYTHON_USEDEP}]
+		dev-python/zope-component[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+PATCHES=(
+	# https://github.com/Simplistix/testfixtures/commit/8fb2122eea0f1d0de1ccca7a3a0f5426bc6d4964
+	"${FILESDIR}/testfixtures-6.18.1-py3.10.patch"
+)
+
+python_prepare_all() {
+	# kill weird way of declaring build deps
+	sed -e '/build=/d' -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTHONPATH="."
+	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
+	epytest -Wignore::DeprecationWarning
+}