gentoo resync : 29.12.2022

3 files changed, 74 insertions, 30 deletions

diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index 82b9d88817ef..c9a55b3b32f5 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,7 +1,9 @@
 DIST streamlink-1.3.1.tar.gz 695736 BLAKE2B 377fdfb6a90b2e680697dda57b4237a14b63df1e33af5fcbf8333ebd3bc85f877e0e3c4698ab965d766560234cc0ddb7399c8b43eac1b3bbbc4984bfd2ed2194 SHA512 d6c299c6ea444d5b5956a752be8a5c192ca2aae25087db4045035c53fa078396b1bf89203cd55a82630c33492117323892caa5cf27c9dc9ea4b64602dbfdd87c
 DIST streamlink-2.0.0.tar.gz 497816 BLAKE2B e0d8ebf2ae72bb2dc9c9a22810577a34ae6fe3a81bb75b03f5186c69170b9ed94311c1e018bd2a2a0e9a5fc1d8f8470de431f602bd3c8bb2d215c9c8d87dc867 SHA512 ce8b34670ea991ddd9b86eb4f05233468ad9df7ea743ed047cd2e3de8d0844dcded082df1215273e8a22ac5386dd17f64c80662b80fb8dbfae421b7f18c146d6
+DIST streamlink-4.1.0.tar.gz 447665 BLAKE2B 18577544c64266bbd013ad90f80b452d0ec8800ba6650acdf30da00997498d3b642873069f64f1445ddfcfdc91d4bd4b64a7f35895ac2685fb01735e7d4f4539 SHA512 f163766bffe079c10cb9f33792ca1e8fa806f46fac64716bada5221f97b6b7b6786f1a218a9ba0ba6ae4eb1b9e5bfc8bf2de1a6b2e5bf9d4c9ba8b11a6a99b9e
 DIST streamlink.1-2.0.0.man.xz 12956 BLAKE2B e4e24f1f04a4edabcc9973005a1097a6ed0cf450bf65624fee9dee13c39312e96d48a91c5558b5b4f2e1122510ea64d497588c42c1c6f2a83f1bb6fd92843419 SHA512 3d857b953a10a4c4ca9906cd03d170a7b76ecf724c3627571b90fa584c729cce54f492438c7e9aae32fc65b5c0561e0d325b0b1f9bcc69a98bc000b81e5492c9
 EBUILD streamlink-1.3.1-r1.ebuild 1978 BLAKE2B c2c51ddcc295b0be2d9cc75ac252f991e6d087666c3ebb3562f40fe66798d84edca9f47e38612b972690b112ec229023d2d81adac2a4c375444caf0c4e8d3497 SHA512 ed905fff46702949b7de43622dc69b72a660e97b42f818b479a3bb99f95d73ffc9b3e64fb10a39f681f894369c82da6100ca938dc283223c9d8aab9e28194e9e
 EBUILD streamlink-2.0.0.ebuild 1777 BLAKE2B 5d9852c4598fa9fa7cf73de4c3f3e9d970921470bf569754d6cd924782657e6f8ad728a7897f488f58422b88fb2e52f5385c43b2999413d5f92a5752ce59a875 SHA512 0b7c35ed612b85597a9d5adf474f50ffeb78162e5fafaedb11d8cde5a99cb562fa24f8bb1918d78250336b5435ed7b1b7519b639b689d4df29802f9d507f180d
-EBUILD streamlink-9999.ebuild 1777 BLAKE2B 5d9852c4598fa9fa7cf73de4c3f3e9d970921470bf569754d6cd924782657e6f8ad728a7897f488f58422b88fb2e52f5385c43b2999413d5f92a5752ce59a875 SHA512 0b7c35ed612b85597a9d5adf474f50ffeb78162e5fafaedb11d8cde5a99cb562fa24f8bb1918d78250336b5435ed7b1b7519b639b689d4df29802f9d507f180d
+EBUILD streamlink-4.1.0-r2.ebuild 1513 BLAKE2B 0198953b62784af54a7ed90dd0df1f49abca56d5a014916ec6d477c14cb37fc13e9b1d6fd5d8d1a848284626e53b598c34ccc837601449ba39b61cbc636fe4b7 SHA512 0731859b980472685e657adee6f8a581f733fe78a0fb37638233e26ec95bc84be6e6bcbb1c0c274063d4464c58a4ae6d206370501c1f541bcdaf48d1bbeeae68
+EBUILD streamlink-9999.ebuild 1508 BLAKE2B c5b55bdd15e64d53dd3879e497df337cfa6df0e296df045bf5a9004e0d1a4e7221a0ee888694fc00e13eb02aef443a8ae8288b69a6299a3147c9a37b070309f9 SHA512 1a489584690862d1177e0ac0b4aa792ae10db12e39781f0f26bd8b5966cdbf766fa80126dd2d5f5ab214c9fb42812e6ae402638575d00b24a40e2657d726ce68
 MISC metadata.xml 331 BLAKE2B 7872b2d59cd70d3f8fe1cad4d41d66a0e0fb5cac22412b7239273d0ab7fe028da8992b8d1113cb3bcb8d04a4486ff60155935bfd4dcb17b412ed4e2ea0db42a2 SHA512 4606169ce928cad0bddfde73fe826ba58c901756e8c23e46b998d1fcf317cad922f0816bb459188a2267fe242239fc330805a493a5a28ab43c58d61d97429a3c
