fix import bug wrt #488866

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

4 files changed, 105 insertions, 17 deletions

diff --git a/x11-misc/menulibre/ChangeLog b/x11-misc/menulibre/ChangeLog
index d33c68752b52..a3d903ded3da 100644
--- a/x11-misc/menulibre/ChangeLog
+++ b/x11-misc/menulibre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/menulibre
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/menulibre/ChangeLog,v 1.4 2013/06/25 12:52:49 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/menulibre/ChangeLog,v 1.5 2013/10/21 17:40:09 hasufell Exp $
+
+*menulibre-13.01.4-r1 (21 Oct 2013)
+
+  21 Oct 2013; Julian Ospald <hasufell@gentoo.org>
+  +menulibre-13.01.4-r1.ebuild, +files/menulibre-13.01.4-GError-import.patch:
+  fix import bug wrt #488866
 
   25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> menulibre-13.01.4.ebuild:
   Stable for amd64, wrt bug #474396
diff --git a/x11-misc/menulibre/Manifest b/x11-misc/menulibre/Manifest
index f4f9d004b17f..2739f32b4512 100644
--- a/x11-misc/menulibre/Manifest
+++ b/x11-misc/menulibre/Manifest
@@ -1,24 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX menulibre-13.01.4-GError-import.patch 411 SHA256 598e0a92ff69f681ebf5823ddb835b2820733fd85531ad000cb19fa32b179c30 SHA512 36f5c0427024e348917d9de3106e815aacc595d701d8e30d6df1b84bfec6f9942150e4b094cd4125e93608340f736985d93404754d03d970f4ccd4318ee476ac WHIRLPOOL 4f1efc2266f9ff27770280211c80c8cc65fada567fa21a142c562daf9611d2c941f085d80d95c7f7deca29a263b8183c1fa4c287203e10cda296f10aa9b3bd42
 DIST menulibre_13.01.4.tar.gz 322686 SHA256 2329b426af55936dc40c7d1bcae99f98b674d06e3757657bd47dcb93d1ac45f3 SHA512 c3311443d00901d0c80078e4f51f81cc2bafbb8048a8eb1f0594e4430e9d8d1c563f4ec6b423952d3e8523f921220bb9d6fa0e4a62453d07011ae781070750d4 WHIRLPOOL b419f3285a97918796c08d0cb7681ada8f6bd19297bdfaea603c2e6256c06d775369d683f150f9c708d26ff2220fceb97d37541143bbcd9d08387e5ebd2967d5
+EBUILD menulibre-13.01.4-r1.ebuild 1951 SHA256 40dfe17fdc6f7915259ce1c310a7d182847eb6be9e388bd571a01be838efd2ab SHA512 d14bd61a6ee62a2f8a1cb595433aa54d02c40a778ac997f0a4ba5b50c7e61daf0c9cacb4ba150d7fba050b4f15995c5b59c66318ef1dc71d7c3d4cea726b44da WHIRLPOOL b2e4c4aa350a66cdd27507a418984258594c9784d4300849d7d55177a573c0f388042904db5ca90afaf1a37e75962077343b681ebd5ce6ce1309497fbe6c4571
 EBUILD menulibre-13.01.4.ebuild 1879 SHA256 c26dbd1c3ce4168dee1f8eb867aff4b5db1ea4d968a8b5dcad282a8d655da416 SHA512 4928934c907d696b11003c905b2c789e2cb3816c315f17dd5ba30e15ca2d5fb71c900422d783b0550ddf8bbdca653589cbd0e5662359df77f76f8918bbcebcc6 WHIRLPOOL 341a628a2d6c6bd8add54eadadd78ba4cde6fe28f6e251ff50b238979842dce5fd608fcf2888870833ad3f8e629f4a49d0b5295a78ce22b43e5f19e454c6e7e3
