gentoo resync : 29.01.2021

3 files changed, 33 insertions, 40 deletions

diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest
index ae230f42c48d..151aa9021a7e 100644
--- a/net-misc/streamlink/Manifest
+++ b/net-misc/streamlink/Manifest
@@ -1,6 +1,7 @@
-DIST streamlink-1.3.0.tar.gz 694190 BLAKE2B cd262290cd81f1954567e217eaf9568c00180ee7f6955c8227b7067488d685385fe8b4b3bcd6004e7e8f7f66236696a48e744cb24c4d00f2111f00633ffeb1bf SHA512 5a114e0b1e617b2a41f8fe00f9bd6846843dd7643b4283d2fe30ea869cc9d6f495458b0ddb97955a87b7ad64e5628343262af5068b8a7a19d0d84a32020b3365
 DIST streamlink-1.3.1.tar.gz 695736 BLAKE2B 377fdfb6a90b2e680697dda57b4237a14b63df1e33af5fcbf8333ebd3bc85f877e0e3c4698ab965d766560234cc0ddb7399c8b43eac1b3bbbc4984bfd2ed2194 SHA512 d6c299c6ea444d5b5956a752be8a5c192ca2aae25087db4045035c53fa078396b1bf89203cd55a82630c33492117323892caa5cf27c9dc9ea4b64602dbfdd87c
-EBUILD streamlink-1.3.0-r2.ebuild 2058 BLAKE2B 59e8674d7cd8626c7720370a626ea3da8f0d85d9629aebc842aff2cbcc929d4e39c0c3b24081bf5f18b43d635381034d3bff82fa049c98f16b90bb7c2af6f0a6 SHA512 a9577b8586ec067701d9cc70598022fce711ec134e9ff4b269f1a7a850ee3f0964e277053b96e0f6716247aa73a05b6eb6db4b1bc8963f83e8668e265e6a6553
+DIST streamlink-2.0.0.tar.gz 497816 BLAKE2B e0d8ebf2ae72bb2dc9c9a22810577a34ae6fe3a81bb75b03f5186c69170b9ed94311c1e018bd2a2a0e9a5fc1d8f8470de431f602bd3c8bb2d215c9c8d87dc867 SHA512 ce8b34670ea991ddd9b86eb4f05233468ad9df7ea743ed047cd2e3de8d0844dcded082df1215273e8a22ac5386dd17f64c80662b80fb8dbfae421b7f18c146d6
+DIST streamlink.1-2.0.0.man.xz 12956 BLAKE2B e4e24f1f04a4edabcc9973005a1097a6ed0cf450bf65624fee9dee13c39312e96d48a91c5558b5b4f2e1122510ea64d497588c42c1c6f2a83f1bb6fd92843419 SHA512 3d857b953a10a4c4ca9906cd03d170a7b76ecf724c3627571b90fa584c729cce54f492438c7e9aae32fc65b5c0561e0d325b0b1f9bcc69a98bc000b81e5492c9
 EBUILD streamlink-1.3.1-r1.ebuild 2060 BLAKE2B d8c5a8929e7996b0ba791ca114409d882dc236f1a5c2346dcddc14566d25534bd790f9d6f3d2227b62442f635908161fd9ade62ee539500555b78ad6098c35b6 SHA512 7dd52874f571b4c22901a9b39faadf534deb019d7c83385a9897c1fa583c848faca60d2e36c5eacb8d25663090bf995d91d81e25ce6474523bd540fda42e3e57
-EBUILD streamlink-9999.ebuild 2060 BLAKE2B d8c5a8929e7996b0ba791ca114409d882dc236f1a5c2346dcddc14566d25534bd790f9d6f3d2227b62442f635908161fd9ade62ee539500555b78ad6098c35b6 SHA512 7dd52874f571b4c22901a9b39faadf534deb019d7c83385a9897c1fa583c848faca60d2e36c5eacb8d25663090bf995d91d81e25ce6474523bd540fda42e3e57
+EBUILD streamlink-2.0.0.ebuild 1858 BLAKE2B e217664cd89d379da81ea55d94729627b454382e7c5a633823dfdfa8f764e2b50d7f43aba14d3f5953c68f4e680f17ca2d1c1f80d83f20726e90874fb287fd34 SHA512 4f6e57657a96bc883ea300b59cdfa876b2be1d8051be304724f6676822a17d05cfafbeb059a4f7b8d05c9fe7ecaa47c18f9f9cbd643b27e10f9b09dff69c4aca
+EBUILD streamlink-9999.ebuild 1858 BLAKE2B e217664cd89d379da81ea55d94729627b454382e7c5a633823dfdfa8f764e2b50d7f43aba14d3f5953c68f4e680f17ca2d1c1f80d83f20726e90874fb287fd34 SHA512 4f6e57657a96bc883ea300b59cdfa876b2be1d8051be304724f6676822a17d05cfafbeb059a4f7b8d05c9fe7ecaa47c18f9f9cbd643b27e10f9b09dff69c4aca
 MISC metadata.xml 330 BLAKE2B ad3caca1dc3dd2ea5915a6d14f9741ba7352d8a961939dacf89efdcae0cf1203343ca11ea230efc30cf69d359e09e7cd06218404943f8e4e3853a5c6676f7ff6 SHA512 73730cc94810711b86088a41beba0d0da4f20c4ca377c24122ebeac1ea68e712d03d0e79518df847aa15cb9d8a3f04658715f0b75dfaa1a6dfbedc0a15c33672
