Add support for weak blockers, fix eselect compatibility. Cleanse older versions.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 17 insertions, 100 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index b9370fa2eeb4..62cba6436296 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/pkgcore
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.146 2012/01/18 04:16:19 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.147 2012/01/24 11:53:49 ferringb Exp $
+
+*pkgcore-0.7.7.7 (24 Jan 2012)
+
+  24 Jan 2012; Brian Harring <ferringb@gentoo.org> -pkgcore-0.7.7.5.ebuild,
+  -pkgcore-0.7.7.5-r1.ebuild, -files/pkgcore-0.7.7.5-NameError.patch,
+  +pkgcore-0.7.7.7.ebuild:
+  Add support for weak blockers, fix eselect compatibility. Cleanse older
+  versions.
 
 *pkgcore-0.7.7.6 (16 Jan 2012)
 
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 26ff7a5d473d..b536a973b226 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,19 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pkgcore-0.7.7.5-NameError.patch 1193 RMD160 b04e779cf334efda080f76f37a2059b1e3fd017f SHA1 25f3ebb9dc44fed44e9271e9c4f4d123c5efd285 SHA256 7def05a3d5d8bb20797e986f2eb6d132747f36efe46d39b58045dc80e7403735
-DIST pkgcore-0.7.7.5.tar.bz2 437427 RMD160 b84604bd45c3043e25785a3afbe260e2c2d17354 SHA1 35e3b48c1a444504eb014e3ce9ea76c171dc43dc SHA256 2008524f961f588a1826b3aa18079cf65c4af38a357204590f4bcb68bcfa2197
 DIST pkgcore-0.7.7.6.tar.bz2 437497 RMD160 d56bdec9550ec7c6524cdac64edf065abeb11dce SHA1 74c688d0bd9ed93f7a8f850c0d2c1c91c7e95835 SHA256 5077cfa75227770600ed47f695a6ee58bbb69dd3932ca13972a1ad24710d7e3c
-EBUILD pkgcore-0.7.7.5-r1.ebuild 1195 RMD160 fc67af9aa5e3df231c51de8aa906dcdc3ff7ea85 SHA1 c60f7bc9ecb71b777a38bfe167acbbcd54e3c8eb SHA256 913d94328570a12474faa58a5dede0933c08f67af7064957094d019c98a1a56e
-EBUILD pkgcore-0.7.7.5.ebuild 1123 RMD160 f9368da785fa3b46404982a52816539cc0cd27cd SHA1 093fc49b5e3242f3d0ba47dbf9d651fcd83b48a7 SHA256 c6f3bc64bd70ee6d50e14531b308bf0fd6d0afbe58ed7c62e0aa4cf64d6609df
+DIST pkgcore-0.7.7.7.tar.bz2 437984 RMD160 d1204551c074d403fb049efac2ae6731934ed8fc SHA1 d746ca4edd84c84ba3b785336a684e0efa0c9d3b SHA256 47273b634f38141b2a6095dc9d62b9153796d1c445d31d4569a06e05dccc56d7
 EBUILD pkgcore-0.7.7.6.ebuild 1123 RMD160 e081c9e95d7c80afc49c06a2d20ad2260b710741 SHA1 ef7bde63e51967dfabc3bba314ff3f7370039662 SHA256 254b959648cea2eb5ce4c05d375ebdca85a716f2247ad24a0dbe5cbc875f4c95
+EBUILD pkgcore-0.7.7.7.ebuild 1123 RMD160 75bf83ec785db03a802caf86e9f472196c8e256c SHA1 931fd20c826421e1a9045db479b1bb6cfb1345fd SHA256 99720043dccecd20adb1fd4cb0f0446adf319c400bbfba525698c5991ee603d8
 EBUILD pkgcore-9999.ebuild 1118 RMD160 af13d2dc92adfa82879683868a9bf4e0627ba9c6 SHA1 5600fd931d33cf213dcd7719a7dd4cd7603db016 SHA256 c38e7943f7813a997ebc81039b2f854a9a6630ff687064b523e53ab6f9621c72
