From 49b3f18679453dc917b1f21937d5c129774a4b44 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 13 Aug 2012 10:10:48 +0200
Subject: [PATCH] libcap-ng: update to 0.7.

---
 srcpkgs/libcap-ng/libcap-ng-devel.template          |  6 ++----
 srcpkgs/libcap-ng/libcap-ng-progs.template          |  4 +---
 srcpkgs/libcap-ng/libcap-ng-python.template         |  4 +---
 .../patches/missing_XATTR_NAME_CAPS_def.diff        | 13 -------------
 srcpkgs/libcap-ng/template                          | 11 +++++------
 5 files changed, 9 insertions(+), 29 deletions(-)
 delete mode 100644 srcpkgs/libcap-ng/patches/missing_XATTR_NAME_CAPS_def.diff

diff --git a/srcpkgs/libcap-ng/libcap-ng-devel.template b/srcpkgs/libcap-ng/libcap-ng-devel.template
index afa12bb1ed8..88ab321a57a 100644
--- a/srcpkgs/libcap-ng/libcap-ng-devel.template
+++ b/srcpkgs/libcap-ng/libcap-ng-devel.template
@@ -1,14 +1,12 @@
 # Template file for 'libcap-ng-devel'.
 #
-depends="glibc-devel libcap-ng"
+depends="glibc-devel libcap-ng>=${version}"
 short_desc="${sourcepkg} development files"
 long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-
-do_install()
-{
+do_install() {
 	vmove usr/include usr
 	vmove usr/lib/pkgconfig usr/lib
 	vmove "usr/lib/*.a" usr/lib
diff --git a/srcpkgs/libcap-ng/libcap-ng-progs.template b/srcpkgs/libcap-ng/libcap-ng-progs.template
index 126329d4ed2..4e52680d7f2 100644
--- a/srcpkgs/libcap-ng/libcap-ng-progs.template
+++ b/srcpkgs/libcap-ng/libcap-ng-progs.template
@@ -5,9 +5,7 @@ long_desc="${long_desc}
 
  This package contains binary utilities provided by the ${sourcepkg} package."
 
-
-do_install()
-{
+do_install() {
 	vmove usr/bin usr
 	vmove usr/share usr
 }
diff --git a/srcpkgs/libcap-ng/libcap-ng-python.template b/srcpkgs/libcap-ng/libcap-ng-python.template
index 67bc285c258..2bd481d4dbd 100644
--- a/srcpkgs/libcap-ng/libcap-ng-python.template
+++ b/srcpkgs/libcap-ng/libcap-ng-python.template
@@ -8,8 +8,6 @@ long_desc="${long_desc}
 
 pycompile_module="capng"
 
-
-do_install()
-{
+do_install() {
 	vmove "usr/lib/python*" usr/lib/python
 }
diff --git a/srcpkgs/libcap-ng/patches/missing_XATTR_NAME_CAPS_def.diff b/srcpkgs/libcap-ng/patches/missing_XATTR_NAME_CAPS_def.diff
deleted file mode 100644
index a285cd4dd19..00000000000
--- a/srcpkgs/libcap-ng/patches/missing_XATTR_NAME_CAPS_def.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/cap-ng.h.orig	2010-10-29 16:26:53.000000000 +0200
-+++ src/cap-ng.h	2010-10-29 16:27:25.000000000 +0200
-@@ -35,6 +35,10 @@ extern "C" {
- #define CAP_LAST_CAP CAP_AUDIT_CONTROL
- #endif
- 
-+#ifndef XATTR_NAME_CAPS
-+#define XATTR_NAME_CAPS	"security.capability"
-+#endif
-+
- typedef enum {  CAPNG_DROP, CAPNG_ADD } capng_act_t;
- typedef enum {  CAPNG_EFFECTIVE=1, CAPNG_PERMITTED=2,
- 		CAPNG_INHERITABLE=4, CAPNG_BOUNDING_SET=8 } capng_type_t;
diff --git a/srcpkgs/libcap-ng/template b/srcpkgs/libcap-ng/template
index f012b2c42f0..ebc798b7eb1 100644
--- a/srcpkgs/libcap-ng/template
+++ b/srcpkgs/libcap-ng/template
@@ -1,15 +1,16 @@
 # Template file for 'libcap-ng'
 pkgname=libcap-ng
-version=0.6.6
-distfiles="http://people.redhat.com/sgrubb/$pkgname/$pkgname-$version.tar.gz"
+version=0.7
+revision=1
 build_style=gnu-configure
-revision=3
+subpackages="$pkgname-devel $pkgname-progs $pkgname-python"
 makedepends="python-devel swig"
 short_desc="An alternate POSIX capabilities library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://people.redhat.com/sgrubb/libcap-ng/"
 license="GPL-2, LGPL-2.1"
-checksum=89589a29a6b19068edd650dd4f626c10e84bfe63eacae7b1fd1f98f3ac8ea00d
+distfiles="http://people.redhat.com/sgrubb/$pkgname/$pkgname-$version.tar.gz"
+checksum=369682b2e5a5716a6271a6c5db9a43e3809e91acfb08438c0d3de2fec1284a35
 long_desc="
  This library implements the user-space interfaces to the POSIX 1003.1e
  capabilities available in Linux kernels. These capabilities are a
@@ -18,5 +19,3 @@ long_desc="
 
  The libcap-ng library is intended to make programming with posix capabilities
  much easier than the traditional libcap library."
-
-subpackages="$pkgname-devel $pkgname-progs $pkgname-python"