summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gryniewicz <dang@gentoo.org>2008-07-21 14:50:59 +0000
committerDaniel Gryniewicz <dang@gentoo.org>2008-07-21 14:50:59 +0000
commit99153ca1ec393609e15e002b3c0890d52082e719 (patch)
tree51fd19b755780b8d614a761e8ae9902bce13535e /x11-misc
parentadd the missing inherits (diff)
downloadgentoo-2-99153ca1ec393609e15e002b3c0890d52082e719.tar.gz
gentoo-2-99153ca1ec393609e15e002b3c0890d52082e719.tar.bz2
gentoo-2-99153ca1ec393609e15e002b3c0890d52082e719.zip
Add a python 2.6 compat patch; bug #232378
(Portage version: 2.2_rc1/cvs/Linux 2.6.26-gentoo x86_64)
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/alacarte/ChangeLog6
-rw-r--r--x11-misc/alacarte/alacarte-0.11.5.ebuild4
-rw-r--r--x11-misc/alacarte/files/alacarte-0.11.5-python-2.6.patch12
3 files changed, 19 insertions, 3 deletions
diff --git a/x11-misc/alacarte/ChangeLog b/x11-misc/alacarte/ChangeLog
index f6ab700ad8a4..5171b3768d9b 100644
--- a/x11-misc/alacarte/ChangeLog
+++ b/x11-misc/alacarte/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/alacarte
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.52 2008/03/22 03:46:37 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.53 2008/07/21 14:50:58 dang Exp $
+
+ 21 Jul 2008; Daniel Gryniewicz <dang@gentoo.org>
+ +files/alacarte-0.11.5-python-2.6.patch, alacarte-0.11.5.ebuild:
+ Add a python 2.6 compat patch; bug #232378
22 Mar 2008; Daniel Gryniewicz <dang@gentoo.org> alacarte-0.11.4.ebuild:
Marked stable on amd64 for bug #212986
diff --git a/x11-misc/alacarte/alacarte-0.11.5.ebuild b/x11-misc/alacarte/alacarte-0.11.5.ebuild
index ff88d2773766..12e4ce5419c4 100644
--- a/x11-misc/alacarte/alacarte-0.11.5.ebuild
+++ b/x11-misc/alacarte/alacarte-0.11.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.11.5.ebuild,v 1.1 2008/03/10 23:55:43 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.11.5.ebuild,v 1.2 2008/07/21 14:50:58 dang Exp $
inherit gnome2 python eutils autotools
@@ -33,7 +33,7 @@ pkg_setup() {
src_unpack() {
gnome2_src_unpack
- epatch "${FILESDIR}"/${PN}-0.11.3-python-2.5.patch
+ epatch "${FILESDIR}"/${PN}-0.11.5-python-2.6.patch
# disable pyc compiling
mv py-compile py-compile.orig
diff --git a/x11-misc/alacarte/files/alacarte-0.11.5-python-2.6.patch b/x11-misc/alacarte/files/alacarte-0.11.5-python-2.6.patch
new file mode 100644
index 000000000000..5eac67b042a2
--- /dev/null
+++ b/x11-misc/alacarte/files/alacarte-0.11.5-python-2.6.patch
@@ -0,0 +1,12 @@
+diff -ur alacarte-0.11.5.orig/configure.ac alacarte-0.11.5/configure.ac
+--- alacarte-0.11.5.orig/configure.ac 2008-07-20 01:18:37.000000000 +0200
++++ alacarte-0.11.5/configure.ac 2008-07-20 01:19:19.000000000 +0200
+@@ -19,7 +19,7 @@
+ AM_GLIB_GNU_GETTEXT
+ IT_PROG_INTLTOOL([0.35.0])
+
+-AM_PATH_PYTHON_VERSION(2.4, 2.4.0, 2.5, 2.5.0)
++AM_PATH_PYTHON_VERSION(2.6, 2.6.0, 2.5, 2.5.0, 2.4, 2.4.0)
+
+ PKG_CHECK_MODULES(ALACARTE, libgnome-menu >= 2.15)
+