Tue Dec 13 23:14:49 UTC 2011

1 files changed, 11 insertions, 19 deletions

diff --git a/multilib/lib32-util-linux/PKGBUILD b/multilib/lib32-util-linux/PKGBUILD
index 026d52a1b..cdd799467 100644
--- a/multilib/lib32-util-linux/PKGBUILD
+++ b/multilib/lib32-util-linux/PKGBUILD
@@ -1,31 +1,27 @@
-# $Id: PKGBUILD 41742 2011-03-08 19:17:58Z dreisner $
+# $Id: PKGBUILD 60379 2011-12-12 14:54:24Z dreisner $
 # Maintainer: judd <jvinet@zeroflux.org>
 
 _pkgbasename=util-linux
 pkgname=lib32-$_pkgbasename
-pkgver=2.19
+pkgver=2.20.1
 pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux (32-bit)"
 url="http://userweb.kernel.org/~kzak/util-linux-ng/"
 arch=('x86_64')
-depends=('lib32-glibc' $_pkgbasename)
+depends=('lib32-glibc' "$_pkgbasename")
 makedepends=('gcc-multilib')
 provides=('lib32-util-linux-ng')
 conflicts=('lib32-util-linux-ng')
 replaces=('lib32-util-linux-ng')
 license=('GPL2')
 options=('!libtool' '!emptydirs')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${_pkgbasename}/v2.19/${_pkgbasename}-${pkgver}.tar.bz2)
-md5sums=('590ca71aad0b254e2631d84401f28255')
+source=(ftp://ftp.infradead.org/pub/$_pkgbasename/v2.20/$_pkgbasename-$pkgver.tar.bz2)
+md5sums=('079b37517fd4e002a2e6e992e8b4e361')
 
 shopt -s extglob
 
 build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
-  # hardware clock
-  sed -e 's%etc/adjtime%var/lib/hwclock/adjtime%' -i hwclock/hwclock.c
-  mkdir -p "${pkgdir}/var/lib/hwclock"
+  cd "$srcdir/$_pkgbasename-$pkgver"
 
   export CC="gcc -m32"
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
@@ -33,20 +29,16 @@ build() {
   ./autogen.sh
   ./configure --without-ncurses --libdir=/usr/lib32
 
-  cd shlibs
-  for lib in *; do
-    make -C $lib
+  for lib in lib{mount,blkid,uuid}; do
+    make -C "$lib"
   done
 }
 
 package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
+  cd "$srcdir/$_pkgbasename-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
-  # remove unnecessary files
-  cd "$pkgdir"
-  rm -rf !(usr)
-  cd usr
-  rm -rf !(lib32)
+  # remove everything but libs
+  rm -rf "$pkgdir"/!(usr) "$pkgdir"/usr/!(lib32)
 }