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

(Portage version: 2.1.10.44/cvs/Linux x86_64)

4 files changed, 11 insertions, 92 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/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"