Add networkmanager USE flag, enabled by default, to make nm-applet optional (bug...

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/gnome-base/gnome-core-apps/ChangeLog b/gnome-base/gnome-core-apps/ChangeLog
index 75db417b8e279498b026587aff84cabb8647c998..eb32b371a8fd94c06a6cc25cd1212c717f39ce95 100644 (file)
--- 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/Manifest b/gnome-base/gnome-core-apps/Manifest
index d6146c6b47122be6e9d2e6ac4ec4147c5ae3b74c..44f2d4b055a73a74e1f35b744ce7ed0e6c3d94ae 100644 (file)
--- a/gnome-base/gnome-core-apps/Manifest
+++ b/gnome-base/gnome-core-apps/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD gnome-core-apps-3.2.1.ebuild 1727 RMD160 52040d78331c6df55699e7b1fffd91156134dd9e SHA1 d0861104a214ad7816f1d3546147f837d3a8f2c7 SHA256 112a4f51744a015332e70d6d1b3a6233afa2f2ee43a10d39d8a6b8f0f6e23e72
-MISC ChangeLog 457 RMD160 2bf614e0818a577df0036e9c7b4a98618fd7505e SHA1 eedcf04f2d5f9dbdfdee33361233e874eab16c79 SHA256 4467039c48df62b6c51a87fcd5ba1b0725d1d4f51802047d16a0bd775b3de751
+EBUILD gnome-core-apps-3.2.1.ebuild 1763 RMD160 e1920d4a77b2edbc6b6730bb901becbd27a27e86 SHA1 4e6ed7beb80752cf1a09d6161b3f0283b084a9ad SHA256 3e92ada75549af0d8ae78db7e1279f430384c925aecdc2298d6eb56ff6e922f8
+MISC ChangeLog 681 RMD160 42e259e7c7afa075d191563ea0f1423be6a7d0a9 SHA1 b779f5b026faf272228d8b0f65465f357da3cca1 SHA256 8cb5138e67d31caa24f807b9314dae150b206dffa1247a0a9635e7209da50a8d
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk63jVoACgkQdjK8w9WeBnAwFgD+M/bRT/oQ4cKGKesXn8dTAAbT
-GkRFM+WRNcteECZnEPQA/R5dFjJE9m+8mjYJ3pLX1sozigmJ7fSo1WmBHl44MO2U
-=Wada
+iF4EAREIAAYFAk8FCNMACgkQdjK8w9WeBnAjpAEAkgXP6TQNlCUAdZqF/IgYxsm/
+E0pEAWJQwrnUKmh+cXAA/2WAWpt8ezxtQroi9BrjFuHg2R0RPD4TAUcWUn5OEQMb
+=OvaT
 -----END PGP SIGNATURE-----

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 3e29982cdbddb792e8ab3a845ffd3248a296af42..643f9311bbf8602cc7d41d16addeb07f17041cbf 100644 (file)
--- 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}