Version bump, default to dhclient instead of dhcpcd (#493732), set proper pppd plugindir (#519986 by Clemente Aguiar, Sergey Popov, Agostino Sarubbo and others), remove wimax support (#522822 by Dion Moult), drop old.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 59 insertions, 47 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index f08d3a5822c6..fe5685d78f0d 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.202 2014/08/21 10:45:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.203 2014/09/22 19:19:19 pacho Exp $
+
+*networkmanager-0.9.10.0 (22 Sep 2014)
+
+  22 Sep 2014; Pacho Ramos <pacho@gentoo.org> +networkmanager-0.9.10.0.ebuild,
+  -networkmanager-0.9.8.8.ebuild, metadata.xml:
+  Version bump, default to dhclient instead of dhcpcd (#493732), set proper pppd
+  plugindir (#519986 by Clemente Aguiar, Sergey Popov, Agostino Sarubbo and
+  others), remove wimax support (#522822 by Dion Moult), drop old.
 
   21 Aug 2014; Agostino Sarubbo <ago@gentoo.org>
   networkmanager-0.9.8.10-r1.ebuild:
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 8191c70e71d2..b8549953e2f1 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -24,28 +24,18 @@ AUX networkmanager-0.9.8.2-allow-new-dhcpcd.patch 917 SHA256 b3a69fd9850634edc19
 AUX networkmanager-0.9.8.4-pre-sleep.patch 4606 SHA256 ea70654524d5b414fcef10164b8dfb5e84bdf2444341f62fc7617952e2e721de SHA512 0781743f1e1afce3e51df6958996ea96885f56be96bd377dfbf115efaaa935396d468c701dd8a8c97e3a1623743476880e5936f4c0db4d560188e1f4c3b9b814 WHIRLPOOL 76dc1381cf0d7aa4d2d1530c077379929b40fcd54f66426ff46cca28d128fb40c88fd15bb6cb6139bec8c6bc338dbc8d266512056d27f307fa4e830cf28deb12
 AUX networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch 2015 SHA256 b883506591031ebda11beed149975137950449c0c17a4c3f06745c89d782256c SHA512 3435d9ab85df69e6cd8284a34bf689331d338d13a5d64d52abc36f4ffb5c3ba31aa4336560a7e0e082c58dd916ba4364dfb75246f1bd8c22c81aa195f4ff18a7 WHIRLPOOL eb9fbd2ff5471539dcfbb0cee8213ae479c191695f798a7475484c7061d636f5cb6e6be3eebbb74e0781481477002846d37957768e5b089c2b0bbc143f9d4991
 AUX nm-system-settings.conf-ifnet 70 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f SHA512 74304a367c0675cfc88a6ae17b291a9bc20f24a9dab72e9a4578e697870c4d96245aa45ce62ec86f1e5e7e3069ab8fccec33936e479ca630a836805addb5574d WHIRLPOOL 24e140440014c07c355cecab0564d6a57fc2e37e3ded242f3b9dd3e6ddd05dd924a7497400d2984eed407e99ba9661028a159dd4e393917cee7665b0ff4737eb
+DIST NetworkManager-0.9.10.0.tar.xz 2540228 SHA256 66a88346bb04d4f402540281181340313b2ec433e75aa9d9ea13f31697f9487e SHA512 099ae0b18cd9c37a2dccce8d7c8e0a3aca54bd0d00f8da04e0f3bc07b8f1ad47f7310c33b712f78329669db47416363722c7cf5f12dc74eebb1a12e7429a9a66 WHIRLPOOL 676055a1fd528a5ee14f200b3c3f6bea52c900a9644b498b3c7c6af338add1c4f066f04ebb71c95b10881dc7f5b70864b7663b07c7548ea2ddef6ce212c5b307
 DIST NetworkManager-0.9.6.4.tar.xz 1968564 SHA256 511b411e055d187bc8f26c519fdb3e55e07fc40d4adecbbec623c0249380a7eb SHA512 900eb30f7fed35d43f2c1003fcf7fc0b6ab9c5a9f0a14777d4636372376af8477e63fc7fc9b05d2f281d48de658d96d9b30f44851af8ae2b4271bb2b5c2cb669 WHIRLPOOL b87903e4cbb3efcec17b25e74dd67dc6a81a6d553df57e9c699bb1f0d40fe6d611953f6baaeca48ef4387316980d775ec2b07a9df06ecb5f03c10dffc2b60584
 DIST NetworkManager-0.9.8.10.tar.xz 2015492 SHA256 064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972 SHA512 8688b8dceadf87d26b76bdda76ecb0b383ecaa7991487e6f6ddc150cf311f2f0cb3487afd91f19ecde2925585e8d53c8761fd45743f25c488eff6a7811ca4200 WHIRLPOOL 29c4f2189eb812c23e8c1cfbce728c525282ad3f04d3c9c25b3a80a043c95f2a9419fa71ac6f8a59d7abde8a30275e68e3ef615b74f78c07846757d92f114e1c
-DIST NetworkManager-0.9.8.8.tar.xz 2026860 SHA256 8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55 SHA512 d65ab18642e7aff09d64ef97bb87324eb10955c71db5896d326f2f9acc340ae185b701405a441998555ac080c95ffafd32dfcbe8c8cca00ecffa64873d0bbd9f WHIRLPOOL 2d71561619003fbfdf9ef547e5ede49860fe891434be9948f50ed751b8ffbc961c87d804ea6676f5b2dad2ef5889f70afb05ce3ef374c8f47d1bba60931eae96
+EBUILD networkmanager-0.9.10.0.ebuild 8607 SHA256 c21001db0413433032eb054e3afe972631ca38f0d7705cbb7c37bccfb7d97afb SHA512 a1de9357eecf03830e7befe1ad50a02125eefea118b082894d37a04c6eeea91c7ba060e656e468d3293bd791f8f16a2363064f24f0ba34987741f1aaf6e3769d WHIRLPOOL a32b6c66d91272380b978cd53f3ec19ce4f4fec7ce3bf48e6c6a0c9f1acbf5f9182be83139a3a1bb7f06c3e6dc82fc8dc9b28865df2898f19ffa35ac781a98c6
 EBUILD networkmanager-0.9.6.4.ebuild 7539 SHA256 eb79f3dba76cd9efa4920358166aad907dd18a12c0ef7fdfc2e4ace25d6e98b9 SHA512 b0835ef38289c740f694468e2ba261e94a148041ca0256a26061283f1219d1fd476cfda89745d5b3a9c6b73013062c1848a05ba5bd80c8a207be2abe605d40b0 WHIRLPOOL 1a4fda18bea548ad9615639ed8c7e55d5bd6572072abd234bdaefbde90aa54a76f69eb1b19d5ad6ae45af82ff7da6f1f02f447f24c524391416b6ed1336ed37d
 EBUILD networkmanager-0.9.8.10-r1.ebuild 8438 SHA256 612602a75fa84020a8ddad474a874074e22e72b52b8eaba445cb89d8a085948d SHA512 93fb72392844fb283768f74e3ebde795535e08caa91330a11f1fbf86ca7ccb575e8d95bb0a69c4dece536849cf0636894a9c2083bdee25da013f95a91a7e90e6 WHIRLPOOL 1041f546d240700af2ee7f91b562aba7232b9f4f98876c2976324f2f7a502e113cfee09882079f9975fe76b263cbf88acfe706c5d5cd6e49dea5bd27df298014
-EBUILD networkmanager-0.9.8.8.ebuild 8299 SHA256 5bfbd7851688a06988fd74a3bbb4c2f36ae23775014d1bfa17fb1af1ba918338 SHA512 1e7d63bdcb7085295cac56bf6c3cad5fa6c309c04aceff6eeb4ec72b78f75584302ba93eda9b7d9153246c299936005317462ef244a8c77cd665034e3281de42 WHIRLPOOL 9326400e6604a399cdc7f0a28299765200e2791e6266ee49b55c5ba8b24e0c522a6a359681ba8a93bb8c9ab6ff56fbc59711bff446237b047d9ee46b1ffbfb41
-MISC ChangeLog 49071 SHA256 2167524918be1b1caf7b3c548ba5afb975a85df227fea9a5f4317ffc6aaf5446 SHA512 871fcbb7f703069cffce2c179ada6f19d26f74a5819d577d8e8815db1fa8fd51edecd2e5e5c1a0d22c097d17b4689ecf494fbd52d899da76f1df76aa25834b56 WHIRLPOOL 525bef903e20856ec157c771f53acb880cce12d2d1d308b9242089b20f91f7f838000ac96562a050d59e6e3ca2c7047c74e289a5f5f1c24dd6e1d61c444f97e6
-MISC metadata.xml 1432 SHA256 473cf4f4e96a9d2ba397bf2526ea54565ff8901e358e2e47fd395a27a00fa201 SHA512 1007fac4c7de320b942d41cc8ce04648077c7aaff2daf18423be86caa322e4dfae4ed009becbfb22e324de9d65e261bb9c410f240ec4700ffbeb8325c6181a62 WHIRLPOOL 52ae999e503fed880202a1d7af606ab3678f43e25496ce043a58d83a4db606e17e8c0375c60471baa38251a1e48077c030d4e023d5edcd846c69af82cfed504a
+MISC ChangeLog 49465 SHA256 ac638c0f340d49eee0c87ea197e7e5ed35a4c9bde221a9c87c8b3cd0e48e1ad4 SHA512 005f7d52c1af7275642e6b6c5e2b6f5e1d4ce95bead3a3c182252533f1c42d2b2468ac9fd3ef49189abad6ec231f9cf673f233206034d5a98dbaf4504f519ef1 WHIRLPOOL 6462ba0fe778c12c2aecbe688b8d7492becc93f17386fd6cbe8d014df4bfd4a90288a149a6caa94854c020df4f9824d945c205d3a541f795154b98ce311c691e
+MISC metadata.xml 1489 SHA256 c8ebe531a40ce36414b0ea2e101c3d5bc7b6810c14f433731d532ac6ebaf34bf SHA512 f25d96afe7d6f793309a5e2b1cb0a9ca89df375e4cc55ca48caabf0bb40a672fd75b4c06083d6976220f08af205aba717bde17454e750a08182b4ec4aa412326 WHIRLPOOL d4188a7ec2a52520f684ab847565b110168899c9e7e73429e781694f53cd2cbd4f39746f6d9cc355d0f9bf82960c05951c7d3b78151cd2bc9d2aab568f00f063
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT9c3TAAoJELp701BxlEWfxy8P/1iGZBhlB2ijwgEyrl1iNr2k
-I6t3dBTbh/W9p4rP1so/l3+cVpFXM5R9SSZO2jKcEzEMZeB82f9R9R6aSob4qDHA
-oqrRBqWeIILuhmud2iV+Q8uE+LEZuckz9O/J3ozamEORdPQwcMOV5Sss9z1/r5RS
-y7/NlhFFylRNRmbho714tP4JZ/p7EHLGTXpmqbM0vlxXslSr1gHbczehmCgq7HOH
-Ixpk4ofFZDh8Rf7Fb0GwAvUntWgfjK1YYEVtR9uf/rp8UUWOcOV/RIvEPyGnyiL5
-E8kgREO4m/8DUKFcjtyaIn2RRi59ND+UdHHeZRXj7s2az+7ilwi2aZ26lDb8q1rq
-dxPdbyZdVjSFL7kwfKvLOLSp9i+hJXRiZgfdf+n7PmsxvfbI/uXUNzSrVMRBy/j/
-NbTsv1nP8gqS4Iec/HVdJm5JuRc4qaGxntAVk7AJfoIi6CXXG95OM9iHIDY+yDMx
-DTpFWlnuaRNcAGmr5uP0/QwxtUoCF+yoWA1CgKkClyzASoQYzxyNAEjx8jjPlKS3
-JlxEpr5GoXx8Uk4x+mkOYx0iyOqdM0vL6M+oVtT6jAwEX1fY+5rpCvepMPMkcbda
-8ELeV6x1DBfgWJfxOtiFJM5ChCfaZWPBJRwAC8NyWgbI3EOnWHZLUnkJLRRnLNtj
-FQI6WRUdQGQFqa/mJ0SA
-=psik
+iEYEAREIAAYFAlQgdjgACgkQCaWpQKGI+9TKmgCfTq9/9L/hE1xFYxUEweMhoLHA
+up4AoIBCxeRmJEhffXW2j0EZTodZAgd1
+=wvuH
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 13d26abdd7b1..254b9e77a79c 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -17,6 +17,7 @@
 			connections using <pkg>net-dialup/ppp</pkg></flag>
 		<flag name="resolvconf">Use <pkg>net-dns/openresolv</pkg> for managing
 			DNS information</flag>
+		<flag name="teamd">Enable Teamd control support</flag>
 		<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 		<flag name="wifi">Enable support for wifi and 802.1x security using
 		    <pkg>net-wireless/wpa_supplicant</pkg></flag>
diff --git a/net-misc/networkmanager/networkmanager-0.9.8.8.ebuild b/net-misc/networkmanager/networkmanager-0.9.10.0.ebuild
index 782de38a2942..e645d49727d7 100644
--- a/net-misc/networkmanager/networkmanager-0.9.8.8.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.10.0.ebuild
@@ -1,22 +1,26 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.8.ebuild,v 1.13 2014/07/24 17:07:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.10.0.ebuild,v 1.1 2014/09/22 19:19:19 pacho Exp $
 
 EAPI="5"
+GCONF_DEBUG="no"
 GNOME_ORG_MODULE="NetworkManager"
+GNOME2_LA_PUNT="yes"
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
-inherit bash-completion-r1 gnome.org linux-info systemd user readme.gentoo toolchain-funcs vala virtualx udev eutils
+inherit bash-completion-r1 eutils gnome2 linux-info multilib systemd user readme.gentoo toolchain-funcs vala virtualx udev
 
 DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="http://projects.gnome.org/NetworkManager/"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-IUSE="avahi bluetooth connection-sharing consolekit dhclient +dhcpcd gnutls +introspection kernel_linux +nss +modemmanager +ppp resolvconf systemd test vala +wext +wifi" # wimax
+IUSE="avahi connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \
+kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
+vala +wext +wifi" # wimax
 
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64"
 
 REQUIRED_USE="
 	modemmanager? ( ppp )
@@ -29,13 +33,14 @@ REQUIRED_USE="
 # TODO: Qt support?
 COMMON_DEPEND="
 	>=sys-apps/dbus-1.2
-	>=dev-libs/dbus-glib-0.94
-	>=dev-libs/glib-2.30
-	>=dev-libs/libnl-3.2.7:3=
+	>=dev-libs/dbus-glib-0.100
+	>=dev-libs/glib-2.32:2
+	>=dev-libs/libnl-3.2.8:3=
 	>=sys-auth/polkit-0.106
+	net-libs/libndp
 	>=net-libs/libsoup-2.26:2.4=
-	virtual/libgudev:=
-	bluetooth? ( >=net-wireless/bluez-4.82 )
+	sys-libs/readline
+	>=virtual/libgudev-165:=
 	avahi? ( net-dns/avahi:=[autoipd] )
 	connection-sharing? (
 		net-dns/dnsmasq[dhcp]
@@ -44,17 +49,18 @@ COMMON_DEPEND="
 		dev-libs/libgcrypt:0=
 		net-libs/gnutls:= )
 	modemmanager? ( >=net-misc/modemmanager-0.7.991 )
+	ncurses? ( >=dev-libs/newt-0.52.15 )
 	nss? ( >=dev-libs/nss-3.11:= )
 	dhclient? ( =net-misc/dhcp-4*[client] )
 	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
 	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
-	ppp? ( >=net-dialup/ppp-2.4.5[ipv6] )
+	ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
 	resolvconf? ( net-dns/openresolv )
 	systemd? ( >=sys-apps/systemd-183:0= )
+	teamd? ( >=net-misc/libteam-1.9 )
 	|| ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 )
 "
 RDEPEND="${COMMON_DEPEND}
-	virtual/udev
 	consolekit? ( sys-auth/consolekit )
 	wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
 "
@@ -105,30 +111,34 @@ src_prepare() {
 	DOC_CONTENTS="To modify system network connections without needing to enter the
 		root password, add your user account to the 'plugdev' group."
 
-	# Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
-	epatch "${FILESDIR}/${PN}-0.9.8.4-pre-sleep.patch"
-
 	# Use python2.7 shebangs for test scripts
 	sed -e 's@\(^#!.*python\)@\12.7@' \
 		-i */tests/*.py || die
 
-	# Fix completiondir, avoid eautoreconf, bug #465100
-	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
-		cli/completion/Makefile.in || die "sed completiondir failed"
-
-	## Force use of /run, avoid eautoreconf
+	# Force use of /run, avoid eautoreconf, upstream bug #737139
 	sed -e 's:$localstatedir/run/:/run/:' -i configure || die
 
 	use vala && vala_src_prepare
 
 	epatch_user # don't remove, users often want custom patches for NM
+
+	gnome2_src_prepare
 }
 
 src_configure() {
+	local myconf
+
+	# Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
+	if use ppp; then
+		local PPPD_VER=`best_version net-dialup/ppp`
+		PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
+		PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
+		myconf="${myconf} --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER}"
+	fi
+
 	# TODO: enable wimax when we have a libnl:3 compatible revision of it
-	# We are not ready for bluez5 yet
-	econf \
-		--enable-bluez4 \
+	# wimax will be removed, bug #522822
+	gnome2_src_configure \
 		--disable-more-warnings \
 		--disable-static \
 		--localstatedir=/var \
@@ -147,21 +157,25 @@ src_configure() {
 		$(use_with dhclient) \
 		$(use_with dhcpcd) \
 		$(use_with modemmanager modem-manager-1) \
+		$(use_with ncurses nmtui) \
 		$(use_with resolvconf) \
+		$(use_with selinux) \
+		$(use_enable teamd teamdctl) \
 		$(use_enable test tests) \
 		$(use_enable vala) \
+		--without-valgrind \
 		$(use_with wext) \
-		"$(systemd_with_unitdir)"
+		"$(systemd_with_unitdir)" \
+		${myconf}
 }
 
 src_test() {
-	# bug #????
-	cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die
 	Xemake check
 }
 
 src_install() {
-	default
+	# Install completions at proper place, bug #465100
+	gnome2_src_install completiondir="$(get_bashcompdir)"
 
 	readme.gentoo_create_doc
 
@@ -195,11 +209,10 @@ src_install() {
 	# Allow users in plugdev group to modify system connections
 	insinto /usr/share/polkit-1/rules.d/
 	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
-	prune_libtool_files --modules
 }
 
 pkg_postinst() {
+	gnome2_pkg_postinst
 	readme.gentoo_print_elog
 
 	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then