diff options
Diffstat (limited to 'media-tv/kodi')
| -rw-r--r-- | media-tv/kodi/Manifest | 2 | ||||
| -rw-r--r-- | media-tv/kodi/kodi-9999.ebuild | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index 151d5767dd24..cac78adb26d6 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -7,5 +7,5 @@ DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7 EBUILD kodi-18.3-r1.ebuild 9615 BLAKE2B 9b507cab8dcf05014fa2c35af477afeca13c9c09e699da7af7d199974f603ebe900e59f25f7f7cf5443d1a8cc1d1dbc871f21509eefa826c237042d2270872cd SHA512 d53a257d5552965e26ee3e9037dbb58ec1661c8a5964160822d14fc63c736d6304e3622369378ba1888c587241c75e4fbbb7345a7082047bf59d2e315aaa1cb1 EBUILD kodi-18.4.ebuild 9447 BLAKE2B c7b046a250efdc94f21e184cc598eae63385f7a2f9c1c6284c7f99ef35c63805dbf57cdad3868f46a32268ad185e843bf43f89e3993cc38fb2b13d90ff722af5 SHA512 90a84232549ef0fc88a4259aa75d891079d3c83c1fe82aaa645740b3922257a77721d23a8a7a70bff281d89409964dd0862abd474347944987f4a5b51e0a7330 -EBUILD kodi-9999.ebuild 9398 BLAKE2B 624a3e4ced7929e817d13d532426716c8a3913125850e66f9ec7db5c5cb1bc04af2ecd828515ffcab15794c701ce08b867cc816cc24e53a9574f30ed301f0bc1 SHA512 74ae9ffa4ab5521b3802cf23b1765cb3bd38ce86802c99bb8020eaeb4604af37b728a1589865c8533752c9969bdb657c219c820f24770e2e30b5e186e98af92a +EBUILD kodi-9999.ebuild 8876 BLAKE2B 46c2548ba49448769fae96180451f840afa81e8dcb67fd1178c357f0c8b3248ac77dd81341ac1b995517601dabdc2c6113d1e8768e924507c0678235c06b0bee SHA512 8ca5f40ade8bad47209b33edded429db8d348af369271756b9c6236eda91362a505b3934a1d06e55c6370f981e2d41229f4d785b5eba431d3fdef082dc2c772a MISC metadata.xml 1720 BLAKE2B 3158b87065286649496de2edf821c37042cafe7e729f7ba31c571ade72cf8f9fbce218485ac721ad896fa5ef751becfd2f3b4ce1645e97b4db673ec879884834 SHA512 f8d52358276ad8c2eb23632451f025ac45f799fa392bd59fcfd4417d9e9e76cf9ce066ac50cd8ee563319d7f2248b28c45fee3059a4e069ebb862e41d230b1da diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index b408b49df3d2..ef6cd2879da7 100644 --- 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} @@ -59,7 +58,7 @@ COMMON_DEPEND="${PYTHON_DEPS} ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) - bluray? ( >=media-libs/libbluray-1.0.2 ) + bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite @@ -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 |