commit: 87a0c6ec70d56ea2c61838fb70e2d75bb94a695e Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Sat Jan 23 19:02:08 2021 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Sat Jan 23 19:20:59 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87a0c6ec
net-misc/streamlink: bump to 2.0.0 Closes: https://bugs.gentoo.org/761508 Closes: https://bugs.gentoo.org/758422 Closes: https://bugs.gentoo.org/750422 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> net-misc/streamlink/Manifest | 2 ++ ...eamlink-9999.ebuild => streamlink-2.0.0.ebuild} | 32 ++++++++++------------ net-misc/streamlink/streamlink-9999.ebuild | 32 ++++++++++------------ 3 files changed, 30 insertions(+), 36 deletions(-) diff --git a/net-misc/streamlink/Manifest b/net-misc/streamlink/Manifest index 048963da2cb..0335efdca28 100644 --- a/net-misc/streamlink/Manifest +++ b/net-misc/streamlink/Manifest @@ -1 +1,3 @@ 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.1-2.0.0.man.xz 12956 BLAKE2B e4e24f1f04a4edabcc9973005a1097a6ed0cf450bf65624fee9dee13c39312e96d48a91c5558b5b4f2e1122510ea64d497588c42c1c6f2a83f1bb6fd92843419 SHA512 3d857b953a10a4c4ca9906cd03d170a7b76ecf724c3627571b90fa584c729cce54f492438c7e9aae32fc65b5c0561e0d325b0b1f9bcc69a98bc000b81e5492c9 diff --git a/net-misc/streamlink/streamlink-9999.ebuild b/net-misc/streamlink/streamlink-2.0.0.ebuild similarity index 71% copy from net-misc/streamlink/streamlink-9999.ebuild copy to net-misc/streamlink/streamlink-2.0.0.ebuild index e1b66ef0065..43cd8b5f34a 100644 --- a/net-misc/streamlink/streamlink-9999.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 @@ -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 e1b66ef0065..43cd8b5f34a 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 }
