Version bump for gnome-3.6. Drop old.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

11 files changed, 86 insertions, 485 deletions

diff --git a/x11-misc/alacarte/ChangeLog b/x11-misc/alacarte/ChangeLog
index 5fb15ae50f55..f7075e64b62a 100644
--- a/x11-misc/alacarte/ChangeLog
+++ b/x11-misc/alacarte/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-misc/alacarte
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.116 2012/12/15 20:13:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/ChangeLog,v 1.117 2012/12/19 10:10:21 tetromino Exp $
+
+*alacarte-3.6.1-r1 (19 Dec 2012)
+
+  19 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -files/alacarte-0.11.5-python-2.6.patch, -alacarte-0.13.2-r50.ebuild,
+  -files/alacarte-0.13.2-selection_browse.patch,
+  -files/alacarte-0.13.2-settings_menu.patch, -alacarte-0.13.3.ebuild,
+  -files/alacarte-0.13.3-cursor-changed-selection-none.patch,
+  -files/alacarte-0.13.3-icon-crash.patch,
+  -files/alacarte-0.13.3-no-pygtk-checks.patch, alacarte-0.13.4.ebuild,
+  +alacarte-3.6.1-r1.ebuild:
+  Version bump for gnome-3.6. Drop old.
 
   15 Dec 2012; Sven Wegener <swegener@gentoo.org> alacarte-0.13.2.ebuild,
   alacarte-0.13.2-r50.ebuild:
diff --git a/x11-misc/alacarte/alacarte-0.13.2-r50.ebuild b/x11-misc/alacarte/alacarte-0.13.2-r50.ebuild
deleted file mode 100644
index deb62706436d..000000000000
--- a/x11-misc/alacarte/alacarte-0.13.2-r50.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.13.2-r50.ebuild,v 1.4 2012/12/15 20:13:34 swegener Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"
-
-inherit eutils gnome2 python
-
-DESCRIPTION="Simple GNOME menu editor"
-HOMEPAGE="http://live.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-# gnome-menus-2.91.6 is the earliest version that dropped settings.menu
-# slot 0 of gnome-menus is required due to an API break in slot 3
-common_depends="
-	>=dev-python/pygobject-2.15.1:2
-	>=dev-python/pygtk-2.13:2
-	>=gnome-base/gnome-menus-2.91.6:0[python]"
-
-RDEPEND="${common_depends}
-	>=gnome-base/gnome-panel-2.16"
-
-DEPEND="${common_depends}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	python_pkg_setup
-}
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=647382 and 655113
-	epatch "${FILESDIR}/${PN}-0.13.2-settings_menu.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=652454
-	epatch "${FILESDIR}/${PN}-0.13.2-selection_browse.patch"
-
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-
-	python_copy_sources
-}
-
-src_configure() {
-	configure() {
-		G2CONF="${G2CONF} PYTHON=$(PYTHON -a)"
-		gnome2_src_configure
-	}
-	python_execute_function -s configure
-}
-
-src_compile() {
-	python_execute_function -s gnome2_src_compile
-}
-
-src_test() {
-	python_execute_function -s -d
-}
-
-src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
-	python_convert_shebangs -r 2 "${ED}"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize Alacarte
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup Alacarte
-}
diff --git a/x11-misc/alacarte/alacarte-0.13.3.ebuild b/x11-misc/alacarte/alacarte-0.13.3.ebuild
deleted file mode 100644
index 72fee004482d..000000000000
--- a/x11-misc/alacarte/alacarte-0.13.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.13.3.ebuild,v 1.1 2012/05/24 05:01:18 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-PYTHON_DEPEND="2:2.5"
-PYTHON_USE_WITH="xml"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit autotools eutils gnome2 python
-
-DESCRIPTION="Simple GNOME menu editor"
-HOMEPAGE="http://live.gnome.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-COMMON_DEPEND="dev-python/pygobject:3
-	>=gnome-base/gnome-menus-3.2.0.1:3[introspection]
-"
-# gnome-panel needed for gnome-desktop-item-edit
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gnome-panel
-	x11-libs/gdk-pixbuf:2[introspection]
-	x11-libs/gtk+:3[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	python_pkg_setup
-}
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=676699
-	epatch "${FILESDIR}/${P}-no-pygtk-checks.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=676700
-	epatch "${FILESDIR}/${P}-icon-crash.patch"
-	# https://bugzilla.gnome.org/show_bug.cgi?id=676702
-	epatch "${FILESDIR}/${P}-cursor-changed-selection-none.patch"
-	eautoreconf
-
-	gnome2_src_prepare
-
-	# disable pyc compiling
-	python_clean_py-compile_files
-
-	python_copy_sources
-}
-
-src_configure() {
-	configure() {
-		G2CONF="${G2CONF} PYTHON=$(PYTHON -a)"
-		gnome2_src_configure
-	}
-	python_execute_function -s configure
-}
-
-src_compile() {
-	python_execute_function -s gnome2_src_compile
-}
-
-src_test() {
-	python_execute_function -s -d
-}
-
-src_install() {
-	python_execute_function -s gnome2_src_install
-	python_clean_installation_image
-	python_convert_shebangs -r 2 "${ED}"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_mod_optimize Alacarte
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	python_mod_cleanup Alacarte
-}
diff --git a/x11-misc/alacarte/alacarte-0.13.4.ebuild b/x11-misc/alacarte/alacarte-0.13.4.ebuild
index 5e5d9ca0bc23..cedfba9b0792 100644
--- a/x11-misc/alacarte/alacarte-0.13.4.ebuild
+++ b/x11-misc/alacarte/alacarte-0.13.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.13.4.ebuild,v 1.1 2012/10/28 16:50:07 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-0.13.4.ebuild,v 1.2 2012/12/19 10:10:21 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ inherit gnome2 python
 DESCRIPTION="Simple GNOME menu editor"
 HOMEPAGE="http://live.gnome.org/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE=""
