Added patch to fix bug #335335 --entry-map crashes.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux i686

4 files changed, 73 insertions, 6 deletions

diff --git a/dev-python/yolk/ChangeLog b/dev-python/yolk/ChangeLog
index c897e0ba72eb..909d02d93bbe 100644
--- a/dev-python/yolk/ChangeLog
+++ b/dev-python/yolk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/yolk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/yolk/ChangeLog,v 1.11 2011/07/20 13:29:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/yolk/ChangeLog,v 1.12 2011/07/20 17:53:54 neurogeek Exp $
+
+*yolk-0.4.1-r1 (20 Jul 2011)
+
+  20 Jul 2011; Jesus Rivero <neurogeek@gentoo.org> +yolk-0.4.1-r1.ebuild,
+  +files/yolk-0.4.1_entry_map.patch:
+  Added patch to fix bug #335335 --entry-map crashes.
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #28480
diff --git a/dev-python/yolk/Manifest b/dev-python/yolk/Manifest
index c61377efee65..5abdb845fb28 100644
--- a/dev-python/yolk/Manifest
+++ b/dev-python/yolk/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX yolk-0.4.1_entry_map.patch 849 RMD160 703491819d9d362857919ab4ae2987b7b7947b01 SHA1 5c94a18d0d8369a0b7a03be0bce4911a66c3f037 SHA256 1b48a5553458ed6e134224bdc7ebd219c5d873ca49403496e81a6cb3597d9e22
 DIST yolk-0.4.1.tar.gz 80537 RMD160 5a672ab6ba8f121787c008b2e1e5d2b4fd8270d0 SHA1 004e7bf297ac9a752d4d41c3f7eeea7adaa7a675 SHA256 f03d9ebe2fa67aa210868312a474d949d26732b743aeece970e06f02ff740212
+EBUILD yolk-0.4.1-r1.ebuild 995 RMD160 ba604dd1c685d78d9f738ee46e5c8f582d090a34 SHA1 66ad4babee267bc0cffd5c9dd975cfe4b20b1642 SHA256 d0ada053160d50e503ec7643dc0aa3a53ad89c786affacf180418dcd111b5a0c
 EBUILD yolk-0.4.1.ebuild 936 RMD160 f9e0f9a158c1775336be5ab7841f657a01d28085 SHA1 6af58e1a027a5bf9e8aa11b34a9fe85ab5e1bb70 SHA256 f8265fa06f8227e123d1ef98e5a4e92fefbf0bcdf04cbadd0704fb5cc80d7d2b
-MISC ChangeLog 1715 RMD160 8e84461ab83f396b8fa6dd9d74218523e9807aef SHA1 9ac27677857292a68fd28c69a6012eacdf6856ea SHA256 fcf2808aa93ffce166df5ac511c098c7a0c8ca69d6de49863d948faf904fba31
+MISC ChangeLog 1915 RMD160 a9b1fb0ce38fe0c83c93cf91354c8cf26fe96653 SHA1 4b50ecb6640a4df3a094faf3cbf771eeea1ca7d9 SHA256 4fac9b4dee24d670bca8efb27e9424f92d09f432a940d3982e0f76abb41877c7
 MISC metadata.xml 416 RMD160 53ceca4e28f719127e86cad99db5d8f451e3f79d SHA1 ef053c60eacd712e5b2d9926b5c3e88ca9fe2b2c SHA256 65dd4c97684e9134162af7ba97209b91b83c1b9e003801bfb2aa205788482222
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk4m2D0ACgkQCaWpQKGI+9TcUQCfayb5YMk4dmJ28w+x5P2h+d/Y
-OoQAn1cxiTT9r19ySSuz9hrWUR59/xUn
-=ravH
+iEYEARECAAYFAk4nGYgACgkQdIssYB9vBoNP+QCfW+rIP17AKkB8ZTdVqNBduKj0
+mLAAn23d4OdJVRmUZMXk1E5LUOjMzW0C
+=v53s
 -----END PGP SIGNATURE-----
diff --git a/dev-python/yolk/files/yolk-0.4.1_entry_map.patch b/dev-python/yolk/files/yolk-0.4.1_entry_map.patch
new file mode 100644
index 000000000000..2eec2de97ad8
--- /dev/null
+++ b/dev-python/yolk/files/yolk-0.4.1_entry_map.patch
@@ -0,0 +1,20 @@
+#Patch by Jesus Rivero <neurogeek@gentoo.org>
+#Sent upstream on 2011-07-20
+diff -uNr yolk-0.4.1.orig/yolk/cli.py yolk-0.4.1/yolk/cli.py
+--- yolk-0.4.1.orig/yolk/cli.py	2008-08-11 10:36:54.000000000 -0400
++++ yolk-0.4.1/yolk/cli.py	2011-07-20 10:53:26.000000000 -0400
+@@ -830,10 +830,12 @@
+         """
+         pprinter = pprint.PrettyPrinter()
+         try:
+-            pprinter.pprint(pkg_resources.get_entry_map(self.options.entry_map))
++            entry_map = pkg_resources.get_entry_map(self.options.show_entry_map)
++            if entry_map:
++                pprinter.pprint(entry_map)
+         except pkg_resources.DistributionNotFound:
+             self.logger.error("Distribution not found: %s" \
+-                    % self.options.entry_map)
++                    % self.options.show_entry_map)
+             return 1
+         return 0
+ 
diff --git a/dev-python/yolk/yolk-0.4.1-r1.ebuild b/dev-python/yolk/yolk-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..34bf1c4deeb5
--- /dev/null
+++ b/dev-python/yolk/yolk-0.4.1-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/yolk/yolk-0.4.1-r1.ebuild,v 1.1 2011/07/20 17:53:54 neurogeek Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+
+inherit eutils distutils
+
+DESCRIPTION="Tool and library for querying PyPI and locally installed Python packages"
+HOMEPAGE="http://pypi.python.org/pypi/yolk"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-python/setuptools"
+RDEPEND="dev-python/yolk-portage"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}_entry_map.patch"
+}
+
+src_install() {
+	distutils_src_install
+
+	if use examples; then
+		docinto examples/plugins
+		dodoc examples/plugins/*
+		docinto examples/plugins/yolk_portage
+		dodoc examples/plugins/yolk_portage/*
+		docinto examples/plugins/yolk_pkg_manager
+		dodoc examples/plugins/yolk_pkg_manager/*
+	fi
+}