Update xbmc to kodi in various names #526992 by Rafal Kupiec.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 30 insertions, 33 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index c9822b560aef..0b81d33a788d 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.223 2015/02/15 19:30:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.224 2015/02/16 00:45:18 vapier Exp $
+
+  16 Feb 2015; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Update xbmc to kodi in various names #526992 by Rafal Kupiec.
 
   15 Feb 2015; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
   Switch to libsdl2 to match upstream #536602 by hal.
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index bde1cd1ddd68..7cb26edca96d 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -34,23 +34,23 @@ EBUILD xbmc-13.0_p2.ebuild 9270 SHA256 9ecb70c2024f19560ae1ce253400cac01e1ccd850
 EBUILD xbmc-13.1.ebuild 9206 SHA256 39b3038b506ea6c7b28924460e3632a7819782ee3d4a35b5fc21383135cbfe73 SHA512 9827ad167e6d5bee7682db983638186c88c978e0b09284eb9dce3c8543a43b9ae7f209662c44d3f8bbc7a097dbfd46748433873c622ca7354fbac0eb52b0277c WHIRLPOOL f6214b9e8b5d1ca7bf23d2fe5f4707fb81ec3e1cc611d5264df689ac1edbeec20170cc3a3d8ec7dbd69d80031d46833b02078b5da177e19a3095af954adb15a5
 EBUILD xbmc-13.2-r1.ebuild 9205 SHA256 df7156a2a0c748039688f4a5096aa5dc9568ebc4060a4139bc2e4f640abf5b62 SHA512 bd879b71a0c33e8a461300d2863b03e227e1499ef1326a6cd197395d5cd3d1d0f7a9bafb8d0f8d103801f283dbd196865f8b993be36ca46ce5a138d645c0f0ea WHIRLPOOL 6c6766ee78f389dd31fa2ffff776cf0a27236f805be2fb4ed7c4ee8efd92143b1399fd05d083ba1e6ad3da521b065cf16e116fff29d1847a98f0d14a46401022
 EBUILD xbmc-13.2.ebuild 9206 SHA256 408dc67d983a22f9252e5d2cdd10cf60d022775074f14b9e269f0ac4a93b3ac6 SHA512 76d1491e51c9571361ecd5bc7e31b5a8d17b872ca33360a65e0a5d017c971a5429ecb3439c2889185c08443ed3b08158950093fd10ee034635b693975b7bb01f WHIRLPOOL 6df1aec03b4d339075ca7cf7078f3bab2af2b8ede8dea862e8831e523158015987228798bc166e730681c019f7a837e099e2f9688e54ce8ef5748ec4acca2d78
