git-r3 instead of deprecated git-2 eclass

drop warning about configure.in
use correct compiler for configure (Help distcc with crosscompilation)

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

4 files changed, 32 insertions, 19 deletions

diff --git a/media-tv/kodi/ChangeLog b/media-tv/kodi/ChangeLog
index aa7097307ba2..0f00a6fc8886 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.3 2015/02/28 18:06:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/ChangeLog,v 1.4 2015/03/03 14:37:22 tupone Exp $
+
+  03 Mar 2015; Tupone Alfredo <tupone@gentoo.org> kodi-9999.ebuild,
+  +files/kodi-9999-gentoo.patch:
+  git-r3 instead of deprecated git-2 eclass
+  drop warning about configure.in
+  use correct compiler for configure (Help distcc with crosscompilation) 
 
   28 Feb 2015; Mike Frysinger <vapier@gentoo.org> kodi-14.1.ebuild,
   kodi-9999.ebuild:
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 4e4f2703ebcf..cb661d3ed969 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -3,28 +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-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 7710 SHA256 5ce08ca8d366b748706c774cf2df589210634e3f3b6480bbc822eb583f142642 SHA512 78990676603a07cdd67d63622324569eef38e8fe6aa121ed810a90eb41e74d514357cdd052174573cd4ed132df636ea20bd955dd2f93f69942dac793dd4015a4 WHIRLPOOL f482f6faead695938a66ecae58088ee5248161f0eeba62a95232a000f382552da68d8a8e5e5b3ecfee4bae1a2988d20560ecc4940d20892638fcb0f98af96266
-MISC ChangeLog 831 SHA256 eacb42fdaff82c7514698b870c7e3e667241ca23d041d19342c60b4199f5321d SHA512 6772df11a80a2b2f73bc7084d1777e2d793c093ef6367895aec56b7e0207e1047f2e4868ae5ea5ded96a6f280919da0ea5955ece7a8b8c828d79aa712d732a0a WHIRLPOOL cfa99c4c3473d3b6151b27e761e087c9e87978c7fb34752cc4ffa173e4226dded43911553050a851f1159c1f4b72532b4c6a92ec50edc9d5f2abdcc2edfdc5a3
+EBUILD kodi-9999.ebuild 7910 SHA256 cdd952dd9d08705a0a7b4a1e8f4bd7da5d89fb039c9ef568008fa1b0e765bd86 SHA512 3df5fd99bb2fdd0064ab910c77d79f0d31b703cf8a9cd64cac2e40344b8aa9b87e68a2eeb7fe5f3b6616f35bda296ac33e7e5e4be5d77e0c7a18544daffd5aae WHIRLPOOL fc3826646798fd83e884b6cffb528c99a78acc8e9bc2f99b277b76c3d1c09f55d70de96011806deb12ebdde6a55085ecb8ba4e5bb1f47c99b7e8bf574c05a22e
+MISC ChangeLog 1085 SHA256 0f425451c464b3946cd4b3e511428a292d677e38c9cd2d2648d5241ce509f690 SHA512 f1aaa34e3b66f559e5accb5505990be73579bca069f50ebf09b1d249beaed0551aebf2b1ae8db69733fe0ed955253dad0146a7ceac0c153f6b838514a5efe583 WHIRLPOOL 0fa4cfc3cc638aa52ecf40e11816752b5ff47f269038b190aead5007e109063b1078026599856d3d636171489177af3f4a6006791488b98d0a6fd90aaacd178d
 MISC metadata.xml 1164 SHA256 f8e32d8b3a4347b197b5d1c6e983d6928b6516c437ab8fccb9d910c6f58c107f SHA512 49f19f115cf306447afa87c18724d717dc7b924b65b0fb4f5d55212b4d30650e28217bba4d848a786ecefd18622c89244b2f70e89c246372e4ce723f9932c76f WHIRLPOOL 6a905fce5cc388227f8f2ee471a198cabdd8dc203d52d21073c2a1999bbe12cb1620d693aba4468f88982a2eb3b876c912ceb710b615aeecaa92dc9bccfc7af6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU8gOZAAoJEPGu1DbS6WIA6+IP/2FKRlZsy9/53RbCb02ZxV36
