Merge branch '3.0' into 3.1

e2fsprogs/.md5sum

@@ -1 +1 @@
-3f8e41e63b432ba114b33f58674563f7  e2fsprogs-1.42.9.tar.gz
+62bfe2fe0a194c5c37165789ac2825a8  e2fsprogs-1.42.10.tar.gz

e2fsprogs/Pkgfile

@@ -4,8 +4,8 @@
 # Depends on:  util-linux
 
 name=e2fsprogs
-version=1.42.9
-release=1
+version=1.42.10
+release=2
 source=(http://downloads.sourceforge.net/project/$name/$name/v$version/$name-$version.tar.gz)
 
 build() {
@@ -23,13 +23,9 @@ build() {
                 --disable-libuuid \
                 --disable-uuidd
 
-    make
+    make -j1
     make -j1 DESTDIR=$PKG install install-libs
 
-    # quota support is disabled by default
-    rm -r $PKG/usr/include/quota
-    rm $PKG/usr/lib/{libquota.a,pkgconfig/quota.pc}
-
     rm -r $PKG/usr/share/info
 
     chmod +w -R $PKG

xfsprogs/.footprint

@@ -14,6 +14,7 @@ drwxr-xr-x	root/root	usr/include/xfs/
 -rw-r--r--	root/root	usr/include/xfs/platform_defs.h
 -rw-r--r--	root/root	usr/include/xfs/xfs.h
 -rw-r--r--	root/root	usr/include/xfs/xfs_fs.h
+-rw-r--r--	root/root	usr/include/xfs/xfs_types.h
 -rw-r--r--	root/root	usr/include/xfs/xqm.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libhandle.a

xfsprogs/.md5sum

@@ -1 +1 @@
-de9f1f45026c2f4e0776058d429ff4b6  xfsprogs-3.1.11.tar.gz
+400047b2f6af87c0345b8f0cc00c13db  xfsprogs-3.2.0.tar.gz

xfsprogs/Pkgfile

@@ -4,7 +4,7 @@
 # Depends on:  util-linux
 
 name=xfsprogs
-version=3.1.11
+version=3.2.0
 release=1
 source=(ftp://oss.sgi.com/projects/xfs/cmd_tars/$name-$version.tar.gz)
 
@@ -20,10 +20,10 @@ build() {
                 --mandir=/usr/man \
                 --disable-gettext
     make
-    make DIST_ROOT=$PKG install install-dev
+    make -j1 DIST_ROOT=$PKG install install-dev
 
     rm $PKG/lib/libhandle.{a,la,so}
-    ln -sf ../../lib/libhandle.so.1.0.3 $PKG/usr/lib/libhandle.so
+    ln -sf ../../lib/$(readlink $PKG/lib/libhandle.so.1) $PKG/usr/lib/libhandle.so
 
     rm -r $PKG/usr/share
 }