update paludis patchset

4 files changed, 25 insertions, 25 deletions

diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest
index 2af22dd2..648e40c9 100644
--- a/sys-apps/paludis/Manifest
+++ b/sys-apps/paludis/Manifest
@@ -1,4 +1,4 @@
-AUX 0001-paludis-sort-world.patch 6416 RMD160 e44d1ffe38023bbbe2ec42183b86c29cc9336f93 SHA1 b226f262d9da201d9f6c8ac00245b25776e37f1d SHA256 082d9a9dcc8932ea780682c9b12871e8c257f5159b7ff4039878093402b5f589
-AUX 0002-paludis-ask.patch 13069 RMD160 1cdbe33c80f4148832e3c85fecdca3adbb97a616 SHA1 944d83c85c34a5edb3e76a0e2e985b3eea8ad18a SHA256 6f6bb027f7b237b780340a07424d622f29109639b29af87b2becc9362fe4bdf6
-AUX 0003-cave-resolve-ask.patch 9429 RMD160 855a6dd15dfd4e3338bd53bb525878e1b21d8c39 SHA1 b66b5d43e0eab2bedee136f9a14ca2dcb6348d01 SHA256 c52f491fe592cde8db57aa45c80a3529dc4197d2bbcc35e30badacc179e24125
+AUX 0001-paludis-sort-world.patch 6416 RMD160 33d3ed9a0861215025dcd764f8747ebe1a247898 SHA1 25dedea5c230cc41d1ce27f885f9255ef9c7b4f6 SHA256 925cfcefd21363802fc6896f11243a7c31dd5f8fac0554f5b5c2dcea050358ae
+AUX 0002-paludis-ask.patch 13069 RMD160 f7a222eca5e49fb7353f20b62510006ce05f2887 SHA1 ddb4cee275da30401d6d23739956288858a6cf8c SHA256 a5fa2f2654a3aa5fd65b137fd86d28ea0e4bea606d6dcffbb2a8290b31680b84
+AUX 0003-cave-resolve-ask.patch 9444 RMD160 db4672ae5b6c5399f621869a74599e5e66fc71ab SHA1 17f069650518af1d720d6d7ec79a7e0a1f301f6c SHA256 26cf7ce69c893861f13c569e2eeccc9f1d6c21098ed7e0ee5264a1e794fb98c9
 EBUILD paludis-9999.ebuild 5138 RMD160 d7ece3dac6d63d68f547c1ba4be9b78b60a94ab0 SHA1 849755072fae22b04aae9e338ccef38b06a9f3ac SHA256 7ff344fccec0b581976a27905859d4b124ca4a8f1ee5e775f65649bcbf2d410b
diff --git a/sys-apps/paludis/files/0001-paludis-sort-world.patch b/sys-apps/paludis/files/0001-paludis-sort-world.patch
index 90f419c2..c5a66575 100644
--- a/sys-apps/paludis/files/0001-paludis-sort-world.patch
+++ b/sys-apps/paludis/files/0001-paludis-sort-world.patch
@@ -1,4 +1,4 @@
-From 593a60910311d2ddf52d6c9555db22ec5c08d0f5 Mon Sep 17 00:00:00 2001
+From 288cdd096ee19d170eaaa0ce887f96c2ff1a4a2c Mon Sep 17 00:00:00 2001
 From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
 Date: Mon, 26 Jul 2010 18:17:27 +0200
 Subject: [PATCH 1/3] paludis sort world
@@ -208,5 +208,5 @@ index 78d18bb..02f4656 100644
               */
              void rewrite() const;
 -- 
-1.7.3.2.164.g6f10c.dirty
+1.7.3.2.245.g03276.dirty
 
diff --git a/sys-apps/paludis/files/0002-paludis-ask.patch b/sys-apps/paludis/files/0002-paludis-ask.patch
index 62c98df2..c407f6b6 100644
--- a/sys-apps/paludis/files/0002-paludis-ask.patch
+++ b/sys-apps/paludis/files/0002-paludis-ask.patch
@@ -1,4 +1,4 @@
-From 579f2664230e7ce51cba3661e3f49a95f146f316 Mon Sep 17 00:00:00 2001
+From a8ad1e341f2f085e3fdb11ef07c6622339dddb38 Mon Sep 17 00:00:00 2001
 From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
 Date: Mon, 26 Jul 2010 18:38:14 +0200
 Subject: [PATCH 2/3] paludis ask
@@ -335,5 +335,5 @@ index f3fb939..e32cad4 100644
          "(--preserve-world -1)"{--preserve-world,-1}"[Don't modify the world file]"
          "--add-to-world-spec[Use this atom, rather than all targets, for updating world (for resume commands)]"
 -- 
-1.7.3.2.164.g6f10c.dirty
+1.7.3.2.245.g03276.dirty
 
diff --git a/sys-apps/paludis/files/0003-cave-resolve-ask.patch b/sys-apps/paludis/files/0003-cave-resolve-ask.patch
index 5c5dbd52..ec4b38f8 100644
--- a/sys-apps/paludis/files/0003-cave-resolve-ask.patch
+++ b/sys-apps/paludis/files/0003-cave-resolve-ask.patch
@@ -1,4 +1,4 @@
-From 37ac77c387f866f4ad230ded8149a8c3cbd86b33 Mon Sep 17 00:00:00 2001
+From a4ed01fa399c48ac511ec24b6fdf46d4303ee834 Mon Sep 17 00:00:00 2001
 From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
 Date: Sat, 7 Aug 2010 11:00:13 +0200
 Subject: [PATCH 3/3] cave resolve ask