-MISC ChangeLog 682 SHA256 e5e9809916542144d5419942538c19d9e1b43e0bb2e35a42b69d00ff70dfe974 SHA512 6496837c82bdc3f9e3c56f3c9bf42f14676003cf9985f132cdff407963c928dd12ee5ea53619da28d9730c354b6fd58ce0acfda509287dccca34af8a87986a8c WHIRLPOOL 4914809da4bb3d28c2c7c5d2659fd63c26c6c18920f29e12abb7c895ec2513bca0de20ea65466df2b07d87db21f6f142d0605df3c10ec1964781e55c02a53f15
+MISC ChangeLog 883 SHA256 eca0a926d40bfec6d4510e22dea5d07f45c831f51da915b5c3640c170cb88b98 SHA512 b4b5eb167f117f7479ab5b32e30f6f99eb2144286b0b3e21453ee20526421af790fb092cb838e4d1c6958ffff98fc7f232f7ed41c55bd279ec03f3c991fe33d0 WHIRLPOOL 9aeae9354d19661082a74d56ec05c15b48d8e526f60f950c88796a890c2bd0347c9aa27b615f6c74e85c8bdf6f26699549769bc439dd6b20a4e4a819f7529ba3
 MISC metadata.xml 262 SHA256 56be8376790c0f5f241ddafd3ed1b3068ce13f4751f8bf8e318ba4623f1150bc SHA512 f327aca9b62ca6a6ba5cb7dc7c003ebda21be3cc88d71d9cfa8c3960a87b5184e39da663367dfa8fbed598258a51924c025802036c345beb2ba2df30f137b238 WHIRLPOOL 0284fde5542adcffd34289c7db618c48d3494d7da25794259542669a3084c1e602b3f2b9b72ff28a1326087223f3276f21bdf42cb4ea9451faccc9dba9819d13
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRyZKbAAoJELp701BxlEWfK/sP/3Q0baqVCIynpMGFa2IriRn5
-P8M4+lO/gLiYlt54YxH2rkQPAh89eqpyko+iAmZ8C3YfFLNYo5bRgWZnwK7bYbLk
-PrNAO2y0Nh41l4ySxzSiIu8NnJcI5DrM75dhqDl+fygpmi8mA76Wo1I2JzRtudR7
-aLac6TRcWzr2rMQxPBKIVHcdPGhSaC08TiJo7NIvhGlbx65Qr8Kr6Rv44gqOySym
-scSwXK4DMkhAmBJsJXAOR6U3etI9QOZ2wx5hz1DaGy1BpBTjs+m1ldQnY25vzjAO
-WUpY1DCAYe8HuDk/uWdfI4CqHJR41zsGE35EyIGSHRZLlKWnHHN2eC5YpvebEJ9A
-iAC/AsbYWKe/DKz4o6VrQPr2xtQEr04iYwu18jzz9BvnDwNhy6YqxDjNG1iCQgo+
-riKQ92ISZvZDCzDCPkN+F5XQnLnGJVuX/ImK+mUtjH/dN8nTBbfJ3sBDtAQLDmYp
-vDbrek76hqsA9W37oAjXwgEsNqqDk5sbrn6207JDa9X1eHQEotcm+oGV/5Du5G8d
-wAjckqKhYdec6u6TY0QeGK4EZP1WKgQlJ6iOg3m3PD4yvH/hJMRT2dETRc2nWAan
-SQRfVgtT8apza+WxsJYnBYiZdvuuDOQoZfvPM9DBgctFQBia/wqdt/77Se1vr4kv
-QVCo0EAFS7Ad23Qucd/0
-=ySx6
+iQEcBAEBCAAGBQJSZWb9AAoJEFpvPKfnPDWzq7AH/0HHMYfhc38UyQuP4/nzl5DM
+N/+YTmggK0epjx05F5fftrUwOPrgUG4anONcolI/bDPxIKoJ+IAt5LMuUNoJR7SG
+eMEf/0GXNffwFJLKG00SkqYkV7krIZFqPQPCYM8Lv6t+s4Frp+sUTzLiXqYClQK6
+z9ZHnHt9aL6MC/D+UV0kKSXYVq+x79DQSD/1gPvdeAxuKiZdZvrrc2nocP7ybm+Q
+QmNPCZRzOQ+CSDaW3zm4Vt3KjwenRMn3YhL6nJblr31Q6yWgjMYWQcxPrRsPhgcc
+xp5nZJWd6+uvBSnthY7eRBsxtN+S16KAxUCzDzHeOXcTeFsH5wCCFcfRu5shVFU=
+=EY3o
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/menulibre/files/menulibre-13.01.4-GError-import.patch b/x11-misc/menulibre/files/menulibre-13.01.4-GError-import.patch
new file mode 100644
index 000000000000..6a747ba07fb8
--- /dev/null
+++ b/x11-misc/menulibre/files/menulibre-13.01.4-GError-import.patch
@@ -0,0 +1,17 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Mon Oct 21 17:32:25 UTC 2013
+Subject: fix import
+
+https://bugs.gentoo.org/show_bug.cgi?id=488866
+
+--- a/menulibre_lib/IconTheme.py
++++ b/menulibre_lib/IconTheme.py
+@@ -15,7 +15,7 @@
+ ### END LICENSE
+ 
+ from gi.repository import Gtk, GdkPixbuf
+-from gi._glib import GError
++from gi._glib._glib import GError
+ import os
+ 
+ from menulibreconfig import get_data_file
diff --git a/x11-misc/menulibre/menulibre-13.01.4-r1.ebuild b/x11-misc/menulibre/menulibre-13.01.4-r1.ebuild
new file mode 100644
index 000000000000..3382d113b36b
--- /dev/null
+++ b/x11-misc/menulibre/menulibre-13.01.4-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/menulibre/menulibre-13.01.4-r1.ebuild,v 1.1 2013/10/21 17:40:09 hasufell Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_REQ_USE="xml"
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit eutils gnome2-utils distutils-r1
+
+DESCRIPTION="An advanced menu editor that provides modern features in a clean, easy-to-use interface"
+HOMEPAGE="http://www.smdavis.us/projects/menulibre/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/python-distutils-extra[${PYTHON_USEDEP}]"
+RDEPEND="dev-libs/gobject-introspection
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf[X,introspection]
+	x11-libs/gtk+:3[X,introspection]
+	x11-themes/hicolor-icon-theme"
+
+PATCHES=( "${FILESDIR}"/${P}-GError-import.patch )
+
+S=${WORKDIR}/${PN}
+
+python_prepare_all() {
+	# too many categories
+	sed -i \
+		-e 's/X-GNOME-Settings-Panel;X-GNOME-PersonalSettings;DesktopSettings;X-XFCE;//' \
+		menulibre.desktop.in || die 'sed on menulibre.desktop.in failed'
+
+	local i
+	# fix incorrect behavior when LINGUAS is set to an empty string
+	# https://bugs.launchpad.net/python-distutils-extra/+bug/1133594
+	if [[ -n "${LINGUAS+x}" ]] ; then # if LINGUAS is set
+		for i in $(cd "${S}"/po ; for p in *.po ; do echo ${p%.po} ; done) ; do # for every supported language
+			if ! has ${i} ${LINGUAS} ; then # if language is disabled
+				rm po/${i}.po || die
+			fi
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newicon -s 32 help/C/figures/icon.png menu-editor.png
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	elog "optional dependencies:"
+	elog "  gnome-extra/yelp (view help contents)"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}