Version bump

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

3 files changed, 261 insertions, 6 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index deb1208fb0e3..47e4a688507c 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,11 @@
 # 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.183 2013/10/06 14:14:57 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.184 2013/10/10 19:11:29 pacho Exp $
+
+*networkmanager-0.9.8.8 (10 Oct 2013)
+
+  10 Oct 2013; Pacho Ramos <pacho@gentoo.org> +networkmanager-0.9.8.8.ebuild:
+  Version bump
 
   06 Oct 2013; Pacho Ramos <pacho@gentoo.org> networkmanager-0.9.8.6.ebuild:
   Add a warning for people having a NetworkManager.conf that loads ifnet plugin
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 5a8311a3c815..234a2c6ad5ce 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -26,15 +26,17 @@ AUX nm-system-settings.conf-ifnet 70 SHA256 34f53d9ac1ad65eda6942dc3059117f60f63
 DIST NetworkManager-0.9.6.4.tar.xz 1968564 SHA256 511b411e055d187bc8f26c519fdb3e55e07fc40d4adecbbec623c0249380a7eb SHA512 900eb30f7fed35d43f2c1003fcf7fc0b6ab9c5a9f0a14777d4636372376af8477e63fc7fc9b05d2f281d48de658d96d9b30f44851af8ae2b4271bb2b5c2cb669 WHIRLPOOL b87903e4cbb3efcec17b25e74dd67dc6a81a6d553df57e9c699bb1f0d40fe6d611953f6baaeca48ef4387316980d775ec2b07a9df06ecb5f03c10dffc2b60584
 DIST NetworkManager-0.9.8.4.tar.xz 2007408 SHA256 4c9ff0aaf52bee8df9a73290ec2b3f4441ff504420d0b0dfd729b00a92d80d99 SHA512 2e70ab144a07d5d452efbd445ab0fc28a0a64934661cc77456ec0c4f8ba4015e8943759954b0c6d6bb0994237e97a53ff16929a4ac7a620cfc5fde095f02c327 WHIRLPOOL 900d2ff6adbfd71f5d26734a3c9791d46be8e3a76775e2878767573004ef78047338e188e9200b64955504c547467c2e07909ba6bcc5db98bd6d1aa85940040d
 DIST NetworkManager-0.9.8.6.tar.xz 2026452 SHA256 2289800de66fd7f8c141e029923beb39f43952e442b3cb864e3bf73b26c0c369 SHA512 a7c56763422ca71be70aec5507e39158ac6062a247df4aec1b78fdaf21f1369ffd9728234ed8ea2c40e1e8a18bbca23e71e4a088e05c5c482b859fd98ed544ce WHIRLPOOL bb4f93bbb811d7b34ea57e5b68bad1fd6fa74e87fedd5c93c0c9258325e9d953b797712fbd59094678f58a4b3c6c289c14ea159b01fbdfe56c8c2b831dad3ee7
+DIST NetworkManager-0.9.8.8.tar.xz 2026860 SHA256 8a0a3de9cd2897f778193aa5f04c8a6f6f87fe07f7a088aab26d2b35baa17a55 SHA512 d65ab18642e7aff09d64ef97bb87324eb10955c71db5896d326f2f9acc340ae185b701405a441998555ac080c95ffafd32dfcbe8c8cca00ecffa64873d0bbd9f WHIRLPOOL 2d71561619003fbfdf9ef547e5ede49860fe891434be9948f50ed751b8ffbc961c87d804ea6676f5b2dad2ef5889f70afb05ce3ef374c8f47d1bba60931eae96
 EBUILD networkmanager-0.9.6.4.ebuild 7530 SHA256 119f07d23fff9969a85438ea092242c761393b32e95ffcb292eeb94770fbaac9 SHA512 f8dea7d426b67d215f3f3d8c40e25a2d14da2d7dff3bd80aeb24e4a8d2d6da5e46b22692d75a2c266a85617ede1b24b5c0a08b5d41ad25ff0767e09318117a6c WHIRLPOOL e9c4ba5236727574e0bf79cde0935ec62d52cab63b18af824a3a463daf4fedaf6b2fc29fd7a8658177bd1367ab14ea21c4a16eea08d4a484c162db0b82916b24
 EBUILD networkmanager-0.9.8.4.ebuild 7704 SHA256 cb97a4bdd449275c6a87863b49ef58cbbee0c3e1e7210fb7eacec024029ee284 SHA512 6e33017fc519fb57d756bf2b8a4addda207300a3ecc21d87e0ae19890a932195760c3e42726ef0d4c8eeca9b0bd967a7537412d6191bdc2f3d5c36c4e16ba120 WHIRLPOOL 8cab1cb320b2a981380cbe6c98d14787d0a6aabe806bd6dfbfc96736ee06997e390dbe5236a6d7fa986cb9cfe3f7264b532741247a6715665a8ba1e8340f49ad
 EBUILD networkmanager-0.9.8.6.ebuild 8255 SHA256 530f79f539eef8601aabec1480118ea32d9c9e615a2296227d439ab1d06e7d87 SHA512 f3181abda36e3383141a7da2605eae590bed71baebdbff7494ae7ea2c8840f80b8f39d155d4198b31e31bf32d85f97bf623ebaf17981df57c577abd6845bbd6e WHIRLPOOL cfbfabc65af2f55b73579a919153691681ce6b2ceb7567d88bf14eab74d288c8af8b909080489a46b76a9a27fadaa6411d9b02f021a6e807ac9aba5a2adaa1cc
