From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6E2BD138252 for ; Thu, 12 May 2016 11:40:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51FB621C060; Thu, 12 May 2016 11:40:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3445E0814 for ; Thu, 12 May 2016 11:40:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8299B34099A for ; Thu, 12 May 2016 11:40:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EFE4E983 for ; Thu, 12 May 2016 11:40:08 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1463053176.6a6e2bbae35f407f183bfec277dc8f51013b6f8b.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/subliminal/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/subliminal/subliminal-9999.ebuild X-VCS-Directories: media-video/subliminal/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 6a6e2bbae35f407f183bfec277dc8f51013b6f8b X-VCS-Branch: master Date: Thu, 12 May 2016 11:40:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5b130d0f-afc4-4c08-a0f4-5a701ea969ea X-Archives-Hash: a9c81c0d2773111fdf8d5cc40bcd39a1 commit: 6a6e2bbae35f407f183bfec277dc8f51013b6f8b Author: Ilya Tumaykin gmail com> AuthorDate: Wed May 11 08:37:04 2016 +0000 Commit: Ian Delaney gentoo org> CommitDate: Thu May 12 11:39:36 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a6e2bba media-video/subliminal: update 9999 ebuild Sync 9999 ebuild with 2.0_rc1. Switch to develop branch. Update deps. Closes: https://github.com/gentoo/gentoo/pull/1451 Package-Manager: portage-2.2.28 Signed-off-by: Ian Delaney gentoo.org> media-video/subliminal/subliminal-9999.ebuild | 56 +++++++++++++++++---------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/media-video/subliminal/subliminal-9999.ebuild b/media-video/subliminal/subliminal-9999.ebuild index 1ca71de..6071291 100644 --- a/media-video/subliminal/subliminal-9999.ebuild +++ b/media-video/subliminal/subliminal-9999.ebuild @@ -2,50 +2,64 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +EAPI=6 -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/Diaoul/subliminal.git" - inherit git-r3 -else - SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi +PYTHON_COMPAT=( python{2_7,3_4} ) -inherit distutils-r1 +inherit distutils-r1 git-r3 DESCRIPTION="Python library to search and download subtitles" -HOMEPAGE="http://subliminal.readthedocs.org https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal" +HOMEPAGE="https://github.com/Diaoul/subliminal https://pypi.python.org/pypi/subliminal" +EGIT_REPO_URI="git://github.com/Diaoul/${PN}.git" +EGIT_BRANCH="develop" LICENSE="MIT" SLOT="0" +KEYWORDS="" IUSE="test" RDEPEND=" + >=dev-python/guessit-2.0.1[${PYTHON_USEDEP}] >=dev-python/babelfish-0.5.2[${PYTHON_USEDEP}] + >=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}] >=dev-python/beautifulsoup-4.2.0:4[${PYTHON_USEDEP}] - >=dev-python/chardet-2.3.0[${PYTHON_USEDEP}] + >=dev-python/requests-2.0.1[${PYTHON_USEDEP}] >=dev-python/click-4.0[${PYTHON_USEDEP}] >=dev-python/dogpile-cache-0.5.4[${PYTHON_USEDEP}] - >=dev-python/enzyme-0.4.1[${PYTHON_USEDEP}] - >=dev-python/guessit-0.9.1[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}] + >=dev-python/chardet-2.3.0[${PYTHON_USEDEP}] >=dev-python/pysrt-1.0.1[${PYTHON_USEDEP}] - >=dev-python/requests-2.0.1[${PYTHON_USEDEP}] >=dev-python/six-1.9.0[${PYTHON_USEDEP}] - >=dev-python/stevedore-1.0.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/setuptools[${PYTHON_USEDEP}] + virtual/python-futures[${PYTHON_USEDEP}] " DEPEND="${RDEPEND} test? ( - dev-python/pytest[${PYTHON_USEDEP}] + >=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}] dev-python/pytest-cov[${PYTHON_USEDEP}] + dev-python/pytest-runner[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] dev-python/sympy[${PYTHON_USEDEP}] - >=dev-python/vcrpy-1.6.1[${PYTHON_USEDEP}] + $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) ) - dev-python/setuptools[${PYTHON_USEDEP}] " -# tests need network -RESTRICT="test" + +# Tests require network and severely broken too. +RESTRICT=test + +python_prepare_all() { + # Disable code checkers as they require unavailable dependencies. + sed -i -e 's/--\(pep8\|flakes\)//g' pytest.ini || die + sed -i -e "s/'pytest-\(pep8\|flakes\)',//g" setup.py || die + + # Disable unconditional dependency on dev-python/pytest-runner. + sed -i -e "s|'pytest-runner'||g" setup.py || die + + distutils-r1_python_prepare_all +} python_test() { esetup.py test