Remove the patch, since it apparently causes problems when building against older libnl:3 releases (thanks to Pavel Šimerda). Instead, simply mark networkmanager as incompatible with =libnl-3.2.20, since libnl-3.2.21 installs object-api.h again.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 21 insertions, 43 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index f520ecc2bf1f..858b1cbc2e79 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.158 2013/01/24 04:38:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.159 2013/01/25 03:49:38 tetromino Exp $
+
+  25 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  networkmanager-0.9.6.4.ebuild,
+  -files/networkmanager-0.9.6.4-object-api.h.patch:
+  Remove the patch, since it apparently causes problems when building against
+  older libnl:3 releases (thanks to Pavel Šimerda). Instead, simply mark
+  networkmanager as incompatible with =libnl-3.2.20, since libnl-3.2.21
+  installs object-api.h again.
 
   24 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
   -networkmanager-0.9.4.0-r5.ebuild, -networkmanager-0.9.4.0-r7.ebuild,
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index fa100abb81c9..524a46fd0d22 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -18,22 +18,21 @@ AUX networkmanager-0.9.4.0-libnm-glib-init-gerror.patch 866 SHA256 edd0f9405cdff
 AUX networkmanager-0.9.4.0-nl80211-encryption-caps.patch 1486 SHA256 bfff23072a2610a1f5d896123fa083f767c2627ce65af4b8b2bae6e4d49ee2ee SHA512 c2a8d103221a2e7c39066c7dc3f2d328ba87777c1e91eefbc5b52eb0b6fe8a265d112f820f796e96875844c6e34eb7906f97d35526dc20074443f48f7b04ce73 WHIRLPOOL 04973744e81b4d93adf54c35f931188d5487fda529ac1f6473d461bc58a0f8d07f7985996edf9e4ac44c3ab016b33fe989d50da6610d01edb5e3e085f492da24
 AUX networkmanager-0.9.4.0-wifi-kernel-api.patch 2734 SHA256 e442f9ea526ae37f2169d7e205ed3cdc268fba6e2c2970064999150a01fa6499 SHA512 4d0353c267fc109d5acbd23e083a92ab7f9fabe63a3a6088c611c98d96200a332f25971153f48d7d75e08d07cc6529d3be6548a32ab11658623b9b85b03f7c0e WHIRLPOOL 619361264b1e75e98b8e2f217814a1c4fcbfa178db42da24bd06c182de6869f36c3dc7f6467452dd8f56a82723bf185486a4dae5dcb28961e54e0303fbc1d022
 AUX networkmanager-0.9.6.0-daemon-signals.patch 1045 SHA256 eb9e01f5622aabf611f881e3bf7989cdaa9df25dc19b0087747f04c423efe503 SHA512 2f6e7fcb76eb3944ae5df0fcc7b894ed45a8e852b0cba425fc6001de8a5532a1691ed847bb6c0b54988b9f2df5e9fa1720e4c6306e295477d7c8d246d00bf29a WHIRLPOOL 3243def958145d734954b8baaf4fefce4b9becf7e274f297010be9fb80998ae43df987061a7e0d00348df68bb84e92e1f90b5419567b88ed5a72e0db200a9598
