Require media-libs/ffmpeg:2.6

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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x0145142D

4 files changed, 34 insertions, 16 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/Manifest b/media-tv/kodi/Manifest
index 5442bde92343..36212861ca30 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -3,19 +3,19 @@ Hash: SHA256
 
 AUX generate.sh 803 SHA256 8e32ccbd56e2d36d9d0504282881b3ee1d33ee7293827b75444b917093955d09 SHA512 064b11416be5583202d92ab0c87156b7098bf4a97c7875ad3a0b11e048ebcfd69aeb22653e8175e7ad0cd400ed2d9c27aa8d1d25be04d34438f4c4f86e329986 WHIRLPOOL 3565b3f6ef9650bfbb3b9e4b6ee5b71d1d245e62520f00f88f1c0b2ade6bf923200a1e94efdbbea8d5e53449f38ac78bc4714280e276e085c91ada404ebfeb89
 AUX kodi-14.0-dvddemux-ffmpeg.patch 466 SHA256 dbfa9edf3592a4b06292a0813fc920e66d53808ff5bb3aa9192a750d11015ec5 SHA512 cbc71ae5f85374b15f19139a549fc10e5ebb363af0e6354d708043748b2d6e89903223bf4146472cf6281f4fb912b1c72407de4e81993a89811d4b1fab226f87 WHIRLPOOL 5c9167c97f057b57f6e2d2a57a1ce798a7c9f8e043db987e73261a45ec1f9e7e694385db1c5b7738e479d9be2ddeb1f26990d4df518710aeb5ee18ad02b838fd
-AUX kodi-9999-gentoo.patch 603 SHA256 c8c7831d1ab3789510f72bda9ab5f19a50871b7cd8ceb36f8c386d51752c6988 SHA512 1ddd7196475dd7af7c9c1c67535db4461bdb8403e5b6ba4bc10f74e33c70e73d99f0f01812c95cce371d5cfad4a18456ffd835097bf6ddffc4c7332913fe0ea5 WHIRLPOOL 5746953d754b436074325362c77d6b13ed290605d8b498ddc81574f613305f6e1ed3489f8e3698941dd99660d603efc99f359adbefe524e861ac3ff34e78fcbb
+AUX kodi-9999-gentoo.patch 1160 SHA256 811713a6381d7d9cfd18846bd3558f3e8c478a056d3389853fb6136ed6e35a55 SHA512 62017571f9d3fc1d89dd6835fc4be5a235d947311070ffdf3780750d8f854cce11ffc5e212fb6174480d781931fbaef203e6bee5cb19311bc64851a5afef1212 WHIRLPOOL 691c26bb57090a6196888c74260c1b38c217a329446ecd8768a7d304da3605c37585ea49b42ed0f90eabc477789c7ac4f7f5b0df5d6e9525fc9a0eb7bf97fb9e
 AUX kodi-9999-no-arm-flags.patch 478 SHA256 075db2562d31914d86b4394500d4b3168ea77114b63d1a7929ddae96111017a2 SHA512 b958cf3ab4877dbae4e5bd1376e8b9bd82f0dab43b1695c1d85e0e8ff366ef278ff686fe6394a04b3d79e19f11d8c92689fc049d2874e3fc12c907e36e993064 WHIRLPOOL f322fa4db24ff6f3372bdadd3dba8fbd4aed5849dc676f8c63d654f2c83de2165e60b26af821647a46cfa5ff129e7e0cb7c39c5cddbc2e5d9ec675bb148b2d63
 AUX kodi-9999-nomythtv.patch 1689 SHA256 b54e52be122890affca5eb726873817bfbaa1b5da0d58231bd0c098681ce6b35 SHA512 ebd3deef88fdef0b54bb5936f9a479523297c1224595ea021af0674b9cb422f3a3bdc03c3cdf9e96f475b23e68983a62241d91cb74fd4f69b2635e6f7d4a80e4 WHIRLPOOL 0d2ad77fee3a4cce535cb25c07c481d9133c867f6de1fba5cd1dcc6f79d480f496673c223e464d90cab9602651e226792679eaa499959d7cae01b94f64a2f345
 DIST kodi-14.1-generated-addons.tar.xz 71072 SHA256 0666eae88a3214f7577544975524b95a9f55b107cde5124d5d299351427c5d39 SHA512 a26889ba8af33316ac61bbf5a55ec6cd72cb867eac9b6d7c626ff890f3287de8704cf8372a5e2b72d6075ab8c31ba3d8465d1da0c9437065fe6e0171a560142f WHIRLPOOL 34a7067964febd71d5e07333a1ef90c14ad3d7d09e82aa4a3245b8174b068a1b2b31d0d6e5d20a449d11d34701b59611b725c8f37ce61702489c84bda16f227a
 DIST kodi-14.1.tar.gz 70832109 SHA256 a38059e292cf8523918834e49fcc2d688525ceb7951ddf7f5ee535f4147255d6 SHA512 05dccad279073fc804faf2f179ba370f612d53c823dd333fdd151e05de37eb8202cc981ba48afff695d475bafde9c8f05f562fe09883593a70299a2f098a9849 WHIRLPOOL 464ff2673c9e65466dff73d3c91b8754ee68d64b4a18ebb0b0c6e8efa2da1cc32ab22686530a8469a105bf7a089d8928db64c5c61d272462c13485006875b506
 EBUILD kodi-14.1.ebuild 7710 SHA256 0d01cde4dffa3a0c2433eb39f15333cac9b7dd4fd70852454cc3c6ca155e20cc SHA512 c9340ab0bc37fcd027d85cf63b77d5ca6196f1ae9954d860be17d8a5a0f7bdc5a02e961c5a66cbc20e930246a8c295537f2d6eb421c1d790d21dab6a3a0bd58a WHIRLPOOL 41555707f2b10a2ff2a414f1f8a1861da446bd16f0652091f7ade97241c4af03ed6d65e20eee4a4b39104f42a6b702679530f6828adf8d31f7f7fd01d22557c7
