New version for GNOME 2.26. Translation updates.

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

3 files changed, 32 insertions, 21 deletions

diff --git a/gnome-base/gnome-menus/ChangeLog b/gnome-base/gnome-menus/ChangeLog
index d9acc89e2606..9750ff112b5d 100644
--- a/gnome-base/gnome-menus/ChangeLog
+++ b/gnome-base/gnome-menus/ChangeLog
@@ -1,6 +1,13 @@
 # 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.126 2009/04/27 14:04:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/ChangeLog,v 1.127 2009/05/10 18:43:15 eva Exp $
+
+*gnome-menus-2.26.1 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  gnome-menus-2.20.3.ebuild, -gnome-menus-2.22.2.ebuild,
+  +gnome-menus-2.26.1.ebuild:
+  New version for GNOME 2.26. Translation updates.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> gnome-menus-2.24.2:
   Stable for HPPA (bug #260063).
diff --git a/gnome-base/gnome-menus/gnome-menus-2.20.3.ebuild b/gnome-base/gnome-menus/gnome-menus-2.20.3.ebuild
index a5406465de28..a0601b070d81 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.20.3.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.20.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.20.3.ebuild,v 1.10 2008/05/29 16:59:45 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.20.3.ebuild,v 1.11 2009/05/10 18:43:15 eva Exp $
 
 inherit eutils gnome2 python multilib linux-info
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="arm sh"
 IUSE="debug python kernel_linux"
 
 RDEPEND=">=dev-libs/glib-2.6
diff --git a/gnome-base/gnome-menus/gnome-menus-2.22.2.ebuild b/gnome-base/gnome-menus/gnome-menus-2.26.1.ebuild
index e4ad067c3fbe..1c3a9e79067f 100644
--- a/gnome-base/gnome-menus/gnome-menus-2.22.2.ebuild
+++ b/gnome-base/gnome-menus/gnome-menus-2.26.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.22.2.ebuild,v 1.8 2008/11/13 19:13:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-menus/gnome-menus-2.26.1.ebuild,v 1.1 2009/05/10 18:43:15 eva Exp $
 
 inherit eutils gnome2 python
 
@@ -9,23 +9,28 @@ HOMEPAGE="http://www.gnome.org"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug python"
 
-RDEPEND=">=dev-libs/glib-2.15.2
-		 python? (
-					>=dev-lang/python-2.4.4-r5
-					dev-python/pygtk
-				 )"
+RDEPEND=">=dev-libs/glib-2.18.0
+	python? (
+		>=dev-lang/python-2.4.4-r5
+		dev-python/pygtk )"
 DEPEND="${RDEPEND}
-		  sys-devel/gettext
-		>=dev-util/pkgconfig-0.9
-		>=dev-util/intltool-0.35"
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README"
 
 pkg_setup() {
-	G2CONF="${G2CONF} $(use_enable debug) $(use_enable python)"
+	# Do NOT compile with --disable-debug/--enable-debug=no
+	# FIXME: fix autofoo and report upstream
+	if use debug ; then
+		G2CONF="${G2CONF} --enable-debug=yes"
+	fi
+
+	G2CONF="${G2CONF} $(use_enable python) --disable-static"
 }
 
 src_unpack() {
@@ -35,7 +40,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${PN}-2.18.3-ignore_kde_standalone.patch"
 
 	# disable pyc compiling
-	mv py-compile py-compile.orig
+	mv py-compile py-compile-disabled
 	ln -s $(type -P true) py-compile
 }
 
@@ -43,13 +48,12 @@ pkg_postinst() {
 	gnome2_pkg_postinst
 	if use python; then
 		python_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/GMenuSimpleEditor
+		python_need_rebuild
+		python_mod_optimize $(python_get_sitedir)/GMenuSimpleEditor
 	fi
 }
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	if use python; then
-		python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/GMenuSimpleEditor
-	fi
+	python_mod_cleanup $(python_get_sitedir)/GMenuSimpleEditor
 }