diff options
| author |   Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2011-06-22 22:53:30 +0200 |
|---|---|---|
| committer | Marc-Antoine Perennou <Marc-Antoine@Perennou.com> | 2011-06-22 23:03:17 +0200 |
| commit | 55a8e75819212c2f3e3dcd51dfdc24759085f684 (patch) | |
| tree | e3836dd8f80560f15643493554d970852f5385e8 /sys-apps | |
| parent | simplify a bit (diff) | |
| download | keruspe-55a8e75819212c2f3e3dcd51dfdc24759085f684.tar.gz keruspe-55a8e75819212c2f3e3dcd51dfdc24759085f684.tar.bz2 keruspe-55a8e75819212c2f3e3dcd51dfdc24759085f684.zip | |
update paludis patchset
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/paludis/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/paludis/files/0001-paludis-sort-world.patch | 4 | ||||
| -rw-r--r-- | sys-apps/paludis/files/0002-cave-resolve-ask.patch | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sys-apps/paludis/Manifest b/sys-apps/paludis/Manifest index bd0a876d..c482e2fd 100644 --- a/sys-apps/paludis/Manifest +++ b/sys-apps/paludis/Manifest @@ -1,3 +1,3 @@ -AUX 0001-paludis-sort-world.patch 6311 RMD160 15a2b86033389e11040202f339781aa8e3b3c5b6 SHA1 8351a9eed740d5103121c83a13cb930396eb42cf SHA256 98aa98be577781bb2d3fb0d6406b7515b72f01f4ddabb0e56bc02a83ffa2eba8 -AUX 0002-cave-resolve-ask.patch 8355 RMD160 f6c62903d7fc834ad333b2cea28f146f28233b66 SHA1 7a90fdabec67c9f49475c9c57a49bed4b3275caa SHA256 a604a3232f8b1450d2821c8a07d9cd03a5eacc01c94f333535ba3848b1996e14 +AUX 0001-paludis-sort-world.patch 6309 RMD160 aed7ebcd6584cb48c9078b7b0f25686c8bd7c16a SHA1 ca105295391c8869f4f1a38b7689d08efdcc6a0a SHA256 b1f40b94776ea05d109d6b8c6ae3abf31cb362f5241beac8c3e30adb605f7650 +AUX 0002-cave-resolve-ask.patch 8368 RMD160 5fc2de9fa90551a255fcebd8926e5bd121781c1f SHA1 7a5df81d45d20f9867bbf5344fc1504d72fb23f0 SHA256 fb5d1519f60f354401a3b3450ad5284f28c42a7aaa032d6f8c5647447c42d708 EBUILD paludis-9999.ebuild 3856 RMD160 fe538afa55e7877079e03e6ecfe9025b1e294b77 SHA1 603aad5b61ecf52d8c97741e79a78ff627da1392 SHA256 99c4fc809632474cddb08adc67d6d55720d2004b5c187ec1d7d8d849da7d5b69 diff --git a/sys-apps/paludis/files/0001-paludis-sort-world.patch b/sys-apps/paludis/files/0001-paludis-sort-world.patch index ec446f30..f2f96a82 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 56dcc8a921e96085afd9154226fd5ba7ab147786 Mon Sep 17 00:00:00 2001 +From d8c939211426b1754fc8c28f5c6d5f9e11c54842 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/2] paludis sort world @@ -208,5 +208,5 @@ index e3a853c..019ccbb 100644 */ void rewrite() const; -- -1.7.6.rc1.1.g2c162b.dirty +1.7.6.rc2.8.g28eb.dirty diff --git a/sys-apps/paludis/files/0002-cave-resolve-ask.patch b/sys-apps/paludis/files/0002-cave-resolve-ask.patch index 15337393..8de08233 100644 --- a/sys-apps/paludis/files/0002-cave-resolve-ask.patch +++ b/sys-apps/paludis/files/0002-cave-resolve-ask.patch @@ -1,4 +1,4 @@ -From 0bd45d930737092c9c754386666d800fbefc60ad Mon Sep 17 00:00:00 2001 +From 0a0f409268b713108bc487b060605802e2c6c6bb 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/2] cave resolve ask @@ -41,7 +41,7 @@ index a43287f..ef6ba64 100644 <p>Non-Problem: Paludis doesn't restore the xterm title on exit.</p> diff --git a/src/clients/cave/cmd_execute_resolution.cc b/src/clients/cave/cmd_execute_resolution.cc -index b9b71c1..260bd0d 100644 +index b9b71c1..568af40 100644 --- a/src/clients/cave/cmd_execute_resolution.cc +++ b/src/clients/cave/cmd_execute_resolution.cc @@ -104,7 +104,8 @@ namespace @@ -95,7 +95,7 @@ index b9b71c1..260bd0d 100644 retcode |= execute_pretends(env, lists, cmdline); + + if ((! cmdline.a_pretend.specified()) && cmdline.a_ask.specified() && lists->execute_job_list()->length() != 0 && (! do_ask())) -+ cmdline.a_pretend.set_specified(true); ++ cmdline.a_pretend.set_specified(args::aos_specified); + if (0 != retcode || cmdline.a_pretend.specified()) return retcode; @@ -118,7 +118,7 @@ index e0a7f2a..9985df5 100644 std::string app_name() const diff --git a/src/clients/cave/resolve_cmdline.cc b/src/clients/cave/resolve_cmdline.cc -index 90252b0..6b1ad27 100644 +index 82abf30..7033c28 100644 --- a/src/clients/cave/resolve_cmdline.cc +++ b/src/clients/cave/resolve_cmdline.cc @@ -46,6 +46,7 @@ ResolveCommandLineResolutionOptions::ResolveCommandLineResolutionOptions(args::A @@ -142,7 +142,7 @@ index 8bdd0b4..589230c 100644 args::ArgsGroup g_convenience_options; args::SwitchArg a_lazy; diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc -index b095dfc..d1727a2 100644 +index 3ddbddb..2770932 100644 --- a/src/clients/cave/resolve_common.cc +++ b/src/clients/cave/resolve_common.cc @@ -427,6 +427,8 @@ namespace @@ -155,7 +155,7 @@ index b095dfc..d1727a2 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 7067fa8..cd774bb 100644 +index 7dd5afe..e47f43f 100644 --- a/zsh-completion/_cave +++ b/zsh-completion/_cave @@ -666,6 +666,7 @@ _cave_cmd_report() @@ -167,5 +167,5 @@ index 7067fa8..cd774bb 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.6.rc1.1.g2c162b.dirty +1.7.6.rc2.8.g28eb.dirty |