From 1816f2a9657ea28dc8aeaea21f6a8db1bd02e20b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 30 Jan 2012 17:52:11 +0100
Subject: [PATCH] e2fsprogs-libs: move shlibs to /usr/lib.

---
 srcpkgs/e2fsprogs/e2fsprogs-libs.template | 9 +++------
 srcpkgs/e2fsprogs/template                | 8 ++++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/e2fsprogs/e2fsprogs-libs.template b/srcpkgs/e2fsprogs/e2fsprogs-libs.template
index f63c94a8af..f0d9f7e153 100644
--- a/srcpkgs/e2fsprogs/e2fsprogs-libs.template
+++ b/srcpkgs/e2fsprogs/e2fsprogs-libs.template
@@ -5,11 +5,8 @@ long_desc="${long_desc}
 
  This package contains the shared libraries."
 
-revision=1
+revision=2
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/lib ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/lib/lib*.so.* ${DESTDIR}/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
+do_install() {
+	vmove "usr/lib/*.so*" usr/lib
 }
diff --git a/srcpkgs/e2fsprogs/template b/srcpkgs/e2fsprogs/template
index 7b38a4d366..10605d11b2 100644
--- a/srcpkgs/e2fsprogs/template
+++ b/srcpkgs/e2fsprogs/template
@@ -6,8 +6,9 @@ distfiles="$SOURCEFORGE_SITE/e2fsprogs/$pkgname-$version.tar.gz"
 build_style=gnu-configure
 configure_args="--enable-htree --enable-elf-shlibs --disable-fsck
 --enable-e2initrd-helper --disable-rpath --with-root-prefix=
--disable-uuidd --disable-libuuid --disable-libblkid
---enable-symlink-build --enable-symlink-install"
+--disable-uuidd --disable-libuuid --disable-libblkid
+--enable-symlink-build --enable-symlink-install
+--libdir=/usr/lib --libexecdir=/usr/lib"
 make_install_args="install-libs"
 short_desc="Ext2/3/4 Filesystem Utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -25,8 +26,7 @@ Add_dependency build libuuid-devel
 Add_dependency build libblkid-devel
 Add_dependency build pkg-config
 
-post_install()
-{
+post_install() {
 	# Remove stuff belonging to libblkid or libuuid pkgs.
 	find ${DESTDIR} -name \*blkid\* -o -name \*findfs\* \
 		-name \*uuidd\* -o -name \*uuidgen\* | \