| 1 |
commit: 21668311059bcc228c7c3f0663f8e46f4e5cd4cb |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 19 02:50:32 2018 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 19 03:23:18 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21668311 |
| 7 |
|
| 8 |
media-tv/kodi: Experimental Python 3 support in -9999 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
| 11 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 12 |
|
| 13 |
media-tv/kodi/kodi-9999.ebuild | 44 +++++++++++++++++++++++++++--------------- |
| 14 |
1 file changed, 28 insertions(+), 16 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild |
| 17 |
index 4b9bc5d60e0..9994cd976c3 100644 |
| 18 |
--- a/media-tv/kodi/kodi-9999.ebuild |
| 19 |
+++ b/media-tv/kodi/kodi-9999.ebuild |
| 20 |
@@ -3,9 +3,23 @@ |
| 21 |
|
| 22 |
EAPI=6 |
| 23 |
|
| 24 |
-# Does not work with py3 here |
| 25 |
-PYTHON_COMPAT=( python2_7 ) |
| 26 |
-PYTHON_REQ_USE="sqlite" |
| 27 |
+PYTHON_REQ_USE="libressl?,sqlite,ssl" |
| 28 |
+ |
| 29 |
+if [[ ${PV} == *9999 ]] ; then |
| 30 |
+ PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
| 31 |
+ EGIT_REPO_URI="https://github.com/xbmc/xbmc.git" |
| 32 |
+ inherit git-r3 |
| 33 |
+else |
| 34 |
+ PYTHON_COMPAT=( python2_7 ) |
| 35 |
+ MY_PV=${PV/_p/_r} |
| 36 |
+ MY_PV=${MY_PV/_alpha/a} |
| 37 |
+ MY_PV=${MY_PV/_beta/b} |
| 38 |
+ MY_PV=${MY_PV/_rc/rc} |
| 39 |
+ MY_P="${PN}-${MY_PV}" |
| 40 |
+ SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz" |
| 41 |
+ KEYWORDS="~amd64 ~x86" |
| 42 |
+ S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} |
| 43 |
+fi |
| 44 |
|
| 45 |
inherit autotools cmake-utils eutils gnome2-utils linux-info pax-utils python-single-r1 xdg-utils |
| 46 |
|
| 47 |
@@ -60,6 +74,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 48 |
>=dev-libs/lzo-2.04 |
| 49 |
dev-libs/tinyxml[stl] |
| 50 |
dev-python/pillow[${PYTHON_USEDEP}] |
| 51 |
+ dev-python/pycryptodome[${PYTHON_USEDEP}] |
| 52 |
>=dev-libs/libcdio-0.94 |
| 53 |
dev-libs/libfmt |
| 54 |
dev-libs/libfstrcmp |
| 55 |
@@ -147,19 +162,6 @@ DEPEND="${COMMON_DEPEND} |
| 56 |
virtual/jre |
| 57 |
x86? ( dev-lang/nasm ) |
| 58 |
" |
| 59 |
-if [[ ${PV} == *9999 ]] ; then |
| 60 |
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git" |
| 61 |
- inherit git-r3 |
| 62 |
-else |
| 63 |
- MY_PV=${PV/_p/_r} |
| 64 |
- MY_PV=${MY_PV/_alpha/a} |
| 65 |
- MY_PV=${MY_PV/_beta/b} |
| 66 |
- MY_PV=${MY_PV/_rc/rc} |
| 67 |
- MY_P="${PN}-${MY_PV}" |
| 68 |
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz" |
| 69 |
- KEYWORDS="~amd64 ~x86" |
| 70 |
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} |
| 71 |
-fi |
| 72 |
|
| 73 |
CONFIG_CHECK="~IP_MULTICAST" |
| 74 |
ERROR_IP_MULTICAST=" |
| 75 |
@@ -172,6 +174,16 @@ pkg_setup() { |
| 76 |
python-single-r1_pkg_setup |
| 77 |
} |
| 78 |
|
| 79 |
+src_unpack() { |
| 80 |
+ python_is_python3 && EGIT_BRANCH="feature_python3" |
| 81 |
+ ewarn "Using the experimental Python 3 branch!" |
| 82 |
+ ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information." |
| 83 |
+ ewarn "To use the non-experimental Python 2 version:" |
| 84 |
+ ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use" |
| 85 |
+ ewarn "then re-merge using: emerge -a =${CATEGORY}/${P}" |
| 86 |
+ git-r3_src_unpack |
| 87 |
+} |
| 88 |
+ |
| 89 |
src_prepare() { |
| 90 |
cmake-utils_src_prepare |
Archives