tetromino 14/05/08 01:11:27
Modified: gnome-shell-3.10.4-r1.ebuild
gnome-shell-3.10.4-r2.ebuild
gnome-shell-3.12.1.ebuild ChangeLog
Log:
Fix gdm ↔ gnome-shell circular dependency, pointed out by odium
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
CF0ADD61)
Revision Changes Path
1.6 gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild?r1=1.5&r2=1.6
Index: gnome-shell-3.10.4-r1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-shell-3.10.4-r1.ebuild 1 May 2014 02:31:19 -0000 1.5
+++ gnome-shell-3.10.4-r1.ebuild 8 May 2014 01:11:26 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild,v
1.5 2014/05/01 02:31:19 tetromino Exp $
+# $Header:
/var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r1.ebuild,v
1.6 2014/05/08 01:11:26 tetromino Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -84,7 +84,6 @@
>=sys-auth/polkit-0.101[introspection]
>=app-accessibility/caribou-0.4.8
- >=gnome-base/gdm-3.5[introspection]
media-libs/cogl[introspection]
>=sys-apps/accountsservice-0.6.14[introspection]
sys-power/upower[introspection]
@@ -105,6 +104,9 @@
net-misc/mobile-broadband-provider-info
sys-libs/timezone-data )
"
+# avoid circular dependency
+PDEPEND=">=gnome-base/gdm-3.5[introspection]
+"
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
>=dev-util/gtk-doc-am-1.17
1.6 gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild?rev=1.6&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild?rev=1.6&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild?r1=1.5&r2=1.6
Index: gnome-shell-3.10.4-r2.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-shell-3.10.4-r2.ebuild 4 May 2014 12:10:18 -0000 1.5
+++ gnome-shell-3.10.4-r2.ebuild 8 May 2014 01:11:26 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild,v
1.5 2014/05/04 12:10:18 pacho Exp $
+# $Header:
/var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild,v
1.6 2014/05/08 01:11:26 tetromino Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -84,7 +84,6 @@
>=sys-auth/polkit-0.101[introspection]
>=app-accessibility/caribou-0.4.8
- >=gnome-base/gdm-3.5[introspection]
media-libs/cogl[introspection]
>=sys-apps/accountsservice-0.6.14[introspection]
sys-power/upower[introspection]
@@ -105,6 +104,9 @@
net-misc/mobile-broadband-provider-info
sys-libs/timezone-data )
"
+# avoid circular dependency
+PDEPEND=">=gnome-base/gdm-3.5[introspection]
+"
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
>=dev-util/gtk-doc-am-1.17
1.3 gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild?r1=1.2&r2=1.3
Index: gnome-shell-3.12.1.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-shell-3.12.1.ebuild 1 May 2014 02:31:19 -0000 1.2
+++ gnome-shell-3.12.1.ebuild 8 May 2014 01:11:26 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header:
/var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild,v 1.2
2014/05/01 02:31:19 tetromino Exp $
+# $Header:
/var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.12.1.ebuild,v 1.3
2014/05/08 01:11:26 tetromino Exp $
EAPI="5"
GCONF_DEBUG="no"
@@ -84,7 +84,6 @@
>=sys-auth/polkit-0.101[introspection]
>=app-accessibility/caribou-0.4.8
- >=gnome-base/gdm-3.5[introspection]
media-libs/cogl[introspection]
>=sys-apps/accountsservice-0.6.14[introspection]
sys-power/upower[introspection]
@@ -105,6 +104,9 @@
net-misc/mobile-broadband-provider-info
sys-libs/timezone-data )
"
+# avoid circular dependency
+PDEPEND=">=gnome-base/gdm-3.5[introspection]
+"
DEPEND="${COMMON_DEPEND}
dev-libs/libxslt
>=dev-util/gtk-doc-am-1.17
1.78 gnome-base/gnome-shell/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/ChangeLog?rev=1.78&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/ChangeLog?rev=1.78&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/ChangeLog?r1=1.77&r2=1.78
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- ChangeLog 4 May 2014 12:10:18 -0000 1.77
+++ ChangeLog 8 May 2014 01:11:26 -0000 1.78
@@ -1,6 +1,11 @@
# ChangeLog for gnome-base/gnome-shell
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.77
2014/05/04 12:10:18 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.78
2014/05/08 01:11:26 tetromino Exp $
+
+ 08 May 2014; Alexandre Rostovtsev <[email protected]>
+ gnome-shell-3.10.4-r1.ebuild, gnome-shell-3.10.4-r2.ebuild,
+ gnome-shell-3.12.1.ebuild:
+ Fix gdm ↔ gnome-shell circular dependency, pointed out by odium
04 May 2014; Pacho Ramos <[email protected]> gnome-shell-3.10.4-r2.ebuild:
x86 stable, bug 508862