From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PrQ1z-0007iz-59 for garchives@archives.gentoo.org; Mon, 21 Feb 2011 07:18:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EF42E05F1; Mon, 21 Feb 2011 07:17:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C1DB1E05F1 for ; Mon, 21 Feb 2011 07:17:53 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 41A221B414B for ; Mon, 21 Feb 2011 07:17:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 698B98006A for ; Mon, 21 Feb 2011 07:17:52 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <24bb3651ef66bac3a8d032728a688745017bc063.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-shell/gnome-shell-9999.ebuild X-VCS-Directories: gnome-base/gnome-shell/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 24bb3651ef66bac3a8d032728a688745017bc063 Date: Mon, 21 Feb 2011 07:17:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 3d93c982c4267998b4cc56c96b1c447e commit: 24bb3651ef66bac3a8d032728a688745017bc063 Author: Nirbheek Chauhan gentoo org> AuthorDate: Mon Feb 21 07:16:19 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Feb 21 07:16:19 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D24bb3651 gnome-base/gnome-shell: make experimental applet optional, fix its deps --- gnome-base/gnome-shell/gnome-shell-9999.ebuild | 26 +++++++++++++-----= ----- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/= gnome-shell/gnome-shell-9999.ebuild index 7f31f64..5e46849 100644 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild @@ -14,7 +14,7 @@ HOMEPAGE=3D"http://live.gnome.org/GnomeShell" =20 LICENSE=3D"GPL-2" SLOT=3D"0" -IUSE=3D"" +IUSE=3D"nm-applet" if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live KEYWORDS=3D"" @@ -47,7 +47,6 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9 >=3Dmedia-libs/gst-plugins-base-0.10.16 media-libs/libcanberra media-sound/pulseaudio - >=3Dnet-misc/networkmanager-9999 >=3Dnet-wireless/gnome-bluetooth-2.90.0[introspection] =20 x11-libs/startup-notification @@ -56,7 +55,9 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9 x11-apps/mesa-progs =20 dev-python/dbus-python - dev-python/gconf-python" + dev-python/gconf-python + + nm-applet? ( >=3Dnet-misc/networkmanager-9999[introspection] )" # Runtime-only deps are probably incomplete and approximate. # nm-applet is only needed temporarily for the secrets and wireless dial= ogs. RDEPEND=3D"${COMMON_DEPEND} @@ -65,7 +66,8 @@ RDEPEND=3D"${COMMON_DEPEND} >=3Dgnome-base/gnome-settings-daemon-2.91 >=3Dgnome-base/gnome-control-center-2.91 >=3Dgnome-base/libgnomekbd-2.91.4[introspection] - >=3Dgnome-extra/nm-applet-9999" + + nm-applet? ( >=3Dgnome-extra/nm-applet-9999 )" DEPEND=3D"${COMMON_DEPEND} sys-devel/gettext >=3Ddev-util/pkgconfig-0.22 @@ -77,13 +79,15 @@ G2CONF=3D"--enable-compile-warnings=3Dmaximum --disable-schemas-compile" =20 src_prepare() { - # See https://bugzilla.gnome.org/show_bug.cgi?id=3D621707" - ewarn "Adding support for the experimental NetworkManager applet." - ewarn "This needs the latest NetworkManager & nm-applet trunk." - ewarn "Report bugs about this to 'nirbheek' on #gentoo-desktop @ FreeNo= de." - epatch "${FILESDIR}/${PN}-nm-1.patch" - epatch "${FILESDIR}/${PN}-nm-2.patch" - epatch "${FILESDIR}/${PN}-nm-3.patch" + if use nm-applet; then + # See https://bugzilla.gnome.org/show_bug.cgi?id=3D621707" + ewarn "Adding support for the experimental NetworkManager applet." + ewarn "This needs the latest NetworkManager & nm-applet trunk." + ewarn "Report bugs about this to 'nirbheek' on #gentoo-desktop @ FreeN= ode." + epatch "${FILESDIR}/${PN}-nm-1.patch" + epatch "${FILESDIR}/${PN}-nm-2.patch" + epatch "${FILESDIR}/${PN}-nm-3.patch" + fi =20 gnome2_src_prepare }