diff --git a/x11-misc/alacarte/alacarte-3.6.1-r1.ebuild b/x11-misc/alacarte/alacarte-3.6.1-r1.ebuild
new file mode 100644
index 000000000000..e9b7e8f73211
--- /dev/null
+++ b/x11-misc/alacarte/alacarte-3.6.1-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/alacarte/alacarte-3.6.1-r1.ebuild,v 1.1 2012/12/19 10:10:21 tetromino Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_REQ_USE="xml"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Simple GNOME menu editor"
+HOMEPAGE="http://live.gnome.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=gnome-base/gnome-menus-3.5.3:3[introspection]
+"
+# gnome-panel needed for gnome-desktop-item-edit
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gnome-panel
+	x11-libs/gdk-pixbuf:2[introspection]
+	x11-libs/gtk+:3[introspection]
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir gnome2_src_compile
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	installing() {
+		gnome2_src_install
+		# Massage shebang to make python_doscript happy
+		sed -e 's:#! '"${PYTHON}:#!/usr/bin/python:" \
+			-i alacarte || die
+			python_doscript alacarte
+		}
+	python_foreach_impl run_in_build_dir installing
+}
+
+run_in_build_dir() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	"$@"
+	popd > /dev/null
+}
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
deleted file mode 100644
index 5eac67b042a2..000000000000
--- a/x11-misc/alacarte/files/alacarte-0.11.5-python-2.6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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)
- 
diff --git a/x11-misc/alacarte/files/alacarte-0.13.2-selection_browse.patch b/x11-misc/alacarte/files/alacarte-0.13.2-selection_browse.patch
deleted file mode 100644
index 4567d8a93b55..000000000000
--- a/x11-misc/alacarte/files/alacarte-0.13.2-selection_browse.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c3271e552b5071d5663a57a6f8d185258a47a704 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gmail.com>
-Date: Sat, 6 Aug 2011 19:16:54 -0400
-Subject: [PATCH] Use gtk.SELECTION_BROWSE mode for menu_tree (bgo 652454)
-
-Use gtk.SELECTION_BROWSE selection mode for menu_tree to ensure that
-one row is always selected and valid iters are returned from the
-selection's get_selected().
-
-Addresses https://bugzilla.gnome.org/show_bug.cgi?id=652454
----
- Alacarte/MainWindow.py |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/Alacarte/MainWindow.py b/Alacarte/MainWindow.py
-index 260efe5..c2b4780 100644
---- a/Alacarte/MainWindow.py
-+++ b/Alacarte/MainWindow.py
-@@ -174,6 +174,7 @@ class MainWindow:
- 		menus.append_column(column)
- 		menus.enable_model_drag_source(gtk.gdk.BUTTON1_MASK, self.dnd_menus, gtk.gdk.ACTION_COPY)
- 		menus.enable_model_drag_dest(self.dnd_both, gtk.gdk.ACTION_PRIVATE)
-+		menus.get_selection().set_mode(gtk.SELECTION_BROWSE)
- 
- 	def setupItemTree(self):
- 		items = self.tree.get_object('item_tree')
--- 
-1.7.6
-
diff --git a/x11-misc/alacarte/files/alacarte-0.13.2-settings_menu.patch b/x11-misc/alacarte/files/alacarte-0.13.2-settings_menu.patch
deleted file mode 100644
index c83b09a8f9bd..000000000000
--- a/x11-misc/alacarte/files/alacarte-0.13.2-settings_menu.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-Index: alacarte-0.13.2/Alacarte/MainWindow.py
-===================================================================
---- alacarte-0.13.2.orig/Alacarte/MainWindow.py	2011-04-16 19:05:15.086723615 +0200
-+++ alacarte-0.13.2/Alacarte/MainWindow.py	2011-04-16 19:05:19.482745099 +0200
-@@ -72,7 +72,6 @@ class MainWindow:
- 	def run(self):
- 		self.loadMenus()
- 		self.editor.applications.tree.add_monitor(self.menuChanged, None)
--		self.editor.settings.tree.add_monitor(self.menuChanged, None)
- 		self.tree.get_object('mainwindow').show_all()
- 		gtk.main()
- 
-Index: alacarte-0.13.2/Alacarte/MenuEditor.py
-===================================================================
---- alacarte-0.13.2.orig/Alacarte/MenuEditor.py	2011-04-16 19:05:39.102841022 +0200
-+++ alacarte-0.13.2/Alacarte/MenuEditor.py	2011-04-16 19:07:26.783367453 +0200
-@@ -48,22 +48,10 @@ class MenuEditor:
- 			self.applications.dom = xml.dom.minidom.parse(self.applications.path)
- 		self.__remove_whilespace_nodes(self.applications.dom)
- 
--		self.settings = Menu() 	 
--		self.settings.tree = gmenu.lookup_tree('settings.menu', gmenu.FLAGS_SHOW_EMPTY|gmenu.FLAGS_INCLUDE_EXCLUDED|gmenu.FLAGS_INCLUDE_NODISPLAY|gmenu.FLAGS_SHOW_ALL_SEPARATORS)
--		self.settings.visible_tree = gmenu.lookup_tree('settings.menu') 	 
--		self.settings.tree.sort_key = gmenu.SORT_DISPLAY_NAME
--		self.settings.visible_tree.sort_key = gmenu.SORT_DISPLAY_NAME
--		self.settings.path = os.path.join(util.getUserMenuPath(), self.settings.tree.get_menu_file()) 	 
--		if not os.path.isfile(self.settings.path): 	 
--			self.settings.dom = xml.dom.minidom.parseString(util.getUserMenuXml(self.settings.tree)) 	 
--		else: 	 
--			self.settings.dom = xml.dom.minidom.parse(self.settings.path) 	 
--		self.__remove_whilespace_nodes(self.settings.dom)
--
- 		self.save(True)
- 
- 	def save(self, from_loading=False):
--		for menu in ('applications', 'settings'):
-+		for menu in ('applications',):
- 			fd = open(getattr(self, menu).path, 'w')
- 			fd.write(re.sub("\n[\s]*([^\n<]*)\n[\s]*</", "\\1</", getattr(self, menu).dom.toprettyxml().replace('<?xml version="1.0" ?>\n', '')))
- 			fd.close()
-@@ -85,7 +73,7 @@ class MenuEditor:
- 				os.unlink(file_path)
- 
- 	def revert(self):
--		for name in ('applications', 'settings'):
-+		for name in ('applications',):
- 			menu = getattr(self, name)
- 			self.revertTree(menu.tree.root)
- 			path = os.path.join(util.getUserMenuPath(), menu.tree.get_menu_file())
-@@ -126,7 +114,7 @@ class MenuEditor:
- 			os.unlink(file_path)
- 			redo.append(redo_path)
- 		#reload DOM to make changes stick
--		for name in ('applications', 'settings'):
-+		for name in ('applications',):
- 			menu = getattr(self, name)
- 			if not os.path.isfile(menu.path):
- 				menu.dom = xml.dom.minidom.parseString(util.getUserMenuXml(menu.tree))
-@@ -150,7 +138,7 @@ class MenuEditor:
- 			os.unlink(file_path)
- 			undo.append(undo_path)
- 		#reload DOM to make changes stick
--		for name in ('applications', 'settings'):
-+		for name in ('applications',):
- 			menu = getattr(self, name)
- 			if not os.path.isfile(menu.path):
- 				menu.dom = xml.dom.minidom.parseString(util.getUserMenuXml(menu.tree))
-@@ -162,7 +150,6 @@ class MenuEditor:
- 	def getMenus(self, parent=None):
- 		if parent == None:
- 			yield self.applications.tree.root
--			yield self.settings.tree.root
- 		else:
- 			for menu in parent.get_contents():
- 				if menu.get_type() == gmenu.TYPE_DIRECTORY:
-@@ -429,31 +416,13 @@ class MenuEditor:
- 			self.__undo[-1].append(undo_path)
- 
- 	def __getMenu(self, item):
--		root = item.get_parent()
--		if not root:
--			#already at the top
--			root = item
--		else:
--			while True:
--				if root.get_parent():
--					root = root.get_parent()
--				else:
--					break
--		if root.menu_id == self.applications.tree.root.menu_id:
--			return self.applications
--		return self.settings
-+		return self.applications
- 
- 	def __findMenu(self, menu_id, parent=None):
- 		if parent == None:
--			menu = self.__findMenu(menu_id, self.applications.tree.root)
--			if menu != None:
--				return menu
--			else:
--				return self.__findMenu(menu_id, self.settings.tree.root)
-+			return self.__findMenu(menu_id, self.applications.tree.root)
- 		if menu_id == self.applications.tree.root.menu_id:
- 			return self.applications.tree.root
--		if menu_id == self.settings.tree.root.menu_id:
--			return self.settings.tree.root
- 		for item in parent.get_contents():
- 			if item.get_type() == gmenu.TYPE_DIRECTORY:
- 				if item.menu_id == menu_id:
-@@ -468,8 +437,6 @@ class MenuEditor:
- 		menu = self.__getMenu(item)
- 		if menu == self.applications:
- 			root = self.applications.visible_tree.root
--		elif menu == self.settings:
--			root = self.settings.visible_tree.root
- 		if item.get_type() == gmenu.TYPE_DIRECTORY:
- 			if self.__findMenu(item.menu_id, root) == None:
- 				return False
diff --git a/x11-misc/alacarte/files/alacarte-0.13.3-cursor-changed-selection-none.patch b/x11-misc/alacarte/files/alacarte-0.13.3-cursor-changed-selection-none.patch
deleted file mode 100644
index b1f9cfef42d1..000000000000
--- a/x11-misc/alacarte/files/alacarte-0.13.3-cursor-changed-selection-none.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e265c5b46cfa259b03ca08672023b8ef0d0e2ea9 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 24 May 2012 00:54:20 -0400
-Subject: [PATCH] MainWindow: treeview.get_selection() in cursor-changed
- callbacks can return None
-
-https://bugzilla.gnome.org/show_bug.cgi?id=676702
----
- Alacarte/MainWindow.py |   10 ++++++++--
- 1 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/Alacarte/MainWindow.py b/Alacarte/MainWindow.py
-index be460e1..fd18064 100644
---- a/Alacarte/MainWindow.py
-+++ b/Alacarte/MainWindow.py
-@@ -366,7 +366,10 @@ class MainWindow(object):
-             GObject.timeout_add(100, self.waitForEditProcess, process, file_path)
- 
-     def on_menu_tree_cursor_changed(self, treeview):
--        menus, iter = treeview.get_selection().get_selected()
-+        selection = treeview.get_selection()
-+        if selection is None:
-+            return
-+        menus, iter = selection.get_selected()
-         if iter is None:
-             return
-         menu_path = menus.get_path(iter)
-@@ -424,7 +427,10 @@ class MainWindow(object):
-         self.item_store[path][0] = not self.item_store[path][0]
- 
-     def on_item_tree_cursor_changed(self, treeview):
--        items, iter = treeview.get_selection().get_selected()
-+        selection = treeview.get_selection()
-+        if selection is None:
-+            return
-+        items, iter = selection.get_selected()
-         if iter is None:
-             return
-         item = items[iter][3]
--- 
-1.7.8.6
-
diff --git a/x11-misc/alacarte/files/alacarte-0.13.3-icon-crash.patch b/x11-misc/alacarte/files/alacarte-0.13.3-icon-crash.patch
deleted file mode 100644
index 2b3dfe6225c9..000000000000
--- a/x11-misc/alacarte/files/alacarte-0.13.3-icon-crash.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8fd2c4b9939a9adf5b9bfad9df17ee8bbeac2c2c Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Thu, 24 May 2012 00:04:55 -0400
-Subject: [PATCH] util: avoid crashing if a .desktop file has no icon defined
-
-https://bugzilla.gnome.org/show_bug.cgi?id=676700
----
- Alacarte/util.py |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/Alacarte/util.py b/Alacarte/util.py
-index 8501a35..bcd4bca 100644
---- a/Alacarte/util.py
-+++ b/Alacarte/util.py
-@@ -138,6 +138,8 @@ def getIcon(item):
-     else:
-         app_info = item.get_app_info()
-         gicon = app_info.get_icon()
-+    if gicon is None:
-+        return None
- 
-     icon_theme = Gtk.IconTheme.get_default()
-     info = icon_theme.lookup_by_gicon(gicon, 24, 0)
--- 
-1.7.8.6
-
diff --git a/x11-misc/alacarte/files/alacarte-0.13.3-no-pygtk-checks.patch b/x11-misc/alacarte/files/alacarte-0.13.3-no-pygtk-checks.patch
deleted file mode 100644
index 15c5526fc048..000000000000
--- a/x11-misc/alacarte/files/alacarte-0.13.3-no-pygtk-checks.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 14d2b9a75a0cd6dd7e611caa37dee93b5ac5c3cd Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Wed, 23 May 2012 23:34:36 -0400
-Subject: [PATCH] configure: Remove old pygtk/pygobject-2 checks
-
-https://bugzilla.gnome.org/show_bug.cgi?id=676699
----
- configure.ac |   48 +-----------------------------------------------
- 1 files changed, 1 insertions(+), 47 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index db5495f..378fa6c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,9 +8,6 @@ AC_CONFIG_HEADERS([config.h])
- AM_INIT_AUTOMAKE([1.7])
- AM_MAINTAINER_MODE
- 
--m4_define(required_pygobject_version, 2.15.1)
--m4_define(required_pygtk_version, 2.13.0)
--
- dnl put the ACLOCAL flags in the makefile
- ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
- 
-@@ -23,50 +20,7 @@ IT_PROG_INTLTOOL([0.40.0])
- 
- AM_PATH_PYTHON_VERSION(2.7, 2.7.0, 2.6, 2.6.0, 2.5, 2.5.0, 2.4, 2.4.0)
- 
--PKG_CHECK_MODULES(ALACARTE, libgnome-menu-3.0 >= 3.2.0.1)
--
--dnl Check for correctly installed pygobject
--AC_MSG_CHECKING(for pygobject required_pygobject_version installed for python required_python_abi)
--prog="
--import pygtk; pygtk.require('2.0')
--import gobject
--assert gobject.pygobject_version >= tuple(map(int, 'required_pygobject_version'.split('.')))
--"
--
--if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC; then
--    AC_MSG_RESULT(found)
--else
--    AC_MSG_RESULT(not found)
--    AC_MSG_ERROR(required pygobject version not found)
--fi
--
--dnl Check for correctly installed pygtk
--AC_MSG_CHECKING(for pygtk required_pygtk_version installed for python ${PYTHON_VERSION})
--prog="
--import pygtk; pygtk.require('2.0')
--import gobject
--assert gobject.pygtk_version >= tuple(map(int, 'required_pygtk_version'.split('.')))
--"
--
--if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC; then
--    AC_MSG_RESULT(found)
--else
--    AC_MSG_RESULT(not found)
--    AC_MSG_ERROR(required pygtk version not found)
--fi
--
--dnl Check for correctly installed python-glade
--dnl AC_MSG_CHECKING(for pyglade required_pygtk_version installed for python ${PYTHON_VERSION})
--dnl prog="
--dnl import pygtk; pygtk.require('2.0')
--dnl import gtk.glade
--dnl "
--dnl if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC; then
--dnl    AC_MSG_RESULT(found)
--dnl else
--dnl    AC_MSG_RESULT(not found)
--dnl    AC_MSG_ERROR(required pyglade version not found)
--dnl fi
-+PKG_CHECK_MODULES(ALACARTE, libgnome-menu-3.0 >= 3.2.0.1 pygobject-3.0)
- 
- AC_CONFIG_FILES([
-         Makefile
--- 
-1.7.8.6
-