From 1ad8dcfbd95304f35eb65e1df3135d660e5d9510 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 22 Jul 2014 15:50:19 +0200
Subject: [PATCH] util-linux: update to 2.25.

---
 common/shlibs               |  1 +
 srcpkgs/libsmartcols        |  1 +
 srcpkgs/libsmartcols-devel  |  1 +
 srcpkgs/util-linux/template | 45 ++++++++++++++++++++++++-------------
 4 files changed, 33 insertions(+), 15 deletions(-)
 create mode 120000 srcpkgs/libsmartcols
 create mode 120000 srcpkgs/libsmartcols-devel

diff --git a/common/shlibs b/common/shlibs
index 6f4d184c29..23afbca2de 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1678,3 +1678,4 @@ libgeis.so.1 geis-2.2.16_1
 libndp.so.0 libndp-1.3_1
 libepoxy.so.0 libepoxy-1.2_1
 libfakekey.so.0 libfakekey-0.1_1
+libsmartcols.so.1 libsmartcols-2.25_1
diff --git a/srcpkgs/libsmartcols b/srcpkgs/libsmartcols
new file mode 120000
index 0000000000..a7ce47a999
--- /dev/null
+++ b/srcpkgs/libsmartcols
@@ -0,0 +1 @@
+util-linux
\ No newline at end of file
diff --git a/srcpkgs/libsmartcols-devel b/srcpkgs/libsmartcols-devel
new file mode 120000
index 0000000000..a7ce47a999
--- /dev/null
+++ b/srcpkgs/libsmartcols-devel
@@ -0,0 +1 @@
+util-linux
\ No newline at end of file
diff --git a/srcpkgs/util-linux/template b/srcpkgs/util-linux/template
index 11bc1ffed6..e77ae878c1 100644
--- a/srcpkgs/util-linux/template
+++ b/srcpkgs/util-linux/template
@@ -1,15 +1,15 @@
 # Template file for 'util-linux'
 pkgname=util-linux
-version=2.24.2
-revision=3
+version=2.25
+revision=1
 short_desc="Miscellaneous linux utilities"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://userweb.kernel.org/~kzak/util-linux-ng"
 license="GPL-2"
-distfiles="${KERNEL_SITE}/utils/${pkgname}/v2.24/${pkgname}-${version}.tar.xz"
-checksum=1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0
+distfiles="${KERNEL_SITE}/utils/${pkgname}/v${version}/${pkgname}-${version}.tar.xz"
+checksum=47ba5a8bd8cdd55262699078a5612a95db17966c7f20c43e3fe492c90ce7980a
 
-hostmakedepends="pkg-config"
+hostmakedepends="libtool pkg-config"
 makedepends="zlib-devel ncurses-devel pam-devel>=1.1.8_4 libcap-ng-devel"
 # Create uuidd system account for uuidd.
 system_accounts="uuidd"
@@ -25,12 +25,9 @@ conflicts="chroot-util-linux>=0 coreutils<8.21_3 shadow<4.1.5.1_14"
 replaces="util-linux-ng>=0 e2fsprogs<=1.41.14_1 eject>=0 shadow<4.1.5.1_3"
 provides="eject-${version}_1"
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" automake gettext-devel libtool"
-	pre_configure() {
-		NOCONFIGURE=1 ./autogen.sh
-	}
-fi
+pre_configure() {
+	libtoolize -f
+}
 
 do_configure() {
 	./configure ${configure_args} \
@@ -41,8 +38,7 @@ do_configure() {
 		--enable-fs-paths-extra=/usr/sbin:/usr/bin \
 		--disable-vipw --enable-newgrp --enable-chfn-chsh \
 		--with-systemdsystemunitdir=/usr/lib/systemd/system \
-		--without-udev --enable-write \
-		--enable-socket-activation --localstatedir=/run \
+		--without-udev --enable-write --localstatedir=/run \
 		SUID_CFLAGS="-fPIE" SUID_LDFLAGS="-pie"
 }
 do_build() {
@@ -116,7 +112,26 @@ libuuid-devel_package() {
 		vmove usr/lib/libuuid.a
 		vmove usr/lib/libuuid.so
 		vmove usr/lib/pkgconfig
-		vmove usr/include
-		vmove usr/share/man/man3
+		vmove usr/include/uuid
+		vmove usr/share/man/man3/uuid*
 	}
 }
+
+libsmartcols-devel_package() {
+	depends="libsmartcols>=${version}_${revision}"
+	short_desc="Table or Tree library from util-linux - development files"
+	pkg_install() {
+		vmove usr/lib/libsmartcols.a
+		vmove usr/lib/libsmartcols.so
+		vmove usr/include/libsmartcols
+		vmove usr/lib/pkgconfig/smartcols*
+	}
+}
+
+libsmartcols_package() {
+	short_desc="Table or Tree library from util-linux"
+	pkg_install() {
+		vmove usr/lib/libsmartcols.so.*
+	}
+}
+