diff --git a/net-misc/streamlink/streamlink-1.3.0-r2.ebuild b/net-misc/streamlink/streamlink-2.0.0.ebuild
index 6f6674f9723b..43cd8b5f34a6 100644
--- a/net-misc/streamlink/streamlink-1.3.0-r2.ebuild
+++ b/net-misc/streamlink/streamlink-2.0.0.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
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999* ]]; then
 	GIT_ECLASS="git-r3"
 fi
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE='xml(+),threads(+)'
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_SETUPTOOLS=rdepend
@@ -20,19 +20,18 @@ 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"
 fi
 
 LICENSE="BSD-2 Apache-2.0"
 SLOT="0"
-IUSE="doc test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
-# >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too
 DEPEND="
 	$(python_gen_cond_dep '
 		>dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}]
 		dev-python/isodate[${PYTHON_MULTI_USEDEP}]
 		dev-python/websocket-client[${PYTHON_MULTI_USEDEP}]
 		dev-python/pycountry[${PYTHON_MULTI_USEDEP}]
@@ -45,36 +44,33 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	$(python_gen_cond_dep '
-		doc? (
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/docutils[${PYTHON_MULTI_USEDEP}]
-			dev-python/recommonmark[${PYTHON_MULTI_USEDEP}]
-		)
 		test? (
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/requests-mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
-			dev-python/freezegun[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/freezegun-1.0.0[${PYTHON_MULTI_USEDEP}]
 		)
 	')"
 
+src_prepare() {
+	distutils-r1_src_prepare
+	if [[ ${PV} != 9999* ]]; then
+		mv ${WORKDIR}/streamlink.1-${PV}.man ${WORKDIR}/streamlink.1 || die
+	fi
+}
+
 python_configure_all() {
 	# Avoid iso-639, iso3166 dependencies since we use pycountry.
 	export STREAMLINK_USE_PYCOUNTRY=1
 }
 
-python_compile_all() {
-	use doc && emake -C docs html man
-}
-
 python_test() {
 	esetup.py test
 }
 
 python_install_all() {
-	if use doc; then
-		local HTML_DOCS=( docs/_build/html/. )
-		doman docs/_build/man/*
-	fi
 	distutils-r1_python_install_all
+	if [[ ${PV} != 9999* ]]; then
+		doman ${WORKDIR}/streamlink.1
+	fi
 }
diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-9999.ebuild
index e1b66ef0065e..43cd8b5f34a6 100644
--- a/net-misc/streamlink/streamlink-9999.ebuild
+++ b/net-misc/streamlink/streamlink-9999.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
@@ -20,19 +20,18 @@ 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"
 fi
 
 LICENSE="BSD-2 Apache-2.0"
 SLOT="0"
-IUSE="doc test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
-# >=urllib3-1.23 only needed for python2, but requests pulls some version anyways, so we might as well guarantee at least that ver for py3 too
 DEPEND="
 	$(python_gen_cond_dep '
 		>dev-python/requests-2.21.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/urllib3-1.23[${PYTHON_MULTI_USEDEP}]
 		dev-python/isodate[${PYTHON_MULTI_USEDEP}]
 		dev-python/websocket-client[${PYTHON_MULTI_USEDEP}]
 		dev-python/pycountry[${PYTHON_MULTI_USEDEP}]
@@ -45,36 +44,33 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="
 	$(python_gen_cond_dep '
-		doc? (
-			dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
-			dev-python/docutils[${PYTHON_MULTI_USEDEP}]
-			dev-python/recommonmark[${PYTHON_MULTI_USEDEP}]
-		)
 		test? (
 			dev-python/mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/requests-mock[${PYTHON_MULTI_USEDEP}]
 			dev-python/pytest[${PYTHON_MULTI_USEDEP}]
-			dev-python/freezegun[${PYTHON_MULTI_USEDEP}]
+			>=dev-python/freezegun-1.0.0[${PYTHON_MULTI_USEDEP}]
 		)
 	')"
 
+src_prepare() {
+	distutils-r1_src_prepare
+	if [[ ${PV} != 9999* ]]; then
+		mv ${WORKDIR}/streamlink.1-${PV}.man ${WORKDIR}/streamlink.1 || die
+	fi
+}
+
 python_configure_all() {
 	# Avoid iso-639, iso3166 dependencies since we use pycountry.
 	export STREAMLINK_USE_PYCOUNTRY=1
 }
 
-python_compile_all() {
-	use doc && emake -C docs html man
-}
-
 python_test() {
 	esetup.py test
 }
 
 python_install_all() {
-	if use doc; then
-		local HTML_DOCS=( docs/_build/html/. )
-		doman docs/_build/man/*
-	fi
 	distutils-r1_python_install_all
+	if [[ ${PV} != 9999* ]]; then
+		doman ${WORKDIR}/streamlink.1
+	fi
 }