-EBUILD kodi-9999.ebuild 8135 SHA256 bdfdc5fa3fca6eaab6006cf8aeb0a0ddad3b0f440fb3b59aa9aa2833cefeac28 SHA512 b09f419cd6e8887a50d5f7de31ac76fd894f87e93b9b7b0e9882a5b69e3d056ab4db51948d18da824f2e7b2c54c3500f863a7cfc55e9fbede5cf2947ef76567e WHIRLPOOL c566de4ba81911dc812854003844ba5647cf09e5688d8e20e6c5c14d66e62a9270189349a74286152fe74b479800dc78550b84cfb8cd30a3fad9e7484f88af4b
-MISC ChangeLog 1341 SHA256 4675049558f92470c913f8d33c6924c32e0d75463b753f0520b462d8be817197 SHA512 5e07f40af9daf0261ded0fb7492df14744d5dc59d3fd0213d75746a6b6107dbb94d10527700db994c2ae5982073507106fb171249a3ced605b76899b604fba11 WHIRLPOOL 7da1335ce5c238f96560f8a435ba2ce67b12e9a96a1599f6be548eaf45a3fd3f0fc1e41eaf8f0ea8dcafa275ab07c01d28a1019bc5992b16edd72c51e8a94e03
+EBUILD kodi-9999.ebuild 7896 SHA256 6e2b05a35d76a3d3b1fa5b5f2811e969cd51f61a84fd909377f26fc4f5212bf1 SHA512 9e67501e1adcc655eb9cd8fafcb33beded476fb2a097683894df496fd90d4c1ef239b238d1245a6114107ae58e9b3a829d76b0fd6bbbd3ad983dee17c9666395 WHIRLPOOL 8a67970407f22b152ce2455fec323572da5060c4d69efbb362bc6d0982485ac398a3c5bc4da14234dd98d58cb76a9df6ccb9c3256230da06d71e5729b9bce14b
+MISC ChangeLog 1550 SHA256 74b4b2cd082e53965b6c956eb052eeebf5af7605f07d10ae09b802b20baca93b SHA512 5162c4c88647f8b2dedaedafb1075e87e83196440e1c84706ff5be731e224c46cf76b28d7a8eea67d383be64d3e53507fc7ad608c7656316a00a0d7f5ab13b1f WHIRLPOOL 9533412723336252a0492e05ab6bf9eb8720eae8f41529522f439d8f0fcca0cfd21ecebfc875c9c3040f984dc2cb2c8842b70130494e17f853633f06df6563b8
 MISC metadata.xml 1234 SHA256 5fb643446f2efcf3a164c14c438bd9a6d58f060da69aac7669e1d9ce6e7541a8 SHA512 4cf23d3684a6c7c2affb0dc7218bdc6d8b7ae1d7e029f25898f8932ce21be53df6bacb19259b28e5126b02f0cc4af4145a0c37a11a79c4238e6238bfc752f098 WHIRLPOOL 7a819921c3cf9fb9ad342de1c13652870b3e179adf8e7d639046f422a4e898348a7c9e09d15f959ffb877332bc35683896ace0d72cac91cb9515d2bcace9d3ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlT6FTkACgkQIY77eQFFFC1jBwCgpK5DJkKQvNl3PKE/lWsXAwMG
-K/8AnRdffiCq6BrO/0QhSXEGIi/zve2A
-=+8ch
+iEYEAREIAAYFAlUDTg4ACgkQIY77eQFFFC1TpQCgqcTIDv1YfSeP0xHjC6KjUr0X
+fhUAnj2e5RSFAl1NDTORkRAELuBrwAlF
+=MHw+
 -----END PGP SIGNATURE-----
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) \