Version bump, drop old

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

4 files changed, 32 insertions, 252 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index b55291bde048..d2ac7021686b 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,12 @@
 # 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.170 2013/05/18 15:56:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.171 2013/06/10 09:25:33 pacho Exp $
+
+*networkmanager-0.9.8.2 (10 Jun 2013)
+
+  10 Jun 2013; Pacho Ramos <pacho@gentoo.org> +networkmanager-0.9.8.2.ebuild,
+  -networkmanager-0.9.4.0-r6.ebuild, -networkmanager-0.9.7.995.ebuild:
+  Version bump, drop old
 
   18 May 2013; Pacho Ramos <pacho@gentoo.org> networkmanager-0.9.8.0.ebuild:
   Add some fixes to the ebuild and fix bash-completion locations (#465100 by
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 73315c6612d1..db4802647100 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -21,22 +21,20 @@ AUX networkmanager-0.9.4.0-wifi-kernel-api.patch 2734 SHA256 e442f9ea526ae37f216
 AUX networkmanager-0.9.6.0-daemon-signals.patch 1045 SHA256 eb9e01f5622aabf611f881e3bf7989cdaa9df25dc19b0087747f04c423efe503 SHA512 2f6e7fcb76eb3944ae5df0fcc7b894ed45a8e852b0cba425fc6001de8a5532a1691ed847bb6c0b54988b9f2df5e9fa1720e4c6306e295477d7c8d246d00bf29a WHIRLPOOL 3243def958145d734954b8baaf4fefce4b9becf7e274f297010be9fb80998ae43df987061a7e0d00348df68bb84e92e1f90b5419567b88ed5a72e0db200a9598
 AUX networkmanager-0.9.7.995-pre-sleep.patch 4585 SHA256 d01d598846fccacbc5d4ddda8d31b6113c193bdbf2adbd72786d8385b9ae3d2a SHA512 d7e4b9a0dc934382e3fa3c49dcae0f9d5fb5eed39c67ca4f4a372acdfcd84beee4bbf7f9ce484f04b063cd0626d5c81ba69de1bdb3496746a0fff7a434864719 WHIRLPOOL 0d7f59fb2bbce67dce03e2286c294658e571cf57e1fc9915462a947def16ee695fc55e36abd171f491db9d23c184bdf5ea65e9e235cd5a76e7c0a656db800c52
 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
-DIST NetworkManager-0.9.7.995.tar.xz 2049284 SHA256 662ac086ce7ab19accea922a31a6368650815adb76da720489c1fe96e4356f8e SHA512 5d57e2df7baac19454876aa6be54bcf0754f98a96c15facb731c5508bbd68f0224378dc480056bb9caa92d323b0f73c50aecdc582beb75e2ec267131faff51ae WHIRLPOOL 2411ce00252e78bb6184c6cd12b8dad5e97e611fe8925be57f6391b880f1c1143d6169b4e24eab9a6cc1cda7999c5b802612c99c3b7eac924a276c5c62d62629
 DIST NetworkManager-0.9.8.0.tar.xz 2056356 SHA256 c366bcded6354d8186ad93c05d26d6a20bc550aa0391f974704e7a60e9f6096b SHA512 a13cf044b405ecafe1c28f6b0796e62968e4090862ec45eae48fd65c644f520b45107e37c97150e4f9c47d50de7663c0e74baeb2cade4b5f0736dede4d79c398 WHIRLPOOL 9449c404fade944cc2d3f267894bafc9574e6da4f93534151d7e41b6f8c55cb417bab89b09add3a06278467483cf64ccdc3651d29646ead0c46251fecd678284
-EBUILD networkmanager-0.9.4.0-r6.ebuild 7735 SHA256 43e83083ab986ae5a980882ebd8130adca0b854fd913e5af28691fbaeb1caae2 SHA512 3c377ace29634500414a01db9ce31c4e959df796f36e0833e779ecbeb329010d9d331953c83dba6d97ac2a664b07423f5a17d620fea0b74ba48cc6f19b3917ca WHIRLPOOL 9a7046ad06f449f955980d295fcfa8706c8539927882244ba3a6265639ac3bf5d40cc9770434e49b6877f1247f5078af945afbbb8b0f552a9a1947e5c6364046
+DIST NetworkManager-0.9.8.2.tar.xz 1967452 SHA256 5c0b2f71b2f61e0dfbe95cebad83001758db252d5cdf5b6f7ceebac9c6bd7ead SHA512 a731b85d267bcbd837960b0b1bec2c8ec0458180a751bce353e763e9fca033dfc8101a1267101dadcc8984138a4b693a198a09c15acd7faab3930f98c8246775 WHIRLPOOL 788c3f07f66aca9099349a1a8325cf4ba5c23665d019c508baf4bf037f77316379a1c47c1eb67d4ab6ef845ff6a783e2453d6ff50cde6b830d36f2d5cd648e3c
 EBUILD networkmanager-0.9.6.4-r1.ebuild 7546 SHA256 a998f7bad28581572ed7375ecdc33615d71a4b70c153d32f3142feee745016e3 SHA512 26636400345268f7534aeee029b29af5c53cc68f2b9d721c62f9cf206a2b5396641ded815fca1d2c375fedecb16c07bdf81b33fdc03bc8a46f40c50c3a7dea0a WHIRLPOOL 8c1549c48141feadf1cf1f7950b177fda1e044f23708af6e35502746f86fc5e1e2e26295ea9da6fb2f572b5cd8e3af2e4b3dde5481070bb9243669de277538a7
 EBUILD networkmanager-0.9.6.4.ebuild 7518 SHA256 e1786b0b52196e98b6c7aff8dd641193f196ecf5ed8fbcf088ff4baa4ec9d56f SHA512 7b74e41be564767a591eadf50445b6a278cb9fe571f512a6075bc72268198b841ffb3e818276aaf3c738b2198b5ff9de037f6d60b7e32d6c91e380bd016386d5 WHIRLPOOL 2702292d1530bb4e7b6177cd3a54d7640842eac179f05e174fa8bbf590a81ac25af7ec769f7ddd5e71e0446df0c9c370deeb3d5edb2ac3cab8ddd98b5a6bde80
-EBUILD networkmanager-0.9.7.995.ebuild 7310 SHA256 eae4c9338a6bb5fbfc0a18c327f673cb15dfa8fa1b11017ec445b0f4ef836d29 SHA512 9b3e3ea93b10632587d1c34a636e7ef2c4c9f0722031f41988d19610a91912e864152e7812b302d866e62d74dd2817dd164a0c032a3c6e22dabb09814f7d520d WHIRLPOOL d2ef65548d870c38cb1b4e620d15a31caa71fe98d98ee0864b54ea7887f73a0ad8b9456c03298bd0aa95658e30727a42b998d37ce1139aa1118f50cdf6ba1af7
 EBUILD networkmanager-0.9.8.0.ebuild 7496 SHA256 2aae74fd3924ff9e805ac53fbbf7354311759af2b76b46cf89fed157c320f5a1 SHA512 ea647608a0ddce388d38e0f33566419bcde37b6e29d7fff620929d4585524b1b532ab8f5e1bb8442fd48db57023f7043aaa3ff8f373917a5bc736408a989b15a WHIRLPOOL 8ad248c763a96659a87012f78948f240658ce04c183c61264d9714c75bfdcb3e3de6080f3c715df73d1931bf713252293859b59d4f6787bb2d2e439e59de4090
+EBUILD networkmanager-0.9.8.2.ebuild 7503 SHA256 3338fe5460c0920f363483de0c5f89bc32420a270e4bc9e6a5fe393037a23c1b SHA512 50ef0324ac5f336b73ae1674a6441b2f470de8d4a4a6ea5e0bd8922f5d15605e888acaf615cb4ecefbeb1cb132c4cc6fea0b4c8a591eb642cbc4dc554531d9c5 WHIRLPOOL d0ca01bb3f815f5a8be00fb48f98c1377e1f6abf4fffbceb0f0e2a79647f06c13aef54e14418a6f567ddd569627b6e50e923ee7456989b4801190225cf2a8dba
 EBUILD networkmanager-9999.ebuild 7460 SHA256 dad244e610beb27f6637231c914cb6dfe51eaa2d7fac5f9fd1a7ef8c9011cf42 SHA512 0968b131ca81cf9340b601f60dd1fc7662df33cfe57f4e427c3372e9e3bdd1c36f1bfd2a279750f641734cd3449974e2b76fa08d3b93909a809dcc6d6ad966a9 WHIRLPOOL b0819eaa482b9640202da89ffaa369e4229e4b220aa609edb881047bae83c7840d3f48c432f7d31dd67fc0b763dd067388c8cabf978b14b4fd30735e08981cd2
-MISC ChangeLog 42539 SHA256 ec918343fec2577260af431382708de965dcdb63f245c57f7dac7ea8bbfa281b SHA512 04a797e6ffbef25a62c1d336de92f4f31277779b653949b7cbc7835f72a3f8bf58eeb9c7cbdbfae2afd5738648c19c4a309c7520e6fbc1cfc186798e7ff7e675 WHIRLPOOL c74c29edeafffd62c6f9fec7b868dbfcbe3cfcd20601b79c8d54d31ed239fe63ac28887223604bdb69cd6b6afea8b71d0f8284f907eaffc33958f9f8e97ae23f
+MISC ChangeLog 42753 SHA256 fa46181a40335f1c637b85c78855cd53bc849039e27ea82e4c0219f6c1bf21cb SHA512 b82a3490504f39233c87dd8e8109486c57e44411f12729f748b702c4b1988e06a079d2cc6ded8f44a4cd39b26464dd2b8fde31eecc12c0ab6d3dae6252f945d6 WHIRLPOOL 7c3daaf5e259fb202ac0919adfc5731a3c2e28182fda9cc0d0ba86053a0887cca04b23dffc685051a41f6804c56ca1142b6c91628983fd8d6b54c0e1574785d4
 MISC metadata.xml 1492 SHA256 194d2784544c8dadf2a06ffa007cdf4c75d4727d2edd358431611abbbd11760e SHA512 50b0a3e918986da99da155f0fddcd52372d341aaca342dd70690cb241292d1009641e003e30e5015f97ee62ebc5b893d5fe3ad35a0eee75c1923e9326dc1818c WHIRLPOOL 2d679bd1e29c04c48712587b6f7287001d9c2951416bcc00657dd8ab7b5deb41d78db77fb2585679f9bb4e85ea37416a7a8439edcd7179047f7d1e7787669fbe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGXpMAACgkQCaWpQKGI+9SmEgCfbkFdfH+PBawsLpRqv7OaqG7n
-fMcAn0yb3HSfJFeXzOgYPTsNIwZ7nXxF
-=m57s
+iEYEAREIAAYFAlG1m44ACgkQCaWpQKGI+9RLLACfdy1U2cT2JMoi/oYPXXFd0uYq
+TRwAoIZwBlQg41wjT7zfjofsvQ55WKlU
+=WSdi
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild b/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild
deleted file mode 100644
index 341e420b0ab1..000000000000
--- a/net-misc/networkmanager/networkmanager-0.9.4.0-r6.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# 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.4.0-r6.ebuild,v 1.11 2013/01/28 08:07:29 tetromino Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="NetworkManager"
-
-inherit autotools eutils gnome.org linux-info systemd user toolchain-funcs udev
-
-DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="avahi bluetooth connection-sharing dhclient +dhcpcd doc gnutls +introspection kernel_linux +nss modemmanager +ppp resolvconf +wext wimax" # systemd
-KEYWORDS="amd64 arm ppc ppc64 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
-# libnl:1.1 is needed for linking to net-wireless/wimax libraries
-# XXX: on bump, check that net-wireless/wimax is still using libnl:1.1 !
-# TODO: Qt support?
-COMMON_DEPEND=">=sys-apps/dbus-1.2
-	>=dev-libs/dbus-glib-0.75
-	virtual/udev[gudev]
-	>=dev-libs/glib-2.26
-	>=sys-auth/polkit-0.97
-	>=net-libs/libsoup-2.26:2.4
-	>=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
-	bluetooth? ( >=net-wireless/bluez-4.82 )
-	avahi? ( net-dns/avahi[autoipd] )
-	gnutls? (
-		dev-libs/libgcrypt
-		net-libs/gnutls )
-	nss? ( >=dev-libs/nss-3.11 )
-	dhclient? ( net-misc/dhcp[client] )
-	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
-	ppp? ( >=net-dialup/ppp-2.4.5 )
-	resolvconf? ( net-dns/openresolv )
-	connection-sharing? (
-		net-dns/dnsmasq
-		net-firewall/iptables )
-	wimax? (
-		dev-libs/libnl:1.1
-		>=net-wireless/wimax-1.5.1 )
-	!wimax? ( dev-libs/libnl:3 )"
-
-RDEPEND="${COMMON_DEPEND}
-	modemmanager? ( >=net-misc/modemmanager-0.4 )
-	sys-auth/consolekit"
-#	systemd? ( >=sys-apps/systemd-31 )
-#	!systemd? ( sys-auth/consolekit )
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	>=sys-kernel/linux-headers-2.6.29
-	doc? ( >=dev-util/gtk-doc-1.8 )"
-
-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() {
-	# Build against libnl:1.1 for net-wireless/wimax-1.5.2 compatibility
-	epatch "${FILESDIR}/${PN}-0.9.4.0-force-libnl1.1-r1.patch"
-	# Update init.d script to provide net and use inactive status if not connected
-	epatch "${FILESDIR}/${PN}-0.9.2.0-init-provide-net-r1.patch"
-	# Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832
-	epatch "${FILESDIR}/${PN}-0.9.2.0-pre-sleep.patch"
-	# Fix quote handling for global data (Bug #410821)
-	epatch "${FILESDIR}/${PN}-0.9.4.0-fix-quote-handling.patch"
-	# Fix uninitialized variables in libnm-glib
-	epatch "${FILESDIR}/${P}-libnm-glib-ensure_inited.patch"
-	epatch "${FILESDIR}/${P}-libnm-glib-init-gerror.patch"
-	# Fix building against linux-headers-3.4, #417055
-	epatch "${FILESDIR}/${P}-ip_ppp.h.patch"
-	# Fix ipv6 default route bug, #417529
-	epatch "${FILESDIR}/${P}-ipv6-route.patch"
-	# Bug #335147, https://bugzilla.gnome.org/show_bug.cgi?id=679428
-	epatch "${FILESDIR}/${P}-dhclient-ipv6.patch"
-	# Bug #426844, wext vs. nl80211 API issues
-	epatch "${FILESDIR}/${P}-nl80211-encryption-caps.patch"
-	epatch "${FILESDIR}/${P}-wifi-kernel-api.patch"
-
-	epatch_user
-
-	eautoreconf
-	default
-}
-
-src_configure() {
-	ECONF="--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--with-distro=gentoo
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		--with-udev-dir=$(udev_get_udevdir)
-		--with-iptables=/sbin/iptables
-		--enable-concheck
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable ppp)
-		$(use_enable wimax)
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		$(use_with doc docs)
-		$(use_with resolvconf)
-		$(use_with wext)
-		$(use_with wimax libnl-1)
-		$(systemd_with_unitdir)"
-
-		if use nss ; then
-			ECONF="${ECONF} $(use_with nss crypto=nss)"
-		else
-			ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
-		fi
-
-#		if use systemd; then
-#			ECONF="${ECONF} --with-session-tracking=systemd"
-#		else
-			ECONF="${ECONF} --with-session-tracking=ck"
-#		fi
-
-	econf ${ECONF}
-}
-
-src_test() {
-	cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die
-	default
-}
-
-src_install() {
-	default
-	# /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-r2" 10-openrc-status
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" \
-		-i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
-	# Add keyfile plugin support
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-	insinto /etc/NetworkManager
-	newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
-
-	# 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"
-	if has_version '<sys-auth/polkit-0.106'; then
-		insinto /etc/polkit-1/localauthority/10-vendor.d
-		doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.pkla"
-	fi
-
-	# Default conf.d file
-	newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-}
-
-pkg_postinst() {
-	elog "To modify system network connections without needing to enter the"
-	elog "root password, add your user account to the 'plugdev' group."
-
-	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
-}
diff --git a/net-misc/networkmanager/networkmanager-0.9.7.995.ebuild b/net-misc/networkmanager/networkmanager-0.9.8.2.ebuild
index b863da1a5c87..0ff38efecb18 100644
--- a/net-misc/networkmanager/networkmanager-0.9.7.995.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.8.2.ebuild
@@ -1,20 +1,20 @@
 # 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.7.995.ebuild,v 1.1 2013/01/28 07:05:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.2.ebuild,v 1.1 2013/06/10 09:25:33 pacho Exp $
 
 EAPI="5"
 GNOME_ORG_MODULE="NetworkManager"
 VALA_MIN_API_VERSION="0.18"
 VALA_USE_DEPEND="vapigen"
 
