xfsprogs: remove -libs subpkg, useless. Move stuff to /usr.

common/shlibs

@@ -419,7 +419,6 @@ libQtDesigner.so.4		qt-designer		qt-devel
 libsysfs.so.2			libsysfs		libsysfs-devel
 libsensors.so.4			libsensors		libsensors-devel
 libcap-ng.so.0			libcap-ng		libcap-ng-devel
-libhandle.so.1			xfsprogs-libs		xfsprogs-devel
 libphysfs.so.1			physfs			physfs-devel
 libSDL_ttf-2.0.so.0		SDL_ttf			SDL_ttf-devel
 libparted.so.1			libparted		libparted-devel

srcpkgs/xfsprogs-libs

@@ -1 +0,0 @@
-xfsprogs

srcpkgs/xfsprogs/depends

@@ -1,2 +1,2 @@
 abi_depends=">=3.0.3"
-api_depends="${abi_depends}"
+api_depends=">=3.1.7_2"

srcpkgs/xfsprogs/template

@@ -1,6 +1,7 @@
 # Template file for 'xfsprogs'
 pkgname=xfsprogs
 version=3.1.7
+revision=1
 homepage="http://oss.sgi.com/projects/xfs/"
 distfiles="http://ftp.archlinux.org/other/xfsprogs/$pkgname-$version.tar.gz"
 short_desc="Utilities for managing the XFS filesystem"
@@ -16,8 +17,10 @@ long_desc="
  based, and makes extensive use of Btrees (directories, extents, free space)
  to aid both performance and scalability."
 
+replaces="xfsprogs-libs>=0"
+
 disable_parallel_build=yes
-subpackages="$pkgname-libs $pkgname-devel"
+subpackages="$pkgname-devel"
 
 Add_dependency build gawk
 Add_dependency build gettext
@@ -27,7 +30,7 @@ Add_dependency build readline-devel
 
 do_build() {
 	export DEBUG=-DNDEBUG
-	./configure --libdir=/usr/lib --libexecdir=/usr/lib \
+	./configure ${CONFIGURE_SHARED_ARGS} \
 		--enable-readline=yes --enable-blkid=yes --enable-lib64=no
 	make ${makejobs}
 }
@@ -38,4 +41,8 @@ do_install() {
 	rm -rf ${DESTDIR}/usr/share/doc
 	rm -f ${DESTDIR}/usr/share/man/man5/proj*
 	rm -f ${DESTDIR}/lib/*.{a,la}
+	rm -f ${DESTDIR}/usr/lib/*.so
+	# Move stuff to /usr.
+	vmove "sbin/*" usr/sbin
+	vmove "lib/*" usr/lib
 }

srcpkgs/xfsprogs/xfsprogs-devel.template

@@ -5,10 +5,10 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
+revision=2
 
 Add_dependency run libuuid-devel
-Add_dependency run xfsprogs-libs
+Add_dependency run xfsprogs ">=3.1.7_1"
 
 do_install() {
 	vmove usr/include usr

srcpkgs/xfsprogs/xfsprogs-libs.rshlibs

@@ -1 +0,0 @@
-libc.so.6

srcpkgs/xfsprogs/xfsprogs-libs.template

@@ -1,12 +0,0 @@
-# Template file for 'xfsprogs-libs'.
-#
-short_desc="${short_desc} (shared libraries)"
-long_desc="${long_desc}
-
- This package contains the shared libraries."
-
-revision=1
-
-do_install() {
-	vmove "lib/*.so*" usr/lib
-}

srcpkgs/xfsprogs/xfsprogs.rshlibs

@@ -4,4 +4,3 @@ libpthread.so.0
 libc.so.6
 libblkid.so.1
 libreadline.so.6
-libhandle.so.1