Add fontconfig files as suggested in bug #416417. Remove old.

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

6 files changed, 231 insertions, 25 deletions

diff --git a/media-fonts/droid/ChangeLog b/media-fonts/droid/ChangeLog
index b1fba3242a90..51929013f571 100644
--- a/media-fonts/droid/ChangeLog
+++ b/media-fonts/droid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-fonts/droid
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/ChangeLog,v 1.20 2011/01/27 16:49:51 spatz Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/ChangeLog,v 1.21 2012/05/27 13:01:14 yngwin Exp $
+
+*droid-113-r2 (27 May 2012)
+
+  27 May 2012; Ben de Groot <yngwin@gentoo.org> +droid-113-r2.ebuild,
+  +files/59-google-droid-sans-mono.conf, +files/59-google-droid-sans.conf,
+  +files/59-google-droid-serif.conf, -droid-112_p1.ebuild:
+  Add fontconfig files as suggested in bug #416417. Remove old.
 
   27 Jan 2011; Dror Levin <spatz@gentoo.org> -droid-112_p1-r1.ebuild,
   -droid-113.ebuild, droid-113-r1.ebuild:
diff --git a/media-fonts/droid/droid-112_p1.ebuild b/media-fonts/droid/droid-112_p1.ebuild
deleted file mode 100644
index 7501b5e81d93..000000000000
--- a/media-fonts/droid/droid-112_p1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/droid-112_p1.ebuild,v 1.4 2009/09/27 09:39:54 volkmar Exp $
-
-inherit font
-
-# $PV is a build number, use fontforge to find it out. 112 was taken from:
-# http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts;hb=HEAD
-DESCRIPTION="Font family from Google's Android project"
-HOMEPAGE="http://code.google.com/android/RELEASENOTES.html"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-S=${WORKDIR}/${PN}
-FONT_S=${WORKDIR}/${PN}
-FONT_SUFFIX="ttf"
-
-RDEPEND=""
-DEPEND=""
diff --git a/media-fonts/droid/droid-113-r2.ebuild b/media-fonts/droid/droid-113-r2.ebuild
new file mode 100644
index 000000000000..d14f9215954b
--- /dev/null
+++ b/media-fonts/droid/droid-113-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/droid/droid-113-r2.ebuild,v 1.1 2012/05/27 13:01:14 yngwin Exp $
+
+EAPI=4
+
+inherit font
+
+MY_PN="${PN/d/D}"
+
+# $PV is a build number, use fontforge to find it out. 113 was taken from:
+# http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts;hb=HEAD
+DESCRIPTION="Font family from Google's Android project"
+HOMEPAGE="http://code.google.com/android/RELEASENOTES.html http://www.cosmix.org/software/"
+SRC_URI="mirror://gentoo/${P}-r1.tar.bz2
+	mirror://gentoo/${MY_PN}SansMonoSlashed-112_p1.ttf.bz2
+	mirror://gentoo/${MY_PN}SansMonoDotted-112_p1.ttf.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN}"
+FONT_S="${S}"
+FONT_SUFFIX="ttf"
+FONT_CONF=(
+	"${FILESDIR}/59-google-droid-sans-mono.conf"
+	"${FILESDIR}/59-google-droid-sans.conf"
+	"${FILESDIR}/59-google-droid-serif.conf"
+)
+
+src_prepare() {
+	mv "${WORKDIR}/${MY_PN}SansMonoSlashed-112_p1.ttf" \
+		"${S}/${MY_PN}SansMonoSlashed.ttf"
+	mv "${WORKDIR}/${MY_PN}SansMonoDotted-112_p1.ttf" \
+		"${S}/${MY_PN}SansMonoDotted.ttf"
+}
diff --git a/media-fonts/droid/files/59-google-droid-sans-mono.conf b/media-fonts/droid/files/59-google-droid-sans-mono.conf
new file mode 100644
index 000000000000..1cf8bbc1602b
--- /dev/null
+++ b/media-fonts/droid/files/59-google-droid-sans-mono.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>Droid Sans Mono</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Droid Sans Mono</family>
+    <default>
+      <family>monospace</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/media-fonts/droid/files/59-google-droid-sans.conf b/media-fonts/droid/files/59-google-droid-sans.conf
new file mode 100644
index 000000000000..80ba66cde815
--- /dev/null
+++ b/media-fonts/droid/files/59-google-droid-sans.conf
@@ -0,0 +1,152 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <match target="scan">
+    <test name="family">
+      <string>Droid Sans</string>
+    </test>
+    <edit name="fontversion">
+      <int>7</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="family">
+      <string>Droid Sans Hebrew</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>6</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="family">
+      <string>Droid Sans Arabic</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>5</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="family">
+      <string>Droid Sans Thai</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>4</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="lang" compare="not_eq">
+      <string>zh-cn</string>
+      <string>zh-sg</string>
+      <string>zh-hk</string>
+      <string>zh-tw</string>
+      <string>zh</string>
+    </test>
+    <test name="family">
+      <string>Droid Sans Japanese</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>3</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="family">
+      <string>Droid Sans Fallback</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>2</int>
+    </edit>
+  </match>
+  <match target="scan">
+    <test name="lang">
+      <string>zh-cn</string>
+      <string>zh-sg</string>
+      <string>zh-hk</string>
+      <string>zh-tw</string>
+      <string>zh</string>
+    </test>
+    <test name="family">
+      <string>Droid Sans Japanese</string>
+    </test>
+    <edit name="family">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fullname">
+      <string>Droid Sans</string>
+    </edit>
+    <edit name="fontversion">
+      <int>1</int>
+    </edit>
+  </match>
+  <alias binding="same">
+    <family>Droid Sans Arabic</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Hebrew</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Japanese</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Thai</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias binding="same">
+    <family>Droid Sans Fallback</family>
+    <accept>
+      <family>Droid Sans</family>
+    </accept>
+  </alias>
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Droid Sans</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Droid Sans</family>
+    <default>
+      <family>sans-serif</family>
+    </default>
+  </alias>
+</fontconfig>
diff --git a/media-fonts/droid/files/59-google-droid-serif.conf b/media-fonts/droid/files/59-google-droid-serif.conf
new file mode 100644
index 000000000000..f56b5ed51b4c
--- /dev/null
+++ b/media-fonts/droid/files/59-google-droid-serif.conf
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Droid Serif</family>
+    </prefer>
+  </alias>
+  <alias>
+    <family>Droid Serif</family>
+    <default>
+      <family>serif</family>
+    </default>
+  </alias>
+</fontconfig>