[arch-commits] Commit in (7 files)

[Jan Steffens]

    Date: Friday, January 31, 2014 @ 16:41:24
  Author: heftig
Revision: 204932

add freefont otf variant

Added:
  gnu-free-fonts/
  gnu-free-fonts/trunk/69-gnu-free-fonts.conf
  gnu-free-fonts/trunk/fonts.install
    (from rev 204929, ttf-freefont/trunk/install)
Modified:
  gnu-free-fonts/trunk/PKGBUILD
Deleted:
  gnu-free-fonts/repos/extra-any/
  gnu-free-fonts/trunk/conf.avail
  gnu-free-fonts/trunk/install

---------------------------------------------+
 gnu-free-fonts/trunk/69-gnu-free-fonts.conf |   28 ++++++++++++++++++
 gnu-free-fonts/trunk/fonts.install          |   11 +++++++
 trunk/PKGBUILD                              |   40 ++++++++++++--------------
 trunk/install                               |   14 ---------
 4 files changed, 58 insertions(+), 35 deletions(-)

Added: gnu-free-fonts/trunk/69-gnu-free-fonts.conf
===================================================================
--- gnu-free-fonts/trunk/69-gnu-free-fonts.conf	                        (rev 0)
+++ gnu-free-fonts/trunk/69-gnu-free-fonts.conf	2014-01-31 15:41:24 UTC (rev 204932)
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <alias>
+    <family>monospace</family>
+    <prefer><family>FreeMono</family></prefer>
+  </alias>
+  <alias>
+    <family>sans-serif</family>
+    <prefer><family>FreeSans</family></prefer>
+  </alias>
+  <alias>
+    <family>serif</family>
+    <prefer><family>FreeSerif</family></prefer>
+  </alias>
+  <alias>
+    <family>FreeMono</family>
+    <default><family>monospace</family></default>
+  </alias>
+  <alias>
+    <family>FreeSans</family>
+    <default><family>sans-serif</family></default>
+  </alias>
+  <alias>
+    <family>FreeSerif</family>
+    <default><family>serif</family></default>
+  </alias>
+</fontconfig>


Property changes on: gnu-free-fonts/trunk/69-gnu-free-fonts.conf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Modified: gnu-free-fonts/trunk/PKGBUILD
===================================================================
--- ttf-freefont/trunk/PKGBUILD	2014-01-31 14:12:03 UTC (rev 204929)
+++ gnu-free-fonts/trunk/PKGBUILD	2014-01-31 15:41:24 UTC (rev 204932)
@@ -1,27 +1,25 @@
 # $Id$
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
 
-pkgname=ttf-freefont
+pkgname=gnu-free-fonts
 pkgver=20120503
-pkgrel=2
-pkgdesc='Set of free outline fonts covering the Unicode character set'
-url='http://www.nongnu.org/freefont/'
-license=('GPL')
-arch=('any')
-depends=('fontconfig' 'xorg-font-utils')
-provides=('ttf-font')
-source=("http://ftp.gnu.org/gnu/freefont/freefont-ttf-${pkgver}.zip"
-        'conf.avail')
-sha1sums=('46179a6f3469b386f6569fc61913314ba79aadac'
-          '11bbd7e1be9ce310917642cf7ee589d4433383e0')
+pkgrel=1
+pkgdesc='Set of free OpenType fonts covering the Unicode character set'
+arch=(any)
+url="http://www.nongnu.org/freefont/"
+license=(GPL)
+depends=(fontconfig)
+install=fonts.install
+source=(http://ftp.gnu.org/gnu/freefont/freefont-otf-${pkgver}.tar.gz{,.sig}
+        69-gnu-free-fonts.conf)
+sha256sums=('3a6c51868c71b006c33c4bcde63d90927e6fcca8f51c965b8ad62d021614a860'
+            'SKIP'
+            '9bd436771b20e03d8ede3b2558dec63c5f48d2dfe797f9e7d7455188e850a415')
 
-install=install
-
 package() {
-	cd "${srcdir}/freefont-${pkgver}"
-	install -d "${pkgdir}"/usr/share/fonts/TTF
-	install -m644 *.ttf "${pkgdir}"/usr/share/fonts/TTF
-	install -Dm644 ../conf.avail "${pkgdir}"/etc/fonts/conf.avail/69-freefont.conf
+  install -d "$pkgdir/usr/share/fonts/gnu-free-fonts"
+  install -t "$pkgdir/usr/share/fonts/gnu-free-fonts" -m644 freefont-$pkgver/*.otf
+  install -Dm644 69-gnu-free-fonts.conf "$pkgdir/etc/fonts/conf.avail/69-gnu-free-fonts.conf"
 }
+
+# vim:set ts=2 sw=2 et:

Deleted: gnu-free-fonts/trunk/conf.avail
===================================================================
(Binary files differ)

Copied: gnu-free-fonts/trunk/fonts.install (from rev 204929, ttf-freefont/trunk/install)
===================================================================
--- gnu-free-fonts/trunk/fonts.install	                        (rev 0)
+++ gnu-free-fonts/trunk/fonts.install	2014-01-31 15:41:24 UTC (rev 204932)
@@ -0,0 +1,11 @@
+post_install() {
+  fc-cache -f
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}

Deleted: gnu-free-fonts/trunk/install
===================================================================
--- ttf-freefont/trunk/install	2014-01-31 14:12:03 UTC (rev 204929)
+++ gnu-free-fonts/trunk/install	2014-01-31 15:41:24 UTC (rev 204932)
@@ -1,14 +0,0 @@
-post_install() {
-	fc-cache -f > /dev/null
-	mkfontscale /usr/share/fonts/TTF
-	mkfontdir /usr/share/fonts/TTF
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
-