Thu Apr 21 14:19:17 UTC 2011

8 files changed, 11 insertions, 26 deletions

diff --git a/libre/ffmpeg-libre/PKGBUILD b/libre/ffmpeg-libre/PKGBUILD
index dc5725eff..41c332dca 100644
--- a/libre/ffmpeg-libre/PKGBUILD
+++ b/libre/ffmpeg-libre/PKGBUILD
@@ -17,9 +17,9 @@ makedepends=('yasm' 'git')
 source=(ftp://ftp.archlinux.org/other/ffmpeg/ffmpeg-${pkgver}.tar.xz)
 md5sums=('dd682a876a496b9f9ae8afb3b3b70389')
 #source=(http://ffmpeg.org/releases//releases/ffmpeg-${pkgver}.tar.bz2)
-provides=('ffmpeg')
+provides=("ffmpeg=$pkgver")
 conflicts=('ffmpeg')
-replaces=("ffmpeg=$pkgver")
+replaces=('ffmpeg')
 
 build() {
   cd "$srcdir/${pkgname%-libre}"
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 61c96f190..238fa973b 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -18,7 +18,7 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 source=(ftp://ftp.archlinux.org/other/${pkgname%-libre}/${pkgname%-libre}-${pkgver}.tar.xz mplayer.desktop mplayer.png)
 provides=("mplayer=$pkgver")
 conflicts=('mplayer')
-replaces=("mplayer=$pkgver")
+replaces=('mplayer')
 md5sums=('caedcdc1e50b5575c38c2a85f9c53afc'
          '647b9f4ab5284a7fef3f84f992214e77'
          'd00874ccc644b7f43d6ef1c942fcef28')
diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD
index 2f1028119..22517928e 100644
--- a/libre/mplayer-vaapi-libre/PKGBUILD
+++ b/libre/mplayer-vaapi-libre/PKGBUILD
@@ -18,9 +18,9 @@ depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'cdparanoia' 'libxinerama' 'sdl'
          'libxvmc' 'enca' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger'
          'libvpx' 'libpulse' 'fribidi' 'libva' 'desktop-file-utils')
 makedepends=('unzip' 'mesa' 'live-media>=2010.01.13' 'yasm')
-provides=("mplayer-vaapi=$pkgver")
+provides=("mplayer-vaapi=$pkgver" 'mplayer')
 conflicts=('mplayer' 'mplayer-vaapi')
-replaces=("mplayer-vaapi=$pkgver")
+replaces=('mplayer-vaapi')
 backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
 source=(http://pkgbuild.com/~foutrelis/mplayer-$pkgver.tar.xz
         http://www.splitted-desktop.com/~gbeauchesne/mplayer-vaapi/mplayer-vaapi-$_vaapi_version.tar.bz2
diff --git a/libre/xorg-fonts-100dpi-libre/PKGBUILD b/libre/xorg-fonts-100dpi-libre/PKGBUILD
index 13832bb91..3f88f1cee 100644
--- a/libre/xorg-fonts-100dpi-libre/PKGBUILD
+++ b/libre/xorg-fonts-100dpi-libre/PKGBUILD
@@ -4,7 +4,7 @@
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
 pkgname=xorg-fonts-100dpi-libre
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org 100dpi fonts"
 arch=(any)
 url="http://xorg.freedesktop.org/"
diff --git a/libre/xorg-fonts-100dpi-libre/xfonts.install b/libre/xorg-fonts-100dpi-libre/xfonts.install
index 3eb0455c9..5c5e8a2b4 100644
--- a/libre/xorg-fonts-100dpi-libre/xfonts.install
+++ b/libre/xorg-fonts-100dpi-libre/xfonts.install
@@ -1,8 +1,8 @@
 post_install() {
   echo -n "Updating font cache... "
   fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/Type1
-  mkfontdir /usr/share/fonts/Type1
+  mkfontscale /usr/share/fonts/100dpi
+  mkfontdir /usr/share/fonts/100dpi
   echo "done."
 }
 
@@ -13,8 +13,3 @@ post_upgrade() {
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-
-$op $*
diff --git a/libre/xorg-fonts-75dpi-libre/PKGBUILD b/libre/xorg-fonts-75dpi-libre/PKGBUILD
index 5266bd550..c262229fc 100644
--- a/libre/xorg-fonts-75dpi-libre/PKGBUILD
+++ b/libre/xorg-fonts-75dpi-libre/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=xorg-fonts-75dpi-libre
 pkgver=1.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org 75dpi fonts"
 arch=(any)
 url="http://xorg.freedesktop.org/"
diff --git a/libre/xorg-fonts-75dpi-libre/xfonts.install b/libre/xorg-fonts-75dpi-libre/xfonts.install
index 3eb0455c9..e52603946 100644
--- a/libre/xorg-fonts-75dpi-libre/xfonts.install
+++ b/libre/xorg-fonts-75dpi-libre/xfonts.install
@@ -1,8 +1,8 @@
 post_install() {
   echo -n "Updating font cache... "
   fc-cache -f > /dev/null
-  mkfontscale /usr/share/fonts/Type1
-  mkfontdir /usr/share/fonts/Type1
+  mkfontscale /usr/share/fonts/75dpi
+  mkfontdir /usr/share/fonts/75dpi
   echo "done."
 }
 
@@ -13,8 +13,3 @@ post_upgrade() {
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-
-$op $*
diff --git a/libre/xorg-fonts-type1-libre/xfonts.install b/libre/xorg-fonts-type1-libre/xfonts.install
index 3eb0455c9..51688a1d1 100644
--- a/libre/xorg-fonts-type1-libre/xfonts.install
+++ b/libre/xorg-fonts-type1-libre/xfonts.install
@@ -13,8 +13,3 @@ post_upgrade() {
 post_remove() {
   post_install $1
 }
-
-op=$1
-shift
-
-$op $*