-EBUILD xbmc-9999.ebuild 8669 SHA256 220992832740717583986e717ec8b81b169bc6cbfb98d78aacee99d987a8a646 SHA512 b791e2c41c549fd4fa8f8a539dce8a1499c547dbe083b634b17c8e3a9a4062ee668908c8ce38431eadc0106af6069cb48c0d5e44375c5817c99d4d78f21d1eeb WHIRLPOOL 0f02b6b151efa170357ef41dfe505a30b047a52daf5f3799df3ab57b3a204ced44c2b8d0b24ea9b0349012904e78ea1bb6dce21a339ebaa0ddcf8b7fa3bdaea8
-MISC ChangeLog 37143 SHA256 566b6cd44b1ec8d23b58d9037f6631f12e72f6cd17b29e06f351c95b75f1936a SHA512 67f299a5aca857a012b897d5d887604eb6c8d08c9c1c8b93377d1f16059c841a8a17aace60d4fa871576882cc33602055f797b5fd52f3329ddbd71e203194cb3 WHIRLPOOL b088c0e84ded9beb4fdddf315569fdf5e1598612d59fd840c207709d008964523d63e4794cdde007986e0b6a87dc8d1bc5bd211b8e920c683213c25bce0c5bd2
+EBUILD xbmc-9999.ebuild 8482 SHA256 a8e4ad544afee3456323d54d2fb865f7eb659219e2d6dc65216e8d1284c0ab09 SHA512 c1de6ec1c1aa35005eda867032408266277d0a82317907e3b48cc34201e7881f6a91511cac46461659a644b0c55ec25632981ee1066f96a4fd97d2c89a45afc8 WHIRLPOOL a942891a30f211d30567af364e41b7185371cfbefeb3c40cb1079a3ff1d9ea9123a519bf37bcb801bb3eb15b962e1122416da09a2d82bc858f3960a3d8c5072e
+MISC ChangeLog 37276 SHA256 c7165bbb8568e342c382bca5bfd999c90007889f6d5107a9ec5f02fdda2da4c4 SHA512 1db1e65e6d0b073882e6d1f0cb70d34761340b1d8b65520d1dc16afafb520a7c817bf507f32f5e100c9a97dd6578cdff88356f38c90f7ce862672ba96a052473 WHIRLPOOL 6368f3958ae8da398bfe1dcec61cfcb30efb89af9a21f2f4bdef513ef0e5f10daf873e342f5d4c6c51212976ee7a66e6625d2897b716d0d1ae17af59401fb2ba
 MISC metadata.xml 1164 SHA256 f8e32d8b3a4347b197b5d1c6e983d6928b6516c437ab8fccb9d910c6f58c107f SHA512 49f19f115cf306447afa87c18724d717dc7b924b65b0fb4f5d55212b4d30650e28217bba4d848a786ecefd18622c89244b2f70e89c246372e4ce723f9932c76f WHIRLPOOL 6a905fce5cc388227f8f2ee471a198cabdd8dc203d52d21073c2a1999bbe12cb1620d693aba4468f88982a2eb3b876c912ceb710b615aeecaa92dc9bccfc7af6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4PRsAAoJEPGu1DbS6WIAUQ0QAIICBM48oSxl4n/IpGaPA05d
-xVdXk59TcMulpQMYaZyHF9qioiYNFkS0aRsK8qLKjkkhOXB3ig4pfQBjMVqlWJUJ
-QOcRE1oxUk+tvHFmctdH0PWdrXT2McReG7HZeVXUoSJft486Orz1UoNgwX52iCez
-0vDk1HYEcQm8qG48gVJ6vlPHK/cnClZIQiDDy5a+ycGMgr3lqi8Bb6wvj3n0O6bz
-Wgja1k2FACPR+h5fuhh4RfRkOFZoMxXsNOPsuude/19LWKWRB197j795H0cTFtiu
-ZF5Xb8HCRt4K3TipCEs/Ckkw09I3wuctYIpwQ98/xxLMCDFt+8gSdvg9JdDBd//q
-oJPz4kmmGMUU8UTN1Gum7vFSW4LiVzN49xwbhQnoD7L5OqqD4KnnrahCBLmg7WtJ
-KD0oiVk1Y+Pr/S9OZhJOehbjU/wzmjF/MFtFzMv/kzE437Q453FXrS9zQmzs5nfV
-t9kurOz7ezOc4njQ/kAw3FATJZCxUZOSLPU734ynDCpO933OptGVysbl0tUQQN4i
-7yEyTnKj/GwI+rJE6gqWf8nXy7QAJ2LsXvP+rmbskhZhbR2iWVdmt5CYT6x6QeGr
-xFJedBVaMBCzZ1QAYfVuaQg5lqhJg6OOGMgGe9OYkW8zjP7Y4GlAoXMehHBVDOq6
-pSL3xtVq8rdRPM6Q8uAr
-=gyIP
+iQIcBAEBCAAGBQJU4T40AAoJEPGu1DbS6WIAjJIP/0V7nEr7Sle5aqzdN1B7/n2a
+4/FybMjHKQXjeHq5DxGbbQCvGKW07QRFaeaim5h54xPcr8wwvvD6LHt+zInx9bY+
+Eb+53Da5SW6S9EfTmGGClGTm0lUTdfbsbbfCp3IPtUAlOLlxn4q6KRGrmtKjZvcp
+HD6t824PeUwZIAhiyKvUpHC7UAyvq9dzXZVxBNCjkAZczN46jAvlrRjjsRURID6b
+m9CG//9ci8oNXKtCrrUsrewWttYsswiLhAXs1R5SLGzwnnFQgF+N/8sSlSPyKLrj
+ibiBmvu6EEYhwenKVXkkKL5qFB0espzUwMGe7b6+N7A8EvPmrSRauhbHh/f+apYn
+E7NkSqljylBhOQXcfNr8XQ+Hl1Cq1EAOrVOK/kD3y8JyB7S/MSAZzL2EpQ5yKwG8
+Spx4ouUsV+Gq0nQKvfoUrgfZaVx07fRtLXOZon1kXoixF/iF3c3hjFxU2SHfrcSd
+dUrxL6fzUIbhl3z7kSwJugFrui3YiC0JG7bssMPbpvptxKXTmemxjoH0incfeLCQ
+0b2KKvPiqn0cMX8JbdApUn9wjvXrocIGU6dKxShJs/lpOywENUV4JsvfyztVY7Vn
+CBwm8pO803vLLnVMPwb5FlRT1Mirkqsrmv06ZJyjdgSJpYZYaWE3VrI66McyIdfU
+6hP0rR0kxgOg1WBZCAUD
+=rhCJ
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 194b031ca588..73bb3e54ba90 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-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/xbmc/xbmc-9999.ebuild,v 1.171 2015/02/15 19:30:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.172 2015/02/16 00:45:18 vapier Exp $
 
 EAPI="5"
 
