forgot the patch, thanks to Mr_bones for the reminder

Package-Manager: portage-2.1.2.7

3 files changed, 38 insertions, 8 deletions

diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog
index 6d4e6fa7974d..180b60481f9b 100644
--- a/sys-apps/pkgcore/ChangeLog
+++ b/sys-apps/pkgcore/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/pkgcore
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.39 2007/06/28 07:20:34 tsunam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.40 2007/06/28 08:12:37 tsunam Exp $
+
+  28 Jun 2007; Joshua Jackson <tsunam@gentoo.org>
+  +files/pkgcore-0.3.1-pmerge-unmerge-ask.patch:
+  Forgot the patch bumpage as well
 
 *pkgcore-0.3.1 (28 Jun 2007)
 
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index f8561cfde1ac..e52f5be72c1e 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -13,6 +13,10 @@ AUX pkgcore-0.3-pmerge-unmerge-ask.patch 859 RMD160 d053b4274a0ac1ff874b52444759
 MD5 32a909b8fc4a9d9eda3ae0942c0e1a80 files/pkgcore-0.3-pmerge-unmerge-ask.patch 859
 RMD160 d053b4274a0ac1ff874b52444759d97a7fb0f25b files/pkgcore-0.3-pmerge-unmerge-ask.patch 859
 SHA256 7fb52074a66fe2a9584f1766bd1e81a28ab62d458b334a6cc452679713cc375c files/pkgcore-0.3-pmerge-unmerge-ask.patch 859
+AUX pkgcore-0.3.1-pmerge-unmerge-ask.patch 859 RMD160 d053b4274a0ac1ff874b52444759d97a7fb0f25b SHA1 569938237d1d26c4c762210c4e891af09a429ebe SHA256 7fb52074a66fe2a9584f1766bd1e81a28ab62d458b334a6cc452679713cc375c
+MD5 32a909b8fc4a9d9eda3ae0942c0e1a80 files/pkgcore-0.3.1-pmerge-unmerge-ask.patch 859
+RMD160 d053b4274a0ac1ff874b52444759d97a7fb0f25b files/pkgcore-0.3.1-pmerge-unmerge-ask.patch 859
+SHA256 7fb52074a66fe2a9584f1766bd1e81a28ab62d458b334a6cc452679713cc375c files/pkgcore-0.3.1-pmerge-unmerge-ask.patch 859
 DIST pkgcore-0.1.4.tar.bz2 389388 RMD160 a4eadddfc55afad5c82277ae18d751e9b8e21a2a SHA1 6ebe98b4c0e7f37f6a9a3d0b5568e9b87712f46c SHA256 0c9cbe841d189924502ad17a52a0c3336862464c796c8c9f6fbde15915163b53
 DIST pkgcore-0.2.12.tar.bz2 562501 RMD160 197aede719a5ec229a8503b52b25b02469e38479 SHA1 119b97522100583171cc3b5d5098b05f12d3cab3 SHA256 2d0fc5cd9b223053b9832266f9378363218022cf5d1d7af0472b433107071013
 DIST pkgcore-0.2.13.tar.bz2 563424 RMD160 a5c7b87af67bd0458950a21905df492256dcb68e SHA1 11a66e65965aea738dc8d08089333c8df47f61fb SHA256 b173588dbcd0f4f9a847d8162f4709daa4f453531315db6d7a7f292bea10f78e
@@ -47,10 +51,10 @@ EBUILD pkgcore-0.3.ebuild 2108 RMD160 ac108dc1f01a0562ee98f43f6ea0cfc341f980ab S
 MD5 3737ad02e7650ddd4c1cbdd711eeb2de pkgcore-0.3.ebuild 2108
 RMD160 ac108dc1f01a0562ee98f43f6ea0cfc341f980ab pkgcore-0.3.ebuild 2108
 SHA256 5cc2272c0b62691ab1d3baa931eb151dd3d48156fcd5ad5d800d27fbb149d03b pkgcore-0.3.ebuild 2108
