1 |
commit: 26c211cd669e4f1c2b2d4e6a6d6ac7a605b038a6 |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com> |
3 |
AuthorDate: Sat Oct 1 04:44:23 2011 +0000 |
4 |
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com> |
5 |
CommitDate: Sat Oct 1 04:44:23 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=26c211cd |
7 |
|
8 |
replace !!< blockers with !< |
9 |
|
10 |
As pointed out by Olivier Crete on IRC (and tested experimentally), this |
11 |
will allow portage to automatically upgrade packages and deal with file |
12 |
collisions behind the scenes. |
13 |
|
14 |
--- |
15 |
dev-python/pygobject/pygobject-3.0.0.ebuild | 2 +- |
16 |
games-board/aisleriot/aisleriot-3.2.0.ebuild | 2 +- |
17 |
games-board/aisleriot/aisleriot-9999.ebuild | 2 +- |
18 |
gnome-base/gnome-menus/gnome-menus-3.2.0.ebuild | 2 +- |
19 |
.../gnome-settings-daemon-3.2.0-r1.ebuild | 4 ++-- |
20 |
.../gnome-settings-daemon-9999.ebuild | 4 ++-- |
21 |
gnome-extra/gucharmap/gucharmap-3.2.0.ebuild | 2 +- |
22 |
x11-libs/libcryptui/libcryptui-3.2.0.ebuild | 2 +- |
23 |
x11-libs/libcryptui/libcryptui-9999.ebuild | 2 +- |
24 |
9 files changed, 11 insertions(+), 11 deletions(-) |
25 |
|
26 |
diff --git a/dev-python/pygobject/pygobject-3.0.0.ebuild b/dev-python/pygobject/pygobject-3.0.0.ebuild |
27 |
index 5916ddc..407ae5e 100644 |
28 |
--- a/dev-python/pygobject/pygobject-3.0.0.ebuild |
29 |
+++ b/dev-python/pygobject/pygobject-3.0.0.ebuild |
30 |
@@ -47,7 +47,7 @@ DEPEND="${COMMON_DEPEND} |
31 |
# slot 3 will collide with them. |
32 |
RDEPEND="${COMMON_DEPEND} |
33 |
!<dev-python/pygtk-2.13 |
34 |
- !!<dev-python/pygobject-2.28.6-r50:2[introspection]" |
35 |
+ !<dev-python/pygobject-2.28.6-r50:2[introspection]" |
36 |
|
37 |
pkg_setup() { |
38 |
DOCS="AUTHORS ChangeLog* NEWS README" |
39 |
|
40 |
diff --git a/games-board/aisleriot/aisleriot-3.2.0.ebuild b/games-board/aisleriot/aisleriot-3.2.0.ebuild |
41 |
index f44a9f3..ec44bd6 100644 |
42 |
--- a/games-board/aisleriot/aisleriot-3.2.0.ebuild |
43 |
+++ b/games-board/aisleriot/aisleriot-3.2.0.ebuild |
44 |
@@ -37,7 +37,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2 |
45 |
sound? ( >=media-libs/libcanberra-0.26[gtk3] )" |
46 |
# aisleriot was split off from gnome-games |
47 |
RDEPEND="${COMMON_DEPEND} |
48 |
- !!<gnome-extra/gnome-games-3.1.1[aisleriot]" |
49 |
+ !<gnome-extra/gnome-games-3.1.1[aisleriot]" |
50 |
DEPEND="${COMMON_DEPEND} |
51 |
>=dev-util/intltool-0.40.4 |
52 |
>=dev-util/pkgconfig-0.15 |
53 |
|
54 |
diff --git a/games-board/aisleriot/aisleriot-9999.ebuild b/games-board/aisleriot/aisleriot-9999.ebuild |
55 |
index f44a9f3..ec44bd6 100644 |
56 |
--- a/games-board/aisleriot/aisleriot-9999.ebuild |
57 |
+++ b/games-board/aisleriot/aisleriot-9999.ebuild |
58 |
@@ -37,7 +37,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.26.0:2 |
59 |
sound? ( >=media-libs/libcanberra-0.26[gtk3] )" |
60 |
# aisleriot was split off from gnome-games |
61 |
RDEPEND="${COMMON_DEPEND} |
62 |
- !!<gnome-extra/gnome-games-3.1.1[aisleriot]" |
63 |
+ !<gnome-extra/gnome-games-3.1.1[aisleriot]" |
64 |
DEPEND="${COMMON_DEPEND} |
65 |
>=dev-util/intltool-0.40.4 |
66 |
>=dev-util/pkgconfig-0.15 |
67 |
|
68 |
diff --git a/gnome-base/gnome-menus/gnome-menus-3.2.0.ebuild b/gnome-base/gnome-menus/gnome-menus-3.2.0.ebuild |
69 |
index 1db4e6e..0b72acb 100644 |
70 |
--- a/gnome-base/gnome-menus/gnome-menus-3.2.0.ebuild |
71 |
+++ b/gnome-base/gnome-menus/gnome-menus-3.2.0.ebuild |
72 |
@@ -31,7 +31,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.29.15:2 |
73 |
x11-libs/gtk+:3[introspection] )" |
74 |
# Older versions of slot 0 install the menu editor and the desktop directories |
75 |
RDEPEND="${COMMON_DEPEND} |
76 |
- !!<gnome-base/gnome-menus-3.0.1-r50:0" |
77 |
+ !<gnome-base/gnome-menus-3.0.1-r50:0" |
78 |
DEPEND="${COMMON_DEPEND} |
79 |
sys-devel/gettext |
80 |
>=dev-util/pkgconfig-0.9 |
81 |
|
82 |
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 |
83 |
index 91b5a05..9e22144 100644 |
84 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r1.ebuild |
85 |
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.0-r1.ebuild |
86 |
@@ -67,8 +67,8 @@ RDEPEND="${COMMON_DEPEND} |
87 |
>=x11-themes/gnome-icon-theme-2.91 |
88 |
>=x11-themes/gnome-icon-theme-symbolic-2.91 |
89 |
!<gnome-base/gnome-control-center-2.22 |
90 |
- !!<gnome-extra/gnome-color-manager-3.1.1 |
91 |
- !!<gnome-extra/gnome-power-manager-3.1.3" |
92 |
+ !<gnome-extra/gnome-color-manager-3.1.1 |
93 |
+ !<gnome-extra/gnome-power-manager-3.1.3" |
94 |
# xproto-7.0.15 needed for power plugin |
95 |
DEPEND="${COMMON_DEPEND} |
96 |
cups? ( sys-apps/sed ) |
97 |
|
98 |
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild |
99 |
index 36b8c4f..d782d44 100644 |
100 |
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild |
101 |
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild |
102 |
@@ -67,8 +67,8 @@ RDEPEND="${COMMON_DEPEND} |
103 |
>=x11-themes/gnome-icon-theme-2.91 |
104 |
>=x11-themes/gnome-icon-theme-symbolic-2.91 |
105 |
!<gnome-base/gnome-control-center-2.22 |
106 |
- !!<gnome-extra/gnome-color-manager-3.1.1 |
107 |
- !!<gnome-extra/gnome-power-manager-3.1.3" |
108 |
+ !<gnome-extra/gnome-color-manager-3.1.1 |
109 |
+ !<gnome-extra/gnome-power-manager-3.1.3" |
110 |
# xproto-7.0.15 needed for power plugin |
111 |
DEPEND="${COMMON_DEPEND} |
112 |
cups? ( sys-apps/sed ) |
113 |
|
114 |
diff --git a/gnome-extra/gucharmap/gucharmap-3.2.0.ebuild b/gnome-extra/gucharmap/gucharmap-3.2.0.ebuild |
115 |
index 30a3c9f..4a23102 100644 |
116 |
--- a/gnome-extra/gucharmap/gucharmap-3.2.0.ebuild |
117 |
+++ b/gnome-extra/gucharmap/gucharmap-3.2.0.ebuild |
118 |
@@ -23,7 +23,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.16.3 |
119 |
gnome? ( gnome-base/gconf:2 ) |
120 |
introspection? ( >=dev-libs/gobject-introspection-0.9.0 )" |
121 |
RDEPEND="${COMMON_DEPEND} |
122 |
- !!<gnome-extra/gucharmap-3:0" |
123 |
+ !<gnome-extra/gucharmap-3:0" |
124 |
DEPEND="${RDEPEND} |
125 |
app-text/scrollkeeper |
126 |
>=dev-util/pkgconfig-0.9 |
127 |
|
128 |
diff --git a/x11-libs/libcryptui/libcryptui-3.2.0.ebuild b/x11-libs/libcryptui/libcryptui-3.2.0.ebuild |
129 |
index 67fcc3c..d77fde7 100644 |
130 |
--- a/x11-libs/libcryptui/libcryptui-3.2.0.ebuild |
131 |
+++ b/x11-libs/libcryptui/libcryptui-3.2.0.ebuild |
132 |
@@ -47,7 +47,7 @@ DEPEND="${COMMON_DEPEND} |
133 |
" |
134 |
# Before 3.1.4, libcryptui was part of seahorse |
135 |
RDEPEND="${COMMON_DEPEND} |
136 |
- !!<app-crypt/seahorse-3.1.4 |
137 |
+ !<app-crypt/seahorse-3.1.4 |
138 |
" |
139 |
|
140 |
pkg_setup() { |
141 |
|
142 |
diff --git a/x11-libs/libcryptui/libcryptui-9999.ebuild b/x11-libs/libcryptui/libcryptui-9999.ebuild |
143 |
index 67fcc3c..d77fde7 100644 |
144 |
--- a/x11-libs/libcryptui/libcryptui-9999.ebuild |
145 |
+++ b/x11-libs/libcryptui/libcryptui-9999.ebuild |
146 |
@@ -47,7 +47,7 @@ DEPEND="${COMMON_DEPEND} |
147 |
" |
148 |
# Before 3.1.4, libcryptui was part of seahorse |
149 |
RDEPEND="${COMMON_DEPEND} |
150 |
- !!<app-crypt/seahorse-3.1.4 |
151 |
+ !<app-crypt/seahorse-3.1.4 |
152 |
" |
153 |
|
154 |
pkg_setup() { |