commit: 0494bad3861595b29a0788e738c1dd3e78b024ca
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 5 18:31:47 2018 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Mon Nov 5 19:15:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0494bad3
media-tv/kodi: No more generated addons for Kodi 18
Kodi 18 changed the build system breaking the generated addons approach
previously taken.
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
media-tv/kodi/kodi-9999.ebuild | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index dacbe39f647..0648210f36a 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -143,30 +143,20 @@ DEPEND="${COMMON_DEPEND}
>=media-libs/libpng-1.6.26:0=
test? ( dev-cpp/gtest )
virtual/pkgconfig
+ virtual/jre
x86? ( dev-lang/nasm )
"
if [[ ${PV} == *9999 ]] ; then
EGIT_REPO_URI="https://github.com/xbmc/xbmc.git";
inherit git-r3
- # Force java for latest git version to avoid having to hand maintain the
- # generated addons package. #488118
- DEPEND+="
- virtual/jre
- "
else
MY_PV=${PV/_p/_r}
MY_PV=${MY_PV/_alpha/a}
MY_PV=${MY_PV/_beta/b}
MY_PV=${MY_PV/_rc/rc}
MY_P="${PN}-${MY_PV}"
- SRC_URI+="
https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz ->
${MY_P}.tar.gz
- !java? (
https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz
)"
+ SRC_URI+="
https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz ->
${MY_P}.tar.gz"
KEYWORDS="~amd64 ~x86"
- IUSE+=" java"
- DEPEND+="
- java? ( virtual/jre )
- "
-
S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
fi
@@ -182,9 +172,6 @@ pkg_setup() {
}
src_prepare() {
- if in_iuse java && use !java; then
- eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
- fi
cmake-utils_src_prepare
# avoid long delays when powerkit isn't running #348580