-MISC ChangeLog 46018 SHA256 799400aa84ae2b2f8c15cd3e243dc7440bdf82a3a092d2127045f2040c5d8d5b SHA512 e5110001f80aa5ca0e2b0af057e37019dd1eeb4ce8f84226d35a747cbb4d3c9b2603385bf39bf13b4f353819fd6ee86850e202da89181eeaeb5c04490046116e WHIRLPOOL cd309a3a0d97c0b04ff01e4e297ca1a7b6804a85be053335cbb4506c0fe7600abf6175c234b7bcad312041939ea52a0564eb241a7cf694c768dbd8177c5b0c9d
+EBUILD networkmanager-0.9.8.8.ebuild 8245 SHA256 d842b74dbfe398d9553c19dafb93c895d922ea1a71915ef9cb68b1274a50d6f4 SHA512 074b9fe50e6afc3c98ccb239eff3583dc1ce715ae01d1882ed3f2087c664aaa86c53a9d0eac3daf23deb5759dafd5c3a6a818b3248b609d93ca2147fc8c0ad1b WHIRLPOOL 68852608a7c4c3167bf0de392e80ce5508917db2bf173d549fe97982f3f26b9a03e4421b33690e959cc4be50b83608dfb5f6859037475b6b0fa86a99a76bf968
+MISC ChangeLog 46151 SHA256 20eb02817c88b2aadfff4b7eaa8435e6e77b6f705d5e521020c4a07526f192f5 SHA512 cfdfedf1b961588507bfd865b026d257a6863807433b6de9f69b9ad6749d1dadcb6d24f7cbad450b0a77d38a85f168b1c9eaa36002645a1562a46f80245ae845 WHIRLPOOL 0e8183a1bb7f013b9d7e28b44e384ada920fd08c34ad7b0b365667447e9632055f4dbefd266a7c30abfd72b1e64009560cd075a8ab31f103eec5afe5e490a63c
 MISC metadata.xml 1310 SHA256 7bc71d09fd619c5f65f1e9b5618d49f9f8ee38fe5b437cab2a3a870b8272fdbd SHA512 5637c1aed72ac8bcecd6fa806f4f8c35aa8ed353b5a4ae649cc415a1bad31b62ed657ed0a8c43cfdcbeebdac827ede6fa86c88a7ed49fa38464f00bcb4e72574 WHIRLPOOL 13bc9e31905900f2c23399268e5f670b6b75cf21ad6c1a7ccde29668fc441362f9b8b03ff2eba2de320c395f79dbd5dffa03d0ebcf62bf95a4f1a525c446dc42
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJRcGIACgkQCaWpQKGI+9S/cACfR6D9InsjnEhZTd52lEgLMNC1
-6xgAni6Fob9RI9GdzEHEXytVWwq3KbGg
-=SBAa
+iEYEAREIAAYFAlJW++IACgkQCaWpQKGI+9TY3QCeOB7FoOT//5BDn0zykw4EFi38
+gLEAn0wBh2qfWRvMbVK7iCjkU/DTYuOG
+=KmrE
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/networkmanager-0.9.8.8.ebuild b/net-misc/networkmanager/networkmanager-0.9.8.8.ebuild
new file mode 100644
index 000000000000..5c220cfdd40b
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.9.8.8.ebuild
@@ -0,0 +1,248 @@
+# 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.8.8.ebuild,v 1.1 2013/10/10 19:11:29 pacho Exp $
+
+EAPI="5"
+GNOME_ORG_MODULE="NetworkManager"
+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
+
+DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
+HOMEPAGE="http://projects.gnome.org/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" # wimax
+
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+REQUIRED_USE="
+	modemmanager? ( ppp )
+	^^ ( nss gnutls )
+	^^ ( dhclient dhcpcd )
+"
+
+# gobject-introspection-0.10.3 is needed due to gnome bug 642300
+# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
+# 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=
+	>=sys-auth/polkit-0.106
+	>=net-libs/libsoup-2.26:2.4=
+	>=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
+	>=virtual/udev-165[gudev]
+	bluetooth? ( >=net-wireless/bluez-4.82 )
+	avahi? ( net-dns/avahi:=[autoipd] )
+	connection-sharing? (
+		net-dns/dnsmasq[dhcp]
+		net-firewall/iptables )
+	gnutls? (
+		dev-libs/libgcrypt:=
+		net-libs/gnutls:= )
+	modemmanager? ( >=net-misc/modemmanager-0.7.991 )
+	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] )
+	resolvconf? ( net-dns/openresolv )
+	systemd? ( >=sys-apps/systemd-183 )
+	|| ( sys-power/upower >=sys-apps/systemd-183 )
+"
+RDEPEND="${COMMON_DEPEND}
+	consolekit? ( sys-auth/consolekit )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40
+	>=sys-devel/gettext-0.17
+	>=sys-kernel/linux-headers-2.6.29
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/dbus-python[python_targets_python2_7]
+		dev-python/pygobject:2[python_targets_python2_7] )
+"
+
+sysfs_deprecated_check() {
+	ebegin "Checking for SYSFS_DEPRECATED support"
+
+	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
+		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
+		eerror "or NetworkManager will not work correctly."
+		eerror "See http://bugs.gentoo.org/333639 for more info."
+		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
+	fi
+	eend $?
+}
+
+pkg_pretend() {
+	if use kernel_linux; then
+		get_version
+		if linux_config_exists; then
+			sysfs_deprecated_check
+		else
+			ewarn "Was unable to determine your kernel .config"
+			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
+			ewarn "See http://bugs.gentoo.org/333639 for more info."
+		fi
+
+	fi
+}
+
+pkg_setup() {
+	enewgroup plugdev
+}
+
+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
+	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
+}
+
+src_configure() {
+	# TODO: enable wimax when we have a libnl:3 compatible revision of it
+	# We are not ready for bluez5 yet
+	econf \
+		--enable-bluez4 \
+		--disable-more-warnings \
+		--disable-static \
+		--localstatedir=/var \
+		$(usex systemd '--disable-ifnet' '--enable-ifnet') \
+		--without-netconfig \
+		--with-dbus-sys-dir=/etc/dbus-1/system.d \
+		--with-udev-dir="$(udev_get_udevdir)" \
+		--with-iptables=/sbin/iptables \
+		--enable-concheck \
+		--with-crypto=$(usex nss nss gnutls) \
+		--with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \
+		--with-suspend-resume=$(usex systemd systemd upower) \
+		$(use_enable introspection) \
+		$(use_enable ppp) \
+		--disable-wimax \
+		$(use_with dhclient) \
+		$(use_with dhcpcd) \
+		$(use_with modemmanager modem-manager-1) \
+		$(use_with resolvconf) \
+		$(use_enable test tests) \
+		$(use_enable vala) \
+		$(use_with wext) \
+		"$(systemd_with_unitdir)"
+}
+
+src_test() {
+	# bug #????
+	cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die
+	Xemake check
+}
+
+src_install() {
+	default
+
+	readme.gentoo_create_doc
+
+	# Gentoo init script
+	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
+
+	# /var/run/NetworkManager is used by some distros, but not by Gentoo
+	rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	# Provide openrc net dependency only when nm is connected
+	exeinto /etc/NetworkManager/dispatcher.d
+	newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
+		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
+
+	# Default conf.d file
+	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
+
+	# Add keyfile plugin support
+	keepdir /etc/NetworkManager/system-connections
+	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
+
+	if ! use systemd; then
+		insinto /etc/NetworkManager
+		newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
+	fi
+
+	# 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() {
+	readme.gentoo_print_elog
+
+	if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
+		ewarn "The ${PN} system configuration file has moved to a new location."
+		ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
+		ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
+		ewarn
+		ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
+	fi
+
+	# The polkit rules file moved to /usr/share
+	old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
+	if [[ -f "${old_rules}" ]]; then
+		case "$(md5sum ${old_rules})" in
+		  574d0cfa7e911b1f7792077003060240* )
+			# Automatically delete the old rules.d file if the user did not change it
+			elog
+			elog "Removing old ${old_rules} ..."
+			rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
+			;;
+		  * )
+			elog "The ${old_rules}"
+			elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
+			elog "If you edited ${old_rules}"
+			elog "without changing its behavior, you may want to remove it."
+			;;
+		esac
+	fi
+
+	if use systemd; then
+		if [[ ${REPLACING_VERSIONS} < 0.9.8.6 ]]; then
+			ewarn "Ifnet plugin won't be used with systemd support enabled"
+			ewarn "as it is meant to be used with openRC and can cause collisions"
+			ewarn "(like bug #485658)."
+			ewarn "Because of this, you will likely need to reconfigure some of"
+			ewarn "your networks."
+		fi
+
+		if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
+			if grep -q plugins | grep -q ifnet ${EROOT}etc/NetworkManager/NetworkManager.conf; then
+				ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
+				ewarn "Since it won't be used when running under Systemd, you will need to stop setting"
+				ewarn "ifnet plugin there to allow NetworkManager to work."
+			fi
+		fi
+	fi
+}