Patch to skip corrupt eggs. Removed previous version.

Package-Manager: portage-2.1.2.4

5 files changed, 103 insertions, 8 deletions

diff --git a/dev-python/yolk/ChangeLog b/dev-python/yolk/ChangeLog
index f3c547424c7d..c8891f476a4d 100644
--- a/dev-python/yolk/ChangeLog
+++ b/dev-python/yolk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/yolk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/yolk/ChangeLog,v 1.1 2007/04/23 05:56:36 pythonhead Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/yolk/ChangeLog,v 1.2 2007/04/23 18:35:43 pythonhead Exp $
+
+*yolk-0.0.7-r1 (23 Apr 2007)
+
+  23 Apr 2007; Rob Cakebread <pythonhead@gentoo.org>
+  +files/yolk-0.0.7-bad-egg.patch, +yolk-0.0.7-r1.ebuild:
+  Patch to skip corrupt eggs. Removed previous version.
 
 *yolk-0.0.7 (23 Apr 2007)
 
diff --git a/dev-python/yolk/Manifest b/dev-python/yolk/Manifest
index 06dba4081ea3..a824ea3793a2 100644
--- a/dev-python/yolk/Manifest
+++ b/dev-python/yolk/Manifest
@@ -1,15 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX yolk-0.0.7-bad-egg.patch 1662 RMD160 98b12282c0ede2d243d46b8c12965f83dfa1a3e9 SHA1 aa6f7028777b9c6edfaa2aeea229487ce896eef8 SHA256 c4afce22ffff0a096f094f2fb5eae2fa019dbe421ea805b3993af3aa0e7b4660
+MD5 12d55249b2a320f44cf866fd59754e72 files/yolk-0.0.7-bad-egg.patch 1662
+RMD160 98b12282c0ede2d243d46b8c12965f83dfa1a3e9 files/yolk-0.0.7-bad-egg.patch 1662
+SHA256 c4afce22ffff0a096f094f2fb5eae2fa019dbe421ea805b3993af3aa0e7b4660 files/yolk-0.0.7-bad-egg.patch 1662
 DIST yolk-0.0.7.tar.gz 29441 RMD160 dfd2dd2730acbe2801ad34cb747e466edb9425eb SHA1 8a168664eef745753ce37f4b1b558be82bf0d6f0 SHA256 10440e4d37b1c9f52e1437b5a789b629061eb9cbf05a5afb08d673840a190437
+EBUILD yolk-0.0.7-r1.ebuild 1017 RMD160 a85f3796e15b2145e80df3593991f0ee8425a9f6 SHA1 e84f5c2c77fff472e8a6d7448ba4a7dbc4386e66 SHA256 44ba747fe40c6164165655f2b358fc7f601bd8ace0428e3445298054ba2fe57c
+MD5 d6893f16aca560f7fe069213584b4bfa yolk-0.0.7-r1.ebuild 1017
+RMD160 a85f3796e15b2145e80df3593991f0ee8425a9f6 yolk-0.0.7-r1.ebuild 1017
+SHA256 44ba747fe40c6164165655f2b358fc7f601bd8ace0428e3445298054ba2fe57c yolk-0.0.7-r1.ebuild 1017
 EBUILD yolk-0.0.7.ebuild 921 RMD160 57695cf8c82390c619feb5ebbee7b1e51fcb2cef SHA1 6ed69f6bc4cc7fe78e4ca0c7ba2daad0c6a174d9 SHA256 44b23f545ccc752571f93807e9388f4299ab71371539f77628c4539078d3564e
 MD5 e33b16865e58b5444f2b3f525f6fc858 yolk-0.0.7.ebuild 921
 RMD160 57695cf8c82390c619feb5ebbee7b1e51fcb2cef yolk-0.0.7.ebuild 921
 SHA256 44b23f545ccc752571f93807e9388f4299ab71371539f77628c4539078d3564e yolk-0.0.7.ebuild 921
-MISC ChangeLog 343 RMD160 8cba4fa495ef688ca7ea4d4c25b36c07f02117fe SHA1 b9785d7c08b9e368a0e2985eb6f70054701fcab8 SHA256 f59c7202df62c78690918efff658e98643eba6290f18683292b0eefa9dae99ab
-MD5 2dceef1ca29e50ee0680c2c37bad3a90 ChangeLog 343
-RMD160 8cba4fa495ef688ca7ea4d4c25b36c07f02117fe ChangeLog 343
-SHA256 f59c7202df62c78690918efff658e98643eba6290f18683292b0eefa9dae99ab ChangeLog 343
+MISC ChangeLog 541 RMD160 0c5ecaeda9d7d20437e17d8958cfd39140412a5a SHA1 f2c59cf5f50e07ffac57ae74f00f4c4f0f451115 SHA256 82f06f463e2077b0eb20f40e9523d708de0d8dd8062111b3b64b2ad45912abab
+MD5 50c0ddaf8fb19141ba18670767a94d0e ChangeLog 541
+RMD160 0c5ecaeda9d7d20437e17d8958cfd39140412a5a ChangeLog 541
+SHA256 82f06f463e2077b0eb20f40e9523d708de0d8dd8062111b3b64b2ad45912abab ChangeLog 541
 MISC metadata.xml 513 RMD160 3af1ec454da4ac656567a60bfb7c7eb8660539f0 SHA1 f5e9eee38224c9f464f6305c10a5412b99358368 SHA256 842e667d9f263027d77b803e1e638545d6fe9edd76d5ab5ccc30bfce1b5a357c
 MD5 948114ffcc0906b7ffdbe83a348aaa8e metadata.xml 513
 RMD160 3af1ec454da4ac656567a60bfb7c7eb8660539f0 metadata.xml 513