-AUX networkmanager-0.9.6.4-object-api.h.patch 787 SHA256 a3d5a153cd89b852808528b35bd018246687663e1d5a0326dfc6a1af4fcca4ba SHA512 54eece26b266b167db718d30cbd7f247e7c6668f9df88045b2f82ff0485a98a8277c2adc598122b6974c9ab72d10bf1aad7485d5029f2e6941630adcdfde28fc WHIRLPOOL e9cf788cd266e4a2f922ba781e31e22d463c1fc293df82b59274b4e59c2a772c1c1f468961484e83248deecf2f63aa2a4b3de856f331dfcde5492bb93fadee11
 AUX nm-system-settings.conf-ifnet 70 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f SHA512 74304a367c0675cfc88a6ae17b291a9bc20f24a9dab72e9a4578e697870c4d96245aa45ce62ec86f1e5e7e3069ab8fccec33936e479ca630a836805addb5574d WHIRLPOOL 24e140440014c07c355cecab0564d6a57fc2e37e3ded242f3b9dd3e6ddd05dd924a7497400d2984eed407e99ba9661028a159dd4e393917cee7665b0ff4737eb
 DIST NetworkManager-0.9.4.0.tar.xz 1885364 SHA256 eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f SHA512 1895bb10d6d1954bd083729ac0f4529a983c510701cb5460cc6621651ea6b3e3db2585799594746701e5b6ded37b799f0a8a03b09baccc44fd371973e3ab22dd WHIRLPOOL af7ba4a1d5402e9062a0d333e8ad0d8a8669f7a881316d447f4d567f0354be63e12074cde2d94dc476de7bcbe594c49b27906ae495df0577b1a16d2e065b9581
 DIST NetworkManager-0.9.6.4.tar.xz 1968564 SHA256 511b411e055d187bc8f26c519fdb3e55e07fc40d4adecbbec623c0249380a7eb SHA512 900eb30f7fed35d43f2c1003fcf7fc0b6ab9c5a9f0a14777d4636372376af8477e63fc7fc9b05d2f281d48de658d96d9b30f44851af8ae2b4271bb2b5c2cb669 WHIRLPOOL b87903e4cbb3efcec17b25e74dd67dc6a81a6d553df57e9c699bb1f0d40fe6d611953f6baaeca48ef4387316980d775ec2b07a9df06ecb5f03c10dffc2b60584
 EBUILD networkmanager-0.9.4.0-r6.ebuild 7726 SHA256 50c81e92d05d304b3d9725f337f02dee347a79d3153350e64eecc6cfe80d79c3 SHA512 aa3dfc6d96397d65d954c7c2964dad14797a75293bb5d24a2f5ae93b762ccc03508c4dd957f655dc15363f76ace9f220dbdb984b3bb3c702eed7a78dcf3f5c67 WHIRLPOOL ba5bc3d8cb47e6cef4d96bf0064f8ba9ab5fdb137ee7124c92e1f709e0581b87abe9b5a28942bff272e03c57b0abea3f3a1f76a456efa596f516878137bb4468
-EBUILD networkmanager-0.9.6.4.ebuild 7695 SHA256 957d7aa8a592f0bf023008bb936c01fbc2c6614d19f3ae7d5aa28af13bdb75d9 SHA512 6812edfe93fffd957597e4a37530f9fa67c0052bdc9309a058e662e95101fab9b6faf39fd9631e86eea14dc98959e14dc1f60fd3907706f39f28688855b27bd3 WHIRLPOOL b29a93033a1e5612566dc99f0b0e78724740132c3e2c7f028bd396295b7d5245a319a551d56711b35c5b2c1ee64945deb34d92dc884cb5467cc42cab02f97f18
-MISC ChangeLog 40036 SHA256 77be70eedd10365d719822d43dff3318862043bd1ed1e0e2a323074889584b53 SHA512 0ed8a8a6edae8ad0dc27afe021ffdaefd4e09e906c0a5d5faa67147adffc8a39a4a677ef7680b2c35e25313a78bc04c1a72ae53eb89b4dafe98a268bd98e317f WHIRLPOOL af10d4db345d7b9c5f972b35e38f3dff99fe50285d9d257cf846bf73bf0a6c47a23b743a2b7a990ace4d02aecf546fe2e30a53090cf8c6bea4f7a8a8f80fc1a9
+EBUILD networkmanager-0.9.6.4.ebuild 7612 SHA256 e4e1d08937316a1c1d6ad503ba6771f186ff0baf86165ab3bbb68dfc61919f47 SHA512 825d165d8eaa03385e37b69a2082f65e5a2fabb7ad8fa35d2934d0eca0f6019b1c464801feadbacc70452ad73439a55bf801b572abb841a50f501adb892719df WHIRLPOOL 1d3516b1dc0df064d7fae39ae593e919a86c8d92e02dd245d16a27bbe5b3c32747a7a6035fce1eb6b86224d96b2b628de775df5727ad906b0a3df230dc44d653
+MISC ChangeLog 40436 SHA256 54440bc95610cd5964a20ab497ac2568908757ee1d50722155b52069b91b38a1 SHA512 ea10eb9e0ea6acd175589e0885c4fdc8eb028950e3133a8c4dd3acad2ba868ee4653dae1531edee349729c11247576dc3452ecd626780f773e05567a9a5070e2 WHIRLPOOL 4c8a1c58f5f74f3f10b75deea5e4106fc9d196c34d444bcbdb027791c353c3e44c95f306681d3a1871d07123a99bd2ac6841a92d89f27d4f68bf58b9b7adbc70
 MISC metadata.xml 1719 SHA256 59389638e363cf7454d60f5799d0744a98e22618480f327ded50aa5c7b390676 SHA512 5fae699bc621beb604abdffc4bb4afc6d4619dd7ad08a351cbbdea9c3a5521dfd050d9e526f40f068c93e0f8c0cd46116ab107ad11abe40a0750c58ecb55ceed WHIRLPOOL f51bb0d682f723e90878f2470426b65c02429d44ba3b3749bd0d182ec474ebcdc3a542347c38e6fabb1add4ed8ac9429d15a0e16fd4c159242d309496c6a8ed5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRALqxAAoJEJ0WA1zPCt1hZBYH/RwNwNOLAMIaQ9dO0UuX7yoz
