1 |
commit: 77f6395c1970f79a9e2b1f7e63c12b5f975dfbdc |
2 |
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 4 21:27:10 2011 +0000 |
4 |
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 5 00:29:57 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=77f6395c |
7 |
|
8 |
gnome-base/gnome-menus: 2.91.91 → 3.0.0 |
9 |
|
10 |
* Show administration tools and old capplets in Other (Vincent) |
11 |
* Translation updates |
12 |
|
13 |
--- |
14 |
gnome-base/gnome-light/gnome-light-2.91.90.ebuild | 10 ++++---- |
15 |
... gnome-menus-3.0.0-ignore_kde_standalone.patch} | 2 +- |
16 |
...nus-2.91.91.ebuild => gnome-menus-3.0.0.ebuild} | 2 +- |
17 |
gnome-base/gnome/gnome-2.91.90.ebuild | 26 ++++++++----------- |
18 |
4 files changed, 18 insertions(+), 22 deletions(-) |
19 |
|
20 |
diff --git a/gnome-base/gnome-light/gnome-light-2.91.90.ebuild b/gnome-base/gnome-light/gnome-light-2.91.90.ebuild |
21 |
index afb927b..1b23b6d 100644 |
22 |
--- a/gnome-base/gnome-light/gnome-light-2.91.90.ebuild |
23 |
+++ b/gnome-base/gnome-light/gnome-light-2.91.90.ebuild |
24 |
@@ -24,10 +24,10 @@ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-freebsd ~amd64-l |
25 |
# XXX: This list is incomplete! |
26 |
RDEPEND="!gnome-base/gnome |
27 |
|
28 |
- >=dev-libs/glib-2.28.3:2 |
29 |
+ >=dev-libs/glib-2.28.4:2 |
30 |
>=media-libs/clutter-1.6.10:1.0 |
31 |
- >=x11-libs/gtk+-3.0.4:3 |
32 |
- >=x11-libs/gdk-pixbuf-2.23.1:2 |
33 |
+ >=x11-libs/gtk+-3.0.8:3 |
34 |
+ >=x11-libs/gdk-pixbuf-2.23.2:2 |
35 |
>=dev-libs/atk-1.33.6 |
36 |
>=x11-libs/pango-1.28.3 |
37 |
>=x11-libs/libwnck-${PV}:3 |
38 |
@@ -44,14 +44,14 @@ RDEPEND="!gnome-base/gnome |
39 |
>=x11-wm/mutter-${PV} |
40 |
>=gnome-base/gnome-shell-${PV} |
41 |
|
42 |
- >=x11-wm/metacity-2.30.3-r1 |
43 |
+ >=x11-wm/metacity-2.34.0 |
44 |
>=gnome-base/gnome-panel-${PV} |
45 |
|
46 |
>=x11-themes/gnome-icon-theme-${PV} |
47 |
>=x11-themes/gnome-icon-theme-symbolic-${PV} |
48 |
>=x11-themes/gnome-themes-standard-${PV} |
49 |
|
50 |
- >=x11-terms/gnome-terminal-2.33.1 |
51 |
+ >=x11-terms/gnome-terminal-${PV} |
52 |
|
53 |
>=gnome-extra/yelp-${PV}" |
54 |
DEPEND="" |
55 |
|
56 |
diff --git a/gnome-base/gnome-menus/files/gnome-menus-2.18.3-ignore_kde_standalone.patch b/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch |
57 |
similarity index 94% |
58 |
rename from gnome-base/gnome-menus/files/gnome-menus-2.18.3-ignore_kde_standalone.patch |
59 |
rename to gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch |
60 |
index 895f5f2..5f5f8b2 100644 |
61 |
--- a/gnome-base/gnome-menus/files/gnome-menus-2.18.3-ignore_kde_standalone.patch |
62 |
+++ b/gnome-base/gnome-menus/files/gnome-menus-3.0.0-ignore_kde_standalone.patch |
63 |
@@ -2,8 +2,8 @@ |
64 |
+++ layout/applications.menu 2007-09-21 17:55:38.000000000 +0300 |
65 |
@@ -146,6 +146,19 @@ |
66 |
<Not><Category>Core</Category></Not> |
67 |
- <Not><Category>Settings</Category></Not> |
68 |
<Not><Category>Screensaver</Category></Not> |
69 |
+ <Not><Category>X-GNOME-Settings-Panel</Category></Not> |
70 |
+ <Not><Category>X-KDE-settings-accessibility</Category></Not> |
71 |
+ <Not><Category>X-KDE-settings-components</Category></Not> |
72 |
+ <Not><Category>X-KDE-settings-desktop</Category></Not> |
73 |
|
74 |
diff --git a/gnome-base/gnome-menus/gnome-menus-2.91.91.ebuild b/gnome-base/gnome-menus/gnome-menus-3.0.0.ebuild |
75 |
similarity index 97% |
76 |
rename from gnome-base/gnome-menus/gnome-menus-2.91.91.ebuild |
77 |
rename to gnome-base/gnome-menus/gnome-menus-3.0.0.ebuild |
78 |
index 39ed608..1abebc3 100644 |
79 |
--- a/gnome-base/gnome-menus/gnome-menus-2.91.91.ebuild |
80 |
+++ b/gnome-base/gnome-menus/gnome-menus-3.0.0.ebuild |
81 |
@@ -48,7 +48,7 @@ src_prepare() { |
82 |
gnome2_src_prepare |
83 |
|
84 |
# Don't show KDE standalone settings desktop files in GNOME others menu |
85 |
- epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch" |
86 |
+ epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch" |
87 |
|
88 |
# disable pyc compiling |
89 |
mv py-compile py-compile-disabled |
90 |
|
91 |
diff --git a/gnome-base/gnome/gnome-2.91.90.ebuild b/gnome-base/gnome/gnome-2.91.90.ebuild |
92 |
index 887b092..1575e89 100644 |
93 |
--- a/gnome-base/gnome/gnome-2.91.90.ebuild |
94 |
+++ b/gnome-base/gnome/gnome-2.91.90.ebuild |
95 |
@@ -20,10 +20,10 @@ S=${WORKDIR} |
96 |
|
97 |
# TODO: check a11y and re-enable USE-flag |
98 |
RDEPEND=" |
99 |
- >=dev-libs/glib-2.28.3:2 |
100 |
+ >=dev-libs/glib-2.28.4:2 |
101 |
>=media-libs/clutter-1.6.10:1.0 |
102 |
- >=x11-libs/gtk+-3.0.4:3[cups?] |
103 |
- >=x11-libs/gdk-pixbuf-2.23.1:2 |
104 |
+ >=x11-libs/gtk+-3.0.8:3[cups?] |
105 |
+ >=x11-libs/gdk-pixbuf-2.23.2:2 |
106 |
>=dev-libs/atk-1.33.6 |
107 |
>=x11-libs/pango-1.28.3 |
108 |
>=x11-libs/libwnck-${PV}:3 |
109 |
@@ -44,7 +44,7 @@ RDEPEND=" |
110 |
>=x11-wm/mutter-${PV} |
111 |
>=gnome-base/gnome-shell-${PV} |
112 |
|
113 |
- >=x11-wm/metacity-2.30.3-r1 |
114 |
+ >=x11-wm/metacity-2.34 |
115 |
>=gnome-base/gnome-panel-${PV} |
116 |
>=gnome-base/gnome-menus-${PV} |
117 |
|
118 |
@@ -54,34 +54,34 @@ RDEPEND=" |
119 |
>=gnome-base/gnome-keyring-${PV} |
120 |
>=gnome-base/libgnome-keyring-${PV} |
121 |
|
122 |
- >=gnome-base/gvfs-1.7 |
123 |
+ >=gnome-base/gvfs-1.8 |
124 |
>=gnome-base/nautilus-${PV} |
125 |
|
126 |
>=app-arch/file-roller-${PV} |
127 |
>=app-crypt/seahorse-${PV} |
128 |
- >=app-editors/gedit-2.91.10 |
129 |
+ >=app-editors/gedit-${PV} |
130 |
>=app-text/evince-${PV} |
131 |
>=gnome-extra/gcalctool-5.91.90 |
132 |
>=gnome-extra/gconf-editor-${PV} |
133 |
>=gnome-extra/gnome-games-${PV} |
134 |
>=gnome-extra/gnome-system-monitor-${PV} |
135 |
>=gnome-extra/gnome-utils-${PV} |
136 |
- >=gnome-extra/gucharmap-2.32.1 |
137 |
+ >=gnome-extra/gucharmap-${PV} |
138 |
>=media-gfx/eog-${PV} |
139 |
>=media-sound/sound-juicer-2.32.0 |
140 |
>=media-video/cheese-${PV} |
141 |
>=media-video/totem-${PV} |
142 |
- >=net-analyzer/gnome-nettool-2.91.5 |
143 |
+ >=net-analyzer/gnome-nettool-${PV} |
144 |
>=net-misc/vinagre-${PV} |
145 |
- >=net-misc/vino-2.99.4 |
146 |
+ >=net-misc/vino-${PV} |
147 |
>=www-client/epiphany-${PV} |
148 |
- >=x11-terms/gnome-terminal-2.33.1 |
149 |
+ >=x11-terms/gnome-terminal-${PV} |
150 |
|
151 |
>=mail-client/evolution-${PV} |
152 |
>=gnome-extra/evolution-data-server-${PV} |
153 |
|
154 |
>=x11-themes/gtk-engines-2.20.2:2 |
155 |
- >=x11-themes/gnome-backgrounds-2.32.0 |
156 |
+ >=x11-themes/gnome-backgrounds-${PV} |
157 |
>=x11-themes/gnome-icon-theme-${PV} |
158 |
>=x11-themes/gnome-icon-theme-symbolic-${PV} |
159 |
>=x11-themes/gnome-themes-standard-${PV} |
160 |
@@ -101,10 +101,6 @@ PDEPEND=">=gnome-base/gvfs-1.6.6[gdu]" |
161 |
|
162 |
# gnome-cups-manager isn't needed, printing support is in gnome-control-center |
163 |
|
164 |
-# Don't work at all: |
165 |
-# cheese-2.91.91.1 |
166 |
-# gucharmap-2.33.2 |
167 |
-# |
168 |
# Not ported: |
169 |
# bug-buddy-2.32 |
170 |
# sound-juicer-2.32 |