-MISC ChangeLog 24506 RMD160 0f6e39e1ae202fe6713bf40c16dea607f0a78283 SHA1 11359f57a4c08863a117281f3290bfa47c1766cd SHA256 cc6fb23c739a95234356224591eb920bf26ff911ed569ca62c990e1004505b6b
+MISC ChangeLog 24798 RMD160 9ce43f72aa94ed045d0f15ca2d855e86c79b4904 SHA1 709e030c75ad6dd9ba3f809c6b2aacdad779943b SHA256 8b97596e043aadfca452b81062c3bb23810f0e6a935e69eb582b82a9a6b1524a
 MISC metadata.xml 234 RMD160 7f7e4ec7da60203d4fc0d59ea9b7001ca84fd88c SHA1 fc54601f1382d43dd16625b242d7a52ff36f3782 SHA256 f036ed153de912a1bb1466478e9ce0c9d4ecae55929f6b13490c3f47a242fc0d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8WR5sACgkQsiLx3HvNzgcMrgCfbHikQP1l/ullXuyPOSG4iFdt
-Ax0AoNCRQF0HMRlGMYqMbzUWtZLIJsAm
-=zUxq
+iEYEARECAAYFAk8em9IACgkQsiLx3HvNzgcfoACfTXq8eBO72LDUV0yQbgHYwxBg
+mzsAn1C2hSuCVyE6nmNn6JWiVgy5/+5z
+=vJ3j
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pkgcore/files/pkgcore-0.7.7.5-NameError.patch b/sys-apps/pkgcore/files/pkgcore-0.7.7.5-NameError.patch
deleted file mode 100644
index fe163be2c25b..000000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.7.7.5-NameError.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4b56e8e31c301840ac8734b601d868a9b4ca42ba Mon Sep 17 00:00:00 2001
-From: Brian Harring <ferringb@gmail.com>
-Date: Mon, 2 Jan 2012 13:01:07 -0800
-Subject: [PATCH] fix NameError's w/in the error pathway
-
----
- pkgcore/util/commandline.py |    6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/pkgcore/util/commandline.py b/pkgcore/util/commandline.py
-index 02330b4..8a409aa 100644
---- a/pkgcore/util/commandline.py
-+++ b/pkgcore/util/commandline.py
-@@ -807,12 +807,14 @@ def main(subcommands, args=None, outfile=None, errfile=None,
-             tb = None
-         dump_error(errfile, e, "Error in configuration", tb=tb)
-     except operations.OperationError, e:
--        exc = sys.exc_info()[-1]
-+        tb = sys.exc_info()[-1]
-         if not getattr(options, 'debug', False):
-             tb = None
-         dump_error(errfile, e, "Error running an operation", tb=tb)
-     except Exception, e:
--        exc = sys.exc_info()[-1]
-+        tb = sys.exc_info()[-1]
-+        if not getattr(options, 'debug', False):
-+            tb = None
-         dump_error(errfile, e, "Unhandled Exception occured", tb=tb)
-     if out is not None:
-         if exitstatus:
--- 
-1.7.8.2
-
diff --git a/sys-apps/pkgcore/pkgcore-0.7.7.5-r1.ebuild b/sys-apps/pkgcore/pkgcore-0.7.7.5-r1.ebuild
deleted file mode 100644
index 2bbab9c55412..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.7.7.5-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.7.5-r1.ebuild,v 1.1 2012/01/03 14:02:38 ferringb Exp $
-
-EAPI="3"
-DISTUTILS_SRC_TEST="setup.py"
-
-inherit distutils eutils
-
-DESCRIPTION="pkgcore package manager"
-HOMEPAGE="http://pkgcore.googlecode.com/"
-SRC_URI="http://pkgcore.googlecode.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="-doc build"
-
-RDEPEND=">=dev-lang/python-2.4
-	>=dev-python/snakeoil-0.4.5
-	|| ( >=dev-lang/python-2.5 dev-python/pycrypto )"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx dev-python/pyparsing )"
-
-DOCS="AUTHORS NEWS"
-
-pkg_setup() {
-	# disable snakeoil 2to3 caching...
-	unset PY2TO3_CACHEDIR
-	python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/"${PN}-${PV}-NameError.patch
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		python setup.py build_docs || die "doc building failed"
-	fi
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		dohtml -r build/sphinx/html/*
-	fi
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	pplugincache
-}
diff --git a/sys-apps/pkgcore/pkgcore-0.7.7.5.ebuild b/sys-apps/pkgcore/pkgcore-0.7.7.7.ebuild
index 7672359f74c0..1c0befdc8092 100644
--- a/sys-apps/pkgcore/pkgcore-0.7.7.5.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.7.7.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.7.5.ebuild,v 1.1 2011/12/26 20:32:06 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/pkgcore-0.7.7.7.ebuild,v 1.1 2012/01/24 11:53:49 ferringb Exp $
 
 EAPI="3"
 DISTUTILS_SRC_TEST="setup.py"