[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, media-fonts/cantarell/

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, media-fonts/cantarell/

[nirbheek]

commit:     bc5072acf49f295faab1033e3c1bb9d8536ccdce
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  4 05:05:33 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Feb  4 05:05:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bc5072acf49f295faab1033e3c1bb9d8536ccdce

Add media-fonts/cantarell-0.0.1: very broken font

* Default GNOME 3 font, added to the deps of gnome-settings-daemon
* No monospace version, only does latin characters (afaik)
* The schemas say "Sans 10", so this isn't globally applicable in applications
  - Edit org.gnome.desktop.interface in dconf-editor to change that

---
 gnome-base/gnome-settings-daemon/Manifest          |    4 +-
 .../gnome-settings-daemon-2.91.9.ebuild            |    1 +
 .../gnome-settings-daemon-9999.ebuild              |    1 +
 media-fonts/cantarell/Manifest                     |    2 +
 media-fonts/cantarell/cantarell-0.0.1.ebuild       |   28 ++++++++++++++++++++
 5 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest
index abd8f9b..34dc641 100644
--- a/gnome-base/gnome-settings-daemon/Manifest
+++ b/gnome-base/gnome-settings-daemon/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-settings-daemon-2.91.9.tar.bz2 1383464 RMD160 76efe4e7a134b6d563d94eb6e76dd03bb8198280 SHA1 fceed75800572d323b47eeacc623e1359b1637d1 SHA256 2267e920a2bf2fbae4c2a4bc4178da686efa75e2fb2019ae378330943d7a017b
-EBUILD gnome-settings-daemon-2.91.9.ebuild 3348 RMD160 62c82c35c781899982a69d7fe8514c72a49a3201 SHA1 ee78ebbadae6a25e469cf1d8a26852dfcbf4261d SHA256 0bceeb7fbe6d04595a8cdce413a13cf2c788007313e0cbbd8260502357d1821c
-EBUILD gnome-settings-daemon-9999.ebuild 3348 RMD160 62c82c35c781899982a69d7fe8514c72a49a3201 SHA1 ee78ebbadae6a25e469cf1d8a26852dfcbf4261d SHA256 0bceeb7fbe6d04595a8cdce413a13cf2c788007313e0cbbd8260502357d1821c
+EBUILD gnome-settings-daemon-2.91.9.ebuild 3371 RMD160 ed4ca81c946acf5327df6282887545754c4b8c94 SHA1 421e9ba23bd808331a70d88f9c617b1a64670f8c SHA256 8954c416cba18b921ff9d73e6733da5238a101e94c12a40e478752ad2d61f808
+EBUILD gnome-settings-daemon-9999.ebuild 3371 RMD160 ed4ca81c946acf5327df6282887545754c4b8c94 SHA1 421e9ba23bd808331a70d88f9c617b1a64670f8c SHA256 8954c416cba18b921ff9d73e6733da5238a101e94c12a40e478752ad2d61f808

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.9.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.9.ebuild
index f99693f..06e26c3 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.9.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-2.91.9.ebuild
@@ -31,6 +31,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 	>=gnome-base/libgnomekbd-2.91.1
 	>=gnome-base/gnome-desktop-2.91.5:3
 	>=gnome-base/gsettings-desktop-schemas-0.1.2
+	media-fonts/cantarell
 	media-libs/fontconfig
 	net-print/cups
 

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index f99693f..06e26c3 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -31,6 +31,7 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 	>=gnome-base/libgnomekbd-2.91.1
 	>=gnome-base/gnome-desktop-2.91.5:3
 	>=gnome-base/gsettings-desktop-schemas-0.1.2
+	media-fonts/cantarell
 	media-libs/fontconfig
 	net-print/cups
 

diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
new file mode 100644
index 0000000..769ab22
--- /dev/null
+++ b/media-fonts/cantarell/Manifest
@@ -0,0 +1,2 @@
+DIST cantarell-fonts-0.0.1.tar.bz2 269853 RMD160 23d6b47eac4be9ac76c7725f1772f28059239911 SHA1 24346497633287845c66e2a847b112a9bca74b3a SHA256 471ae75968c0a8f25f63f7265a63250441d124528a193fe12d5722a501c176b9
+EBUILD cantarell-0.0.1.ebuild 601 RMD160 cf9cee6cbf9fdd1140618ca351ee6849087d93d6 SHA1 ccd163da4d01762b470e0d44fddb2d408a6e1762 SHA256 5178c3f664e079728aa2c2d402a612591f498064e3798350e954673d2e976d8c

diff --git a/media-fonts/cantarell/cantarell-0.0.1.ebuild b/media-fonts/cantarell/cantarell-0.0.1.ebuild
new file mode 100644
index 0000000..e7792e0
--- /dev/null
+++ b/media-fonts/cantarell/cantarell-0.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+MY_PN="${PN}-fonts"
+
+inherit font gnome.org
+
+DESCRIPTION="Cantarell fonts, default fontset for GNOME Shell"
+HOMEPAGE="http://abattis.org/cantarell/"
+LICENSE="OFL-1.1"
+SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+RDEPEND="media-libs/fontconfig"
+DEPEND=">=dev-util/pkgconfig-0.19"
+
+DOCS="NEWS README"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+# Font eclass settings
+FONT_CONF=("${S}/fontconfig/57-cantarell.conf")
+FONT_S="${S}/otf"
+FONT_SUFFIX="otf"