-+Z1+nHQea2b1TIkLjRE9yO6WUixRZ7O9Lw6Hkc00uHzCtWV+kCSQ99pHmRiafzCE
-7X4NU2axARHVVlA+zkMdtgpQLcbSBgSmjFjZ4KkAXgVZ7jB6dMR0MUKRjT3C/E7C
-asTbsbRx2NrSQHBaMAKSrFejXdF5Pnh8E29rYae8QYaJSGGYRBisjwLeDmU5E1oo
-b1FHY3dMQdTUzhwFcvJPtd+kwRv953eLDqFhMj90RgIprdVWYMpbSeCuz/LrZatf
-AENNVMxe8KlXXPOF82nQYryOIHhxU6kpxi9Y1nOarGEgpcvgU4rfLg9pO4VQcRs=
-=qi6Z
+iQEcBAEBCAAGBQJRAgDTAAoJEJ0WA1zPCt1hvtgH/jIWi+oA7uqEwTpR09K8CElX
+dlWH45YTTEhbS8sxh2pCB2gPTTFQeJFYWWEqpH00IfNXrv2QNHQpEgzT8rMAF8k9
++CD0htpmkyXJ9oJM7RHS9g0E2rWgykNwIf7f9Sh9BG2PLSIWv7Nk6gKPnHG34iow
+fZkXBcY0daoyghr1Lcb+k/j1Y4DngzXeaRxkDpkY9mqIcUsFnElI40PthWZ0ftSF
+VG+/qMSJwpjRpoSvEICtRiSiSld1OErwaHVOZ0yTAQt5mD0myoHJgsbtCCXfOTRw
+g83v2zeayNMJm0JKPVu7m5xmJdq303LHluP+zwVPInranahCFpIGuabUKE4CK7w=
+=qM/N
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/networkmanager-0.9.6.4-object-api.h.patch b/net-misc/networkmanager/files/networkmanager-0.9.6.4-object-api.h.patch
deleted file mode 100644
index cca6edfa9403..000000000000
--- a/net-misc/networkmanager/files/networkmanager-0.9.6.4-object-api.h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 527f55420fb16c5525e12178ddd8b7568dceb0e2 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 23 Jan 2013 23:00:37 -0500
-Subject: [PATCH] netlink: do not include object-api.h
-
-It's no longer installed by libnl-3.0 >= 3.2.20
-
-https://bugzilla.gnome.org/show_bug.cgi?id=692423
----
- src/nm-netlink-monitor.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c
-index 29a21e3..84f9386 100644
---- a/src/nm-netlink-monitor.c
-+++ b/src/nm-netlink-monitor.c
-@@ -38,7 +38,7 @@
- #include <linux/if.h>
- #include <linux/unistd.h>
- #include <unistd.h>
--#include <netlink/object-api.h>
-+#include <netlink/object.h>
- #include <netlink/route/addr.h>
- #include <netlink/route/rtnl.h>
- 
--- 
-1.8.1.1
-
diff --git a/net-misc/networkmanager/networkmanager-0.9.6.4.ebuild b/net-misc/networkmanager/networkmanager-0.9.6.4.ebuild
index 97c71a4a012e..204fcfadb681 100644
--- a/net-misc/networkmanager/networkmanager-0.9.6.4.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.6.4.ebuild,v 1.9 2013/01/24 04:38:08 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.6.4.ebuild,v 1.10 2013/01/25 03:49:38 tetromino Exp $
 
 EAPI="4"
 GNOME_ORG_MODULE="NetworkManager"
@@ -64,7 +64,8 @@ DEPEND="${COMMON_DEPEND}
 	>=sys-devel/gettext-0.17
 	>=sys-kernel/linux-headers-2.6.29
 	doc? ( >=dev-util/gtk-doc-1.8 )
-	vala? ( $(vala_depend) )"
+	vala? ( $(vala_depend) )
+	!wimax? ( !=dev-libs/libnl-3.2.20 )"
 
 sysfs_deprecated_check() {
 	ebegin "Checking for SYSFS_DEPRECATED support"
@@ -107,8 +108,6 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.9.4.0-dhclient-ipv6.patch"
 	# https://bugzilla.gnome.org/show_bug.cgi?id=683932
 	epatch "${FILESDIR}/${PN}-0.9.6.0-daemon-signals.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=692423, bug #453736
-	epatch "${FILESDIR}/${PN}-0.9.6.4-object-api.h.patch"
 
 	epatch_user