summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-01-05 02:19:58 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-01-05 02:19:58 +0000
commite218fd19e39f3416bf9f8583be7b3c4ec9be6415 (patch)
tree0620bd0c293189a0945c6b3cfb516686c3096af6 /gnome-base/gnome-core-apps
parentMake ifnet ignore user connections (bug #392409) (diff)
downloadgentoo-2-e218fd19e39f3416bf9f8583be7b3c4ec9be6415.tar.gz
gentoo-2-e218fd19e39f3416bf9f8583be7b3c4ec9be6415.tar.bz2
gentoo-2-e218fd19e39f3416bf9f8583be7b3c4ec9be6415.zip
Add networkmanager USE flag, enabled by default, to make nm-applet optional (bug #397635, thanks to Gert Wollny for reporting).
(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base/gnome-core-apps')
-rw-r--r--gnome-base/gnome-core-apps/ChangeLog9
-rw-r--r--gnome-base/gnome-core-apps/gnome-core-apps-3.2.1.ebuild8
2 files changed, 11 insertions, 6 deletions
diff --git a/gnome-base/gnome-core-apps/ChangeLog b/gnome-base/gnome-core-apps/ChangeLog
index 75db417b8e27..eb32b371a8fd 100644
--- a/gnome-base/gnome-core-apps/ChangeLog
+++ b/gnome-base/gnome-core-apps/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/gnome-core-apps
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-apps/ChangeLog,v 1.1 2011/11/07 07:48:37 tetromino Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-apps/ChangeLog,v 1.2 2012/01/05 02:19:58 tetromino Exp $
+
+ 05 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+ gnome-core-apps-3.2.1.ebuild:
+ Add networkmanager USE flag, enabled by default, to make nm-applet optional
+ (bug #397635, thanks to Gert Wollny for reporting).
*gnome-core-apps-3.2.1 (07 Nov 2011)
diff --git a/gnome-base/gnome-core-apps/gnome-core-apps-3.2.1.ebuild b/gnome-base/gnome-core-apps/gnome-core-apps-3.2.1.ebuild
index 3e29982cdbdd..643f9311bbf8 100644
--- a/gnome-base/gnome-core-apps/gnome-core-apps-3.2.1.ebuild
+++ b/gnome-base/gnome-core-apps/gnome-core-apps-3.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-apps/gnome-core-apps-3.2.1.ebuild,v 1.1 2011/11/07 07:48:37 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-core-apps/gnome-core-apps-3.2.1.ebuild,v 1.2 2012/01/05 02:19:58 tetromino Exp $
EAPI="4"
@@ -8,7 +8,7 @@ DESCRIPTION="Sub-meta package for the core applications integrated with GNOME 3"
HOMEPAGE="http://www.gnome.org/"
LICENSE="as-is"
SLOT="3.0"
-IUSE="+bluetooth +cdr cups"
+IUSE="+bluetooth +cdr cups +networkmanager"
# when unmasking for an arch
# double check none of the deps are still masked !
@@ -31,7 +31,6 @@ RDEPEND="
>=gnome-extra/evolution-data-server-${PV}
>=gnome-extra/gnome-power-manager-${PV}
>=gnome-extra/gnome-screensaver-3.2
- >=gnome-extra/nm-applet-0.9.1.90[bluetooth?]
>=app-crypt/seahorse-${PV}
>=app-editors/gedit-${PV}
@@ -52,6 +51,7 @@ RDEPEND="
bluetooth? ( >=net-wireless/gnome-bluetooth-${PV} )
cdr? ( >=app-cdr/brasero-3.2 )
+ networkmanager? ( >=gnome-extra/nm-applet-0.9.1.90[bluetooth?] )
"
DEPEND=""
S=${WORKDIR}