media-tv/kodi: Use python 3

Python 3 support was merged, removing support for Python 2
See: https://github.com/xbmc/xbmc/commit/c0968c9
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Craig Andrews <candrews@gentoo.org>

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index b1a0a18250bcf9233ed912525fff9c3a89a6f6be..ef6cd2879da784ff20719c2b5a8897e1c2f933b7 100644 (file)
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -10,17 +10,16 @@ LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
 FFMPEG_VERSION="4.0.4"
 CODENAME="Leia"
 FFMPEG_KODI_VERSION="18.4"
+PYTHON_COMPAT=( python3_{5,6,7} )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
        https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
        https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
        !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
 
 if [[ ${PV} == *9999 ]] ; then
-       PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
        EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
        inherit git-r3
 else
-       PYTHON_COMPAT=( python2_7 )
        MY_PV=${PV/_p/_r}
        MY_PV=${MY_PV/_alpha/a}
        MY_PV=${MY_PV/_beta/b}
@@ -73,7 +72,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
        >=dev-libs/lzo-2.04
        dev-libs/tinyxml[stl]
        dev-python/pillow[${PYTHON_USEDEP}]
-       $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_USEDEP}]' 'python3*')
+       dev-python/pycryptodome[${PYTHON_USEDEP}]
        >=dev-libs/libcdio-0.94
        >=dev-libs/libfmt-3.0.1
        dev-libs/libfstrcmp
@@ -175,14 +174,6 @@ pkg_setup() {
 
 src_unpack() {
        if [[ ${PV} == *9999 ]] ; then
-               if python_is_python3; then
-                       EGIT_BRANCH="feature_python3"
-                       ewarn "Using the experimental Python 3 branch!"
-                       ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
-                       ewarn "To use the non-experimental Python 2 version:"
-                       ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
-                       ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
-               fi
                git-r3_src_unpack
        else
                default