summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-02-18 12:27:58 +0000
committerPacho Ramos <pacho@gentoo.org>2015-02-18 12:27:58 +0000
commit905dee73cc4c0cd4e4fe556dea4debf7b2c21901 (patch)
tree4d1856670efdb3fdac88aace36f70c7d24efc1d1 /net-misc/networkmanager
parentAdd some || die. (diff)
downloadgentoo-2-905dee73cc4c0cd4e4fe556dea4debf7b2c21901.tar.gz
gentoo-2-905dee73cc4c0cd4e4fe556dea4debf7b2c21901.tar.bz2
gentoo-2-905dee73cc4c0cd4e4fe556dea4debf7b2c21901.zip
Don't install empty /var/run (#539400 by Jan Vesely)
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'net-misc/networkmanager')
-rw-r--r--net-misc/networkmanager/ChangeLog6
-rw-r--r--net-misc/networkmanager/metadata.xml1
-rw-r--r--net-misc/networkmanager/networkmanager-1.0.0.ebuild3
3 files changed, 7 insertions, 3 deletions
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index f9bcb4fcdbf5..092efb08e359 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/networkmanager
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.227 2015/02/08 21:06:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.228 2015/02/18 12:27:58 pacho Exp $
+
+ 18 Feb 2015; Pacho Ramos <pacho@gentoo.org> metadata.xml,
+ networkmanager-1.0.0.ebuild:
+ Don't install empty /var/run (#539400 by Jan Vesely)
08 Feb 2015; Markus Meier <maekke@gentoo.org> networkmanager-1.0.0.ebuild:
arm stable, bug #536694
diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml
index 66fbd7536aa6..ed6d30f37115 100644
--- a/net-misc/networkmanager/metadata.xml
+++ b/net-misc/networkmanager/metadata.xml
@@ -18,7 +18,6 @@
<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>
<flag name="wext">Enable support for the deprecated Wext (Wireless
diff --git a/net-misc/networkmanager/networkmanager-1.0.0.ebuild b/net-misc/networkmanager/networkmanager-1.0.0.ebuild
index 581cae78e9b3..19aa2c8128f7 100644
--- a/net-misc/networkmanager/networkmanager-1.0.0.ebuild
+++ b/net-misc/networkmanager/networkmanager-1.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-1.0.0.ebuild,v 1.6 2015/02/08 21:06:12 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-1.0.0.ebuild,v 1.7 2015/02/18 12:27:58 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -210,6 +210,7 @@ src_install() {
# /var/run/NetworkManager is used by some distros, but not by Gentoo
rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed"
+ rmdir -v "${ED}/var/run" || die "rmdir failed"
# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
keepdir /etc/NetworkManager/dispatcher.d