Updating liguros repo

17 files changed, 135 insertions, 207 deletions

diff --git a/dev-python/glooey/Manifest b/dev-python/glooey/Manifest
index f4987002ca4d..f3f7011325e8 100644
--- a/dev-python/glooey/Manifest
+++ b/dev-python/glooey/Manifest
@@ -1 +1 @@
-DIST glooey-0.3.1.tar.gz 19110562 BLAKE2B 252621789def523e3f8535ff6d72d3b5e71664cc5a0b2b4440b64be8170c08f275709c1771d2ab154349da643a521dae352e711b7f0a705f0e6eaeb1bd842932 SHA512 c804125bc9ccd9f2b44cc5fcf5a0c7353402aa8587641fc75870bf0c2474c449936dd41ddc641050009f32dbaef4e05fecd4c60c477c0c89512a02028f957c65
+DIST glooey-0.3.4.tar.gz 19113011 BLAKE2B 45be6355ad51fd9a77003a39f8532f4a86bb3ba758d8fb56d483399ae2d876ff5f072e6f0c6a64ce71b493b650f5e09b553b3d97d8b73c6e2dbdfb789d427f47 SHA512 12222b336f0d1f720b6eb5b2a24eeba8bfa3d39c0775ffc8b9687a6720d8282f263da55cae653ccc1f610db0708a6c75671ca98969accaf0d02320815244ecbf
diff --git a/dev-python/glooey/glooey-0.3.1.ebuild b/dev-python/glooey/glooey-0.3.4.ebuild
index d320beae0430..6d76527f5093 100644
--- a/dev-python/glooey/glooey-0.3.1.ebuild
+++ b/dev-python/glooey/glooey-0.3.4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
 PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
 inherit distutils-r1 virtualx
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 3c36015e19f7..c860699edff2 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -2,3 +2,4 @@ DIST pillow-6.2.2.tar.gz 37538464 BLAKE2B dfd9b81490a8adb4e12ecbf6764e4e27573c9a
 DIST pillow-7.0.0.tar.gz 37880130 BLAKE2B be940cbdced884c33f2b3979be113b1bc8974814c9532fe80203395184f90eccba1cd9a5017fec1f0c30a21ff06abc46560d5c6d67938dbf640f2e8e08b7e554 SHA512 187173a525d4f3f01b4898633263b53a311f337aa7b159c64f79ba8c7006fd44798a058e7cc5d8f1116bad008e4142ff303456692329fe73b0e115ef5c225d73
 DIST pillow-7.2.0.tar.gz 39125407 BLAKE2B f49015922c34473590740c9fa63435f85f9a517b3295abd2e758941b95162cef0fb1fa2a0e6ee0ac86323709ee3af02888f6e029a1905f13698e82c1f38d5d94 SHA512 ac9c7c8f445b3f67f51bea13fad118d1612c45272c26d33bec286f3c2e198912b934378c4bf986b409aaa2a83d92ff176ee4d25f28701d61746c9cb86d0f412b
 DIST pillow-8.0.0.tar.gz 44614151 BLAKE2B c0b4444a1850fe59f11dcec1face78c34f098752d9f1d11e00851b14331056a45d44dc40bcad51558c0a533476ba05c815170eb5cb807a142c473daf1358fd76 SHA512 4f126e39a8c4ff7cb83ed263e04e5921fe55d5167fca98b59ffecb95f994b2487b9b7ca83151c017d915f9d3cc05b71da44de7b9cfa418f1c70574234c1b9c83
