From 21c0e59991fb8e571801a0323c5d5e50ec521338 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 14 Aug 2009 09:33:40 +0000
Subject: testing/util-linux-ng: upgrade to 2.16. provide libuuid and libblkid

This means e2fsprogs no longer provides the libuuid and libblkid packages

Also, rely on busybox trigger rather than use post-deinstall
---
 testing/util-linux-ng/APKBUILD                     | 35 +++++++++++++++-------
 testing/util-linux-ng/util-linux-ng.post-deinstall |  3 --
 2 files changed, 25 insertions(+), 13 deletions(-)
 delete mode 100644 testing/util-linux-ng/util-linux-ng.post-deinstall

diff --git a/testing/util-linux-ng/APKBUILD b/testing/util-linux-ng/APKBUILD
index 37c67548eb..6a0dbc809f 100644
--- a/testing/util-linux-ng/APKBUILD
+++ b/testing/util-linux-ng/APKBUILD
@@ -1,18 +1,17 @@
 # Contributor: Leonardo Arena <rnalrd@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=util-linux-ng
-pkgver=2.14.2
+pkgver=2.16
 pkgrel=0
 pkgdesc="Random collection of Linux utilities"
 arch=""
 url="http://kernel.org/~kzak/util-linux-ng/"
 license="GPL-2 GPL Public Domain"
-depends="uclibc e2fsprogs libuuid zlib"
-makedepends="e2fsprogs-dev zlib-dev"
-install=$pkgname.post-deinstall
-source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.14/$pkgname-$pkgver.tar.gz
-	$install"
-subpackages="$pkgname-doc"
+depends=
+makedepends="zlib-dev"
+install=
+source="http://www.kernel.org/pub/linux/utils/util-linux-ng/v2.16/$pkgname-$pkgver.tar.gz"
+subpackages="$pkgname-doc $pkgname-dev libuuid libblkid"
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -21,9 +20,11 @@ build() {
 		-i mount/lomount.c
 
 	./configure --prefix=/usr \
+		--disable-uuidd \
 		--disable-nls \
+		--disable-tls \
 		--disable-kill \
-		--enable-init \
+		--disable-init \
 		--without-ncurses \
 		--without-pam
 		
@@ -31,5 +32,19 @@ build() {
 	make install DESTDIR=$pkgdir
 }
 
-md5sums="8e5897e214292e83aa842fe3a3ec626f  util-linux-ng-2.14.2.tar.gz
-d4bfc6c5612df4fd8118032175aa2201  util-linux-ng.post-deinstall"
+libuuid() {
+	pkgdesc="DCE compatible Universally Unique Identifier library"
+	depends=
+	mkdir -p "$subpkgdir"/lib
+	mv "$pkgdir"/lib/libuuid* "$subpkgdir"/lib/
+}
+
+libblkid() {
+	pkgdesc="Block device identification library"
+	depends=
+	mkdir -p "$subpkgdir"/lib 
+	mv "$pkgdir"/lib/libblkid* "$subpkgdir"/lib/
+}
+
+	
+md5sums="f6aba93a43b7736782d7aaa3718c45e3  util-linux-ng-2.16.tar.gz"
diff --git a/testing/util-linux-ng/util-linux-ng.post-deinstall b/testing/util-linux-ng/util-linux-ng.post-deinstall
deleted file mode 100644
index f5c46058fe..0000000000
--- a/testing/util-linux-ng/util-linux-ng.post-deinstall
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-busybox --install -sh
-- 
cgit v1.2.3