summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2013-01-26 11:18:53 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2013-01-26 11:18:53 +0000
commitda4f80e356da694b5f11064e637aec82a54e2905 (patch)
tree4f75bc8a6ecd87ad5b1f6540e10f502b909a409d /media-tv
parentarm stable, bug #452968 (diff)
downloadhistorical-da4f80e356da694b5f11064e637aec82a54e2905.tar.gz
historical-da4f80e356da694b5f11064e637aec82a54e2905.tar.bz2
historical-da4f80e356da694b5f11064e637aec82a54e2905.zip
Symlink in-system fonts rather than use bundled ones.
Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64 Manifest-Sign-Key: 0x8EEE3BE8
Diffstat (limited to 'media-tv')
-rw-r--r--media-tv/xbmc/ChangeLog5
-rw-r--r--media-tv/xbmc/Manifest30
-rw-r--r--media-tv/xbmc/xbmc-9999.ebuild16
3 files changed, 34 insertions, 17 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 7e02146fe044..f23bd6e86fb9 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.168 2013/01/26 11:04:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.169 2013/01/26 11:17:37 scarabeus Exp $
+
+ 26 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> xbmc-9999.ebuild:
+ Symlink in-system fonts rather than use bundled ones.
26 Jan 2013; Tomáš Chvátal <scarabeus@gentoo.org> xbmc-9999.ebuild:
Remove fontconfig dirs as they are useless at best.
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 3da39abb361e..ab7947f6b0fb 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -23,23 +23,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_rc2.ebuild 6485 SHA256 c1747574823327f1e3d30662e12effaec969d5362553fb5af18f9145ab790a2c SHA512 507b3416cb85ddc201cfb83a0ff3d71f9f3fd53abb386f070d55700460f6800b90b17f4237998536443cd47fdb3502bae28c99559664db3bfa102971a32523e8 WHIRLPOOL 9f9444da3a277ceeca19cd762d7b0e24a2be28f2c14c868cb87b5f1228b63689f6560d9dec16551244d40d1d7e97194b3fa7d7e418c940d72ffa1441cc59b644
EBUILD xbmc-12.0_rc3.ebuild 6485 SHA256 6945111215e22e4257a159df698d8091bf4e49f1da287351f847b1a46f8eb599 SHA512 60aaa6edcfc5bde08dfd74a42a1ea36536acbe8aac17967c9209b18da4bf546b0f27c1e14d05869eb3e07ac13e2482e4ad69259ebd733ad5369bafed8253a079 WHIRLPOOL 32e008b48d094f4cde1b06e8d16fb8f6d3e9b5381f7f8d5abed1a16a002658dd87f94f646bb1c4f398140e3eb9abab2eceb3efa5d47cae7c4f124a3ce1f24a17
-EBUILD xbmc-9999.ebuild 6854 SHA256 2c25a3d1fb72043c5d6d348e683ccf5e627ecb8a701065027fe290602a977bc8 SHA512 49ef03e99ed0e5d5198b6f0192aa6694ef046811e694cb19341623d9cccbd9204aa660d2f2912ec281e7d9dc76599fd812e2ae97d73de32c3f2dea9eacce66bb WHIRLPOOL fc755f5fcc1cc0b1ae69fc2c8c1d62fe391e6a85482dc0f30ef8b9082fc2175db809f5f1a87d9967907d33f8d940db8860339df0a6134343a64f3b5b9904eed4
-MISC ChangeLog 27147 SHA256 7b27d5245b78e1e36c02d10103a0b9d750ff8ee065f0af89dd354f602de513e5 SHA512 e4426b20ffe6b222e37b8ece6f59befe5e288c1b57aee842aed7eed269d83764a28d1e1aa08715622a44cd411e02f2d21b56b33ea642198e905cbfd449229ae3 WHIRLPOOL 0bf302c840d97124f8916236a1e2a40c939fb8d80a4ff36d7b425f890eb14c6d77e6a1d3997591698c1644b924cfbf801383a72d06eeb09d3df762e2d09e047c
+EBUILD xbmc-9999.ebuild 7453 SHA256 1417ce13985ac4a6ff7bc4833c00aeaa5fbe086a68d815e55185def85c3a336b SHA512 f0566ca8bbcc28ae1ca33bbb048ba80a7a3109dbda84f7f6920873a81e390961ce5797bab7fe4e1205308a0c9b4be122f9452e67d253ec2b412793f1e05a4d4d WHIRLPOOL 5e5c7fd91d38e3784559214810cbf8220556e10715b237eaa1f310ea1f6f38b8c6d10d198a0a690f36ba7f920fe2cbfe1346a76ba43a23dddc5e07d98474f3e3
+MISC ChangeLog 27277 SHA256 998293723ddd8ff8a209904a7f3b8b389c01b713272b397757821c78e6471298 SHA512 cf9182acf28e7264931b43351bf3efee79d9630af3dff4e1ba24664699a6771b8f131307217a775ce96f1d7c3017c0b0a4025316275f04a588e07a5fc3aa3bcb WHIRLPOOL c31dde5ec9723e33f8f2d4af16d310239c86ebfa75652e3c3bdf15397f014fc9d34c66f205284457768f0476e1ead62951573569a4fa5cc2286a0891fb8a9fbc
MISC metadata.xml 1025 SHA256 73ced63a34ac528635412bea6d8e671d6ba517c6bfa17d0f48a560a9de0f12f9 SHA512 40d2a20175ef2fd0bdc5228339f4236905cd91758d30bec4c8575ff2a90f59e3333167e8ffcb125f382530248931e1a0a98f7e67a40073bff0850c350bccc36f WHIRLPOOL 3c4f940a8a42426b530041e0958635cbd46d9a23817594f82dbe4dce2a0873189c727a53663bb98c198c146dd38dc2fcb6e06823c4c22cb9ae860c3d51ea6750
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJRA7g/AAoJEOSiRoyO7jvoZP4QAIgx2NLYG8z4570raaOmBqNY
-wcF4z0E4qoU084rN/JxND264bgVQmwGoZRMOP1qLUHR+LCQ035fcy1TYU1T2EhSD
-+b5VDZZA+Qq9/3f9FgPMKOEgygtx7iQlydR/04Xig/HoHS9+ZFkyY3+/61WsHJFw
-PbZoPxzC+wXFu9gN9/PkSmI3TrCPMqIybB1oxNVWLqMjd62nEjNBG8ZL6MSl0VSJ
-roawf3cMKZ7gcGGuCUXvr1U3Z1dy2zpNpVNc0+gp4Bq3fRwjsTshckng8GerxCZJ
-oiGph0gErJIg1GpxAKCRdY7VoR/v1XGUa6sU+L2BnHWFsCfE0gr2khfd/JOXABhj
-bbDYZXhYf6uUg8C37ZBLH4E9HprrJXmd2+LCadmyh7Za6pFpyIWeHqQwsgOUMmcb
-QEa6Qd/p7hl1SG/keVLaVqsyIBexMbI5LFRXrdDg7NoyissaOJwf8DTDCtskjcah
-5iial6uOQSR/4fqfOygUAfTkTNum9JKBKbfM8gsCFLKvoy40RBAaJ1TGe0cqbVdZ
-9yXT9pYVcmvYEk8BU7oHHVwWU5yROO8fdlZXVOgrkf+2BrXwApjoo68EWs/47ezh
-QE/1jAfOBBz0gCnbS0ncR0fy6f7YNqgqj0lQuWLsvQK436NGynORpTs1wzfHAx6j
-WY+HcxAqC48hx1/3eFxi
-=PEHv
+iQIcBAEBCAAGBQJRA7tyAAoJEOSiRoyO7jvo6/IP/iaV7ehSR4sfy4Tphxm+eLLO
+Mi976AfOT5UYBxS1wb0r/NIhqjso/C7w7Nx7s/EJMg7PkhB1j/qhYfPCvSONvjXv
+aAifkmOECE6cK6x3VQ8756vrxF/C8DBp1U+LpwChPYAIbeEgPpu0S/qPtmKux+6h
+cMRGD6JI09lgYccpqWB54q9zJ0HRbrGOWMZFqz4H75WSfS+TwCoZ0bvAHJH1PjbB
+BBQY7Xfmc9LFaFcF816fZjK+RgeO+aB6/b9brkOVTyvtufcwoU/eCW8RyOax05vH
+Woftp7xPSu3LBJUb0mZmeqXIwBSopag+M4XaUub1CFbE4Cf2jLH/MDgTvXW865Yn
+FtThmLaPwXVzH3WjqD4DYBzCbuWT9zasE/2zYFiw/AoUVBj/aOJJPkPZPPYLokLS
+m81mUNayzddqDd2kaf/3KYjRUFUdqfZ1BflytFdoEQtd0ZqXJn2asLkn7UGtqjmc
+6H/imhFCr4KVtLozMzMGmbxn34gZRCxwFsWAf+ooBOLQytvidtkwuUJBKKS804B/
+weVosbDNKyelGanZm9iJ/+TF+RiA7qMQbdM3/DyW6vFvpBTCGMG2Ph5542D1Nftb
+ygEo4YQ8mBnGK0I/jaBskrNhUEjWRTyoRyX/mJ1+Wz7ybzjr36XB08cNvYrxJ5uj
+1MpFc56YIGymknLQj/GV
+=d94B
-----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index c10b48a4f4d3..8d074f61ccd3 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.132 2013/01/26 11:04:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.133 2013/01/26 11:17:37 scarabeus Exp $
EAPI="4"
@@ -56,6 +56,8 @@ COMMON_DEPEND="virtual/glu
dev-libs/tinyxml[stl]
dev-libs/yajl
dev-python/simplejson
+ media-fonts/corefonts
+ media-fonts/roboto
media-libs/alsa-lib
media-libs/flac
media-libs/fontconfig
@@ -234,6 +236,18 @@ src_install() {
# them into same structure like they have in git.
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/
+ # roboto: roboto-bold, roboto-regular ; unknown source: bold-caps
+ 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/
+ dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \
+ /usr/share/xbmc/addons/skin.confluence/fonts/
+
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