Choose python 2.5 over 2.4, if available; bug #179019

(Portage version: 2.1.2.9)

4 files changed, 60 insertions, 1 deletions

diff --git a/x11-misc/alacarte/ChangeLog b/x11-misc/alacarte/ChangeLog
index 6f8e640ec558..c2d3f1fe198d 100644
--- a/x11-misc/alacarte/ChangeLog
+++ b/x11-misc/alacarte/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/alacarte
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.30 2007/06/02 02:50:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.31 2007/06/11 17:40:42 dang Exp $
+
+*alacarte-0.11.3-r1 (11 Jun 2007)
+
+  11 Jun 2007; Daniel Gryniewicz <dang@gentoo.org>
+  +files/alacarte-0.11.3-python-2.5.patch, +alacarte-0.11.3-r1.ebuild:
+  Choose python 2.5 over 2.4, if available; bug #179019
 
   02 Jun 2007; Brent Baude <ranger@gentoo.org> alacarte-0.10.2.ebuild:
   Marking alacarte-0.10.2 ppc stable for bug #171107
diff --git a/x11-misc/alacarte/alacarte-0.11.3-r1.ebuild b/x11-misc/alacarte/alacarte-0.11.3-r1.ebuild
new file mode 100644
index 000000000000..3559aa47e946
--- /dev/null
+++ b/x11-misc/alacarte/alacarte-0.11.3-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.11.3-r1.ebuild,v 1.1 2007/06/11 17:40:42 dang Exp $
+
+inherit gnome2 python eutils
+
+DESCRIPTION="Simple GNOME menu editor"
+HOMEPAGE="http://www.realistanew.com/projects/alacarte"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+SLOT=0
+
+RDEPEND=">=dev-lang/python-2.4
+		 >=dev-python/pygtk-2.8
+		 >=gnome-base/gnome-menus-2.18"
+DEPEND="${RDEPEND}
+		  sys-devel/gettext
+		>=dev-util/intltool-0.35
+		>=dev-util/pkgconfig-0.19"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	if ! built_with_use gnome-base/gnome-menus python ; then
+		eerror "You must emerge gnome-base/gnome-menus with the python USE flag"
+		die "alacarte needs python support in gnome-base/gnome-menus"
+	fi
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch "${FILESDIR}"/${P}-python-2.5.patch
+
+	eautoreconf
+}
diff --git a/x11-misc/alacarte/files/alacarte-0.11.3-python-2.5.patch b/x11-misc/alacarte/files/alacarte-0.11.3-python-2.5.patch
new file mode 100644
index 000000000000..62308643279c
--- /dev/null
+++ b/x11-misc/alacarte/files/alacarte-0.11.3-python-2.5.patch
@@ -0,0 +1,12 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN alacarte-0.11.3.orig/configure.ac alacarte-0.11.3/configure.ac
+--- alacarte-0.11.3.orig/configure.ac	2007-02-12 16:16:54.000000000 -0500
++++ alacarte-0.11.3/configure.ac	2007-06-11 13:34:23.000000000 -0400
+@@ -19,7 +19,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GE
+ 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.5, 2.5.0, 2.4, 2.4.0)
+ 
+ PKG_CHECK_MODULES(ALACARTE, libgnome-menu >= 2.15)
+ 
diff --git a/x11-misc/alacarte/files/digest-alacarte-0.11.3-r1 b/x11-misc/alacarte/files/digest-alacarte-0.11.3-r1
new file mode 100644
index 000000000000..2cc90d00448d
--- /dev/null
+++ b/x11-misc/alacarte/files/digest-alacarte-0.11.3-r1
@@ -0,0 +1,3 @@
+MD5 5ca9f07e839f64b7fcefc84cfb05aa17 alacarte-0.11.3.tar.bz2 217547
+RMD160 5130bd619f049d1abcb93de6f3c706dfa688163a alacarte-0.11.3.tar.bz2 217547
+SHA256 9983e56cd43ee97e6f294145ea4420f7a8aa3f76284928f16e590b7d9b5039c0 alacarte-0.11.3.tar.bz2 217547