+DIST pillow-8.0.1.tar.gz 44614653 BLAKE2B 0f8ec178e92a57a55d575fac61779d39e79ff18032a02ad93aa6eca1211436342944b1a5bbd29979b52f0e2df756936ade4bf637ac3c153b5dda5838b58087ac SHA512 41b4ea786990c834f77ad06b64f465bc8f3a65911cf14bb05f452316fdf504e5e49b2bb50a9346f207187e79f83c5b6d310d703d1588f678b606584b1f27ce6a
diff --git a/dev-python/pillow/pillow-8.0.1.ebuild b/dev-python/pillow/pillow-8.0.1.ebuild
new file mode 100644
index 000000000000..c0cb5d37076b
--- /dev/null
+++ b/dev-python/pillow/pillow-8.0.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg tiff )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:0= )"
+RDEPEND="${DEPEND}
+	dev-python/olefile[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[png]
+	)
+"
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	mydistutilsargs=(
+		build_ext
+		--disable-platform-guessing
+		$(use_enable truetype freetype)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jpeg2000)
+		$(use_enable lcms)
+		$(use_enable tiff)
+		$(use_enable imagequant)
+		$(use_enable webp)
+		$(use_enable webp webpmux)
+		$(use_enable xcb)
+		$(use_enable zlib)
+	)
+
+	# setup.py sucks at adding the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but this setup.py does stupid things.
+	export \
+		INCLUDE=${ESYSROOT}/usr/include \
+		LIB=${ESYSROOT}/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
index 77a686674cb2..9d5f70307bdd 100644
--- a/dev-python/pycountry/Manifest
+++ b/dev-python/pycountry/Manifest
@@ -1,2 +1 @@
-DIST pycountry-19.8.18.tar.gz 10003160 BLAKE2B ac7894e9fc1ed4e8f386cc6e07c1fc2abefee63c39c7c851c100519418606b52bc18be8da672930ceefdc7ca7b51571e4b3884ea0c20e547e5b596e249ebf407 SHA512 39ba06629eeea55460424d06992ca5f1e5bf6168b219dc4880ec326f6aa0c92a4fdc54d4143a8b8bb1490149af793e760e291c6d704104a57ba91e88228ab669
 DIST pycountry-20.7.3.tar.gz 10137217 BLAKE2B 2b32d450a1d16eab95e0c1ab6cae3bf89c07742d48cf6f8473854119ac0483b5490523e03e823c9b314231983f39d1c8bf595aac201756fee9897a8d15a84c08 SHA512 df88a34307a4275267a7f3af282b73ca5e762c49ad158bfcd39b97c5d852bf045bcfe72351fc6f232c55003a7c4b0a04801eb562ba65ed5d599bd45b2bd3bc58
diff --git a/dev-python/pycountry/pycountry-19.8.18.ebuild b/dev-python/pycountry/pycountry-19.8.18.ebuild
deleted file mode 100644
index 15a41724f75f..000000000000
--- a/dev-python/pycountry/pycountry-19.8.18.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
-HOMEPAGE="https://github.com/flyingcircusio/pycountry"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ia64 ppc ~sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	# https://bitbucket.org/techtonik/pycountry/issue/8/test_locales-pycountry-015-pypy
-	pushd "${BUILD_DIR}"/lib > /dev/null || die
-	if [[ ${EPYTHON} == pypy* ]]; then
-		sed -e 's:test_locales:_&:' -i pycountry/tests/test_general.py || die
-	fi
-	pytest -o cache_dir="${T}" -vv || die
-	popd > /dev/null || die
-}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 47d73ee39823..336a274d3d2e 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,2 +1 @@
-DIST Pygments-2.7.0.tar.gz 2358072 BLAKE2B a9c4753f62589a676300d366804aecc9349de2367b609919518f11be3ea40c3fb264d68c5da515cf80aaa42fb4e4dd9dd362d58945148a21c81a214c7e6c6b58 SHA512 b70714dd33cac725e0b32678971ab5902895c7d2fd8c9548f69110af32c82ba46a2d366dbbc9c4017e91c39120abe3e5d28e69893e8d92058f0bcbf579909db5
 DIST Pygments-2.7.1.tar.gz 2323072 BLAKE2B ee55bb47369caca78d180659c2f62af18c1b1c6bfd803148ed88254f33c7261bf8acd29d193be2ac9c04d022a1c0c14c0fe9ff3cfcf8a5dc1d4dec90d3f1ee43 SHA512 95d1109cd53092fafa2f1d5c21a135c426700fc92e39bb22a27f47e63d10bdcb9e52593cd282339a3b501430ededbccea4f8d5970ba1171204579b964a6771c8