@@ -6,14 +6,14 @@ Subject: [PATCH 3/3] cave resolve ask
 ---
  src/clients/cave/cmd_execute_resolution.cc |   46 ++++++++++++++++++++++-----
  src/clients/cave/cmd_resolve.cc            |    6 ++--
- src/clients/cave/cmd_resolve_cmdline.cc    |    1 +
- src/clients/cave/cmd_resolve_cmdline.hh    |    1 +
+ src/clients/cave/resolve_cmdline.cc        |    1 +
+ src/clients/cave/resolve_cmdline.hh        |    1 +
  src/clients/cave/resolve_common.cc         |    2 +
  zsh-completion/_cave                       |    1 +
  6 files changed, 45 insertions(+), 12 deletions(-)
 
 diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc
-index dab4d3b..2bb546c 100644
+index a775bf5..4f1f749 100644
 --- a/src/clients/cave/cmd_execute_resolution.cc
 +++ b/src/clients/cave/cmd_execute_resolution.cc
 @@ -104,6 +104,7 @@ namespace
@@ -128,7 +128,7 @@ index dab4d3b..2bb546c 100644
                      make_null_shared_ptr()).max_exit_status())
              throw ActionAbortedError("Aborted by hook");
 diff --git a/src/clients/cave/cmd_resolve.cc b/src/clients/cave/cmd_resolve.cc
-index 7d01f1d..8fd9228 100644
+index 7845acb..af3f01a 100644
 --- a/src/clients/cave/cmd_resolve.cc
 +++ b/src/clients/cave/cmd_resolve.cc
 @@ -49,9 +49,9 @@ namespace
@@ -144,22 +144,22 @@ index 7d01f1d..8fd9228 100644
          }
  
          std::string app_name() const
-diff --git a/src/clients/cave/cmd_resolve_cmdline.cc b/src/clients/cave/cmd_resolve_cmdline.cc
-index d73161f..7e29e2b 100644
---- a/src/clients/cave/cmd_resolve_cmdline.cc
-+++ b/src/clients/cave/cmd_resolve_cmdline.cc
+diff --git a/src/clients/cave/resolve_cmdline.cc b/src/clients/cave/resolve_cmdline.cc
+index 29531a5..902191e 100644
+--- a/src/clients/cave/resolve_cmdline.cc
++++ b/src/clients/cave/resolve_cmdline.cc
 @@ -46,6 +46,7 @@ ResolveCommandLineResolutionOptions::ResolveCommandLineResolutionOptions(args::A
      ArgsSection(h, "Resolution Options"),
      g_execution_options(this, "Execution Options", "Control execution."),
      a_execute(&g_execution_options, "execute", 'x', "Execute the suggested actions", true),
 +    a_ask(&g_execution_options, "ask", '?', "Ask before executing", true),
  
-     g_convenience_options(this, "Convenience Options", "Broad behaviour options."),
-     a_lazy(&g_convenience_options, "lazy", 'z', "Do as little work as possible.", true),
-diff --git a/src/clients/cave/cmd_resolve_cmdline.hh b/src/clients/cave/cmd_resolve_cmdline.hh
-index 67d0663..dc916b3 100644
---- a/src/clients/cave/cmd_resolve_cmdline.hh
-+++ b/src/clients/cave/cmd_resolve_cmdline.hh
+     g_convenience_options(this, "Convenience Options", "Broad behaviour options. These options are simply "
+             "a convenient way of selecting common groups of other options; see individual option descriptions "
+diff --git a/src/clients/cave/resolve_cmdline.hh b/src/clients/cave/resolve_cmdline.hh
+index 41f441f..8f98b97 100644
+--- a/src/clients/cave/resolve_cmdline.hh
++++ b/src/clients/cave/resolve_cmdline.hh
 @@ -36,6 +36,7 @@ namespace paludis
  
              args::ArgsGroup g_execution_options;
@@ -182,10 +182,10 @@ index 2eb7c64..5176e4c 100644
          for (Sequence<std::string>::ConstIterator p(world_specs->begin()), p_end(world_specs->end()) ;
                  p != p_end ; ++p)
 diff --git a/zsh-completion/_cave b/zsh-completion/_cave
-index 5fe9cf9..a46bcf2 100644
+index 0bc9660..79d7097 100644
 --- a/zsh-completion/_cave
 +++ b/zsh-completion/_cave
-@@ -540,6 +540,7 @@ _cave_cmd_report()
+@@ -570,6 +570,7 @@ _cave_cmd_report()
  _cave_resolve_arguments=(
      '(--help -h)'{--help,-h}'[Display help messsage]' \
      '(--execute -x --no-execute)'{--execute,-x,--no-execute}'[Execute the suggested actions]' \
@@ -194,5 +194,5 @@ index 5fe9cf9..a46bcf2 100644
      '(--lazy -z --complete -c --everything -e --no-lazy --no-complete --no-everything)'{--complete,-c,--no-complete}'[Do all optional work]' \
      '(--lazy -z --complete -c --everything -e --no-lazy --no-complete --no-everything)'{--everything,-e,--no-everything}'[Do all optional work, and also reinstall]' \
 -- 
-1.7.3.2.164.g6f10c.dirty
+1.7.3.2.245.g03276.dirty