Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gnome-menus: gnome-menus-2.30.5-r1.ebuild ChangeLog gnome-menus-3.4.2-r1.ebuild gnome-menus-3.0.1-r2.ebuild gnome-menus-3.4.0.ebuild
Date: Sat, 24 Nov 2012 23:43:50
Message-Id: 20121124234339.C1E3620C65@flycatcher.gentoo.org
1 tetromino 12/11/24 23:43:39
2
3 Modified: ChangeLog
4 Added: gnome-menus-2.30.5-r1.ebuild
5 gnome-menus-3.4.2-r1.ebuild
6 gnome-menus-3.0.1-r2.ebuild
7 Removed: gnome-menus-3.4.0.ebuild
8 Log:
9 Correctly load custom menus from 'applications-merged' directories when XDG_MENU_PREFIX is set.
10
11 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
12
13 Revision Changes Path
14 1.180 gnome-base/gnome-menus/ChangeLog
15
16 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-menus/ChangeLog?rev=1.180&view=markup
17 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-menus/ChangeLog?rev=1.180&content-type=text/plain
18 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-menus/ChangeLog?r1=1.179&r2=1.180
19
20 Index: ChangeLog
21 ===================================================================
22 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v
23 retrieving revision 1.179
24 retrieving revision 1.180
25 diff -u -r1.179 -r1.180
26 --- ChangeLog 20 May 2012 09:47:16 -0000 1.179
27 +++ ChangeLog 24 Nov 2012 23:43:39 -0000 1.180
28 @@ -1,6 +1,18 @@
29 # ChangeLog for gnome-base/gnome-menus
30 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
31 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.179 2012/05/20 09:47:16 tetromino Exp $
32 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.180 2012/11/24 23:43:39 tetromino Exp $
33 +
34 +*gnome-menus-3.4.2-r1 (24 Nov 2012)
35 +*gnome-menus-3.0.1-r2 (24 Nov 2012)
36 +*gnome-menus-2.30.5-r1 (24 Nov 2012)
37 +
38 + 24 Nov 2012; Alexandre Rostovtsev <tetromino@g.o>
39 + +gnome-menus-2.30.5-r1.ebuild, +gnome-menus-3.0.1-r2.ebuild,
40 + +files/gnome-menus-3.0.1-applications-merged.patch,
41 + -gnome-menus-3.4.0.ebuild, +gnome-menus-3.4.2-r1.ebuild,
42 + +files/gnome-menus-3.6.1-applications-merged.patch:
43 + Correctly load custom menus from 'applications-merged' directories when
44 + XDG_MENU_PREFIX is set.
45
46 *gnome-menus-3.4.2 (20 May 2012)
47
48
49
50
51 1.1 gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild
52
53 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild?rev=1.1&view=markup
54 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild?rev=1.1&content-type=text/plain
55
56 Index: gnome-menus-2.30.5-r1.ebuild
57 ===================================================================
58 # Copyright 1999-2012 Gentoo Foundation
59 # Distributed under the terms of the GNU General Public License v2
60 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.30.5-r1.ebuild,v 1.1 2012/11/24 23:43:39 tetromino Exp $
61
62 EAPI="3"
63 GCONF_DEBUG="no"
64
65 PYTHON_DEPEND="python? 2:2.5"
66 SUPPORT_PYTHON_ABIS="1"
67 RESTRICT_PYTHON_ABIS="3.*"
68
69 inherit eutils gnome2 python
70
71 DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
72 HOMEPAGE="http://www.gnome.org"
73
74 LICENSE="GPL-2 LGPL-2"
75 SLOT="0"
76 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
77 IUSE="debug +introspection python"
78
79 RDEPEND=">=dev-libs/glib-2.18
80 python? ( dev-python/pygtk )
81 introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
82 DEPEND="${RDEPEND}
83 sys-devel/gettext
84 virtual/pkgconfig
85 >=dev-util/intltool-0.40"
86
87 pkg_setup() {
88 DOCS="AUTHORS ChangeLog HACKING NEWS README"
89
90 # Do NOT compile with --disable-debug/--enable-debug=no
91 # It disables api usage checks
92 if ! use debug ; then
93 G2CONF="${G2CONF} --enable-debug=minimum"
94 fi
95
96 G2CONF="${G2CONF}
97 --disable-static
98 $(use_enable python)
99 $(use_enable introspection)"
100 }
101
102 src_prepare() {
103 gnome2_src_prepare
104
105 # Don't show KDE standalone settings desktop files in GNOME others menu
106 epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch"
107 # https://bugzilla.gnome.org/show_bug.cgi?id=688972
108 epatch "${FILESDIR}/${PN}-3.0.1-applications-merged.patch"
109
110 # disable pyc compiling
111 python_clean_py-compile_files
112
113 python_copy_sources
114 }
115
116 src_configure() {
117 python_execute_function -s gnome2_src_configure
118 }
119
120 src_compile() {
121 python_execute_function -s gnome2_src_compile
122 }
123
124 src_test() {
125 python_execute_function -s -d
126 }
127
128 src_install() {
129 python_execute_function -s gnome2_src_install
130 python_clean_installation_image
131
132 # Prefix menu, bug #256614
133 mv "${ED}"/etc/xdg/menus/applications.menu \
134 "${ED}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
135
136 exeinto /etc/X11/xinit/xinitrc.d/
137 doexe "${FILESDIR}/10-xdg-menu-gnome" || die "doexe failed"
138
139 use python && python_convert_shebangs -r 2 "${ED}"usr/bin/gmenu-simple-editor
140 }
141
142 pkg_postinst() {
143 gnome2_pkg_postinst
144 if use python; then
145 python_mod_optimize GMenuSimpleEditor
146 fi
147
148 ewarn "Due to bug #256614, you might lose icons in applications menus."
149 ewarn "If you use a login manager, please re-select your session."
150 ewarn "If you use startx and have no .xinitrc, just export XSESSION=Gnome."
151 ewarn "If you use startx and have .xinitrc, export XDG_MENU_PREFIX=gnome-."
152 }
153
154 pkg_postrm() {
155 gnome2_pkg_postrm
156 if use python; then
157 python_mod_cleanup GMenuSimpleEditor
158 fi
159 }
160
161
162
163 1.1 gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild
164
165 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild?rev=1.1&view=markup
166 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild?rev=1.1&content-type=text/plain
167
168 Index: gnome-menus-3.4.2-r1.ebuild
169 ===================================================================
170 # Copyright 1999-2012 Gentoo Foundation
171 # Distributed under the terms of the GNU General Public License v2
172 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.4.2-r1.ebuild,v 1.1 2012/11/24 23:43:39 tetromino Exp $
173
174 EAPI="4"
175 GCONF_DEBUG="no"
176 GNOME2_LA_PUNT="yes"
177
178 PYTHON_DEPEND="2:2.5"
179 SUPPORT_PYTHON_ABIS="1"
180 RESTRICT_PYTHON_ABIS="3.*"
181
182 inherit eutils gnome2 python
183
184 DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
185 HOMEPAGE="http://www.gnome.org"
186
187 LICENSE="GPL-2 LGPL-2"
188 SLOT="3"
189 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
190
191 # +python for gmenu-simple-editor
192 IUSE="debug +introspection +python test"
193
194 COMMON_DEPEND=">=dev-libs/glib-2.29.15:2
195 introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
196 python? (
197 >=dev-libs/gobject-introspection-0.9.5
198 dev-python/pygobject:3
199 x11-libs/gdk-pixbuf:2[introspection]
200 x11-libs/gtk+:3[introspection] )"
201 # Older versions of slot 0 install the menu editor and the desktop directories
202 RDEPEND="${COMMON_DEPEND}
203 !<gnome-base/gnome-menus-3.0.1-r1:0"
204 DEPEND="${COMMON_DEPEND}
205 sys-devel/gettext
206 virtual/pkgconfig
207 >=dev-util/intltool-0.40
208 test? ( dev-libs/gjs )"
209
210 pkg_setup() {
211 use python && python_pkg_setup
212 DOCS="AUTHORS ChangeLog HACKING NEWS README"
213
214 # Do NOT compile with --disable-debug/--enable-debug=no
215 # It disables api usage checks
216 if ! use debug ; then
217 G2CONF="${G2CONF} --enable-debug=minimum"
218 fi
219
220 if use python || use introspection; then
221 use introspection || ewarn "Enabling introspection due to USE=python"
222 G2CONF="${G2CONF} --enable-introspection"
223 else
224 G2CONF="${G2CONF} --disable-introspection"
225 fi
226
227 G2CONF="${G2CONF} --disable-static"
228 }
229
230 src_prepare() {
231 gnome2_src_prepare
232
233 # Don't show KDE standalone settings desktop files in GNOME others menu
234 epatch "${FILESDIR}/${PN}-3.0.0-ignore_kde_standalone.patch"
235
236 # https://bugzilla.gnome.org/show_bug.cgi?id=688972
237 epatch "${FILESDIR}/${PN}-3.6.1-applications-merged.patch"
238
239 if use python; then
240 python_clean_py-compile_files
241 python_copy_sources
242 else
243 sed -e 's/\(SUBDIRS.*\) simple-editor/\1/' \
244 -i Makefile.* || die "sed failed"
245 fi
246 }
247
248 src_configure() {
249 if use python; then
250 python_execute_function -s gnome2_src_configure
251 else
252 gnome2_src_configure
253 fi
254 }
255
256 src_compile() {
257 if use python; then
258 python_execute_function -s gnome2_src_compile
259 else
260 gnome2_src_compile
261 fi
262 }
263
264 src_test() {
265 if use python; then
266 python_execute_function -s -d
267 else
268 default
269 fi
270 }
271
272 src_install() {
273 if use python; then
274 python_execute_function -s gnome2_src_install
275 python_clean_installation_image
276 else
277 gnome2_src_install
278 fi
279
280 # Prefix menu, bug #256614
281 mv "${ED}"/etc/xdg/menus/applications.menu \
282 "${ED}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
283
284 exeinto /etc/X11/xinit/xinitrc.d/
285 newexe "${FILESDIR}/10-xdg-menu-gnome-r1" 10-xdg-menu-gnome
286 }
287
288 pkg_postinst() {
289 gnome2_pkg_postinst
290 if use python; then
291 python_mod_optimize GMenuSimpleEditor
292 fi
293 }
294
295 pkg_postrm() {
296 gnome2_pkg_postrm
297 if use python; then
298 python_mod_cleanup GMenuSimpleEditor
299 fi
300 }
301
302
303
304 1.1 gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild
305
306 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild?rev=1.1&view=markup
307 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild?rev=1.1&content-type=text/plain
308
309 Index: gnome-menus-3.0.1-r2.ebuild
310 ===================================================================
311 # Copyright 1999-2012 Gentoo Foundation
312 # Distributed under the terms of the GNU General Public License v2
313 # $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-3.0.1-r2.ebuild,v 1.1 2012/11/24 23:43:39 tetromino Exp $
314
315 EAPI="4"
316 GCONF_DEBUG="no"
317 GNOME2_LA_PUNT="yes"
318 GNOME_TARBALL_SUFFIX="bz2"
319
320 PYTHON_DEPEND="python? 2:2.5"
321 SUPPORT_PYTHON_ABIS="1"
322 RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
323
324 inherit autotools eutils gnome2 python
325
326 DESCRIPTION="The GNOME menu system, implementing the F.D.O cross-desktop spec"
327 HOMEPAGE="http://www.gnome.org"
328
329 LICENSE="GPL-2 LGPL-2"
330 SLOT="0"
331 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
332
333 IUSE="debug python +introspection"
334
335 RDEPEND=">=dev-libs/glib-2.18
336 introspection? ( >=dev-libs/gobject-introspection-0.9.5 )"
337 DEPEND="${RDEPEND}
338 sys-devel/gettext
339 virtual/pkgconfig
340 >=dev-util/intltool-0.40
341
342 gnome-base/gnome-common
343 dev-libs/gobject-introspection-common"
344 # eautoreconf requires gnome-common
345 # The actual menus are provided by slot 3
346 PDEPEND="gnome-base/gnome-menus:3"
347
348 pkg_setup() {
349 DOCS="AUTHORS ChangeLog HACKING NEWS README"
350
351 # Do NOT compile with --disable-debug/--enable-debug=no
352 # It disables api usage checks
353 if ! use debug ; then
354 G2CONF="${G2CONF} --enable-debug=minimum"
355 fi
356
357 G2CONF="${G2CONF}
358 --disable-static
359 $(use_enable python)
360 $(use_enable introspection)"
361
362 python_pkg_setup
363 }
364
365 src_prepare() {
366 # Only build the library (everything else is coming from slot 3)
367 epatch "${FILESDIR}/${PN}-3.0.2-library-only.patch"
368 # https://bugzilla.gnome.org/show_bug.cgi?id=688972
369 epatch "${FILESDIR}/${PN}-3.0.1-applications-merged.patch"
370 eautoreconf
371 gnome2_src_prepare
372
373 # disable pyc compiling
374 python_clean_py-compile_files
375
376 python_copy_sources
377 }
378
379 src_configure() {
380 python_execute_function -s gnome2_src_configure
381 }
382
383 src_compile() {
384 python_execute_function -s gnome2_src_compile
385 }
386
387 src_test() {
388 python_execute_function -s -d
389 }
390
391 src_install() {
392 python_execute_function -s gnome2_src_install
393 python_clean_installation_image
394 }
395
396 pkg_postinst() {
397 gnome2_pkg_postinst
398 }
399
400 pkg_postrm() {
401 gnome2_pkg_postrm
402 }
Report Message
Find on MARC Find on Google Groups