From 5ab134f6a3a82690d54dccb5818431b2467d3169 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 2 Mar 2012 07:42:48 +0100
Subject: [PATCH] e2fsprogs: update to 1.42.1.

---
 srcpkgs/e2fsprogs/e2fsprogs-devel.template | 29 ++++++++--------------
 srcpkgs/e2fsprogs/e2fsprogs-libs.template  |  4 +--
 srcpkgs/e2fsprogs/template                 | 10 ++++----
 3 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/srcpkgs/e2fsprogs/e2fsprogs-devel.template b/srcpkgs/e2fsprogs/e2fsprogs-devel.template
index 82d742a661e..066a2015daf 100644
--- a/srcpkgs/e2fsprogs/e2fsprogs-devel.template
+++ b/srcpkgs/e2fsprogs/e2fsprogs-devel.template
@@ -1,6 +1,6 @@
 # Template file for 'e2fsprogs-devel'.
 #
-short_desc="${short_desc} (development files)"
+short_desc="${short_desc} -- development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
@@ -9,23 +9,16 @@ Add_dependency run libuuid-devel
 Add_dependency run libblkid-devel
 Add_dependency run e2fsprogs-libs
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/{bin,lib}
-	mkdir -p ${DESTDIR}/usr/share/info
-	mkdir -p ${DESTDIR}/usr/share/man/man1
-
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+do_install() {
+	vmove usr/include usr
+	vmove usr/lib/pkgconfig usr/lib
+	vmove "usr/lib/*.a" usr/lib
 	for f in compile_et mk_cmds; do
-		mv ${SRCPKGDESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin
-		mv ${SRCPKGDESTDIR}/usr/share/man/man1/${f}* \
-			${DESTDIR}/usr/share/man/man1
+		vmove usr/bin/${f} usr/bin
+		vmove "usr/share/man/man1/${f}*" usr/share/man/man1
 	done
-	mv ${SRCPKGDESTDIR}/usr/share/et ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/ss ${DESTDIR}/usr/share
-	mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man
-	mv ${SRCPKGDESTDIR}/usr/share/info/libext2fs.info* \
-		${DESTDIR}/usr/share/info
+	vmove usr/share/et usr/share
+	vmove usr/share/ss usr/share
+	vmove usr/share/man/man3 usr/share/man
+	vmove "usr/share/info/libext2fs.info*" usr/share/info
 }
diff --git a/srcpkgs/e2fsprogs/e2fsprogs-libs.template b/srcpkgs/e2fsprogs/e2fsprogs-libs.template
index f0d9f7e153c..9561f7b36db 100644
--- a/srcpkgs/e2fsprogs/e2fsprogs-libs.template
+++ b/srcpkgs/e2fsprogs/e2fsprogs-libs.template
@@ -1,12 +1,10 @@
 # Template file for 'e2fsprogs-libs'.
 #
-short_desc="${short_desc} (shared libraries)"
+short_desc="${short_desc} -- shared libraries"
 long_desc="${long_desc}
 
  This package contains the shared libraries."
 
-revision=2
-
 do_install() {
 	vmove "usr/lib/*.so*" usr/lib
 }
diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index f5435b98b73..313ef602a4c 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -1,6 +1,6 @@
 # Template file for 'e2fsprogs'
 pkgname=e2fsprogs
-version=1.42
+version=1.42.1
 homepage="http://e2fsprogs.sourceforge.net/"
 distfiles="$SOURCEFORGE_SITE/e2fsprogs/$pkgname-$version.tar.gz"
 build_style=gnu-configure
@@ -13,17 +13,17 @@ make_install_args="install-libs"
 short_desc="Ext2/3/4 Filesystem Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2, LGPL-2.1"
-checksum=55b46db0cec3e2eb0e5de14494a88b01ff6c0500edf8ca8927cad6da7b5e4a46
+checksum=0f1fdc10c6289b6750714490837df9aab691f352d33f5ecb64507704df6ff991
 long_desc="
  It provides the filesystem utilities for use with the ext2 filesystem.
- It also supports the ext3 filesystem with journaling support."
+ It also supports the ext3/4 filesystem with journaling support."
 
-build_requires=16
 subpackages="$pkgname-devel $pkgname-libs"
 conf_files="/etc/mke2fs.conf"
+
+Add_dependency build pkg-config
 Add_dependency build libuuid-devel
 Add_dependency build libblkid-devel
-Add_dependency build pkg-config
 
 post_install() {
 	# Remove stuff belonging to libblkid or libuuid pkgs.