diff --git a/dev-python/pygments/pygments-2.7.0.ebuild b/dev-python/pygments/pygments-2.7.0.ebuild
deleted file mode 100644
index 63a3e7c4d7f6..000000000000
--- a/dev-python/pygments/pygments-2.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1 bash-completion-r1
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="https://pygments.org/ https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		virtual/ttf-fonts
-	)"
-
-distutils_enable_sphinx doc
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-	pytest -vv "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 7032f310f5b5..5365acb67ad3 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,2 +1 @@
-DIST pyproject2setuppy-7.tar.gz 9274 BLAKE2B 5394543aeb7b615cfef5548b530d136887d81bff8c40dc343529d3e316e2f8851b82747d59dc9bceafdd7f2017695f523c75a8b376e033936708f76c64ebdd7d SHA512 22224a63acb0af5558b63e90aa2e96243c1ffc2ef9c114b2e20b8dbc5b84abc468879822d8d20f8dd2f7fdc2ce4a508b5f84e661831cf9e99e383d89fe2b63fa
 DIST pyproject2setuppy-8.tar.gz 9501 BLAKE2B d0c168efa2742732710a7d967ce0783a942d4718ae2be75e6263bb560500527ee11260c9b7362d10cb059171475dc647c0bc97e284554f2e159f470e3eb7f569 SHA512 527e2de790fb02373150db834d1a007a63b71f87ae01fef1dd9fc86a51ac6cafeac28fa3f39a2d484e7a9f84549d0ba285894cf9201f3b2b2a47965be29913cc
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
deleted file mode 100644
index c41bcc54a3c4..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
-HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
-SRC_URI="
-	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index f9cd0ce843b2..dfde944d9b0e 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,2 +1,3 @@
 DIST pytest-django-3.10.0.gh.tar.gz 68995 BLAKE2B dcc9ddceda88c32dab559c065feb347582e72ec5fcd9929cb2bde091bd5c89bbe09879901daf5dc0adc7e38921de5b4989e0d1bbefaa5eb1cdce1dfd2ef58a11 SHA512 7f66fa9287fb80082018613ec3b15a0da3f7a13075e85f0a2eff9e13358c993e56245c441d952d13f232bf7e49a05c799b4affbb844e90abaac736d86bb0a6c9
 DIST pytest-django-4.0.0.gh.tar.gz 67041 BLAKE2B 74971186666498a39afca4ad273b932579ce425df439805b6f1e36eadfa916dfaa4affc29ce2987ac62d38ae517140cedbeb9a20c6e13e2362af21878f4694a5 SHA512 411a28b6e2f4cef8a0bae1ce3a937e47fa11728a873ec6a8de6599d02e5a548548ecf56d896600924acfbc0a74c651c66f9d7c4d772ce572879c17bccd3bb27d