-inherit eutils gnome.org linux-info systemd user toolchain-funcs vala virtualx udev
+inherit eutils gnome.org linux-info systemd user readme.gentoo toolchain-funcs vala virtualx udev
 
 DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts"
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+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 doc gnutls
+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"
@@ -29,7 +29,8 @@ REQUIRED_USE="
 # 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
+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=
@@ -45,25 +46,25 @@ COMMON_DEPEND=">=sys-apps/dbus-1.2
 	gnutls? (
 		dev-libs/libgcrypt:=
 		net-libs/gnutls:= )
-	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
+	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 )
+	systemd? ( >=sys-apps/systemd-200 )
 	!systemd? ( sys-power/upower )
 "
 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
-	doc? ( >=dev-util/gtk-doc-1.8 )
 	vala? ( $(vala_depend) )
 	test? (
 		dev-lang/python:2.7
@@ -102,6 +103,9 @@ pkg_setup() {
 }
 
 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.7.995-pre-sleep.patch"
 
@@ -109,6 +113,10 @@ src_prepare() {
 	sed -e 's@\(^#!.*python\)@\12.7@' \
 		-i */tests/*.py || die
 
+	# Fix completiondir, avoid eautoreconf, bug #465100
+	sed -i 's|^completiondir =.*|completiondir = $(datadir)/bash-completion|' \
+		cli/completion/Makefile.in || die "sed completiondir failed"
+
 	epatch_user
 
 	use vala && vala_src_prepare
@@ -134,13 +142,11 @@ src_configure() {
 		--with-crypto=$(usex nss nss gnutls) \
 		--with-session-tracking=$(usex consolekit consolekit $(usex systemd systemd no)) \
 		--with-suspend-resume=$(usex systemd systemd upower) \
-		$(use_enable doc) \
 		$(use_enable introspection) \
 		$(use_enable ppp) \
 		--disable-wimax \
 		$(use_with dhclient) \
 		$(use_with dhcpcd) \
-		$(use_with doc docs) \
 		$(use_with modemmanager modem-manager-1) \
 		$(use_with resolvconf) \
 		$(use_enable test tests) \
@@ -157,6 +163,8 @@ src_test() {
 src_install() {
 	default
 
+	readme.gentoo_create_doc
+
 	# Gentoo init script
 	newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
 
@@ -196,8 +204,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "To modify system network connections without needing to enter the"
-	elog "root password, add your user account to the 'plugdev' group."
+	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."