New version for GNOME 2.28. Clean up old revision.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

3 files changed, 42 insertions, 8 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/Manifest b/gnome-base/gnome-menus/Manifest
index a9f8985515ff..0ed69e9e3edd 100644
--- a/gnome-base/gnome-menus/Manifest
+++ b/gnome-base/gnome-menus/Manifest
@@ -1,12 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 10-xdg-menu-gnome 115 RMD160 3e235da94ec1e7f97be144358f105d24ca8144e8 SHA1 f4d0e6dff08acd5b06531973f1f68b5f4a640240 SHA256 d6a4938ed879f908e93d0c917db4c99321cb6fa126b79fe1e878ff2ddade963b
 AUX gnome-menus-2.18.3-ignore_kde_standalone.patch 1208 RMD160 302201bbc2a9b4d6a673904d11ce60390268b4b5 SHA1 58880f2807bc6a11a724a15c4f626f7385e650be SHA256 6b13ae1708b5d4753f38e57e161e58bd31d0b7a9de8b78145052388b150eedb8
 DIST gnome-menus-2.20.3.tar.bz2 446966 RMD160 eb1ff84b161d8354b1ee30364cefec91a43ff57d SHA1 25c8161f1bb4ecd4a868cbf1b59edcfb06adaa51 SHA256 2ce7a6aabed338ca3f65685e7e46149cdacc80fab0a8701c2d827fcb950a9897
 DIST gnome-menus-2.24.2.tar.bz2 453261 RMD160 f377b2ea6f94a4ecd159e0a095c8a0ea3139ed37 SHA1 8769c37ca8a7045d9b79b02fd3fa3f89442b4271 SHA256 c28cc72e69164533e4a64270486d18b58184920ec4f4b288758758a373d45d3c
-DIST gnome-menus-2.26.1.tar.bz2 460916 RMD160 53e37a05b67e8e757888b5726e24c58fc7e15ffa SHA1 e89b4cc483821429fba4db3399e35775e5f73d20 SHA256 2a5696f6673aef57a87bb32e36c51a1a940ca701f6222c864b428b356bfe84e4
 DIST gnome-menus-2.26.2.tar.bz2 438945 RMD160 a3b526d908448c52737edecb8f83c6c99e0d72e9 SHA1 ab914a083ef63bacd960349b3dee3dbd3a005a82 SHA256 c9709695819ffaea92d41647adef8c0a6a408aa9a725e4b2987273bb06115a1c
+DIST gnome-menus-2.28.0.1.tar.bz2 461356 RMD160 9d74e64375c4c14c347dbbbe010035ccb3a7b5b0 SHA1 af3469cc2ffd41aad3e3931176e17e9c91e94a29 SHA256 75e73554cd0b0a8356956e76ccb517def5382eafa7bdb14336499cd271570dbc
 EBUILD gnome-menus-2.20.3.ebuild 1483 RMD160 08b88755ce455ff66d87032eb04f7bbe024af6b1 SHA1 bf09bad4d3e913fe65146d2c09592910e02d936a SHA256 e86d99cf81b0b31e9bd05baf662104fdf4b89dc7cddd9675468e44c59c0f0c90
 EBUILD gnome-menus-2.24.2.ebuild 1531 RMD160 73d211c4e9f9f723b424ffdee9c05842e31ad99c SHA1 d1d09a742d5f5c583007f46db8f4d0e7213b9f74 SHA256 5e20e5b98f98ff4921d4ddfdfea0d5c40aebcd33cf529265ae4a0d5f18816de2
-EBUILD gnome-menus-2.26.1.ebuild 1526 RMD160 d8ac63b04ce8824f6488f61ba952b17cf1e0cd87 SHA1 5b2fa7c12494d5896d5d630b31934954425e083d SHA256 a45b1719cf3a28b62d4294eda422edf55e101cc9b6b159cc967d394f5d942ded
 EBUILD gnome-menus-2.26.2.ebuild 2106 RMD160 68f8c3b7145f809d1d3e7e33e3ceaefa0525c8a3 SHA1 1a44e2b46a233a9f76113bc7b4fa3ec444c4f476 SHA256 4157c0937da9e5c69ac1dab1400ec5a9fa0a17ad2e5eb6619c7b52941d2ab445
-MISC ChangeLog 17503 RMD160 5cb050acb095b99ccb0ec9bc8040edeb328b6f3a SHA1 570e9767ba3ec881dc63bdda7419bd7438327c4b SHA256 a6d2a5a3b63f5660bce71c5240aa421b1fdc60615cc2acb814c65283ee6482a9
+EBUILD gnome-menus-2.28.0.1.ebuild 2175 RMD160 6e70f95859433d22a52a29a2a4cf0345b311e5e7 SHA1 9bcbcbbef6ce208bfae74bfbbd09a9187009a445 SHA256 574ed8cb2a5b43b9cf28e5b59aaf050b34b5c9f1bf8d3e662a5cb6d8ce01fbe3
+MISC ChangeLog 17705 RMD160 e26fdf5a85d10a33d408c35e050eb41f7890a986 SHA1 0a7e1fe86ac46383dd1685415bf00e570da1548c SHA256 dca2317de95d4d2171362b51e001e1a22935036cf04e0003b4c2284e0f82a038
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrqDL0ACgkQ1fmVwcYIWAaECACfZHY3dzEJ8jl8gCG/j/YpGIY5
+GaQAoN5RwgY8R378S0lpGPMWcbtV0Oa+
+=sjaq
+-----END PGP SIGNATURE-----
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() {