+DIST pytest-django-4.1.0.gh.tar.gz 67983 BLAKE2B b7f4fe1366ce1443b19f05e8e834f0555cd8d63bf10921be1427338b7e5e737b7e04d96c9c9d2ad1b9c0f0ed6fba4ed93fb4fd9a948dc5315b4b7a35ba8adfd1 SHA512 734921f5c6f8569f6488706fbb6ca2515a5b24c6641fd260771022bd4fd72b65d062a8130f59163e8b30f4c9bceb383d154b26f8fbf46a1903339668d0a7d12b
diff --git a/dev-python/pytest-django/pytest-django-4.1.0.ebuild b/dev-python/pytest-django/pytest-django-4.1.0.ebuild
new file mode 100644
index 000000000000..dbfdf71f70cf
--- /dev/null
+++ b/dev-python/pytest-django/pytest-django-4.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django plugin for py.test"
+HOMEPAGE="
+	https://pypi.org/project/pytest-django/
+	https://pytest-django.readthedocs.org
+	https://github.com/pytest-dev/pytest-django"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/pytest-5.4[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
+"
+
+# not all test dependencies are packaged and this package isn't worth it.
+RESTRICT="test"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index fe2755affbde..52a75dd52a23 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,2 +1 @@
-DIST pytest-timeout-1.3.4.tar.gz 12255 BLAKE2B c8991e0255a490048f43e1163d0315cb8fabfaf9d96deb476e2d59da7efce8c63da09b1e8e6f9d6f3fe82b3c6f67608b5e5db117e6378a041ca6e5ba9c71fc05 SHA512 29af25f3c3776d9ef63c6b7217ffc6b0cedd873b8cc96be742a642da84d12c8988bb9b409e00850246e554b21908d6fd2207692650b154cf6831f38c4395bc80
 DIST pytest-timeout-1.4.2.tar.gz 15424 BLAKE2B b7ab91833e59af56ae50c066c14bb9b8ae9995d1586f35b29f107665d7da124828d7accc1b0149702f2973c61f18024739c68de736ae8aae6f55e8a10bf5d4ff SHA512 3446ecdb5aaad5fbca12df4e7f4f40c6c1a12895d3ed9f3a3ee24800ce36deed3cb8c09a4cc72220c962b06f821cfd55bf7eebbca23664c56abf2d0e5bc8fbea
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.3.4-r1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.3.4-r1.ebuild
deleted file mode 100644
index fb916622570e..000000000000
--- a/dev-python/pytest-timeout/pytest-timeout-1.3.4-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="py.test plugin to abort hanging tests"
-HOMEPAGE="https://pypi.org/project/pytest-timeout/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pytest[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pexpect[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	distutils_install_for_testing
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/tempita/tempita-0.5.3-r2.ebuild b/dev-python/tempita/tempita-0.5.3-r2.ebuild
deleted file mode 100644
index 909d28202777..000000000000
--- a/dev-python/tempita/tempita-0.5.3-r2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-MY_COMMIT="97392d008cc8"
-
-DESCRIPTION="A very small text templating language"
-HOMEPAGE="https://pypi.org/project/Tempita/"
-# Tests are not published on PyPI
-SRC_URI="https://bitbucket.org/ianb/${PN}/get/${MY_COMMIT}.tar.gz -> ${P}-bitbucket.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}/${P}-pypy-tests.patch" )
-
-S="${WORKDIR}/ianb-${PN}-${MY_COMMIT}"
-
-python_prepare_all() {
-	# Remove reference to a non-existent CSS file
-	# in order to make sphinx use its default theme.
-	sed -i '/^html_style =/d' docs/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build docs docs/_build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
-
-python_test() {
-	# We need to append to sys.path, otherwise pytest imports
-	# the module from ${S} (before it was 2to3'd)
-	pytest --import-mode=append -vv tests/test_template.txt docs/index.txt \
-		|| die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index 878772134369..2145ac8b7c3d 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,2 +1 @@
-DIST voluptuous-0.11.7.tar.gz 45262 BLAKE2B 2c4c171ed281bdf799491b0e14f64ff2f4ff73143b1b5498eed0d2d4a148ff0e40392393923f25bbb066a872a81ac753d861640abc8b3d340c4c01ff5e139140 SHA512 bf0ad4684a4da59b3eccb54f6edfa643eb894076fc50d1bfd4c953de15cfd711a70e8aee685497197eaef24897ae55fb5fb2aec5e2fc9dcf344a6f7c6f569b88
 DIST voluptuous-0.12.0.tar.gz 46958 BLAKE2B ec41ea9d5775bdc443153b913bcef7e73f14e29d47c6997e5597958b59c2b1143c83b65ca08d2a06aba3725f76f9168be4f46f68d91d87ceb4e4e3b6643e6800 SHA512 7c72d965f2a2eeb2ad099a19b41e2249b9921e51985ff975ed62fe5a6d5b3f2d5c2a7d6fc2cbe3c80abbea17cfc46c39f1953db5daecc0faafb348c838f80417
diff --git a/dev-python/voluptuous/voluptuous-0.11.7.ebuild b/dev-python/voluptuous/voluptuous-0.11.7.ebuild
deleted file mode 100644
index d298c80e3d41..000000000000
--- a/dev-python/voluptuous/voluptuous-0.11.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python data validation library."
-HOMEPAGE="https://github.com/alecthomas/voluptuous"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch )
-
-distutils_enable_tests nose