My previous revert was unnecessary. This is an improved ebuild by dwfreed which brings in an upstream patch and additional functionality.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0xB5058F9A)

5 files changed, 98 insertions, 38 deletions

diff --git a/net-libs/libnftnl/ChangeLog b/net-libs/libnftnl/ChangeLog
index 8ff850312e29..beba44d45a8f 100644
--- a/net-libs/libnftnl/ChangeLog
+++ b/net-libs/libnftnl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-libs/libnftnl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnftnl/ChangeLog,v 1.2 2014/01/20 20:09:40 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnftnl/ChangeLog,v 1.3 2014/01/22 22:40:15 chainsaw Exp $
+
+*libnftnl-1.0.0-r2 (22 Jan 2014)
+
+  22 Jan 2014; Tony Vroon <chainsaw@gentoo.org> -libnftnl-1.0.0-r1.ebuild,
+  +libnftnl-1.0.0-r2.ebuild, +files/libnftnl-1.0.0-91264d8.patch:
+  My previous revert was unnecessary. This is an improved ebuild by dwfreed
+  which brings in an upstream patch and additional functionality.
 
 *libnftnl-1.0.0-r1 (20 Jan 2014)
 
diff --git a/net-libs/libnftnl/files/libnftnl-1.0.0-91264d8.patch b/net-libs/libnftnl/files/libnftnl-1.0.0-91264d8.patch
new file mode 100644
index 000000000000..646590701797
--- /dev/null
+++ b/net-libs/libnftnl/files/libnftnl-1.0.0-91264d8.patch
@@ -0,0 +1,36 @@
+From 91264d8b8b746f7eee8a3e1ee9b5e57758441cfc Mon Sep 17 00:00:00 2001
+From: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
+Date: Mon, 20 Jan 2014 15:56:21 +0000
+Subject: build: Ensure pkg-config file provides the right informations
+
+It's not -lnftables anymore but -lnftnl (among other details)
+
+Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+diff --git a/libnftnl.pc.in b/libnftnl.pc.in
+index 0c6d57e..fd5cc6a 100644
+--- a/libnftnl.pc.in
++++ b/libnftnl.pc.in
+@@ -1,15 +1,15 @@
+-# libnftables pkg-config file
++# libnftnl pkg-config file
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+ 
+-Name: libnftables
++Name: libnftnl
+ Description: Netfilter nf_tables infrastructure library
+-URL: http://netfilter.org/projects/libnftables/
++URL: http://netfilter.org/projects/libnftnl/
+ Version: @VERSION@
+ Requires:
+ Conflicts:
+-Libs: -L${libdir} -lnftables
++Libs: -L${libdir} -lnftnl
+ Cflags: -I${includedir}
+--
+cgit v0.9.2
diff --git a/net-libs/libnftnl/libnftnl-1.0.0-r1.ebuild b/net-libs/libnftnl/libnftnl-1.0.0-r1.ebuild
deleted file mode 100644
index afbbea327191..000000000000
--- a/net-libs/libnftnl/libnftnl-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnftnl/libnftnl-1.0.0-r1.ebuild,v 1.1 2014/01/20 20:09:40 chainsaw Exp $
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="http://www.netfilter.org/projects/libnftnl"
-SRC_URI="http://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="examples static-libs"
-
-RDEPEND="
-	net-libs/libmnl
-"
-
-src_configure() {
-	econf \
-		--libdir="${EPREFIX}"/$(get_libdir) \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-
-	if use examples; then
-		find examples/ -name 'Makefile*' -delete
-		dodoc -r examples/
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-libs/libnftnl/libnftnl-1.0.0-r2.ebuild b/net-libs/libnftnl/libnftnl-1.0.0-r2.ebuild
new file mode 100644
index 000000000000..d65635d2644f
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.0.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnftnl/libnftnl-1.0.0-r2.ebuild,v 1.1 2014/01/22 22:40:15 chainsaw Exp $
+
+EAPI=5
+
+inherit base linux-info toolchain-funcs
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="http://netfilter.org/projects/nftables/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="xml json examples static-libs"
+SRC_URI="http://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+RDEPEND=">=net-libs/libmnl-1.0.0
+	xml? ( >=dev-libs/mini-xml-2.6 )
+	json? ( >=dev-libs/jansson-2.3 )"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+PATCHES=( "${FILESDIR}/libnftnl-1.0.0-91264d8.patch" )
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with xml xml-parsing) \
+		$(use_with json json-parsing)
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a nftnl
+	prune_libtool_files
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete
+		dodoc -r examples/
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/net-libs/libnftnl/metadata.xml b/net-libs/libnftnl/metadata.xml
index 49772dfa6a87..b5965709677d 100644
--- a/net-libs/libnftnl/metadata.xml
+++ b/net-libs/libnftnl/metadata.xml
@@ -2,5 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<use>
+	<flag name="json">Supports parsing of JSON</flag>
+</use>
 </pkgmetadata>