summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2012-06-27 14:38:28 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2012-06-27 14:38:28 +0000
commit5ef2f5a7a1ea35e4bf855d69118aed1b50b879ce (patch)
treead8baba9357029b47d9d27823cb979571d703f68 /net-misc
parentSimplify PYTHON_DEPEND. (diff)
downloadgentoo-2-5ef2f5a7a1ea35e4bf855d69118aed1b50b879ce.tar.gz
gentoo-2-5ef2f5a7a1ea35e4bf855d69118aed1b50b879ce.tar.bz2
gentoo-2-5ef2f5a7a1ea35e4bf855d69118aed1b50b879ce.zip
.pkla files are only used by <sys-auth/polkit-0.106 wrt #421577
(Portage version: 2.2.0_alpha113/cvs/Linux x86_64)
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/networkmanager/ChangeLog6
-rw-r--r--net-misc/networkmanager/networkmanager-0.9.4.0-r2.ebuild8
2 files changed, 10 insertions, 4 deletions
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index aa15c4386377..48583ad7e545 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/networkmanager
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.134 2012/05/24 03:04:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.135 2012/06/27 14:38:28 ssuominen Exp $
+
+ 27 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+ networkmanager-0.9.4.0-r2.ebuild:
+ .pkla files are only used by <sys-auth/polkit-0.106 wrt #421577
24 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
networkmanager-0.8.4.0-r2.ebuild, networkmanager-0.9.0.ebuild,
diff --git a/net-misc/networkmanager/networkmanager-0.9.4.0-r2.ebuild b/net-misc/networkmanager/networkmanager-0.9.4.0-r2.ebuild
index 96cf2c2f173a..9754e1ae4609 100644
--- a/net-misc/networkmanager/networkmanager-0.9.4.0-r2.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.9.4.0-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 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-r2.ebuild,v 1.4 2012/05/24 03:04:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.4.0-r2.ebuild,v 1.5 2012/06/27 14:38:28 ssuominen Exp $
EAPI="4"
GNOME_ORG_MODULE="NetworkManager"
@@ -171,8 +171,10 @@ src_install() {
newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf
# Allow users in plugdev group to modify system connections
- insinto /etc/polkit-1/localauthority/10-vendor.d
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.pkla"
+ 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