summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2013-03-31 15:13:17 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2013-03-31 15:13:17 +0000
commitc661bd19cea7121c59f1cd72e5d67b1fd6c1bfcc (patch)
tree87af30563d08ee5420c1117dffaab149ed273239 /media-tv/xbmc
parentmake plugin header installation dependent on plugins (diff)
downloadhistorical-c661bd19cea7121c59f1cd72e5d67b1fd6c1bfcc.tar.gz
historical-c661bd19cea7121c59f1cd72e5d67b1fd6c1bfcc.tar.bz2
historical-c661bd19cea7121c59f1cd72e5d67b1fd6c1bfcc.zip
Do not remove arial.ttf wrt bug#460514.
Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64 Manifest-Sign-Key: 0x8EEE3BE8
Diffstat (limited to 'media-tv/xbmc')
-rw-r--r--media-tv/xbmc/ChangeLog5
-rw-r--r--media-tv/xbmc/Manifest30
-rw-r--r--media-tv/xbmc/xbmc-9999.ebuild11
3 files changed, 24 insertions, 22 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 7bdc6ca11648..88f5bee0842b 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.174 2013/03/29 16:14:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.175 2013/03/31 15:13:14 scarabeus Exp $
+
+ 31 Mar 2013; Tomáš Chvátal <scarabeus@gentoo.org> xbmc-9999.ebuild:
+ Do not remove arial.ttf wrt bug#460514.
29 Mar 2013; Mike Frysinger <vapier@gentoo.org> xbmc-12.1.ebuild,
xbmc-9999.ebuild:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index b7361ad11b62..612c4f4b3472 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -21,23 +21,23 @@ EBUILD xbmc-11.0-r1.ebuild 6507 SHA256 8a061777222215b70be0e356744a733da97bff974
EBUILD xbmc-11.0.ebuild 6295 SHA256 5a700f39848da84db6e79eed1a316dbec2cea01252ae412f2219f63b653e8c71 SHA512 02fd0286655573965dc9204d1580d69dce5a9beef049a92ad10d619e39ef9ad07524b4172503626a442c8f4969200e4e9587b31e776fc5ca8a2b3f2596a11b12 WHIRLPOOL 1b03964b773587217dea06243a2c4b9f459e7deb3f6efbaed17ae8fa0b80e0f83e286b03d97a4ac2f19fce5df7bb609232a38f6c7366183c42165013ed7f08d6
EBUILD xbmc-12.0.ebuild 6481 SHA256 b232410feb0c2715dc2b2e9ad9204f1e1f09a9237c0cc57b9a2f23f8a9e2b8d3 SHA512 65a1cac4a88b806ecc327cfec1ac3ef90dc73868a82c8ace3a47fcf5eb2b61f125d317646c096b671bc88f7814e08231ace11312e74e595a8c421696bd1982c3 WHIRLPOOL da70651c655c64ca82895236d11e1ae4462cce62809ab0338364b142bcd03c42c6d244c75591df381cc93bc9809d44b6f5f6a9a518fd52e150d4c520a21d2622
EBUILD xbmc-12.1.ebuild 6483 SHA256 746ac9b641afbe5042ab00bbb1df5eeef0644ae2320ad4e90e80c1b6c4fded0b SHA512 e9ad55facf371515f180e081ca1ff41eaf6290e819659dbf03ecebb874248b2652ae4d5eeab022fd8229c43a023e944779fb4356fa1b64fb722935d7f4c3c986 WHIRLPOOL 8a6989bf3684fe4048d9495fdc10ed88488e75c792e4e73c2613ee4da63a2feba3cdcddd30c1b80b42e409e13cef76a8318782a0241786549e6bd490a2bc2705
-EBUILD xbmc-9999.ebuild 7529 SHA256 d464bc66c445a19d1cbb7a127c816ef89540c42c64c5d35cb0fad15197ebdfc8 SHA512 92b4d4e64c0356519a3a4d8f2fefd717dd791f9f4641021b07cc1242d29b69607d13360134f4523eecf1790428fdc167355e16ce0d79683e4b19fb3ee1febe88 WHIRLPOOL 9b94b8c57439b8a1b358725def8638d2b0271d2077d3293363dffff4645978cc6f8cdc70b947a83266bc75c60ba83e70d4671400db4165e380e5f06e9de78c72
-MISC ChangeLog 28037 SHA256 44f3bf50eb5d4ae45c3b7e78534af3a9492b0e27c5bf02db0484f0c40feb42e9 SHA512 f53b09201f6cf968faf61d291964437194cb8d71e3dfb78a7832c706138b4d6aa8d8d879c9a6e0b93edeeac52239fc40ae5d51b75612cddc8c6668916a5bb716 WHIRLPOOL 4a27178df33272b2e034ca21a7f942006daa70d8c3c9aa151b6c6192133cfaa49e0c395a053ee3659deb5f611f99af97466b593002d22ad0cc88ef59fd205c07
+EBUILD xbmc-9999.ebuild 7438 SHA256 8c8a96b1cc249e93115ef642733bb1505e1b4f939fc21b9e8235d68875236fbf SHA512 eabea33573d02acc94f33394c3020c8a6ac0817a6e35574123daf566f85c35fb993f585e1d9ebab58a5cefdad3c0195387a7cbba41ee3f297791765bf4edf58f WHIRLPOOL c37886f74e9c09a9bc6ea26ade7cebb125bd3cd4f5d2d759a320afba02a0543476379318a8d4f0490b58562d6bb1374fa0de9c5581cecb04c733d13ecc0ad1d5
+MISC ChangeLog 28156 SHA256 a645f9aa00769b521aa2f5c5ac24a537ada9311ca33bbd4c2b3ff2340728d2a2 SHA512 bcfe08f02bfb5dd293406ccbc3306de207ff73782ba4d5be14d4da1285a956f75e9a87c5ed0ae64f38d89cbe8f7e5cfcc0576b0e63bc909c7ca936b37607a0b8 WHIRLPOOL 5409768e7db0370487c40ab367875856a7b5dc868232c1b888ae6140d27024dda3a9a1284b631c97884d5fa7bacf007184157d8a7b02b68296deced15862be71
MISC metadata.xml 1090 SHA256 8ec926619d4ed4beef3e8a3b5127906a6ac04132bf598452420969ad59615331 SHA512 d9b3c1fe1c8997434afcde1ea63276e7e8db0ba1a1e962e87e55a3ba106d95c536d9c38654cacb7d9d9da84cdd5236a49029748a4a8a6da061b864ae3db1f692 WHIRLPOOL 516eb5cd2d07536ad97ec71f3f68dcc1a874e9c369bad2f334a1272fb6a3ed795367a6b14cb8c4ed66a9b464bd68b6d11ab7eb195064543bfb102dae069a5791
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJRVb8aAAoJELEHsLL7fEFWOXEQAMCxvNa260ye8uE1H9xWACPr
-7JyPxOIhWXPpb/f2arFOHTiMb5UlBXV16lrAlZ6tliEKHodFgM3KPC0o7CnKtHp6
-qSWnKScffJNLXCjn1I0u+7Y1vTdgbcQqL9dqQy8gmn+DoYOyW3kjMtIvnRne0nUw
-Wwv6lYdPWCkgr1RCV4glSugy6BvTzmvKexZyZSphhQJ1qfrynX9IbkGH6fc5EAAq
-FQiWCOJs0KgLGZ88DDK6XiP8s7TBXZ8cN0rBX62FtGsbTnHmC/H4pOwcwUbMkiln
-eJ2Fqlcs/ub9XOo+9ZjqhruZK8K0vFv4fzlUBsVeaa0eqhWDj4LENG2q7FfWKQVN
-kqI7GgTdo23hgqLU1lHy6Iaeg4O9g16RO9d0jib8wmnNAbPR80O+mlT8iG+fLwVy
-U7d3/c+CUrz35lSmsq4GSucm7ACWmgdX5WwHCoYVtYLH7LgmmLlPwtU8wqnW7G13
-qTjt1BuV6wsVdE/sIPLd2VuMIueas2pauOJnsaT4aocKQIpr9LXV8i7LHxuo7qCo
-HYom0l/JbLkrKEIQbDPoDKssIQjXXz9+ZPuobbhZ4KgnlIPHwcjEk84Z00XmKiZH
-0xbYoemcRviSd7Ec5wKHSCNAQSPOqYMcd3u01aQHWLeE0crsYMZD4/8wnlMPNRFr
-xrgpRTQSUSsBIq64MQPG
-=hH7R
+iQIcBAEBCAAGBQJRWFKLAAoJEOSiRoyO7jvoVN0QAIK9yCtZaQd8SUJkjq+d0YH9
+u8HQMIqRvCpGWc9K1JayXpLKLOoDRAfr/4u7raQ6rdUbAXsoGvQKnxeR4ibl7CPN
+EF9ziEnNYR5F2DOoKf8rK0sr2c8yAHvccAD5h/YN+WTfy6WDvhddATg1lPRTbrLd
+Hi/uelaB7whjrhsO5TouLV8LZPwtv3iKB5ZJpvTa8+TrFub15wT8j5K3hXCU0sAs
+/SFKWz4afOEaF1F9wdI+/AHcwywP6DUWblxGiIcMGAcIedwm9ybLLtQLdtyBfNK+
+RVJdyaDtf0fZRQVTFfFUhhLtX3FDEE51/L83OTSkIH8jB8eFSJun6LeMwM70vOcD
+NXLGv8bkz0zYMML78g0ua/iZKSkZXgDxzunCHBZoaInJyOJH6s6gWZYTu1BUkdXP
+Hk41qtPXCMicomn5P60R/+0YoGlaUJW5Gs7bc4wWVbHHMUy4T5TiyjF/Yjoje019
+ITdXYUcoptGQ/Bpw3RfpVIbjhPDfBWsSUmRunlN7DFYvnIs5q8wpD9HhWpplTICD
+HFMsPQZhi7TucnUTJXipjmnwUt/v7iqdDu+o4W4Mx+B4fcg0K+Q82rNJFaFEeItS
+Fu/ig1c58EF1tH4XQfWvuIMmjctwjdJqkfymkN00VYkKd1AiYcfhssQMnJrKgdiE
+jTxdm5bp7pnwxeTlxH2d
+=Aju/
-----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 77d9339e352f..2cbff7b7e2b5 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.136 2013/03/29 16:14:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.137 2013/03/31 15:13:14 scarabeus Exp $
EAPI="4"
@@ -238,11 +238,10 @@ src_install() {
rm -rf "${ED}"/usr/share/xbmc/system/players/dvdplayer/etc
# Replace bundled fonts with system ones
- # corefonts: arial ; unknown source teletext.ttf
- rm -rf "${ED}"/usr/share/xbmc/media/Fonts/arial.ttf
- dosym /usr/share/fonts/corefonts/arial.ttf \
- /usr/share/xbmc/media/Fonts/arial.ttf
- # roboto: roboto-bold, roboto-regular ; unknown source: bold-caps
+ # 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-*
dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \
/usr/share/xbmc/addons/skin.confluence/fonts/Roboto-Regular.ttf