Require media-libs/ffmpeg:2.6

Fix a parallel make issue
Internal mythtv has been removed by upstream.

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0145142D)

3 files changed, 28 insertions, 10 deletions

diff --git a/media-tv/kodi/ChangeLog b/media-tv/kodi/ChangeLog
index 730da36a785d..eb6f79b154fe 100644
--- a/media-tv/kodi/ChangeLog
+++ b/media-tv/kodi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-tv/kodi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/ChangeLog,v 1.6 2015/03/06 20:59:31 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/ChangeLog,v 1.7 2015/03/13 20:52:24 tupone Exp $
+
+  12 Mar 2015; Tupone Alfredo <tupone@gentoo.org> kodi-9999.ebuild,
+  files/kodi-9999-gentoo.patch:
+  Require media-libs/ffmpeg:2.6
+  Fix a parallel make issue
+  Internal mythtv has been removed by upstream.
 
   06 Mar 2015; Tupone Alfredo <tupone@gentoo.org> kodi-9999.ebuild,
   metadata.xml:
diff --git a/media-tv/kodi/files/kodi-9999-gentoo.patch b/media-tv/kodi/files/kodi-9999-gentoo.patch
index 0032e76ee095..4aa46420e5ed 100644
--- a/media-tv/kodi/files/kodi-9999-gentoo.patch
+++ b/media-tv/kodi/files/kodi-9999-gentoo.patch
@@ -9,3 +9,21 @@
    export PKG_CONFIG_PATH="${abs_top_srcdir}/tools/depends/native/libsquish-native/squish-install/lib/pkgconfig:$PKG_CONFIG_PATH"
  fi
  PKG_CHECK_MODULES([SQUISH], [squish],
+--- codegenerator.mk.old	2015-03-10 08:49:45.480631067 +0100
++++ codegenerator.mk	2015-03-10 08:51:32.048879905 +0100
+@@ -74,7 +74,7 @@
+ 
+ $(GENERATED_JSON): $(JSON_BUILDER)
+ 	@echo Jsonbuilder: $(JSON_BUILDER)
+-	make -C $(INTERFACES_DIR)/json-rpc $(notdir $@)
++	$(MAKE) -C $(INTERFACES_DIR)/json-rpc $(notdir $@)
+ 
+ $(JSON_BUILDER):
+ ifeq ($(BOOTSTRAP_FROM_DEPENDS), yes)
+@@ -82,5 +82,5 @@
+ 	@false
+ else
+ #build json builder - ".." because makefile is in the parent dir of "bin"
+-	make -C $(abspath $(dir $@)..)
++	$(MAKE) -C $(abspath $(dir $@)..)
+ endif
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 324535a9a203..b9af03854714 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-9999.ebuild,v 1.6 2015/03/06 20:59:31 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-9999.ebuild,v 1.7 2015/03/13 20:52:24 tupone Exp $
 
 EAPI="5"
 
@@ -33,9 +33,8 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs raspberry-pi rtmp +samba sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
+IUSE="airplay avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs raspberry-pi rtmp +samba sftp test udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
 REQUIRED_USE="
-	pvr? ( mysql )
 	rsxs? ( X )
 	xrandr? ( X )
 "
@@ -82,7 +81,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/tiff
 	pulseaudio? ( media-sound/pulseaudio )
 	media-sound/wavpack
-	>=media-video/ffmpeg-2.4:=[encode]
+	>=media-video/ffmpeg-2.6:=[encode]
 	rtmp? ( media-video/rtmpdump )
 	avahi? ( net-dns/avahi )
 	nfs? ( net-fs/libnfs )
@@ -143,11 +142,7 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch
 	epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-	epatch "${FILESDIR}"/${PN}-14.0-dvddemux-ffmpeg.patch #526992#36
-	# The mythtv patch touches configure.ac, so force a regen
-	rm -f configure
 	mv xbmc/visualizations/Goom/goom2k4-0/configure.{in,ac}
 	mv configure.{in,ac}
 	sed -i -e "s:configure.in:configure.ac:" \
@@ -228,7 +223,6 @@ src_configure() {
 		$(use_enable profile profiling) \
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
-		$(use_enable pvr mythtv) \
 		$(use_enable rsxs) \
 		$(use_enable rtmp) \
 		$(use_enable samba) \