Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/
Date: Sun, 09 Feb 2020 16:31:43
Message-Id: 1581265887.223a002041ba2169ed3194b7891f16ce2faae11d.mgorny@gentoo
1 commit: 223a002041ba2169ed3194b7891f16ce2faae11d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 7 16:55:36 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 16:31:27 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=223a0020
7
8 media-tv/kodi: Switch to PYTHON_MULTI_USEDEP API
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 media-tv/kodi/kodi-18.3-r1.ebuild | 4 ++--
13 media-tv/kodi/{kodi-18.4.ebuild => kodi-18.4-r1.ebuild} | 4 ++--
14 media-tv/kodi/{kodi-18.5-r1.ebuild => kodi-18.5-r2.ebuild} | 4 ++--
15 media-tv/kodi/kodi-9999.ebuild | 6 ++++--
16 4 files changed, 10 insertions(+), 8 deletions(-)
17
18 diff --git a/media-tv/kodi/kodi-18.3-r1.ebuild b/media-tv/kodi/kodi-18.3-r1.ebuild
19 index a217e27214a..ea0a6609f66 100644
20 --- a/media-tv/kodi/kodi-18.3-r1.ebuild
21 +++ b/media-tv/kodi/kodi-18.3-r1.ebuild
22 @@ -73,8 +73,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
23 >=dev-libs/libxml2-2.9.4
24 >=dev-libs/lzo-2.04
25 dev-libs/tinyxml[stl]
26 - dev-python/pillow[${PYTHON_USEDEP}]
27 - $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
28 + $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
29 + $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
30 >=dev-libs/libcdio-0.94
31 >=dev-libs/libfmt-3.0.1
32 dev-libs/libfstrcmp
33
34 diff --git a/media-tv/kodi/kodi-18.4.ebuild b/media-tv/kodi/kodi-18.4-r1.ebuild
35 similarity index 98%
36 rename from media-tv/kodi/kodi-18.4.ebuild
37 rename to media-tv/kodi/kodi-18.4-r1.ebuild
38 index eabaec48f0e..3b37458b80e 100644
39 --- a/media-tv/kodi/kodi-18.4.ebuild
40 +++ b/media-tv/kodi/kodi-18.4-r1.ebuild
41 @@ -76,8 +76,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
42 >=dev-libs/libxml2-2.9.4
43 >=dev-libs/lzo-2.04
44 dev-libs/tinyxml[stl]
45 - dev-python/pillow[${PYTHON_USEDEP}]
46 - $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
47 + $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
48 + $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
49 >=dev-libs/libcdio-0.94
50 >=dev-libs/libfmt-3.0.1
51 dev-libs/libfstrcmp
52
53 diff --git a/media-tv/kodi/kodi-18.5-r1.ebuild b/media-tv/kodi/kodi-18.5-r2.ebuild
54 similarity index 98%
55 rename from media-tv/kodi/kodi-18.5-r1.ebuild
56 rename to media-tv/kodi/kodi-18.5-r2.ebuild
57 index ffe5d7416b7..9b455201ee3 100644
58 --- a/media-tv/kodi/kodi-18.5-r1.ebuild
59 +++ b/media-tv/kodi/kodi-18.5-r2.ebuild
60 @@ -76,8 +76,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
61 >=dev-libs/libxml2-2.9.4
62 >=dev-libs/lzo-2.04
63 dev-libs/tinyxml[stl]
64 - dev-python/pillow[${PYTHON_USEDEP}]
65 - $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
66 + $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
67 + $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
68 >=dev-libs/libcdio-0.94
69 >=dev-libs/libfmt-3.0.1
70 dev-libs/libfstrcmp
71
72 diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
73 index 96f3f5e54a1..c78d67f3d62 100644
74 --- a/media-tv/kodi/kodi-9999.ebuild
75 +++ b/media-tv/kodi/kodi-9999.ebuild
76 @@ -71,8 +71,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
77 >=dev-libs/libxml2-2.9.4
78 >=dev-libs/lzo-2.04
79 dev-libs/tinyxml[stl]
80 - dev-python/pillow[${PYTHON_USEDEP}]
81 - dev-python/pycryptodome[${PYTHON_USEDEP}]
82 + $(python_gen_cond_dep '
83 + dev-python/pillow[${PYTHON_MULTI_USEDEP}]
84 + dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
85 + ')
86 >=dev-libs/libcdio-0.94
87 >=dev-libs/libfmt-3.0.1
88 dev-libs/libfstrcmp