[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, x11-libs/libcryptui/, gnome-extra/gucharmap/, ...

[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, x11-libs/libcryptui/, gnome-extra/gucharmap/, ...

[Alexandre Restovtsev]

commit:     26c211cd669e4f1c2b2d4e6a6d6ac7a605b038a6
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Oct  1 04:44:23 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct  1 04:44:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=26c211cd

replace !!< blockers with !<

As pointed out by Olivier Crete on IRC (and tested experimentally), this
will allow portage to automatically upgrade packages and deal with file
collisions behind the scenes.

---
 dev-python/pygobject/pygobject-3.0.0.ebuild        |    2 +-
 games-board/aisleriot/aisleriot-3.2.0.ebuild       |    2 +-
 games-board/aisleriot/aisleriot-9999.ebuild        |    2 +-
 gnome-base/gnome-menus/gnome-menus-3.2.0.ebuild    |    2 +-
 .../gnome-settings-daemon-3.2.0-r1.ebuild          |    4 ++--
 .../gnome-settings-daemon-9999.ebuild              |    4 ++--
 gnome-extra/gucharmap/gucharmap-3.2.0.ebuild       |    2 +-
 x11-libs/libcryptui/libcryptui-3.2.0.ebuild        |    2 +-
 x11-libs/libcryptui/libcryptui-9999.ebuild         |    2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dev-python/pygobject/pygobject-3.0.0.ebuild b/dev-python/pygobject/pygobject-3.0.0.ebuild
index 5916ddc..407ae5e 100644
--- a/dev-python/pygobject/pygobject-3.0.0.ebuild
+++ b/dev-python/pygobject/pygobject-3.0.0.ebuild
@@ -47,7 +47,7 @@ DEPEND="${COMMON_DEPEND}
 # slot 3 will collide with them.
 RDEPEND="${COMMON_DEPEND}
 	!<dev-python/pygtk-2.13
-	!!<dev-python/pygobject-2.28.6-r50:2[introspection]"
+	!<dev-python/pygobject-2.28.6-r50:2[introspection]"
 
 pkg_setup() {
 	DOCS="AUTHORS ChangeLog* NEWS README"

diff --git a/games-board/aisleriot/aisleriot-3.2.0.ebuild b/games-board/aisleriot/aisleriot-3.2.0.ebuild
index f44a9f3..ec44bd6 100644
--- a/games-board/aisleriot/aisleriot-3.2.0.ebuild
+++ b/games-board/aisleriot/aisleriot-3.2.0.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 	sound? ( >=media-libs/libcanberra-0.26[gtk3] )"
 # aisleriot was split off from gnome-games
 RDEPEND="${COMMON_DEPEND}
-	!!<gnome-extra/gnome-games-3.1.1[aisleriot]"
+	!<gnome-extra/gnome-games-3.1.1[aisleriot]"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.4
 	>=dev-util/pkgconfig-0.15

diff --git a/games-board/aisleriot/aisleriot-9999.ebuild b/games-board/aisleriot/aisleriot-9999.ebuild
index f44a9f3..ec44bd6 100644
--- a/games-board/aisleriot/aisleriot-9999.ebuild
+++ b/games-board/aisleriot/aisleriot-9999.ebuild
@@ -37,7 +37,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2
 	sound? ( >=media-libs/libcanberra-0.26[gtk3] )"
 # aisleriot was split off from gnome-games
 RDEPEND="${COMMON_DEPEND}
-	!!<gnome-extra/gnome-games-3.1.1[aisleriot]"
+	!<gnome-extra/gnome-games-3.1.1[aisleriot]"
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40.4
 	>=dev-util/pkgconfig-0.15

diff --git a/gnome-base/gnome-menus/gnome-menus-3.2.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.2.0.ebuild
index 1db4e6e..0b72acb 100644
--- a/gnome-base/gnome-menus/gnome-menus-3.2.0.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-3.2.0.ebuild
@@ -31,7 +31,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
 		x11-libs/gtk+:3[introspection] )"
 # Older versions of slot 0 install the menu editor and the desktop directories
 RDEPEND="${COMMON_DEPEND}
-	!!<gnome-base/gnome-menus-3.0.1-r50:0"
+	!<gnome-base/gnome-menus-3.0.1-r50:0"
 DEPEND="${COMMON_DEPEND}
 	sys-devel/gettext
 	>=dev-util/pkgconfig-0.9

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r1.ebuild
index 91b5a05..9e22144 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r1.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r1.ebuild
@@ -67,8 +67,8 @@ RDEPEND="${COMMON_DEPEND}
 	>=x11-themes/gnome-icon-theme-2.91
 	>=x11-themes/gnome-icon-theme-symbolic-2.91
 	!<gnome-base/gnome-control-center-2.22
-	!!<gnome-extra/gnome-color-manager-3.1.1
-	!!<gnome-extra/gnome-power-manager-3.1.3"
+	!<gnome-extra/gnome-color-manager-3.1.1
+	!<gnome-extra/gnome-power-manager-3.1.3"
 # xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index 36b8c4f..d782d44 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -67,8 +67,8 @@ RDEPEND="${COMMON_DEPEND}
 	>=x11-themes/gnome-icon-theme-2.91
 	>=x11-themes/gnome-icon-theme-symbolic-2.91
 	!<gnome-base/gnome-control-center-2.22
-	!!<gnome-extra/gnome-color-manager-3.1.1
-	!!<gnome-extra/gnome-power-manager-3.1.3"
+	!<gnome-extra/gnome-color-manager-3.1.1
+	!<gnome-extra/gnome-power-manager-3.1.3"
 # xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )

diff --git a/gnome-extra/gucharmap/gucharmap-3.2.0.ebuild b/gnome-extra/gucharmap/gucharmap-3.2.0.ebuild
index 30a3c9f..4a23102 100644
--- a/gnome-extra/gucharmap/gucharmap-3.2.0.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-3.2.0.ebuild
@@ -23,7 +23,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.16.3
 	gnome? ( gnome-base/gconf:2 )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )"
 RDEPEND="${COMMON_DEPEND}
-	!!<gnome-extra/gucharmap-3:0"
+	!<gnome-extra/gucharmap-3:0"
 DEPEND="${RDEPEND}
 	app-text/scrollkeeper
 	>=dev-util/pkgconfig-0.9

diff --git a/x11-libs/libcryptui/libcryptui-3.2.0.ebuild b/x11-libs/libcryptui/libcryptui-3.2.0.ebuild
index 67fcc3c..d77fde7 100644
--- a/x11-libs/libcryptui/libcryptui-3.2.0.ebuild
+++ b/x11-libs/libcryptui/libcryptui-3.2.0.ebuild
@@ -47,7 +47,7 @@ DEPEND="${COMMON_DEPEND}
 "
 # Before 3.1.4, libcryptui was part of seahorse
 RDEPEND="${COMMON_DEPEND}
-	!!<app-crypt/seahorse-3.1.4
+	!<app-crypt/seahorse-3.1.4
 "
 
 pkg_setup() {

diff --git a/x11-libs/libcryptui/libcryptui-9999.ebuild b/x11-libs/libcryptui/libcryptui-9999.ebuild
index 67fcc3c..d77fde7 100644
--- a/x11-libs/libcryptui/libcryptui-9999.ebuild
+++ b/x11-libs/libcryptui/libcryptui-9999.ebuild
@@ -47,7 +47,7 @@ DEPEND="${COMMON_DEPEND}
 "
 # Before 3.1.4, libcryptui was part of seahorse
 RDEPEND="${COMMON_DEPEND}
-	!!<app-crypt/seahorse-3.1.4
+	!<app-crypt/seahorse-3.1.4
 "
 
 pkg_setup() {