From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8E826138334 for ; Sun, 13 Oct 2019 18:23:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87210E0101; Sun, 13 Oct 2019 18:23:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6B0A3E0101 for ; Sun, 13 Oct 2019 18:23:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4917534BA3E for ; Sun, 13 Oct 2019 18:23:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D7CF7F5 for ; Sun, 13 Oct 2019 18:23:53 +0000 (UTC) From: "Craig Andrews" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Craig Andrews" Message-ID: <1570991028.f5d8dee98f7ec3cc53d27460250e9dc4290ab9ab.candrews@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-tv/kodi/kodi-9999.ebuild X-VCS-Directories: media-tv/kodi/ X-VCS-Committer: candrews X-VCS-Committer-Name: Craig Andrews X-VCS-Revision: f5d8dee98f7ec3cc53d27460250e9dc4290ab9ab X-VCS-Branch: master Date: Sun, 13 Oct 2019 18:23:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 44a32a29-cec9-43ba-8012-60c8b7be11d4 X-Archives-Hash: 1aa2c0dd7ef3649255fa70bbed451556 commit: f5d8dee98f7ec3cc53d27460250e9dc4290ab9ab Author: Craig Andrews gentoo org> AuthorDate: Sun Oct 13 18:14:21 2019 +0000 Commit: Craig Andrews gentoo org> CommitDate: Sun Oct 13 18:23:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d8dee9 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 gentoo.org> media-tv/kodi/kodi-9999.ebuild | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index b1a0a18250b..ef6cd2879da 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} @@ -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