drop dead patches from the files directory

(Portage version: 2.1.11.23/cvs/Linux x86_64)

3 files changed, 6 insertions, 142 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 8bc8c248cb78..a68d194a9f03 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,11 @@
 # 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.162 2012/10/19 18:50:32 ferringb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.163 2012/10/22 00:41:32 ferringb Exp $
+
+  22 Oct 2012; Brian Harring <ferringb@gentoo.org>
+  -files/pkgcore-0.7.7.8-ebuild-envs-assert.patch,
+  -files/pkgcore-0.7.7.8-fix-resolver-assert.patch:
+  Drop dead patches.
 
 *pkgcore-0.8.5-r1 (19 Oct 2012)
 
diff --git a/sys-apps/pkgcore/files/pkgcore-0.7.7.8-ebuild-envs-assert.patch b/sys-apps/pkgcore/files/pkgcore-0.7.7.8-ebuild-envs-assert.patch
deleted file mode 100644
index 4b4268471472..000000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.7.7.8-ebuild-envs-assert.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a34717465da31b1d5519e09b3e32202380c0a6ab Mon Sep 17 00:00:00 2001
-From: Brian Harring <ferringb@gmail.com>
-Date: Sat, 19 May 2012 17:28:54 -0700
-Subject: [PATCH] ebuild envs assert: ensure a zero exit code.
-
-_unpacker within unpacker eclass is sensitive to it, thus
-match portage behaviour.
----
- NEWS                                       |    4 ++++
- pkgcore/ebuild/eapi-bash/exit-handling.lib |    2 +-
- 2 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/pkgcore/ebuild/eapi-bash/exit-handling.lib b/pkgcore/ebuild/eapi-bash/exit-handling.lib
-index bf2fcdb..c02b2db 100644
---- a/pkgcore/ebuild/eapi-bash/exit-handling.lib
-+++ b/pkgcore/ebuild/eapi-bash/exit-handling.lib
-@@ -5,7 +5,7 @@ assert() {
- 	local _pipestatus=${PIPESTATUS[*]}
- 	local x
- 	for x in ${_pipestatus}; do
--		[ "$x" != 0 ] && die "$@"
-+		[ "$x" -eq 0 ] || die "$@"
- 	done
- }
- 
--- 
-1.7.8.5
-
diff --git a/sys-apps/pkgcore/files/pkgcore-0.7.7.8-fix-resolver-assert.patch b/sys-apps/pkgcore/files/pkgcore-0.7.7.8-fix-resolver-assert.patch
deleted file mode 100644
index fa165a8b1137..000000000000
--- a/sys-apps/pkgcore/files/pkgcore-0.7.7.8-fix-resolver-assert.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From ac3e8f392ad61d8a3d455776a3df05e08e8d993c Mon Sep 17 00:00:00 2001
-From: Brian Harring <ferringb@gmail.com>
-Date: Wed, 11 Apr 2012 12:17:55 -0700
-Subject: [PATCH] Fix rollback support when reverting a replace affected by a
- blocker.
-
-Specifically, if the state is blocker !a:1 w/ a replace operation of
-a-1:1 -> a-2:2, that replace is fine.  Reverting the replace however
-would fail w/ an assertion error due to !a:1 catching a-1:1 during
-revert.
-
-Thus track the state, and only through the error if the blocker state
-for that package has somehow changed since we last looked (unlikely).
----
- pkgcore/resolver/pigeonholes.py |   11 ++++++++---
- pkgcore/resolver/state.py       |   14 ++++++++++----
- 2 files changed, 18 insertions(+), 7 deletions(-)
-
-diff --git a/pkgcore/resolver/pigeonholes.py b/pkgcore/resolver/pigeonholes.py
-index 112d53b..fc010e9 100644
---- a/pkgcore/resolver/pigeonholes.py
-+++ b/pkgcore/resolver/pigeonholes.py
-@@ -22,9 +22,10 @@ class PigeonHoledSlots(object):
- 
-         :return: any conflicting objs (empty list if inserted successfully).
-         """
--        key = obj.key
--        l = [x for x in self.limiters.get(key, ()) if x.match(obj)]
- 
-+        l = self.check_limiters(obj)
-+
-+        key = obj.key
-         dslot = obj.slot
-         l.extend(x for x in self.slot_dict.get(key, ()) if x.slot == dslot)
- 
-@@ -32,7 +33,6 @@ class PigeonHoledSlots(object):
-             self.slot_dict.setdefault(key, []).append(obj)
-         return l
- 
--
-     def get_conflicting_slot(self, pkg):
-         for x in self.slot_dict.get(pkg.key, ()):
-             if pkg.slot == x.slot:
-@@ -56,6 +56,11 @@ class PigeonHoledSlots(object):
-         self.limiters.setdefault(key, []).append(atom)
-         return self.find_atom_matches(atom, key=key)
- 
-+    def check_limiters(self, obj):
-+        """return any limiters conflicting w/ the psased in obj"""
-+        key = obj.key
-+        return [x for x in self.limiters.get(key, ()) if x.match(obj)]
-+
-     def remove_slotting(self, obj):
-         key = obj.key
-         # let the key error be thrown if they screwed up.
-diff --git a/pkgcore/resolver/state.py b/pkgcore/resolver/state.py
-index f4ad3c4..c14d9f9 100644
---- a/pkgcore/resolver/state.py
-+++ b/pkgcore/resolver/state.py
-@@ -198,24 +198,26 @@ class remove_op(base_op_state):
-         plan.vdb_filter.add(self.pkg)
- 
-     def revert(self, plan):
--        plan.state.fill_slotting(self.pkg, force=self.force)
-+        plan.state.fill_slotting(self.pkg, force=True)
-         plan.pkg_choices[self.pkg] = self.choices
-         plan.vdb_filter.remove(self.pkg)
- 
- 
- class replace_op(base_op_state):
- 
--    __slots__ = ("old_pkg", "old_choices")
-+    __slots__ = ("old_pkg", "old_choices", "force_old")
-     desc = "replace"
- 
-     def __init__(self, *args, **kwds):
-         base_op_state.__init__(self, *args, **kwds)
-         self.old_pkg, self.old_choices = None, None
-+        self.force_old = False
- 
-     def apply(self, plan):
-         revert_point = plan.current_state
-         old = plan.state.get_conflicting_slot(self.pkg)
-         # probably should just convert to an add...
-+        force_old = bool(plan.state.check_limiters(old))
-         assert old is not None
-         plan.state.remove_slotting(old)
-         old_choices = plan.pkg_choices[old]
-@@ -233,6 +235,7 @@ class replace_op(base_op_state):
-         # wipe olds blockers.
- 
-         self.old_pkg = old
-+        self.force_old = force_old
-         self.old_choices = old_choices
-         del plan.pkg_choices[old]
-         plan.pkg_choices[self.pkg] = self.choices
-@@ -243,8 +246,11 @@ class replace_op(base_op_state):
-         # far simpler, since the apply op generates multiple ops on it's own.
-         # all we have to care about is swap.
-         plan.state.remove_slotting(self.pkg)
--        l = plan.state.fill_slotting(self.old_pkg, force=self.force)
--        assert not l, "reverting a replace op %r, got %r from slotting" % (self, l)
-+        l = plan.state.fill_slotting(self.old_pkg, force=self.force_old)
-+        if bool(l) != self.force_old:
-+            raise AssertionError(
-+                "Internal error detected, unable to revert %s; got %s, "
-+                "force_old=%s " % (self, l, self.force_old))
-         del plan.pkg_choices[self.pkg]
-         plan.pkg_choices[self.old_pkg] = self.old_choices
-         plan.vdb_filter.remove(self.old_pkg)
--- 
-1.7.8.5
-