diff --git a/net-misc/streamlink/streamlink-4.1.0-r2.ebuild b/net-misc/streamlink/streamlink-4.1.0-r2.ebuild
new file mode 100644
index 000000000000..31e03af2cb69
--- /dev/null
+++ b/net-misc/streamlink/streamlink-4.1.0-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
+	inherit git-r3
+fi
+
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+inherit distutils-r1
+
+DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
+HOMEPAGE="https://streamlink.github.io/"
+
+if [[ ${PV} != 9999* ]]; then
+	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD-2 Apache-2.0"
+SLOT="0"
+
+DEPEND="
+	$(python_gen_cond_dep '
+		>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
+		dev-python/isodate[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
+		dev-python/websocket-client[${PYTHON_USEDEP}]
+		dev-python/pycountry[${PYTHON_USEDEP}]
+		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-1.1.1[${PYTHON_USEDEP}]
+	')
+"
+RDEPEND="${DEPEND}
+	media-video/ffmpeg
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/versioningit[${PYTHON_USEDEP}]
+		test? (
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/requests-mock[${PYTHON_USEDEP}]
+			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
+		)
+	')"
+
+distutils_enable_tests pytest
+
+python_configure_all() {
+	# Avoid iso-639, iso3166 dependencies since we use pycountry.
+	export STREAMLINK_USE_PYCOUNTRY=1
+}
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index 92c0803d4cf5..1f654f0ef9f0 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.ebuild
@@ -1,74 +1,58 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/streamlink/${PN}.git"
-	GIT_ECLASS="git-r3"
+	inherit git-r3
 fi
 
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE='xml(+),threads(+)'
 DISTUTILS_SINGLE_IMPL=1
-inherit distutils-r1 ${GIT_ECLASS}
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE='xml(+),threads(+)'
+inherit distutils-r1
 
 DESCRIPTION="CLI for extracting streams from websites to a video player of your choice"
 HOMEPAGE="https://streamlink.github.io/"
 
 if [[ ${PV} != 9999* ]]; then
 	SRC_URI="https://github.com/streamlink/${PN}/releases/download/${PV}/${P}.tar.gz"
-	SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/streamlink.1-${PV}.man.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64"
 fi
 
 LICENSE="BSD-2 Apache-2.0"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 DEPEND="
 	$(python_gen_cond_dep '
 		>dev-python/requests-2.21.0[${PYTHON_USEDEP}]
 		dev-python/isodate[${PYTHON_USEDEP}]
+		>=dev-python/lxml-4.6.4[${PYTHON_USEDEP}]
 		dev-python/websocket-client[${PYTHON_USEDEP}]
 		dev-python/pycountry[${PYTHON_USEDEP}]
 		>=dev-python/pycryptodome-3.4.3[${PYTHON_USEDEP}]
+		>dev-python/PySocks-1.5.7[${PYTHON_USEDEP}]
+		>=dev-python/versioningit-1.1.1[${PYTHON_USEDEP}]
 	')
 "
 RDEPEND="${DEPEND}
-	media-video/rtmpdump
 	media-video/ffmpeg
 "
 BDEPEND="
 	$(python_gen_cond_dep '
+		dev-python/versioningit[${PYTHON_USEDEP}]
 		test? (
 			dev-python/mock[${PYTHON_USEDEP}]
 			dev-python/requests-mock[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
 			>=dev-python/freezegun-1.0.0[${PYTHON_USEDEP}]
 		)
 	')"
 
-src_prepare() {
-	distutils-r1_src_prepare
-	if [[ ${PV} != 9999* ]]; then
-		mv "${WORKDIR}"/streamlink.1-${PV}.man "${WORKDIR}"/streamlink.1 || die
-	fi
-}
+distutils_enable_tests pytest
 
 python_configure_all() {
 	# Avoid iso-639, iso3166 dependencies since we use pycountry.
 	export STREAMLINK_USE_PYCOUNTRY=1
 }
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if [[ ${PV} != 9999* ]]; then
-		doman "${WORKDIR}"/streamlink.1
-	fi
-}