[gentoo-commits] repo/gentoo:master commit in: media-video/subliminal/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/subliminal/
Date: Sun,  7 Jul 2019 05:30:52 +0000 (UTC)	[thread overview]
Message-ID: <1562477294.23a6f6ffd9eb75e5768607c4f7a54030f6ebb53b.mgorny@gentoo> (raw)

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}]
 	)
 "

next             reply	other threads:[~2019-07-07  5:30 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-07  5:30 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-08-29  6:34 [gentoo-commits] repo/gentoo:master commit in: media-video/subliminal/ Jakov Smolić
2024-07-16 19:18 Arthur Zamarin
2024-07-15  4:22 Sam James
2024-07-15  1:39 Sam James
2024-06-02  4:09 Sam James
2023-11-25  5:28 Sam James
2023-04-22 16:41 Sam James
2022-01-04 20:45 Sam James
2020-10-27 19:58 Sam James
2020-10-27  5:10 Sam James
2020-08-31 14:15 Sam James
2020-08-31 13:49 Sam James
2020-08-02 19:05 Sam James
2020-08-02  6:46 Michał Górny
2020-07-08 20:50 Sam James
2020-07-08 20:50 Sam James
2020-06-20  0:26 Aaron Bauman
2020-06-20  0:26 Aaron Bauman
2020-06-01  8:41 Joonas Niilola
2020-06-01  8:41 Joonas Niilola
2020-03-25  9:39 Michał Górny
2020-03-19 21:56 David Seifert
2020-03-17  8:08 Michał Górny
2020-03-16 18:55 Michał Górny
2020-01-13  9:48 Michał Górny
2019-07-07  5:30 Michał Górny
2018-07-28  8:53 Michał Górny
2018-06-25 23:20 Thomas Deutschmann
2018-06-24 10:20 Pacho Ramos
2018-06-24  9:46 Pacho Ramos
2018-06-24  9:41 Pacho Ramos
2018-05-05 17:46 Maxim Koltsov
2017-09-22 14:47 Patrice Clement
2017-07-30  9:44 Michał Górny
2017-07-23  1:09 Michael Palimaka
2017-01-16 17:55 David Seifert
2017-01-16 10:15 Agostino Sarubbo
2017-01-16  9:49 Agostino Sarubbo
2017-01-15 13:34 David Seifert
2017-01-15 13:34 David Seifert
2017-01-10 15:22 Agostino Sarubbo
2017-01-06 17:41 David Seifert
2017-01-04 22:26 Aaron Bauman
2017-01-03 23:07 Patrice Clement
2016-09-06 20:25 David Seifert
2016-09-06 20:25 David Seifert
2016-06-23 21:53 Patrice Clement
2016-06-23 21:53 Patrice Clement
2016-06-23 21:53 Patrice Clement
2016-06-23 21:53 Patrice Clement
2016-06-23 21:53 Patrice Clement
2016-05-12 11:40 Ian Delaney
2016-05-12 11:40 Ian Delaney
2016-05-12 11:40 Ian Delaney
2016-05-12 11:40 Ian Delaney
2016-05-12 11:40 Ian Delaney
2016-05-12 11:40 Ian Delaney
2016-04-05 20:14 Mike Frysinger

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:95473f3790 dfblob:28b3e4c46b dfblob:95473f3790
dfblob:7c83f3864f )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: media-video/subliminal/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1562477294.23a6f6ffd9eb75e5768607c4f7a54030f6ebb53b.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox