commit: 23a6f6ffd9eb75e5768607c4f7a54030f6ebb53b Author: Nikos Chantziaras <realnc <AT> gmail <DOT> com> AuthorDate: Tue May 21 21:23:34 2019 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Jul 7 05:28:14 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a6f6ff
media-video/subliminal: add dev-python/decorator dep, EAPI 7, sort deps Closes: https://bugs.gentoo.org/686514 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Nikos Chantziaras <realnc <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12073 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> ...inal-9999.ebuild => subliminal-2.0.5-r3.ebuild} | 47 ++++++++++++---------- media-video/subliminal/subliminal-9999.ebuild | 25 ++++++------ 2 files changed, 39 insertions(+), 33 deletions(-) diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-2.0.5-r3.ebuild similarity index 79% copy from media-video/subliminal/subliminal-9999.ebuild copy to media-video/subliminal/subliminal-2.0.5-r3.ebuild index 95473f3790c..28b3e4c46bd 100644 --- a/media-video/subliminal/subliminal-9999.ebuild +++ b/media-video/subliminal/subliminal-2.0.5-r3.ebuild @@ -1,58 +1,63 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python{2_7,3_5,3_6} ) PYTHON_REQ_USE='xml(+)' +COMMIT_ID='dd74383d1cba82829ce720f2e439a65d13ffe7ef' -inherit distutils-r1 git-r3 +inherit distutils-r1 DESCRIPTION="Python library to search and download subtitles" HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.org/project/subliminal/"; -EGIT_REPO_URI="https://github.com/Diaoul/${PN}.git"; -EGIT_BRANCH="develop" -SRC_URI="test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip )" +SRC_URI=" + https://github.com/Diaoul/${PN}/archive/${COMMIT_ID}.tar.gz -> ${P}-r2.tar.gz + test? ( mirror://sourceforge/matroska/test_files/matroska_test_w1_1.zip ) +" LICENSE="MIT" SLOT="0" -KEYWORDS="" +KEYWORDS="~amd64 ~x86" IUSE="test" RDEPEND=" - >=dev-python/guessit-2.0.1[${PYTHON_USEDEP}] + >=dev-python/appdirs-1.3[${PYTHON_USEDEP}] >=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}] - >=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}] >=dev-python/beautifulsoup-4.4.0:4[${PYTHON_USEDEP}] - >=dev-python/requests-2.0[${PYTHON_USEDEP}] + >=dev-python/chardet-2.3.0[${PYTHON_USEDEP}] >=dev-python/click-4.0[${PYTHON_USEDEP}] + dev-python/decorator[${PYTHON_USEDEP}] >=dev-python/dogpile-cache-0.6.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}] - >=dev-python/chardet-2.3.0[${PYTHON_USEDEP}] + >=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}] + >=dev-python/guessit-2.0.1[${PYTHON_USEDEP}] >=dev-python/pysrt-1.0.1[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/appdirs-1.3[${PYTHON_USEDEP}] - >=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}] >=dev-python/pytz-2012c[${PYTHON_USEDEP}] + >=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}] + >=dev-python/requests-2.0[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}] virtual/python-futures[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} test? ( app-arch/unzip - >=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) dev-python/pytest-cov[${PYTHON_USEDEP}] dev-python/pytest-runner[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] dev-python/sympy[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) + >=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}] ) " -src_unpack() { - default_src_unpack - git-r3_src_unpack -} +# Tests don't work in 2.0.5. Recheck in later versions. See Gentoo bug 630114. +RESTRICT=test + +PATCHES=( "${FILESDIR}/${P}-add-missing-comma.patch" ) + +S="${WORKDIR}/${PN}-${COMMIT_ID}" python_prepare_all() { # Disable code checkers as they require unavailable dependencies. diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild index 95473f3790c..7c83f3864f0 100644 --- a/media-video/subliminal/subliminal-9999.ebuild +++ b/media-video/subliminal/subliminal-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 PYTHON_COMPAT=( python{2_7,3_5,3_6} ) PYTHON_REQ_USE='xml(+)' @@ -20,32 +20,33 @@ KEYWORDS="" IUSE="test" RDEPEND=" - >=dev-python/guessit-2.0.1[${PYTHON_USEDEP}] + >=dev-python/appdirs-1.3[${PYTHON_USEDEP}] >=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}] - >=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}] >=dev-python/beautifulsoup-4.4.0:4[${PYTHON_USEDEP}] - >=dev-python/requests-2.0[${PYTHON_USEDEP}] + >=dev-python/chardet-2.3.0[${PYTHON_USEDEP}] >=dev-python/click-4.0[${PYTHON_USEDEP}] + dev-python/decorator[${PYTHON_USEDEP}] >=dev-python/dogpile-cache-0.6.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}] - >=dev-python/chardet-2.3.0[${PYTHON_USEDEP}] + >=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}] + >=dev-python/guessit-2.0.1[${PYTHON_USEDEP}] >=dev-python/pysrt-1.0.1[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/appdirs-1.3[${PYTHON_USEDEP}] - >=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}] >=dev-python/pytz-2012c[${PYTHON_USEDEP}] + >=dev-python/rarfile-2.7[compressed,${PYTHON_USEDEP}] + >=dev-python/requests-2.0[${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}] virtual/python-futures[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} test? ( app-arch/unzip - >=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) dev-python/pytest-cov[${PYTHON_USEDEP}] dev-python/pytest-runner[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] dev-python/sympy[${PYTHON_USEDEP}] - $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) + >=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}] ) "
