| 1 |
commit: a0aaa0ae8bcfde7cd31ca7df2d4ee0be75fe5b56 |
| 2 |
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 21 11:43:01 2011 +0000 |
| 4 |
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 21 11:43:06 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a0aaa0ae |
| 7 |
|
| 8 |
Fix circular dependency using PDEPEND |
| 9 |
|
| 10 |
* gnome-session's dependency on gnome-shell is pure-runtime |
| 11 |
* gnome-control-center's dependency on gnome-session is pure-runtime |
| 12 |
|
| 13 |
--- |
| 14 |
.../gnome-control-center-2.91.6-r1.ebuild | 3 ++- |
| 15 |
.../gnome-session/gnome-session-2.91.6-r1.ebuild | 5 +++-- |
| 16 |
2 files changed, 5 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.91.6-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.91.6-r1.ebuild |
| 19 |
index 03e37b3..c867504 100644 |
| 20 |
--- a/gnome-base/gnome-control-center/gnome-control-center-2.91.6-r1.ebuild |
| 21 |
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.91.6-r1.ebuild |
| 22 |
@@ -37,7 +37,6 @@ COMMON_DEPEND=" |
| 23 |
>=gnome-base/gconf-2.0 |
| 24 |
>=dev-libs/dbus-glib-0.73 |
| 25 |
>=gnome-base/gnome-desktop-2.91.5:3 |
| 26 |
- >=gnome-base/gnome-session-2.91.6-r1 |
| 27 |
>=gnome-base/gnome-settings-daemon-2.91.2 |
| 28 |
>=gnome-base/libgnomekbd-2.91.2 |
| 29 |
|
| 30 |
@@ -66,6 +65,8 @@ COMMON_DEPEND=" |
| 31 |
!!<gnome-extra/gnome-media-2.32.0-r300" |
| 32 |
RDEPEND="${COMMON_DEPEND} |
| 33 |
sys-apps/accountsservice" |
| 34 |
+# PDEPEND to avoid circular dependency |
| 35 |
+PDEPEND=">=gnome-base/gnome-session-2.91.6-r1" |
| 36 |
DEPEND="${COMMON_DEPEND} |
| 37 |
x11-proto/xproto |
| 38 |
x11-proto/xf86miscproto |
| 39 |
|
| 40 |
diff --git a/gnome-base/gnome-session/gnome-session-2.91.6-r1.ebuild b/gnome-base/gnome-session/gnome-session-2.91.6-r1.ebuild |
| 41 |
index 4ee1bc7..afec698 100644 |
| 42 |
--- a/gnome-base/gnome-session/gnome-session-2.91.6-r1.ebuild |
| 43 |
+++ b/gnome-base/gnome-session/gnome-session-2.91.6-r1.ebuild |
| 44 |
@@ -45,8 +45,9 @@ COMMON_DEPEND=">=dev-libs/glib-2.16:2 |
| 45 |
# gnome-panel is used by classic-gnome |
| 46 |
RDEPEND="${COMMON_DEPEND} |
| 47 |
gnome-base/gnome-panel |
| 48 |
- gnome-base/gnome-settings-daemon |
| 49 |
- gnome-base/gnome-shell" |
| 50 |
+ gnome-base/gnome-settings-daemon" |
| 51 |
+# PDEPEND to avoid circular dependency |
| 52 |
+PDEPEND="gnome-base/gnome-shell" |
| 53 |
DEPEND="${COMMON_DEPEND} |
| 54 |
>=dev-lang/perl-5 |
| 55 |
>=sys-devel/gettext-0.10.40 |
Archives