drop dead patches from the files directory

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

4 files changed, 10 insertions, 148 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/Manifest b/sys-apps/pkgcore/Manifest
index 41e53e0de6e9..b1ad887f293d 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,8 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX pkgcore-0.7.7.8-ebuild-envs-assert.patch 878 SHA256 c25b07f88bcf99d12479e69da39ed4753a8cfbcc151669d952be8a45209f237b SHA512 dc34dfc64686eb26615900b9a73bbdc6b7cf4a602f07b1447ad605c9170ae663446896ed00871b993c6441c30f7bc6e135bf43647fa9f350426efd74b8510628 WHIRLPOOL 6f303b7130b84771b03888f92752893485b724e9bc36ce12dfbce02dfa0f91bdd9d67410bc24c021c990da93b27e1c01fa72d302b85108ba747b73a8159070bf
-AUX pkgcore-0.7.7.8-fix-resolver-assert.patch 4386 SHA256 ac33f503aacdc379d81022a658b4c3e0802fafcfe9ef7eb0efec3aebae7b422d SHA512 653ff143d43ad1e9e0b709d030ea042497527df2dfdabd48eec480ea187ff608155e029f09c8d1f1d9e18eaa88e1ebfe8c3819feba8158dbd132a4b6e34e9e46 WHIRLPOOL f733c6cd864b766c7901dc369d57dc5ca1819a60f4f7d1f65eae27a70ede22c877c7cfc1b2a053381f3f7dbf3fc99a833665cd17690d589ab08f2acc2bd8f537
 DIST pkgcore-0.8.4.tar.bz2 447101 SHA256 ca2ec9db3fcca87f9f5ea0560dc3fe1529c8ca274cd175ee58f43e4c94150df7 SHA512 b489d99b57482868e93fa5dc638528104d62b5546a85c25a1e44cb2b7c5993d3eec6631824929342c030dbb3503dcbb2ad838e3671dab4aecc264ca28ba051f7 WHIRLPOOL 19763e39aa8d7e6694d1f75401a4b11a1f8dac0bb196ac4bb15daec150d03a4e4f53bac16e4211d95c1a0c63bbc20367bb82fdecdf44977350d21ded96c74bf5
 DIST pkgcore-0.8.5.tar.bz2 446662 SHA256 17e1cbc8320a3cd1d92f9c00f23f638d115024a3244f7ca5105925ae43fde7bd SHA512 3a1295ed314b6b5366e0663d2efa61322fc391162a2eddb50a3f591f55a6d9d66d35c8aceee945996cd2282a7f72f4402a92ee0d836e5f4f568e9f0ed8d62c27 WHIRLPOOL 857fdaf7a1d09fcd4a0afbc9edfeb46bedd3a31c55f4591e8c3958d7d72cffd38bf3e38630122d73be24bf0f7a65dec5bd07353e2e694e61002cc82f45ace1cc
 DIST pkgcore-0.8.tar.bz2 442938 SHA256 5acafb875c3a52ea197d7acc9cd2b9a7ec8479e65e55a238555ad766d2cdbfcd SHA512 9b33595be3498f00312b1738e69d2114d1af568d8de7ef05a90af61cdf5e4f5ba6010d1bded5b3b57e530d56bf056232ee6f377fccb669456732c8f5a024040a WHIRLPOOL c7c30227324f8110370b7e3edcf092fb0ca96819e1ea3867ded4ae7fb7f5524242d593349e761c47f706bc78bd3849817b4591ab3e48aef46d70025416794eb1
