summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2013-01-21 21:08:21 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2013-01-21 21:08:21 +0000
commitc8f1d51f12788a1214b354eca47a8d30f21ec200 (patch)
tree595353cc0c67749ebe8d72b0a0fa73013daf8fb0 /media-tv/xbmc
parentVersion bump. (diff)
downloadgentoo-2-c8f1d51f12788a1214b354eca47a8d30f21ec200.tar.gz
gentoo-2-c8f1d51f12788a1214b354eca47a8d30f21ec200.tar.bz2
gentoo-2-c8f1d51f12788a1214b354eca47a8d30f21ec200.zip
Remove simplejson code as it is not used anyway.
(Portage version: 2.2.0_alpha158/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'media-tv/xbmc')
-rw-r--r--media-tv/xbmc/ChangeLog5
-rw-r--r--media-tv/xbmc/xbmc-9999.ebuild5
2 files changed, 8 insertions, 2 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 96b153d07065..1d04743e877b 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-tv/xbmc
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.166 2013/01/18 05:55:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.167 2013/01/21 21:08:21 scarabeus Exp $
+
+ 21 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> xbmc-9999.ebuild:
+ Remove simplejson code as it is not used anyway.
*xbmc-12.0_rc3 (18 Jan 2013)
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index cc865c8d6db4..79a115f83855 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 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.130 2013/01/15 23:41:32 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.131 2013/01/21 21:08:21 scarabeus Exp $
EAPI="4"
@@ -227,6 +227,9 @@ src_install() {
domenu tools/Linux/xbmc.desktop
newicon tools/Linux/xbmc-48x48.png xbmc.png
+ # punt simplejson bundle, we use the system one anyway
+ rm -rf "${ED}"/usr/share/xbmc/addons/script.module.simplejson/lib
+
insinto "$(python_get_sitedir)" #309885
doins tools/EventClients/lib/python/xbmcclient.py || die
newbin "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send || die