Merge branch 'testing' of ssh://linhes.org/mount/repository/linhes_pkgbuild into testing

3 files changed, 64 insertions, 12 deletions

diff --git a/abs/core/ttf-dejavu/ChangeLog b/abs/core/ttf-dejavu/ChangeLog
index b3cf284..c5c8c4a 100644
--- a/abs/core/ttf-dejavu/ChangeLog
+++ b/abs/core/ttf-dejavu/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-12  Alexander Fehr  <pizzapunk gmail com>
+
+  * ttf-dejavu-2.29-1:
+  New upstream release.
+
 2008-12-22  Alexander Fehr  <pizzapunk gmail com>
 
   * ttf-dejavu-2.28-1:
diff --git a/abs/core/ttf-dejavu/PKGBUILD b/abs/core/ttf-dejavu/PKGBUILD
index 93356a5..a5fd988 100644
--- a/abs/core/ttf-dejavu/PKGBUILD
+++ b/abs/core/ttf-dejavu/PKGBUILD
@@ -1,25 +1,29 @@
-# $Id: PKGBUILD 22203 2008-12-22 23:29:26Z alexanderf $
+# $Id: PKGBUILD 71355 2010-03-06 19:39:30Z jgc $
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michal Krenek <mikos@sg1.cz>
 
 pkgname=ttf-dejavu
-pkgver=2.28
-pkgrel=1
+pkgver=2.30
+pkgrel=2
 pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters"
-arch=('i686' 'x86_64')
+arch=('any')
 url="http://dejavu.sourceforge.net/"
 license=('custom')
 depends=('fontconfig' 'xorg-fonts-encodings')
 install=ttf-dejavu.install
-source=(http://downloads.sourceforge.net/dejavu/dejavu-fonts-ttf-$pkgver.tar.bz2)
-md5sums=('10002ae52fbad207641d1fd2bf9bf4b8')
+source=(http://downloads.sourceforge.net/project/dejavu/dejavu/${pkgver}/dejavu-fonts-ttf-${pkgver}.tar.bz2)
+md5sums=('545b3bfc69893075a90a7c6e6f4a7e67')
 
 build() {
-  cd "$srcdir/dejavu-fonts-ttf-$pkgver"
+  cd "${srcdir}/dejavu-fonts-ttf-${pkgver}"
 
-  mkdir -p "$pkgdir/usr/share/fonts/TTF" || return 1
-  install -m644 ttf/*.ttf "$pkgdir/usr/share/fonts/TTF" || return 1
+  install -m755 -d "${pkgdir}/usr/share/fonts/TTF"
+  install -m644 ttf/*.ttf "${pkgdir}/usr/share/fonts/TTF/" || return 1
 
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/ttf-dejavu/LICENSE" || return 1
+  install -m755 -d "${pkgdir}/etc/fonts/conf.avail"
+  install -m644 fontconfig/*.conf "${pkgdir}/etc/fonts/conf.avail/" || return 1
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/" || return 1
 }
diff --git a/abs/core/ttf-dejavu/ttf-dejavu.install b/abs/core/ttf-dejavu/ttf-dejavu.install
index 18666d2..f831cb1 100644
--- a/abs/core/ttf-dejavu/ttf-dejavu.install
+++ b/abs/core/ttf-dejavu/ttf-dejavu.install
@@ -1,13 +1,56 @@
+configs=(20-unhint-small-dejavu-sans-mono.conf
+         20-unhint-small-dejavu-sans.conf
+         20-unhint-small-dejavu-serif.conf
+         57-dejavu-sans-mono.conf
+         57-dejavu-sans.conf
+         57-dejavu-serif.conf)
 post_install() {
+  pushd /etc/fonts/conf.d > /dev/null
+  for config in "${configs[@]}"; do
+    ln -sf ../conf.avail/${config} .
+  done
+  popd > /dev/null
   fc-cache -fs
   mkfontscale usr/share/fonts/TTF
   mkfontdir usr/share/fonts/TTF
 }
 
 post_upgrade() {
-  post_install
+  if [ `vercmp 2.30-2 $2` -gt 0 ]; then 
+    pushd /etc/fonts/conf.d > /dev/null
+    for config in "${configs[@]}"; do
+      ln -sf ../conf.avail/${config} .
+    done
+    popd > /dev/null
+  fi
+  for config in /etc/fonts/conf.d/*; do
+    if [ ! -f ${config} ]; then
+      rm -f ${config}
+    fi
+  done
+  fc-cache -fs
+  mkfontscale usr/share/fonts/TTF
+  mkfontdir usr/share/fonts/TTF
+}
+
+pre_upgrade() {
+  # Link new config files not present on system yet
+  pushd /etc/fonts/conf.d > /dev/null
+  for config in "${configs[@]}"; do
+    if [ ! -f ../conf.avail/${config} ]; then
+      ln -sf ../conf.avail/${config} .
+    fi
+  done
+  popd > /dev/null
 }
 
 post_remove() {
-  post_install
+  pushd /etc/fonts/conf.d > /dev/null
+  for config in "${configs[@]}"; do
+    rm -f ${config}
+  done
+  popd > /dev/null
+  fc-cache -fs
+  mkfontscale usr/share/fonts/TTF
+  mkfontdir usr/share/fonts/TTF
 }