@@ -40,8 +40,8 @@ case ${PV} in
 	;;
 esac
 
-DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
-HOMEPAGE="http://xbmc.org/"
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -186,7 +186,7 @@ src_prepare() {
 	# stuff handles this just fine already #408395
 	export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes
 
-	# Fix XBMC's final version string showing as "exported"
+	# Fix the final version string showing as "exported"
 	# instead of the SVN revision number.
 	export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported}
 
@@ -253,8 +253,8 @@ src_install() {
 	default
 	rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}*
 
-	domenu tools/Linux/xbmc.desktop
-	newicon media/icon48x48.png xbmc.png
+	domenu tools/Linux/kodi.desktop
+	newicon media/icon48x48.png kodi.png
 
 	# Remove optional addons (platform specific and disabled by USE flag).
 	local disabled_addons=(
@@ -264,30 +264,24 @@ src_install() {
 	use fishbmc  || disabled_addons+=( visualization.fishbmc )
 	use projectm || disabled_addons+=( visualization.{milkdrop,projectm} )
 	use rsxs     || disabled_addons+=( screensaver.rsxs.{euphoria,plasma,solarwinds} )
-	rm -rf "${disabled_addons[@]/#/${ED}/usr/share/xbmc/addons/}"
+	rm -rf "${disabled_addons[@]/#/${ED}/usr/share/kodi/addons/}"
 
-	# Punt simplejson bundle, we use the system one anyway.
-	rm -rf "${ED}"/usr/share/xbmc/addons/script.module.simplejson/lib
 	# Remove fonconfig 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/xbmc/system/players/dvdplayer/etc
+	rm -rf "${ED}"/usr/share/kodi/system/players/dvdplayer/etc
 
 	# Replace bundled fonts with system ones
 	# teletext.ttf: unknown
 	# bold-caps.ttf: unknown
 	# roboto: roboto-bold, roboto-regular
 	# arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514
-	rm -rf "${ED}"/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-*
+	rm -rf "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-*
 	dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
-		/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Regular.ttf
+		/usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf
 	dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
-		/usr/share/xbmc/addons/skin.confluence/fonts/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
 }
-
-pkg_postinst() {
-	elog "Visit http://kodi.wiki/?title=XBMC_Online_Manual"
-}