| 1 |
commit: 24bb3651ef66bac3a8d032728a688745017bc063 |
| 2 |
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 21 07:16:19 2011 +0000 |
| 4 |
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 21 07:16:19 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=24bb3651 |
| 7 |
|
| 8 |
gnome-base/gnome-shell: make experimental applet optional, fix its deps |
| 9 |
|
| 10 |
--- |
| 11 |
gnome-base/gnome-shell/gnome-shell-9999.ebuild | 26 +++++++++++++---------- |
| 12 |
1 files changed, 15 insertions(+), 11 deletions(-) |
| 13 |
|
| 14 |
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild |
| 15 |
index 7f31f64..5e46849 100644 |
| 16 |
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild |
| 17 |
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild |
| 18 |
@@ -14,7 +14,7 @@ HOMEPAGE="http://live.gnome.org/GnomeShell" |
| 19 |
|
| 20 |
LICENSE="GPL-2" |
| 21 |
SLOT="0" |
| 22 |
-IUSE="" |
| 23 |
+IUSE="nm-applet" |
| 24 |
if [[ ${PV} = 9999 ]]; then |
| 25 |
inherit gnome2-live |
| 26 |
KEYWORDS="" |
| 27 |
@@ -47,7 +47,6 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9 |
| 28 |
>=media-libs/gst-plugins-base-0.10.16 |
| 29 |
media-libs/libcanberra |
| 30 |
media-sound/pulseaudio |
| 31 |
- >=net-misc/networkmanager-9999 |
| 32 |
>=net-wireless/gnome-bluetooth-2.90.0[introspection] |
| 33 |
|
| 34 |
x11-libs/startup-notification |
| 35 |
@@ -56,7 +55,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9 |
| 36 |
x11-apps/mesa-progs |
| 37 |
|
| 38 |
dev-python/dbus-python |
| 39 |
- dev-python/gconf-python" |
| 40 |
+ dev-python/gconf-python |
| 41 |
+ |
| 42 |
+ nm-applet? ( >=net-misc/networkmanager-9999[introspection] )" |
| 43 |
# Runtime-only deps are probably incomplete and approximate. |
| 44 |
# nm-applet is only needed temporarily for the secrets and wireless dialogs. |
| 45 |
RDEPEND="${COMMON_DEPEND} |
| 46 |
@@ -65,7 +66,8 @@ RDEPEND="${COMMON_DEPEND} |
| 47 |
>=gnome-base/gnome-settings-daemon-2.91 |
| 48 |
>=gnome-base/gnome-control-center-2.91 |
| 49 |
>=gnome-base/libgnomekbd-2.91.4[introspection] |
| 50 |
- >=gnome-extra/nm-applet-9999" |
| 51 |
+ |
| 52 |
+ nm-applet? ( >=gnome-extra/nm-applet-9999 )" |
| 53 |
DEPEND="${COMMON_DEPEND} |
| 54 |
sys-devel/gettext |
| 55 |
>=dev-util/pkgconfig-0.22 |
| 56 |
@@ -77,13 +79,15 @@ G2CONF="--enable-compile-warnings=maximum |
| 57 |
--disable-schemas-compile" |
| 58 |
|
| 59 |
src_prepare() { |
| 60 |
- # See https://bugzilla.gnome.org/show_bug.cgi?id=621707" |
| 61 |
- ewarn "Adding support for the experimental NetworkManager applet." |
| 62 |
- ewarn "This needs the latest NetworkManager & nm-applet trunk." |
| 63 |
- ewarn "Report bugs about this to 'nirbheek' on #gentoo-desktop @ FreeNode." |
| 64 |
- epatch "${FILESDIR}/${PN}-nm-1.patch" |
| 65 |
- epatch "${FILESDIR}/${PN}-nm-2.patch" |
| 66 |
- epatch "${FILESDIR}/${PN}-nm-3.patch" |
| 67 |
+ if use nm-applet; then |
| 68 |
+ # See https://bugzilla.gnome.org/show_bug.cgi?id=621707" |
| 69 |
+ ewarn "Adding support for the experimental NetworkManager applet." |
| 70 |
+ ewarn "This needs the latest NetworkManager & nm-applet trunk." |
| 71 |
+ ewarn "Report bugs about this to 'nirbheek' on #gentoo-desktop @ FreeNode." |
| 72 |
+ epatch "${FILESDIR}/${PN}-nm-1.patch" |
| 73 |
+ epatch "${FILESDIR}/${PN}-nm-2.patch" |
| 74 |
+ epatch "${FILESDIR}/${PN}-nm-3.patch" |
| 75 |
+ fi |
| 76 |
|
| 77 |
gnome2_src_prepare |
| 78 |
} |
Archives