[gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/

[Michał Górny]

commit:     223a002041ba2169ed3194b7891f16ce2faae11d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  7 16:55:36 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 16:31:27 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=223a0020

media-tv/kodi: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 media-tv/kodi/kodi-18.3-r1.ebuild                          | 4 ++--
 media-tv/kodi/{kodi-18.4.ebuild => kodi-18.4-r1.ebuild}    | 4 ++--
 media-tv/kodi/{kodi-18.5-r1.ebuild => kodi-18.5-r2.ebuild} | 4 ++--
 media-tv/kodi/kodi-9999.ebuild                             | 6 ++++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/media-tv/kodi/kodi-18.3-r1.ebuild 
b/media-tv/kodi/kodi-18.3-r1.ebuild
index a217e27214a..ea0a6609f66 100644
--- a/media-tv/kodi/kodi-18.3-r1.ebuild
+++ b/media-tv/kodi/kodi-18.3-r1.ebuild
@@ -73,8 +73,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
        >=dev-libs/libxml2-2.9.4
        >=dev-libs/lzo-2.04
        dev-libs/tinyxml[stl]
-       dev-python/pillow[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 
'python3*')
+       $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
+       $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 
'python3*')
        >=dev-libs/libcdio-0.94
        >=dev-libs/libfmt-3.0.1
        dev-libs/libfstrcmp

diff --git a/media-tv/kodi/kodi-18.4.ebuild b/media-tv/kodi/kodi-18.4-r1.ebuild
similarity index 98%
rename from media-tv/kodi/kodi-18.4.ebuild
rename to media-tv/kodi/kodi-18.4-r1.ebuild
index eabaec48f0e..3b37458b80e 100644
--- a/media-tv/kodi/kodi-18.4.ebuild
+++ b/media-tv/kodi/kodi-18.4-r1.ebuild
@@ -76,8 +76,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
        >=dev-libs/libxml2-2.9.4
        >=dev-libs/lzo-2.04
        dev-libs/tinyxml[stl]
-       dev-python/pillow[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 
'python3*')
+       $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
+       $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 
'python3*')
        >=dev-libs/libcdio-0.94
        >=dev-libs/libfmt-3.0.1
        dev-libs/libfstrcmp

diff --git a/media-tv/kodi/kodi-18.5-r1.ebuild 
b/media-tv/kodi/kodi-18.5-r2.ebuild
similarity index 98%
rename from media-tv/kodi/kodi-18.5-r1.ebuild
rename to media-tv/kodi/kodi-18.5-r2.ebuild
index ffe5d7416b7..9b455201ee3 100644
--- a/media-tv/kodi/kodi-18.5-r1.ebuild
+++ b/media-tv/kodi/kodi-18.5-r2.ebuild
@@ -76,8 +76,8 @@ COMMON_DEPEND="${PYTHON_DEPS}
        >=dev-libs/libxml2-2.9.4
        >=dev-libs/lzo-2.04
        dev-libs/tinyxml[stl]
-       dev-python/pillow[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 
'python3*')
+       $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
+       $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 
'python3*')
        >=dev-libs/libcdio-0.94
        >=dev-libs/libfmt-3.0.1
        dev-libs/libfstrcmp

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 96f3f5e54a1..c78d67f3d62 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -71,8 +71,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
        >=dev-libs/libxml2-2.9.4
        >=dev-libs/lzo-2.04
        dev-libs/tinyxml[stl]
-       dev-python/pillow[${PYTHON_USEDEP}]
-       dev-python/pycryptodome[${PYTHON_USEDEP}]
+       $(python_gen_cond_dep '
+               dev-python/pillow[${PYTHON_MULTI_USEDEP}]
+               dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
+       ')
        >=dev-libs/libcdio-0.94
        >=dev-libs/libfmt-3.0.1
        dev-libs/libfstrcmp