From 797df3774b8d109892dde972186c5eb981df1f2e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 24 Feb 2012 18:16:41 +0100
Subject: [PATCH] util-linux: update to 2.21.

---
 srcpkgs/util-linux/libblkid.template |  1 -
 srcpkgs/util-linux/libmount.template |  1 -
 srcpkgs/util-linux/libuuid.template  |  1 -
 srcpkgs/util-linux/template          | 11 +++--------
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/util-linux/libblkid.template b/srcpkgs/util-linux/libblkid.template
index 6a9ae99712..5c2c6e4138 100644
--- a/srcpkgs/util-linux/libblkid.template
+++ b/srcpkgs/util-linux/libblkid.template
@@ -1,6 +1,5 @@
 # Template file for 'libblkid'.
 #
-revision=2
 short_desc="Library to handle device identification"
 long_desc="
  The libblkid package contains a library to handle device identification
diff --git a/srcpkgs/util-linux/libmount.template b/srcpkgs/util-linux/libmount.template
index c3e3033e57..52faede8b8 100644
--- a/srcpkgs/util-linux/libmount.template
+++ b/srcpkgs/util-linux/libmount.template
@@ -1,6 +1,5 @@
 # Template file for 'libmount'.
 #
-revision=2
 short_desc="A mount(8) library"
 long_desc="
  This NEW LIBRARY is designed to be used in low-level utils like
diff --git a/srcpkgs/util-linux/libuuid.template b/srcpkgs/util-linux/libuuid.template
index 008315706e..09ad06d5a8 100644
--- a/srcpkgs/util-linux/libuuid.template
+++ b/srcpkgs/util-linux/libuuid.template
@@ -1,6 +1,5 @@
 # Template file for 'libuuid'.
 #
-revision=3
 short_desc="UUID library"
 long_desc="
  libuuid generates and parses 128-bit universally unique id's (UUIDs).
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 6635d931e2..7285f69170 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,13 +1,12 @@
 # Template file for 'util-linux'
 pkgname=util-linux
-version=2.20.1
-revision=3
-distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.20/${pkgname}-${version}.tar.bz2"
+version=2.21
+distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.21/${pkgname}-${version}.tar.xz"
 short_desc="Miscellaneous linux utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
 license="GPL-2"
-checksum=d16ebcda3e64ab88ed363d9c1242cdb7ccfd5e1f56c83d0c3b0638c23793bbe0
+checksum=5192e8ba7dcf3cf0dc447f07b3d177f6cb3fb49dfae54ac45d6c8c7d86eeab0f
 long_desc="
  The ${pkgname} package contains miscellaneous utility programs. Among
  them are utilities for handling file systems, consoles, partitions,
@@ -42,8 +41,4 @@ do_build() {
 
 do_install() {
 	make DESTDIR=${DESTDIR} install
-	# Move logger to /bin.
-	vmkdir bin
-	mv ${DESTDIR}/usr/bin/logger ${DESTDIR}/bin
-	vmkdir var/lib/hwclock
 }