-HKfx+W9/+AbSDXzS2qv13RKnUAizeUkp6L1GVScIY06XkxzU9uw6YDp1KRNXoJ2C
-3cO4hGZnjnW8jxUxJK+e9Jx58HunAiHw9GdESvlaX2aCt3Jn/REc6BPfJ/nL7gDT
-z8o9X7XobYxfjibzVBhHULygYt7KNN6g9graaDBLCQVLEFgOL0pjPficIYbYMVRN
-trXJyKCTqQC73JOal0pzTHWAxdEcI8CSgWhAueUYnbfUbKXl90yqBroMHv7zJm9o
-VOqDEx8pwvWeYFrx0/MbeIFg/QcbZgFf/cdvfSLLzEsPBkNnsVLZBx60ZDDHvM0t
-zAy7ZBVrBZl4iAM18ZCF0lIRgV4fOK+qWYim02WTfc9Ych1I9TWiQ13mE99EcWJ+
-kCuBsBubjlsgIg+7S84OwtSCE8hItGTaJULHeIRbtYTkWYCR2BTfdtufjMdfavD1
-6uFh/CPHUQQTKWUESB67gSsycEz0b0F4u1HGiK5YH6Iog1LhSniR/YceGIbKXGxt
-KGsx1lI7u4nwlv7P646xqVzaUNh8mCGUO6r2VQ1OlITaBEsjjflF1g9BGmXgVQhU
-FMx7p9dpgY190xOdktd7SJJuw6a3OTDTHInZzZ5VM8BT62PoxRUXt3PGLOhGM0Iv
-Wsvj+0J2vQKIg2Pgw0+6
-=SePi
+iEYEAREIAAYFAlT1xycACgkQIY77eQFFFC2a9ACfdD79zHyn+M+fOhedwOE01RcD
+A6kAn3NmpVB9BHzJm742E9bIz9NXQfH/
+=5iea
 -----END PGP SIGNATURE-----
diff --git a/media-tv/kodi/files/kodi-9999-gentoo.patch b/media-tv/kodi/files/kodi-9999-gentoo.patch
new file mode 100644
index 000000000000..0032e76ee095
--- /dev/null
+++ b/media-tv/kodi/files/kodi-9999-gentoo.patch
@@ -0,0 +1,11 @@
+--- configure.ac.old	2015-03-03 14:26:28.690271749 +0100
++++ configure.ac	2015-03-03 14:27:32.283087389 +0100
+@@ -2230,7 +2230,7 @@
+ # we don't compile with default upstream squish, so we use our own one
+ # even on non unified deps platforms
+ if test "$cross_compiling" != "yes"; then
+-  make -C ${abs_top_srcdir}/tools/depends/native/libsquish-native
++  make -C ${abs_top_srcdir}/tools/depends/native/libsquish-native CXX=${CXX}
+   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],
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 3eed6c7d23b6..f8ec8de6855f 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.3 2015/02/28 18:06:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-9999.ebuild,v 1.4 2015/03/03 14:37:22 tupone Exp $
 
 EAPI="5"
 
@@ -15,7 +15,7 @@ CODENAME="Helix"
 case ${PV} in
 9999)
 	EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
-	inherit git-2
+	inherit git-r3
 	;;
 *|*_p*)
 	MY_PV=${PV/_p/_r}
@@ -137,7 +137,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	[[ ${PV} == "9999" ]] && git-2_src_unpack || default
+	[[ ${PV} == "9999" ]] && git-r3_src_unpack || default
 }
 
 src_prepare() {
@@ -146,6 +146,11 @@ src_prepare() {
 	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:" \
+		bootstrap.mk || die "sed failed"
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 
 	# some dirs ship generated autotools, some dont
 	multijob_init