@@ -17,10 +25,13 @@ SHA256 842e667d9f263027d77b803e1e638545d6fe9edd76d5ab5ccc30bfce1b5a357c metadata
 MD5 d756c8f02a7a80965be754b0e6fbc00b files/digest-yolk-0.0.7 229
 RMD160 9669c02eaad71d952f457c9b91392b8cc31012ec files/digest-yolk-0.0.7 229
 SHA256 7f8b9c65b99db876b125e0e45b487b5190b94b9d136802096b9071d5974291d6 files/digest-yolk-0.0.7 229
+MD5 d756c8f02a7a80965be754b0e6fbc00b files/digest-yolk-0.0.7-r1 229
+RMD160 9669c02eaad71d952f457c9b91392b8cc31012ec files/digest-yolk-0.0.7-r1 229
+SHA256 7f8b9c65b99db876b125e0e45b487b5190b94b9d136802096b9071d5974291d6 files/digest-yolk-0.0.7-r1 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGLEqh96cFzIajWwkRApzWAJ4kXijbdKUZS8pXUw80ahOs2y/thwCfWPDp
-TIzwDumsfZjukBY66UBv+S8=
-=vSD/
+iD8DBQFGLPyO96cFzIajWwkRAtazAKDlQZSfE5G90LdA80Ot7SqWom1OwQCfRix+
+us9pUxiQ8FRFRyO8Q3pvaJw=
+=YzuR
 -----END PGP SIGNATURE-----
diff --git a/dev-python/yolk/files/digest-yolk-0.0.7 b/dev-python/yolk/files/digest-yolk-0.0.7-r1
index b29816d83be0..b29816d83be0 100644
--- a/dev-python/yolk/files/digest-yolk-0.0.7
+++ b/dev-python/yolk/files/digest-yolk-0.0.7-r1
diff --git a/dev-python/yolk/files/yolk-0.0.7-bad-egg.patch b/dev-python/yolk/files/yolk-0.0.7-bad-egg.patch
new file mode 100644
index 000000000000..1f0a87ff022b
--- /dev/null
+++ b/dev-python/yolk/files/yolk-0.0.7-bad-egg.patch
@@ -0,0 +1,39 @@
+Index: /trunk/yolk/yolklib.py

+===================================================================

+--- /trunk/yolk/yolklib.py (revision 98)

++++ /trunk/yolk/yolklib.py (revision 116)

+@@ -91,7 +91,13 @@

+ 

+ 

+-def get_highest_installed(project_name):

+-    """Return highest version of installed package"""

+-    return pkg_resources.require(project_name)[0].version

++    def get_highest_installed(self, project_name):

++        """Return highest version of installed package"""

++        #http://tools.assembla.com/yolk/ticket/17

++        #try:

++        #    return pkg_resources.require(project_name)[0].version

++        #except pkg_resources.DistributionNotFound:

++        #    Do something like:

++        #    return "Error: Possibly corrupt egg."

++        return self.environment[project_name][0].version

+ 

+ 

+Index: /trunk/yolk/cli.py

+===================================================================

+--- /trunk/yolk/cli.py (revision 107)

++++ /trunk/yolk/cli.py (revision 116)

+@@ -31,5 +31,5 @@

+ from yolk import __version__

+ from yolk.metadata import get_metadata

+-from yolk.yolklib import get_highest_installed, get_highest_version, Distributions

++from yolk.yolklib import get_highest_version, Distributions

+ from yolk.pypi import CheeseShop

+ from yolk.setuptools_support import get_download_uri

+@@ -69,5 +69,5 @@

+     for pkg in get_pkglist():

+         for (dist, active) in dists.get_distributions("all", pkg,

+-                get_highest_installed(pkg)):

++                dists.get_highest_installed(pkg)):

+             (project_name, versions) = \

+                     pypi.query_versions_pypi(dist.project_name, True)

diff --git a/dev-python/yolk/yolk-0.0.7-r1.ebuild b/dev-python/yolk/yolk-0.0.7-r1.ebuild
new file mode 100644
index 000000000000..ecd5bf7c2d0b
--- /dev/null
+++ b/dev-python/yolk/yolk-0.0.7-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/yolk/yolk-0.0.7-r1.ebuild,v 1.1 2007/04/23 18:35:43 pythonhead Exp $
+
+inherit distutils eutils
+
+NEED_PYTHON=2.4
+DESCRIPTION="Tool and library for querying PyPI and packages installed by setuptools"
+HOMEPAGE="http://cheeseshop.python.org/pypi/yolk"
+SRC_URI="http://cheeseshop.python.org/packages/source/y/yolk/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="test examples"
+RDEPEND="|| ( >=dev-lang/python-2.5 dev-python/elementtree )
+	dev-python/setuptools
+	test? ( dev-python/nose )
+	dev-python/yolk-portage"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	#Avoid traceback from users botched egg removal.
+	epatch ${FILESDIR}/${P}-bad-egg.patch
+}
+
+src_install() {
+	distutils_src_install
+	if use examples ; then
+		dodir /usr/share/doc/${P}/examples
+		cp -r examples/* ${D}/usr/share/doc/${P}/examples
+	fi
+}
+
+src_test() {
+	nosetests || die "nose test failed"
+}
+