media-tv/kodi: upower and gold fixes
authorCraig Andrews <candrews@integralblue.com>
Wed, 18 Jan 2017 22:50:59 +0000 (17:50 -0500)
committerJory A. Pratt <anarchy@gentoo.org>
Wed, 18 Jan 2017 23:47:27 +0000 (17:47 -0600)
* -16.1-r2, -17.0_rc3-r2, -9999: adjust the upower dependency
* -16.1-r2, -17.0_rc3-r2, -9999: always use the system linker instead of always trying (inappropriately based on the way Gentoo works) to use gold

Gentoo-bug: 583230, 606124
Closes: https://github.com/gentoo/gentoo/pull/3535

media-tv/kodi/kodi-16.1-r2.ebuild [new file with mode: 0644]
media-tv/kodi/kodi-17.0_rc3-r2.ebuild [new file with mode: 0644]
media-tv/kodi/kodi-9999.ebuild

diff --git a/media-tv/kodi/kodi-16.1-r2.ebuild b/media-tv/kodi/kodi-16.1-r2.ebuild
new file mode 100644 (file)
index 0000000..e95080f
--- /dev/null
@@ -0,0 +1,304 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# Does not work with py3 here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs
+
+CODENAME="Jarvis"
+case ${PV} in
+9999)
+       EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
+       inherit git-r3
+       ;;
+*)
+       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
+               https://dev.gentoo.org/~soap/distfiles/${PN}-${PV}-gcc-6.patch
+               !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons-r1.tar.xz )"
+       KEYWORDS="~amd64 ~x86"
+
+       S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+       ;;
+esac
+
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="airplay alsa bluetooth bluray caps cec css dbus debug gles java joystick midi mysql nfs +opengl profile pulseaudio rtmp +samba sftp systemd test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X zeroconf"
+# gles/vaapi: http://trac.kodi.tv/ticket/10552 #464306
+REQUIRED_USE="
+       || ( gles opengl )
+       ?? ( gles vaapi )
+       udisks? ( dbus )
+       upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+       app-arch/bzip2
+       app-arch/unzip
+       app-arch/zip
+       app-i18n/enca
+       airplay? ( app-pda/libplist )
+       dev-libs/boost:=
+       dev-libs/expat
+       dev-libs/fribidi
+       dev-libs/libcdio[-minimal]
+       cec? ( >=dev-libs/libcec-3.0 )
+       dev-libs/libpcre[cxx]
+       dev-libs/libxml2
+       dev-libs/libxslt
+       >=dev-libs/lzo-2.04
+       dev-libs/tinyxml[stl]
+       >=dev-libs/yajl-2
+       dev-python/simplejson[${PYTHON_USEDEP}]
+       media-fonts/corefonts
+       media-fonts/roboto
+       alsa? ( media-libs/alsa-lib )
+       media-libs/flac
+       media-libs/fontconfig
+       media-libs/freetype
+       media-libs/jasper:=
+       media-libs/jbigkit
+       >=media-libs/libass-0.9.7
+       bluray? ( >=media-libs/libbluray-0.7.0 )
+       css? ( media-libs/libdvdcss )
+       media-libs/libmad
+       media-libs/libmodplug
+       media-libs/libmpeg2
+       media-libs/libogg
+       media-libs/libpng:0=
+       media-libs/libsamplerate
+       joystick? ( media-libs/libsdl2 )
+       >=media-libs/taglib-1.8
+       media-libs/libvorbis
+       media-libs/tiff:0=
+       media-sound/dcadec
+       pulseaudio? ( media-sound/pulseaudio )
+       media-sound/wavpack
+       >=media-video/ffmpeg-2.6:=[encode]
+       rtmp? ( media-video/rtmpdump )
+       nfs? ( net-fs/libnfs:= )
+       webserver? ( net-libs/libmicrohttpd[messages] )
+       sftp? ( net-libs/libssh[sftp] )
+       net-misc/curl
+       samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+       bluetooth? ( net-wireless/bluez )
+       dbus? ( sys-apps/dbus )
+       caps? ( sys-libs/libcap )
+       sys-libs/zlib
+       virtual/jpeg:0=
+       usb? ( virtual/libusb:1 )
+       mysql? ( virtual/mysql )
+       opengl? (
+               virtual/glu
+               virtual/opengl
+               >=media-libs/glew-1.5.6:=
+       )
+       gles? (
+               media-libs/mesa[gles2]
+       )
+       vaapi? ( x11-libs/libva[opengl] )
+       vdpau? (
+               || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+               media-video/ffmpeg[vdpau]
+       )
+       X? (
+               x11-apps/xdpyinfo
+               x11-apps/mesa-progs
+               x11-libs/libXinerama
+               x11-libs/libXrandr
+               x11-libs/libXrender
+       )
+       zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+       !media-tv/xbmc
+       udisks? ( sys-fs/udisks:0 )
+       upower? (
+               systemd? ( sys-power/upower )
+               !systemd? (
+                       || ( sys-power/upower-pm-utils sys-power/upower )
+               )
+       )"
+DEPEND="${COMMON_DEPEND}
+       app-arch/xz-utils
+       dev-lang/swig
+       dev-libs/crossguid
+       dev-util/gperf
+       texturepacker? ( media-libs/giflib )
+       X? ( x11-proto/xineramaproto )
+       dev-util/cmake
+       x86? ( dev-lang/nasm )
+       java? ( virtual/jre )
+       test? ( dev-cpp/gtest )
+       virtual/pkgconfig"
+# Force java for latest git version to avoid having to hand maintain the
+# generated addons package.  #488118
+[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400618887
+       "${FILESDIR}"/${PN}-9999-texturepacker.patch
+       "${FILESDIR}"/${PN}-16-ffmpeg3.patch
+       "${DISTDIR}"/${PN}-${PV}-gcc-6.patch #592446
+)
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+       check_extra_config
+       python-single-r1_pkg_setup
+}
+
+src_unpack() {
+       [[ ${PV} == "9999" ]] && git-r3_src_unpack || default
+}
+
+src_prepare() {
+       default
+
+       # some dirs ship generated autotools, some dont
+       multijob_init
+       local d dirs=(
+               tools/depends/native/TexturePacker/src/configure
+               $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f)
+       )
+       for d in "${dirs[@]}" ; do
+               [[ -e ${d} ]] && continue
+               pushd ${d/%configure/.} >/dev/null || die
+               AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
+               multijob_child_init eautoreconf
+               popd >/dev/null || die
+       done
+       multijob_finish
+       elibtoolize
+
+       # Cross-compiler support
+       # We need JsonSchemaBuilder and TexturePacker binaries for the host system
+       # Later we need libsquish for the target system
+       if tc-is-cross-compiler ; then
+               mkdir "${WORKDIR}"/${CBUILD} || die
+               pushd "${WORKDIR}"/${CBUILD} >/dev/null || die
+               einfo "Building host tools"
+               cp -a "$S"/{tools,xbmc} ./ || die
+               local tools=( JsonSchemaBuilder )
+               use texturepacker && tools+=( TexturePacker )
+               for tool in "${tools[@]}" ; do
+                       tc-env_build emake -C tools/depends/native/$tool
+                       mkdir "$S"/tools/depends/native/$tool/bin || die
+                       ln -s "${WORKDIR}"/${CBUILD}/tools/depends/native/$tool/bin/$tool "$S"/tools/depends/native/$tool/bin/$tool || die
+               done
+               popd >/dev/null || die
+
+               emake -f codegenerator.mk
+
+               # Binary kodi.bin links against libsquish,
+               # so we need libsquish compiled for the target system
+               emake -C tools/depends/native/libsquish-native/ CXX=$(tc-getCXX)
+       elif [[ ${PV} == "9999" ]] || use java ; then #558798
+               tc-env_build emake -f codegenerator.mk
+       fi
+
+       # Disable internal func checks as our USE/DEPEND
+       # stuff handles this just fine already #408395
+       export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
+
+       # Fix the final version string showing as "exported"
+       # instead of the SVN revision number.
+       export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
+
+       # avoid long delays when powerkit isn't running #348580
+       sed -i \
+               -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+               xbmc/linux/*.cpp || die
+
+       # Tweak autotool timestamps to avoid regeneration
+       find . -type f -exec touch -r configure {} + || die
+}
+
+src_configure() {
+       # Disable documentation generation
+       export ac_cv_path_LATEX=no
+       # Avoid help2man
+       export HELP2MAN=$(type -P help2man || echo true)
+       # No configure flage for this #403561
+       export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth)
+       # Requiring java is asine #434662
+       [[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true))
+
+       econf \
+               --disable-ccache \
+               --disable-optimizations \
+               --with-ffmpeg=shared \
+               $(use_enable alsa) \
+               $(use_enable airplay) \
+               $(use_enable bluray libbluray) \
+               $(use_enable caps libcap) \
+               $(use_enable cec libcec) \
+               $(use_enable css dvdcss) \
+               $(use_enable dbus) \
+               $(use_enable debug) \
+               $(use_enable gles) \
+               $(use_enable joystick) \
+               $(use_enable midi mid) \
+               $(use_enable mysql) \
+               $(use_enable nfs) \
+               $(use_enable opengl gl) \
+               $(use_enable profile profiling) \
+               $(use_enable pulseaudio pulse) \
+               $(use_enable rtmp) \
+               $(use_enable samba) \
+               $(use_enable sftp ssh) \
+               $(use_enable usb libusb) \
+               $(use_enable test gtest) \
+               $(use_enable texturepacker) \
+               $(use_enable upnp) \
+               $(use_enable vaapi) \
+               $(use_enable vdpau) \
+               $(use_enable webserver) \
+               $(use_enable X x11) \
+               $(use_enable zeroconf avahi)
+}
+
+src_compile() {
+       emake V=1
+}
+
+src_install() {
+       default
+       rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+       domenu tools/Linux/kodi.desktop
+       newicon media/icon48x48.png kodi.png
+
+       # Remove fontconfig settings that are used only on MacOSX.
+       # Can't be patched upstream because they just find all files and install
+       # them into same structure like they have in git.
+       rm -rf "${ED%/}"/usr/share/kodi/system/players/dvdplayer/etc || die
+
+       # Replace bundled fonts with system ones.
+       rm "${ED%/}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* || die
+       dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
+               /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf
+       dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
+               /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.ttf
+
+       python_domodule tools/EventClients/lib/python/xbmcclient.py
+       python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-17.0_rc3-r2.ebuild b/media-tv/kodi/kodi-17.0_rc3-r2.ebuild
new file mode 100644 (file)
index 0000000..de9404c
--- /dev/null
@@ -0,0 +1,280 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# Does not work with py3 here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils linux-info python-single-r1 cmake-utils autotools
+
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+CODENAME="Krypton"
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
+       https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
+       https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl +ssl pulseaudio samba sftp systemd test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+REQUIRED_USE="
+       ${PYTHON_REQUIRED_USE}
+       || ( gles opengl )
+       udev? ( !libusb )
+       udisks? ( dbus )
+       upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+       airplay? ( app-pda/libplist )
+       alsa? ( media-libs/alsa-lib )
+       bluetooth? ( net-wireless/bluez )
+       bluray? ( >=media-libs/libbluray-0.7.0 )
+       caps? ( sys-libs/libcap )
+       dbus? ( sys-apps/dbus )
+       dev-db/sqlite
+       dev-libs/expat
+       dev-libs/fribidi
+       cec? ( >=dev-libs/libcec-4.0 )
+       dev-libs/libpcre[cxx]
+       dev-libs/libxml2
+       >=dev-libs/lzo-2.04
+       dev-libs/tinyxml[stl]
+       >=dev-libs/yajl-2
+       dev-python/pillow[${PYTHON_USEDEP}]
+       dev-libs/libcdio
+       dvd? ( dev-libs/libcdio[-minimal] )
+       gles? ( media-libs/mesa[gles2] )
+       libusb? ( virtual/libusb:1 )
+       media-fonts/corefonts
+       >=media-fonts/noto-20160531
+       media-fonts/roboto
+       media-libs/fontconfig
+       media-libs/freetype
+       >=media-libs/libass-0.13.4
+       media-libs/mesa[egl]
+       >=media-libs/taglib-1.11.1
+       >=media-video/ffmpeg-3.1.6:=[encode]
+       mysql? ( virtual/mysql )
+       >=net-misc/curl-7.51.0
+       nfs? ( net-fs/libnfs:= )
+       opengl? ( media-libs/glu )
+       ssl? (
+               !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+               libressl? ( dev-libs/libressl:0= )
+       )
+       pulseaudio? ( media-sound/pulseaudio )
+       samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+       sftp? ( net-libs/libssh[sftp] )
+       sys-libs/zlib
+       udev? ( virtual/udev )
+       vaapi? ( x11-libs/libva[opengl] )
+       vdpau? (
+               || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+               media-video/ffmpeg[vdpau]
+       )
+       webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
+       X? (
+               x11-libs/libdrm
+               x11-libs/libX11
+               x11-libs/libXrandr
+               x11-libs/libXrender
+       )
+       xslt? ( dev-libs/libxslt )
+       zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+       lirc? (
+               || ( app-misc/lirc app-misc/inputlircd )
+       )
+       !media-tv/xbmc
+       udisks? ( sys-fs/udisks:0 )
+       upower? (
+               systemd? ( sys-power/upower )
+               !systemd? (
+                       || ( sys-power/upower-pm-utils sys-power/upower )
+               )
+       )
+"
+DEPEND="${COMMON_DEPEND}
+       app-arch/bzip2
+       app-arch/unzip
+       app-arch/xz-utils
+       app-arch/zip
+       dev-lang/swig
+       dev-libs/crossguid
+       dev-util/cmake
+       dev-util/gperf
+       media-libs/giflib
+       >=media-libs/libjpeg-turbo-1.5.1:=
+       >=media-libs/libpng-1.6.26:0=
+       test? ( dev-cpp/gtest )
+       virtual/pkgconfig
+       x86? ( dev-lang/nasm )
+"
+case ${PV} in
+9999)
+       EGIT_REPO_URI="git://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
+               "
+       ;;
+*)
+       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 )"
+       KEYWORDS="~amd64 ~x86"
+       IUSE+=" java"
+       DEPEND+="
+               java? ( virtual/jre )
+               "
+
+       S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+       ;;
+esac
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+CMAKE_USE_DIR=${S}/project/cmake/
+
+pkg_setup() {
+       check_extra_config
+       python-single-r1_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
+       sed -i \
+               -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+               xbmc/linux/*.cpp || die
+
+       # Prepare tools and libs witch are configured with autotools during compile time
+       AUTOTOOLS_DIRS=(
+               "${S}"/lib/cpluff
+               "${S}"/tools/depends/native/TexturePacker/src
+               "${S}"/tools/depends/native/JsonSchemaBuilder/src
+       )
+
+       local d
+       for d in "${AUTOTOOLS_DIRS[@]}" ; do
+               pushd ${d} >/dev/null || die
+               AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+               popd >/dev/null || die
+       done
+       elibtoolize
+
+       # Prevent autoreconf rerun
+       sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+               "${S}"/project/cmake/modules/FindCpluff.cmake \
+               "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+               "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh
+}
+
+src_configure() {
+       local CMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo)
+
+       local mycmakeargs=(
+               -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+               -DNABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+               -DENABLE_ALSA=$(usex alsa)
+               -DENABLE_AIRTUNES=OFF
+               -DENABLE_AVAHI=$(usex zeroconf)
+               -DENABLE_BLUETOOTH=$(usex bluetooth)
+               -DENABLE_BLURAY=$(usex bluray)
+               -DENABLE_CCACHE=OFF
+               -DENABLE_CEC=$(usex cec)
+               -DENABLE_DBUS=$(usex dbus)
+               -DENABLE_DVDCSS=$(usex css)
+               -DENABLE_INTERNAL_CROSSGUID=OFF
+               -DENABLE_INTERNAL_FFMPEG=OFF
+               -DENABLE_CAP=$(usex caps)
+               -DENABLE_LIRC=$(usex lirc)
+               -DENABLE_MICROHTTPD=$(usex webserver)
+               -DENABLE_MYSQLCLIENT=$(usex mysql)
+               -DENABLE_NFS=$(usex nfs)
+               -DENABLE_NONFREE=$(usex nonfree)
+               -DENABLE_OPENGLES=$(usex gles)
+               -DENABLE_OPENGL=$(usex opengl)
+               -DENABLE_OPENSSL=$(usex ssl)
+               -DENABLE_OPTICAL=$(usex dvd)
+               -DENABLE_PLIST=$(usex airplay)
+               -DENABLE_PULSEAUDIO=$(usex pulseaudio)
+               -DENABLE_SMBCLIENT=$(usex samba)
+               -DENABLE_SSH=$(usex sftp)
+               -DENABLE_UDEV=$(usex udev)
+               -DENABLE_UPNP=$(usex upnp)
+               -DENABLE_VAAPI=$(usex vaapi)
+               -DENABLE_VDPAU=$(usex vdpau)
+               -DENABLE_X11=$(usex X)
+               -DENABLE_XSLT=$(usex xslt)
+               -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
+               -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+               -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
+       )
+
+       use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+       cmake-utils_src_configure
+}
+
+src_compile() {
+       cmake-utils_src_compile all $(usev test)
+}
+
+src_install() {
+       cmake-utils_src_install
+       rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+       newicon media/icon48x48.png kodi.png
+
+       # Remove fontconfig settings that are used only on MacOSX.
+       # Can't be patched upstream because they just find all files and install
+       # them into same structure like they have in git.
+       # Will be fixed upstream so this deletion will be unnecesssary, see https://github.com/xbmc/xbmc/pull/11451
+       rm -rf "${ED%/}"/usr/share/kodi/system/players/VideoPlayer/etc || die
+
+       # Replace bundled fonts with system ones.
+       rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+       dosym /usr/share/fonts/noto/NotoSans-Regular.ttf \
+               usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+       local f
+       for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
+               rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
+               dosym /usr/share/fonts/noto/"${f}" \
+                       usr/share/kodi/addons/skin.estuary/fonts/"${f}"
+       done
+
+       rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+       dosym /usr/share/fonts/roboto/Roboto-Thin.ttf \
+               usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+       python_domodule tools/EventClients/lib/python/xbmcclient.py
+       python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
index de348a07c9b4105bc741b61ea007fb9ef77bd5a6..47143985fc7e6417cade1a6a13de4b64ee1afd7d 100644 (file)
@@ -101,7 +101,9 @@ RDEPEND="${COMMON_DEPEND}
        udisks? ( sys-fs/udisks:0 )
        upower? (
                systemd? ( sys-power/upower )
-               !systemd? ( sys-power/upower-pm-utils )
+               !systemd? (
+                       || ( sys-power/upower-pm-utils sys-power/upower )
+               )
        )
 "
 DEPEND="${COMMON_DEPEND}
@@ -187,7 +189,7 @@ src_prepare() {
 
        # Prevent autoreconf rerun
        sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
-               "${S}"/project/cmake/modules/FindCpluff.cmake \
+               "${S}"/cmake/modules/FindCpluff.cmake \
                "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
                "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh
 }
@@ -197,6 +199,7 @@ src_configure() {
 
        local mycmakeargs=(
                -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+               -DNABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
                -DENABLE_ALSA=$(usex alsa)
                -DENABLE_AIRTUNES=OFF
                -DENABLE_AVAHI=$(usex zeroconf)