From: Jeroen Roovers <jer@gentoo.org>
Date: Sun, 1 Jan 2017 19:19:21 +0000 (+0100)
Subject: dev-libs/libnl: Fix building against older kernel headers (bug #604190 by pavel sanda).
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=47bc9ccf7abfb3054d762f2d9f7b3a1cbeebe612;p=gentoo.git

dev-libs/libnl: Fix building against older kernel headers (bug #604190 by pavel sanda).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---

diff --git a/dev-libs/libnl/files/libnl-3.2.20-cache-api.patch b/dev-libs/libnl/files/libnl-3.2.20-cache-api.patch
deleted file mode 100644
index ce6e47b7cfa7..000000000000
--- a/dev-libs/libnl/files/libnl-3.2.20-cache-api.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/tests/test-cache-mngr.c
-+++ b/tests/test-cache-mngr.c
-@@ -1,5 +1,5 @@
- #include <netlink/netlink.h>
--#include <netlink/cache.h>
-+#include <netlink/cache-api.h>
- #include <netlink/cli/utils.h>
- #include <signal.h>
- 
diff --git a/dev-libs/libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch b/dev-libs/libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch
deleted file mode 100644
index 09b2f0bb8ebb..000000000000
--- a/dev-libs/libnl/files/libnl-3.2.20-rtnl_tc_get_ops.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/src/nl-class-add.c
-+++ b/src/nl-class-add.c
-@@ -14,6 +14,7 @@
- #include <netlink/cli/qdisc.h>
- #include <netlink/cli/class.h>
- #include <netlink/cli/link.h>
-+#include <netlink/route/tc-api.h> /* rtnl_tc_get_ops() */
- 
- static int quiet = 0;
- 
---- a/src/nl-cls-add.c
-+++ b/src/nl-cls-add.c
-@@ -12,6 +12,7 @@
- #include <netlink/cli/tc.h>
- #include <netlink/cli/cls.h>
- #include <netlink/cli/link.h>
-+#include <netlink/route/tc-api.h> /* rtnl_tc_get_ops() */
- 
- static int quiet = 0;
- 
---- a/src/nl-qdisc-add.c
-+++ b/src/nl-qdisc-add.c
-@@ -13,6 +13,7 @@
- #include <netlink/cli/tc.h>
- #include <netlink/cli/qdisc.h>
- #include <netlink/cli/link.h>
-+#include <netlink/route/tc-api.h> /* rtnl_tc_get_ops() */
- 
- static int quiet = 0;
- 
diff --git a/dev-libs/libnl/files/libnl-3.2.28-in6.patch b/dev-libs/libnl/files/libnl-3.2.28-in6.patch
new file mode 100644
index 000000000000..5dcf6ae40ccf
--- /dev/null
+++ b/dev-libs/libnl/files/libnl-3.2.28-in6.patch
@@ -0,0 +1,12 @@
+https://github.com/thom311/libnl/pull/121
+
+--- a/include/linux-private/linux/if_bridge.h
++++ b/include/linux-private/linux/if_bridge.h
+@@ -15,7 +15,6 @@
+ 
+ #include <linux/types.h>
+ #include <linux/if_ether.h>
+-#include <linux/in6.h>
+ 
+ #define SYSFS_BRIDGE_ATTR	"bridge"
+ #define SYSFS_BRIDGE_FDB	"brforward"
diff --git a/dev-libs/libnl/libnl-3.2.28.ebuild b/dev-libs/libnl/libnl-3.2.28.ebuild
index ef5f05a0a771..9c037879b6db 100644
--- a/dev-libs/libnl/libnl-3.2.28.ebuild
+++ b/dev-libs/libnl/libnl-3.2.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -63,8 +63,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch
-	"${FILESDIR}"/${PN}-3.2.20-cache-api.patch
+	"${FILESDIR}"/${PN}-3.2.28-in6.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/libnl/libnl-3.2.29.ebuild b/dev-libs/libnl/libnl-3.2.29.ebuild
index 5c5c56579d80..56f302170246 100644
--- a/dev-libs/libnl/libnl-3.2.29.ebuild
+++ b/dev-libs/libnl/libnl-3.2.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -63,8 +63,7 @@ MULTILIB_WRAPPED_HEADERS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch
-	"${FILESDIR}"/${PN}-3.2.20-cache-api.patch
+	"${FILESDIR}"/${PN}-3.2.28-in6.patch
 )
 
 src_prepare() {
diff --git a/dev-libs/libnl/libnl-3.2.9999.ebuild b/dev-libs/libnl/libnl-3.2.9999.ebuild
index 29a9d874c38f..1c1ea6daf4c2 100644
--- a/dev-libs/libnl/libnl-3.2.9999.ebuild
+++ b/dev-libs/libnl/libnl-3.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -31,16 +31,13 @@ DEPEND="
 	sys-devel/flex
 "
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
 
 DOCS=(
 	ChangeLog
 )
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1-vlan-header.patch
-	"${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch
-	"${FILESDIR}"/${PN}-3.2.20-cache-api.patch
-)
 
 MULTILIB_WRAPPED_HEADERS=(
 	# we do not install CLI stuff for non-native