public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Jonathan Callen" <abcd@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/
Date: Sat, 26 Mar 2011 05:10:15 +0000 (UTC)	[thread overview]
Message-ID: <e1446e06b44f42cd9dae478c1d73110cefeb79ec.abcd@gentoo> (raw)

commit:     e1446e06b44f42cd9dae478c1d73110cefeb79ec
Author:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 04:26:35 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 04:26:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e1446e06

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: --force, 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.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.92-r2.ebuild
@@ -60,12 +60,13 @@ COMMON_DEPEND="
 		>=media-video/cheese-2.91.91.1 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	networkmanager? ( >=net-misc/networkmanager-0.8.992 )
-	socialweb? ( net-libs/libsocialweb )
+	socialweb? ( net-libs/libsocialweb )"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/accountsservice
 
 	!gnome-extra/gnome-media[pulseaudio]
-	!<gnome-extra/gnome-media-2.32.0-r300"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/accountsservice"
+	!<gnome-extra/gnome-media-2.32.0-r300
+	!<gnome-base/gdm-2.91.94"
 # PDEPEND to avoid circular dependency
 PDEPEND=">=gnome-base/gnome-session-2.91.6-r1"
 DEPEND="${COMMON_DEPEND}
@@ -79,7 +80,7 @@ DEPEND="${COMMON_DEPEND}
 
 	app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.10.1
-	
+
 	cups? ( sys-apps/sed )
 	doc? ( >=dev-util/gtk-doc-1.9 )"
 # Needed for autoreconf



             reply	other threads:[~2011-03-26  5:10 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-26  5:10 Jonathan Callen [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-09-28 17:58 [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-control-center/ Mart Raudsepp
2018-09-26 20:29 Mart Raudsepp
2018-09-26 20:29 Mart Raudsepp
2018-09-10 21:33 Gilles Dartiguelongue
2018-04-16 16:28 Sobhan Mohammadpour
2018-02-09 15:55 Sobhan Mohammadpour
2018-01-12 12:09 Dennis Lamm
2015-05-17 15:39 Gilles Dartiguelongue
2015-05-12 22:20 Gilles Dartiguelongue
2014-12-22 23:11 Gilles Dartiguelongue
2014-11-23 22:28 Gilles Dartiguelongue
2014-10-15 22:26 Gilles Dartiguelongue
2014-10-11 23:30 Gilles Dartiguelongue
2014-04-25 23:35 Gilles Dartiguelongue
2014-02-12 20:58 Gilles Dartiguelongue
2013-01-22  8:12 Alexandre Rostovtsev
2012-12-25 22:01 Gilles Dartiguelongue
2012-11-18 19:33 Gilles Dartiguelongue
2012-10-25  6:30 Priit Laes
2012-09-30  0:15 Alexandre Rostovtsev
2012-09-08  0:37 Alexandre Restovtsev
2012-04-06  9:00 Alexandre Restovtsev
2011-10-02 19:11 Alexandre Restovtsev
2011-06-02 17:39 Nirbheek Chauhan
2011-05-30 18:39 Nirbheek Chauhan
2011-04-27 22:22 Gilles Dartiguelongue
2011-04-08 10:52 Gilles Dartiguelongue
2011-04-07 13:44 Nirbheek Chauhan
2011-04-05  0:57 Nirbheek Chauhan
2011-03-26  2:54 Nirbheek Chauhan
2011-03-23  5:20 Nirbheek Chauhan
2011-03-15 13:08 Nirbheek Chauhan
2011-03-09 11:34 Nirbheek Chauhan
2011-03-04 14:57 Nirbheek Chauhan
2011-02-28 20:25 Nirbheek Chauhan
2011-02-28 10:19 Nirbheek Chauhan
2011-02-27  3:02 Jonathan Callen
2011-02-22 19:44 Nirbheek Chauhan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e1446e06b44f42cd9dae478c1d73110cefeb79ec.abcd@gentoo \
    --to=abcd@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox