summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2009-10-29 21:44:23 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2009-10-29 21:44:23 +0000
commit543f271a5c267131548bbe525bf8de80b6e341dd (patch)
tree8b047be0d03e57588e539467f8f791ab327fa2e8 /gnome-base
parentNew version for GNOME 2.28. (diff)
downloadgentoo-2-543f271a5c267131548bbe525bf8de80b6e341dd.tar.gz
gentoo-2-543f271a5c267131548bbe525bf8de80b6e341dd.tar.bz2
gentoo-2-543f271a5c267131548bbe525bf8de80b6e341dd.zip
New version for GNOME 2.28. Clean up old revision.
(Portage version: 2.2_rc46/cvs/Linux x86_64)
Diffstat (limited to 'gnome-base')
-rw-r--r--gnome-base/gnome-menus/ChangeLog8
-rw-r--r--gnome-base/gnome-menus/gnome-menus-2.28.0.1.ebuild (renamed from gnome-base/gnome-menus/gnome-menus-2.26.1.ebuild)26
2 files changed, 29 insertions, 5 deletions
diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index 86168d61b65b..4c576b44eb37 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for gnome-base/gnome-menus
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.133 2009/10/24 16:19:16 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.134 2009/10/29 21:44:23 eva Exp $
+
+*gnome-menus-2.28.0.1 (29 Oct 2009)
+
+ 29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org>
+ -gnome-menus-2.26.1.ebuild, +gnome-menus-2.28.0.1.ebuild:
+ New version for GNOME 2.28. Clean up old revision.
24 Oct 2009; nixnut <nixnut@gentoo.org> gnome-menus-2.26.2.ebuild:
ppc stable #281427
diff --git a/gnome-base/gnome-menus/gnome-menus-2.26.1.ebuild b/gnome-base/gnome-menus/gnome-menus-2.28.0.1.ebuild
index 0cbc46dc7c3c..6483deff6999 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.26.1.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.28.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.26.1.ebuild,v 1.2 2009/05/10 18:51:37 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.28.0.1.ebuild,v 1.1 2009/10/29 21:44:23 eva Exp $
inherit eutils gnome2 python
@@ -25,9 +25,9 @@ DOCS="AUTHORS ChangeLog HACKING NEWS README"
pkg_setup() {
# Do NOT compile with --disable-debug/--enable-debug=no
- # FIXME: fix autofoo and report upstream
- if use debug ; then
- G2CONF="${G2CONF} --enable-debug=yes"
+ # It disables api usage checks
+ if ! use debug ; then
+ G2CONF="${G2CONF} --enable-debug=minimum"
fi
G2CONF="${G2CONF} $(use_enable python) --disable-static"
@@ -44,6 +44,19 @@ src_unpack() {
ln -s $(type -P true) py-compile
}
+src_install() {
+ gnome2_src_install
+
+ find "${D}" -name "*.la" -delete || die "remove of la files failed"
+
+ # Prefix menu, bug #256614
+ mv "${D}"/etc/xdg/menus/applications.menu \
+ "${D}"/etc/xdg/menus/gnome-applications.menu || die "menu move failed"
+
+ exeinto /etc/X11/xinit/xinitrc.d/
+ doexe "${FILESDIR}/10-xdg-menu-gnome" || die "doexe failed"
+}
+
pkg_postinst() {
gnome2_pkg_postinst
if use python; then
@@ -51,6 +64,11 @@ pkg_postinst() {
python_need_rebuild
python_mod_optimize $(python_get_sitedir)/GMenuSimpleEditor
fi
+
+ ewarn "Due to bug #256614, you might loose icons in applications menus."
+ ewarn "If you use a login manager, please re-select your session."
+ ewarn "If you use startx and have no .xinitrc, just export XSESSION=Gnome."
+ ewarn "If you use startx and have .xinitrc, export XDG_MENU_PREFIX=gnome-."
}
pkg_postrm() {