Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 767598 Details for
Bug 782244
app-admin/keepassxc-2.6.4-r2 - add missing DEPENDencies
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
0002-app-admin-keepassxc-remove-USE-ccache.patch
0002-app-admin-keepassxc-remove-USE-ccache.patch (text/plain), 23.95 KB, created by
Sam James
on 2022-03-22 21:23:06 UTC
(
hide
)
Description:
0002-app-admin-keepassxc-remove-USE-ccache.patch
Filename:
MIME Type:
Creator:
Sam James
Created:
2022-03-22 21:23:06 UTC
Size:
23.95 KB
patch
obsolete
> > ><!DOCTYPE html> ><html lang="en"> ><head> > <!-- Mercurial head: 55d5146 --> > <meta charset="utf-8"> > <meta http-equiv="x-ua-compatible" content="ie=edge"> > <meta name="google-site-verification" content="m41-YA2o4kXb32RmyuClA1zAXZCyaGaDEUj1QIc5bmc" /> > <title>dpaste: 0002-app-admin-keepassxc-remove-USE-ccache.patch</title> > <meta name="viewport" content="width=device-width, initial-scale=1"> > > <link rel="icon" type="image/x-icon" href="https://dpaste.b-cdn.net/static/pastebin/favicon.ico"> > <link rel="icon" type="image/png" sizes="32x32" href="https://dpaste.b-cdn.net/static/pastebin/favicon-32x32.png"> > <link rel="icon" type="image/png" sizes="16x16" href="https://dpaste.b-cdn.net/static/pastebin/favicon-16x16.png"> > <link rel="apple-touch-icon" sizes="180x180" href="https://dpaste.b-cdn.net/static/pastebin/apple-touch-icon.png"> > <link rel="manifest" href="https://dpaste.b-cdn.net/static/pastebin/site.webmanifest"> > > <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script> > <script defer src="https://media.ethicalads.io/media/client/ethicalads.min.js"></script> > > ><script src="https://cdn.jsdelivr.net/npm/shareon@2/dist/shareon.iife.js" type="text/javascript" defer init></script> ><link href="https://cdn.jsdelivr.net/npm/shareon@2/dist/shareon.min.css" rel="stylesheet"> ><script> > function key(event, letter) { > return (event.charCode == letter.charCodeAt() || event.charCode == letter.charCodeAt() + 32) > } > function subview_redirect(path_end) { > // Drop line anchor and/or syntax-override extension for proper base > location.href = location.pathname.split('#')[0].split('.')[0] + path_end; > } > function indicate_wrap() { $("#softwrap_toggle").text("UNWRAP"); location.hash = "wrap"; } > function indicate_unwrap() { $("#softwrap_toggle").text("SOFT WRAP"); location.hash = ""; } > function softwrap_toggle() { > $("pre").toggleClass("softwrap"); > $(".linenodiv").toggle(); > if ($("#softwrap_toggle").text() == "SOFT WRAP") { indicate_wrap(); } > else { indicate_unwrap(); } > } > function toggle_star() { > $.ajax({type:"POST", url:"/api/v2/star/36D2A7TCV"}); > if ($("#toggle_star").html() == "â") { $("#toggle_star").html("★") } > else { $("#toggle_star").html("☆") } > } > function mark_linked_line() { > $('.linemark').remove(); > $('a[href="'+location.hash+'"]').after('<svg height="10" width="16" class="linemark"> <polygon points="3,0 15,4 3,9" style="fill:#99f"></svg>'); > } > function copy_to_clipboard() { > if (!navigator.clipboard) { > console.log("Clipboard API not available") > return > } > try { > navigator.clipboard.writeText($('#raw-content').html()) > $('#copy-success').show() > } catch (err) { > console.error('Copying raw content failed: ', err) > } > > } > $(document).ready(function() { > window.onhashchange = mark_linked_line > if (location.hash == "#wrap") { softwrap_toggle(); indicate_wrap(); } > if (location.hash.indexOf("#line-") === 0) { mark_linked_line(); } > $("#softwrap_toggle").click(softwrap_toggle); > $("#toggle_star").click(toggle_star); > $('#copy-button').click(copy_to_clipboard) > }); > $(document).keypress(function(event){ > if (key(event, 'W')) { softwrap_toggle(); } > // For pastes only, not diffs > if (key(event, 'C')) { copy_to_clipboard() } > if (key(event, 'D')) { subview_redirect('/duplicate/') } > if (key(event, 'R')) { subview_redirect('.txt') } > if (key(event, '*')) { toggle_star() } > > > > }); > > $(document).keyup(function(event){ > if (event.keyCode == 8 || event.keyCode == 46) { subview_redirect('/delete/'); } > }); ></script> > > > <link rel="stylesheet" href="https://dpaste.b-cdn.net/static/pastebin/css/normalize.css"> > <link rel="stylesheet" href="https://dpaste.b-cdn.net/static/pastebin/css/skeleton.css"> > <link rel="stylesheet" href="https://dpaste.b-cdn.net/static/pastebin/css/main.css"> > <link href="https://fonts.googleapis.com/css2?family=Fira+Sans:wght@400;700&display=swap" rel="stylesheet"> > <link href="https://fonts.googleapis.com/css?family=Fira+Mono" rel="stylesheet"> > > <style> > > pre { line-height: 125%; } >td.linenos .normal { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } >span.linenos { color: inherit; background-color: transparent; padding-left: 5px; padding-right: 5px; } >td.linenos .special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } >span.linenos.special { color: #000000; background-color: #ffffc0; padding-left: 5px; padding-right: 5px; } >.highlight .hll { background-color: #ffffcc } >.highlight { background: #f8f8f8; } >.highlight .c { color: #408080; font-style: italic } /* Comment */ >.highlight .err { border: 1px solid #FF0000 } /* Error */ >.highlight .k { color: #008000; font-weight: bold } /* Keyword */ >.highlight .o { color: #666666 } /* Operator */ >.highlight .ch { color: #408080; font-style: italic } /* Comment.Hashbang */ >.highlight .cm { color: #408080; font-style: italic } /* Comment.Multiline */ >.highlight .cp { color: #BC7A00 } /* Comment.Preproc */ >.highlight .cpf { color: #408080; font-style: italic } /* Comment.PreprocFile */ >.highlight .c1 { color: #408080; font-style: italic } /* Comment.Single */ >.highlight .cs { color: #408080; font-style: italic } /* Comment.Special */ >.highlight .gd { color: #A00000 } /* Generic.Deleted */ >.highlight .ge { font-style: italic } /* Generic.Emph */ >.highlight .gr { color: #FF0000 } /* Generic.Error */ >.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */ >.highlight .gi { color: #00A000 } /* Generic.Inserted */ >.highlight .go { color: #888888 } /* Generic.Output */ >.highlight .gp { color: #000080; font-weight: bold } /* Generic.Prompt */ >.highlight .gs { font-weight: bold } /* Generic.Strong */ >.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ >.highlight .gt { color: #0044DD } /* Generic.Traceback */ >.highlight .kc { color: #008000; font-weight: bold } /* Keyword.Constant */ >.highlight .kd { color: #008000; font-weight: bold } /* Keyword.Declaration */ >.highlight .kn { color: #008000; font-weight: bold } /* Keyword.Namespace */ >.highlight .kp { color: #008000 } /* Keyword.Pseudo */ >.highlight .kr { color: #008000; font-weight: bold } /* Keyword.Reserved */ >.highlight .kt { color: #B00040 } /* Keyword.Type */ >.highlight .m { color: #666666 } /* Literal.Number */ >.highlight .s { color: #BA2121 } /* Literal.String */ >.highlight .na { color: #7D9029 } /* Name.Attribute */ >.highlight .nb { color: #008000 } /* Name.Builtin */ >.highlight .nc { color: #0000FF; font-weight: bold } /* Name.Class */ >.highlight .no { color: #880000 } /* Name.Constant */ >.highlight .nd { color: #AA22FF } /* Name.Decorator */ >.highlight .ni { color: #999999; font-weight: bold } /* Name.Entity */ >.highlight .ne { color: #D2413A; font-weight: bold } /* Name.Exception */ >.highlight .nf { color: #0000FF } /* Name.Function */ >.highlight .nl { color: #A0A000 } /* Name.Label */ >.highlight .nn { color: #0000FF; font-weight: bold } /* Name.Namespace */ >.highlight .nt { color: #008000; font-weight: bold } /* Name.Tag */ >.highlight .nv { color: #19177C } /* Name.Variable */ >.highlight .ow { color: #AA22FF; font-weight: bold } /* Operator.Word */ >.highlight .w { color: #bbbbbb } /* Text.Whitespace */ >.highlight .mb { color: #666666 } /* Literal.Number.Bin */ >.highlight .mf { color: #666666 } /* Literal.Number.Float */ >.highlight .mh { color: #666666 } /* Literal.Number.Hex */ >.highlight .mi { color: #666666 } /* Literal.Number.Integer */ >.highlight .mo { color: #666666 } /* Literal.Number.Oct */ >.highlight .sa { color: #BA2121 } /* Literal.String.Affix */ >.highlight .sb { color: #BA2121 } /* Literal.String.Backtick */ >.highlight .sc { color: #BA2121 } /* Literal.String.Char */ >.highlight .dl { color: #BA2121 } /* Literal.String.Delimiter */ >.highlight .sd { color: #BA2121; font-style: italic } /* Literal.String.Doc */ >.highlight .s2 { color: #BA2121 } /* Literal.String.Double */ >.highlight .se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */ >.highlight .sh { color: #BA2121 } /* Literal.String.Heredoc */ >.highlight .si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */ >.highlight .sx { color: #008000 } /* Literal.String.Other */ >.highlight .sr { color: #BB6688 } /* Literal.String.Regex */ >.highlight .s1 { color: #BA2121 } /* Literal.String.Single */ >.highlight .ss { color: #19177C } /* Literal.String.Symbol */ >.highlight .bp { color: #008000 } /* Name.Builtin.Pseudo */ >.highlight .fm { color: #0000FF } /* Name.Function.Magic */ >.highlight .vc { color: #19177C } /* Name.Variable.Class */ >.highlight .vg { color: #19177C } /* Name.Variable.Global */ >.highlight .vi { color: #19177C } /* Name.Variable.Instance */ >.highlight .vm { color: #19177C } /* Name.Variable.Magic */ >.highlight .il { color: #666666 } /* Literal.Number.Integer.Long */ > .linenos { padding-right: 0 } > .softwrap { white-space: pre-wrap; } > h1 i { color: #888;} > td.code { padding-left: 0 } > #copy-success { color: #fff; font-weight: bold } > > </style> > </head> > <body> > <div id='container'> > <div class="topbuttons"> > > <a href="/accounts/login/" class="button"><b>Log in</b></a> > > <a href="/" title="Create a new paste" > class=" button">New</a> > <a href="/api/v2/" title="Paste creation API" > class=" button">API</a> > <a href="/help" title="Usage tips" > class=" button">Help</a> > <a href="/about" title="Colophon, backstory, stats, tweets" > class=" button">About</a> > </div> > > > ><h1>0002-app-admin-keepassxc-remove-USE-ccache.patch</h1> ><div class="row"> > > > >2.5Â KB of <strong>Plain text</strong><br> >Created 17Â seconds ago > > > — expires in <strong>1 day</strong> > ><span style="display:none"><br>https://dpaste.com/36D2A7TCV</span> > ></div> ><div class="row actionbuttons"> > ><a id="copy-button" title="Copy raw content (shortcut: 'C'">COPY TO CLIPBOARD<span id="copy-success" hidden> ✔</span></a> ><a id="softwrap_toggle" title="Toggle visual wrap of long lines (shortcut: 'W')">SOFT WRAP</a> ><a href="/36D2A7TCV.txt" title="Plaintext version (shortcut: 'R')">RAW TEXT</a> > ><a href="/36D2A7TCV/duplicate/" title="Make a new paste based on this one (shortcut: 'D')">DUPLICATE</a> ><a href="/36D2A7TCV/diff" title="Diff this paste against another one">DIFF</a> > ></div> > ><table class="highlighttable"><tr><td class="linenos"><div class="linenodiv"><pre><span class="normal"><a href="#line-1"> 1</a></span> ><span class="normal"><a href="#line-2"> 2</a></span> ><span class="normal"><a href="#line-3"> 3</a></span> ><span class="normal"><a href="#line-4"> 4</a></span> ><span class="normal"><a href="#line-5"> 5</a></span> ><span class="normal"><a href="#line-6"> 6</a></span> ><span class="normal"><a href="#line-7"> 7</a></span> ><span class="normal"><a href="#line-8"> 8</a></span> ><span class="normal"><a href="#line-9"> 9</a></span> ><span class="normal"><a href="#line-10">10</a></span> ><span class="normal"><a href="#line-11">11</a></span> ><span class="normal"><a href="#line-12">12</a></span> ><span class="normal"><a href="#line-13">13</a></span> ><span class="normal"><a href="#line-14">14</a></span> ><span class="normal"><a href="#line-15">15</a></span> ><span class="normal"><a href="#line-16">16</a></span> ><span class="normal"><a href="#line-17">17</a></span> ><span class="normal"><a href="#line-18">18</a></span> ><span class="normal"><a href="#line-19">19</a></span> ><span class="normal"><a href="#line-20">20</a></span> ><span class="normal"><a href="#line-21">21</a></span> ><span class="normal"><a href="#line-22">22</a></span> ><span class="normal"><a href="#line-23">23</a></span> ><span class="normal"><a href="#line-24">24</a></span> ><span class="normal"><a href="#line-25">25</a></span> ><span class="normal"><a href="#line-26">26</a></span> ><span class="normal"><a href="#line-27">27</a></span> ><span class="normal"><a href="#line-28">28</a></span> ><span class="normal"><a href="#line-29">29</a></span> ><span class="normal"><a href="#line-30">30</a></span> ><span class="normal"><a href="#line-31">31</a></span> ><span class="normal"><a href="#line-32">32</a></span> ><span class="normal"><a href="#line-33">33</a></span> ><span class="normal"><a href="#line-34">34</a></span> ><span class="normal"><a href="#line-35">35</a></span> ><span class="normal"><a href="#line-36">36</a></span> ><span class="normal"><a href="#line-37">37</a></span> ><span class="normal"><a href="#line-38">38</a></span> ><span class="normal"><a href="#line-39">39</a></span> ><span class="normal"><a href="#line-40">40</a></span> ><span class="normal"><a href="#line-41">41</a></span> ><span class="normal"><a href="#line-42">42</a></span> ><span class="normal"><a href="#line-43">43</a></span> ><span class="normal"><a href="#line-44">44</a></span> ><span class="normal"><a href="#line-45">45</a></span> ><span class="normal"><a href="#line-46">46</a></span> ><span class="normal"><a href="#line-47">47</a></span> ><span class="normal"><a href="#line-48">48</a></span> ><span class="normal"><a href="#line-49">49</a></span> ><span class="normal"><a href="#line-50">50</a></span> ><span class="normal"><a href="#line-51">51</a></span> ><span class="normal"><a href="#line-52">52</a></span> ><span class="normal"><a href="#line-53">53</a></span> ><span class="normal"><a href="#line-54">54</a></span> ><span class="normal"><a href="#line-55">55</a></span> ><span class="normal"><a href="#line-56">56</a></span> ><span class="normal"><a href="#line-57">57</a></span> ><span class="normal"><a href="#line-58">58</a></span> ><span class="normal"><a href="#line-59">59</a></span> ><span class="normal"><a href="#line-60">60</a></span> ><span class="normal"><a href="#line-61">61</a></span> ><span class="normal"><a href="#line-62">62</a></span> ><span class="normal"><a href="#line-63">63</a></span> ><span class="normal"><a href="#line-64">64</a></span> ><span class="normal"><a href="#line-65">65</a></span> ><span class="normal"><a href="#line-66">66</a></span> ><span class="normal"><a href="#line-67">67</a></span> ><span class="normal"><a href="#line-68">68</a></span> ><span class="normal"><a href="#line-69">69</a></span> ><span class="normal"><a href="#line-70">70</a></span> ><span class="normal"><a href="#line-71">71</a></span> ><span class="normal"><a href="#line-72">72</a></span> ><span class="normal"><a href="#line-73">73</a></span> ><span class="normal"><a href="#line-74">74</a></span> ><span class="normal"><a href="#line-75">75</a></span> ><span class="normal"><a href="#line-76">76</a></span> ><span class="normal"><a href="#line-77">77</a></span> ><span class="normal"><a href="#line-78">78</a></span> ><span class="normal"><a href="#line-79">79</a></span> ><span class="normal"><a href="#line-80">80</a></span> ><span class="normal"><a href="#line-81">81</a></span> ><span class="normal"><a href="#line-82">82</a></span></pre></div></td><td class="code"><div class="highlight"><pre><span></span><a id="line-1" name="line-1"></a>From 2b0eeebd18e1c1998a32ad72c0d83d6abd9b8b19 Mon Sep 17 00:00:00 2001 ><a id="line-2" name="line-2"></a>From: Sam James <sam@gentoo.org> ><a id="line-3" name="line-3"></a>Date: Tue, 22 Mar 2022 21:18:19 +0000 ><a id="line-4" name="line-4"></a>Subject: [PATCH 2/2] app-admin/keepassxc: remove USE=ccache ><a id="line-5" name="line-5"></a> ><a id="line-6" name="line-6"></a>Gentoo users enable ccache via FEATURES=ccache (or if they wish, ><a id="line-7" name="line-7"></a>manual means). Most packages don't have USE=ccache for this reason. ><a id="line-8" name="line-8"></a> ><a id="line-9" name="line-9"></a>Remove it from keepassxc as an outlier. ><a id="line-10" name="line-10"></a> ><a id="line-11" name="line-11"></a>Signed-off-by: Sam James <sam@gentoo.org> ><a id="line-12" name="line-12"></a>--- ><a id="line-13" name="line-13"></a> app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild | 7 ++++--- ><a id="line-14" name="line-14"></a> app-admin/keepassxc/keepassxc-9999.ebuild | 7 ++++--- ><a id="line-15" name="line-15"></a> 2 files changed, 8 insertions(+), 6 deletions(-) ><a id="line-16" name="line-16"></a> ><a id="line-17" name="line-17"></a>diff --git a/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild b/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild ><a id="line-18" name="line-18"></a>index 7e361326ccd8..19fe34eaf921 100644 ><a id="line-19" name="line-19"></a>--- a/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild ><a id="line-20" name="line-20"></a>+++ b/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild ><a id="line-21" name="line-21"></a>@@ -25,7 +25,7 @@ fi ><a id="line-22" name="line-22"></a> ><a id="line-23" name="line-23"></a> LICENSE="LGPL-2.1 GPL-2 GPL-3" ><a id="line-24" name="line-24"></a> SLOT="0" ><a id="line-25" name="line-25"></a>-IUSE="autotype browser ccache doc keeshare +network test yubikey" ><a id="line-26" name="line-26"></a>+IUSE="autotype browser doc keeshare +network test yubikey" ><a id="line-27" name="line-27"></a> ><a id="line-28" name="line-28"></a> RESTRICT="!test? ( test )" ><a id="line-29" name="line-29"></a> ><a id="line-30" name="line-30"></a>@@ -61,7 +61,6 @@ DEPEND=" ><a id="line-31" name="line-31"></a> dev-qt/qttest:5 ><a id="line-32" name="line-32"></a> " ><a id="line-33" name="line-33"></a> BDEPEND=" ><a id="line-34" name="line-34"></a>- ccache? ( dev-util/ccache ) ><a id="line-35" name="line-35"></a> doc? ( dev-ruby/asciidoctor ) ><a id="line-36" name="line-36"></a> " ><a id="line-37" name="line-37"></a> ><a id="line-38" name="line-38"></a>@@ -78,7 +77,9 @@ src_configure() { ><a id="line-39" name="line-39"></a> filter-flags -flto* ><a id="line-40" name="line-40"></a> ><a id="line-41" name="line-41"></a> local mycmakeargs=( ><a id="line-42" name="line-42"></a>- -DWITH_CCACHE="$(usex ccache)" ><a id="line-43" name="line-43"></a>+ # Gentoo users enable ccache via e.g. FEATURES=ccache or ><a id="line-44" name="line-44"></a>+ # other means. We don't want the build system to enable it for us. ><a id="line-45" name="line-45"></a>+ -DWITH_CCACHE=OFF ><a id="line-46" name="line-46"></a> -DWITH_GUI_TESTS=OFF ><a id="line-47" name="line-47"></a> -DWITH_TESTS="$(usex test)" ><a id="line-48" name="line-48"></a> -DWITH_XC_AUTOTYPE="$(usex autotype)" ><a id="line-49" name="line-49"></a>diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild ><a id="line-50" name="line-50"></a>index 7e361326ccd8..19fe34eaf921 100644 ><a id="line-51" name="line-51"></a>--- a/app-admin/keepassxc/keepassxc-9999.ebuild ><a id="line-52" name="line-52"></a>+++ b/app-admin/keepassxc/keepassxc-9999.ebuild ><a id="line-53" name="line-53"></a>@@ -25,7 +25,7 @@ fi ><a id="line-54" name="line-54"></a> ><a id="line-55" name="line-55"></a> LICENSE="LGPL-2.1 GPL-2 GPL-3" ><a id="line-56" name="line-56"></a> SLOT="0" ><a id="line-57" name="line-57"></a>-IUSE="autotype browser ccache doc keeshare +network test yubikey" ><a id="line-58" name="line-58"></a>+IUSE="autotype browser doc keeshare +network test yubikey" ><a id="line-59" name="line-59"></a> ><a id="line-60" name="line-60"></a> RESTRICT="!test? ( test )" ><a id="line-61" name="line-61"></a> ><a id="line-62" name="line-62"></a>@@ -61,7 +61,6 @@ DEPEND=" ><a id="line-63" name="line-63"></a> dev-qt/qttest:5 ><a id="line-64" name="line-64"></a> " ><a id="line-65" name="line-65"></a> BDEPEND=" ><a id="line-66" name="line-66"></a>- ccache? ( dev-util/ccache ) ><a id="line-67" name="line-67"></a> doc? ( dev-ruby/asciidoctor ) ><a id="line-68" name="line-68"></a> " ><a id="line-69" name="line-69"></a> ><a id="line-70" name="line-70"></a>@@ -78,7 +77,9 @@ src_configure() { ><a id="line-71" name="line-71"></a> filter-flags -flto* ><a id="line-72" name="line-72"></a> ><a id="line-73" name="line-73"></a> local mycmakeargs=( ><a id="line-74" name="line-74"></a>- -DWITH_CCACHE="$(usex ccache)" ><a id="line-75" name="line-75"></a>+ # Gentoo users enable ccache via e.g. FEATURES=ccache or ><a id="line-76" name="line-76"></a>+ # other means. We don't want the build system to enable it for us. ><a id="line-77" name="line-77"></a>+ -DWITH_CCACHE=OFF ><a id="line-78" name="line-78"></a> -DWITH_GUI_TESTS=OFF ><a id="line-79" name="line-79"></a> -DWITH_TESTS="$(usex test)" ><a id="line-80" name="line-80"></a> -DWITH_XC_AUTOTYPE="$(usex autotype)" ><a id="line-81" name="line-81"></a>-- ><a id="line-82" name="line-82"></a>2.35.1 ></pre></div> ></td></tr></table> > ><div id="raw-content" hidden> >From 2b0eeebd18e1c1998a32ad72c0d83d6abd9b8b19 Mon Sep 17 00:00:00 2001 >From: Sam James <sam@gentoo.org> >Date: Tue, 22 Mar 2022 21:18:19 +0000 >Subject: [PATCH 2/2] app-admin/keepassxc: remove USE=ccache > >Gentoo users enable ccache via FEATURES=ccache (or if they wish, >manual means). Most packages don't have USE=ccache for this reason. > >Remove it from keepassxc as an outlier. > >Signed-off-by: Sam James <sam@gentoo.org> >--- > app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild | 7 ++++--- > app-admin/keepassxc/keepassxc-9999.ebuild | 7 ++++--- > 2 files changed, 8 insertions(+), 6 deletions(-) > >diff --git a/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild b/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild >index 7e361326ccd8..19fe34eaf921 100644 >--- a/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild >+++ b/app-admin/keepassxc/keepassxc-2.7.0-r1.ebuild >@@ -25,7 +25,7 @@ fi > > LICENSE="LGPL-2.1 GPL-2 GPL-3" > SLOT="0" >-IUSE="autotype browser ccache doc keeshare +network test yubikey" >+IUSE="autotype browser doc keeshare +network test yubikey" > > RESTRICT="!test? ( test )" > >@@ -61,7 +61,6 @@ DEPEND=" > dev-qt/qttest:5 > " > BDEPEND=" >- ccache? ( dev-util/ccache ) > doc? ( dev-ruby/asciidoctor ) > " > >@@ -78,7 +77,9 @@ src_configure() { > filter-flags -flto* > > local mycmakeargs=( >- -DWITH_CCACHE="$(usex ccache)" >+ # Gentoo users enable ccache via e.g. FEATURES=ccache or >+ # other means. We don't want the build system to enable it for us. >+ -DWITH_CCACHE=OFF > -DWITH_GUI_TESTS=OFF > -DWITH_TESTS="$(usex test)" > -DWITH_XC_AUTOTYPE="$(usex autotype)" >diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild >index 7e361326ccd8..19fe34eaf921 100644 >--- a/app-admin/keepassxc/keepassxc-9999.ebuild >+++ b/app-admin/keepassxc/keepassxc-9999.ebuild >@@ -25,7 +25,7 @@ fi > > LICENSE="LGPL-2.1 GPL-2 GPL-3" > SLOT="0" >-IUSE="autotype browser ccache doc keeshare +network test yubikey" >+IUSE="autotype browser doc keeshare +network test yubikey" > > RESTRICT="!test? ( test )" > >@@ -61,7 +61,6 @@ DEPEND=" > dev-qt/qttest:5 > " > BDEPEND=" >- ccache? ( dev-util/ccache ) > doc? ( dev-ruby/asciidoctor ) > " > >@@ -78,7 +77,9 @@ src_configure() { > filter-flags -flto* > > local mycmakeargs=( >- -DWITH_CCACHE="$(usex ccache)" >+ # Gentoo users enable ccache via e.g. FEATURES=ccache or >+ # other means. We don't want the build system to enable it for us. >+ -DWITH_CCACHE=OFF > -DWITH_GUI_TESTS=OFF > -DWITH_TESTS="$(usex test)" > -DWITH_XC_AUTOTYPE="$(usex autotype)" >-- >2.35.1 ></div> > ><hr> > ><div class="shareon"> > <p>Share:</p> > <button class="mastodon"></button> > <button class="reddit"></button> > <button class="twitter"></button> ></div> > > > </div> > > > <script> > window.fwSettings={'widget_id':22000000180 }; > !function(){if("function"!=typeof window.FreshworksWidget){var n=function(){n.q.push(arguments)};n.q=[],window.FreshworksWidget=n}}(); > </script> > <script defer src='https://widget.freshworks.com/widgets/22000000180.js'></script> > </body> ></html>
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=767598">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 782244
:
767597
|
767598
|
767599
|
767600
