From b3ccc9e84e4a015e91285aac780bd93d11117417 Mon Sep 17 00:00:00 2001
From: "Anna (cybertailor) Vyalkova" <cyber+gentoo@sysrq.in>
Date: Mon, 6 Dec 2021 17:55:45 +0500
Subject: [PATCH] dev-python/w3lib: fix deps

Closes: https://bugs.gentoo.org/825438
Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo@sysrq.in>
---
 dev-python/w3lib/metadata.xml        |  2 +-
 dev-python/w3lib/w3lib-1.22.0.ebuild | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/dev-python/w3lib/metadata.xml b/dev-python/w3lib/metadata.xml
index 65ac1f2056..10a288b0bd 100644
--- a/dev-python/w3lib/metadata.xml
+++ b/dev-python/w3lib/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>gentoo@aisha.cc</email>
diff --git a/dev-python/w3lib/w3lib-1.22.0.ebuild b/dev-python/w3lib/w3lib-1.22.0.ebuild
index a525694be5..1693f33521 100644
--- a/dev-python/w3lib/w3lib-1.22.0.ebuild
+++ b/dev-python/w3lib/w3lib-1.22.0.ebuild
@@ -1,25 +1,24 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_9 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Library of web-related functions"
 HOMEPAGE="https://scrapy.org/"
-SRC_URI="https://github.com/scrapy/w3lib/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/scrapy/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT=0
 KEYWORDS="~amd64"
 
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
-python_test(){
+EPYTEST_DESELECT=(
 	# https://github.com/scrapy/w3lib/issues/164
-	py.test -k "not test_add_or_replace_parameter" || die
-}
+	tests/test_url.py::UrlTests::test_add_or_replace_parameter
+)