@@ -10,12 +8,12 @@ EBUILD pkgcore-0.8.4.ebuild 1041 SHA256 78360cf4ef32668c84205d091941c21175e8575f
 EBUILD pkgcore-0.8.5-r1.ebuild 1043 SHA256 0ced8b6cbd051fa305db7763d16518bc9863d095d53655a5a637cf2386759519 SHA512 4de1ffdd1474d91330b14efaea2e8618e13947a5418cb583fb7f260d7694717ac96a8a5c223575a90abac3e5ed65fd4b40812558ab0a11a62f43d03ced782e1e WHIRLPOOL 004a7cf3c1b667fc7805b443864e0aa6be05a597ebc83d7eb7daf186b7c1c0d30aff82aa99f7d707f10fc08f2b3ca83a33a17b8705503e1696c512056a5c0c34
 EBUILD pkgcore-0.8.ebuild 1042 SHA256 23455065f4f13f6b0359fc8e0ea80b1f8ec982ec4c0f551b6cc7e7d0ddcb62a2 SHA512 0c58f1a3a2864dae0b98ad393c45d2e16c061d3c6389d651573519918cda3475fb2fbd5773321a6b0e9a762f748f92e37988d71e678db7d6e9774b1912ca83ad WHIRLPOOL 72003e5c091b77d996f4a5e0b32252f79c1a2a16ee265e87c3f40765e9d0dd4b40b06dbab2036ee9c64842a99a4e3b40c822823722163e0f32bb826d41f95ba3
 EBUILD pkgcore-9999.ebuild 1151 SHA256 657f5c16ca4fa52eec1dee84dc06e218a368d80954a3b0a041be6728c62a3d47 SHA512 eb2c90876a0a3b2d135c52b6a715a2d72793980e682c4ab6a7b061b1e1f08653ffb607da82d2d966ebce07c8f69413c45cb6529d0b52b273c1a736c0769b3713 WHIRLPOOL 271600e4edaf139bcdb2e1ca22225a5b0295c4f12707e4b9bac9e5f1aad992a825549ba43abdbe84f8bfbbe272d6c72029888419ee8418e1ffc59271aa8cedae
-MISC ChangeLog 28070 SHA256 77aae33bcc9a967704f72b4d6536c486579b68a9d1da425106fe1ecf3e2bb70f SHA512 7cf0cd625153d922f88f7cde2a8f6e32c6496e61440f810fdf9a88f43eaf0bcd524b953bcadc13dd89932cf87e8640ec4ccf77b30e1ce0f11f6a5ff37720398e WHIRLPOOL e3f440d7532430e3a325c972e9c5b08fe5d6f4c642e3bbdda860da4fc7442e87aaea49be3b0d65947f182a2a4e88a8bad352bab27dfcae0b68bc507a9380cd44
+MISC ChangeLog 28246 SHA256 089b8a76620d79c217a00ae26e7a8834f3d77111f6565cd86970024a5e027a33 SHA512 19cee1e3b889d3ab80aaecd9631a44a1dae7d59886c928f028c859c31d6e49b9ddaf6b1ab74edee5c669d6cd6d786b0cee00a3658b447b1cfad8064c4f34e2ca WHIRLPOOL 575d8a3b5c41902d9cc2788d5078930f07fc3442adbf7f1fab2f16ffede3e6d479f4ebae7cc0aaa53d88b51880dbf6087101cbc8ca93a5fb321b453e1a698750
 MISC metadata.xml 358 SHA256 9cd29ff0b62fdc004f8a686675df1175b7605ce6ad099d5aa278dfb212aced88 SHA512 8c3f044bf202ed5a84f1b55b7772f5952dfd92bea7d4b106ae83a39c35f3ba2c59422e8274d3d5d924791a54c927328a91b42f9a025f07ee5ba3e5b4a54fd442 WHIRLPOOL fe798c57417ecebb758aad533421b4b9ccf515cf71227d3aaa49da7ea377e87bcd5dbbc7d985556d7168d27dbe8e1a08f262e1a322e1309e32e9995487888848
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCBoPoACgkQsiLx3HvNzge9GQCgh2XlP3OyUFWc528MRcOfzidn
-TqQAn36oXLfklAsTfzFmKXChV2VtfZHl
-=Pr0X
+iEYEAREIAAYFAlCElj4ACgkQsiLx3HvNzgcuRwCgomZ2Ysogxb3qRgbK6avhDkh1
+i/QAmwSBl/YaV1xLutGCuRnnd19aDA6G
+=p5oo
 -----END PGP SIGNATURE-----
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
-