-MISC ChangeLog 5845 RMD160 a204bf7a6c72843f2f5c70d90eb30640dd65e56a SHA1 5ce1dc506ee754faffcdd6e49c9b9e53bb12265c SHA256 8d3ccdb682beefe4aef7c8fe1e08b006c8099d5bb3966d84322a23782ff059bb
-MD5 5f7a9152918df2ee7a95230d78419909 ChangeLog 5845
-RMD160 a204bf7a6c72843f2f5c70d90eb30640dd65e56a ChangeLog 5845
-SHA256 8d3ccdb682beefe4aef7c8fe1e08b006c8099d5bb3966d84322a23782ff059bb ChangeLog 5845
+MISC ChangeLog 5980 RMD160 0d0efeb1e4ada98f486bf342597f01f1c7426581 SHA1 521c1cff69effea3494e323e3b59f14b7a52b534 SHA256 8065433c421d0276facfdb1d22e3f650251e3328ec6de33df0c6841fee2eb4ed
+MD5 d1520c008bacdc5a5f773f872d55be70 ChangeLog 5980
+RMD160 0d0efeb1e4ada98f486bf342597f01f1c7426581 ChangeLog 5980
+SHA256 8065433c421d0276facfdb1d22e3f650251e3328ec6de33df0c6841fee2eb4ed ChangeLog 5980
 MISC metadata.xml 222 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 SHA1 95963907e0f22bc3795213303a68a2155b1ba78a SHA256 6e5dda05386711c829057f65bfd0e3ae693232628949c1612163ce9915963a63
 MD5 5dff6cc33967055cfde969cbcb7b6d5d metadata.xml 222
 RMD160 01bd2c9180f544353de73063bede0dd6b8ca6152 metadata.xml 222
@@ -79,7 +83,7 @@ SHA256 32445810958c059e5b488787cd160a129e08363b373cb08a5a30d6e68b306a77 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGg2FJ2ZWR0Jhg/EsRAtAsAJ4hcv9JiumTg5UuHBX/Al9zEvlRfgCfdALX
-+8umDKr6u4zJok3VdKLV/EI=
-=1XXk
+iD8DBQFGg2172ZWR0Jhg/EsRAm/OAJ4/D50Sr77qYG8c9+saIrw36ibIsACdGFEw
+5DBIG4MBHeYQsUNdMBxJKVc=
+=jkep
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pkgcore/files/pkgcore-0.3.1-pmerge-unmerge-ask.patch b/sys-apps/pkgcore/files/pkgcore-0.3.1-pmerge-unmerge-ask.patch
new file mode 100644
index 000000000000..541be270a5bd
--- /dev/null
+++ b/sys-apps/pkgcore/files/pkgcore-0.3.1-pmerge-unmerge-ask.patch
@@ -0,0 +1,22 @@
+=== modified file 'pkgcore/scripts/pmerge.py'
+--- pkgcore/scripts/pmerge.py	2007-06-06 21:01:31 +0000
++++ pkgcore/scripts/pmerge.py	2007-06-06 21:03:03 +0000
+@@ -174,7 +174,7 @@
+     """Raised internally to indicate an "expected" failure condition."""
+ 
+ 
+-def unmerge(out, err, vdb, tokens, options, world_set=None):
++def unmerge(out, err, vdb, tokens, options, formatter, world_set=None):
+     """Unmerge tokens. hackish, should be rolled back into the resolver"""
+     all_matches = set()
+     for token in tokens:
+@@ -311,7 +311,7 @@
+                 return 1
+         try:
+             unmerge(
+-                out, err, vdb, options.targets, options, world_set)
++                out, err, vdb, options.targets, options, formatter, world_set)
+         except (parserestrict.ParseError, Failure), e:
+             out.error(str(e))
+             return 1
+