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 1Q3LlY-0002vR-KH for garchives@archives.gentoo.org; Sat, 26 Mar 2011 05:10:24 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FF8F1C009; Sat, 26 Mar 2011 05:10:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 296331C009 for ; Sat, 26 Mar 2011 05:10:16 +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 B22B11B410D for ; Sat, 26 Mar 2011 05:10:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 11B668006A for ; Sat, 26 Mar 2011 05:10:15 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild X-VCS-Directories: gnome-base/gnome-control-center/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: e1446e06b44f42cd9dae478c1d73110cefeb79ec Date: Sat, 26 Mar 2011 05:10:15 +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: 0ee4acf1f237d1ca1ced86ec692a0410 commit: e1446e06b44f42cd9dae478c1d73110cefeb79ec Author: Jonathan Callen gentoo org> AuthorDate: Sat Mar 26 04:26:35 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Sat Mar 26 04:26:35 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3De1446e06 gnome-base/gnome-control-center: Add blocker on old gdm Older gdm installs files that collide with current gnome-control-center. Ensure that this isn't an issue by adding a blocker. Also move all blockers to RDEPEND, as they are runtime-only. (Portage version: 2.2.0_alpha28_p8/git/Linux i686, RepoMan options: --for= ce, signed Manifest commit with key 229E5838) --- .../gnome-control-center-2.91.92-r2.ebuild | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.92= -r2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.92= -r2.ebuild index df60b71..734344a 100644 --- a/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebu= ild +++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebu= ild @@ -60,12 +60,13 @@ COMMON_DEPEND=3D" >=3Dmedia-video/cheese-2.91.91.1 ) cups? ( >=3Dnet-print/cups-1.4[dbus] ) networkmanager? ( >=3Dnet-misc/networkmanager-0.8.992 ) - socialweb? ( net-libs/libsocialweb ) + socialweb? ( net-libs/libsocialweb )" +RDEPEND=3D"${COMMON_DEPEND} + sys-apps/accountsservice =20 !gnome-extra/gnome-media[pulseaudio] - !=3Dgnome-base/gnome-session-2.91.6-r1" DEPEND=3D"${COMMON_DEPEND} @@ -79,7 +80,7 @@ DEPEND=3D"${COMMON_DEPEND} =20 app-text/scrollkeeper >=3Dapp-text/gnome-doc-utils-0.10.1 -=09 + cups? ( sys-apps/sed ) doc? ( >=3Ddev-util/gtk-doc-1.9 )" # Needed for autoreconf